Merge pull request #49 from facile-it/feature/php74

PHP 7.4 support

Author: xzhayon

.travis.yml

@@ -9,20 +9,22 @@ matrix:
     - php: 7.1
       env:
         - DEPS_LOWEST=1
-    - php: 7.2
+    - php: 7.4
       env:
         - COVERAGE=1
+        - PHPSTAN=1
     - php: nightly
   fast_finish: true
   allow_failures:
     - php: nightly
 
 install:
-  - phpenv config-rm xdebug.ini
+  - phpenv config-rm xdebug.ini || true
   - if [[ ${DEPS_LOWEST} == 1 ]]; then composer update --prefer-dist --prefer-stable --prefer-lowest --no-interaction; fi
   - if [[ ${DEPS_LOWEST} != 1 ]]; then composer update --prefer-source --no-interaction; fi
 
 script:
+  - if [[ ${PHPSTAN} == 1 ]]; then ./vendor/bin/phpstan analyse --level 1 ./src/ ./tests/; fi
   - if [[ ${COVERAGE} == 1 ]]; then phpdbg -qrr ./vendor/bin/phpunit --coverage-clover ./build/logs/clover.xml; else ./vendor/bin/phpunit; fi
 
 after_success:

README.md

@@ -34,7 +34,7 @@ class FooTest extends \AnyTestCase
 {
     private $foo;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         Moka::clean();
 
@@ -73,7 +73,7 @@ class FooTest extends TestCase
 {
     use MokaCleanerTrait;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         // No call to Moka::clean() needed.
 

composer.json

@@ -47,16 +47,16 @@
     }
   },
   "require": {
-    "php": ">=7.1",
+    "php": "^7.1",
     "phpcollection/phpcollection": "^0.5",
     "phpunit/phpunit": "^7.0",
     "psr/container": "^1.0"
   },
   "require-dev": {
-    "friendsofphp/php-cs-fixer": "^2.3",
+    "friendsofphp/php-cs-fixer": "^2.16",
     "mockery/mockery": "^1.0",
     "phake/phake": "^3.0",
-    "phpspec/prophecy": "^1.0",
+    "phpspec/prophecy": "^1.7",
     "phpstan/phpstan": "^0.12.8"
   },
   "suggest": {

src/Tests/MokaMockingStrategyTestCase.php

@@ -32,7 +32,7 @@ abstract class MokaMockingStrategyTestCase extends TestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->namesWithValues = [
             '$property' => mt_rand(),

tests/Builder/ProxyBuilderTest.php

@@ -63,7 +63,7 @@ public function testGetProxySuccessWithSameAliasOnly()
         $this->assertSame($proxy, $this->proxyBuilder->getProxy('bar'));
     }
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->mockingStrategy = $this->getMockBuilder(MockingStrategyInterface::class)
             ->disableOriginalConstructor()

tests/Generator/ProxyGeneratorTest.php

@@ -17,7 +17,7 @@ class ProxyGeneratorTest extends TestCase
      */
     private $proxyGenerator;
 
-    public function setUp()
+    public function setUp(): void
     {
         $mock = $this->getMockBuilder(FooTestClass::class)
             ->disableOriginalConstructor()

tests/MokaTest.php

@@ -32,13 +32,6 @@ public function testCallStaticSuccess()
         }
     }
 
-    public function testCallStaticFailure()
-    {
-        $this->expectException(NotImplementedException::class);
-
-        Moka::foo(\stdClass::class);
-    }
-
     public function testPHPUnitExpectation()
     {
         /** @var ProxyTrait $proxy */

tests/Plugin/Phake/Matcher/FirstStubMatcherTest.php

@@ -25,7 +25,7 @@ class FirstStubMatcherTest extends TestCase
      */
     private $arguments = [];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->mock = $this->getMockBuilder(PhakeMock::class)
             ->disableOriginalConstructor()

tests/Proxy/ProxyContainerTest.php

@@ -20,7 +20,7 @@ class ProxyContainerTest extends TestCase
      */
     private $proxy;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->proxyContainer = new ProxyContainer();
         /** @var ProxyInterface $proxy */

tests/Proxy/ProxyTraitTest.php

@@ -26,7 +26,7 @@ class ProxyTraitTest extends TestCase
      */
     private $mock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->proxy = new TestProxy();
 

tests/Stub/StubSetTest.php

@@ -15,7 +15,7 @@ class StubSetTest extends TestCase
      */
     private $set;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->set = new StubSet();
     }