Merge branch 'hotfix/4435' into develop

Forward port zendframework/zendframework#4435

src/Definition/ArrayDefinition.php

@@ -9,6 +9,8 @@
 
 namespace Zend\Di\Definition;
 
+use Zend\Di\Definition\Builder\InjectionMethod;
+
 /**
  * Class definitions based on a given array
  */
@@ -28,6 +30,15 @@ public function __construct(array $dataArray)
             // force lower names
             $dataArray[$class] = array_change_key_case($dataArray[$class], CASE_LOWER);
         }
+        foreach ($dataArray as $class => $definition) {
+            if (isset($definition['methods']) && is_array($definition['methods'])) {
+                foreach ($definition['methods'] as $type => $requirement) {
+                    if (!is_int($requirement)) {
+                        $dataArray[$class]['methods'][$type] = InjectionMethod::detectMethodRequirement($requirement);
+                    }
+                }
+            }
+        }
         $this->dataArray = $dataArray;
     }
 

src/Definition/Builder/InjectionMethod.php

@@ -9,6 +9,8 @@
 
 namespace Zend\Di\Definition\Builder;
 
+use Zend\Di\Di;
+
 /**
  * Definitions for an injection endpoint method
  */
@@ -55,7 +57,7 @@ public function addParameter($name, $class = null, $isRequired = null, $default
         $this->parameters[] = array(
             $name,
             $class,
-            ($isRequired == null) ? true : false,
+            self::detectMethodRequirement($isRequired),
             $default,
         );
 
@@ -69,4 +71,51 @@ public function getParameters()
     {
         return $this->parameters;
     }
+
+    /**
+     *
+     * @param mixed $requirement
+     * @return int
+     */
+    public static function detectMethodRequirement($requirement)
+    {
+        if (is_bool($requirement)) {
+            return $requirement ? Di::METHOD_IS_REQUIRED : Di::METHOD_IS_OPTIONAL;
+        }
+
+        if (null === $requirement) {
+            //This is mismatch to ClassDefinition::addMethod is it ok ? is optional?
+            return Di::METHOD_IS_REQUIRED;
+        }
+
+        if (is_int($requirement)) {
+            return $requirement;
+        }
+
+        if (is_string($requirement)) {
+            switch (strtolower($requirement)) {
+                default:
+                case "require":
+                case "required":
+                    return Di::METHOD_IS_REQUIRED;
+                    break;
+                case "aware":
+                    return Di::METHOD_IS_AWARE;
+                    break;
+                case "optional":
+                    return Di::METHOD_IS_OPTIONAL;
+                    break;
+                case "constructor":
+                    return Di::MEHTOD_IS_CONSTRUCTOR;
+                    break;
+                case "instantiator":
+                    return Di::METHOD_IS_INSTANTIATOR;
+                    break;
+                case "eager":
+                    return Di::METHOD_IS_EAGER;
+                    break;
+            }
+        }
+        return 0;
+    }
 }

src/Definition/ClassDefinition.php

@@ -9,6 +9,9 @@
 
 namespace Zend\Di\Definition;
 
+use Zend\Di\Definition\Builder\InjectionMethod;
+use Zend\Di\Di;
+
 /**
  * Class definitions for a single class
  */
@@ -71,15 +74,21 @@ public function setSupertypes(array $supertypes)
 
     /**
      * @param  string    $method
-     * @param  bool|null $isRequired
+     * @param  mixed|bool|null $isRequired
      * @return self
      */
     public function addMethod($method, $isRequired = null)
     {
-        if ($isRequired === null) {
-            $isRequired = ($method === '__construct') ? true : false;
+       if ($isRequired === null) {
+            if ($method === '__construct') {
+                $methodRequirementType = Di::METHOD_IS_CONSTRUCTOR;
+            }
+            $methodRequirementType = Di::METHOD_IS_OPTIONAL;
+        } else {
+            $methodRequirementType = InjectionMethod::detectMethodRequirement($isRequired);
         }
-        $this->methods[$method] = (bool) $isRequired;
+
+        $this->methods[$method] = $methodRequirementType;
 
         return $this;
     }
@@ -93,7 +102,11 @@ public function addMethod($method, $isRequired = null)
     public function addMethodParameter($method, $parameterName, array $parameterInfo)
     {
         if (!array_key_exists($method, $this->methods)) {
-            $this->methods[$method] = ($method === '__construct') ? true : false;
+            if ($method === '__construct') {
+                $this->methods[$method] = Di::METHOD_IS_CONSTRUCTOR;
+            } else {
+                $this->methods[$method] = Di::METHOD_IS_OPTIONAL;
+            }
         }
 
         if (!array_key_exists($method, $this->methodParameters)) {

src/Definition/RuntimeDefinition.php

@@ -12,6 +12,7 @@
 use Zend\Code\Annotation\AnnotationCollection;
 use Zend\Code\Reflection;
 use Zend\Di\Definition\Annotation;
+use Zend\Di\Di;
 
 /**
  * Class definitions based on runtime reflection
@@ -248,7 +249,7 @@ protected function processClass($class)
         }
 
         if ($rClass->hasMethod('__construct')) {
-            $def['methods']['__construct'] = true; // required
+            $def['methods']['__construct'] = Di::METHOD_IS_CONSTRUCTOR; // required
             $this->processParams($def, $rClass, $rClass->getMethod('__construct'));
         }
 
@@ -266,7 +267,8 @@ protected function processClass($class)
                 if (($annotations instanceof AnnotationCollection)
                     && $annotations->hasAnnotation('Zend\Di\Definition\Annotation\Inject')) {
 
-                    $def['methods'][$methodName] = true;
+                    // use '@inject' and search for parameters
+                    $def['methods'][$methodName] = Di::METHOD_IS_EAGER;
                     $this->processParams($def, $rClass, $rMethod);
                     continue;
                 }
@@ -278,7 +280,7 @@ protected function processClass($class)
             foreach ($methodPatterns as $methodInjectorPattern) {
                 preg_match($methodInjectorPattern, $methodName, $matches);
                 if ($matches) {
-                    $def['methods'][$methodName] = false; // check ot see if this is required?
+                    $def['methods'][$methodName] = Di::METHOD_IS_OPTIONAL; // check ot see if this is required?
                     $this->processParams($def, $rClass, $rMethod);
                     continue 2;
                 }
@@ -304,7 +306,7 @@ protected function processClass($class)
                             // constructor not allowed in interfaces
                             continue;
                         }
-                        $def['methods'][$rMethod->getName()] = true;
+                        $def['methods'][$rMethod->getName()] = Di::METHOD_IS_AWARE;
                         $this->processParams($def, $rClass, $rMethod);
                     }
                     continue 2;