removed usage of magic properties & Nette\Object

Author: dg

src/DI/Config/Adapters/NeonAdapter.php

@@ -117,16 +117,16 @@ function (& $val) {
 				}
 			}
 		);
-		if (is_array($val->entity) && $val->entity[0] instanceof Statement) {
+		if (is_array($val->getEntity()) && $val->getEntity()[0] instanceof Statement) {
 			return new Neon\Entity(
 				Neon\Neon::CHAIN,
 				[
-					self::statementToEntity($val->entity[0]),
-					new Neon\Entity('::' . $val->entity[1], $val->arguments)
+					self::statementToEntity($val->getEntity()[0]),
+					new Neon\Entity('::' . $val->getEntity()[1], $val->arguments)
 				]
 			);
 		} else {
-			return new Neon\Entity($val->entity, $val->arguments);
+			return new Neon\Entity($val->getEntity(), $val->arguments);
 		}
 	}
 

tests/DI/Compiler.services.dynamic.phpt

@@ -11,7 +11,7 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-class Service extends Nette\Object
+class Service
 {
 }
 

tests/DI/Compiler.services.tags.phpt

@@ -23,7 +23,7 @@ services:
 ');
 
 
-$prop = $container->getReflection()->getProperty('meta');
+$prop = (new ReflectionClass($container))->getProperty('meta');
 $prop->setAccessible(TRUE);
 
 Assert::same([

tests/DI/Container.getByType.phpt

@@ -11,15 +11,15 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-class Service extends Nette\Object
+class Service extends stdClass
 {
 }
 
 class Child extends Service
 {
 }
 
-class Service2 extends Nette\Object
+class Service2 extends stdClass
 {
 }
 
@@ -46,8 +46,8 @@ Assert::null($container->getByType('Child', FALSE));
 Assert::type(Service2::class, $container->getByType('Service2'));
 
 Assert::exception(function () use ($container) {
-	$container->getByType(Nette\Object::class);
-}, Nette\DI\MissingServiceException::class, 'Multiple services of type Nette\Object found: one, two, container.');
+	$container->getByType(stdClass::class);
+}, Nette\DI\MissingServiceException::class, 'Multiple services of type stdClass found: one, two.');
 
 Assert::null($container->getByType('unknown', FALSE));
 

tests/DI/ContainerBuilder.getByType.phpt

@@ -11,15 +11,15 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-class Service extends Nette\Object
+class Service extends stdClass
 {
 }
 
 class Child extends Service
 {
 }
 
-class Service2 extends Nette\Object
+class Service2 extends stdClass
 {
 }
 
@@ -49,8 +49,8 @@ Assert::null($builder->getByType('Child'));
 Assert::same('two', $builder->getByType('Service2'));
 
 Assert::exception(function () use ($builder) {
-	$builder->getByType(Nette\Object::class);
-}, Nette\DI\ServiceCreationException::class, 'Multiple services of type Nette\Object found: one, two, container');
+	$builder->getByType(stdClass::class);
+}, Nette\DI\ServiceCreationException::class, 'Multiple services of type stdClass found: one, two');
 
 Assert::null($builder->getByType('unknown'));
 

tests/DI/DecoratorExtension.basic.phpt

@@ -18,7 +18,7 @@ interface Iface
 }
 
 
-class Service extends Nette\Object implements Iface
+class Service extends stdClass implements Iface
 {
 
 	public $setup;
@@ -34,7 +34,7 @@ $compiler = new DI\Compiler;
 $compiler->addExtension('decorator', new Nette\DI\Extensions\DecoratorExtension);
 $container = createContainer($compiler, '
 decorator:
-	Nette\Object:
+	stdClass:
 		setup:
 			- setup(Object)
 		inject: yes