From 8034028677e2b2a4647e6dc4bb1cdea9d0b0e012 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Wed, 6 Apr 2016 00:19:33 +0200 Subject: [PATCH] uses Nette\SmartObject & StrictClass --- app/forms/FormFactory.php | 3 ++- app/forms/SignFormFactory.php | 4 +++- app/model/UserManager.php | 4 +++- app/presenters/ErrorPresenter.php | 4 +++- app/router/RouterFactory.php | 1 + composer.json | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/forms/FormFactory.php b/app/forms/FormFactory.php index b48de76e..6a3f0b53 100644 --- a/app/forms/FormFactory.php +++ b/app/forms/FormFactory.php @@ -6,8 +6,9 @@ use Nette\Application\UI\Form; -class FormFactory extends Nette\Object +class FormFactory { + use Nette\SmartObject; /** * @return Form diff --git a/app/forms/SignFormFactory.php b/app/forms/SignFormFactory.php index 88df42cd..5ae039ca 100644 --- a/app/forms/SignFormFactory.php +++ b/app/forms/SignFormFactory.php @@ -7,8 +7,10 @@ use Nette\Security\User; -class SignFormFactory extends Nette\Object +class SignFormFactory { + use Nette\SmartObject; + /** @var FormFactory */ private $factory; diff --git a/app/model/UserManager.php b/app/model/UserManager.php index d00557b6..d2cc6a90 100644 --- a/app/model/UserManager.php +++ b/app/model/UserManager.php @@ -9,8 +9,10 @@ /** * Users management. */ -class UserManager extends Nette\Object implements Nette\Security\IAuthenticator +class UserManager implements Nette\Security\IAuthenticator { + use Nette\SmartObject; + const TABLE_NAME = 'users', COLUMN_ID = 'id', diff --git a/app/presenters/ErrorPresenter.php b/app/presenters/ErrorPresenter.php index f3d28634..b1f5ee4a 100644 --- a/app/presenters/ErrorPresenter.php +++ b/app/presenters/ErrorPresenter.php @@ -6,8 +6,10 @@ use Tracy\ILogger; -class ErrorPresenter extends Nette\Object implements Nette\Application\IPresenter +class ErrorPresenter implements Nette\Application\IPresenter { + use Nette\SmartObject; + /** @var ILogger */ private $logger; diff --git a/app/router/RouterFactory.php b/app/router/RouterFactory.php index 2a39947f..11565bb1 100644 --- a/app/router/RouterFactory.php +++ b/app/router/RouterFactory.php @@ -9,6 +9,7 @@ class RouterFactory { + use Nette\StaticClass; /** * @return Nette\Application\IRouter diff --git a/composer.json b/composer.json index 0ddda882..65af1f29 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "nette/robot-loader": "^2.3", "nette/safe-stream": "^2.3", "nette/security": "^2.3", - "nette/utils": "^2.3", + "nette/utils": "^2.4", "latte/latte": "^2.3", "tracy/tracy": "^2.3", "dg/adminer-custom": "^1.6"