Skip to content

Commit a347c89

Browse files
authored
Test PHP 7.4 on Travis (#16)
1 parent 714b535 commit a347c89

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ php:
44
- '7.1'
55
- '7.2'
66
- '7.3'
7+
- '7.4'
78

89
env:
910
global:
@@ -25,7 +26,7 @@ before_install:
2526
- phpenv config-rm xdebug.ini || true
2627

2728
install:
28-
- composer require symfony/http-kernel:$SYMFONY_VERSION symfony/dependency-injection:$SYMFONY_VERSION
29+
- composer require symfony/http-kernel:$SYMFONY_VERSION symfony/dependency-injection:$SYMFONY_VERSION symfony/routing:$SYMFONY_VERSION
2930
- make build
3031
script:
3132
- make test-technical

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"php": ">=7.1",
3434
"yoanm/jsonrpc-server-sdk": "^3.0",
3535
"yoanm/symfony-jsonrpc-http-server": "^2.0",
36-
"yoanm/jsonrpc-params-symfony-validator-sdk": "^0.1",
36+
"yoanm/jsonrpc-params-symfony-validator-sdk": "^0.2",
3737
"symfony/http-kernel": "^3.0 || ^4.0",
3838
"symfony/dependency-injection": "^3.0 || ^4.0"
3939
},
@@ -42,7 +42,7 @@
4242
"behat/behat": "~3.0",
4343
"squizlabs/php_codesniffer": "3.*",
4444
"phpunit/phpunit": "^7.0 || ^8.0",
45-
"matthiasnoback/symfony-dependency-injection-test": "^2.0 || ^3.0",
45+
"matthiasnoback/symfony-dependency-injection-test": "^3.0 || ^4.0",
4646
"matthiasnoback/symfony-config-test": "^3.0 || ^4.0",
4747
"symfony/framework-bundle": "^3.0 || ^4.0",
4848
"symfony/routing": "^3.0 || ^4.0",

tests/Common/DependencyInjection/AbstractTestClass.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ abstract class AbstractTestClass extends AbstractExtensionTestCase
1515
/**
1616
* {@inheritdoc}
1717
*/
18-
protected function getContainerExtensions()
18+
protected function getContainerExtensions(): array
1919
{
2020
return [
2121
new JsonRpcParamsValidatorExtension()
2222
];
2323
}
2424

25-
protected function load(array $configurationValues = [], $mockSfValidator = true)
25+
protected function loadContainer(array $configurationValues = [], $mockSfValidator = true): void
2626
{
2727
if (true === $mockSfValidator) {
2828
$sfValidatorDefinition = new Definition(ValidatorInterface::class);

tests/Functional/DependencyInjection/ConfigFilesTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class ConfigFilesTest extends AbstractTestClass
1414
/**
1515
* {@inheritdoc}
1616
*/
17-
protected function getContainerExtensions()
17+
protected function getContainerExtensions(): array
1818
{
1919
return [
2020
new JsonRpcParamsValidatorExtension()
@@ -31,7 +31,7 @@ protected function getContainerExtensions()
3131
*/
3232
public function testShouldHaveService($serviceId, $expectedClassName, $public)
3333
{
34-
$this->load([]);
34+
$this->loadContainer([]);
3535

3636
$this->assertContainerBuilderHasService($serviceId, $expectedClassName);
3737
if (true === $public) {

tests/Functional/DependencyInjection/JsonRpcHttpServerExtensionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class JsonRpcHttpServerExtensionTest extends AbstractTestClass
1212
/**
1313
* {@inheritdoc}
1414
*/
15-
protected function getContainerExtensions()
15+
protected function getContainerExtensions(): array
1616
{
1717
return [
1818
new JsonRpcParamsValidatorExtension()
@@ -22,7 +22,7 @@ protected function getContainerExtensions()
2222

2323
public function testShouldBeLoadable()
2424
{
25-
$this->load();
25+
$this->loadContainer();
2626

2727
$this->assertValidatorIsUsable();
2828
}

0 commit comments

Comments
 (0)