replace Nette\Object with Nette\SmartObject

src/Kdyby/Aop/DI/AdviceDefinition.php

@@ -20,9 +20,11 @@
 /**
  * @author Filip Procházka <[email protected]>
  */
-class AdviceDefinition extends Nette\Object
+class AdviceDefinition
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * @var Method
 	 */

src/Kdyby/Aop/DI/AspectsConfig.php

@@ -18,9 +18,11 @@
 /**
  * @author Filip Procházka <[email protected]>
  */
-class AspectsConfig extends Nette\Object
+class AspectsConfig
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * @var array
 	 */

src/Kdyby/Aop/JoinPoint/MethodInvocation.php

@@ -20,9 +20,11 @@
 /**
  * @author Filip Procházka <[email protected]>
  */
-abstract class MethodInvocation extends Nette\Object
+abstract class MethodInvocation
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * @var object
 	 */

src/Kdyby/Aop/PhpGenerator/AdvisedClassType.php

@@ -19,9 +19,11 @@
 /**
  * @author Filip Procházka <[email protected]>
  */
-class AdvisedClassType extends Nette\Object
+class AdvisedClassType
 {
 
+	use Nette\SmartObject;
+
 	const CG_INJECT_METHOD = '__injectAopContainer';
 	const CG_PUBLIC_PROXY_PREFIX = '__publicAopProxy_';
 

src/Kdyby/Aop/Pointcut/AspectAnalyzer.php

@@ -21,8 +21,9 @@
 /**
  * @author Filip Procházka <[email protected]>
  */
-class AspectAnalyzer extends Nette\Object
+class AspectAnalyzer
 {
+	use Nette\SmartObject;
 
 	/**
 	 * @var \Doctrine\Common\Annotations\Reader

src/Kdyby/Aop/Pointcut/Matcher/ClassAnnotateWithMatcher.php

@@ -19,9 +19,11 @@
 /**
  * @author Filip Procházka <[email protected]>
  */
-class ClassAnnotateWithMatcher extends Nette\Object implements Kdyby\Aop\Pointcut\Filter
+class ClassAnnotateWithMatcher implements Kdyby\Aop\Pointcut\Filter
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * @var string
 	 */

src/Kdyby/Aop/Pointcut/Matcher/Criteria.php

@@ -21,8 +21,11 @@
 /**
  * @author Filip Procházka <[email protected]>
  */
-class Criteria extends Nette\Object
+class Criteria
 {
+
+	use Nette\SmartObject;
+
 	const TYPE_AND = 'AND';
 	const TYPE_OR = 'OR';
 

src/Kdyby/Aop/Pointcut/Matcher/EvaluateMatcher.php

@@ -18,9 +18,11 @@
 /**
  * @author Filip Procházka <[email protected]>
  */
-class EvaluateMatcher extends Nette\Object implements Kdyby\Aop\Pointcut\Filter, Kdyby\Aop\Pointcut\RuntimeFilter
+class EvaluateMatcher implements Kdyby\Aop\Pointcut\Filter, Kdyby\Aop\Pointcut\RuntimeFilter
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * @var Criteria
 	 */

src/Kdyby/Aop/Pointcut/Matcher/FilterMatcher.php

@@ -18,9 +18,11 @@
 /**
  * @author Filip Procházka <[email protected]>
  */
-class FilterMatcher extends Nette\Object implements Kdyby\Aop\Pointcut\Filter
+class FilterMatcher implements Kdyby\Aop\Pointcut\Filter
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * @var \Kdyby\Aop\Pointcut\Filter
 	 */

src/Kdyby/Aop/Pointcut/Matcher/Inverse.php

@@ -18,9 +18,11 @@
 /**
  * @author Filip Procházka <[email protected]>
  */
-class Inverse extends Nette\Object implements Kdyby\Aop\Pointcut\Filter
+class Inverse implements Kdyby\Aop\Pointcut\Filter
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * @var \Kdyby\Aop\Pointcut\Filter
 	 */

src/Kdyby/Aop/Pointcut/Matcher/MethodAnnotateWithMatcher.php

@@ -19,9 +19,11 @@
 /**
  * @author Filip Procházka <[email protected]>
  */
-class MethodAnnotateWithMatcher extends Nette\Object implements Kdyby\Aop\Pointcut\Filter
+class MethodAnnotateWithMatcher implements Kdyby\Aop\Pointcut\Filter
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * @var string
 	 */

src/Kdyby/Aop/Pointcut/Matcher/MethodMatcher.php

@@ -18,9 +18,11 @@
 /**
  * @author Filip Procházka <[email protected]>
  */
-class MethodMatcher extends Nette\Object implements Kdyby\Aop\Pointcut\Filter
+class MethodMatcher implements Kdyby\Aop\Pointcut\Filter
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * @var string
 	 */

src/Kdyby/Aop/Pointcut/Matcher/SettingMatcher.php

@@ -18,9 +18,11 @@
 /**
  * @author Filip Procházka <[email protected]>
  */
-class SettingMatcher extends Nette\Object implements Kdyby\Aop\Pointcut\Filter
+class SettingMatcher implements Kdyby\Aop\Pointcut\Filter
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * @var Criteria
 	 */

src/Kdyby/Aop/Pointcut/Matcher/WithinMatcher.php

@@ -18,9 +18,11 @@
 /**
  * @author Filip Procházka <[email protected]>
  */
-class WithinMatcher extends Nette\Object implements Kdyby\Aop\Pointcut\Filter
+class WithinMatcher implements Kdyby\Aop\Pointcut\Filter
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * @var string
 	 */

src/Kdyby/Aop/Pointcut/MatcherFactory.php

@@ -20,9 +20,11 @@
 /**
  * @author Filip Procházka <[email protected]>
  */
-class MatcherFactory extends Nette\Object
+class MatcherFactory
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * @var \Nette\DI\ContainerBuilder
 	 */

src/Kdyby/Aop/Pointcut/Method.php

@@ -24,8 +24,11 @@
  * @property array|string[] $typesWithin
  * @property-read array|string[] $typesWithin
  */
-class Method extends Nette\Object
+class Method
 {
+
+	use Nette\SmartObject;
+
 	const VISIBILITY_PUBLIC = 'public';
 	const VISIBILITY_PROTECTED = 'protected';
 	const VISIBILITY_PRIVATE = 'private';

src/Kdyby/Aop/Pointcut/Parser.php

@@ -21,8 +21,10 @@
 /**
  * @author Filip Procházka <[email protected]>
  */
-class Parser extends Nette\Object
+class Parser
 {
+	use Nette\SmartObject;
+
 	const TOK_BRACKET = 'bracket';
 	const TOK_VISIBILITY = 'visibility';
 	const TOK_KEYWORD = 'keyword';

src/Kdyby/Aop/Pointcut/Rules.php

@@ -19,9 +19,11 @@
 /**
  * @author Filip Procházka <[email protected]>
  */
-class Rules extends Nette\Object implements Filter, RuntimeFilter
+class Rules implements Filter, RuntimeFilter
 {
 
+	use Nette\SmartObject;
+
 	const OP_AND = 'AND';
 	const OP_OR = 'OR';
 

src/Kdyby/Aop/Pointcut/ServiceDefinition.php

@@ -25,9 +25,11 @@
  * @property Nette\Reflection\ClassType $typeReflection
  * @property-read Nette\Reflection\ClassType $typeReflection
  */
-class ServiceDefinition extends Nette\Object
+class ServiceDefinition
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * @var \Nette\DI\ServiceDefinition
 	 */

tests/KdybyTests/Aop/files/aspect-examples.php

@@ -54,9 +54,11 @@ function create();
 
 
 
-class BeforeAspect extends Nette\Object
+class BeforeAspect
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * @var array|Aop\JoinPoint\BeforeMethod[]
 	 */
@@ -84,8 +86,9 @@ public function log(Aop\JoinPoint\BeforeMethod $before)
 
 
 
-class ConditionalBeforeAspect extends Nette\Object
+class ConditionalBeforeAspect
 {
+	use Nette\SmartObject;
 
 	/**
 	 * @var array|Aop\JoinPoint\BeforeMethod[]
@@ -121,9 +124,11 @@ class SecondBeforeAspect extends BeforeAspect
 
 
 
-class AroundAspect extends Nette\Object
+class AroundAspect
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * @var array|Aop\JoinPoint\AroundMethod[]
 	 */
@@ -161,9 +166,11 @@ public function log(Aop\JoinPoint\AroundMethod $around)
 
 
 
-class ConditionalAroundAspect extends Nette\Object
+class ConditionalAroundAspect
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * @var array|Aop\JoinPoint\AroundMethod[]
 	 */
@@ -208,9 +215,11 @@ class SecondAroundAspect extends AroundAspect
 
 
 
-class AroundBlockingAspect extends Nette\Object
+class AroundBlockingAspect
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * @var array|Aop\JoinPoint\AroundMethod[]
 	 */
@@ -261,9 +270,11 @@ class SecondAroundBlockingAspect extends AroundBlockingAspect
 
 
 
-class AfterReturningAspect extends Nette\Object
+class AfterReturningAspect
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * @var array|Aop\JoinPoint\AfterReturning[]
 	 */
@@ -289,9 +300,11 @@ public function log(Aop\JoinPoint\AfterReturning $after)
 
 
 
-class ConditionalAfterReturningAspect extends Nette\Object
+class ConditionalAfterReturningAspect
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * @var array|Aop\JoinPoint\AfterReturning[]
 	 */
@@ -324,9 +337,11 @@ class SecondAfterReturningAspect extends AfterReturningAspect
 
 
 
-class AfterThrowingAspect extends Nette\Object
+class AfterThrowingAspect
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * @var array|Aop\JoinPoint\AfterThrowing[]
 	 */
@@ -353,9 +368,11 @@ class SecondAfterThrowingAspect extends AfterThrowingAspect
 
 
 
-class AfterAspect extends Nette\Object
+class AfterAspect
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * @var array|Aop\JoinPoint\AfterMethod[]
 	 */
@@ -380,9 +397,11 @@ class SecondAfterAspect extends AfterAspect
 
 }
 
-class AspectWithArguments extends Nette\Object
+class AspectWithArguments
 {
 
+	use Nette\SmartObject;
+
 	public $args;
 
 
@@ -405,9 +424,11 @@ public function log(Aop\JoinPoint\AfterMethod $after)
 }
 
 
-class ConstructorBeforeAspect extends Nette\Object
+class ConstructorBeforeAspect
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * @var array|Aop\JoinPoint\BeforeMethod[]
 	 */