[PHP7] cyclomatic complexity and coupling

Author: Halleck45

.gitignore

@@ -8,4 +8,4 @@ provision.sh
 Makefile
 /nbproject
 phpmetrics.yml.dist
-log
+log

src/Hal/Component/OOP/Reflected/ReflectedMethod.php

@@ -273,6 +273,16 @@ public function getDependencies()
         foreach($this->dependencies as $name) {
             array_push($dependencies, $this->nameResolver->resolve($name, null));
         }
+
+        // returned values
+        $resolver = new TypeResolver();
+        foreach($this->returns as $return) {
+            $name = $return->getType();
+            if(!$resolver->isNative($name)) {
+                array_push($dependencies, $this->nameResolver->resolve($name, null));
+            }
+        }
+
         return array_unique($dependencies);
     }
 

tests/Hal/Component/OOP/MethodExtractorTest.php

@@ -110,7 +110,6 @@ public function providesForMethodsArgs() {
 
     /**
      * @dataProvider provideCodeForReturns
-     * @group wip
      */
     public function testReturnsAreFound($expected, $code) {
         $searcher = new Searcher();

tests/Hal/Metrics/Complexity/Component/McCabe/McCabeTest.php

@@ -35,4 +35,21 @@ public function testMcCaybeResultCanBeConvertedToArray() {
 
         $this->assertArrayHasKey('cyclomaticComplexity', $array);
     }
+
+    /**
+     * @dataProvider provideCCNPHP7
+     * @group php7
+     */
+    public function testICanCountComplexityOfAnonymousClass($filename, $expectedCCN) {
+
+        $loc = new McCabe(new \Hal\Component\Token\Tokenizer());
+        $r = $loc->calculate($filename);
+        $this->assertEquals($expectedCCN, $r->getCyclomaticComplexityNumber());
+    }
+
+    public function provideCCNPHP7() {
+        return array(
+            array(__DIR__.'/../../../../../resources/mccaybe/php7-1.php', 4)
+        );
+    }
 }

tests/Hal/Metrics/Complexity/Structural/HenryAndKafura/CouplingTest.php

@@ -1,5 +1,8 @@
 <?php
 namespace Test\Hal\Metrics\Complexity\Structural\HenryAndKafura;
+use Hal\Component\OOP\Extractor\ClassMap;
+use Hal\Component\OOP\Extractor\Extractor;
+use Hal\Component\Token\Tokenizer;
 use Hal\Metrics\Complexity\Structural\HenryAndKafura\Coupling;
 
 /**
@@ -57,4 +60,18 @@ public function testICanExportCoupling() {
         );
         $this->assertEquals($expected, $this->result->get('\Ns1\Class1')->asArray());
     }
+
+    public function testCouplingTakesCareOfReturnedValues() {
+        $filename = __DIR__.'/../../../../../resources/coupling/f1.php';
+        $extractor = new Extractor(new Tokenizer());
+        $classmap = new ClassMap();
+        $classmap->push($filename, $extractor->extract($filename));
+        $coupling = new Coupling();
+        $this->result = $coupling->calculate($classmap);
+
+        $this->assertEquals(0, $this->result->get('\\ClassWhoUseAnother')->getAfferentCoupling());
+        $this->assertEquals(1, $this->result->get('\\ClassWhoUseAnother')->getEfferentCoupling());
+        $this->assertEquals(1, $this->result->get('\\ClassWhoIsUsed')->getAfferentCoupling());
+        $this->assertEquals(0, $this->result->get('\\ClassWhoIsUsed')->getEfferentCoupling());
+    }
 }

tests/resources/coupling/f1.php

@@ -0,0 +1,7 @@
+<?php
+class ClassWhoUseAnother {
+    public function demo()
+    {
+        return new ClassWhoIsUsed;
+    }
+}

tests/resources/mccaybe/php7-1.php

@@ -0,0 +1,34 @@
+<?php
+class A {
+    public function foo() {
+
+        $a = new class {
+            public function bar () {
+                if( c1() )
+                    f1();
+                else
+                    f2();
+
+                if( c2() )
+                    f3();
+                else
+                    f4();
+            }
+        }
+
+        $b = new class {
+            public function bar () {
+                if( c1() )
+                    f1();
+                else
+                    f2();
+
+                if( c2() )
+                    f3();
+                else
+                    f4();
+            }
+        }
+
+    }
+}