refactoring

Author: dg

composer.json

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

src/PhpGenerator/ClassType.php

@@ -226,7 +226,7 @@ public function isAbstract()
 	 */
 	public function setExtends($types)
 	{
-		if (!is_string($types) && !(is_array($types) && array_filter($types, 'is_string') === $types)) {
+		if (!is_string($types) && !(is_array($types) && Nette\Utils\Arrays::every($types, 'is_string'))) {
 			throw new Nette\InvalidArgumentException('Argument must be string or string[].');
 		}
 		$this->extends = $types;
@@ -535,7 +535,7 @@ public function addMethod($name)
 	{
 		$method = (new Method($name))->setNamespace($this->namespace);
 		if ($this->type === 'interface') {
-			$method->setVisibility(NULL)->setBody(FALSE);
+			$method->setBody(FALSE);
 		} else {
 			$method->setVisibility('public');
 		}

src/PhpGenerator/Factory.php

@@ -39,13 +39,13 @@ public function fromClassReflection(\ReflectionClass $from)
 		$props = $methods = [];
 		foreach ($from->getProperties() as $prop) {
 			if ($prop->isDefault() && $prop->getDeclaringClass()->getName() === $from->getName()) {
-				$props[$prop->getName()] = $this->fromPropertyReflection($prop);
+				$props[] = $this->fromPropertyReflection($prop);
 			}
 		}
 		$class->setProperties($props);
 		foreach ($from->getMethods() as $method) {
 			if ($method->getDeclaringClass()->getName() === $from->getName()) {
-				$methods[$method->getName()] = $this->fromFunctionReflection($method)->setNamespace($class->getNamespace());
+				$methods[] = $this->fromFunctionReflection($method)->setNamespace($class->getNamespace());
 			}
 		}
 		$class->setMethods($methods);
@@ -59,11 +59,7 @@ public function fromClassReflection(\ReflectionClass $from)
 	public function fromFunctionReflection(\ReflectionFunctionAbstract $from)
 	{
 		$method = new Method($from->isClosure() ? NULL : $from->getName());
-		$params = [];
-		foreach ($from->getParameters() as $param) {
-			$params[$param->getName()] = $this->fromParameterReflection($param);
-		}
-		$method->setParameters($params);
+		$method->setParameters(array_map([$this, 'fromParameterReflection'], $from->getParameters()));
 		if ($from instanceof \ReflectionMethod) {
 			$isInterface = $from->getDeclaringClass()->isInterface();
 			$method->setStatic($from->isStatic());

src/PhpGenerator/Method.php

@@ -20,7 +20,7 @@ class Method extends Member
 	/** @var array of name => Parameter */
 	private $parameters = [];
 
-	/** @var array of name => bool */
+	/** @var Parameter[] */
 	private $uses = [];
 
 	/** @var string|FALSE */