Merge pull request #108 from thecodingmachine/dependabot/composer/php…

…unit/phpunit-tw-7.5.9or-tw-8.0.0 Update phpunit/phpunit requirement from ^7.5.9 to ^7.5.9 || ^8.0.0
thecodingmachine · Jul 9, 2019 · 35fb733 · 35fb733
2 parents e339be7 + 897e11e
commit 35fb733
Show file tree

Hide file tree

Showing 49 changed files with 181 additions and 179 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,5 @@ website/i18n/*
 /tests/dependencies/graphqlite-bundle/
 /tests/dependencies/graphqlite-laravel/
 /tests/dependencies/graphqlite-universal-service-provider/
+
+.phpunit.result.cache
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
         "ocramius/package-versions": "^1.4"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.5.9",
+        "phpunit/phpunit": "^8.2.4",
         "php-coveralls/php-coveralls": "^2.1",
         "mouf/picotainer": "^1.1",
         "phpstan/phpstan": "^0.11",

diff --git a/tests/AggregateControllerQueryProviderTest.php b/tests/AggregateControllerQueryProviderTest.php
@@ -13,7 +13,7 @@
 
 class AggregateControllerQueryProviderTest extends AbstractQueryProviderTest
 {
-    public function testAggregate()
+    public function testAggregate(): void
     {
         $controller = new TestController();
 

diff --git a/tests/AggregateQueryProviderTest.php b/tests/AggregateQueryProviderTest.php
@@ -24,7 +24,7 @@ public function getMutations(): array
         };
     }
 
-    public function testGetMutations()
+    public function testGetMutations(): void
     {
         $aggregateQueryProvider = new AggregateQueryProvider([$this->getMockQueryProvider(), $this->getMockQueryProvider()]);
         $this->assertCount(2, $aggregateQueryProvider->getMutations());
@@ -33,7 +33,7 @@ public function testGetMutations()
         $this->assertCount(0, $aggregateQueryProvider->getMutations());
     }
 
-    public function testGetQueries()
+    public function testGetQueries(): void
     {
         $aggregateQueryProvider = new AggregateQueryProvider([$this->getMockQueryProvider(), $this->getMockQueryProvider()]);
         $this->assertCount(2, $aggregateQueryProvider->getQueries());

diff --git a/tests/AnnotationReaderTest.php b/tests/AnnotationReaderTest.php
@@ -17,101 +17,101 @@
 
 class AnnotationReaderTest extends TestCase
 {
-    public function testBadConstructor()
+    public function testBadConstructor(): void
     {
         $this->expectException(InvalidArgumentException::class);
         new AnnotationReader(new DoctrineAnnotationReader(), 'foo');
     }
 
-    public function testStrictMode()
+    public function testStrictMode(): void
     {
         $annotationReader = new AnnotationReader(new DoctrineAnnotationReader(), AnnotationReader::STRICT_MODE, []);
 
         $this->expectException(AnnotationException::class);
         $annotationReader->getTypeAnnotation(new ReflectionClass(ClassWithInvalidClassAnnotation::class));
     }
 
-    public function testLaxModeWithBadAnnotation()
+    public function testLaxModeWithBadAnnotation(): void
     {
         $annotationReader = new AnnotationReader(new DoctrineAnnotationReader(), AnnotationReader::LAX_MODE, []);
 
         $type = $annotationReader->getTypeAnnotation(new ReflectionClass(ClassWithInvalidClassAnnotation::class));
         $this->assertNull($type);
     }
 
-    public function testLaxModeWithSmellyAnnotation()
+    public function testLaxModeWithSmellyAnnotation(): void
     {
         $annotationReader = new AnnotationReader(new DoctrineAnnotationReader(), AnnotationReader::LAX_MODE, []);
 
         $this->expectException(AnnotationException::class);
         $annotationReader->getTypeAnnotation(new ReflectionClass(ClassWithInvalidTypeAnnotation::class));
     }
 
-    public function testLaxModeWithBadAnnotationAndStrictNamespace()
+    public function testLaxModeWithBadAnnotationAndStrictNamespace(): void
     {
         $annotationReader = new AnnotationReader(new DoctrineAnnotationReader(), AnnotationReader::LAX_MODE, ['TheCodingMachine\\GraphQLite\\Fixtures']);
 
         $this->expectException(AnnotationException::class);
         $annotationReader->getTypeAnnotation(new ReflectionClass(ClassWithInvalidClassAnnotation::class));
     }
 
-    public function testGetAnnotationsStrictMode()
+    public function testGetAnnotationsStrictMode(): void
     {
         $annotationReader = new AnnotationReader(new DoctrineAnnotationReader(), AnnotationReader::STRICT_MODE, []);
 
         $this->expectException(AnnotationException::class);
         $annotationReader->getClassAnnotations(new ReflectionClass(ClassWithInvalidClassAnnotation::class), Type::class);
     }
 
-    public function testGetAnnotationsLaxModeWithBadAnnotation()
+    public function testGetAnnotationsLaxModeWithBadAnnotation(): void
     {
         $annotationReader = new AnnotationReader(new DoctrineAnnotationReader(), AnnotationReader::LAX_MODE, []);
 
         $types = $annotationReader->getClassAnnotations(new ReflectionClass(ClassWithInvalidClassAnnotation::class), Type::class);
         $this->assertSame([], $types);
     }
 
-    public function testGetAnnotationsLaxModeWithSmellyAnnotation()
+    public function testGetAnnotationsLaxModeWithSmellyAnnotation(): void
     {
         $annotationReader = new AnnotationReader(new DoctrineAnnotationReader(), AnnotationReader::LAX_MODE, []);
 
         $this->expectException(AnnotationException::class);
         $annotationReader->getClassAnnotations(new ReflectionClass(ClassWithInvalidTypeAnnotation::class), Type::class);
     }
 
-    public function testGetAnnotationsLaxModeWithBadAnnotationAndStrictNamespace()
+    public function testGetAnnotationsLaxModeWithBadAnnotationAndStrictNamespace(): void
     {
         $annotationReader = new AnnotationReader(new DoctrineAnnotationReader(), AnnotationReader::LAX_MODE, ['TheCodingMachine\\GraphQLite\\Fixtures']);
 
         $this->expectException(AnnotationException::class);
         $annotationReader->getClassAnnotations(new ReflectionClass(ClassWithInvalidClassAnnotation::class), Type::class);
     }
 
-    public function testMethodStrictMode()
+    public function testMethodStrictMode(): void
     {
         $annotationReader = new AnnotationReader(new DoctrineAnnotationReader(), AnnotationReader::STRICT_MODE, []);
 
         $this->expectException(AnnotationException::class);
         $annotationReader->getRequestAnnotation(new ReflectionMethod(ClassWithInvalidClassAnnotation::class, 'testMethod'), Field::class);
     }
 
-    public function testMethodLaxModeWithBadAnnotation()
+    public function testMethodLaxModeWithBadAnnotation(): void
     {
         $annotationReader = new AnnotationReader(new DoctrineAnnotationReader(), AnnotationReader::LAX_MODE, []);
 
         $type = $annotationReader->getRequestAnnotation(new ReflectionMethod(ClassWithInvalidClassAnnotation::class, 'testMethod'), Field::class);
         $this->assertNull($type);
     }
 
-    public function testMethodLaxModeWithSmellyAnnotation()
+    public function testMethodLaxModeWithSmellyAnnotation(): void
     {
         $annotationReader = new AnnotationReader(new DoctrineAnnotationReader(), AnnotationReader::LAX_MODE, []);
 
         $this->expectException(AnnotationException::class);
         $annotationReader->getRequestAnnotation(new ReflectionMethod(ClassWithInvalidTypeAnnotation::class, 'testMethod'), Field::class);
     }
 
-    public function testExtendAnnotationException()
+    public function testExtendAnnotationException(): void
     {
         $annotationReader = new AnnotationReader(new DoctrineAnnotationReader(), AnnotationReader::STRICT_MODE, []);
 
@@ -120,23 +120,23 @@ public function testExtendAnnotationException()
         $annotationReader->getExtendTypeAnnotation(new ReflectionClass(ClassWithInvalidExtendTypeAnnotation::class));
     }
 
-    public function testMethodsStrictMode()
+    public function testMethodsStrictMode(): void
     {
         $annotationReader = new AnnotationReader(new DoctrineAnnotationReader(), AnnotationReader::STRICT_MODE, []);
 
         $this->expectException(AnnotationException::class);
         $annotationReader->getMethodAnnotations(new ReflectionMethod(ClassWithInvalidClassAnnotation::class, 'testMethod'), Field::class);
     }
 
-    public function testMethodsLaxModeWithBadAnnotation()
+    public function testMethodsLaxModeWithBadAnnotation(): void
     {
         $annotationReader = new AnnotationReader(new DoctrineAnnotationReader(), AnnotationReader::LAX_MODE, []);
 
         $type = $annotationReader->getMethodAnnotations(new ReflectionMethod(ClassWithInvalidClassAnnotation::class, 'testMethod'), Field::class);
         $this->assertSame([], $type);
     }
 
-    public function testGetMethodsAnnotationsLaxModeWithBadAnnotationAndStrictNamespace()
+    public function testGetMethodsAnnotationsLaxModeWithBadAnnotationAndStrictNamespace(): void
     {
         $annotationReader = new AnnotationReader(new DoctrineAnnotationReader(), AnnotationReader::LAX_MODE, ['TheCodingMachine\\GraphQLite\\Fixtures']);
 

diff --git a/tests/Annotations/AutowireTest.php b/tests/Annotations/AutowireTest.php
@@ -8,7 +8,7 @@
 class AutowireTest extends TestCase
 {
 
-    public function testException()
+    public function testException(): void
     {
         $this->expectException(BadMethodCallException::class);
         $this->expectExceptionMessage('The @Autowire annotation must be passed a target. For instance: "@Autowire(for="$myService")"');

diff --git a/tests/Annotations/DecorateTest.php b/tests/Annotations/DecorateTest.php
@@ -8,7 +8,7 @@
 class DecorateTest extends TestCase
 {
 
-    public function testException()
+    public function testException(): void
     {
         $this->expectException(BadMethodCallException::class);
         $this->expectExceptionMessage('The @Decorate annotation must be passed an input type. For instance: "@Decorate("MyInputType")"');

diff --git a/tests/Annotations/ExtendTypeTest.php b/tests/Annotations/ExtendTypeTest.php
@@ -8,7 +8,7 @@
 class ExtendTypeTest extends TestCase
 {
 
-    public function testException()
+    public function testException(): void
     {
         $this->expectException(BadMethodCallException::class);
         $this->expectExceptionMessage('In annotation @ExtendType, missing one of the compulsory parameter "class" or "name".');

diff --git a/tests/Annotations/FactoryTest.php b/tests/Annotations/FactoryTest.php
@@ -8,7 +8,7 @@
 class FactoryTest extends TestCase
 {
 
-    public function testExceptionInConstruct()
+    public function testExceptionInConstruct(): void
     {
         $this->expectException(GraphQLException::class);
         new Factory(['default'=>false]);

diff --git a/tests/Annotations/FailWithTest.php b/tests/Annotations/FailWithTest.php
@@ -8,7 +8,7 @@
 class FailWithTest extends TestCase
 {
 
-    public function testException()
+    public function testException(): void
     {
         $this->expectException(BadMethodCallException::class);
         $this->expectExceptionMessage('The @FailWith annotation must be passed a defaultValue. For instance: "@FailWith(null)"');

diff --git a/tests/Annotations/MiddlewareAnnotationsTest.php b/tests/Annotations/MiddlewareAnnotationsTest.php
@@ -7,7 +7,7 @@
 class MiddlewareAnnotationsTest extends TestCase
 {
 
-    public function testGetAnnotationByTypeException()
+    public function testGetAnnotationByTypeException(): void
     {
         $annotations = new MiddlewareAnnotations([
             new Logged(),

diff --git a/tests/Annotations/ParameterAnnotationsTest.php b/tests/Annotations/ParameterAnnotationsTest.php
@@ -7,7 +7,7 @@
 class ParameterAnnotationsTest extends TestCase
 {
 
-    public function testGetAnnotationByTypeException()
+    public function testGetAnnotationByTypeException(): void
     {
         $annotations = new ParameterAnnotations([
             new Autowire(['for'=>'foo']),

diff --git a/tests/Annotations/RightTest.php b/tests/Annotations/RightTest.php
@@ -8,7 +8,7 @@
 class RightTest extends TestCase
 {
 
-    public function testException()
+    public function testException(): void
     {
         $this->expectException(BadMethodCallException::class);
         $this->expectExceptionMessage('The @Right annotation must be passed a right name. For instance: "@Right(\'my_right\')"');

diff --git a/tests/Annotations/SourceFieldTest.php b/tests/Annotations/SourceFieldTest.php
@@ -8,7 +8,7 @@
 class SourceFieldTest extends TestCase
 {
 
-    public function testExceptionInConstruct()
+    public function testExceptionInConstruct(): void
     {
         $this->expectException(BadMethodCallException::class);
         new SourceField([]);

diff --git a/tests/Annotations/UseInputTypeTest.php b/tests/Annotations/UseInputTypeTest.php
@@ -8,7 +8,7 @@
 class UseInputTypeTest extends TestCase
 {
 
-    public function testException()
+    public function testException(): void
     {
         $this->expectException(BadMethodCallException::class);
         $this->expectExceptionMessage('The @UseInputType annotation must be passed a target and an input type. For instance: "@UseInputType(for="$input", inputType="MyInputType")"');

diff --git a/tests/Containers/BasicAutoWiringContainerTest.php b/tests/Containers/BasicAutoWiringContainerTest.php
@@ -26,7 +26,7 @@ public function has($id)
         };
     }
 
-    public function testFromContainer()
+    public function testFromContainer(): void
     {
         $container = $this->buildAutoWiringContainer($this->getContainer());
 
@@ -36,7 +36,7 @@ public function testFromContainer()
         $this->assertSame('foo', $container->get('foo'));
     }
 
-    public function testInstantiate()
+    public function testInstantiate(): void
     {
         $container = $this->buildAutoWiringContainer($this->getContainer());
 
@@ -47,7 +47,7 @@ public function testInstantiate()
         $this->assertTrue($container->has(TestType::class));
     }
 
-    public function testNotFound()
+    public function testNotFound(): void
     {
         $container = $this->buildAutoWiringContainer($this->getContainer());
         $this->expectException(NotFoundException::class);

diff --git a/tests/Containers/EmptyContainerTest.php b/tests/Containers/EmptyContainerTest.php
@@ -7,7 +7,7 @@
 
 class EmptyContainerTest extends TestCase
 {
-    public function testContainer()
+    public function testContainer(): void
     {
         $container = new EmptyContainer();
         $this->assertFalse($container->has('foo'));