Fix tests failures

Author: pamil

Tests/PhpUnit/AbstractExtensionTestCaseTest.php

@@ -153,7 +153,7 @@ public function if_definition_does_not_have_argument_it_fails()
     {
         $this->load();
 
-        $this->setExpectedException('\PHPUnit_Framework_ExpectationFailedException', 10);
+        $this->setExpectedException('\PHPUnit_Framework_ExpectationFailedException', '10');
 
         $this->assertContainerBuilderHasServiceDefinitionWithArgument('manual_service_id', 10, 'any value');
     }

Tests/PhpUnit/ContainerHasParameterConstraintTest.php

@@ -29,23 +29,17 @@ public function containerBuilderProvider()
 
         $parameterName = 'parameter_name';
         $parameterValue = 'some value';
-        $containerWithParameter = $this->createMockContainerWithParameters(
-            array(
-                $parameterName => $parameterValue
-            )
-        );
-
         $wrongParameterValue = 'some other value';
 
         return array(
             // the container does not have the parameter
             array($emptyContainer, $parameterName, $parameterValue, true, false),
             // the container has the parameter but the values don't match
-            array($containerWithParameter, $parameterName, $wrongParameterValue, true, false),
+            array($this->createMockContainerWithParameters(array($parameterName => $parameterValue)), $parameterName, $wrongParameterValue, true, false),
             // the container has the parameter and the value matches
-            array($containerWithParameter, $parameterName, $parameterValue, true, true),
+            array($this->createMockContainerWithParameters(array($parameterName => $parameterValue)), $parameterName, $parameterValue, true, true),
             // the container has the parameter and the value is optional
-            array($containerWithParameter, $parameterName, null, false, true),
+            array($this->createMockContainerWithParameters(array($parameterName => $parameterValue)), $parameterName, null, false, true),
         );
     }
 
@@ -56,24 +50,16 @@ private function createMockContainerWithParameters(array $parameters)
         $container
             ->expects($this->any())
             ->method('hasParameter')
-            ->will(
-                $this->returnCallback(
-                    function ($parameterName) use ($parameters) {
-                        return array_key_exists($parameterName, $parameters);
-                    }
-                )
-            );
+            ->willReturnCallback(function ($parameterName) use ($parameters) {
+                return array_key_exists($parameterName, $parameters);
+            });
 
         $container
             ->expects($this->any())
             ->method('getParameter')
-            ->will(
-                $this->returnCallback(
-                    function ($parameterName) use ($parameters) {
-                        return $parameters[$parameterName];
-                    }
-                )
-            );
+            ->willReturnCallback(function ($parameterName) use ($parameters) {
+                return $parameters[$parameterName];
+            });
 
         return $container;
     }