Merge pull request #12 from pdaw/master

Little performance enhancement

Author: lisachenko

src/Contract/InvariantContract.php

@@ -10,6 +10,7 @@
 
 namespace PhpDeal\Contract;
 
+use Doctrine\Common\Annotations\Reader;
 use Go\Aop\Intercept\MethodInvocation;
 use PhpDeal\Contract\Fetcher\ParentClass\InvariantFetcher;
 use PhpDeal\Exception\ContractViolation;
@@ -18,6 +19,17 @@
 
 class InvariantContract extends Contract
 {
+    /**
+     * @var InvariantFetcher
+     */
+    private $invariantFetcher;
+
+    public function __construct(Reader $reader)
+    {
+        parent::__construct($reader);
+        $this->invariantFetcher = new InvariantFetcher(Invariant::class);
+    }
+
     /**
      * Verifies invariants for contract class
      *
@@ -66,7 +78,7 @@ private function fetchAllContracts(ReflectionClass $class)
      */
     private function fetchParentsContracts(ReflectionClass $class)
     {
-        return (new InvariantFetcher(Invariant::class))->getConditions(
+        return $this->invariantFetcher->getConditions(
             $class,
             $this->reader
         );

src/Contract/PostconditionContract.php

@@ -10,13 +10,25 @@
 
 namespace PhpDeal\Contract;
 
+use Doctrine\Common\Annotations\Reader;
 use Go\Aop\Intercept\MethodInvocation;
 use PhpDeal\Contract\Fetcher\ParentClass\MethodConditionFetcher;
 use PhpDeal\Exception\ContractViolation;
 use PhpDeal\Annotation\Ensure;
 
 class PostconditionContract extends Contract
 {
+    /**
+     * @var MethodConditionFetcher
+     */
+    private $methodConditionFetcher;
+
+    public function __construct(Reader $reader)
+    {
+        parent::__construct($reader);
+        $this->methodConditionFetcher = new MethodConditionFetcher(Ensure::class);
+    }
+
     /**
      * @param MethodInvocation $invocation
      * @throws ContractViolation
@@ -62,7 +74,7 @@ private function fetchAllContracts(MethodInvocation $invocation)
      */
     private function fetchParentsContracts(MethodInvocation $invocation)
     {
-        return (new MethodConditionFetcher(Ensure::class))->getConditions(
+        return $this->methodConditionFetcher->getConditions(
             $invocation->getMethod()->getDeclaringClass(),
             $this->reader,
             $invocation->getMethod()->name

src/Contract/PreconditionContract.php

@@ -10,13 +10,25 @@
 
 namespace PhpDeal\Contract;
 
+use Doctrine\Common\Annotations\Reader;
 use Go\Aop\Intercept\MethodInvocation;
 use PhpDeal\Contract\Fetcher\ParentClass\MethodConditionWithInheritDocFetcher;
 use PhpDeal\Exception\ContractViolation;
 use PhpDeal\Annotation\Verify;
 
 class PreconditionContract extends Contract
 {
+    /**
+     * @var MethodConditionWithInheritDocFetcher
+     */
+    private $methodConditionFetcher;
+
+    public function __construct(Reader $reader)
+    {
+        parent::__construct($reader);
+        $this->methodConditionFetcher = new MethodConditionWithInheritDocFetcher(Verify::class);
+    }
+
     /**
      * @param MethodInvocation $invocation
      * @Before("@execution(PhpDeal\Annotation\Verify)")
@@ -55,7 +67,7 @@ private function fetchAllContracts(MethodInvocation $invocation)
      */
     private function fetchParentsContracts(MethodInvocation $invocation)
     {
-        return (new MethodConditionWithInheritDocFetcher(Verify::class))->getConditions(
+        return $this->methodConditionFetcher->getConditions(
             $invocation->getMethod()->getDeclaringClass(),
             $this->reader,
             $invocation->getMethod()->name