From 4fe7977fcee5a71a21117ac035419baf999cfddd Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Sun, 19 Jul 2020 22:59:07 +0100 Subject: [PATCH 1/2] Disable code coverage runs --- .travis.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index efd0fdd47bcf..8d0b77fd6958 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,10 +36,3 @@ jobs: - phpenv config-rm xdebug.ini || true - vendor/bin/phpunit php: 7.3 - - stage: Code coverage - script: - - phpenv config-rm xdebug.ini || true - - phpdbg -qrr vendor/bin/phpunit --coverage-text --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 59fa667afa3fa38882b251864194049d1dfefdd2 Mon Sep 17 00:00:00 2001 From: Cachet Bot Date: Sun, 19 Jul 2020 21:59:28 +0000 Subject: [PATCH 2/2] Apply fixes from StyleCI --- app/Presenters/IncidentUpdatePresenter.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/Presenters/IncidentUpdatePresenter.php b/app/Presenters/IncidentUpdatePresenter.php index 5e1d3502cf4b..abbcbbc8d173 100644 --- a/app/Presenters/IncidentUpdatePresenter.php +++ b/app/Presenters/IncidentUpdatePresenter.php @@ -123,14 +123,19 @@ public function icon() { switch ($this->wrappedObject->status) { case 1: // Investigating + return 'icon ion-flag oranges'; case 2: // Identified + return 'icon ion-alert yellows'; case 3: // Watching + return 'icon ion-eye blues'; case 4: // Fixed + return 'icon ion-checkmark greens'; default: // Something actually broke, this shouldn't happen. + return ''; } }