magento-hackathon/Imagine2017#11: Create new CLI command: Collect Dependency Injection Info for the Interfaces and Classes

- fixed issue with the empty constructor parameters list
- fixed static test

Author: vrann

app/code/Magento/Developer/Model/Di/Information.php

@@ -87,6 +87,10 @@ public function getParameters($className)
             $this->getConstructorParameters($this->getVirtualTypeBase($className)) :
             $this->getConstructorParameters($this->getPreference($className));
 
+        if (!$originalParameters) {
+            return $result;
+        }
+
         foreach ($originalParameters as $parameter) {
             $paramArray = [$parameter[0], $parameter[1], is_array($parameter[3]) ? "<empty array>" : $parameter[3]];
             if (isset($diConfiguration[$parameter[0]])) {

app/code/Magento/Developer/Model/Di/PluginList.php

@@ -14,13 +14,31 @@
  */
 class PluginList extends Interception\PluginList\PluginList
 {
+    /**#@+
+     * Constants for the plugin types
+     */
+    const PLUGIN_TYPE_BEFORE = 'before';
+    const PLUGIN_TYPE_AROUND = 'around';
+    const PLUGIN_TYPE_AFTER = 'after';
+    /**#@-*/
+
     /**
      * @var array
      */
     private $pluginList = [
-       'before' => [],
-       'around' => [],
-       'after'  => []
+       self::PLUGIN_TYPE_BEFORE => [],
+       self::PLUGIN_TYPE_AROUND => [],
+       self::PLUGIN_TYPE_AFTER  => []
+    ];
+
+    /**
+     * Mapping of plugin type codes to plugin types
+     * @var array
+     */
+    private $pluginTypeMapping = [
+        DefinitionInterface::LISTENER_AROUND => self::PLUGIN_TYPE_AROUND,
+        DefinitionInterface::LISTENER_BEFORE => self::PLUGIN_TYPE_BEFORE,
+        DefinitionInterface::LISTENER_AFTER => self::PLUGIN_TYPE_AFTER
     ];
 
     /**
@@ -75,7 +93,6 @@ private function getPlugins($type)
         return $this->_inherited[$type];
     }
 
-
     /**
      * Return the list of plugins for the class
      *
@@ -92,28 +109,35 @@ public function getPluginsListByClass($className)
 
         foreach ($this->_inherited[$className] as $pluginKey => $plugin) {
             foreach ($this->_definitions->getMethodList($plugin['instance']) as $pluginMethod => $methodTypes) {
-                if ($methodTypes & DefinitionInterface::LISTENER_AROUND) {
-                    if (!array_key_exists($plugin['instance'], $this->pluginList['around'])) {
-                        $this->pluginList['around'][$plugin['instance']] = [];
-                    }
-                    $this->pluginList['around'][$plugin['instance']][] = $pluginMethod ;
-                }
-                if ($methodTypes & DefinitionInterface::LISTENER_BEFORE) {
-                    if (!array_key_exists($plugin['instance'], $this->pluginList['before'])) {
-                        $this->pluginList['before'][$plugin['instance']] = [];
-                    }
-                    $this->pluginList['before'][$plugin['instance']][] = $pluginMethod ;
-
-                }
-                if ($methodTypes & DefinitionInterface::LISTENER_AFTER) {
-                    if (!array_key_exists($plugin['instance'], $this->pluginList['after'])) {
-                        $this->pluginList['after'][$plugin['instance']] = [];
-                    }
-                    $this->pluginList['after'][$plugin['instance']][] = $pluginMethod ;
-                }
+                $this->addPluginToList($plugin['instance'], $pluginMethod, $methodTypes,
+                    DefinitionInterface::LISTENER_AROUND
+                );
+                $this->addPluginToList($plugin['instance'], $pluginMethod, $methodTypes,
+                    DefinitionInterface::LISTENER_BEFORE
+                );
+                $this->addPluginToList($plugin['instance'], $pluginMethod, $methodTypes,
+                    DefinitionInterface::LISTENER_AFTER
+                );
             }
         }
         return $this->pluginList;
     }
-}
 
+    /**
+     * Add plugin to the appropriate type bucket
+     *
+     * @param string $pluginInstance
+     * @param string $pluginMethod
+     * @param int $methodTypes
+     * @param int $typeCode
+     */
+    private function addPluginToList($pluginInstance, $pluginMethod, $methodTypes, $typeCode)
+    {
+        if ($methodTypes & $typeCode) {
+            if (!array_key_exists($pluginInstance, $this->pluginList[$this->pluginTypeMapping[$typeCode]])) {
+                $this->pluginList[$this->pluginTypeMapping[$typeCode]][$pluginInstance] = [];
+            }
+            $this->pluginList[$this->pluginTypeMapping[$typeCode]][$pluginInstance][] = $pluginMethod ;
+        }
+    }
+}