Update from upstream repo CachetHQ/Cachet

.editorconfig

@@ -11,5 +11,5 @@ indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
 
-[{package.json,*.yml}]
+[{*.json,*.yml}]
 indent_size = 2

.env.example

@@ -3,6 +3,7 @@ APP_DEBUG=false
 APP_URL=http://localhost
 APP_TIMEZONE=UTC
 APP_KEY=
+DEBUGBAR_ENABLED=false
 
 DB_DRIVER=mysql
 DB_HOST=localhost
@@ -39,3 +40,5 @@ GITHUB_TOKEN=null
 NEXMO_KEY=null
 NEXMO_SECRET=null
 NEXMO_SMS_FROM=Cachet
+
+TRUSTED_PROXIES=

CONTRIBUTING.md → .github/CONTRIBUTING.md

@@ -1,14 +1,20 @@
 # Contribution Guidelines
 
-## Creating issues
+## Thank you
 
-We track feature requests and bug reports on the [issue tracker](https://github.com/cachethq/Cachet/issues). Please send support requests to our support email; [support@alt-three.com](mailto:support@alt-three.com?subject=Cachet Support).
+Firstly, thank you for taking an interest in Cachet and for reading this guide.
+
+## Creating issues
+
+We track feature requests and bug reports on the [issue tracker](https://github.com/cachethq/Cachet/issues). Please send support requests to our support email; [support@alt-three.com](mailto:support@alt-three.com?subject=Cachet%20Support).
 
 **Always be respectful.** Organisation members reserve the right to lock topics if they feel necessary.
 
 ## Languages
 
-Please submit non-English translations to the [Cachet CrowdIn](https://translate.cachethq.io) project. This makes syncing translations much easier.
+This project accepts **English translations** only. Translations will be updated automatically through the [CrowdIn](https://translate.cachethq.io) integration.
+
+Please submit alternative translations to the [Cachet CrowdIn](https://translate.cachethq.io) project. CrowdIn will automatically send a Pull Request with your updates in.
 
 ## Coding Standards
 
@@ -32,19 +38,31 @@ If you're feeling adventurous, you can become a Git & GitHub master with the [Gi
 
 You should also make use of the [.editorconfig](/.editorconfig) file found within the root of the repository. It'll make sure that your editor is setup with the same file settings.
 
----
+## Ways to help:
+
+Start by becoming familiar with Cachet. If you're already using Cachet, that's a great head start. If not, check out the latest [demo](https://dev.cachethq.io) and have a play. You can also download and install Cachet locally to familiarise yourself that way.
+
+You don't have to be a developer to help improve Cachet, infact there are lots of ways that you can help us.
+
+### Spread the word
 
-## Contributing as a non-developer/non-designer
+There are a lot of people who don't know about Cachet or what a status page is and how important it can be. [Tweet about Cachet](https://twitter.com/CachetHQ). Write blog posts about your success (or failures, we're not perfect) with Cachet and share what you took away from it.
+
+### Help with Documentation
+
+Cachet is in use around the world. Cachet speaks multiple languages. Our documentation doesn't and can be hard to understand for non-English speaking people. Documentation should be easy to understand and we need your help to make this possible. Check out [CachetHQ/Docs](https://github.com/CachetHQ/Docs) to contribute to our documentation.
+
+### As a non-developer/non-designer
 
 We're always looking for new [translations](#translations).
 
 Of course bug reports, feature requests and [documentation](https://docs.cachethq.io) are always appreciated.
 
-## Contributing as a designer
+### As a designer
 
 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:
 
@@ -56,14 +74,21 @@ If you're making a lot of changes, you'll find that running `npm run watch` will
 
 When you're happy with your changes, please run `npm run prod` to minify the assets.
 
-## Contributing as a developer
+### As a developer
 
 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.
+
+### #YOLO JUST SUBMIT A PR
+
+_A great idea taken from https://github.com/metabase/metabase/blob/master/docs/contributing.md#yolo-just-submit-a-pr._
+
+> If you come up with something really cool, and want to share it with us, just submit a PR. If it hasn't gone through the above process, we probably won't merge it as is, but if it's compelling, we're more than willing to help you via code review, design review and generally OCD nitpicking so that it fits into the rest of our codebase.

.github/FUNDING.yml

@@ -0,0 +1,5 @@
+# These are supported funding model platforms
+
+github:
+  - jbrooksuk
+  - cachethq

.gitignore

@@ -9,3 +9,4 @@ Homestead.json
 Homestead.yaml
 npm-debug.log
 .env
+package-lock.json

.travis.yml

@@ -1,16 +1,38 @@
 language: php
-
+dist: trusty
 sudo: false
 
-php:
-  - 5.6
-  - 7.0
-  - 7.1
+branches:
+  except:
+    - 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
+install:
+  - travis_retry composer install --no-interaction --no-suggest
 
-script: vendor/bin/paratest -p 4 --max-batch-size 256
+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:
+        - phpenv config-rm xdebug.ini || true
+        - vendor/bin/phpunit
+      php: 7.1
+    - stage: Unit tests
+      script:
+        - phpenv config-rm xdebug.ini || true
+        - vendor/bin/phpunit
+      php: 7.2
+    - stage: Unit tests
+      script:
+        - phpenv config-rm xdebug.ini || true
+        - vendor/bin/phpunit
+      php: 7.3

LICENSE

@@ -1,12 +1,9 @@
-Copyright (c) 2015-2017 Alt Three Services Limited.
-All rights reserved.
+The MIT License (MIT)
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Copyright (c) James Brooks
 
-    1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-    2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-    3. Neither the name of the Cachet nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,20 +1,19 @@
-<p align="center"><img src="https://demo.cachethq.io/img/cachet-logo.svg" width="50%"></p>
-
 <p align="center">
-<a href="https://styleci.io/repos/26730195/"><img src="https://styleci.io/repos/26730195/shield" alt="StyleCI"></a>
-<a href="https://travis-ci.org/CachetHQ/Cachet"><img src="https://img.shields.io/travis/CachetHQ/Cachet/2.4.svg?style=flat-square" alt="Build Status"></a>
-<a href="LICENSE"><img src="https://img.shields.io/badge/license-BSD3-brightgreen.svg?style=flat-square" alt="License"></a>
-<a href="https://translate.cachethq.io/project/cachet"><img src="https://d322cqt584bo4o.cloudfront.net/cachet/localized.svg" alt="Localisation"></a>
-<a href="https://github.com/CachetHQ/Cachet/releases"><img src="https://img.shields.io/github/release/cachethq/cachet.svg?style=flat-square" alt="Latest Stable Version"></a>
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="https://cachethq.io/assets/cachet-logo-dark.svg">
+      <img alt="Cachet Logo" src="https://cachethq.io/assets/cachet-logo-light.svg">
+    </picture>
 </p>
 
-Cachet is a beautiful and powerful open source status page system.
+Cachet, the open-source status page system.
+
+## Cachet 3.x Announcement
 
-## Community
+We are shifting our attention and resources to Cachet 3.x and will no longer be supporting the 2.x version.
 
-You can now [join our Slack community!](http://cachethq-slack.herokuapp.com)
+For more information on the Cachet rebuild and our plans for 3.x, you can read the announcement [here](https://github.com/CachetHQ/Cachet/discussions/4342).
 
-## Overview
+## Features
 
 - List your service components
 - Report incidents
@@ -28,46 +27,30 @@ You can now [join our Slack community!](http://cachethq-slack.herokuapp.com)
 
 ## Requirements
 
-- PHP 5.6.4+ or newer
-- HTTP server with PHP support (eg: Apache, Nginx, Caddy)
+- PHP 7.1.3 – 7.3
+- HTTP server with PHP support (e.g.: Apache, Nginx, Caddy)
 - [Composer](https://getcomposer.org)
-- A supported database: MySQL, PostgreSQL or SQLite
+- A supported database: MariaDB, MySQL, PostgreSQL or SQLite
 
 ## Installation, Upgrades and Documentation
 
 You can find documentation at [https://docs.cachethq.io](https://docs.cachethq.io).
 
 Here are some useful quick links:
 
-- [Installing Cachet](https://docs.cachethq.io/docs/installing-cachet)
-- [Getting started with Docker](https://docs.cachethq.io/docs/get-started-with-docker)
+- [Installing Cachet](https://docs.cachethq.io/installation/)
+- [Getting started with Docker](https://docs.cachethq.io/installation/docker)
 
 ### Demo
 
-To test out the demo, you may login to the [Dashboard](https://demo.cachethq.io/dashboard) with the following:
+To test out the demo, you can log in to the [Cachet dashboard](https://demo.cachethq.io/dashboard) with the following credentials:
 
-- **Username:** `test` or `test@test.com`
+- **Username:** `test` or `test@example.com`
 - **Password:** `test123`
 
-> The demo resets every 30 minutes.
-
-### v2.4 Demo
-
-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`
-- **Password:** `test123`
-
-> The demo resets every 30 minutes.
-
-## Translate Cachet
-
-If you'd like to contribute translations, please check out our [CrowdIn project](https://crowdin.com/project/cachet).
-
-## Professional Installation Service
-
-We offer a professional installation service. To find out more, email us at [support@alt-three.com](mailto:support@alt-three.com?Cachet%20Installation)
+> **Note**
+> The demo will automatically reset every 30 minutes.
 
 ## Security Vulnerabilities
 
-If you discover a security vulnerability within Cachet, please send an e-mail to us at support@alt-three.com. We handle all security vulnerabilities on a case-by-case basis.
+If you discover a security vulnerability within Cachet, please send an e-mail to [support@cachethq.io](mailto:support@cachethq.io?Cachet%20Security%20Vulnerability). All security vulnerabilities are reviewed on a case-by-case basis.

SECURITY.md

@@ -0,0 +1,17 @@
+# Security Policy
+
+**PLEASE DON'T DISCLOSE SECURITY-RELATED ISSUES PUBLICLY, [SEE BELOW](#reporting-a-vulnerability).**
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+|   2.4   | :white_check_mark: |
+| < 2.4   | :x: |
+
+## Reporting a Vulnerability
+
+If you discover a security vulnerability within Cachet, please email James Brooks at james@cachethq.io. All security vulnerabilities will be promptly addressed.

VERSION

@@ -1 +1 @@
-2.4.0-dev
+2.4.1

app/Bus/Commands/Component/CreateComponentCommand.php

@@ -74,37 +74,46 @@ final class CreateComponentCommand
      */
     public $meta;
 
+    /**
+     * Tags string.
+     *
+     * @var string
+     */
+    public $tags;
+
     /**
      * The validation rules.
      *
      * @var string[]
      */
     public $rules = [
         'name'        => 'required|string',
-        'description' => 'required|string',
+        'description' => 'nullable|string',
         'status'      => 'required|int|min:0|max:4',
         'link'        => 'nullable|url',
         'order'       => 'nullable|int',
         'group_id'    => 'nullable|int',
         'enabled'     => 'nullable|bool',
         'meta'        => 'nullable|array',
+        'tags'        => 'nullable|string',
     ];
 
     /**
      * Create a new add component command instance.
      *
-     * @param string     $name
-     * @param string     $description
-     * @param int        $status
-     * @param string     $link
-     * @param int        $order
-     * @param int        $group_id
-     * @param bool       $enabled
-     * @param array|null $meta
+     * @param string      $name
+     * @param string      $description
+     * @param int         $status
+     * @param string      $link
+     * @param int         $order
+     * @param int         $group_id
+     * @param bool        $enabled
+     * @param array|null  $meta
+     * @param string|null $tags
      *
      * @return void
      */
-    public function __construct($name, $description, $status, $link, $order, $group_id, $enabled, $meta)
+    public function __construct($name, $description, $status, $link, $order, $group_id, $enabled, $meta, $tags = null)
     {
         $this->name = $name;
         $this->description = $description;
@@ -114,5 +123,6 @@ public function __construct($name, $description, $status, $link, $order, $group_
         $this->group_id = $group_id;
         $this->enabled = $enabled;
         $this->meta = $meta;
+        $this->tags = $tags;
     }
 }