From 81bc9c3fe5df4d207acb79b11064bc581278cb73 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Thu, 18 Oct 2018 23:06:36 +0100 Subject: [PATCH 1/4] Ensure app.debug is always a boolean (#3290) --- config/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/app.php b/config/app.php index e16e4a7a..40636c40 100644 --- a/config/app.php +++ b/config/app.php @@ -47,7 +47,7 @@ return [ | */ - 'debug' => env('APP_DEBUG', false), + 'debug' => (bool) env('APP_DEBUG', false), /* |-------------------------------------------------------------------------- From 97328b6f9e4cb42cc35e77e2cd1e873d97e79bf6 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Thu, 18 Oct 2018 23:13:12 +0100 Subject: [PATCH 2/4] Improved travis workflow (#3289) --- .travis.yml | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 903cff52..5d533fba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,20 +6,29 @@ branches: except: - l10n_2.4 -php: - - 7.1 - - 7.2 - before_install: - cp .env.example .env - phpenv config-rm xdebug.ini -install: travis_retry composer install --no-interaction --no-suggest +install: + - travis_retry composer install --no-interaction --no-suggest -script: - - if [ "$TRAVIS_PHP_VERSION" != "7.1" ]; then vendor/bin/phpunit; fi - - if [ "$TRAVIS_PHP_VERSION" == "7.1" ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; fi - -after_script: - - 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 +jobs: + include: + - stage: Security check + script: + - wget https://get.sensiolabs.org/security-checker.phar + - php security-checker.phar security:check ./composer.lock + php: 7.1 + - stage: Unit tests + script: vendor/bin/phpunit + php: 7.1 + - stage: Unit tests + script: vendor/bin/phpunit + php: 7.2 + - stage: Code coverage + script: + - vendor/bin/phpunit --coverage-clover build/logs/clover.xml + - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi + - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi + php: 7.1 From d900e274c611299699bf12720d5eadd64bbbd361 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Thu, 18 Oct 2018 23:21:00 +0100 Subject: [PATCH 3/4] Test on PHP 7.3 (#3286) --- .travis.yml | 3 +++ resources/views/partials/modules/timeline.blade.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5d533fba..770689a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,9 @@ jobs: - stage: Unit tests script: vendor/bin/phpunit php: 7.2 + - stage: Unit tests + script: vendor/bin/phpunit + php: 7.3 - stage: Code coverage script: - vendor/bin/phpunit --coverage-clover build/logs/clover.xml diff --git a/resources/views/partials/modules/timeline.blade.php b/resources/views/partials/modules/timeline.blade.php index d4f6b761..1c990499 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 861db1de0942ca06d8e72c75a66830b87e78749e Mon Sep 17 00:00:00 2001 From: James Brooks Date: Thu, 18 Oct 2018 23:21:33 +0100 Subject: [PATCH 4/4] Ignore l10n_2.3 branch (#3285) --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 770689a0..ffc98ac9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,8 @@ sudo: false branches: except: - - l10n_2.4 + - l10n_2.3 + - l10n_2.4 before_install: - cp .env.example .env