Skip to content

Commit 1cb2de9

Browse files
Merge branch 'jrobeson-allow-phpunit-3-and-4'
2 parents a93b351 + 8ea0ecc commit 1cb2de9

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

.travis.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,19 @@ php:
66
- 5.5
77
- 5.6
88

9-
before_script: composer install --dev
9+
env:
10+
- SYMFONY_VERSION=2.5.* PHPUNIT_VERSION=~3.7
11+
- SYMFONY_VERSION=2.0.* PHPUNIT_VERSION=~4.0
12+
- SYMFONY_VERSION=2.1.* PHPUNIT_VERSION=~4.0
13+
- SYMFONY_VERSION=2.2.* PHPUNIT_VERSION=~4.0
14+
- SYMFONY_VERSION=2.3.* PHPUNIT_VERSION=~4.0
15+
- SYMFONY_VERSION=2.4.* PHPUNIT_VERSION=~4.0
16+
- SYMFONY_VERSION=2.5.* PHPUNIT_VERSION=~4.0
17+
18+
before_script:
19+
- composer require --no-update "symfony/config:${SYMFONY_VERSION}"
20+
- composer require --no-update "phpunit/phpunit:${PHPUNIT_VERSION}"
21+
- composer update
1022

1123
notifications:
1224

PhpUnit/AbstractConfigurationConstraint.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Matthias\SymfonyConfigTest\PhpUnit;
44

5+
use SebastianBergmann\Exporter\Exporter;
56
use Symfony\Component\Config\Definition\ConfigurationInterface;
67
use Symfony\Component\Config\Definition\Processor;
78

@@ -12,6 +13,7 @@ abstract class AbstractConfigurationConstraint extends \PHPUnit_Framework_Constr
1213
public function __construct(ConfigurationInterface $configuration)
1314
{
1415
$this->configuration = $configuration;
16+
$this->exporter = new Exporter();
1517
}
1618

1719
protected function processConfiguration(array $configurationValues)

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
}
1414
],
1515
"require-dev": {
16-
"phpunit/phpunit": "3.7.*"
16+
"phpunit/phpunit": ">=3.7",
17+
"sebastian/exporter": "1.*"
1718
},
1819
"autoload": {
1920
"psr-4" : { "Matthias\\SymfonyConfigTest\\" : "" }

0 commit comments

Comments
 (0)