uses Nette\SmartObject & StrictClass

dg · dg · commit 8034028677e2 · 2016-04-11T02:30:08.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -9,6 +9,7 @@
 
 class RouterFactory
 {
+	use Nette\StaticClass;
 
 	/**
 	 * @return Nette\Application\IRouter
diff --git 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"

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,9 @@`
`6`	`6`	`use Nette\Application\UI\Form;`
`7`	`7`
`8`	`8`
`9`		`-class FormFactory extends Nette\Object`
	`9`	`+class FormFactory`
`10`	`10`	`{`
	`11`	`+ use Nette\SmartObject;`
`11`	`12`
`12`	`13`	`/**`
`13`	`14`	`* @return Form`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,10 @@`
`7`	`7`	`use Nette\Security\User;`
`8`	`8`
`9`	`9`
`10`		`-class SignFormFactory extends Nette\Object`
	`10`	`+class SignFormFactory`
`11`	`11`	`{`
	`12`	`+ use Nette\SmartObject;`
	`13`	`+`
`12`	`14`	`/** @var FormFactory */`
`13`	`15`	`private $factory;`
`14`	`16`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,10 @@`
`6`	`6`	`use Tracy\ILogger;`
`7`	`7`
`8`	`8`
`9`		`-class ErrorPresenter extends Nette\Object implements Nette\Application\IPresenter`
	`9`	`+class ErrorPresenter implements Nette\Application\IPresenter`
`10`	`10`	`{`
	`11`	`+ use Nette\SmartObject;`
	`12`	`+`
`11`	`13`	`/** @var ILogger */`
`12`	`14`	`private $logger;`
`13`	`15`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`
`10`	`10`	`class RouterFactory`
`11`	`11`	`{`
	`12`	`+ use Nette\StaticClass;`
`12`	`13`
`13`	`14`	`/**`
`14`	`15`	`* @return Nette\Application\IRouter`