Skip to content

Update Travis matrix build & bump up Composer dependencies #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 4, 2016
Merged

Update Travis matrix build & bump up Composer dependencies #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea25858
Update Travis matrix build & bump up Composer dependencies
pamil Jun 20, 2016
c8e5665
Fix tests failures
pamil Jun 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 8 additions & 21 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,20 @@ matrix:
include:
- php: 5.3
env: deps="low"
- php: 5.6
env: SYMFONY_DI_VERSION=2.3.* PHPUNIT_VERSION=~3.7
- php: 5.6
env: SYMFONY_DI_VERSION=2.0.* SYMFONY_YAML_VERSION=2.7.* PHPUNIT_VERSION=~4.0
- php: 5.6
env: SYMFONY_DI_VERSION=2.1.* SYMFONY_YAML_VERSION=2.7.* PHPUNIT_VERSION=~4.0
- php: 5.6
env: SYMFONY_DI_VERSION=2.2.* SYMFONY_YAML_VERSION=2.7.* PHPUNIT_VERSION=~4.0
- php: 5.6
env: SYMFONY_DI_VERSION=2.3.* PHPUNIT_VERSION=~4.0
- php: 5.6
env: SYMFONY_DI_VERSION=2.4.* PHPUNIT_VERSION=~4.0
- php: 5.6
env: SYMFONY_DI_VERSION=2.6.* PHPUNIT_VERSION=~4.0
- php: 5.6
env: SYMFONY_DI_VERSION=2.7.* PHPUNIT_VERSION=~4.0
- php: 5.6
env: SYMFONY_DI_VERSION=2.8.* PHPUNIT_VERSION=~4.0
- php: 5.6
env: SYMFONY_DI_VERSION=3.0.* PHPUNIT_VERSION=~4.0
- php: 7.0
env: SYMFONY_DI_VERSION=2.3.*
- php: 7.0
env: SYMFONY_DI_VERSION=2.7.*
- php: 7.0
env: SYMFONY_DI_VERSION=2.8.*
- php: 7.0
env: SYMFONY_DI_VERSION=3.0.*
allow_failures:
- php: hhvm

before_script:
- if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then phpenv config-rm xdebug.ini; fi
- if [ "$SYMFONY_DI_VERSION" != "" ]; then composer require --no-update "symfony/dependency-injection:${SYMFONY_DI_VERSION}"; fi
- if [ "$SYMFONY_YAML_VERSION" != "" ]; then composer require --no-update "symfony/yaml:${SYMFONY_YAML_VERSION}"; fi
- if [ "$PHPUNIT_VERSION" != "" ]; then composer require --no-update "phpunit/phpunit:${PHPUNIT_VERSION}"; fi
- if [ "$deps" = "low" ]; then composer update --prefer-lowest; fi
- if [ "$deps" = "" ]; then composer install; fi
Expand Down
2 changes: 1 addition & 1 deletion Tests/PhpUnit/AbstractExtensionTestCaseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
Expand Down
32 changes: 9 additions & 23 deletions Tests/PhpUnit/ContainerHasParameterConstraintTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mocked method was available only for the first call, I haven't used PhpUnit mocks yet so this is the best I came up with :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks reasonable to me as it doesn't make much sense to reuse the mocked object.

// 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),
);
}

Expand All @@ -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;
}
Expand Down
15 changes: 6 additions & 9 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,13 @@
}
],
"require": {
"matthiasnoback/symfony-config-test": "0.*|~1.0",
"symfony/dependency-injection": "^2.0.5|~3.0",
"symfony/config": "^2.0.5|~3.0",
"sebastian/exporter": "~1"
"matthiasnoback/symfony-config-test": "^1.0|^2.0",
"phpunit/phpunit": "^4.0|^5.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has nothing to do here and was especially removed on #47.

@matthiasnoback Could you please revert this back?

"symfony/dependency-injection": "^2.3|^3.0",
"symfony/config": "^2.3|^3.0",
"symfony/yaml": "^2.7|^3.0",
"sebastian/exporter": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "~3.0|~4.0"
},
"minimum-stability": "dev",
"prefer-stable": true,
"autoload": {
"psr-4" : { "Matthias\\SymfonyDependencyInjectionTest\\" : "" }
}
Expand Down