Bump version

Don't use settings caching in cli

.github/ISSUE_TEMPLATE

@@ -1,16 +1,8 @@
-Before submitting your issue, please make sure that you've checked all of the checkboxes below.
+Before submitting your issue, please make sure that you've checked the checkboxes below.
 
-- [ ] You're running the [latest release](https://github.com/CachetHQ/Cachet/releases/latest) version of Cachet.
-- [ ] Ensure that you're running at least PHP 5.5.9, you can check this by running `php -v`
-- [ ] You've ran `rm -rf bootstrap/cache/*` from the root of your Cachet installation.
-
-To help us better understand your issue, please answer the following — cheers!
-
-### Your setup
-
-- *What version of Cachet?*
-- *What database driver? MySQL? Postgres? SQLite?*
-- *What version of PHP?*
+- [ ] I am running the [latest release](https://github.com/CachetHQ/Cachet/releases/latest) version of Cachet.
+- [ ] I am running at least PHP 5.5.9. *You can check this by running `php -v`.*
+- [ ] I have ran `rm -rf bootstrap/cache/*`.
 
 ### Expected behaviour
 
@@ -23,3 +15,6 @@ To help us better understand your issue, please answer the following — cheers!
 ### Steps to reproduce
 
 *If your issue requires any specific steps to reproduce, please outline them here.*
+
+1. First step
+2. Second step

README.md

@@ -3,7 +3,7 @@
 [![StyleCI](https://styleci.io/repos/26730195/shield)](https://styleci.io/repos/26730195/)
 [![Build Status](https://img.shields.io/travis/CachetHQ/Cachet/master.svg?style=flat-square)](https://travis-ci.org/CachetHQ/Cachet)
 [![Software License](https://img.shields.io/badge/license-BSD3-brightgreen.svg?style=flat-square)](LICENSE)
-[![Crowdin](https://d322cqt584bo4o.cloudfront.net/cachet/localized.png)](http://translate.cachethq.io/project/cachet)
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/cachet/localized.svg)](http://translate.cachethq.io/project/cachet)
 [![Packagist](https://img.shields.io/packagist/v/cachethq/cachet.svg?style=flat-square)](https://packagist.org/packages/cachethq/cachet)
 
 ![Screenshot](https://cachethq.io/img/main-interface.jpg)

VERSION

@@ -1 +1 @@
-2.3.2
+2.3.5

app/Bus/Commands/Metric/AddMetricPointCommand.php

@@ -42,7 +42,7 @@ final class AddMetricPointCommand
      * @var string[]
      */
     public $rules = [
-        'value'      => 'int',
+        'value'      => 'numeric',
         'created_at' => 'string',
     ];
 

app/Composers/StatusPageComposer.php

@@ -46,7 +46,9 @@ class StatusPageComposer
             ];
         } elseif (Component::enabled()->notStatus(1)->count() === 0) {
             // If all our components are ok, do we have any non-fixed incidents?
-            $incidents = Incident::notScheduled()->orderBy('created_at', 'desc')->get();
+            $incidents = Incident::notScheduled()->orderBy('created_at', 'desc')->get()->filter(function ($incident) {
+                return $incident->status > 0;
+            });
             $incidentCount = $incidents->count();
 
             if ($incidentCount === 0 || ($incidentCount >= 1 && (int) $incidents->first()->status === 4)) {

app/Foundation/Providers/ConfigServiceProvider.php

@@ -16,6 +16,7 @@ use CachetHQ\Cachet\Settings\Cache;
 use CachetHQ\Cachet\Settings\Repository;
 use Exception;
 use Illuminate\Support\ServiceProvider;
+use Jenssegers\Date\Date;
 
 /**
  * This is the config service provider class.
@@ -34,9 +35,10 @@ class ConfigServiceProvider extends ServiceProvider
     public function boot()
     {
         $env = $this->app->environment();
+        $cli = $this->app->runningInConsole();
         $repo = $this->app->make(Repository::class);
         $cache = $this->app->make(Cache::class);
-        $loaded = $cache->load($env);
+        $loaded = $cli ? false : $cache->load($env);
 
         $this->app->terminating(function () use ($repo, $cache) {
             if ($repo->stale()) {
@@ -45,7 +47,7 @@ class ConfigServiceProvider extends ServiceProvider
         });
 
         try {
-            if ($loaded === false) {
+            if ($cli === false && $loaded === false) {
                 $loaded = $repo->all();
                 $cache->store($env, $loaded);
             }
@@ -64,6 +66,7 @@ class ConfigServiceProvider extends ServiceProvider
         if ($appLocale = $this->app->config->get('setting.app_locale')) {
             $this->app->config->set('app.locale', $appLocale);
             $this->app->translator->setLocale($appLocale);
+            Date::setLocale($appLocale);
         }
 
         if ($appTimezone = $this->app->config->get('setting.app_timezone')) {

app/Http/Controllers/Dashboard/ApiController.php

@@ -11,32 +11,46 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
+use CachetHQ\Cachet\Bus\Commands\Component\UpdateComponentCommand;
+use CachetHQ\Cachet\Bus\Commands\ComponentGroup\UpdateComponentGroupCommand;
+use CachetHQ\Cachet\Http\Controllers\Api\AbstractApiController;
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\ComponentGroup;
 use CachetHQ\Cachet\Models\IncidentTemplate;
-use Exception;
 use GrahamCampbell\Binput\Facades\Binput;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Routing\Controller;
+use Illuminate\Database\QueryException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
-class ApiController extends Controller
+class ApiController extends AbstractApiController
 {
     /**
      * Updates a component with the entered info.
      *
      * @param \CachetHQ\Cachet\Models\Component $component
      *
-     * @throws \Exception
+     * @throws \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
      *
      * @return \CachetHQ\Cachet\Models\Component
      */
     public function postUpdateComponent(Component $component)
     {
-        if (!$component->update(Binput::except(['_token']))) {
-            throw new Exception(trans('dashboard.components.edit.failure'));
+        try {
+            dispatch(new UpdateComponentCommand(
+                $component,
+                null,
+                null,
+                Binput::get('status'),
+                null,
+                null,
+                null,
+                null
+            ));
+        } catch (QueryException $e) {
+            throw new BadRequestHttpException();
         }
 
-        return $component;
+        return $this->item($component);
     }
 
     /**
@@ -49,11 +63,23 @@ class ApiController extends Controller
         $componentData = Binput::get('ids');
 
         foreach ($componentData as $order => $componentId) {
-            // Ordering should be 1-based, data comes in 0-based
-            Component::find($componentId)->update(['order' => $order + 1]);
+            try {
+                dispatch(new UpdateComponentCommand(
+                    Component::find($componentId),
+                    null,
+                    null,
+                    null,
+                    null,
+                    $order + 1,
+                    null,
+                    null
+                ));
+            } catch (QueryException $e) {
+                throw new BadRequestHttpException();
+            }
         }
 
-        return $componentData;
+        return $this->collection(Component::query()->orderBy('order')->get());
     }
 
     /**
@@ -66,10 +92,15 @@ class ApiController extends Controller
         $groupData = Binput::get('ids');
 
         foreach ($groupData as $order => $groupId) {
-            ComponentGroup::find($groupId)->update(['order' => $order + 1]);
+            dispatch(new UpdateComponentGroupCommand(
+                ComponentGroup::find($groupId),
+                null,
+                $order + 1,
+                null
+            ));
         }
 
-        return $groupData;
+        return $this->collection(ComponentGroup::query()->orderBy('order')->get());
     }
 
     /**

app/Http/Controllers/SetupController.php

@@ -250,10 +250,11 @@ class SetupController extends Controller
         try {
             (new Dotenv($dir, $file))->load();
 
-            $envValue = env(strtoupper($key)) ?: 'null';
+            $envKey = strtoupper($key);
+            $envValue = env($envKey) ?: 'null';
 
             file_put_contents($path, str_replace(
-                $envValue, $value, file_get_contents($path)
+                $envKey.'='.$envValue, $envKey.'='.$value, file_get_contents($path)
             ));
         } catch (InvalidPathException $e) {
             //

app/Models/Incident.php

@@ -16,6 +16,7 @@ use CachetHQ\Cachet\Models\Traits\SearchableTrait;
 use CachetHQ\Cachet\Models\Traits\SortableTrait;
 use CachetHQ\Cachet\Presenters\IncidentPresenter;
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use McCool\LaravelAutoPresenter\HasPresenter;
@@ -97,7 +98,7 @@ class Incident extends Model implements HasPresenter
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeVisible($query)
+    public function scopeVisible(Builder $query)
     {
         return $query->where('visible', 1);
     }
@@ -109,9 +110,9 @@ class Incident extends Model implements HasPresenter
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeScheduled($query)
+    public function scopeScheduled(Builder $query)
     {
-        return $query->where('status', 0)->where('scheduled_at', '>=', Carbon::now());
+        return $query->where('status', 0)->where('scheduled_at', '>=', Carbon::now()->toDateTimeString());
     }
 
     /**
@@ -121,10 +122,12 @@ class Incident extends Model implements HasPresenter
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeNotScheduled($query)
+    public function scopeNotScheduled(Builder $query)
     {
-        return $query->where(function ($query) {
-            return $query->whereNull('scheduled_at')->orWhere('scheduled_at', '<=', Carbon::now());
+        return $query->where('status', '>', 0)->orWhere(function ($query) {
+            $query->where('status', 0)->where(function ($query) {
+                $query->whereNull('scheduled_at')->orWhere('scheduled_at', '<=', Carbon::now()->toDateTimeString());
+            });
         });
     }
 

composer.json

@@ -41,7 +41,7 @@
         "mccool/laravel-auto-presenter": "^4.3",
         "pragmarx/google2fa": "^0.7.1",
         "rcrowe/twigbridge": "^0.9.2",
-        "roumen/feed": "^2.10.3"
+        "roumen/feed": "^2.10.4"
     },
     "require-dev": {
         "alt-three/testbench": "^1.4",

composer.lock

@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "121ae0d23ad2d8a2d0a87c90a5102e6b",
-    "content-hash": "bd751e5a5d663a274000acd26ba97e86",
+    "hash": "1e468595f20309ca6658b805a1486282",
+    "content-hash": "4b3f3e889041139f810c76897b44722a",
     "packages": [
         {
             "name": "alt-three/badger",
@@ -325,16 +325,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.18.25",
+            "version": "3.18.28",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "37a8ce927a69de3d821c21b64674a2b3b9d1d247"
+                "reference": "c75d3ba185d5db6998124fa1a99a63e5d529b247"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/37a8ce927a69de3d821c21b64674a2b3b9d1d247",
-                "reference": "37a8ce927a69de3d821c21b64674a2b3b9d1d247",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c75d3ba185d5db6998124fa1a99a63e5d529b247",
+                "reference": "c75d3ba185d5db6998124fa1a99a63e5d529b247",
                 "shasum": ""
             },
             "require": {
@@ -401,7 +401,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2016-07-05 19:25:06"
+            "time": "2016-07-13 20:34:06"
         },
         {
             "name": "backup-manager/backup-manager",
@@ -1458,16 +1458,16 @@
         },
         {
             "name": "graham-campbell/exceptions",
-            "version": "v8.6.1",
+            "version": "v8.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/GrahamCampbell/Laravel-Exceptions.git",
-                "reference": "40e6208cff22859cd63788fee19a8c15aebc1ef9"
+                "reference": "7a36e51547258f750a1e68f6caa717bff26e710b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Exceptions/zipball/40e6208cff22859cd63788fee19a8c15aebc1ef9",
-                "reference": "40e6208cff22859cd63788fee19a8c15aebc1ef9",
+                "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Exceptions/zipball/7a36e51547258f750a1e68f6caa717bff26e710b",
+                "reference": "7a36e51547258f750a1e68f6caa717bff26e710b",
                 "shasum": ""
             },
             "require": {
@@ -1523,7 +1523,7 @@
                 "laravel",
                 "whoops"
             ],
-            "time": "2016-06-04 20:20:48"
+            "time": "2016-07-14 15:54:14"
         },
         {
             "name": "graham-campbell/markdown",
@@ -2962,16 +2962,16 @@
         },
         {
             "name": "roumen/feed",
-            "version": "v2.10.3",
+            "version": "v2.10.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/RoumenDamianoff/laravel-feed.git",
-                "reference": "d2f51d9f0d8c699cb812c5b7edeb4804e253f691"
+                "reference": "900594412cab37515b2b53c8953af1201024e48d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/RoumenDamianoff/laravel-feed/zipball/d2f51d9f0d8c699cb812c5b7edeb4804e253f691",
-                "reference": "d2f51d9f0d8c699cb812c5b7edeb4804e253f691",
+                "url": "https://api.github.com/repos/RoumenDamianoff/laravel-feed/zipball/900594412cab37515b2b53c8953af1201024e48d",
+                "reference": "900594412cab37515b2b53c8953af1201024e48d",
                 "shasum": ""
             },
             "require": {
@@ -3009,7 +3009,7 @@
                 "laravel",
                 "rss"
             ],
-            "time": "2016-06-01 18:54:03"
+            "time": "2016-07-17 13:06:35"
         },
         {
             "name": "simplesoftwareio/simple-qrcode",
@@ -3064,23 +3064,23 @@
         },
         {
             "name": "swiftmailer/swiftmailer",
-            "version": "v5.4.2",
+            "version": "v5.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/swiftmailer/swiftmailer.git",
-                "reference": "d8db871a54619458a805229a057ea2af33c753e8"
+                "reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/d8db871a54619458a805229a057ea2af33c753e8",
-                "reference": "d8db871a54619458a805229a057ea2af33c753e8",
+                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/4cc92842069c2bbc1f28daaaf1d2576ec4dfe153",
+                "reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
             "require-dev": {
-                "mockery/mockery": "~0.9.1,<0.9.4"
+                "mockery/mockery": "~0.9.1"
             },
             "type": "library",
             "extra": {
@@ -3113,7 +3113,7 @@
                 "mail",
                 "mailer"
             ],
-            "time": "2016-05-01 08:45:47"
+            "time": "2016-07-08 11:51:25"
         },
         {
             "name": "symfony/console",

package.json

@@ -2,7 +2,7 @@
   "name": "cachet",
   "devDependencies": {
     "gulp": "~3.9.1",
-    "laravel-elixir": "~5.0.0",
+    "laravel-elixir": "~6.0.0-9",
     "animate-sass": "git+https://github.com/tgdev/animate-sass.git",
     "autosize": "^3.0.15",
     "bootstrap-sass": "^3.3.6",

resources/views/partials/schedule.blade.php

@@ -1,4 +1,3 @@
-
 <div class="timeline schedule">
     <div class="panel panel-info">
         <div class="panel-heading">