Removed all conditional logic for tests supporting PHP versions less …

…than 8.1 (thecodingmachine#630)
realFlowControl · Oct 20, 2023 · c906c66 · c906c66
1 parent 3c4045a
commit c906c66
Show file tree

Hide file tree

Showing 20 changed files with 44 additions and 133 deletions.
diff --git a/src/SchemaFactory.php b/src/SchemaFactory.php
@@ -381,14 +381,9 @@ public function createSchema(): Schema
 
         $errorRootTypeMapper = new FinalRootTypeMapper($recursiveTypeMapper);
         $rootTypeMapper = new BaseTypeMapper($errorRootTypeMapper, $recursiveTypeMapper, $topRootTypeMapper);
-
-        if (interface_exists(UnitEnum::class)) {
-            $rootTypeMapper = new EnumTypeMapper($rootTypeMapper, $annotationReader, $symfonyCache, $nsList);
-        }
-
-        if (class_exists(Enum::class)) {
-            $rootTypeMapper = new MyCLabsEnumTypeMapper($rootTypeMapper, $annotationReader, $symfonyCache, $nsList);
-        }
+        $rootTypeMapper = new EnumTypeMapper($rootTypeMapper, $annotationReader, $symfonyCache, $nsList);
+        // Annotation support - deprecated
+        $rootTypeMapper = new MyCLabsEnumTypeMapper($rootTypeMapper, $annotationReader, $symfonyCache, $nsList);
 
         if (! empty($this->rootTypeMapperFactories)) {
             $rootSchemaFactoryContext = new RootTypeMapperFactoryContext(

diff --git a/tests/AbstractQueryProviderTest.php b/tests/AbstractQueryProviderTest.php
@@ -356,21 +356,20 @@ protected function buildRootTypeMapper(): RootTypeMapperInterface
             $topRootTypeMapper
         );
 
+        // Annotation support - deprecated
         $rootTypeMapper = new MyCLabsEnumTypeMapper(
             $rootTypeMapper,
             $this->getAnnotationReader(),
             $arrayAdapter,
             []
         );
 
-        if (interface_exists(UnitEnum::class)) {
-            $rootTypeMapper = new EnumTypeMapper(
-                $rootTypeMapper,
-                $this->getAnnotationReader(),
-                $arrayAdapter,
-                []
-            );
-        }
+        $rootTypeMapper = new EnumTypeMapper(
+            $rootTypeMapper,
+            $this->getAnnotationReader(),
+            $arrayAdapter,
+            []
+        );
 
         $rootTypeMapper = new CompoundTypeMapper(
             $rootTypeMapper,

diff --git a/tests/AnnotationReaderTest.php b/tests/AnnotationReaderTest.php
@@ -154,9 +154,6 @@ public function testEmptyGetParameterAnnotations(): void
         $this->assertEmpty($annotationReader->getParameterAnnotationsPerParameter([]));
     }
 
-    /**
-     * @requires PHP >= 8.0
-     */
     public function testPhp8AttributeClassAnnotation(): void
     {
         $annotationReader = new AnnotationReader(new DoctrineAnnotationReader());
@@ -169,9 +166,6 @@ public function testPhp8AttributeClassAnnotation(): void
         //$this->assertSame($type, $type2, 'Assert some cache is available');
     }
 
-    /**
-     * @requires PHP >= 8.0
-     */
     public function testPhp8AttributeClassAnnotations(): void
     {
         $annotationReader = new AnnotationReader(new DoctrineAnnotationReader());
@@ -181,9 +175,6 @@ public function testPhp8AttributeClassAnnotations(): void
         $this->assertCount(3, $types);
     }
 
-    /**
-     * @requires PHP >= 8.0
-     */
     public function testPhp8AttributeMethodAnnotation(): void
     {
         $annotationReader = new AnnotationReader(new DoctrineAnnotationReader());
@@ -192,9 +183,6 @@ public function testPhp8AttributeMethodAnnotation(): void
         $this->assertInstanceOf(Field::class, $type);
     }
 
-    /**
-     * @requires PHP >= 8.0
-     */
     public function testPhp8AttributeMethodAnnotations(): void
     {
         $annotationReader = new AnnotationReader(new DoctrineAnnotationReader());
@@ -209,9 +197,6 @@ public function testPhp8AttributeMethodAnnotations(): void
         $this->assertTrue($securitys[1]->isFailWithSet());
     }
 
-    /**
-     * @requires PHP >= 8.0
-     */
     public function testPhp8AttributeParameterAnnotations(): void
     {
         $annotationReader = new AnnotationReader(new DoctrineAnnotationReader());

diff --git a/tests/Annotations/DecorateTest.php b/tests/Annotations/DecorateTest.php
@@ -16,9 +16,6 @@ public function testException(): void
         new Decorate([]);
     }
 
-    /**
-     * @requires PHP >= 8.0
-     */
     public function testPhp8Annotation(): void
     {
         $method = new ReflectionMethod(__CLASS__, 'method1');

diff --git a/tests/Annotations/FailWithTest.php b/tests/Annotations/FailWithTest.php
@@ -16,9 +16,6 @@ public function testException(): void
         new FailWith([]);
     }
 
-    /**
-     * @requires PHP >= 8.0
-     */
     public function testPhp8Annotation(): void
     {
         $method = new ReflectionMethod(__CLASS__, 'method1');

diff --git a/tests/Annotations/RightTest.php b/tests/Annotations/RightTest.php
@@ -16,9 +16,6 @@ public function testException(): void
         new Right([]);
     }
 
-    /**
-     * @requires PHP >= 8.0
-     */
     public function testPhp8Annotation(): void
     {
         $method = new ReflectionMethod(__CLASS__, 'method1');

diff --git a/tests/Annotations/UseInputTypeTest.php b/tests/Annotations/UseInputTypeTest.php
@@ -23,9 +23,6 @@ public function testException2(): void
         (new UseInputType(['inputType' => 'foo']))->getTarget();
     }
 
-    /**
-     * @requires PHP >= 8.0
-     */
     public function testPhp8Annotation(): void
     {
         $attribute = new UseInputType('foo');

diff --git a/tests/FieldsBuilderTest.php b/tests/FieldsBuilderTest.php
@@ -70,8 +70,8 @@
 use TheCodingMachine\GraphQLite\Security\VoidAuthenticationService;
 use TheCodingMachine\GraphQLite\Security\VoidAuthorizationService;
 use TheCodingMachine\GraphQLite\Annotations\Query;
-use TheCodingMachine\GraphQLite\Fixtures80\PropertyPromotionInputType;
-use TheCodingMachine\GraphQLite\Fixtures80\PropertyPromotionInputTypeWithoutGenericDoc;
+use TheCodingMachine\GraphQLite\Fixtures\PropertyPromotionInputType;
+use TheCodingMachine\GraphQLite\Fixtures\PropertyPromotionInputTypeWithoutGenericDoc;
 use TheCodingMachine\GraphQLite\Types\DateTimeType;
 use TheCodingMachine\GraphQLite\Types\VoidType;
 
@@ -203,8 +203,6 @@ public function test($typeHintInDocBlock)
     /**
      * Tests that the fields builder will fail when a parameter is missing it's generic docblock
      * definition, when required - an array, for instance, or could be a collection (List types)
-     *
-     * @requires PHP >= 8.0
      */
     public function testTypeMissingForPropertyPromotionWithoutGenericDoc(): void
     {
@@ -221,8 +219,6 @@ public function testTypeMissingForPropertyPromotionWithoutGenericDoc(): void
     /**
      * Tests that the fields builder will properly build an input type using property promotion
      * with the generic docblock defined on the constructor and not the property directly.
-     *
-     * @requires PHP >= 8.0
      */
     public function testTypeInDocBlockWithPropertyPromotion(): void
     {

diff --git a/...egration/Controllers/ButtonController.php → ...egration/Controllers/ButtonController.php b/...egration/Controllers/ButtonController.php → ...egration/Controllers/ButtonController.php
@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace TheCodingMachine\GraphQLite\Fixtures81\Integration\Controllers;
+namespace TheCodingMachine\GraphQLite\Fixtures\Integration\Controllers;
 
 use TheCodingMachine\GraphQLite\Annotations\Mutation;
 use TheCodingMachine\GraphQLite\Annotations\Query;
-use TheCodingMachine\GraphQLite\Fixtures81\Integration\Models\Button;
-use TheCodingMachine\GraphQLite\Fixtures81\Integration\Models\Color;
-use TheCodingMachine\GraphQLite\Fixtures81\Integration\Models\Position;
-use TheCodingMachine\GraphQLite\Fixtures81\Integration\Models\Size;
+use TheCodingMachine\GraphQLite\Fixtures\Integration\Models\Button;
+use TheCodingMachine\GraphQLite\Fixtures\Integration\Models\Color;
+use TheCodingMachine\GraphQLite\Fixtures\Integration\Models\Position;
+use TheCodingMachine\GraphQLite\Fixtures\Integration\Models\Size;
 use TheCodingMachine\GraphQLite\Types\ID;
 
 final class ButtonController

diff --git a/.../Fixtures81/Integration/Models/Button.php → tests/Fixtures/Integration/Models/Button.php b/.../Fixtures81/Integration/Models/Button.php → tests/Fixtures/Integration/Models/Button.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TheCodingMachine\GraphQLite\Fixtures81\Integration\Models;
+namespace TheCodingMachine\GraphQLite\Fixtures\Integration\Models;
 
 use TheCodingMachine\GraphQLite\Annotations\Field;
 use TheCodingMachine\GraphQLite\Annotations\Type;

diff --git a/...s/Fixtures81/Integration/Models/Color.php → tests/Fixtures/Integration/Models/Color.php b/...s/Fixtures81/Integration/Models/Color.php → tests/Fixtures/Integration/Models/Color.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TheCodingMachine\GraphQLite\Fixtures81\Integration\Models;
+namespace TheCodingMachine\GraphQLite\Fixtures\Integration\Models;
 
 use TheCodingMachine\GraphQLite\Annotations\Type;
 

diff --git a/...ixtures81/Integration/Models/Position.php → .../Fixtures/Integration/Models/Position.php b/...ixtures81/Integration/Models/Position.php → .../Fixtures/Integration/Models/Position.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TheCodingMachine\GraphQLite\Fixtures81\Integration\Models;
+namespace TheCodingMachine\GraphQLite\Fixtures\Integration\Models;
 
 use TheCodingMachine\GraphQLite\Annotations\Type;
 

diff --git a/tests/Fixtures81/Integration/Models/Size.php → tests/Fixtures/Integration/Models/Size.php b/tests/Fixtures81/Integration/Models/Size.php → tests/Fixtures/Integration/Models/Size.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TheCodingMachine\GraphQLite\Fixtures81\Integration\Models;
+namespace TheCodingMachine\GraphQLite\Fixtures\Integration\Models;
 
 use TheCodingMachine\GraphQLite\Annotations\Type;
 

diff --git a/...Fixtures80/PropertyPromotionInputType.php → ...s/Fixtures/PropertyPromotionInputType.php b/...Fixtures80/PropertyPromotionInputType.php → ...s/Fixtures/PropertyPromotionInputType.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TheCodingMachine\GraphQLite\Fixtures80;
+namespace TheCodingMachine\GraphQLite\Fixtures;
 
 use TheCodingMachine\GraphQLite\Annotations as GraphQLite;
 

diff --git a/...tyPromotionInputTypeWithoutGenericDoc.php → ...tyPromotionInputTypeWithoutGenericDoc.php b/...tyPromotionInputTypeWithoutGenericDoc.php → ...tyPromotionInputTypeWithoutGenericDoc.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TheCodingMachine\GraphQLite\Fixtures80;
+namespace TheCodingMachine\GraphQLite\Fixtures;
 
 use TheCodingMachine\GraphQLite\Annotations as GraphQLite;
 

diff --git a/tests/Fixtures80/UnionOutputType.php → tests/Fixtures/UnionOutputType.php b/tests/Fixtures80/UnionOutputType.php → tests/Fixtures/UnionOutputType.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TheCodingMachine\GraphQLite\Fixtures80;
+namespace TheCodingMachine\GraphQLite\Fixtures;
 
 use TheCodingMachine\GraphQLite\Fixtures\TestObject;
 use TheCodingMachine\GraphQLite\Fixtures\TestObject2;

diff --git a/tests/Integration/EndToEndTest.php b/tests/Integration/EndToEndTest.php
@@ -24,9 +24,9 @@
 use TheCodingMachine\GraphQLite\FieldsBuilder;
 use TheCodingMachine\GraphQLite\Fixtures\Inputs\ValidationException;
 use TheCodingMachine\GraphQLite\Fixtures\Inputs\Validator;
-use TheCodingMachine\GraphQLite\Fixtures81\Integration\Models\Color;
-use TheCodingMachine\GraphQLite\Fixtures81\Integration\Models\Position;
-use TheCodingMachine\GraphQLite\Fixtures81\Integration\Models\Size;
+use TheCodingMachine\GraphQLite\Fixtures\Integration\Models\Color;
+use TheCodingMachine\GraphQLite\Fixtures\Integration\Models\Position;
+use TheCodingMachine\GraphQLite\Fixtures\Integration\Models\Size;
 use TheCodingMachine\GraphQLite\GlobControllerQueryProvider;
 use TheCodingMachine\GraphQLite\GraphQLRuntimeException;
 use TheCodingMachine\GraphQLite\InputTypeGenerator;