Merge branch 'niconoe--fix-undefined-mi-on-interfaces'

phpmetrics · Apr 10, 2017 · d7599aa · d7599aa
2 parents 3d4627d + c849ab9
commit d7599aa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/src/Hal/Metric/Consolidated.php b/src/Hal/Metric/Consolidated.php
@@ -43,20 +43,17 @@ public function __construct(Metrics $metrics)
         $project = [];
         $nbInterfaces = 0;
         foreach ($metrics->all() as $key => $item) {
-            if ($item instanceof ClassMetric) {
-                $classes[] = $item->all();;
-            }
-            if ($item instanceof InterfaceMetric) {
+            $classItem = get_class($item);
+            if (ClassMetric::class === $classItem) {
+                $classes[] = $item->all();
+            } elseif (InterfaceMetric::class === $classItem) {
                 $nbInterfaces++;
-            }
-            if ($item instanceof FunctionMetric) {
-                $functions[$key] = $item->all();;
-            }
-            if ($item instanceof FileMetric) {
-                $files[$key] = $item->all();;
-            }
-            if ($item instanceof ProjectMetric) {
-                $project[$key] = $item->all();;
+            } elseif (FunctionMetric::class === $classItem) {
+                $functions[$key] = $item->all();
+            } elseif (FileMetric::class === $classItem) {
+                $files[$key] = $item->all();
+            } elseif (ProjectMetric::class === $classItem) {
+                $project[$key] = $item->all();
             }
         }
 
@@ -82,7 +79,6 @@ public function __construct(Metrics $metrics)
             'afferentCoupling' => [],
             'efferentCoupling' => [],
             'difficulty' => [],
-            'lcom' => [],
             'mi' => [],
         ];
 
@@ -96,7 +92,7 @@ public function __construct(Metrics $metrics)
                 array_push($avg->$k, $item->get($k));
             }
         }
-        $sum->nbClasses = sizeof($classes) - $nbInterfaces;
+        $sum->nbClasses = count($classes);
         $sum->nbInterfaces = $nbInterfaces;
 
         foreach ($avg as &$a) {

diff --git a/src/Hal/Metric/Metrics.php b/src/Hal/Metric/Metrics.php
@@ -42,7 +42,7 @@ public function has($key)
     }
 
     /**
-     * @return array
+     * @return Metric[]
      */
     public function all()
     {