From 5782b2edb9bac8fd268ec699450428c6b95fdacc Mon Sep 17 00:00:00 2001 From: James Brooks Date: Thu, 18 Oct 2018 09:56:24 +0100 Subject: [PATCH 1/6] Test on PHP 7.3 Closes #3283 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 903cff52847f..7b05109a5dd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ branches: php: - 7.1 - 7.2 + - 7.3 before_install: - cp .env.example .env From 88fcf0f17a1b17ff2a120bd05ca47b973cecb53b Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Thu, 18 Oct 2018 20:45:30 +0100 Subject: [PATCH 2/6] Ignore failures to disable xdebug --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7b05109a5dd4..9a595a964851 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ php: before_install: - cp .env.example .env - - phpenv config-rm xdebug.ini + - phpenv config-rm xdebug.ini || true install: travis_retry composer install --no-interaction --no-suggest From 9d16727dfe238c3f1e181fd2b8fe3138f295bb15 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Thu, 18 Oct 2018 22:43:02 +0100 Subject: [PATCH 3/6] Dump the log file --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9a595a964851..8673b86e3122 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,5 +22,6 @@ script: - if [ "$TRAVIS_PHP_VERSION" == "7.1" ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; fi after_script: + - cat storage/logs/*.log - if [ "$TRAVIS_PHP_VERSION" == "7.1" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi - if [ "$TRAVIS_PHP_VERSION" == "7.1" ]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi From 1db6d58f2d5092b1f0aeb2a11f65605d947dab86 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Thu, 18 Oct 2018 22:51:21 +0100 Subject: [PATCH 4/6] Ensure the app debug config is really a boolean --- config/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/app.php b/config/app.php index e16e4a7ac36e..40636c40d1b0 100644 --- a/config/app.php +++ b/config/app.php @@ -47,7 +47,7 @@ | */ - 'debug' => env('APP_DEBUG', false), + 'debug' => (bool) env('APP_DEBUG', false), /* |-------------------------------------------------------------------------- From 85745a6b8744f529fe896fe113871c3e3a197039 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Thu, 18 Oct 2018 23:11:20 +0100 Subject: [PATCH 5/6] All dates need not have incidents --- resources/views/partials/modules/timeline.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/partials/modules/timeline.blade.php b/resources/views/partials/modules/timeline.blade.php index d4f6b76109da..660065ffc9c3 100644 --- a/resources/views/partials/modules/timeline.blade.php +++ b/resources/views/partials/modules/timeline.blade.php @@ -2,7 +2,7 @@

{{ trans('cachet.incidents.past') }}

@foreach($allIncidents as $date => $incidents) - @include('partials.incidents', [compact($date), compact($incidents)]) + @include('partials.incidents', [compact($date), @compact($incidents)]) @endforeach
From 6ab69fcfb629dbc27e6d554f4532ed495be129f4 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Thu, 18 Oct 2018 23:16:22 +0100 Subject: [PATCH 6/6] Similar for dates --- resources/views/partials/modules/timeline.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/partials/modules/timeline.blade.php b/resources/views/partials/modules/timeline.blade.php index 660065ffc9c3..1c99049904eb 100644 --- a/resources/views/partials/modules/timeline.blade.php +++ b/resources/views/partials/modules/timeline.blade.php @@ -2,7 +2,7 @@

{{ trans('cachet.incidents.past') }}

@foreach($allIncidents as $date => $incidents) - @include('partials.incidents', [compact($date), @compact($incidents)]) + @include('partials.incidents', [@compact($date), @compact($incidents)]) @endforeach