Refactoring

config/module.dist.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * This file provides the distributed module configuration for Zend\Di
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+return [
+    // TODO: Module configuration
+];

src/Definition/Introspection/DefaultStrategy.php

@@ -9,17 +9,132 @@
 
 namespace Zend\Di\Definition\Introspection;
 
+use ReflectionClass;
+use ReflectionMethod;
+use ReflectionParameter;
+
+use Zend\Di\Definition\Annotation;
+
+use Zend\Code\Annotation\AnnotationManager;
+use Zend\Code\Annotation\Parser\GenericAnnotationParser;
+
+
 /**
  * The default introspection strategy for PHP7 and up
  */
 class DefaultStrategy implements StrategyInterface
 {
+    /**
+     * Method inclusion pattern
+     */
+    const METHOD_PATTERN = '/^set[A-Z]{1}\w*/';
+
+    /**
+     * Interface inclusion pattern
+     */
+    const INTERFACE_PATTERN = '/\w*Aware\w*/';
+
+
+    /**
+     * The annotation manager instance for this strategy
+     *
+     * @var AnnotationManager
+     */
+    protected $annotationManager = null;
+
+    /**
+     * Annotation usage flag
+     *
+     * @var bool
+     */
+    protected $useAnnotations = true;
+
+    /**
+     * Constructor
+     *
+     * @param null|AnnotationManager $annotationManager
+     */
+    public function __construct(AnnotationManager $annotationManager = null)
+    {
+        $this->annotationManager = $annotationManager?: $this->createDefaultAnnotationManager();
+    }
+
+    /**
+     * Creates the default annotation manager
+     *
+     * @return AnnotationManager
+     */
+    protected function createDefaultAnnotationManager()
+    {
+        $annotationManager = new AnnotationManager();
+        $parser            = new GenericAnnotationParser();
+
+        $parser->registerAnnotation(new Annotation\Inject());
+        $parser->registerAnnotation(new Annotation\Instantiator());
+
+        $annotationManager->attach($parser);
+
+        return $annotationManager;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @see \Zend\Di\Definition\Introspection\StrategyInterface::getAnnotationManager()
+     */
+    public function getAnnotationManager()
+    {
+        return $this->annotationManager;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @see \Zend\Di\Definition\Introspection\StrategyInterface::getUseAnnotations()
+     */
+    public function getUseAnnotations()
+    {
+        return $this->useAnnotations;
+    }
+
+    /**
+     * Specify annotation usage
+     *
+     * @param   bool    $flag   Whether to enable/disable annotation usage
+     * @return  self
+     */
+    public function setUseAnnotations($flag)
+    {
+        $this->useAnnotations = (bool)$flag;
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @see \Zend\Di\Definition\Introspection\StrategyInterface::includeInterfaceMethods()
+     */
+    public function includeInterfaceMethods(ReflectionClass $reflectedInterface)
+    {
+        return (bool)preg_match(self::INTERFACE_PATTERN, $reflectedInterface->getName());
+    }
+
+    /**
+     * {@inheritDoc}
+     * @see \Zend\Di\Definition\Introspection\StrategyInterface::includeMethod()
+     */
+    public function includeMethod(ReflectionMethod $reflectedMethod)
+    {
+        return (bool)preg_match(self::METHOD_PATTERN, $reflectedMethod->getName());
+    }
+
     /**
      * {@inheritDoc}
      * @see \Zend\Di\Definition\Introspection\StrategyInterface::reflectParameterType()
      */
-    public function reflectParameterType(\ReflectionParameter $parameter)
+    public function reflectParameterType(ReflectionParameter $parameter)
     {
-        // TODO Auto-generated method stub
+        if (!$parameter->hasType()) {
+            return null;
+        }
+
+        return (string)$parameter->getType();
     }
 }

src/Definition/Introspection/Php5Strategy.php

@@ -9,17 +9,25 @@
 
 namespace Zend\Di\Definition\Introspection;
 
+use ReflectionParameter;
+
 /**
  * Introspection strategy for PHP5
  */
-class Php5Strategy implements StrategyInterface
+class Php5Strategy extends DefaultStrategy implements StrategyInterface
 {
     /**
      * {@inheritDoc}
      * @see \Zend\Di\Definition\Introspection\StrategyInterface::reflectParameterType()
      */
-    public function reflectParameterType(\ReflectionParameter $parameter)
+    public function reflectParameterType(ReflectionParameter $parameter)
     {
-        // TODO Auto-generated method stub
+        $class = $parameter->getClass();
+
+        if (!$class) {
+            return null;
+        }
+
+        return $class->getName();
     }
 }

src/Definition/Introspection/StrategyInterface.php

@@ -23,7 +23,11 @@ interface StrategyInterface
     /**
      * Reflect the parameter type
      *
+     * This should return the required type name. This might
+     * either be a FQCN or a buildin type name (i.e. string or int)
+     *
      * @param \ReflectionParameter $parameter
+     * @return string|null
      */
     public function reflectParameterType(ReflectionParameter $parameter);
 
@@ -56,4 +60,4 @@ public function includeMethod(ReflectionMethod $reflectedMethod);
      * @return  bool
      */
     public function includeInterfaceMethods(ReflectionClass $reflectedInterface);
-}
+}

src/Module.php

@@ -9,9 +9,33 @@
 
 namespace Zend\Di;
 
+use Zend\ModuleManager\Feature\ConfigProviderInterface;
+
+
 /**
- * @todo ZF Module definition
+ * Provides Module functionality for Zend Framework 3 applications
+ *
+ * To add the DI integration to your application, add it to the ZF modules list:
+ *
+ * ```php
+ *  // application.config.php
+ *  return [
+ *      // ...
+ *      'modules' => [
+ *          'Zend\\Di',
+ *          // ...
+ *      ]
+ *  ];
+ * ```
  */
-class Module
+class Module implements ConfigProviderInterface
 {
-}
+    /**
+     * {@inheritDoc}
+     * @see \Zend\ModuleManager\Feature\ConfigProviderInterface::getConfig()
+     */
+    public function getConfig()
+    {
+        return require __DIR__ . '/../config/module.dist.php';
+    }
+}