Merge pull request #2 from ekvedaras/analysis-qyjZRG

Apply fixes from StyleCI
ekvedaras · Aug 12, 2018 · aba5d52 · aba5d52
2 parents d2919a6 + 5d48fb0
commit aba5d52
Show file tree

Hide file tree

Showing 16 changed files with 98 additions and 130 deletions.
diff --git a/src/Exceptions/MockInjectionException.php b/src/Exceptions/MockInjectionException.php
@@ -4,12 +4,10 @@
 
 namespace Ekvedaras\LaravelTestHelpers\Exceptions;
 
-
 use Exception;
 
 /**
- * Class MockInjectionException
- * @package Ekvedaras\LaravelTestHelpers\Exceptions
+ * Class MockInjectionException.
  */
 class MockInjectionException extends Exception
 {
@@ -20,4 +18,4 @@ public static function injectorNotGiven(): self
     {
         return new static('Injector class must be specified when using "onlyForInjector"');
     }
-}
+}
diff --git a/src/Helpers/TestHelpersMock.php b/src/Helpers/TestHelpersMock.php
@@ -5,8 +5,7 @@
 namespace Ekvedaras\LaravelTestHelpers\Helpers;
 
 /**
- * Class TestHelpersMock
- * @package Ekvedaras\LaravelTestHelpers\Helpers
+ * Class TestHelpersMock.
  * @method PHPUnit\Framework\MockObject\Builder\InvocationMocker method($constraint)
  */
 class TestHelpersMock implements \PHPUnit_Framework_MockObject_MockObject
@@ -91,8 +90,7 @@ public function consecutive(
         int $times,
         string $method,
         ...$vars
-    ): \PHPUnit\Framework\MockObject\Builder\InvocationMocker
-    {
+    ): \PHPUnit\Framework\MockObject\Builder\InvocationMocker {
         return $this->getMock()
             ->expects(\PHPUnit\Framework\TestCase::exactly($times))
             ->method($method)
@@ -118,8 +116,7 @@ public function fail(
         string $method,
         \Exception $exception,
         ...$vars
-    ): \PHPUnit\Framework\MockObject\Builder\InvocationMocker
-    {
+    ): \PHPUnit\Framework\MockObject\Builder\InvocationMocker {
         return $this->any($method, ...$vars)->willThrowException($exception);
     }
-}
+}
diff --git a/src/Traits/Helpers/BuildsMocks.php b/src/Traits/Helpers/BuildsMocks.php
@@ -4,21 +4,20 @@
 
 namespace Ekvedaras\LaravelTestHelpers\Traits\Helpers;
 
-use Ekvedaras\LaravelTestHelpers\Exceptions\MockInjectionException;
-use Ekvedaras\LaravelTestHelpers\Helpers\TestHelpersMock;
-use Illuminate\Foundation\Application;
 use Mockery;
+use ReflectionClass;
+use ReflectionException;
 use Mockery\Instantiator;
 use Mockery\MockInterface;
