Skip to content

Test PHP 7.4 on Travis #16

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
Jan 12, 2020
Merged

Test PHP 7.4 on Travis #16

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
2e5f779
Test PHP 7.4 on Travis
yoanm Jan 12, 2020
b2e34e5
Fix
yoanm Jan 12, 2020
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
3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ php:
- '7.1'
- '7.2'
- '7.3'
- '7.4'

env:
global:
Expand All @@ -25,7 +26,7 @@ before_install:
- phpenv config-rm xdebug.ini || true

install:
- composer require symfony/http-kernel:$SYMFONY_VERSION symfony/dependency-injection:$SYMFONY_VERSION
- composer require symfony/http-kernel:$SYMFONY_VERSION symfony/dependency-injection:$SYMFONY_VERSION symfony/routing:$SYMFONY_VERSION
- make build
script:
- make test-technical
Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"php": ">=7.1",
"yoanm/jsonrpc-server-sdk": "^3.0",
"yoanm/symfony-jsonrpc-http-server": "^2.0",
"yoanm/jsonrpc-params-symfony-validator-sdk": "^0.1",
"yoanm/jsonrpc-params-symfony-validator-sdk": "^0.2",
"symfony/http-kernel": "^3.0 || ^4.0",
"symfony/dependency-injection": "^3.0 || ^4.0"
},
Expand All @@ -42,7 +42,7 @@
"behat/behat": "~3.0",
"squizlabs/php_codesniffer": "3.*",
"phpunit/phpunit": "^7.0 || ^8.0",
"matthiasnoback/symfony-dependency-injection-test": "^2.0 || ^3.0",
"matthiasnoback/symfony-dependency-injection-test": "^3.0 || ^4.0",
"matthiasnoback/symfony-config-test": "^3.0 || ^4.0",
"symfony/framework-bundle": "^3.0 || ^4.0",
"symfony/routing": "^3.0 || ^4.0",
Expand Down
4 changes: 2 additions & 2 deletions tests/Common/DependencyInjection/AbstractTestClass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ abstract class AbstractTestClass extends AbstractExtensionTestCase
/**
* {@inheritdoc}
*/
protected function getContainerExtensions()
protected function getContainerExtensions(): array
{
return [
new JsonRpcParamsValidatorExtension()
];
}

protected function load(array $configurationValues = [], $mockSfValidator = true)
protected function loadContainer(array $configurationValues = [], $mockSfValidator = true): void
{
if (true === $mockSfValidator) {
$sfValidatorDefinition = new Definition(ValidatorInterface::class);
Expand Down
4 changes: 2 additions & 2 deletions tests/Functional/DependencyInjection/ConfigFilesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class ConfigFilesTest extends AbstractTestClass
/**
* {@inheritdoc}
*/
protected function getContainerExtensions()
protected function getContainerExtensions(): array
{
return [
new JsonRpcParamsValidatorExtension()
Expand All @@ -31,7 +31,7 @@ protected function getContainerExtensions()
*/
public function testShouldHaveService($serviceId, $expectedClassName, $public)
{
$this->load([]);
$this->loadContainer([]);

$this->assertContainerBuilderHasService($serviceId, $expectedClassName);
if (true === $public) {
Expand Down
4 changes: 2 additions & 2 deletions tests/Functional/DependencyInjection/JsonRpcHttpServerExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class JsonRpcHttpServerExtensionTest extends AbstractTestClass
/**
* {@inheritdoc}
*/
protected function getContainerExtensions()
protected function getContainerExtensions(): array
{
return [
new JsonRpcParamsValidatorExtension()
Expand All @@ -22,7 +22,7 @@ protected function getContainerExtensions()

public function testShouldBeLoadable()
{
$this->load();
$this->loadContainer();

$this->assertValidatorIsUsable();
}
Expand Down