replace zizaco/entrust to 5.2.x-dev

yuansir · Jan 9, 2017 · 7100410 · 7100410
1 parent f21ebe7
commit 7100410
Show file tree

Hide file tree

Showing 2 changed files with 1,614 additions and 555 deletions.
diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
         "laravel/framework": "5.2.*",
         "prettus/l5-repository": "^2.1",
         "thetispro/laravel5-setting": "dev-master",
-        "zizaco/entrust": "dev-laravel-5-2@dev",
+        "zizaco/entrust": "5.2.x-dev",
         "ryan/toastr-for-laravel": "^1.0",
         "league/fractal": "^0.13.0",
         "davejamesmiller/laravel-breadcrumbs": "^3.0"
@@ -39,34 +39,32 @@
         ]
     },
     "scripts": {
-        "post-root-package-install": [
-            "php -r \"copy('.env.example', '.env');\""
-        ],
-        "post-create-project-cmd": [
-            "php artisan key:generate"
-        ],
-        "post-install-cmd": [
-            "php artisan clear-compiled",
-            "php artisan optimize"
-        ],
-        "pre-update-cmd": [
-            "php artisan clear-compiled"
-        ],
-        "post-update-cmd": [
-            "php artisan optimize"
-        ]
-    },
+       "post-root-package-install": [
+           "php -r \"copy('.env.example', '.env');\""
+       ],
+       "post-create-project-cmd": [
+           "php artisan key:generate"
+       ],
+       "post-install-cmd": [
+           "php artisan clear-compiled",
+           "php artisan optimize"
+       ],
+       "post-update-cmd": [
+           "php artisan clear-compiled",
+           "php artisan optimize"
+       ]
+   },
     "config": {
         "preferred-install": "dist"
     },
     "repositories": [
         {
-            "type": "git",
-            "url": "git@github.com:jamisonvalenta/Laravel-4-Generators.git"
+            "type": "composer",
+            "url": "https://packagist.phpcomposer.com"
         },
         {
-            "type": "vcs",
-            "url": "https://github.com/hiendv/entrust"
+            "type": "git",
+            "url": "git@github.com:jamisonvalenta/Laravel-4-Generators.git"
         }
     ]
 }