Ensure - interface propagation

Author: pdaw

src/Aspect/PostconditionCheckerAspect.php

@@ -14,7 +14,7 @@
 use Go\Aop\Aspect;
 use Go\Aop\Intercept\MethodInvocation;
 use PhpDeal\Annotation\Ensure;
-use PhpDeal\Contract\Fetcher\ParentClass\MethodConditionFetcher;
+use PhpDeal\Contract\Fetcher\Parent\MethodConditionFetcher;
 use PhpDeal\Exception\ContractViolation;
 use Go\Lang\Annotation\Around;
 

src/Contract/Fetcher/ParentClass/AbstractFetcher.php src/Contract/Fetcher/Parent/AbstractFetcher.php

@@ -8,7 +8,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace PhpDeal\Contract\Fetcher\ParentClass;
+namespace PhpDeal\Contract\Fetcher\Parent;
 
 use Doctrine\Common\Annotations\Reader;
 

src/Contract/Fetcher/ParentClass/MethodConditionFetcher.php src/Contract/Fetcher/Parent/MethodConditionFetcher.php

@@ -8,7 +8,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace PhpDeal\Contract\Fetcher\ParentClass;
+namespace PhpDeal\Contract\Fetcher\Parent;
 
 use ReflectionClass;
 
@@ -26,9 +26,9 @@ public function getConditions(ReflectionClass $class, $methodName)
     {
         $annotations   = [];
         $parentMethods = [];
-        while (($class = $class->getParentClass()) && $class->hasMethod($methodName)) {
-            $parentMethods[] = $class->getMethod($methodName);
-        }
+
+        $this->getParentClassMethods($class, $methodName, $parentMethods);
+        $this->getInterfacesMethods($class, $methodName, $parentMethods);
 
         foreach ($parentMethods as $parentMethod) {
             $annotations = array_merge($annotations, $this->annotationReader->getMethodAnnotations($parentMethod));
@@ -37,4 +37,32 @@ public function getConditions(ReflectionClass $class, $methodName)
 
         return $contracts;
     }
+
+    /**
+     * @param ReflectionClass $class
+     * @param string $methodName
+     * @param array $parentMethods
+     */
+    private function getParentClassMethods(ReflectionClass $class, $methodName, &$parentMethods)
+    {
+        while (($class = $class->getParentClass()) && $class->hasMethod($methodName)) {
+            $parentMethods[] = $class->getMethod($methodName);
+        }
+    }
+
+    /**
+     * @param ReflectionClass $class
+     * @param string $methodName
+     * @param array $parentMethods
+     */
+    private function getInterfacesMethods(ReflectionClass $class, $methodName, &$parentMethods)
+    {
+        $interfaces = $class->getInterfaces();
+
+        foreach ($interfaces as $interface) {
+            if ($interface->hasMethod($methodName)) {
+                $parentMethods[] = $interface->getMethod($methodName);
+            }
+        }
+    }
 }

tests/Functional/Ensure/Propagation/ContractTest.php tests/Functional/Ensure/ClassPropagation/ContractTest.php

@@ -8,7 +8,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace PhpDeal\Functional\Ensure\Propagation;
+namespace PhpDeal\Functional\Ensure\ClassPropagation;
 
 /**
  * @group propagation

tests/Functional/Ensure/Propagation/Stub.php tests/Functional/Ensure/ClassPropagation/Stub.php

@@ -8,7 +8,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace PhpDeal\Functional\Ensure\Propagation;
+namespace PhpDeal\Functional\Ensure\ClassPropagation;
 
 use PhpDeal\Annotation as Contract;
 

tests/Functional/Ensure/Propagation/StubGrandparent.php tests/Functional/Ensure/ClassPropagation/StubGrandparent.php

@@ -8,7 +8,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace PhpDeal\Functional\Ensure\Propagation;
+namespace PhpDeal\Functional\Ensure\ClassPropagation;
 
 use PhpDeal\Annotation as Contract;
 

tests/Functional/Ensure/Propagation/StubParent.php tests/Functional/Ensure/ClassPropagation/StubParent.php

@@ -8,7 +8,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace PhpDeal\Functional\Ensure\Propagation;
+namespace PhpDeal\Functional\Ensure\ClassPropagation;
 
 use PhpDeal\Annotation as Contract;
 

tests/Functional/Ensure/InterfacePropagation/ContractTest.php

@@ -0,0 +1,80 @@
+<?php
+/**
+ * PHP Deal framework
+ *
+ * @copyright Copyright 2014, Lisachenko Alexander <[email protected]>
+ *
+ * This source file is subject to the license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace PhpDeal\Functional\Ensure\InterfacePropagation;
+
+/**
+ * @group propagation
+ */
+class ContractTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Stub
+     */
+    private $stub;
+
+    public function setUp()
+    {
+        parent::setUp();
+        $this->stub = new Stub();
+    }
+
+    public function tearDown()
+    {
+        unset($this->stub);
+        parent::tearDown();
+    }
+
+    public function providerEnsureValid()
+    {
+        return [
+            [
+                'variable' => 50,
+            ]
+        ];
+    }
+
+    /**
+     * @param int $variable
+     * @dataProvider providerEnsureValid
+     */
+    public function testEnsureValid($variable)
+    {
+        $this->stub->add($variable);
+    }
+
+    public function providerEnsureInvalid()
+    {
+        return [
+            [
+                // invalid for Stub
+                'variable' => 0
+            ],
+            [
+                // invalid for StubInterfaceA
+                'variable' => -1
+            ],
+            [
+                // invalid for StubInterfaceB
+                'variable' => -2
+            ],
+        ];
+    }
+
+    /**
+     * @param int $variable
+     * @dataProvider providerEnsureInvalid
+     * @expectedException \PhpDeal\Exception\ContractViolation
+     */
+    public function testEnsureInvalid($variable)
+    {
+        $this->stub->add($variable);
+    }
+}

tests/Functional/Ensure/InterfacePropagation/Stub.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * PHP Deal framework
+ *
+ * @copyright Copyright 2014, Lisachenko Alexander <[email protected]>
+ *
+ * This source file is subject to the license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace PhpDeal\Functional\Ensure\InterfacePropagation;
+
+use PhpDeal\Annotation as Contract;
+
+class Stub implements StubInterfaceA, StubInterfaceB
+{
+    /**
+     * @var int
+     */
+    private $value;
+
+    /**
+     * @Contract\Ensure("$this->value !== 0")
+     * @param int $variable
+     */
+    public function add($variable)
+    {
+        $this->value += $variable;
+    }
+}

tests/Functional/Ensure/InterfacePropagation/StubInterfaceA.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * PHP Deal framework
+ *
+ * @copyright Copyright 2014, Lisachenko Alexander <[email protected]>
+ *
+ * This source file is subject to the license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace PhpDeal\Functional\Ensure\InterfacePropagation;
+
+use PhpDeal\Annotation as Contract;
+
+interface StubInterfaceA
+{
+    /**
+     * @Contract\Ensure("$this->value !== -1")
+     * @param int $variable
+     */
+    public function add($variable);
+}

tests/Functional/Ensure/InterfacePropagation/StubInterfaceB.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * PHP Deal framework
+ *
+ * @copyright Copyright 2014, Lisachenko Alexander <[email protected]>
+ *
+ * This source file is subject to the license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace PhpDeal\Functional\Ensure\InterfacePropagation;
+
+use PhpDeal\Annotation as Contract;
+
+interface StubInterfaceB
+{
+    /**
+     * @Contract\Ensure("$this->value !== -2")
+     * @param int $variable
+     */
+    public function add($variable);
+}