Skip to content

Commit 8b412a7

Browse files
Bump to php >= 7.1
1 parent 89999fd commit 8b412a7

8 files changed

+20
-19
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ sudo: false
44

55
matrix:
66
include:
7-
- php: 7.0
87
- php: 7.1
98
env: COMPOSER_FLAGS='--prefer-lowest'
109
- php: 7.2
1110
- php: 7.3
1211
- php: 7.4
12+
- php: nightly
1313
fast_finish: true
1414

1515
cache:
@@ -20,10 +20,10 @@ cache:
2020
env:
2121
global:
2222
- SYMFONY_PHPUNIT_DIR="$HOME/symfony-bridge/.phpunit"
23-
- SYMFONY_PHPUNIT_VERSION="6.1"
2423
- COMPOSER_FLAGS=''
2524

2625
before_install:
26+
- ([[ $TRAVIS_PHP_VERSION = nightly ]] && composer config platform.php 7.4.99 || true)
2727
- composer validate
2828

2929
install:

composer.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,16 @@
99
"email": "[email protected]"
1010
}
1111
],
12+
"minimum-stability": "dev",
1213
"require": {
13-
"php": "^7.0",
14+
"php": ">=7.1",
1415
"composer-plugin-api": "^1.0"
1516
},
1617
"require-dev": {
1718
"composer/composer": "^1.0.2",
18-
"symfony/dotenv": "^3.4|^4.0|^5.0",
19-
"symfony/phpunit-bridge": "^3.4.19|^4.1.8|^5.0",
20-
"symfony/process": "^2.7|^3.0|^4.0|^5.0"
19+
"symfony/dotenv": "^4.4|^5.0",
20+
"symfony/phpunit-bridge": "^4.4|^5.0",
21+
"symfony/process": "^4.4|^5.0"
2122
},
2223
"autoload": {
2324
"psr-4": {
@@ -26,7 +27,7 @@
2627
},
2728
"extra": {
2829
"branch-alias": {
29-
"dev-master": "1.5-dev"
30+
"dev-master": "1.7-dev"
3031
},
3132
"class": "Symfony\\Flex\\Flex"
3233
}

tests/CacheTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ public function provideRemoveLegacyTags()
6565
],
6666
];
6767

68-
yield 'empty-intersection-ignores' => [$packages, $packages, '~2.0', ['splits' => [
68+
yield 'empty-intersection-ignores-2' => [$packages, $packages, '~2.0', ['splits' => [
6969
'symfony/foo' => ['3.3', '3.4', '3.5'],
7070
]]];
71-
yield 'empty-intersection-ignores' => [$packages, $packages, '~4.0', ['splits' => [
71+
yield 'empty-intersection-ignores-4' => [$packages, $packages, '~4.0', ['splits' => [
7272
'symfony/foo' => ['3.3', '3.4', '3.5'],
7373
]]];
7474

tests/Configurator/CopyDirectoryFromPackageConfiguratorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function testConfigureDirectory()
5555
}
5656
}
5757

58-
protected function setUp()
58+
protected function setUp(): void
5959
{
6060
parent::setUp();
6161

@@ -94,7 +94,7 @@ protected function setUp()
9494
$this->cleanUpTargetFiles();
9595
}
9696

97-
protected function tearDown()
97+
protected function tearDown(): void
9898
{
9999
parent::tearDown();
100100

tests/Configurator/CopyFromPackageConfiguratorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public function testNoFilesRemoved()
123123
$this->createConfigurator()->unconfigure($this->recipe, [$this->sourceFileRelativePath => $this->targetFileRelativePath], $lock);
124124
}
125125

126-
protected function setUp()
126+
protected function setUp(): void
127127
{
128128
parent::setUp();
129129

@@ -156,7 +156,7 @@ protected function setUp()
156156
$this->cleanUpTargetFiles();
157157
}
158158

159-
protected function tearDown()
159+
protected function tearDown(): void
160160
{
161161
parent::tearDown();
162162

tests/Configurator/CopyFromRecipeConfiguratorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public function testNoFilesRemoved()
134134
$this->createConfigurator()->unconfigure($this->recipe, [$this->sourceFileRelativePath => $this->targetFileRelativePath], $lock);
135135
}
136136

137-
protected function setUp()
137+
protected function setUp(): void
138138
{
139139
parent::setUp();
140140

@@ -158,7 +158,7 @@ protected function setUp()
158158
$this->cleanUpTargetFiles();
159159
}
160160

161-
protected function tearDown()
161+
protected function tearDown(): void
162162
{
163163
parent::tearDown();
164164

tests/Configurator/DockerComposeConfiguratorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class DockerComposeConfiguratorTest extends TestCase
101101
/** @var DockerComposeConfigurator */
102102
private $configurator;
103103

104-
public function setUp(string $name = null, array $data = [], string $dataName = '')
104+
protected function setUp(): void
105105
{
106106
@mkdir(FLEX_TEST_DIR);
107107

@@ -126,7 +126,7 @@ public function setUp(string $name = null, array $data = [], string $dataName =
126126
);
127127
}
128128

129-
protected function tearDown()
129+
protected function tearDown(): void
130130
{
131131
@unlink(FLEX_TEST_DIR.'/docker-compose.yml');
132132
@unlink(FLEX_TEST_DIR.'/docker-compose.yaml');

tests/Configurator/DockerfileConfiguratorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121

2222
class DockerfileConfiguratorTest extends TestCase
2323
{
24-
public function setUp()
24+
public function setUp(): void
2525
{
2626
@mkdir(FLEX_TEST_DIR);
2727
}
2828

29-
protected function tearDown()
29+
protected function tearDown(): void
3030
{
3131
@unlink(FLEX_TEST_DIR.'/Dockerfile');
3232
}

0 commit comments

Comments
 (0)