Merge pull request #9 from paul-thebaud/features/php-8.0

Features/php 8.0
paul-thebaud · Aug 26, 2021 · c6e2ce3 · c6e2ce3
2 parents 1375eb4 + 2b2c62d
commit c6e2ce3
Show file tree

Hide file tree

Showing 67 changed files with 330 additions and 115 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [ 7.4, 7.3, 7.2, 7.1 ]
+        php: [ 8.0, 7.4, 7.3, 7.2, 7.1 ]
         os: [ ubuntu-latest, windows-latest ]
 
     name: PHP${{ matrix.php }} - ${{ matrix.os }}

diff --git a/composer.json b/composer.json
@@ -23,10 +23,10 @@
     }
   ],
   "require": {
-    "php": "^7.1",
+    "php": "^7.1|^8.0",
     "league/container": "^3.2",
     "phpdocumentor/reflection-docblock": "^4.0|^5.0",
-    "roave/better-reflection": "^3.3|^4.0",
+    "ondrejmirtes/better-reflection": "^3.3|^4.0",
     "tightenco/collect": "^5.8|^6.0|^7.0|^8.0.0"
   },
   "require-dev": {

diff --git a/src/Contracts/Generators/DelegateTestGenerator.php b/src/Contracts/Generators/DelegateTestGenerator.php
@@ -4,7 +4,7 @@
 
 namespace PhpUnitGen\Core\Contracts\Generators;
 
-use Roave\BetterReflection\Reflection\ReflectionClass;
+use PHPStan\BetterReflection\Reflection\ReflectionClass;
 
 interface DelegateTestGenerator extends TestGenerator
 {

diff --git a/src/Contracts/Generators/Factories/ClassFactory.php b/src/Contracts/Generators/Factories/ClassFactory.php
@@ -4,8 +4,8 @@
 
 namespace PhpUnitGen\Core\Contracts\Generators\Factories;
 
+use PHPStan\BetterReflection\Reflection\ReflectionClass;
 use PhpUnitGen\Core\Models\TestClass;
-use Roave\BetterReflection\Reflection\ReflectionClass;
 
 /**
  * Interface ClassFactory.

diff --git a/src/Contracts/Generators/Factories/MethodFactory.php b/src/Contracts/Generators/Factories/MethodFactory.php
@@ -4,10 +4,10 @@
 
 namespace PhpUnitGen\Core\Contracts\Generators\Factories;
 
+use PHPStan\BetterReflection\Reflection\ReflectionMethod;
 use PhpUnitGen\Core\Exceptions\InvalidArgumentException;
 use PhpUnitGen\Core\Models\TestClass;
 use PhpUnitGen\Core\Models\TestMethod;
-use Roave\BetterReflection\Reflection\ReflectionMethod;
 
 /**
  * Interface MethodFactory.

diff --git a/src/Contracts/Generators/Factories/PropertyFactory.php b/src/Contracts/Generators/Factories/PropertyFactory.php
@@ -4,9 +4,9 @@
 
 namespace PhpUnitGen\Core\Contracts\Generators\Factories;
 
+use PHPStan\BetterReflection\Reflection\ReflectionParameter;
 use PhpUnitGen\Core\Models\TestClass;
 use PhpUnitGen\Core\Models\TestProperty;
-use Roave\BetterReflection\Reflection\ReflectionParameter;
 
 /**
  * Interface PropertyFactory.

diff --git a/src/Contracts/Generators/TestGenerator.php b/src/Contracts/Generators/TestGenerator.php
@@ -4,10 +4,10 @@
 
 namespace PhpUnitGen\Core\Contracts\Generators;
 
+use PHPStan\BetterReflection\Reflection\ReflectionClass;
 use PhpUnitGen\Core\Contracts\Generators\Factories\ClassFactory;
 use PhpUnitGen\Core\Exceptions\InvalidArgumentException;
 use PhpUnitGen\Core\Models\TestClass;
-use Roave\BetterReflection\Reflection\ReflectionClass;
 
 /**
  * Interface TestGenerator.

diff --git a/src/Contracts/Parsers/CodeParser.php b/src/Contracts/Parsers/CodeParser.php
@@ -4,8 +4,8 @@
 
 namespace PhpUnitGen\Core\Contracts\Parsers;
 
+use PHPStan\BetterReflection\Reflection\ReflectionClass;
 use PhpUnitGen\Core\Exceptions\InvalidArgumentException;
-use Roave\BetterReflection\Reflection\ReflectionClass;
 
 /**
  * Interface CodeParser.

diff --git a/src/Generators/Concerns/InstantiatesClass.php b/src/Generators/Concerns/InstantiatesClass.php
@@ -4,9 +4,9 @@
 
 namespace PhpUnitGen\Core\Generators\Concerns;
 
+use PHPStan\BetterReflection\Reflection\ReflectionClass;
+use PHPStan\BetterReflection\Reflection\ReflectionMethod;
 use PhpUnitGen\Core\Helpers\Reflect;
-use Roave\BetterReflection\Reflection\ReflectionClass;
-use Roave\BetterReflection\Reflection\ReflectionMethod;
 
 /**
  * Trait InstantiatesClass.

diff --git a/src/Generators/Factories/ClassFactory.php b/src/Generators/Factories/ClassFactory.php
@@ -4,14 +4,14 @@
 
 namespace PhpUnitGen\Core\Generators\Factories;
 
+use PHPStan\BetterReflection\Reflection\ReflectionClass;
 use PhpUnitGen\Core\Aware\ConfigAwareTrait;
 use PhpUnitGen\Core\Aware\DocumentationFactoryAwareTrait;
 use PhpUnitGen\Core\Contracts\Aware\ConfigAware;
 use PhpUnitGen\Core\Contracts\Aware\DocumentationFactoryAware;
 use PhpUnitGen\Core\Contracts\Generators\Factories\ClassFactory as ClassFactoryContract;
 use PhpUnitGen\Core\Helpers\Str;
 use PhpUnitGen\Core\Models\TestClass;
-use Roave\BetterReflection\Reflection\ReflectionClass;
 
 /**
  * Class ClassFactory.

diff --git a/src/Generators/Factories/MethodFactory.php b/src/Generators/Factories/MethodFactory.php
@@ -4,6 +4,8 @@
 
 namespace PhpUnitGen\Core\Generators\Factories;
 
+use PHPStan\BetterReflection\Reflection\ReflectionMethod;
+use PHPStan\BetterReflection\Reflection\ReflectionParameter;
 use PhpUnitGen\Core\Aware\DocumentationFactoryAwareTrait;
 use PhpUnitGen\Core\Aware\ImportFactoryAwareTrait;
 use PhpUnitGen\Core\Aware\StatementFactoryAwareTrait;
@@ -19,8 +21,6 @@
 use PhpUnitGen\Core\Models\TestMethod;
 use PhpUnitGen\Core\Models\TestProperty;
 use PhpUnitGen\Core\Models\TestStatement;
-use Roave\BetterReflection\Reflection\ReflectionMethod;
-use Roave\BetterReflection\Reflection\ReflectionParameter;
 use Tightenco\Collect\Support\Collection;
 
 /**

diff --git a/src/Generators/Factories/PropertyFactory.php b/src/Generators/Factories/PropertyFactory.php
@@ -4,6 +4,7 @@
 
 namespace PhpUnitGen\Core\Generators\Factories;
 
+use PHPStan\BetterReflection\Reflection\ReflectionParameter;
 use PhpUnitGen\Core\Aware\DocumentationFactoryAwareTrait;
 use PhpUnitGen\Core\Aware\ImportFactoryAwareTrait;
 use PhpUnitGen\Core\Aware\MockGeneratorAwareTrait;
@@ -16,7 +17,6 @@
 use PhpUnitGen\Core\Models\TestClass;
 use PhpUnitGen\Core\Models\TestImport;
 use PhpUnitGen\Core\Models\TestProperty;
-use Roave\BetterReflection\Reflection\ReflectionParameter;
 use Tightenco\Collect\Support\Collection;
 
 /**

diff --git a/src/Generators/Factories/StatementFactory.php b/src/Generators/Factories/StatementFactory.php
@@ -4,13 +4,13 @@
 
 namespace PhpUnitGen\Core\Generators\Factories;
 
+use PHPStan\BetterReflection\Reflection\ReflectionParameter;
 use PhpUnitGen\Core\Aware\ImportFactoryAwareTrait;
 use PhpUnitGen\Core\Contracts\Aware\ImportFactoryAware;
 use PhpUnitGen\Core\Contracts\Generators\Factories\StatementFactory as StatementFactoryContract;
 use PhpUnitGen\Core\Generators\Concerns\InstantiatesClass;
 use PhpUnitGen\Core\Models\TestClass;
 use PhpUnitGen\Core\Models\TestStatement;
-use Roave\BetterReflection\Reflection\ReflectionParameter;
 use Tightenco\Collect\Support\Collection;
 
 /**

diff --git a/src/Generators/Tests/AbstractTestGenerator.php b/src/Generators/Tests/AbstractTestGenerator.php
@@ -4,6 +4,9 @@
 
 namespace PhpUnitGen\Core\Generators\Tests;
 
+use PHPStan\BetterReflection\Reflection\ReflectionClass;
+use PHPStan\BetterReflection\Reflection\ReflectionMethod;
+use PHPStan\BetterReflection\Reflection\ReflectionParameter;
 use PhpUnitGen\Core\Aware\ClassFactoryAwareTrait;
 use PhpUnitGen\Core\Aware\ConfigAwareTrait;
 use PhpUnitGen\Core\Aware\ImportFactoryAwareTrait;
@@ -35,9 +38,6 @@
 use PhpUnitGen\Core\Helpers\Reflect;
 use PhpUnitGen\Core\Helpers\Str;
 use PhpUnitGen\Core\Models\TestClass;
-use Roave\BetterReflection\Reflection\ReflectionClass;
-use Roave\BetterReflection\Reflection\ReflectionMethod;
-use Roave\BetterReflection\Reflection\ReflectionParameter;
 
 /**
  * Class AbstractTestGenerator.

diff --git a/src/Generators/Tests/Basic/BasicMethodFactory.php b/src/Generators/Tests/Basic/BasicMethodFactory.php
@@ -4,15 +4,15 @@
 
 namespace PhpUnitGen\Core\Generators\Tests\Basic;
 
+use PHPStan\BetterReflection\Reflection\ReflectionMethod;
+use PHPStan\BetterReflection\Reflection\ReflectionParameter;
 use PhpUnitGen\Core\Exceptions\InvalidArgumentException;
 use PhpUnitGen\Core\Generators\Factories\MethodFactory;
 use PhpUnitGen\Core\Helpers\Reflect;
 use PhpUnitGen\Core\Models\TestClass;
 use PhpUnitGen\Core\Models\TestMethod;
 use PhpUnitGen\Core\Models\TestStatement;
 use PhpUnitGen\Core\Reflection\ReflectionType;
-use Roave\BetterReflection\Reflection\ReflectionMethod;
-use Roave\BetterReflection\Reflection\ReflectionParameter;
 
 /**
  * Class BasicMethodFactory.

diff --git a/src/Generators/Tests/Basic/BasicTestGenerator.php b/src/Generators/Tests/Basic/BasicTestGenerator.php
@@ -4,10 +4,10 @@
 
 namespace PhpUnitGen\Core\Generators\Tests\Basic;
 
+use PHPStan\BetterReflection\Reflection\ReflectionMethod;
 use PhpUnitGen\Core\Contracts\Generators\Factories\MethodFactory as MethodFactoryContract;
 use PhpUnitGen\Core\Generators\Tests\AbstractTestGenerator;
 use PhpUnitGen\Core\Models\TestClass;
-use Roave\BetterReflection\Reflection\ReflectionMethod;
 
 /**
  * Class BasicTestGenerator.

diff --git a/src/Generators/Tests/Basic/ManagesGetterAndSetter.php b/src/Generators/Tests/Basic/ManagesGetterAndSetter.php
@@ -4,10 +4,10 @@
 
 namespace PhpUnitGen\Core\Generators\Tests\Basic;
 
+use PHPStan\BetterReflection\Reflection\ReflectionMethod;
+use PHPStan\BetterReflection\Reflection\ReflectionProperty;
 use PhpUnitGen\Core\Helpers\Reflect;
 use PhpUnitGen\Core\Helpers\Str;
-use Roave\BetterReflection\Reflection\ReflectionMethod;
-use Roave\BetterReflection\Reflection\ReflectionProperty;
 
 /**
  * Trait ManagesGetterAndSetter.

diff --git a/src/Generators/Tests/Concerns/ChecksMethods.php b/src/Generators/Tests/Concerns/ChecksMethods.php
@@ -4,7 +4,7 @@
 
 namespace PhpUnitGen\Core\Generators\Tests\Concerns;
 
-use Roave\BetterReflection\Reflection\ReflectionMethod;
+use PHPStan\BetterReflection\Reflection\ReflectionMethod;
 
 /**
  * Trait ChecksMethods.

diff --git a/src/Generators/Tests/Concerns/MocksParameters.php b/src/Generators/Tests/Concerns/MocksParameters.php
@@ -4,12 +4,12 @@
 
 namespace PhpUnitGen\Core\Generators\Tests\Concerns;
 
+use PHPStan\BetterReflection\Reflection\ReflectionParameter;
 use PhpUnitGen\Core\Aware\StatementFactoryAwareTrait;
 use PhpUnitGen\Core\Aware\ValueFactoryAwareTrait;
 use PhpUnitGen\Core\Helpers\Reflect;
 use PhpUnitGen\Core\Models\TestMethod;
 use PhpUnitGen\Core\Models\TestStatement;
-use Roave\BetterReflection\Reflection\ReflectionParameter;
 use Tightenco\Collect\Support\Collection;
 
 /**

diff --git a/src/Generators/Tests/DelegateTestGenerator.php b/src/Generators/Tests/DelegateTestGenerator.php
@@ -4,6 +4,7 @@
 
 namespace PhpUnitGen\Core\Generators\Tests;
 
+use PHPStan\BetterReflection\Reflection\ReflectionClass;
 use PhpUnitGen\Core\Aware\ConfigAwareTrait;
 use PhpUnitGen\Core\Config\Config;
 use PhpUnitGen\Core\Container\CoreContainerFactory;
@@ -26,7 +27,6 @@
 use PhpUnitGen\Core\Helpers\Str;
 use PhpUnitGen\Core\Models\TestClass;
 use Psr\Container\ContainerInterface;
-use Roave\BetterReflection\Reflection\ReflectionClass;
 
 /**
  * Class DelegateTestGenerator.

diff --git a/src/Generators/Tests/Laravel/Channel/ChannelMethodFactory.php b/src/Generators/Tests/Laravel/Channel/ChannelMethodFactory.php
@@ -4,14 +4,14 @@
 
 namespace PhpUnitGen\Core\Generators\Tests\Laravel\Channel;
 
+use PHPStan\BetterReflection\Reflection\ReflectionMethod;
 use PhpUnitGen\Core\Contracts\Aware\ConfigAware;
 use PhpUnitGen\Core\Exceptions\InvalidArgumentException;
 use PhpUnitGen\Core\Generators\Tests\Basic\BasicMethodFactory;
 use PhpUnitGen\Core\Generators\Tests\Concerns\ChecksMethods;
 use PhpUnitGen\Core\Generators\Tests\Laravel\Concerns\UsesUserModel;
 use PhpUnitGen\Core\Models\TestClass;
 use PhpUnitGen\Core\Models\TestMethod;
-use Roave\BetterReflection\Reflection\ReflectionMethod;
 
 /**
  * Class ChannelMethodFactory.

diff --git a/src/Generators/Tests/Laravel/Channel/ChannelTestGenerator.php b/src/Generators/Tests/Laravel/Channel/ChannelTestGenerator.php
@@ -4,11 +4,11 @@
 
 namespace PhpUnitGen\Core\Generators\Tests\Laravel\Channel;
 
+use PHPStan\BetterReflection\Reflection\ReflectionMethod;
 use PhpUnitGen\Core\Contracts\Generators\Factories\MethodFactory as MethodFactoryContract;
 use PhpUnitGen\Core\Generators\Tests\Concerns\ChecksMethods;
 use PhpUnitGen\Core\Generators\Tests\Laravel\Policy\PolicyTestGenerator;
 use PhpUnitGen\Core\Models\TestClass;
-use Roave\BetterReflection\Reflection\ReflectionMethod;
 
 /**
  * Class ChannelTestGenerator.

diff --git a/src/Generators/Tests/Laravel/Command/CommandMethodFactory.php b/src/Generators/Tests/Laravel/Command/CommandMethodFactory.php
@@ -4,6 +4,8 @@
 
 namespace PhpUnitGen\Core\Generators\Tests\Laravel\Command;
 
+use PHPStan\BetterReflection\Reflection\ReflectionClass;
+use PHPStan\BetterReflection\Reflection\ReflectionMethod;
 use PhpUnitGen\Core\Exceptions\InvalidArgumentException;
 use PhpUnitGen\Core\Generators\Tests\Basic\BasicMethodFactory;
 use PhpUnitGen\Core\Generators\Tests\Concerns\ChecksMethods;
@@ -12,8 +14,6 @@
 use PhpUnitGen\Core\Models\TestClass;
 use PhpUnitGen\Core\Models\TestMethod;
 use PhpUnitGen\Core\Models\TestStatement;
-use Roave\BetterReflection\Reflection\ReflectionClass;
-use Roave\BetterReflection\Reflection\ReflectionMethod;
 use Throwable;
 
 /**

diff --git a/src/Generators/Tests/Laravel/Command/CommandTestGenerator.php b/src/Generators/Tests/Laravel/Command/CommandTestGenerator.php
@@ -4,13 +4,13 @@
 
 namespace PhpUnitGen\Core\Generators\Tests\Laravel\Command;
 
+use PHPStan\BetterReflection\Reflection\ReflectionMethod;
 use PhpUnitGen\Core\Contracts\Generators\Factories\ClassFactory as ClassFactoryContract;
 use PhpUnitGen\Core\Contracts\Generators\Factories\MethodFactory as MethodFactoryContract;
 use PhpUnitGen\Core\Generators\Tests\Concerns\ChecksMethods;
 use PhpUnitGen\Core\Generators\Tests\Laravel\FeatureClassFactory;
 use PhpUnitGen\Core\Generators\Tests\Laravel\LaravelTestGenerator;
 use PhpUnitGen\Core\Models\TestClass;
-use Roave\BetterReflection\Reflection\ReflectionMethod;
 
 /**
  * Class CommandTestGenerator.

diff --git a/src/Generators/Tests/Laravel/Concerns/HasInstanceBinding.php b/src/Generators/Tests/Laravel/Concerns/HasInstanceBinding.php
@@ -2,9 +2,9 @@
 
 namespace PhpUnitGen\Core\Generators\Tests\Laravel\Concerns;
 
+use PHPStan\BetterReflection\Reflection\ReflectionClass;
 use PhpUnitGen\Core\Generators\Concerns\InstantiatesClass;
 use PhpUnitGen\Core\Models\TestStatement;
-use Roave\BetterReflection\Reflection\ReflectionClass;
 
 /**
  * Trait HasInstanceBinding.

diff --git a/src/Generators/Tests/Laravel/Controller/ControllerMethodFactory.php b/src/Generators/Tests/Laravel/Controller/ControllerMethodFactory.php
@@ -4,11 +4,11 @@
 
 namespace PhpUnitGen\Core\Generators\Tests\Laravel\Controller;
 
+use PHPStan\BetterReflection\Reflection\ReflectionMethod;
 use PhpUnitGen\Core\Generators\Tests\Laravel\Command\CommandMethodFactory;
 use PhpUnitGen\Core\Helpers\Str;
 use PhpUnitGen\Core\Models\TestClass;
 use PhpUnitGen\Core\Models\TestStatement;
-use Roave\BetterReflection\Reflection\ReflectionMethod;
 
 /**
  * Class ControllerMethodFactory.

diff --git a/src/Generators/Tests/Laravel/Controller/ControllerTestGenerator.php b/src/Generators/Tests/Laravel/Controller/ControllerTestGenerator.php
@@ -4,13 +4,13 @@
 
 namespace PhpUnitGen\Core\Generators\Tests\Laravel\Controller;
 
+use PHPStan\BetterReflection\Reflection\ReflectionMethod;
 use PhpUnitGen\Core\Contracts\Generators\Factories\ClassFactory as ClassFactoryContract;
 use PhpUnitGen\Core\Contracts\Generators\Factories\MethodFactory as MethodFactoryContract;
 use PhpUnitGen\Core\Generators\Tests\Concerns\ChecksMethods;
 use PhpUnitGen\Core\Generators\Tests\Laravel\FeatureClassFactory;
 use PhpUnitGen\Core\Generators\Tests\Laravel\LaravelTestGenerator;
 use PhpUnitGen\Core\Models\TestClass;
-use Roave\BetterReflection\Reflection\ReflectionMethod;
 
 /**
  * Class ControllerTestGenerator.

diff --git a/src/Generators/Tests/Laravel/Job/JobMethodFactory.php b/src/Generators/Tests/Laravel/Job/JobMethodFactory.php
@@ -4,15 +4,15 @@
 
 namespace PhpUnitGen\Core\Generators\Tests\Laravel\Job;
 
+use PHPStan\BetterReflection\Reflection\ReflectionMethod;
+use PHPStan\BetterReflection\Reflection\ReflectionParameter;
 use PhpUnitGen\Core\Exceptions\InvalidArgumentException;
 use PhpUnitGen\Core\Generators\Tests\Basic\BasicMethodFactory;
 use PhpUnitGen\Core\Generators\Tests\Concerns\ChecksMethods;
 use PhpUnitGen\Core\Generators\Tests\Concerns\MocksParameters;
 use PhpUnitGen\Core\Helpers\Reflect;
 use PhpUnitGen\Core\Models\TestClass;
 use PhpUnitGen\Core\Models\TestStatement;
-use Roave\BetterReflection\Reflection\ReflectionMethod;
-use Roave\BetterReflection\Reflection\ReflectionParameter;
 
 /**
  * Class JobMethodFactory.

diff --git a/src/Generators/Tests/Laravel/Job/JobTestGenerator.php b/src/Generators/Tests/Laravel/Job/JobTestGenerator.php
@@ -4,11 +4,11 @@
 
 namespace PhpUnitGen\Core\Generators\Tests\Laravel\Job;
 
+use PHPStan\BetterReflection\Reflection\ReflectionMethod;
 use PhpUnitGen\Core\Contracts\Generators\Factories\MethodFactory as MethodFactoryContract;
 use PhpUnitGen\Core\Generators\Tests\Concerns\ChecksMethods;
 use PhpUnitGen\Core\Generators\Tests\Laravel\LaravelTestGenerator;
 use PhpUnitGen\Core\Models\TestClass;
-use Roave\BetterReflection\Reflection\ReflectionMethod;
 
 /**
  * Class JobTestGenerator.