uses Nette\SmartObject & StaticClass

Author: dg

composer.json

@@ -15,7 +15,7 @@
 	],
 	"require": {
 		"php": ">=5.6.0",
-		"nette/utils": "~2.2"
+		"nette/utils": "~2.4"
 	},
 	"require-dev": {
 		"nette/tester": "~1.4",

src/PhpGenerator/ClassType.php

@@ -14,8 +14,10 @@
 /**
  * Class/Interface/Trait description.
  */
-class ClassType extends Nette\Object
+class ClassType
 {
+	use Nette\SmartObject;
+
 	const TYPE_CLASS = 'class';
 
 	const TYPE_INTERFACE = 'interface';

src/PhpGenerator/Helpers.php

@@ -15,6 +15,8 @@
  */
 class Helpers
 {
+	use Nette\StaticClass;
+
 	const PHP_IDENT = '[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*';
 	const MAX_DEPTH = 50;
 

src/PhpGenerator/Method.php

@@ -13,8 +13,10 @@
 /**
  * Method or function description.
  */
-class Method extends Nette\Object
+class Method
 {
+	use Nette\SmartObject;
+
 	/** @var string|NULL */
 	private $name;
 

src/PhpGenerator/Parameter.php

@@ -13,8 +13,10 @@
 /**
  * Method parameter description.
  */
-class Parameter extends Nette\Object
+class Parameter
 {
+	use Nette\SmartObject;
+
 	/** @var string */
 	private $name = '';
 

src/PhpGenerator/PhpFile.php

@@ -7,7 +7,7 @@
 
 namespace Nette\PhpGenerator;
 
-use Nette\Object;
+use Nette;
 use Nette\Utils\Strings;
 
 
@@ -19,8 +19,10 @@
  * - doc comments
  * - one or more namespaces
  */
-class PhpFile extends Object
+class PhpFile
 {
+	use Nette\SmartObject;
+
 	/** @var string|NULL */
 	private $comment;
 

src/PhpGenerator/PhpNamespace.php

@@ -7,8 +7,8 @@
 
 namespace Nette\PhpGenerator;
 
+use Nette;
 use Nette\InvalidStateException;
-use Nette\Object;
 use Nette\Utils\Strings;
 
 
@@ -20,8 +20,10 @@
  * - variable amount of use statements
  * - one or more class declarations
  */
-class PhpNamespace extends Object
+class PhpNamespace
 {
+	use Nette\SmartObject;
+
 	/** @var string */
 	private $name;
 

src/PhpGenerator/Property.php

@@ -13,8 +13,10 @@
 /**
  * Class property description.
  */
-class Property extends Nette\Object
+class Property
 {
+	use Nette\SmartObject;
+
 	/** @var string */
 	private $name = '';