Merge pull request #28 from cordoval/phpunit4-compat

matthiasnoback · matthiasnoback · commit 3b4b4c6dbc40 · 2014-04-19T10:07:51.000+02:00
testing travis
diff --git a/.travis.yml b/.travis.yml
@@ -6,19 +6,21 @@ php:
   - 5.5
 
 env:
-  - SYMFONY_VERSION=2.0.*
-  - SYMFONY_VERSION=2.1.*
-  - SYMFONY_VERSION=2.2.*
-  - SYMFONY_VERSION=2.3.*
-  - SYMFONY_VERSION=2.4.*
-  - SYMFONY_VERSION=dev-master
+  - SYMFONY_VERSION=2.4.* PHPUNIT_VERSION=~3.7
+  - SYMFONY_VERSION=2.0.* PHPUNIT_VERSION=~4.0
+  - SYMFONY_VERSION=2.1.* PHPUNIT_VERSION=~4.0
+  - SYMFONY_VERSION=2.2.* PHPUNIT_VERSION=~4.0
+  - SYMFONY_VERSION=2.3.* PHPUNIT_VERSION=~4.0
+  - SYMFONY_VERSION=2.4.* PHPUNIT_VERSION=~4.0
 
 before_script:
-  - composer require --dev symfony/dependency-injection:${SYMFONY_VERSION}
+  - composer require --no-update "symfony/dependency-injection:${SYMFONY_VERSION}"
+  - composer require --no-update "phpunit/phpunit:${PHPUNIT_VERSION}"
+  - composer update
 
 notifications:
   email: matthiasnoback@gmail.com
 
 cache:
   directories:
-    - /home/travis/.composer/cache
+    - $COMPOSER_CACHE_DIR
diff --git a/PhpUnit/ContainerBuilderHasAliasConstraint.php b/PhpUnit/ContainerBuilderHasAliasConstraint.php
@@ -2,12 +2,14 @@
 
 namespace Matthias\SymfonyDependencyInjectionTest\PhpUnit;
 
