Merge pull request #2 from jobcloud/feat/bump-vendor

feat: bump PHPUnit to min 6 to have compatible tests with PHP 7.2, too

.travis.yml

@@ -1,11 +1,9 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
   - 7.0
+  - 7.1
+  - 7.2
   - hhvm
 
 before_script:

README.md

@@ -11,7 +11,7 @@ A simple validator to check closure signatures.
 
 ## Requirements
 
-PHP ~5.3
+PHP ~7.0
 
 ## Installation
 
@@ -32,9 +32,11 @@ $validator = new Validator;
 
 $givenSignature = $validator->getSignatureFromClosure($closure);
 
-$wishedSignature = new Signature(array(
-    new Parameter('param1'),
-    new Parameter('param2')
+$wishedSignature = new Signature(
+    [
+        new Parameter('param1'),
+        new Parameter('param2')
+    ]
 );
 ```
 

composer.json

@@ -10,10 +10,10 @@
     }
   ],
   "require": {
-    "php": ">=5.3"
+    "php": "^7.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "~4.0"
+    "phpunit/phpunit": "^6.0"
   },
   "autoload": {
     "psr-4": { "Jobcloud\\ClosureValidator\\": "src/" }

src/Diff.php

@@ -13,18 +13,18 @@ class Diff implements ToArrayInterface
     /**
      * @var Parameter[]|array
      */
-    protected $missingParameters = array();
+    protected $missingParameters = [];
 
     /**
      * @var Parameter[]|array
      */
-    protected $additionalParameters = array();
+    protected $additionalParameters = [];
 
     /**
      * @param Parameter[]|array $missingParameters
      * @param Parameter[]|array $additionalParameters
      */
-    public function __construct(array $missingParameters = array(), array $additionalParameters = array())
+    public function __construct(array $missingParameters = [], array $additionalParameters = [])
     {
         foreach ($missingParameters as $missingParameter) {
             $this->addMissingParameter($missingParameter);
@@ -40,10 +40,10 @@ public function __construct(array $missingParameters = array(), array $additiona
      */
     public function toArray()
     {
-        return array(
+        return [
             'missingParameters' => $this->getParametersAsArray($this->missingParameters),
             'additionalParameters' => $this->getParametersAsArray($this->additionalParameters)
-        );
+        ];
     }
 
     /**
@@ -53,7 +53,7 @@ public function toArray()
      */
     protected function getParametersAsArray(array $parameters)
     {
-        $parametersAsArray = array();
+        $parametersAsArray = [];
         foreach ($parameters as $parameter) {
             $parametersAsArray[] = $parameter->toArray();
         }

src/Parameter.php

@@ -35,10 +35,10 @@ public function __construct(string $name, $type = null)
      */
     public function toArray()
     {
-        return array(
+        return [
             'name' => $this->getName(),
             'type' => $this->getType()
-        );
+        ];
     }
 
     /**

src/Signature.php

@@ -13,12 +13,12 @@ class Signature implements ToArrayInterface
     /**
      * @var Parameter[]|array
      */
-    protected $parameters = array();
+    protected $parameters = [];
 
     /**
      * @param Parameter[]|array $parameters
      */
-    public function __construct(array $parameters = array())
+    public function __construct(array $parameters = [])
     {
         foreach ($parameters as $parameter) {
             $this->addParameter($parameter);
@@ -30,14 +30,14 @@ public function __construct(array $parameters = array())
      */
     public function toArray()
     {
-        $parameters = array();
+        $parameters = [];
         foreach ($this->parameters as $parameter) {
             $parameters[] = $parameter->toArray();
         }
 
-        return array(
+        return [
             'parameters' => $parameters
-        );
+        ];
     }
 
     /**

src/Validator.php

@@ -17,7 +17,7 @@ class Validator
      */
     public function getSignatureFromClosure(\Closure $closure)
     {
-        $parameters = array();
+        $parameters = [];
 
         $reflectionFunction = new \ReflectionFunction($closure);
         foreach ($reflectionFunction->getParameters() as $reflectionParameter) {
@@ -70,7 +70,7 @@ public function validOrException(Signature $givenSignature, Signature $wishedSig
      */
     protected function getDifferentParameter(array $parameters1, array $parameters2)
     {
-        $differentParameters = array();
+        $differentParameters = [];
         foreach ($parameters1 as $i => $parameter1) {
             if (!isset($parameters2[$i]) || $parameter1 != $parameters2[$i]) {
                 $differentParameters[] = $parameter1;

tests/DiffTest.php

@@ -4,19 +4,20 @@
 
 use Jobcloud\ClosureValidator\Diff;
 use Jobcloud\ClosureValidator\Parameter;
+use PHPUnit\Framework\TestCase;
 
-class DiffTest extends \PHPUnit_Framework_TestCase
+class DiffTest extends TestCase
 {
     public function testIdentical()
     {
         $diff = new Diff();
 
         $this->assertTrue($diff->isIdentical());
         $this->assertEquals(
-            array(
-                'missingParameters' => array(),
-                'additionalParameters' => array()
-            ),
+            [
+                'missingParameters' => [],
+                'additionalParameters' => []
+            ],
             $diff->toArray()
         );
     }
@@ -25,19 +26,19 @@ public function testMissingParameter()
     {
         $parameter = new Parameter('parameter');
 
-        $diff = new Diff(array($parameter));
+        $diff = new Diff([$parameter]);
 
         $missingParameters = $diff->getMissingParameters();
 
         $this->assertFalse($diff->isIdentical());
         $this->assertSame($parameter, $missingParameters[0]);
         $this->assertEquals(
-            array(
-                'missingParameters' => array(
+            [
+                'missingParameters' => [
                     $parameter->toArray()
-                ),
-                'additionalParameters' => array()
-            ),
+                ],
+                'additionalParameters' => []
+            ],
             $diff->toArray()
         );
     }
@@ -46,19 +47,19 @@ public function testAdditionalParameter()
     {
         $parameter = new Parameter('parameter');
 
-        $diff = new Diff(array(), array($parameter));
+        $diff = new Diff([], [$parameter]);
 
         $additionalParameters = $diff->getAdditionalParameters();
 
         $this->assertFalse($diff->isIdentical());
         $this->assertSame($parameter, $additionalParameters[0]);
         $this->assertEquals(
-            array(
-                'missingParameters' => array(),
-                'additionalParameters' => array(
+            [
+                'missingParameters' => [],
+                'additionalParameters' => [
                     $parameter->toArray()
-                )
-            ),
+                ]
+            ],
             $diff->toArray()
         );
     }

tests/ParameterTest.php

@@ -3,8 +3,9 @@
 namespace Jobcloud\Tests\ClosureValidator;
 
 use Jobcloud\ClosureValidator\Parameter;
+use PHPUnit\Framework\TestCase;
 
-class ParameterTest extends \PHPUnit_Framework_TestCase
+class ParameterTest extends TestCase
 {
     public function testWithoutType()
     {
@@ -13,10 +14,10 @@ public function testWithoutType()
         $this->assertEquals('parameter', $parameter->getName());
         $this->assertNull($parameter->getType());
         $this->assertEquals(
-            array(
+            [
                 'name' => 'parameter',
                 'type' => null
-            ),
+            ],
             $parameter->toArray()
         );
     }
@@ -28,10 +29,10 @@ public function testWithType()
         $this->assertEquals('parameter', $parameter->getName());
         $this->assertEquals(Parameter::CLASS_NAME, $parameter->getType());
         $this->assertEquals(
-            array(
+            [
                 'name' => 'parameter',
                 'type' => Parameter::CLASS_NAME
-            ),
+            ],
             $parameter->toArray()
         );
     }

tests/SignatureTest.php

@@ -4,32 +4,33 @@
 
 use Jobcloud\ClosureValidator\Parameter;
 use Jobcloud\ClosureValidator\Signature;
+use PHPUnit\Framework\TestCase;
 
-class SignatureTest extends \PHPUnit_Framework_TestCase
+class SignatureTest extends TestCase
 {
     public function testWithoutParameter()
     {
         $signature = new Signature();
 
         $this->assertCount(0, $signature->getParameters());
-        $this->assertEquals(array('parameters' => array()), $signature->toArray());
+        $this->assertEquals(['parameters' => []], $signature->toArray());
     }
 
     public function testWithParameter()
     {
         $parameter = new Parameter('parameter', Parameter::CLASS_NAME);
-        $signature = new Signature(array($parameter));
+        $signature = new Signature([$parameter]);
 
         $parameters = $signature->getParameters();
 
         $this->assertCount(1, $parameters);
         $this->assertEquals($parameter, $parameters[0]);
         $this->assertEquals(
-            array(
-                'parameters' => array(
+            [
+                'parameters' => [
                     $parameter->toArray()
-                )
-            ),
+                ]
+            ],
             $signature->toArray()
         );
     }