Get rid of warnings and risky tests

Author: matthiasnoback

Tests/ArgumentValidatorTest.php

@@ -96,6 +96,7 @@ public function testFailsWhenOptionalParameterHasArrayTypeHintAndResultOfExpress
 
         try {
             $validator->validate($parameter, $argument);
+            $this->addToAssertionCount(1);
         } catch (TypeHintMismatchException $exception) {
             $this->fail('null argument should be allowed');
         }
@@ -149,6 +150,7 @@ public function testFailsWhenResultOfExpressionIsNullButNullIsNotAllowed()
 
         try {
             $validator->validate($parameter, $argument);
+            $this->addToAssertionCount(1);
         } catch (TypeHintMismatchException $exception) {
             $this->fail('null argument should be allowed');
         }
@@ -196,6 +198,7 @@ public function testContainerReferenceArgumentDoesNotFail()
         $validator = new ArgumentValidator(new ContainerBuilder(), $this->createMockResultingClassResolver());
 
         $validator->validate($parameter, $argument);
+        $this->addToAssertionCount(1);
     }
 
     public function testPassesWhenArgumentIsClassAlias()

Tests/BatchServiceDefinitionValidatorTest.php

@@ -5,6 +5,7 @@
 use Matthias\SymfonyServiceDefinitionValidator\BatchServiceDefinitionValidator;
 use Matthias\SymfonyServiceDefinitionValidator\Tests\Fixtures\InvalidServiceDefinitionException;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Definition;
 
 class BatchServiceDefinitionValidatorTest extends TestCase
 {
@@ -34,24 +35,21 @@ public function testCreatesErrorListAndTransformsValidationExceptionIntoErrors()
 
         $exception = $this->createException();
 
-
-
         $errorFactory
             ->expects($this->once())
             ->method('createValidationError')
             ->with('bad_service', $badDefinition, $exception)
             ->will($this->returnValue($error));
 
         $validator = $this->createMockValidator();
-        $validator
-            ->expects($this->at(0))
-            ->method('validate')
-            ->with($goodDefinition);
-        $validator
-            ->expects($this->at(1))
-            ->method('validate')
-            ->with($badDefinition)
-            ->will($this->throwException($exception));
+        $validator->method('validate')
+            ->willReturnCallback(
+                function (Definition $definition) use ($exception, &$badDefinition) {
+                    if ($definition === $badDefinition) {
+                        throw $exception;
+                    }
+                }
+            );
 
         $batchValidator = new BatchServiceDefinitionValidator($validator, $errorFactory);
         $result = $batchValidator->validate($definitions);

Tests/Functional/FunctionalTest.php

@@ -48,6 +48,8 @@ public function testIfTheServiceDefinitionsAreCorrectTheContainerWillBeCompiled(
         }
 
         $this->container->compile();
+
+        $this->addToAssertionCount(1);
     }
 
     public function testIfAServiceDefinitionWithAnExpressionArgumentIsCorrectTheContainerWillBeCompiled()
@@ -62,6 +64,8 @@ public function testIfAServiceDefinitionWithAnExpressionArgumentIsCorrectTheCont
         $loader->load('service_definition_with_expression.xml');
 
         $this->container->compile();
+
+        $this->addToAssertionCount(1);
     }
 
     public function testIfAServiceDefinitionWithAFactoryIsCorrectTheContainerWillBeCompiled()
@@ -74,6 +78,8 @@ public function testIfAServiceDefinitionWithAFactoryIsCorrectTheContainerWillBeC
         $loader->load('service_definition_with_factory.xml');
 
         $this->container->compile();
+
+        $this->addToAssertionCount(1);
     }
 
     public function testIfAServiceDefinitionIsNotCorrectAnExceptionWillBeThrown()

Tests/ServiceDefinitionValidatorTest.php

@@ -41,6 +41,8 @@ public function testResolvesClassWithParameterName()
         );
 
         $validator->validate($definition);
+
+        $this->addToAssertionCount(1);
     }
 
     public function testSyntheticDefinitionCanHaveNoClass()
@@ -56,6 +58,7 @@ public function testSyntheticDefinitionCanHaveNoClass()
 
         try {
             $validator->validate($definition);
+            $this->addToAssertionCount(1);
         } catch (DefinitionHasNoClassException $e) {
             $this->fail('Synthetic definitions should be allowed to have no class');
         }
@@ -74,6 +77,7 @@ public function testAbstractDefinitionCanHaveNoClass()
 
         try {
             $validator->validate($definition);
+            $this->addToAssertionCount(1);
         } catch (DefinitionHasNoClassException $e) {
             $this->fail('Abstract definitions should be allowed to have no class');
         }
@@ -90,6 +94,7 @@ public function testDefinedClassCanBeInterface()
         try {
             // The choice for Serializable is arbitrary, any PHP interface would do
             $validator->validate(new Definition('Serializable'));
+            $this->addToAssertionCount(1);
         } catch (ClassNotFoundException $e) {
             $this->fail('Definition should be allowed to have an interface as class');
         }
@@ -251,6 +256,8 @@ public function factoryCanBeProvidedByServiceDefinition()
         );
 
         $validator->validate($definition);
+
+        $this->addToAssertionCount(1);
     }
 
     /**