+use SebastianBergmann\Exporter\Exporter;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 class ContainerBuilderHasAliasConstraint extends \PHPUnit_Framework_Constraint
 {
     private $aliasId;
     private $expectedServiceId;
+    protected $exporter;
 
     public function __construct($aliasId, $expectedServiceId)
     {
@@ -21,6 +23,7 @@ public function __construct($aliasId, $expectedServiceId)
 
         $this->aliasId = $aliasId;
         $this->expectedServiceId = $expectedServiceId;
+        $this->exporter = new Exporter;
     }
 
     public function toString()
diff --git a/PhpUnit/ContainerBuilderHasServiceDefinitionConstraint.php b/PhpUnit/ContainerBuilderHasServiceDefinitionConstraint.php
@@ -2,12 +2,14 @@
 
 namespace Matthias\SymfonyDependencyInjectionTest\PhpUnit;
 
+use SebastianBergmann\Exporter\Exporter;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 class ContainerBuilderHasServiceDefinitionConstraint extends \PHPUnit_Framework_Constraint
 {
     private $serviceId;
     private $expectedClass;
+    protected $exporter;
 
     public function __construct($serviceId, $expectedClass)
     {
@@ -21,6 +23,7 @@ public function __construct($serviceId, $expectedClass)
 
         $this->serviceId = $serviceId;
         $this->expectedClass = $expectedClass;
+        $this->exporter = new Exporter;
     }
 
     public function toString()
@@ -86,8 +89,8 @@ private function evaluateClass(ContainerBuilder $containerBuilder, $returnResult
             $this->fail($containerBuilder, sprintf(
                 'The class of the service definition of "%s" (%s) does not match the expected value (%s)',
                 $this->serviceId,
-                \PHPUnit_Util_Type::export($actualClass),
-                \PHPUnit_Util_Type::export($this->expectedClass)
+                $this->exporter->export($actualClass),
+                $this->exporter->export($this->expectedClass)
             ));
         }
 
diff --git a/PhpUnit/ContainerBuilderHasSyntheticServiceConstraint.php b/PhpUnit/ContainerBuilderHasSyntheticServiceConstraint.php
@@ -2,11 +2,13 @@
 
 namespace Matthias\SymfonyDependencyInjectionTest\PhpUnit;
 
+use SebastianBergmann\Exporter\Exporter;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 class ContainerBuilderHasSyntheticServiceConstraint extends \PHPUnit_Framework_Constraint
 {
     private $serviceId;
+    protected $exporter;
 
     public function __construct($serviceId)
     {
@@ -15,6 +17,7 @@ public function __construct($serviceId)
         }
 
         $this->serviceId = $serviceId;
+        $this->exporter = new Exporter;
     }
 
     public function toString()
diff --git a/PhpUnit/ContainerHasParameterConstraint.php b/PhpUnit/ContainerHasParameterConstraint.php
@@ -2,17 +2,20 @@
 
 namespace Matthias\SymfonyDependencyInjectionTest\PhpUnit;
 
+use SebastianBergmann\Exporter\Exporter;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class ContainerHasParameterConstraint extends \PHPUnit_Framework_Constraint
 {
     private $parameterName;
     private $expectedParameterValue;
+    protected $exporter;
 
     public function __construct($parameterName, $expectedParameterValue)
     {
         $this->parameterName = $parameterName;
         $this->expectedParameterValue = $expectedParameterValue;
+        $this->exporter = new Exporter;
     }
 
     public function toString()
@@ -72,8 +75,8 @@ private function evaluateParameterValue(ContainerInterface $container, $returnRe
             $this->fail($container, sprintf(
                 'The value of parameter "%s" (%s) does not match the expected value (%s)',
                 $this->parameterName,
-                \PHPUnit_Util_Type::export($this->expectedParameterValue),
-                \PHPUnit_Util_Type::export($actualValue)
+                $this->exporter->export($this->expectedParameterValue),
+                $this->exporter->export($actualValue)
             ));
         }
 
diff --git a/PhpUnit/DefinitionHasArgumentConstraint.php b/PhpUnit/DefinitionHasArgumentConstraint.php
@@ -2,18 +2,21 @@
 
 namespace Matthias\SymfonyDependencyInjectionTest\PhpUnit;
 
+use SebastianBergmann\Exporter\Exporter;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\OutOfBoundsException;
 
 class DefinitionHasArgumentConstraint extends \PHPUnit_Framework_Constraint
 {
     private $argumentIndex;
     private $expectedValue;
+    protected $exporter;
 
     public function __construct($argumentIndex, $expectedValue)
     {
         $this->argumentIndex = (integer)$argumentIndex;
         $this->expectedValue = $expectedValue;
+        $this->exporter = new Exporter;
     }
 
     public function toString()
@@ -87,8 +90,8 @@ private function evaluateArgumentValue(Definition $definition, $returnResult)
                 sprintf(
                     'The value of argument with index %d (%s) is not equal to the expected value (%s)',
                     $this->argumentIndex,
-                    \PHPUnit_Util_Type::export($actualValue),
-                    \PHPUnit_Util_Type::export($this->expectedValue)
+                    $this->exporter->export($actualValue),
+                    $this->exporter->export($this->expectedValue)
                 )
             );
         }
diff --git a/PhpUnit/DefinitionHasMethodCallConstraint.php b/PhpUnit/DefinitionHasMethodCallConstraint.php
@@ -2,17 +2,20 @@
 
 namespace Matthias\SymfonyDependencyInjectionTest\PhpUnit;
 
+use SebastianBergmann\Exporter\Exporter;
 use Symfony\Component\DependencyInjection\Definition;
 
 class DefinitionHasMethodCallConstraint extends \PHPUnit_Framework_Constraint
 {
     private $methodName;
     private $arguments;
+    protected $exporter;
 
     public function __construct($methodName, array $arguments = array())
     {
         $this->methodName = $methodName;
         $this->arguments = $arguments;
+        $this->exporter = new Exporter;
     }
 
     public function evaluate($other, $description = '', $returnResult = false)
@@ -41,7 +44,7 @@ public function evaluate($other, $description = '', $returnResult = false)
                 sprintf(
                     'None of the method calls matched the expected method "%s" with arguments %s',
                     $this->methodName,
-                    \PHPUnit_Util_Type::export($this->arguments)
+                    $this->exporter->export($this->arguments)
                 )
             );
         }
diff --git a/PhpUnit/DefinitionIsChildOfConstraint.php b/PhpUnit/DefinitionIsChildOfConstraint.php
@@ -2,16 +2,19 @@
 
 namespace Matthias\SymfonyDependencyInjectionTest\PhpUnit;
 
+use SebastianBergmann\Exporter\Exporter;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
 
 class DefinitionIsChildOfConstraint extends \PHPUnit_Framework_Constraint
 {
     private $expectedParentServiceId;
+    protected $exporter;
 
     public function __construct($expectedParentServiceId)
     {
         $this->expectedParentServiceId = $expectedParentServiceId;
+        $this->exporter = new Exporter;
     }
 
     public function evaluate($other, $description = '', $returnResult = false)
diff --git a/composer.json b/composer.json
@@ -15,7 +15,8 @@
     "require": {
         "matthiasnoback/symfony-config-test": "0.*",
         "symfony/dependency-injection": "2.*",
-        "phpunit/phpunit": "3.*"
+        "phpunit/phpunit": ">=3",
+        "sebastian/exporter": "~1"
     },
     "target-dir": "Matthias/SymfonyDependencyInjectionTest",
     "autoload": {

Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,14 @@`
`2`	`2`
`3`	`3`	`namespace Matthias\SymfonyDependencyInjectionTest\PhpUnit;`
`4`	`4`
	`5`	`+use SebastianBergmann\Exporter\Exporter;`
`5`	`6`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`6`	`7`
`7`	`8`	`class ContainerBuilderHasAliasConstraint extends \PHPUnit_Framework_Constraint`
`8`	`9`	`{`
`9`	`10`	`private $aliasId;`
`10`	`11`	`private $expectedServiceId;`
	`12`	`+ protected $exporter;`
`11`	`13`
`12`	`14`	`public function __construct($aliasId, $expectedServiceId)`
`13`	`15`	`{`
`@@ -21,6 +23,7 @@ public function __construct($aliasId, $expectedServiceId)`
`21`	`23`
`22`	`24`	`$this->aliasId = $aliasId;`
`23`	`25`	`$this->expectedServiceId = $expectedServiceId;`
	`26`	`+ $this->exporter = new Exporter;`
`24`	`27`	`}`
`25`	`28`
`26`	`29`	`public function toString()`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,13 @@`
`2`	`2`
`3`	`3`	`namespace Matthias\SymfonyDependencyInjectionTest\PhpUnit;`
`4`	`4`
	`5`	`+use SebastianBergmann\Exporter\Exporter;`
`5`	`6`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`6`	`7`
`7`	`8`	`class ContainerBuilderHasSyntheticServiceConstraint extends \PHPUnit_Framework_Constraint`
`8`	`9`	`{`
`9`	`10`	`private $serviceId;`
	`11`	`+ protected $exporter;`
`10`	`12`
`11`	`13`	`public function __construct($serviceId)`
`12`	`14`	`{`
`@@ -15,6 +17,7 @@ public function __construct($serviceId)`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`$this->serviceId = $serviceId;`
	`20`	`+ $this->exporter = new Exporter;`
`18`	`21`	`}`
`19`	`22`
`20`	`23`	`public function toString()`
Original file line number	Diff line number	Diff line change
`@@ -2,18 +2,21 @@`
`2`	`2`
`3`	`3`	`namespace Matthias\SymfonyDependencyInjectionTest\PhpUnit;`
`4`	`4`
	`5`	`+use SebastianBergmann\Exporter\Exporter;`
`5`	`6`	`use Symfony\Component\DependencyInjection\Definition;`
`6`	`7`	`use Symfony\Component\DependencyInjection\Exception\OutOfBoundsException;`
`7`	`8`
`8`	`9`	`class DefinitionHasArgumentConstraint extends \PHPUnit_Framework_Constraint`
`9`	`10`	`{`
`10`	`11`	`private $argumentIndex;`
`11`	`12`	`private $expectedValue;`
	`13`	`+ protected $exporter;`
`12`	`14`
`13`	`15`	`public function __construct($argumentIndex, $expectedValue)`
`14`	`16`	`{`
`15`	`17`	`$this->argumentIndex = (integer)$argumentIndex;`
`16`	`18`	`$this->expectedValue = $expectedValue;`
	`19`	`+ $this->exporter = new Exporter;`
`17`	`20`	`}`
`18`	`21`
`19`	`22`	`public function toString()`
`@@ -87,8 +90,8 @@ private function evaluateArgumentValue(Definition $definition, $returnResult)`
`87`	`90`	`sprintf(`
`88`	`91`	`'The value of argument with index %d (%s) is not equal to the expected value (%s)',`
`89`	`92`	`$this->argumentIndex,`
`90`		`- \PHPUnit_Util_Type::export($actualValue),`
`91`		`- \PHPUnit_Util_Type::export($this->expectedValue)`
	`93`	`+ $this->exporter->export($actualValue),`
	`94`	`+ $this->exporter->export($this->expectedValue)`
`92`	`95`	`)`
`93`	`96`	`);`
`94`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,17 +2,20 @@`
`2`	`2`
`3`	`3`	`namespace Matthias\SymfonyDependencyInjectionTest\PhpUnit;`
`4`	`4`
	`5`	`+use SebastianBergmann\Exporter\Exporter;`
`5`	`6`	`use Symfony\Component\DependencyInjection\Definition;`
`6`	`7`
`7`	`8`	`class DefinitionHasMethodCallConstraint extends \PHPUnit_Framework_Constraint`
`8`	`9`	`{`
`9`	`10`	`private $methodName;`
`10`	`11`	`private $arguments;`
	`12`	`+ protected $exporter;`
`11`	`13`
`12`	`14`	`public function __construct($methodName, array $arguments = array())`
`13`	`15`	`{`
`14`	`16`	`$this->methodName = $methodName;`
`15`	`17`	`$this->arguments = $arguments;`
	`18`	`+ $this->exporter = new Exporter;`
`16`	`19`	`}`
`17`	`20`
`18`	`21`	`public function evaluate($other, $description = '', $returnResult = false)`
`@@ -41,7 +44,7 @@ public function evaluate($other, $description = '', $returnResult = false)`
`41`	`44`	`sprintf(`
`42`	`45`	`'None of the method calls matched the expected method "%s" with arguments %s',`
`43`	`46`	`$this->methodName,`
`44`		`- \PHPUnit_Util_Type::export($this->arguments)`
	`47`	`+ $this->exporter->export($this->arguments)`
`45`	`48`	`)`
`46`	`49`	`);`
`47`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,16 +2,19 @@`
`2`	`2`
`3`	`3`	`namespace Matthias\SymfonyDependencyInjectionTest\PhpUnit;`
`4`	`4`
	`5`	`+use SebastianBergmann\Exporter\Exporter;`
`5`	`6`	`use Symfony\Component\DependencyInjection\Definition;`
`6`	`7`	`use Symfony\Component\DependencyInjection\DefinitionDecorator;`
`7`	`8`
`8`	`9`	`class DefinitionIsChildOfConstraint extends \PHPUnit_Framework_Constraint`
`9`	`10`	`{`
`10`	`11`	`private $expectedParentServiceId;`
	`12`	`+ protected $exporter;`
`11`	`13`
`12`	`14`	`public function __construct($expectedParentServiceId)`
`13`	`15`	`{`
`14`	`16`	`$this->expectedParentServiceId = $expectedParentServiceId;`
	`17`	`+ $this->exporter = new Exporter;`
`15`	`18`	`}`
`16`	`19`
`17`	`20`	`public function evaluate($other, $description = '', $returnResult = false)`