Align code to coding standard

facile-it · Jun 27, 2017 · 2a15c34 · 2a15c34
1 parent bd0b799
commit 2a15c34
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 56 deletions.
diff --git a/src/Moka/Factory/ProxyBuilderFactory.php b/src/Moka/Factory/ProxyBuilderFactory.php
@@ -32,13 +32,12 @@ public static function get(MockingStrategyInterface $mockingStrategy): ProxyBuil
     }
 
     /**
-     * @return void
+     * @param MockingStrategyInterface $mockingStrategy
+     * @return string
      */
-    public static function reset()
+    private static function key(MockingStrategyInterface $mockingStrategy): string
     {
-        foreach (self::$mockBuilders as $mockBuilder) {
-            $mockBuilder->reset();
-        }
+        return get_class($mockingStrategy);
     }
 
     /**
@@ -51,11 +50,12 @@ protected static function build(MockingStrategyInterface $mockingStrategy): Prox
     }
 
     /**
-     * @param MockingStrategyInterface $mockingStrategy
-     * @return string
+     * @return void
      */
-    private static function key(MockingStrategyInterface $mockingStrategy): string
+    public static function reset()
     {
-        return get_class($mockingStrategy);
+        foreach (self::$mockBuilders as $mockBuilder) {
+            $mockBuilder->reset();
+        }
     }
 }
diff --git a/src/Moka/Strategy/AbstractMockingStrategy.php b/src/Moka/Strategy/AbstractMockingStrategy.php
@@ -9,7 +9,6 @@
 use Moka\Exception\NotImplementedException;
 use Moka\Factory\StubFactory;
 use Moka\Stub\Stub;
-use Moka\Stub\StubSet;
 
 /**
  * Class AbstractMockingStrategy
@@ -62,6 +61,12 @@ public function build(string $fqcn)
         }
     }
 
+    /**
+     * @param string $fqcn
+     * @return object
+     */
+    abstract protected function doBuild(string $fqcn);
+
     /**
      * @param object $mock
      * @param array $stubs
@@ -79,40 +84,6 @@ public function decorate($mock, array $stubs)
         }
     }
 
-    /**
-     * @param object $mock
-     * @return object
-     *
-     * @throws NotImplementedException
-     * @throws InvalidArgumentException
-     */
-    public function get($mock)
-    {
-        $this->checkMockType($mock);
-
-        return $this->doGet($mock);
-    }
-
-    /**
-     * @return string
-     *
-     * @throws NotImplementedException
-     */
-    public function getMockType(): string
-    {
-        $this->verifyMockType();
-
-        return $this->mockType;
-    }
-
-    /**
-     * @param string $fqcn
-     */
-    final protected function setMockType(string $fqcn)
-    {
-        $this->mockType = $fqcn;
-    }
-
     /**
      * @param object $mock
      *
@@ -135,10 +106,16 @@ final protected function checkMockType($mock)
     }
 
     /**
-     * @param string $fqcn
-     * @return object
+     * @return void
+     *
+     * @throws NotImplementedException
      */
-    abstract protected function doBuild(string $fqcn);
+    private function verifyMockType()
+    {
+        if (!$this->mockType) {
+            throw new NotImplementedException('Mock type was not defined');
+        }
+    }
 
     /**
      * @param object $mock
@@ -147,21 +124,43 @@ abstract protected function doBuild(string $fqcn);
      */
     abstract protected function doDecorate($mock, Stub $stub);
 
+    /**
+     * @param object $mock
+     * @return object
+     *
+     * @throws NotImplementedException
+     * @throws InvalidArgumentException
+     */
+    public function get($mock)
+    {
+        $this->checkMockType($mock);
+
+        return $this->doGet($mock);
+    }
+
     /**
      * @param object $mock
      * @return object
      */
     abstract protected function doGet($mock);
 
     /**
-     * @return void
+     * @return string
      *
      * @throws NotImplementedException
      */
-    private function verifyMockType()
+    public function getMockType(): string
     {
-        if (!$this->mockType) {
-            throw new NotImplementedException('Mock type was not defined');
-        }
+        $this->verifyMockType();
+
+        return $this->mockType;
+    }
+
+    /**
+     * @param string $fqcn
+     */
+    final protected function setMockType(string $fqcn)
+    {
+        $this->mockType = $fqcn;
     }
 }
diff --git a/src/Moka/Strategy/MockingStrategyInterface.php b/src/Moka/Strategy/MockingStrategyInterface.php
@@ -6,7 +6,6 @@
 use Moka\Exception\InvalidArgumentException;
 use Moka\Exception\MockNotCreatedException;
 use Moka\Exception\NotImplementedException;
-use Moka\Stub\StubSet;
 
 /**
  * Interface MockingStrategyInterface

diff --git a/src/Moka/Tests/MokaMockingStrategyTestCase.php b/src/Moka/Tests/MokaMockingStrategyTestCase.php
@@ -4,10 +4,7 @@
 namespace Moka\Tests;
 
 use Moka\Exception\InvalidArgumentException;
-use Moka\Factory\StubFactory;
 use Moka\Strategy\MockingStrategyInterface;
-use Moka\Stub\Stub;
-use Moka\Stub\StubSet;
 use PHPUnit\Framework\TestCase;
 use Tests\AbstractTestClass;
 use Tests\BarTestClass;