Merge pull request #75 from hboomsma/feature/php71_compat

Feature/php71 compat

Author: mvriel

.travis.yml

@@ -4,10 +4,13 @@ php:
   - 5.6
   - 7.0
   - hhvm
+  - nightly
 
 matrix:
   allow_failures:
-    - php: hhvm
+    - php:
+        - hhvm
+        - nightly
 
 cache:
   directories:

composer.json

@@ -12,7 +12,7 @@
     "require": {
         "php": ">=5.5",
         "phpdocumentor/reflection-common": "^1.0@dev",
-        "phpdocumentor/type-resolver": "^0.1.5",
+        "phpdocumentor/type-resolver": "^0.2.0",
         "webmozart/assert": "^1.0"
     },
     "autoload": {

composer.lock

@@ -17,7 +17,7 @@
 use phpDocumentor\Reflection\Type;
 use phpDocumentor\Reflection\TypeResolver;
 use phpDocumentor\Reflection\Types\Context as TypeContext;
-use phpDocumentor\Reflection\Types\Void;
+use phpDocumentor\Reflection\Types\Void_;
 use Webmozart\Assert\Assert;
 
 /**
@@ -50,7 +50,7 @@ public function __construct(
         Assert::boolean($static);
 
         if ($returnType === null) {
-            $returnType = new Void();
+            $returnType = new Void_();
         }
 
         $this->methodName  = $methodName;
@@ -130,7 +130,7 @@ public static function create(
                 $argument = explode(' ', trim($argument));
                 if ($argument[0][0] === '$') {
                     $argumentName = substr($argument[0], 1);
-                    $argumentType = new Void();
+                    $argumentType = new Void_();
                 } else {
                     $argumentType = $typeResolver->resolve($argument[0], $context);
                     $argumentName = '';
@@ -205,7 +205,7 @@ private function filterArguments($arguments)
                 $argument = [ 'name' => $argument ];
             }
             if (! isset($argument['type'])) {
-                $argument['type'] = new Void();
+                $argument['type'] = new Void_();
             }
             $keys = array_keys($argument);
             if ($keys !== [ 'name', 'type' ]) {

src/DocBlock/Tags/Method.php

@@ -22,7 +22,7 @@
 use phpDocumentor\Reflection\Types\Integer;
 use phpDocumentor\Reflection\Types\Object_;
 use phpDocumentor\Reflection\Types\String_;
-use phpDocumentor\Reflection\Types\Void;
+use phpDocumentor\Reflection\Types\Void_;
 
 /**
  * @coversDefaultClass \phpDocumentor\Reflection\DocBlock\Tags\Method
@@ -56,7 +56,7 @@ public function testIfTagCanBeRenderedUsingDefaultFormatter()
             ['name' => 'argument1', 'type' => new String_()],
             ['name' => 'argument2', 'type' => new Object_()]
         ];
-        $fixture = new Method('myMethod', $arguments, new Void(), true, new Description('My Description'));
+        $fixture = new Method('myMethod', $arguments, new Void_(), true, new Description('My Description'));
 
         $this->assertSame(
             '@method static void myMethod(string $argument1, object $argument2) My Description',
@@ -115,7 +115,7 @@ public function testArgumentsMayBePassedAsString()
     {
         $arguments = ['argument1'];
         $expected = [
-            [ 'name' => $arguments[0], 'type' => new Void() ]
+            [ 'name' => $arguments[0], 'type' => new Void_() ]
         ];
 
         $fixture = new Method('myMethod', $arguments);
@@ -131,7 +131,7 @@ public function testArgumentTypeCanBeInferredAsVoid()
     {
         $arguments = [ [ 'name' => 'argument1' ] ];
         $expected = [
-            [ 'name' => $arguments[0]['name'], 'type' => new Void() ]
+            [ 'name' => $arguments[0]['name'], 'type' => new Void_() ]
         ];
 
         $fixture = new Method('myMethod', $arguments);
@@ -160,7 +160,7 @@ public function testReturnTypeCanBeInferredAsVoid()
     {
         $fixture = new Method('myMethod', []);
 
-        $this->assertEquals(new Void(), $fixture->getReturnType());
+        $this->assertEquals(new Void_(), $fixture->getReturnType());
     }
 
     /**
@@ -204,7 +204,7 @@ public function testStringRepresentationIsReturned()
             ['name' => 'argument1', 'type' => new String_()],
             ['name' => 'argument2', 'type' => new Object_()]
         ];
-        $fixture = new Method('myMethod', $arguments, new Void(), true, new Description('My Description'));
+        $fixture = new Method('myMethod', $arguments, new Void_(), true, new Description('My Description'));
 
         $this->assertSame(
             'static void myMethod(string $argument1, object $argument2) My Description',
@@ -230,7 +230,7 @@ public function testFactoryMethod()
         $description  = new Description('My Description');
         $expectedArguments = [
             [ 'name' => 'argument1', 'type' => new String_() ],
-            [ 'name' => 'argument2', 'type' => new Void() ]
+            [ 'name' => 'argument2', 'type' => new Void_() ]
         ];
 
         $descriptionFactory->shouldReceive('create')->with('My Description', $context)->andReturn($description);
@@ -245,7 +245,7 @@ public function testFactoryMethod()
         $this->assertSame('static void myMethod(string $argument1, void $argument2) My Description', (string)$fixture);
         $this->assertSame('myMethod', $fixture->getMethodName());
         $this->assertEquals($expectedArguments, $fixture->getArguments());
-        $this->assertInstanceOf(Void::class, $fixture->getReturnType());
+        $this->assertInstanceOf(Void_::class, $fixture->getReturnType());
         $this->assertSame($description, $fixture->getDescription());
     }
 
@@ -404,7 +404,7 @@ public function testCreateMethodParenthesisMissing()
         $this->assertSame('static void myMethod() My Description', (string)$fixture);
         $this->assertSame('myMethod', $fixture->getMethodName());
         $this->assertEquals([], $fixture->getArguments());
-        $this->assertInstanceOf(Void::class, $fixture->getReturnType());
+        $this->assertInstanceOf(Void_::class, $fixture->getReturnType());
         $this->assertSame($description, $fixture->getDescription());
     }
 }