Merge branch 'laravel-5.5'

MilesPong · Dec 11, 2017 · 6a445fe · 6a445fe
2 parents cc8f455 + 703de6e
commit 6a445fe
Show file tree

Hide file tree

Showing 4 changed files with 1,166 additions and 553 deletions.
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -48,9 +48,9 @@ public function boot()
      */
     public function register()
     {
-        if ($this->app->environment() != 'production' ) {
-            $this->app->register(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class);
-            $this->app->register(\Barryvdh\Debugbar\ServiceProvider::class);
-        }
+        // if ($this->app->environment() != 'production' ) {
+        //     $this->app->register(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class);
+        //     $this->app->register(\Barryvdh\Debugbar\ServiceProvider::class);
+        // }
     }
 }
diff --git a/composer.json b/composer.json
@@ -1,16 +1,17 @@
 {
-    "name": "laravel/laravel",
-    "description": "The Laravel Framework.",
-    "keywords": ["framework", "laravel"],
+    "name": "miles/indigo",
+    "description": "The individual blog built with Laravel Framework.",
+    "keywords": ["framework", "laravel", "blog"],
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": ">=5.6.4",
+        "php": ">=7.0.0",
+        "fideloper/proxy": "~3.3",
         "erusev/parsedown": "^1.6",
         "jellybool/translug": "^2.0",
         "jenssegers/agent": "^2.5",
         "laracasts/presenter": "^0.2.1",
-        "laravel/framework": "5.4.*",
+        "laravel/framework": "5.5.*",
         "laravel/tinker": "~1.0",
         "league/html-to-markdown": "^4.4",
         "predis/predis": "^1.1",
@@ -19,11 +20,12 @@
         "zizaco/entrust": "^1.8"
     },
     "require-dev": {
-        "barryvdh/laravel-debugbar": "^2.3",
+        "filp/whoops": "~2.0",
+        "barryvdh/laravel-debugbar": "^3.1",
         "barryvdh/laravel-ide-helper": "^2.3",
         "fzaninotto/faker": "~1.4",
         "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "~5.7"
+        "phpunit/phpunit": "~6.0"
     },
     "autoload": {
         "classmap": [
@@ -41,22 +43,26 @@
             "Tests\\": "tests/"
         }
     },
+    "extra": {
+        "laravel": {
+            "dont-discover": [
+            ]
+        }
+    },
     "scripts": {
         "post-root-package-install": [
-            "php -r \"file_exists('.env') || copy('.env.example', '.env');\""
+            "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
         ],
         "post-create-project-cmd": [
-            "php artisan key:generate"
+            "@php artisan key:generate"
         ],
-        "post-install-cmd": [
-            "Illuminate\\Foundation\\ComposerScripts::postInstall",
-            "php artisan optimize"
+        "post-autoload-dump": [
+            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
+            "@php artisan package:discover"
         ],
         "post-update-cmd": [
-            "Illuminate\\Foundation\\ComposerScripts::postUpdate",
-            "php artisan ide-helper:generate",
-            "php artisan ide-helper:meta",
-            "php artisan optimize"
+            "@php artisan ide-helper:generate",
+            "@php artisan ide-helper:meta"
         ]
     },
     "config": {