Merge pull request #110 from phpDocumentor/php-8

jaapio · web-flow · commit e878a14a6524 · 2020-06-27T12:12:23.000+02:00
php 8 support
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -88,7 +88,7 @@ jobs:
           - ubuntu-latest
           - windows-latest
           - macOS-latest
-        php-versions: ['7.2', '7.3', '7.4']
+        php-versions: ['7.2', '7.3', '7.4', '8.0']
     name: Unit tests for PHP version ${{ matrix.php-versions }} on ${{ matrix.operating-system }}
     needs:
       - setup
diff --git a/composer.json b/composer.json
@@ -10,11 +10,11 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.2 || ^8.0",
         "phpdocumentor/reflection-common": "^2.0"
     },
     "require-dev": {
-        "ext-tokenizer": "^7.2"
+        "ext-tokenizer": "*"
     },
     "autoload": {
         "psr-4": {
diff --git a/composer.lock b/composer.lock
diff --git a/src/Types/AggregatedType.php b/src/Types/AggregatedType.php
@@ -39,9 +39,7 @@ abstract class AggregatedType implements Type, IteratorAggregate
     private $token;
 
     /**
-     * @param Type[] $types
-     *
-     * @phpstan-param list<Type> $types
+     * @param array<Type> $types
      */
     public function __construct(array $types, string $token)
     {
diff --git a/src/Types/Compound.php b/src/Types/Compound.php
@@ -29,9 +29,7 @@ final class Compound extends AggregatedType
     /**
      * Initializes a compound type (i.e. `string|int`) and tests if the provided types all implement the Type interface.
      *
-     * @param Type[] $types
-     *
-     * @phpstan-param list<Type> $types
+     * @param array<Type> $types
      */
     public function __construct(array $types)
     {
diff --git a/src/Types/Intersection.php b/src/Types/Intersection.php
@@ -28,9 +28,7 @@ final class Intersection extends AggregatedType
     /**
      * Initializes a intersection type (i.e. `\A&\B`) and tests if the provided types all implement the Type interface.
      *
-     * @param Type[] $types
-     *
-     * @phpstan-param list<Type> $types
+     * @param array<Type> $types
      */
     public function __construct(array $types)
     {

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,7 @@ final class Compound extends AggregatedType`
`29`	`29`	`/**`
`30`	`30`	* Initializes a compound type (i.e. `string\|int`) and tests if the provided types all implement the Type interface.
`31`	`31`	`*`
`32`		`- * @param Type[] $types`
`33`		`- *`
`34`		`- * @phpstan-param list<Type> $types`
	`32`	`+ * @param array<Type> $types`
`35`	`33`	`*/`
`36`	`34`	`public function __construct(array $types)`
`37`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,7 @@ final class Intersection extends AggregatedType`
`28`	`28`	`/**`
`29`	`29`	* Initializes a intersection type (i.e. `\A&\B`) and tests if the provided types all implement the Type interface.
`30`	`30`	`*`
`31`		`- * @param Type[] $types`
`32`		`- *`
`33`		`- * @phpstan-param list<Type> $types`
	`31`	`+ * @param array<Type> $types`
`34`	`32`	`*/`
`35`	`33`	`public function __construct(array $types)`
`36`	`34`	`{`