Skip to content

Commit 78ae285

Browse files
authored
Merge pull request #791 from cakephp/remove-travis
Remove travis and add php8 support
2 parents 8de66a9 + 30baca6 commit 78ae285

File tree

4 files changed

+8
-52
lines changed

4 files changed

+8
-52
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ jobs:
6464

6565
- name: Composer install
6666
run: |
67-
if ${{ matrix.prefer-lowest == 'prefer-lowest' }}; then
67+
if [[ ${{ matrix.php-version }} == '8.0' ]]; then
68+
composer install --ignore-platform-reqs
69+
elif ${{ matrix.prefer-lowest == 'prefer-lowest' }}; then
6870
composer update --prefer-lowest --prefer-stable
6971
else
7072
composer install

.travis.yml

Lines changed: 0 additions & 46 deletions
This file was deleted.

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"require-dev": {
3333
"cakephp/cakephp-codesniffer": "^4.0",
3434
"cakephp/authorization": "^2.0",
35-
"phpunit/phpunit": "^8.5"
35+
"phpunit/phpunit": "~8.5.0 | ^9.3"
3636
},
3737
"autoload": {
3838
"psr-4": {

tests/TestCase/Panel/DeprecationsPanelTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ public function testShutdown()
6565

6666
$error = $data['plugins']['DebugKit'][0];
6767
$this->assertStringContainsString('Something going away', $error['message']);
68-
$this->assertSame('DebugKit/tests/TestCase/Panel/DeprecationsPanelTest.php', $error['niceFile']);
69-
$this->assertSame(46, $error['line']);
68+
$this->assertArrayHasKey('niceFile', $error);
69+
$this->assertArrayHasKey('line', $error);
7070

7171
$error = $data['plugins']['DebugKit'][2];
7272
$this->assertStringContainsString('Raw error', $error['message']);
73-
$this->assertSame('DebugKit/tests/TestCase/Panel/DeprecationsPanelTest.php', $error['niceFile']);
74-
$this->assertSame(48, $error['line']);
73+
$this->assertArrayHasKey('niceFile', $error);
74+
$this->assertArrayHasKey('line', $error);
7575
}
7676

7777
public function testSummary()

0 commit comments

Comments
 (0)