removed usage of magic methods and properties

Author: dg

composer.json

@@ -17,7 +17,7 @@
 		"php": ">=5.3.1",
 		"nette/neon": "~2.3",
 		"nette/reflection": "~2.3",
-		"nette/php-generator": "~2.2",
+		"nette/php-generator": "~2.3",
 		"nette/utils": "~2.3"
 	},
 	"require-dev": {

src/DI/ContainerBuilder.php

@@ -582,7 +582,7 @@ private function generateService($name)
 		}
 
 		$factoryClass = $this->generatedClasses[] = new Nette\PhpGenerator\ClassType;
-		$factoryClass->setName(str_replace(array('\\', '.'), '_', "{$this->generatedClasses[0]->name}_{$def->getImplement()}Impl_{$name}"))
+		$factoryClass->setName(str_replace(array('\\', '.'), '_', "{$this->generatedClasses[0]->getName()}_{$def->getImplement()}Impl_{$name}"))
 			->addImplement($def->getImplement())
 			->setFinal(TRUE);
 
@@ -598,7 +598,7 @@ private function generateService($name)
 			->setParameters($this->convertParameters($def->parameters))
 			->setBody(str_replace('$this', '$this->container', $code));
 
-		return "return new {$factoryClass->name}(\$this);";
+		return "return new {$factoryClass->getName()}(\$this);";
 	}
 
 

src/DI/Extensions/ConstantsExtension.php

@@ -21,7 +21,7 @@ class ConstantsExtension extends Nette\DI\CompilerExtension
 	public function afterCompile(Nette\PhpGenerator\ClassType $class)
 	{
 		foreach ($this->getConfig() as $name => $value) {
-			$class->methods['initialize']->addBody('define(?, ?);', array($name, $value));
+			$class->getMethod('initialize')->addBody('define(?, ?);', array($name, $value));
 		}
 	}
 

src/DI/Extensions/DIExtension.php

@@ -43,7 +43,7 @@ public function loadConfiguration()
 
 	public function afterCompile(Nette\PhpGenerator\ClassType $class)
 	{
-		$initialize = $class->methods['initialize'];
+		$initialize = $class->getMethod('initialize');
 		$container = $this->getContainerBuilder();
 
 		if ($this->debugMode && $this->config['debugger']) {

src/DI/Extensions/PhpExtension.php

@@ -20,7 +20,7 @@ class PhpExtension extends Nette\DI\CompilerExtension
 
 	public function afterCompile(Nette\PhpGenerator\ClassType $class)
 	{
-		$initialize = $class->methods['initialize'];
+		$initialize = $class->getMethod('initialize');
 		foreach ($this->getConfig() as $name => $value) {
 			if (!is_scalar($value)) {
 				throw new Nette\InvalidStateException("Configuration value for directive '$name' is not scalar.");

src/DI/Helpers.php

@@ -167,5 +167,4 @@ public static function getInjectProperties(Nette\Reflection\ClassType $class, $c
 		return $res;
 	}
 
-
 }