Merge pull request #44 from facile-it/feature/phpunit7

PhpUnit 7 integration and drop support for php70

Author: xzhayon

.travis.yml

@@ -6,13 +6,12 @@ cache:
 
 matrix:
   include:
-    - php: 7.0
-      env: 
+    - php: 7.1
+      env:
         - DEPS="low"
-    - php: 7.0
-      env: 
+    - php: 7.2
+      env:
         - TEST_COVERAGE=true
-    - php: 7.1
     - php: nightly
   fast_finish: true
   allow_failures: 

composer.json

@@ -37,7 +37,8 @@
       "src/Plugin/PHPUnit/PHPUnitPlugin.php",
       "src/Plugin/PHPUnit/moka.php",
       "src/Plugin/Prophecy/ProphecyPlugin.php",
-      "src/Plugin/Prophecy/moka.php"
+      "src/Plugin/Prophecy/moka.php",
+      "src/functions.php"
     ]
   },
   "autoload-dev": {
@@ -46,18 +47,18 @@
     }
   },
   "require": {
-    "php": ">=7.0",
+    "php": ">=7.1",
     "phpcollection/phpcollection": "^0.5",
-    "phpunit/phpunit-mock-objects": "^5.0",
+    "phpunit/phpunit-mock-objects": "^6.0",
     "psr/container": "^1.0"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^2.3",
     "mockery/mockery": "^0.9.9",
     "phake/phake": "^3.0",
     "phpspec/prophecy": "^1.7",
-    "phpunit/phpunit": "^6.0",
-    "sebastian/diff": "^2.0"
+    "phpunit/phpunit": "^7.0",
+    "sebastian/diff": "^3.0"
   },
   "suggest": {
     "phpspec/prophecy": "To allow loading of ProphecyPlugin",

src/Builder/ProxyBuilder.php

@@ -40,7 +40,7 @@ public function __construct(MockingStrategyInterface $mockingStrategy)
     /**
      * @return void
      */
-    public function reset()
+    public function reset(): void
     {
         $this->container = new ProxyContainer();
     }
@@ -52,6 +52,8 @@ public function reset()
      *
      * @throws MockNotCreatedException
      * @throws InvalidIdentifierException
+     * @throws InvalidArgumentException
+     * @throws \ReflectionException
      */
     public function getProxy(string $fqcnOrAlias, string $alias = null): ProxyInterface
     {
@@ -74,6 +76,7 @@ public function getProxy(string $fqcnOrAlias, string $alias = null): ProxyInterf
      * @param string $fqcn
      * @return ProxyInterface
      *
+     * @throws \ReflectionException
      * @throws InvalidArgumentException
      * @throws MockNotCreatedException
      */

src/Factory/ProxyBuilderFactory.php

@@ -37,7 +37,7 @@ public static function get(MockingStrategyInterface $mockingStrategy): ProxyBuil
      */
     private static function key(MockingStrategyInterface $mockingStrategy): string
     {
-        return get_class($mockingStrategy);
+        return \get_class($mockingStrategy);
     }
 
     /**
@@ -52,7 +52,7 @@ protected static function build(MockingStrategyInterface $mockingStrategy): Prox
     /**
      * @return void
      */
-    public static function reset()
+    public static function reset(): void
     {
         foreach (self::$mockBuilders as $mockBuilder) {
             $mockBuilder->reset();

src/Factory/ProxyGeneratorFactory.php

@@ -37,7 +37,7 @@ public static function get(MockingStrategyInterface $mockingStrategy): ProxyGene
      */
     private static function key(MockingStrategyInterface $mockingStrategy): string
     {
-        return get_class($mockingStrategy);
+        return \get_class($mockingStrategy);
     }
 
     /**

src/Factory/StubFactory.php

@@ -0,0 +1,21 @@
+<?php
+declare(strict_types=1);
+
+namespace Moka\Factory;
+
+use Moka\Stub\MethodStub;
+use Moka\Stub\PropertyStub;
+use Moka\Stub\StubInterface;
+use function Moka\Stub\Helper\isPropertyName;
+
+/**
+ * @param string $name
+ * @param mixed $value
+ * @return StubInterface
+ */
+function buildStub(string $name, $value): StubInterface
+{
+    return isPropertyName($name)
+        ? new PropertyStub($name, $value)
+        : new MethodStub($name, $value);
+}

src/Factory/buildStub.php

@@ -0,0 +1,30 @@
+<?php
+declare(strict_types=1);
+
+namespace Moka\Factory;
+
+use Moka\Exception\InvalidArgumentException;
+use Moka\Stub\StubInterface;
+use Moka\Stub\StubSet;
+
+/**
+ * @param array $namesWithValues
+ * @return StubSet|StubInterface[]
+ *
+ * @throws InvalidArgumentException
+ */
+function buildStubs(array $namesWithValues): StubSet
+{
+    $stubSet = new StubSet();
+    foreach ($namesWithValues as $name => $value) {
+        try {
+            $stub = buildStub($name, $value);
+        } catch (\Error $error) {
+            throw new InvalidArgumentException($error->getMessage());
+        }
+
+        $stubSet->add($stub);
+    }
+
+    return $stubSet;
+}

src/Factory/buildStubs.php

@@ -36,11 +36,12 @@ public function __construct(MockingStrategyInterface $mockingStrategy)
      *
      * @throws MockNotCreatedException
      * @throws InvalidArgumentException
+     * @throws \ReflectionException
      */
     public function get(string $fqcn): ProxyInterface
     {
         $mock = $this->mockingStrategy->build($fqcn);
-        $mockFQCN = get_class($this->mockingStrategy->get($mock));
+        $mockFQCN = \get_class($this->mockingStrategy->get($mock));
         $mockClass = new \ReflectionClass($mockFQCN);
 
         $proxyCode = ClassTemplate::generate($mockClass);
@@ -54,6 +55,7 @@ public function get(string $fqcn): ProxyInterface
     /**
      * @param string $proxyFQCN
      * @return ProxyInterface|ProxyTrait
+     * @throws \ReflectionException
      */
     protected function getInstance(string $proxyFQCN): ProxyInterface
     {

src/Generator/ProxyGenerator.php

@@ -3,6 +3,7 @@
 
 namespace Moka\Generator\Template;
 
+use Moka\Exception\InvalidArgumentException;
 use Moka\Proxy\ProxyInterface;
 use Moka\Proxy\ProxyTrait;
 
@@ -12,11 +13,11 @@
  */
 class ClassTemplate implements TemplateInterface
 {
-    const UNSAFE_METHODS = ['__construct', '__destruct', '__call', '__get', '__clone'];
+    private const UNSAFE_METHODS = ['__construct', '__destruct', '__call', '__get', '__clone'];
 
-    const TEMPLATE_FQCN = 'Moka_%s_%s';
+    private const TEMPLATE_FQCN = 'Moka_%s_%s';
 
-    const TEMPLATE_CLASS = '
+    private const TEMPLATE_CLASS = '
     class %s extends %s implements %s
     {
         use %s;
@@ -45,7 +46,7 @@ public function __get(%s $name)
     ';
 
     /**
-     * @param \ReflectionClass $class
+     * @param \Reflector|\ReflectionClass $class
      * @return string
      */
     public static function generate(\Reflector $class): string
@@ -56,6 +57,8 @@ public static function generate(\Reflector $class): string
     /**
      * @param \ReflectionClass $class
      * @return string
+     * @throws \RuntimeException
+     * @throws InvalidArgumentException
      */
     protected static function doGenerate(\ReflectionClass $class): string
     {
@@ -82,7 +85,7 @@ protected static function doGenerate(\ReflectionClass $class): string
         foreach ($methods as $method) {
             if (
                 !$method->isFinal() &&
-                !in_array($method->name, self::UNSAFE_METHODS, true)
+                !\in_array($method->name, self::UNSAFE_METHODS, $strict = true)
             ) {
                 $methodsCode[] = MethodTemplate::generate($method);
             }
@@ -106,7 +109,7 @@ protected static function doGenerate(\ReflectionClass $class): string
             random_int($min = 0, $max = PHP_INT_MAX)
         );
 
-        list($callNameType, $callArgumentsType) = $callParametersTypes;
+        [$callNameType, $callArgumentsType] = $callParametersTypes;
 
         return sprintf(
             self::TEMPLATE_CLASS,