Skip to content

Commit 2e74413

Browse files
bramdevriesJaspaul
authored andcommitted
[Upgrade] Add support for Laravel 6 (#17)
* Install Illuminate 6.x dependencies * Drop compatibility with PHP versions lower than 7.2
1 parent c949fd9 commit 2e74413

File tree

6 files changed

+16
-29
lines changed

6 files changed

+16
-29
lines changed

.travis.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,8 @@ language: php
22

33
matrix:
44
include:
5-
- php: 7.0
6-
env: ILLUMINATE_VERSION=5.4.*
7-
- php: 7.0
8-
env: ILLUMINATE_VERSION=5.5.*
9-
- php: 7.1
10-
env: ILLUMINATE_VERSION=5.4.*
11-
- php: 7.1
12-
env: ILLUMINATE_VERSION=5.5.*
135
- php: 7.2
14-
env: ILLUMINATE_VERSION=5.4.*
15-
- php: 7.2
16-
env: ILLUMINATE_VERSION=5.5.*
6+
env: ILLUMINATE_VERSION=6.0.*
177

188
before_install:
199
- composer require "illuminate/cache:${ILLUMINATE_VERSION}" --no-update
@@ -31,4 +21,3 @@ after_script:
3121
- mkdir -p build/logs
3222
- vendor/bin/phpunit --coverage-clover build/logs/clover.xml
3323
- php vendor/bin/coveralls -v
34-
- php vendor/bin/test-reporter

composer.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,20 @@
1111
],
1212
"minimum-stability": "stable",
1313
"require": {
14-
"php": ">=7.0",
15-
"illuminate/cache": "^5.4",
16-
"illuminate/config": "^5.4",
17-
"illuminate/console": "^5.4",
18-
"illuminate/database": "^5.4",
19-
"illuminate/support": "^5.4",
14+
"php": ">=7.2",
15+
"illuminate/cache": "^6.0",
16+
"illuminate/config": "^6.0",
17+
"illuminate/console": "^6.0",
18+
"illuminate/database": "^6.0",
19+
"illuminate/support": "^6.0",
2020
"opensoft/rollout": "2.2.*"
2121
},
2222
"require-dev": {
23-
"codeclimate/php-test-reporter": "^0.4.4",
2423
"friendsofphp/php-cs-fixer": "^2.1",
25-
"illuminate/container": "^5.4",
26-
"mockery/mockery": "^0.9.9",
27-
"orchestra/testbench": "^3.4",
28-
"phpunit/phpunit": "^6.0",
24+
"illuminate/container": "^6",
25+
"mockery/mockery": "^1.2",
26+
"orchestra/testbench": "^4",
27+
"phpunit/phpunit": "^8.0",
2928
"satooshi/php-coveralls": "^1.0",
3029
"squizlabs/php_codesniffer": "^2.8"
3130
},

tests/Console/DeleteCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ function running_the_command_outputs_a_success_statement()
4242

4343
$output = $this->app[Kernel::class]->output();
4444

45-
$this->assertContains('derp', $output);
45+
$this->assertStringContainsString('derp', $output);
4646
}
4747
}

tests/Console/ListCommandTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function it_returns_an_empty_table_if_there_are_no_stored_features()
2929
// The second row contains each of the keys for a feature presenter
3030
$presenter = new FeaturePresenter(new Feature(''));
3131
foreach (array_keys($presenter->toArray()) as $key) {
32-
$this->assertContains($key, $output[1]);
32+
$this->assertStringContainsString($key, $output[1]);
3333
}
3434

3535
// The first row is a seperator row +----+----+ ...
@@ -50,7 +50,7 @@ function it_returns_the_stored_features_in_the_table()
5050

5151
$output = $this->app[Kernel::class]->output();
5252

53-
$this->assertContains('derp', $output);
54-
$this->assertContains(FeaturePresenter::$statuses['disabled'], $output);
53+
$this->assertStringContainsString('derp', $output);
54+
$this->assertStringContainsString(FeaturePresenter::$statuses['disabled'], $output);
5555
}
5656
}

tests/Console/RolloutCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function render_feature_as_a_table_renders_the_feature_as_a_table()
3838

3939
$output = $this->app[Kernel::class]->output();
4040

41-
$this->assertContains('derp', $output);
41+
$this->assertStringContainsString('derp', $output);
4242
}
4343
}
4444

tests/TestCase.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ abstract class TestCase extends Base
1414
protected function setUpMockery()
1515
{
1616
Mockery::getConfiguration()->allowMockingNonExistentMethods(false);
17-
Mockery::getConfiguration()->allowMockingMethodsUnnecessarily(false);
1817
}
1918

2019
/**

0 commit comments

Comments
 (0)