Use interface instead of classe, if it is possible (#3777)

hechoendrupal · Feb 17, 2018 · 0c47f84 · 0c47f84
1 parent 12ef535
commit 0c47f84
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/Command/Shared/ServicesTrait.php b/src/Command/Shared/ServicesTrait.php
@@ -59,6 +59,7 @@ public function buildServices($services)
         if (!empty($services)) {
             foreach ($services as $service) {
                 $class = get_class($this->container->get($service));
+                $class = $this->getInterface($class);
                 $shortClass = explode('\\', $class);
                 $machineName = str_replace('.', '_', $service);
                 $buildServices[$service] = [
@@ -73,4 +74,27 @@ public function buildServices($services)
 
         return $buildServices;
     }
+
+    /**
+     * Gets class interface.
+     *
+     * @param string $class
+     *   Class name.
+     *
+     * @return string
+     *   Interface
+     */
+    private function getInterface($class) {
+        $interfaceName = $class;
+        $interfaces = class_implements($class);
+        if (!empty($interfaces)) {
+            if (count($interfaces) == 1) {
+                $interfaceName = array_shift($interfaces);
+            } elseif ($key = array_search($class . 'Interface', $interfaces)) {
+                $interfaceName = $interfaces[$key];
+            }
+        }
+
+        return $interfaceName;
+    }
 }
diff --git a/templates/module/src/TwigExtension/twig-extension.php.twig b/templates/module/src/TwigExtension/twig-extension.php.twig
@@ -24,7 +24,7 @@ class {{ class }} extends \Twig_Extension {% endblock %}
    /**
     * {{ service.class }} definition.
     *
-    * @var \{{ service.class }}
+    * @var {{ service.short }}
     */
     protected ${{service.camel_case_name}};
     {% endfor %}