Merge pull request #1 from CachetHQ/2.4

Update from upstream repo CachetHQ/Cachet

.travis.yml

@@ -4,22 +4,35 @@ sudo: false
 
 branches:
   except:
-  - l10n_2.4
-
-php:
-  - 7.1
-  - 7.2
+    - l10n_2.3
+    - l10n_2.4
 
 before_install:
   - cp .env.example .env
   - phpenv config-rm xdebug.ini
 
-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
+install:
+  - travis_retry composer install --no-interaction --no-suggest
 
-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: Unit tests
+      script: vendor/bin/phpunit
+      php: 7.3
+    - 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

config/app.php

@@ -47,7 +47,7 @@
     |
     */
 
-    'debug' => env('APP_DEBUG', false),
+    'debug' => (bool) env('APP_DEBUG', false),
 
     /*
     |--------------------------------------------------------------------------

resources/views/partials/modules/timeline.blade.php

@@ -2,7 +2,7 @@
 <div class="section-timeline">
     <h1>{{ trans('cachet.incidents.past') }}</h1>
     @foreach($allIncidents as $date => $incidents)
-    @include('partials.incidents', [compact($date), compact($incidents)])
+    @include('partials.incidents', [@compact($date), @compact($incidents)])
     @endforeach
 </div>