Update from upstream repo CachetHQ/Cachet

.travis.yml

@@ -9,7 +9,6 @@ branches:
 
 before_install:
   - cp .env.example .env
-  - phpenv config-rm xdebug.ini || true
 
 install:
   - travis_retry composer install --no-interaction --no-suggest
@@ -18,21 +17,29 @@ jobs:
   include:
     - stage: Security check
       script:
+        - phpenv config-rm xdebug.ini || true
         - 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
+      script:
+        - phpenv config-rm xdebug.ini || true
+        - vendor/bin/phpunit
       php: 7.1
     - stage: Unit tests
-      script: vendor/bin/phpunit
+      script:
+        - phpenv config-rm xdebug.ini || true
+        - vendor/bin/phpunit
       php: 7.2
     - stage: Unit tests
-      script: vendor/bin/phpunit
+      script:
+        - phpenv config-rm xdebug.ini || true
+        - vendor/bin/phpunit
       php: 7.3
     - stage: Code coverage
       script:
-        - vendor/bin/phpunit --coverage-clover build/logs/clover.xml
+        - 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

CONTRIBUTING.md

@@ -62,7 +62,7 @@ Of course bug reports, feature requests and [documentation](https://docs.cacheth
 
 As Cachet gains new features, the design and ideas that were once a perfect fit need updating and in some cases designing from scratch. This is where you come in! Fancy giving Cachet a lick of paint? Sweet!
 
-You'll need to install Node.js, Bower and Gulp.
+You'll need to install Node.js with NPM or Yarn.
 
 To get started you can do the following:
 
@@ -81,7 +81,8 @@ Built using [Laravel](https://laravel.com).
 We use these extra dependencies to develop Cachet:
 
 - Node.js
-- Gulp
+- NPM or Yarn
+- Composer
 - Git
 
 Once cloned to your local machine, you'll need some demo data! Run `php artisan cachet:seed` to get the demo installation ready for action.

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2018 Alt Three Services Limited.
+Copyright (c) 2015-2019 Alt Three Services Limited.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

README.md

@@ -10,10 +10,6 @@
 
 Cachet is a beautiful and powerful open source status page system.
 
-## Community
-
-You can now [join our Slack community!](http://cachethq-slack.herokuapp.com)
-
 ## Overview
 
 - List your service components
@@ -26,6 +22,10 @@ You can now [join our Slack community!](http://cachethq-slack.herokuapp.com)
 - Subscriber notifications via email
 - Two factor authentication
 
+## Community
+
+You can now [join our Slack community!](http://cachethq-slack.herokuapp.com)
+
 ## Requirements
 
 - PHP 7.1 or later
@@ -47,7 +47,7 @@ Here are some useful quick links:
 
 To test out the demo, you may login to the [Dashboard](https://dev.cachethq.io/dashboard) with the following:
 
-- **Username:** `test` or `test@test.com`
+- **Username:** `test` or `test@example.com`
 - **Password:** `test123`
 
 > The demo resets every 30 minutes.
@@ -72,4 +72,4 @@ A professional **installation service** is offered by Alt Three Services Limited
 
 Thank you to the following for [sponsoring](https://patreon.com/jbrooksuk) Cachet.
 
-![Exascale](/docs/images/sponsorships/exascale.jpg)
+[![Exascale](/docs/images/sponsorships/exascale.jpg)](https://www.exascale.co.uk/)

app/Bus/Commands/Component/CreateComponentCommand.php

@@ -81,7 +81,7 @@ final class CreateComponentCommand
      */
     public $rules = [
         'name'        => 'required|string',
-        'description' => 'required|string',
+        'description' => 'nullable|string',
         'status'      => 'required|int|min:0|max:4',
         'link'        => 'nullable|url',
         'order'       => 'nullable|int',

app/Bus/Commands/Incident/CreateIncidentCommand.php

@@ -140,7 +140,7 @@ final class CreateIncidentCommand
      *
      * @return void
      */
-    public function __construct($name, $status, $message, $visible, $component_id, $component_status, $notify, $stickied, $occurred_at, $template, array $template_vars = [], $meta = [])
+    public function __construct($name, $status, $message, $visible, $component_id, $component_status, $notify, $stickied, $occurred_at, $template, array $template_vars = [], array $meta = [])
     {
         $this->name = $name;
         $this->status = $status;

app/Bus/Commands/Incident/UpdateIncidentCommand.php

@@ -106,6 +106,13 @@ final class UpdateIncidentCommand
      */
     public $template_vars;
 
+    /**
+     * Meta key/value pairs.
+     *
+     * @var array
+     */
+    public $meta = [];
+
     /**
      * The validation rules.
      *
@@ -122,6 +129,7 @@ final class UpdateIncidentCommand
         'stickied'         => 'nullable|bool',
         'occurred_at'      => 'nullable|string',
         'template'         => 'nullable|string',
+        'meta'             => 'nullable|array',
     ];
 
     /**
@@ -139,10 +147,11 @@ final class UpdateIncidentCommand
      * @param string|null                      $occurred_at
      * @param string|null                      $template
      * @param array                            $template_vars
+     * @param array                            $meta
      *
      * @return void
      */
-    public function __construct(Incident $incident, $name, $status, $message, $visible, $component_id, $component_status, $notify, $stickied, $occurred_at, $template, array $template_vars = [])
+    public function __construct(Incident $incident, $name, $status, $message, $visible, $component_id, $component_status, $notify, $stickied, $occurred_at, $template, array $template_vars = [], array $meta = [])
     {
         $this->incident = $incident;
         $this->name = $name;
@@ -156,5 +165,6 @@ public function __construct(Incident $incident, $name, $status, $message, $visib
         $this->occurred_at = $occurred_at;
         $this->template = $template;
         $this->template_vars = $template_vars;
+        $this->meta = $meta;
     }
 }

app/Bus/Handlers/Commands/Incident/CreateIncidentCommandHandler.php

@@ -15,15 +15,16 @@
 use CachetHQ\Cachet\Bus\Commands\Incident\CreateIncidentCommand;
 use CachetHQ\Cachet\Bus\Events\Incident\IncidentWasCreatedEvent;
 use CachetHQ\Cachet\Bus\Exceptions\Incident\InvalidIncidentTimestampException;
+use CachetHQ\Cachet\Bus\Handlers\Traits\StoresMeta;
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\Incident;
 use CachetHQ\Cachet\Models\IncidentTemplate;
 use CachetHQ\Cachet\Models\Meta;
 use CachetHQ\Cachet\Services\Dates\DateFactory;
 use Carbon\Carbon;
 use Illuminate\Contracts\Auth\Guard;
-use Twig_Environment;
-use Twig_Loader_Array;
+use Twig\Environment as Twig_Environment;
+use Twig\Loader\ArrayLoader as Twig_Loader_Array;
 
 /**
  * This is the create incident command handler.
@@ -32,6 +33,8 @@
  */
 class CreateIncidentCommandHandler
 {
+    use StoresMeta;
+
     /**
      * The authentication guard instance.
      *
@@ -104,14 +107,7 @@ public function handle(CreateIncidentCommand $command)
 
         // Store any meta?
         if ($meta = $command->meta) {
-            foreach ($meta as $key => $value) {
-                Meta::create([
-                    'key'       => $key,
-                    'value'     => $value,
-                    'meta_type' => 'incidents',
-                    'meta_id'   => $incident->id,
-                ]);
-            }
+            $this->storeMeta($command->meta, 'incidents', $incident->id);
         }
 
         // Update the component.

app/Bus/Handlers/Commands/Incident/UpdateIncidentCommandHandler.php

@@ -15,13 +15,14 @@
 use CachetHQ\Cachet\Bus\Commands\Incident\UpdateIncidentCommand;
 use CachetHQ\Cachet\Bus\Events\Incident\IncidentWasUpdatedEvent;
 use CachetHQ\Cachet\Bus\Exceptions\Incident\InvalidIncidentTimestampException;
+use CachetHQ\Cachet\Bus\Handlers\Traits\StoresMeta;
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\Incident;
 use CachetHQ\Cachet\Models\IncidentTemplate;
 use CachetHQ\Cachet\Services\Dates\DateFactory;
 use Illuminate\Contracts\Auth\Guard;
-use Twig_Environment;
-use Twig_Loader_Array;
+use Twig\Environment as Twig_Environment;
+use Twig\Loader\ArrayLoader as Twig_Loader_Array;
 
 /**
  * This is the update incident command handler.
@@ -30,6 +31,8 @@
  */
 class UpdateIncidentCommandHandler
 {
+    use StoresMeta;
+
     /**
      * The authentication guard instance.
      *
@@ -86,6 +89,11 @@ public function handle(UpdateIncidentCommand $command)
         // Rather than making lots of updates, just fill and save.
         $incident->save();
 
+        // Store any meta?
+        if ($meta = $command->meta) {
+            $this->storeMeta($command->meta, 'incidents', $incident->id);
+        }
+
         // Update the component.
         if ($component = Component::find($command->component_id)) {
             execute(new UpdateComponentCommand(

app/Bus/Handlers/Traits/StoresMeta.php

@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Bus\Handlers\Traits;
+
+use CachetHQ\Cachet\Models\Meta;
+
+trait StoresMeta
+{
+    /**
+     * Stores all Meta values of a model.
+     *
+     * @param array      $metaData
+     * @param string     $metaType
+     * @param string|int $metaId
+     * @param string     $metaModel
+     *
+     * @return void
+     */
+    public function storeMeta($metaData, $metaType, $metaId, $metaModel = Meta::class)
+    {
+        // Validation required instead of type hinting because it could be passed as false or NULL
+        if (!is_array($metaData)) {
+            return;
+        }
+
+        foreach ($metaData as $key => $value) {
+            $modelInstance = call_user_func(
+                [$metaModel, 'firstOrNew'],
+                [
+                    'key'       => $key,
+                    'meta_type' => $metaType,
+                    'meta_id'   => $metaId,
+                ]
+            );
+
+            $value = $this->removeEmptyValues($value);
+            if (!empty($value)) {
+                $modelInstance->setAttribute('value', $value);
+                $modelInstance->save();
+                continue;
+            }
+
+            // The value is empty, remove the row
+            if ($modelInstance->exists) {
+                $modelInstance->delete();
+            }
+        }
+    }
+
+    /**
+     * Determine if a Value is empty.
+     *
+     * @param mixed $values
+     *
+     * @return array|mixed
+     */
+    protected function removeEmptyValues($values)
+    {
+        if (!is_array($values)) {
+            return empty($values) ? null : $values;
+        }
+
+        foreach ($values as $key => $value) {
+            if (!empty($value)) {
+                continue;
+            }
+            unset($values[$key]);
+        }
+
+        return $values;
+    }
+}

app/Composers/ComponentsComposer.php

@@ -53,7 +53,7 @@ public function __construct(Guard $guard)
     public function compose(View $view)
     {
         $componentGroups = $this->getVisibleGroupedComponents();
-        $ungroupedComponents = Component::ungrouped()->get();
+        $ungroupedComponents = Component::ungrouped()->orderBy('status', 'desc')->get();
 
         $view->withComponentGroups($componentGroups)
             ->withUngroupedComponents($ungroupedComponents);