diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3d6b40d..07eb073 100644 --- 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 index ff2c532..02dd48a 100644 --- 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 index 6d046cc..60cc6d9 100644 --- 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 index 150e16e..8aa300f 100644 --- 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 index 39c9025..3568093 100644 --- 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 index ad145b5..3bee792 100644 --- 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 index 31dd7ee..84a5201 100644 --- 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 index d957c14..53b2299 100644 --- 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 index 00b2538..4989b35 100644 --- 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 index cf8442a..b80fd89 100644 --- a/src/Generators/Factories/ClassFactory.php +++ b/src/Generators/Factories/ClassFactory.php @@ -4,6 +4,7 @@ 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; @@ -11,7 +12,6 @@ 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 index b645f97..dd85045 100644 --- 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 index e81ce8b..a000498 100644 --- 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 index 16893f6..57c78b8 100644 --- 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 index dc29883..bc688c6 100644 --- 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 index 697e5fa..7abb3eb 100644 --- a/src/Generators/Tests/Basic/BasicMethodFactory.php +++ b/src/Generators/Tests/Basic/BasicMethodFactory.php @@ -4,6 +4,8 @@ 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; @@ -11,8 +13,6 @@ 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 index 77db483..c6f9b13 100644 --- 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 index e0a7c95..1c521d2 100644 --- 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 index 2e1682e..e9fac68 100644 --- 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 index aef7398..186a96f 100644 --- 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 index 4a8c874..1c30e03 100644 --- 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 index 5191721..828a8e2 100644 --- a/src/Generators/Tests/Laravel/Channel/ChannelMethodFactory.php +++ b/src/Generators/Tests/Laravel/Channel/ChannelMethodFactory.php @@ -4,6 +4,7 @@ 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; @@ -11,7 +12,6 @@ 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 index 24ed540..3d95b2a 100644 --- 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 index 8f15ab3..5828943 100644 --- 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 index f040c1e..aae1aef 100644 --- 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 index 26fb31f..a3aa8a4 100644 --- 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 index d66c840..6080c13 100644 --- 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 index a820c63..7d3105f 100644 --- 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 index 2160209..616fac3 100644 --- a/src/Generators/Tests/Laravel/Job/JobMethodFactory.php +++ b/src/Generators/Tests/Laravel/Job/JobMethodFactory.php @@ -4,6 +4,8 @@ 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; @@ -11,8 +13,6 @@ 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 index 04eb6d8..c7e4961 100644 --- 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. diff --git a/src/Generators/Tests/Laravel/Policy/PolicyMethodFactory.php b/src/Generators/Tests/Laravel/Policy/PolicyMethodFactory.php index d372acb..eaa18ac 100644 --- a/src/Generators/Tests/Laravel/Policy/PolicyMethodFactory.php +++ b/src/Generators/Tests/Laravel/Policy/PolicyMethodFactory.php @@ -4,6 +4,9 @@ namespace PhpUnitGen\Core\Generators\Tests\Laravel\Policy; +use PHPStan\BetterReflection\Reflection\ReflectionClass; +use PHPStan\BetterReflection\Reflection\ReflectionMethod; +use PHPStan\BetterReflection\Reflection\ReflectionParameter; use PhpUnitGen\Core\Contracts\Aware\ConfigAware; use PhpUnitGen\Core\Exceptions\InvalidArgumentException; use PhpUnitGen\Core\Generators\Tests\Basic\BasicMethodFactory; @@ -13,9 +16,6 @@ use PhpUnitGen\Core\Helpers\Reflect; use PhpUnitGen\Core\Models\TestClass; use PhpUnitGen\Core\Models\TestMethod; -use Roave\BetterReflection\Reflection\ReflectionClass; -use Roave\BetterReflection\Reflection\ReflectionMethod; -use Roave\BetterReflection\Reflection\ReflectionParameter; use Tightenco\Collect\Support\Collection; /** diff --git a/src/Generators/Tests/Laravel/Policy/PolicyTestGenerator.php b/src/Generators/Tests/Laravel/Policy/PolicyTestGenerator.php index 38a935c..3349c18 100644 --- a/src/Generators/Tests/Laravel/Policy/PolicyTestGenerator.php +++ b/src/Generators/Tests/Laravel/Policy/PolicyTestGenerator.php @@ -4,12 +4,12 @@ namespace PhpUnitGen\Core\Generators\Tests\Laravel\Policy; +use PHPStan\BetterReflection\Reflection\ReflectionMethod; use PhpUnitGen\Core\Contracts\Aware\StatementFactoryAware; use PhpUnitGen\Core\Contracts\Generators\Factories\MethodFactory as MethodFactoryContract; use PhpUnitGen\Core\Generators\Tests\Laravel\Concerns\UsesUserModel; use PhpUnitGen\Core\Generators\Tests\Laravel\LaravelTestGenerator; use PhpUnitGen\Core\Models\TestClass; -use Roave\BetterReflection\Reflection\ReflectionMethod; /** * Class PolicyTestGenerator. diff --git a/src/Generators/Tests/Laravel/Resource/ResourceMethodFactory.php b/src/Generators/Tests/Laravel/Resource/ResourceMethodFactory.php index cf2d315..1a8c871 100644 --- a/src/Generators/Tests/Laravel/Resource/ResourceMethodFactory.php +++ b/src/Generators/Tests/Laravel/Resource/ResourceMethodFactory.php @@ -4,14 +4,14 @@ namespace PhpUnitGen\Core\Generators\Tests\Laravel\Resource; +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 Roave\BetterReflection\Reflection\ReflectionMethod; -use Roave\BetterReflection\Reflection\ReflectionParameter; /** * Class ResourceMethodFactory. diff --git a/src/Generators/Tests/Laravel/Resource/ResourceTestGenerator.php b/src/Generators/Tests/Laravel/Resource/ResourceTestGenerator.php index e033a82..4a873c0 100644 --- a/src/Generators/Tests/Laravel/Resource/ResourceTestGenerator.php +++ b/src/Generators/Tests/Laravel/Resource/ResourceTestGenerator.php @@ -4,11 +4,11 @@ namespace PhpUnitGen\Core\Generators\Tests\Laravel\Resource; +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 ResourceTestGenerator. diff --git a/src/Generators/Tests/Laravel/Rule/RuleMethodFactory.php b/src/Generators/Tests/Laravel/Rule/RuleMethodFactory.php index 25aa227..6471efc 100644 --- a/src/Generators/Tests/Laravel/Rule/RuleMethodFactory.php +++ b/src/Generators/Tests/Laravel/Rule/RuleMethodFactory.php @@ -4,12 +4,12 @@ namespace PhpUnitGen\Core\Generators\Tests\Laravel\Rule; +use PHPStan\BetterReflection\Reflection\ReflectionMethod; 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\Models\TestClass; -use Roave\BetterReflection\Reflection\ReflectionMethod; /** * Class RuleMethodFactory. diff --git a/src/Generators/Tests/Laravel/Rule/RuleTestGenerator.php b/src/Generators/Tests/Laravel/Rule/RuleTestGenerator.php index 6a7f7da..b12c1de 100644 --- a/src/Generators/Tests/Laravel/Rule/RuleTestGenerator.php +++ b/src/Generators/Tests/Laravel/Rule/RuleTestGenerator.php @@ -4,11 +4,11 @@ namespace PhpUnitGen\Core\Generators\Tests\Laravel\Rule; +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 RuleTestGenerator. diff --git a/src/Helpers/Reflect.php b/src/Helpers/Reflect.php index 7e90b9a..9a09440 100644 --- a/src/Helpers/Reflect.php +++ b/src/Helpers/Reflect.php @@ -7,11 +7,11 @@ use phpDocumentor\Reflection\DocBlock; use phpDocumentor\Reflection\DocBlockFactory; use phpDocumentor\Reflection\DocBlockFactoryInterface; +use PHPStan\BetterReflection\Reflection\ReflectionClass; +use PHPStan\BetterReflection\Reflection\ReflectionMethod; +use PHPStan\BetterReflection\Reflection\ReflectionParameter; +use PHPStan\BetterReflection\Reflection\ReflectionProperty; use PhpUnitGen\Core\Reflection\ReflectionType; -use Roave\BetterReflection\Reflection\ReflectionClass; -use Roave\BetterReflection\Reflection\ReflectionMethod; -use Roave\BetterReflection\Reflection\ReflectionParameter; -use Roave\BetterReflection\Reflection\ReflectionProperty; use Tightenco\Collect\Support\Collection; /** diff --git a/src/Models/TestClass.php b/src/Models/TestClass.php index dd15c15..067a272 100644 --- a/src/Models/TestClass.php +++ b/src/Models/TestClass.php @@ -4,11 +4,11 @@ namespace PhpUnitGen\Core\Models; +use PHPStan\BetterReflection\Reflection\ReflectionClass; use PhpUnitGen\Core\Contracts\Renderers\Renderable; use PhpUnitGen\Core\Contracts\Renderers\Renderer; use PhpUnitGen\Core\Helpers\Str; use PhpUnitGen\Core\Models\Concerns\HasTestDocumentation; -use Roave\BetterReflection\Reflection\ReflectionClass; use Tightenco\Collect\Support\Collection; /** diff --git a/src/Parsers/CodeParser.php b/src/Parsers/CodeParser.php index 609a7bd..3e9d87d 100644 --- a/src/Parsers/CodeParser.php +++ b/src/Parsers/CodeParser.php @@ -4,15 +4,15 @@ namespace PhpUnitGen\Core\Parsers; +use PHPStan\BetterReflection\BetterReflection; +use PHPStan\BetterReflection\Reflection\ReflectionClass; +use PHPStan\BetterReflection\Reflector\ClassReflector; +use PHPStan\BetterReflection\SourceLocator\Ast\Exception\ParseToAstFailure; +use PHPStan\BetterReflection\SourceLocator\Ast\Locator; +use PHPStan\BetterReflection\SourceLocator\Type\StringSourceLocator; use PhpUnitGen\Core\Contracts\Parsers\CodeParser as CodeParserContract; use PhpUnitGen\Core\Contracts\Parsers\Source; use PhpUnitGen\Core\Exceptions\InvalidArgumentException; -use Roave\BetterReflection\BetterReflection; -use Roave\BetterReflection\Reflection\ReflectionClass; -use Roave\BetterReflection\Reflector\ClassReflector; -use Roave\BetterReflection\SourceLocator\Ast\Exception\ParseToAstFailure; -use Roave\BetterReflection\SourceLocator\Ast\Locator; -use Roave\BetterReflection\SourceLocator\Type\StringSourceLocator; /** * Class CodeParser. diff --git a/src/Reflection/ReflectionType.php b/src/Reflection/ReflectionType.php index c75fb81..f860da8 100644 --- a/src/Reflection/ReflectionType.php +++ b/src/Reflection/ReflectionType.php @@ -4,8 +4,8 @@ namespace PhpUnitGen\Core\Reflection; +use PHPStan\BetterReflection\Reflection\ReflectionType as BetterReflectionType; use PhpUnitGen\Core\Helpers\Str; -use Roave\BetterReflection\Reflection\ReflectionType as BetterReflectionType; use Tightenco\Collect\Support\Collection; /** @@ -54,7 +54,12 @@ class ReflectionType */ public function __construct(string $type, bool $nullable) { - $this->type = ltrim($type, '\\'); + $clearedType = ltrim($type, '\\'); + if (Str::contains('|', $clearedType)) { + $clearedType = explode('|', $clearedType)[0]; + } + + $this->type = $clearedType; $this->nullable = $nullable; } diff --git a/tests/Feature/Generators/Php8Features/Php8FeaturesTestGeneratorTest.php b/tests/Feature/Generators/Php8Features/Php8FeaturesTestGeneratorTest.php new file mode 100644 index 0000000..e2084c3 --- /dev/null +++ b/tests/Feature/Generators/Php8Features/Php8FeaturesTestGeneratorTest.php @@ -0,0 +1,21 @@ +assertGeneratedIs('Php8Features/Rendered', 'Php8Features/Source', [ + 'implementations' => BasicTestGenerator::implementations(), + ]); + } +} diff --git a/tests/Feature/Resources/Generators/Php8Features/Rendered.stub b/tests/Feature/Resources/Generators/Php8Features/Rendered.stub new file mode 100644 index 0000000..5b94f3d --- /dev/null +++ b/tests/Feature/Resources/Generators/Php8Features/Rendered.stub @@ -0,0 +1,136 @@ +name = '42'; + $this->work = Mockery::mock(Work::class); + $this->person = new Person($this->name, $this->work); + } + + /** + * {@inheritdoc} + */ + protected function tearDown(): void + { + parent::tearDown(); + + unset($this->person); + unset($this->name); + unset($this->work); + } + + public function testGetConnection(): void + { + $expected = Mockery::mock(Connection::class); + $property = (new ReflectionClass(Person::class)) + ->getProperty('connection'); + $property->setAccessible(true); + $property->setValue(null, $expected); + $this->assertSame($expected, Person::getConnection()); + } + + public function testSetConnection(): void + { + $expected = Mockery::mock(Connection::class); + $property = (new ReflectionClass(Person::class)) + ->getProperty('connection'); + $property->setAccessible(true); + Person::setConnection($expected); + $this->assertSame($expected, $property->getValue(null)); + } + + public function testFind(): void + { + /** @todo This test is incomplete. */ + $this->markTestIncomplete(); + } + + public function testSave(): void + { + /** @todo This test is incomplete. */ + $this->markTestIncomplete(); + } + + public function testDelete(): void + { + /** @todo This test is incomplete. */ + $this->markTestIncomplete(); + } + + public function testGetName(): void + { + $expected = '42'; + $property = (new ReflectionClass(Person::class)) + ->getProperty('name'); + $property->setAccessible(true); + $property->setValue($this->person, $expected); + $this->assertSame($expected, $this->person->getName()); + } + + public function testSetName(): void + { + $expected = '42'; + $property = (new ReflectionClass(Person::class)) + ->getProperty('name'); + $property->setAccessible(true); + $this->person->setName($expected); + $this->assertSame($expected, $property->getValue($this->person)); + } + + public function testGetWork(): void + { + $expected = Mockery::mock(Work::class); + $property = (new ReflectionClass(Person::class)) + ->getProperty('work'); + $property->setAccessible(true); + $property->setValue($this->person, $expected); + $this->assertSame($expected, $this->person->getWork()); + } + + public function testSetWork(): void + { + $expected = Mockery::mock(Work::class); + $property = (new ReflectionClass(Person::class)) + ->getProperty('work'); + $property->setAccessible(true); + $this->person->setWork($expected); + $this->assertSame($expected, $property->getValue($this->person)); + } +} diff --git a/tests/Feature/Resources/Generators/Php8Features/Source.stub b/tests/Feature/Resources/Generators/Php8Features/Source.stub new file mode 100644 index 0000000..e4784a9 --- /dev/null +++ b/tests/Feature/Resources/Generators/Php8Features/Source.stub @@ -0,0 +1,53 @@ +getConnection()?->entities?->find(self::class, name: $name); + } + + public function __construct( + protected string $name, + protected Work|SpecialWork $work + ) {} + + public function save(): self + { + } + + public function delete(): self + { + } + + public function getName(): string + { + } + + public function setName(string $name): void + { + } + + public function getWork(): Work|SpecialWork + { + } + + public function setWork(Work $work): void + { + } +} diff --git a/tests/Unit/Container/CoreServiceProviderTest.php b/tests/Unit/Container/CoreServiceProviderTest.php index 7d17cb9..3312384 100644 --- a/tests/Unit/Container/CoreServiceProviderTest.php +++ b/tests/Unit/Container/CoreServiceProviderTest.php @@ -8,6 +8,7 @@ use League\Container\ReflectionContainer; use Mockery; use Mockery\Mock; +use PHPStan\BetterReflection\Reflection\ReflectionClass; use PhpUnitGen\Core\Aware\ClassFactoryAwareTrait; use PhpUnitGen\Core\Aware\ConfigAwareTrait; use PhpUnitGen\Core\Aware\DocumentationFactoryAwareTrait; @@ -49,7 +50,6 @@ use PhpUnitGen\Core\Models\TestClass; use PhpUnitGen\Core\Parsers\CodeParser; use PhpUnitGen\Core\Renderers\Renderer; -use Roave\BetterReflection\Reflection\ReflectionClass; use Tests\PhpUnitGen\Core\TestCase; /** diff --git a/tests/Unit/CoreApplicationTest.php b/tests/Unit/CoreApplicationTest.php index e95560e..c5fa748 100644 --- a/tests/Unit/CoreApplicationTest.php +++ b/tests/Unit/CoreApplicationTest.php @@ -5,6 +5,7 @@ namespace Tests\PhpUnitGen\Core\Unit; use Mockery; +use PHPStan\BetterReflection\Reflection\ReflectionClass; use PhpUnitGen\Core\Contracts\Config\Config; use PhpUnitGen\Core\Contracts\Generators\TestGenerator; use PhpUnitGen\Core\Contracts\Parsers\CodeParser; @@ -14,7 +15,6 @@ use PhpUnitGen\Core\CoreApplication; use PhpUnitGen\Core\Models\TestClass; use Psr\Container\ContainerInterface; -use Roave\BetterReflection\Reflection\ReflectionClass; use Tests\PhpUnitGen\Core\TestCase; /** diff --git a/tests/Unit/Generators/Factories/ClassFactoryTest.php b/tests/Unit/Generators/Factories/ClassFactoryTest.php index 707f476..360e7ac 100644 --- a/tests/Unit/Generators/Factories/ClassFactoryTest.php +++ b/tests/Unit/Generators/Factories/ClassFactoryTest.php @@ -5,12 +5,12 @@ namespace Tests\PhpUnitGen\Core\Unit\Generators\Factories; use Mockery; +use PHPStan\BetterReflection\Reflection\ReflectionClass; use PhpUnitGen\Core\Contracts\Config\Config; use PhpUnitGen\Core\Contracts\Generators\Factories\DocumentationFactory; use PhpUnitGen\Core\Generators\Factories\ClassFactory; use PhpUnitGen\Core\Models\TestClass; use PhpUnitGen\Core\Models\TestDocumentation; -use Roave\BetterReflection\Reflection\ReflectionClass; use Tests\PhpUnitGen\Core\TestCase; /** diff --git a/tests/Unit/Generators/Factories/DocumentationFactoryTest.php b/tests/Unit/Generators/Factories/DocumentationFactoryTest.php index a13059d..d20833e 100644 --- a/tests/Unit/Generators/Factories/DocumentationFactoryTest.php +++ b/tests/Unit/Generators/Factories/DocumentationFactoryTest.php @@ -6,13 +6,13 @@ use Mockery; use Mockery\Mock; +use PHPStan\BetterReflection\Reflection\ReflectionClass; use PhpUnitGen\Core\Contracts\Config\Config; use PhpUnitGen\Core\Generators\Factories\DocumentationFactory; use PhpUnitGen\Core\Models\TestClass; use PhpUnitGen\Core\Models\TestImport; use PhpUnitGen\Core\Models\TestMethod; use PhpUnitGen\Core\Models\TestProperty; -use Roave\BetterReflection\Reflection\ReflectionClass; use Tests\PhpUnitGen\Core\TestCase; use Tightenco\Collect\Support\Collection; diff --git a/tests/Unit/Generators/Factories/ImportFactoryTest.php b/tests/Unit/Generators/Factories/ImportFactoryTest.php index b6c8885..a709c20 100644 --- a/tests/Unit/Generators/Factories/ImportFactoryTest.php +++ b/tests/Unit/Generators/Factories/ImportFactoryTest.php @@ -5,10 +5,10 @@ namespace Tests\PhpUnitGen\Core\Unit\Parsers; use Mockery; +use PHPStan\BetterReflection\Reflection\ReflectionClass; use PhpUnitGen\Core\Generators\Factories\ImportFactory; use PhpUnitGen\Core\Models\TestClass; use PhpUnitGen\Core\Models\TestImport; -use Roave\BetterReflection\Reflection\ReflectionClass; use Tests\PhpUnitGen\Core\TestCase; /** diff --git a/tests/Unit/Generators/Factories/MethodFactoryTest.php b/tests/Unit/Generators/Factories/MethodFactoryTest.php index 0945f46..bb3025e 100644 --- a/tests/Unit/Generators/Factories/MethodFactoryTest.php +++ b/tests/Unit/Generators/Factories/MethodFactoryTest.php @@ -6,6 +6,10 @@ use Mockery; use Mockery\Mock; +use PHPStan\BetterReflection\Reflection\ReflectionClass; +use PHPStan\BetterReflection\Reflection\ReflectionMethod; +use PHPStan\BetterReflection\Reflection\ReflectionParameter; +use PHPStan\BetterReflection\Reflection\ReflectionType; use PhpUnitGen\Core\Contracts\Generators\Factories\DocumentationFactory; use PhpUnitGen\Core\Contracts\Generators\Factories\ImportFactory; use PhpUnitGen\Core\Contracts\Generators\Factories\StatementFactory; @@ -17,10 +21,6 @@ use PhpUnitGen\Core\Models\TestProperty; use PhpUnitGen\Core\Models\TestStatement; use PhpUnitGen\Core\Reflection\ReflectionType as PugReflectionType; -use Roave\BetterReflection\Reflection\ReflectionClass; -use Roave\BetterReflection\Reflection\ReflectionMethod; -use Roave\BetterReflection\Reflection\ReflectionParameter; -use Roave\BetterReflection\Reflection\ReflectionType; use Tests\PhpUnitGen\Core\TestCase; use Tightenco\Collect\Support\Collection; diff --git a/tests/Unit/Generators/Factories/PropertyFactoryTest.php b/tests/Unit/Generators/Factories/PropertyFactoryTest.php index 1d6fa95..9066fbb 100644 --- a/tests/Unit/Generators/Factories/PropertyFactoryTest.php +++ b/tests/Unit/Generators/Factories/PropertyFactoryTest.php @@ -6,6 +6,9 @@ use Mockery; use Mockery\Mock; +use PHPStan\BetterReflection\Reflection\ReflectionClass; +use PHPStan\BetterReflection\Reflection\ReflectionParameter; +use PHPStan\BetterReflection\Reflection\ReflectionType; use PhpUnitGen\Core\Contracts\Generators\Factories\DocumentationFactory; use PhpUnitGen\Core\Contracts\Generators\Factories\ImportFactory; use PhpUnitGen\Core\Contracts\Generators\MockGenerator; @@ -14,9 +17,6 @@ use PhpUnitGen\Core\Models\TestDocumentation; use PhpUnitGen\Core\Models\TestImport; use PhpUnitGen\Core\Models\TestProperty; -use Roave\BetterReflection\Reflection\ReflectionClass; -use Roave\BetterReflection\Reflection\ReflectionParameter; -use Roave\BetterReflection\Reflection\ReflectionType; use Tests\PhpUnitGen\Core\TestCase; use Tightenco\Collect\Support\Collection; diff --git a/tests/Unit/Generators/Factories/StatementFactoryTest.php b/tests/Unit/Generators/Factories/StatementFactoryTest.php index 1e72dfa..79ce53e 100644 --- a/tests/Unit/Generators/Factories/StatementFactoryTest.php +++ b/tests/Unit/Generators/Factories/StatementFactoryTest.php @@ -6,12 +6,12 @@ use Mockery; use Mockery\Mock; +use PHPStan\BetterReflection\Reflection\ReflectionClass; +use PHPStan\BetterReflection\Reflection\ReflectionParameter; use PhpUnitGen\Core\Contracts\Generators\Factories\ImportFactory; use PhpUnitGen\Core\Generators\Factories\StatementFactory; use PhpUnitGen\Core\Models\TestClass; use PhpUnitGen\Core\Models\TestImport; -use Roave\BetterReflection\Reflection\ReflectionClass; -use Roave\BetterReflection\Reflection\ReflectionParameter; use Tests\PhpUnitGen\Core\TestCase; use Tightenco\Collect\Support\Collection; diff --git a/tests/Unit/Generators/Factories/ValueFactoryTest.php b/tests/Unit/Generators/Factories/ValueFactoryTest.php index 7c00267..b620281 100644 --- a/tests/Unit/Generators/Factories/ValueFactoryTest.php +++ b/tests/Unit/Generators/Factories/ValueFactoryTest.php @@ -6,11 +6,11 @@ use Mockery; use Mockery\Mock; +use PHPStan\BetterReflection\Reflection\ReflectionClass; use PhpUnitGen\Core\Contracts\Generators\MockGenerator; use PhpUnitGen\Core\Generators\Factories\ValueFactory; use PhpUnitGen\Core\Models\TestClass; use PhpUnitGen\Core\Reflection\ReflectionType; -use Roave\BetterReflection\Reflection\ReflectionClass; use Tests\PhpUnitGen\Core\TestCase; /** diff --git a/tests/Unit/Generators/Tests/Basic/BasicMethodFactoryTest.php b/tests/Unit/Generators/Tests/Basic/BasicMethodFactoryTest.php index a6038fa..9ee6a96 100644 --- a/tests/Unit/Generators/Tests/Basic/BasicMethodFactoryTest.php +++ b/tests/Unit/Generators/Tests/Basic/BasicMethodFactoryTest.php @@ -6,6 +6,10 @@ use Mockery; use Mockery\Mock; +use PHPStan\BetterReflection\Reflection\ReflectionClass; +use PHPStan\BetterReflection\Reflection\ReflectionMethod; +use PHPStan\BetterReflection\Reflection\ReflectionParameter; +use PHPStan\BetterReflection\Reflection\ReflectionProperty; use PhpUnitGen\Core\Contracts\Generators\Factories\ImportFactory; use PhpUnitGen\Core\Contracts\Generators\Factories\StatementFactory as StatementFactoryContract; use PhpUnitGen\Core\Contracts\Generators\Factories\ValueFactory; @@ -15,10 +19,6 @@ use PhpUnitGen\Core\Models\TestClass; use PhpUnitGen\Core\Models\TestImport; use PhpUnitGen\Core\Models\TestStatement; -use Roave\BetterReflection\Reflection\ReflectionClass; -use Roave\BetterReflection\Reflection\ReflectionMethod; -use Roave\BetterReflection\Reflection\ReflectionParameter; -use Roave\BetterReflection\Reflection\ReflectionProperty; use Tests\PhpUnitGen\Core\TestCase; /** diff --git a/tests/Unit/Generators/Tests/Basic/BasicTestGeneratorTest.php b/tests/Unit/Generators/Tests/Basic/BasicTestGeneratorTest.php index 68e80cd..dc2bb18 100644 --- a/tests/Unit/Generators/Tests/Basic/BasicTestGeneratorTest.php +++ b/tests/Unit/Generators/Tests/Basic/BasicTestGeneratorTest.php @@ -6,6 +6,10 @@ use Mockery; use Mockery\Mock; +use PHPStan\BetterReflection\Reflection\ReflectionClass; +use PHPStan\BetterReflection\Reflection\ReflectionMethod; +use PHPStan\BetterReflection\Reflection\ReflectionParameter; +use PHPStan\BetterReflection\Reflection\ReflectionProperty; use PhpUnitGen\Core\Contracts\Config\Config; use PhpUnitGen\Core\Contracts\Generators\Factories\ClassFactory as ClassFactoryContract; use PhpUnitGen\Core\Contracts\Generators\Factories\DocumentationFactory as DocumentationFactoryContract; @@ -28,10 +32,6 @@ use PhpUnitGen\Core\Models\TestImport; use PhpUnitGen\Core\Models\TestMethod; use PhpUnitGen\Core\Models\TestProperty; -use Roave\BetterReflection\Reflection\ReflectionClass; -use Roave\BetterReflection\Reflection\ReflectionMethod; -use Roave\BetterReflection\Reflection\ReflectionParameter; -use Roave\BetterReflection\Reflection\ReflectionProperty; use Tests\PhpUnitGen\Core\TestCase; /** diff --git a/tests/Unit/Generators/Tests/DelegateTestGeneratorTest.php b/tests/Unit/Generators/Tests/DelegateTestGeneratorTest.php index 67009c5..66f4a28 100644 --- a/tests/Unit/Generators/Tests/DelegateTestGeneratorTest.php +++ b/tests/Unit/Generators/Tests/DelegateTestGeneratorTest.php @@ -7,6 +7,7 @@ use League\Container\Container; use Mockery; use Mockery\Mock; +use PHPStan\BetterReflection\Reflection\ReflectionClass; use PHPUnit\Framework\MockObject\MockObject; use PhpUnitGen\Core\Config\Config; use PhpUnitGen\Core\Contracts\Config\Config as ConfigContract; @@ -42,7 +43,6 @@ use PhpUnitGen\Core\Generators\Tests\Laravel\UnitClassFactory; use PhpUnitGen\Core\Models\TestClass; use Psr\Container\ContainerInterface; -use Roave\BetterReflection\Reflection\ReflectionClass; use Tests\PhpUnitGen\Core\TestCase; /** diff --git a/tests/Unit/Generators/Tests/Laravel/Channel/ChannelMethodFactoryTest.php b/tests/Unit/Generators/Tests/Laravel/Channel/ChannelMethodFactoryTest.php index 123378e..5f7b5d0 100644 --- a/tests/Unit/Generators/Tests/Laravel/Channel/ChannelMethodFactoryTest.php +++ b/tests/Unit/Generators/Tests/Laravel/Channel/ChannelMethodFactoryTest.php @@ -6,6 +6,9 @@ use Mockery; use Mockery\Mock; +use PHPStan\BetterReflection\Reflection\ReflectionClass; +use PHPStan\BetterReflection\Reflection\ReflectionMethod; +use PHPStan\BetterReflection\Reflection\ReflectionProperty; use PhpUnitGen\Core\Contracts\Config\Config; use PhpUnitGen\Core\Contracts\Generators\Factories\DocumentationFactory; use PhpUnitGen\Core\Contracts\Generators\Factories\ImportFactory; @@ -18,9 +21,6 @@ use PhpUnitGen\Core\Models\TestDocumentation; use PhpUnitGen\Core\Models\TestImport; use PhpUnitGen\Core\Models\TestStatement; -use Roave\BetterReflection\Reflection\ReflectionClass; -use Roave\BetterReflection\Reflection\ReflectionMethod; -use Roave\BetterReflection\Reflection\ReflectionProperty; use Tests\PhpUnitGen\Core\TestCase; use Tightenco\Collect\Support\Collection; diff --git a/tests/Unit/Generators/Tests/Laravel/Channel/ChannelTestGeneratorTest.php b/tests/Unit/Generators/Tests/Laravel/Channel/ChannelTestGeneratorTest.php index 858dc15..167268b 100644 --- a/tests/Unit/Generators/Tests/Laravel/Channel/ChannelTestGeneratorTest.php +++ b/tests/Unit/Generators/Tests/Laravel/Channel/ChannelTestGeneratorTest.php @@ -6,6 +6,9 @@ use Mockery; use Mockery\Mock; +use PHPStan\BetterReflection\Reflection\ReflectionClass; +use PHPStan\BetterReflection\Reflection\ReflectionMethod; +use PHPStan\BetterReflection\Reflection\ReflectionProperty; use PhpUnitGen\Core\Contracts\Config\Config; use PhpUnitGen\Core\Contracts\Generators\Factories\ClassFactory as ClassFactoryContract; use PhpUnitGen\Core\Contracts\Generators\Factories\DocumentationFactory as DocumentationFactoryContract; @@ -25,9 +28,6 @@ use PhpUnitGen\Core\Generators\Tests\Laravel\UnitClassFactory; use PhpUnitGen\Core\Models\TestClass; use ReflectionException; -use Roave\BetterReflection\Reflection\ReflectionClass; -use Roave\BetterReflection\Reflection\ReflectionMethod; -use Roave\BetterReflection\Reflection\ReflectionProperty; use Tests\PhpUnitGen\Core\TestCase; /** diff --git a/tests/Unit/Generators/Tests/Laravel/Command/CommandMethodFactoryTest.php b/tests/Unit/Generators/Tests/Laravel/Command/CommandMethodFactoryTest.php index e5c46f0..13552c3 100644 --- a/tests/Unit/Generators/Tests/Laravel/Command/CommandMethodFactoryTest.php +++ b/tests/Unit/Generators/Tests/Laravel/Command/CommandMethodFactoryTest.php @@ -7,6 +7,9 @@ use Error; use Mockery; use Mockery\Mock; +use PHPStan\BetterReflection\Reflection\ReflectionClass; +use PHPStan\BetterReflection\Reflection\ReflectionMethod; +use PHPStan\BetterReflection\Reflection\ReflectionProperty; use PhpUnitGen\Core\Contracts\Generators\Factories\DocumentationFactory; use PhpUnitGen\Core\Contracts\Generators\Factories\ImportFactory; use PhpUnitGen\Core\Contracts\Generators\Factories\StatementFactory; @@ -18,9 +21,6 @@ use PhpUnitGen\Core\Models\TestDocumentation; use PhpUnitGen\Core\Models\TestImport; use PhpUnitGen\Core\Models\TestStatement; -use Roave\BetterReflection\Reflection\ReflectionClass; -use Roave\BetterReflection\Reflection\ReflectionMethod; -use Roave\BetterReflection\Reflection\ReflectionProperty; use Tests\PhpUnitGen\Core\TestCase; use Tightenco\Collect\Support\Collection; diff --git a/tests/Unit/Generators/Tests/Laravel/Command/CommandTestGeneratorTest.php b/tests/Unit/Generators/Tests/Laravel/Command/CommandTestGeneratorTest.php index 161109f..2cf8403 100644 --- a/tests/Unit/Generators/Tests/Laravel/Command/CommandTestGeneratorTest.php +++ b/tests/Unit/Generators/Tests/Laravel/Command/CommandTestGeneratorTest.php @@ -6,6 +6,9 @@ use Mockery; use Mockery\Mock; +use PHPStan\BetterReflection\Reflection\ReflectionClass; +use PHPStan\BetterReflection\Reflection\ReflectionMethod; +use PHPStan\BetterReflection\Reflection\ReflectionProperty; use PhpUnitGen\Core\Contracts\Config\Config; use PhpUnitGen\Core\Contracts\Generators\Factories\ClassFactory as ClassFactoryContract; use PhpUnitGen\Core\Contracts\Generators\Factories\DocumentationFactory as DocumentationFactoryContract; @@ -25,9 +28,6 @@ use PhpUnitGen\Core\Generators\Tests\Laravel\FeatureClassFactory; use PhpUnitGen\Core\Models\TestClass; use ReflectionException; -use Roave\BetterReflection\Reflection\ReflectionClass; -use Roave\BetterReflection\Reflection\ReflectionMethod; -use Roave\BetterReflection\Reflection\ReflectionProperty; use Tests\PhpUnitGen\Core\TestCase; /** diff --git a/tests/Unit/Generators/Tests/Laravel/FeatureClassFactoryTest.php b/tests/Unit/Generators/Tests/Laravel/FeatureClassFactoryTest.php index ac593e5..11fbec8 100644 --- a/tests/Unit/Generators/Tests/Laravel/FeatureClassFactoryTest.php +++ b/tests/Unit/Generators/Tests/Laravel/FeatureClassFactoryTest.php @@ -5,12 +5,12 @@ namespace Tests\PhpUnitGen\Core\Unit\Generators\Tests\Laravel; use Mockery; +use PHPStan\BetterReflection\Reflection\ReflectionClass; use PhpUnitGen\Core\Contracts\Config\Config; use PhpUnitGen\Core\Contracts\Generators\Factories\DocumentationFactory; use PhpUnitGen\Core\Generators\Tests\Laravel\FeatureClassFactory; use PhpUnitGen\Core\Models\TestClass; use PhpUnitGen\Core\Models\TestDocumentation; -use Roave\BetterReflection\Reflection\ReflectionClass; use Tests\PhpUnitGen\Core\TestCase; /** diff --git a/tests/Unit/Generators/Tests/Laravel/Policy/PolicyMethodFactoryTest.php b/tests/Unit/Generators/Tests/Laravel/Policy/PolicyMethodFactoryTest.php index 54b12ad..d896f33 100644 --- a/tests/Unit/Generators/Tests/Laravel/Policy/PolicyMethodFactoryTest.php +++ b/tests/Unit/Generators/Tests/Laravel/Policy/PolicyMethodFactoryTest.php @@ -6,6 +6,11 @@ use Mockery; use Mockery\Mock; +use PHPStan\BetterReflection\Reflection\ReflectionClass; +use PHPStan\BetterReflection\Reflection\ReflectionMethod; +use PHPStan\BetterReflection\Reflection\ReflectionParameter; +use PHPStan\BetterReflection\Reflection\ReflectionProperty; +use PHPStan\BetterReflection\Reflection\ReflectionType; use PhpUnitGen\Core\Contracts\Config\Config; use PhpUnitGen\Core\Contracts\Generators\Factories\DocumentationFactory; use PhpUnitGen\Core\Contracts\Generators\Factories\ImportFactory; @@ -19,11 +24,6 @@ use PhpUnitGen\Core\Models\TestImport; use PhpUnitGen\Core\Models\TestStatement; use PhpUnitGen\Core\Reflection\ReflectionType as PugReflectionType; -use Roave\BetterReflection\Reflection\ReflectionClass; -use Roave\BetterReflection\Reflection\ReflectionMethod; -use Roave\BetterReflection\Reflection\ReflectionParameter; -use Roave\BetterReflection\Reflection\ReflectionProperty; -use Roave\BetterReflection\Reflection\ReflectionType; use Tests\PhpUnitGen\Core\TestCase; use Tightenco\Collect\Support\Collection; diff --git a/tests/Unit/Generators/Tests/Laravel/Policy/PolicyTestGeneratorTest.php b/tests/Unit/Generators/Tests/Laravel/Policy/PolicyTestGeneratorTest.php index a25e5d5..e3b23a8 100644 --- a/tests/Unit/Generators/Tests/Laravel/Policy/PolicyTestGeneratorTest.php +++ b/tests/Unit/Generators/Tests/Laravel/Policy/PolicyTestGeneratorTest.php @@ -6,6 +6,9 @@ use Mockery; use Mockery\Mock; +use PHPStan\BetterReflection\Reflection\ReflectionClass; +use PHPStan\BetterReflection\Reflection\ReflectionMethod; +use PHPStan\BetterReflection\Reflection\ReflectionProperty; use PhpUnitGen\Core\Contracts\Config\Config; use PhpUnitGen\Core\Contracts\Generators\Factories\ClassFactory as ClassFactoryContract; use PhpUnitGen\Core\Contracts\Generators\Factories\DocumentationFactory as DocumentationFactoryContract; @@ -26,9 +29,6 @@ use PhpUnitGen\Core\Models\TestClass; use PhpUnitGen\Core\Models\TestProperty; use ReflectionException; -use Roave\BetterReflection\Reflection\ReflectionClass; -use Roave\BetterReflection\Reflection\ReflectionMethod; -use Roave\BetterReflection\Reflection\ReflectionProperty; use Tests\PhpUnitGen\Core\TestCase; /** diff --git a/tests/Unit/Generators/Tests/Laravel/UnitClassFactoryTest.php b/tests/Unit/Generators/Tests/Laravel/UnitClassFactoryTest.php index 29f5f00..fc73198 100644 --- a/tests/Unit/Generators/Tests/Laravel/UnitClassFactoryTest.php +++ b/tests/Unit/Generators/Tests/Laravel/UnitClassFactoryTest.php @@ -5,12 +5,12 @@ namespace Tests\PhpUnitGen\Core\Unit\Generators\Tests\Laravel; use Mockery; +use PHPStan\BetterReflection\Reflection\ReflectionClass; use PhpUnitGen\Core\Contracts\Config\Config; use PhpUnitGen\Core\Contracts\Generators\Factories\DocumentationFactory; use PhpUnitGen\Core\Generators\Tests\Laravel\UnitClassFactory; use PhpUnitGen\Core\Models\TestClass; use PhpUnitGen\Core\Models\TestDocumentation; -use Roave\BetterReflection\Reflection\ReflectionClass; use Tests\PhpUnitGen\Core\TestCase; /** diff --git a/tests/Unit/Helpers/ReflectTest.php b/tests/Unit/Helpers/ReflectTest.php index 06a9838..af55518 100644 --- a/tests/Unit/Helpers/ReflectTest.php +++ b/tests/Unit/Helpers/ReflectTest.php @@ -9,12 +9,12 @@ use phpDocumentor\Reflection\DocBlockFactoryInterface; use phpDocumentor\Reflection\Types\Null_; use phpDocumentor\Reflection\Types\String_; +use PHPStan\BetterReflection\Reflection\ReflectionClass; +use PHPStan\BetterReflection\Reflection\ReflectionMethod; +use PHPStan\BetterReflection\Reflection\ReflectionParameter; +use PHPStan\BetterReflection\Reflection\ReflectionProperty; +use PHPStan\BetterReflection\Reflection\ReflectionType; use PhpUnitGen\Core\Helpers\Reflect; -use Roave\BetterReflection\Reflection\ReflectionClass; -use Roave\BetterReflection\Reflection\ReflectionMethod; -use Roave\BetterReflection\Reflection\ReflectionParameter; -use Roave\BetterReflection\Reflection\ReflectionProperty; -use Roave\BetterReflection\Reflection\ReflectionType; use Tests\PhpUnitGen\Core\TestCase; /** diff --git a/tests/Unit/Models/TestClassTest.php b/tests/Unit/Models/TestClassTest.php index dbcad40..100f60b 100644 --- a/tests/Unit/Models/TestClassTest.php +++ b/tests/Unit/Models/TestClassTest.php @@ -5,6 +5,7 @@ namespace Tests\PhpUnitGen\Core\Unit\Models; use Mockery; +use PHPStan\BetterReflection\Reflection\ReflectionClass; use PhpUnitGen\Core\Contracts\Renderers\Renderer; use PhpUnitGen\Core\Models\TestClass; use PhpUnitGen\Core\Models\TestDocumentation; @@ -12,7 +13,6 @@ use PhpUnitGen\Core\Models\TestMethod; use PhpUnitGen\Core\Models\TestProperty; use PhpUnitGen\Core\Models\TestTrait; -use Roave\BetterReflection\Reflection\ReflectionClass; use Tests\PhpUnitGen\Core\TestCase; /** diff --git a/tests/Unit/Parsers/CodeParserTest.php b/tests/Unit/Parsers/CodeParserTest.php index b099d77..d7367b7 100644 --- a/tests/Unit/Parsers/CodeParserTest.php +++ b/tests/Unit/Parsers/CodeParserTest.php @@ -5,10 +5,10 @@ namespace Tests\PhpUnitGen\Core\Unit\Parsers; use Mockery\Mock; +use PHPStan\BetterReflection\BetterReflection; use PhpUnitGen\Core\Exceptions\InvalidArgumentException; use PhpUnitGen\Core\Parsers\CodeParser; use PhpUnitGen\Core\Parsers\Sources\StringSource; -use Roave\BetterReflection\BetterReflection; use Tests\PhpUnitGen\Core\TestCase; /** diff --git a/tests/Unit/Reflection/ReflectionTypeTest.php b/tests/Unit/Reflection/ReflectionTypeTest.php index 10c2db2..c530e83 100644 --- a/tests/Unit/Reflection/ReflectionTypeTest.php +++ b/tests/Unit/Reflection/ReflectionTypeTest.php @@ -3,8 +3,8 @@ namespace Tests\PhpUnitGen\Core\Unit\Reflection; use Mockery; +use PHPStan\BetterReflection\Reflection\ReflectionType as BetterReflectionType; use PhpUnitGen\Core\Reflection\ReflectionType; -use Roave\BetterReflection\Reflection\ReflectionType as BetterReflectionType; use Tests\PhpUnitGen\Core\TestCase; /** diff --git a/tests/Unit/Renderers/RendererTest.php b/tests/Unit/Renderers/RendererTest.php index 8417bb3..d2c93d2 100644 --- a/tests/Unit/Renderers/RendererTest.php +++ b/tests/Unit/Renderers/RendererTest.php @@ -5,6 +5,7 @@ namespace Tests\PhpUnitGen\Core\Unit\Renderers; use Mockery; +use PHPStan\BetterReflection\Reflection\ReflectionClass; use PhpUnitGen\Core\Models\TestClass; use PhpUnitGen\Core\Models\TestDocumentation; use PhpUnitGen\Core\Models\TestImport; @@ -16,7 +17,6 @@ use PhpUnitGen\Core\Models\TestTrait; use PhpUnitGen\Core\Renderers\RenderedLine; use PhpUnitGen\Core\Renderers\Renderer; -use Roave\BetterReflection\Reflection\ReflectionClass; use Tests\PhpUnitGen\Core\TestCase; /**