-use PHPUnit\Framework\MockObject\MockBuilder;
+use Illuminate\Foundation\Application;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit_Framework_MockObject_MockObject;
-use ReflectionClass;
-use ReflectionException;
+use PHPUnit\Framework\MockObject\MockBuilder;
+use Ekvedaras\LaravelTestHelpers\Helpers\TestHelpersMock;
+use Ekvedaras\LaravelTestHelpers\Exceptions\MockInjectionException;
 
 /**
- * Trait BuildsMocks
- * @package Ekvedaras\LaravelTestHelpers\Helpers
+ * Trait BuildsMocks.
  *
  * @property-read Application $app
  * @method MockBuilder getMockBuilder(string $mockClass)
@@ -39,8 +38,7 @@ protected function mock(
         $methods = false,
         array $constructorArgs = null,
         bool $onlyForInjector = false
-    ): PHPUnit_Framework_MockObject_MockObject
-    {
+    ): PHPUnit_Framework_MockObject_MockObject {
         $this->forgetInstances($mockClass, $injectorClass);
         $mock = $this->createPHPUnitMock($mockClass, $constructorArgs, $methods);
         $this->injectMockToLaravel($mockClass, $mock, $onlyForInjector, $injectorClass);
@@ -58,8 +56,7 @@ protected function mockery(
         string $mockClass,
         string $injectorClass = null,
         bool $onlyForInjector = false
-    ): MockInterface
-    {
+    ): MockInterface {
         $this->forgetInstances($mockClass, $injectorClass);
         $mock = Mockery::mock($mockClass);
         $this->injectMockToLaravel($mockClass, $mock, $onlyForInjector, $injectorClass);
@@ -77,8 +74,7 @@ protected function spy(
         string $mockClass,
         string $injectorClass = null,
         bool $onlyForInjector = false
-    ): MockInterface
-    {
+    ): MockInterface {
         $this->forgetInstances($mockClass, $injectorClass);
         $mock = Mockery::spy($mockClass);
         $this->injectMockToLaravel($mockClass, $mock, $onlyForInjector, $injectorClass);
@@ -110,8 +106,7 @@ private function createPHPUnitMock(
         string $mockClass,
         array $constructorArgs = null,
         $methods = false
-    ): PHPUnit_Framework_MockObject_MockObject
-    {
+    ): PHPUnit_Framework_MockObject_MockObject {
         $builder = $this->getMockBuilder($mockClass);
 
         if (isset($constructorArgs)) {
@@ -127,9 +122,9 @@ private function createPHPUnitMock(
         $mock = $builder->getMock();
         $mockedClass = get_class($mock);
         $helperClass = $this->getClassShortName(TestHelpersMock::class);
-        $wrapperClass = $helperClass . '_' . $mockedClass . '_' . str_random();
+        $wrapperClass = $helperClass.'_'.$mockedClass.'_'.str_random();
 
-        $template = file_get_contents(__DIR__ . '/../../Helpers/TestHelpersMock.php');
+        $template = file_get_contents(__DIR__.'/../../Helpers/TestHelpersMock.php');
         $template = str_replace("class $helperClass", "class $wrapperClass extends $mockedClass", $template);
         $template = substr($template, strpos($template, "class $wrapperClass"));
 
@@ -138,8 +133,8 @@ private function createPHPUnitMock(
             $wrapperClass,
             $mock,
             $mockClass,
-            !is_null($constructorArgs),
-            (array)$constructorArgs
+            ! is_null($constructorArgs),
+            (array) $constructorArgs
         );
     }
 
@@ -162,16 +157,15 @@ private function getObject(
         $proxyTarget,
         string $type = '',
         bool $callOriginalConstructor = false,
-        array $arguments = [ ],
+        array $arguments = [],
         bool $callAutoload = false,
         bool $returnValueGeneration = true
-    )
-    {
+    ) {
         $this->evalClass($code, $className);
 
         if ($callOriginalConstructor &&
             is_string($type) &&
-            !interface_exists($type, $callAutoload)) {
+            ! interface_exists($type, $callAutoload)) {
             if (count($arguments) === 0) {
                 $object = new $className;
             } else {
@@ -198,7 +192,7 @@ private function getObject(
      */
     private function evalClass(string $code, string $className): void
     {
-        if (!class_exists($className, false)) {
+        if (! class_exists($className, false)) {
             eval($code);
         }
     }
@@ -215,14 +209,13 @@ private function injectMockToLaravel(
         $mock,
         bool $onlyForInjector = false,
         string $injectorClass = null
-    ): void
-    {
+    ): void {
         if ($onlyForInjector) {
-            if (!isset($injectorClass)) {
+            if (! isset($injectorClass)) {
                 throw MockInjectionException::injectorNotGiven();
             }
 
-            $this->app->when($injectorClass)->needs($mockClass)->give(function() use ($mock) {
+            $this->app->when($injectorClass)->needs($mockClass)->give(function () use ($mock) {
                 return $mock;
             });
         } else {
@@ -238,4 +231,4 @@ private function getClassShortName(string $class): string
     {
         return substr(strrchr($class, '\\'), 1);
     }
-}
+}
diff --git a/src/Traits/Helpers/ChecksSingletons.php b/src/Traits/Helpers/ChecksSingletons.php
@@ -7,8 +7,7 @@
 use Illuminate\Foundation\Application;
 
 /**
- * Trait ChecksSingletons
- * @package Ekvedaras\LaravelTestHelpers\Helpers
+ * Trait ChecksSingletons.
  *
  * @property-read Application $app
  * @method void assertSame($expected, $actual, $message = '')
@@ -23,7 +22,7 @@ protected function assertSingleton(string $class): void
         $this->assertSame(
             $this->app->make($class),
             $this->app->make($class),
-            $class . ' must be registered as singleton'
+            $class.' must be registered as singleton'
         );
     }
-}
+}
diff --git a/src/Traits/Helpers/TestsCommands.php b/src/Traits/Helpers/TestsCommands.php
@@ -9,8 +9,7 @@
 use Symfony\Component\Console\Tester\CommandTester;
 
 /**
- * Trait TestsCommands
- * @package Ekvedaras\LaravelTestHelpers\Helpers
+ * Trait TestsCommands.
  *
  * @property-read Application $app
  */
@@ -28,4 +27,4 @@ protected function getCommandTester(string $commandClass): CommandTester
 
         return new CommandTester($command);
     }
-}
+}
diff --git a/src/Traits/PortToMock.php b/src/Traits/PortToMock.php
@@ -4,12 +4,11 @@
 
 namespace Ekvedaras\LaravelTestHelpers\Traits;
 
-use PHPUnit\Framework\MockObject\Matcher\Invocation;
 use PHPUnit_Framework_MockObject_MockObject;
+use PHPUnit\Framework\MockObject\Matcher\Invocation;
 
 /**
- * Trait PortToMock
- * @package Ekvedaras\LaravelTestHelpers\Traits
+ * Trait PortToMock.
  */
 trait PortToMock
 {
@@ -19,40 +18,41 @@ trait PortToMock
     abstract public function getMock(): PHPUnit_Framework_MockObject_MockObject;
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function expects(Invocation $matcher)
     {
         return $this->getMock()->expects($matcher);
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function __phpunit_setOriginalObject($originalObject)
     {
         $this->mock = $originalObject;
+
         return $this->getMock();
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function __phpunit_getInvocationMocker()
     {
         return $this->getMock()->__phpunit_getInvocationMocker();
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function __phpunit_verify()
     {
         return $this->getMock()->__phpunit_verify();
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function __phpunit_hasMatchers()
     {
@@ -67,4 +67,4 @@ public function __phpunit_setReturnValueGeneration(bool $returnValueGeneration)
     {
         return $this->getMock()->__phpunit_setReturnValueGeneration($returnValueGeneration);
     }
-}
+}
diff --git a/src/Traits/TestHelpers.php b/src/Traits/TestHelpers.php
@@ -5,16 +5,15 @@
 namespace Ekvedaras\LaravelTestHelpers\Traits;
 
 use Ekvedaras\LaravelTestHelpers\Traits\Helpers\BuildsMocks;
-use Ekvedaras\LaravelTestHelpers\Traits\Helpers\ChecksSingletons;
 use Ekvedaras\LaravelTestHelpers\Traits\Helpers\TestsCommands;
+use Ekvedaras\LaravelTestHelpers\Traits\Helpers\ChecksSingletons;
 
 /**
- * Trait TestingHelpers
- * @package Ekvedaras\LaravelTestHelpers\Traits
+ * Trait TestingHelpers.
  */
 trait TestHelpers
 {
     use BuildsMocks,
         ChecksSingletons,
         TestsCommands;
-}
+}
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -4,18 +4,17 @@
 
 namespace Tests;
 
-use Carbon\Carbon;
 use Exception;
+use Carbon\Carbon;
 use Orchestra\Testbench\TestCase as BaseTestCase;
 
 /**
- * Class TestCase
- * @package Tests
+ * Class TestCase.
  */
 class TestCase extends BaseTestCase
 {
     /**
-     * Set carbon date to avoid test timing issues
+     * Set carbon date to avoid test timing issues.
      * @throws Exception
      */
     protected function setUp()
@@ -24,4 +23,4 @@ protected function setUp()
 
         Carbon::setTestNow(now());
     }
-}
+}