]> BookStack Code Mirror - bookstack/commitdiff
Merge branch 'v0.14'
authorDan Brown <redacted>
Wed, 1 Feb 2017 22:28:38 +0000 (22:28 +0000)
committerDan Brown <redacted>
Wed, 1 Feb 2017 22:28:38 +0000 (22:28 +0000)
1  2 
composer.json

diff --combined composer.json
index c0543a4cad4b896cb17aa3af357c07a4b1ebf09a,8d963022cb34be5e9bba26e1cf5c5872ccd08240..f0cf9c4ae03b9b81a514e101c43fff3ee79a7f97
@@@ -6,18 -6,17 +6,18 @@@
      "type": "project",
      "require": {
          "php": ">=5.6.4",
 -        "laravel/framework": "^5.3.4",
 +        "laravel/framework": "5.4.*",
          "ext-tidy": "*",
          "intervention/image": "^2.3",
 -        "laravel/socialite": "^2.0",
 -        "barryvdh/laravel-ide-helper": "^2.1",
 -        "barryvdh/laravel-debugbar": "^2.2.3",
 +        "laravel/socialite": "^3.0",
 +        "barryvdh/laravel-ide-helper": "^2.2.3",
 +        "barryvdh/laravel-debugbar": "^2.3.2",
          "league/flysystem-aws-s3-v3": "^1.0",
          "barryvdh/laravel-dompdf": "^0.7",
          "predis/predis": "^1.1",
          "gathercontent/htmldiff": "^0.2.1",
 -        "barryvdh/laravel-snappy": "^0.3.1"
 +        "barryvdh/laravel-snappy": "^0.3.1",
 +        "laravel/browser-kit-testing": "^1.0"
      },
      "require-dev": {
          "fzaninotto/faker": "~1.4",
@@@ -36,8 -35,7 +36,8 @@@
      },
      "autoload-dev": {
          "classmap": [
 -            "tests/TestCase.php"
 +            "tests/TestCase.php",
 +            "tests/BrowserKitTest.php"
          ]
      },
      "scripts": {
@@@ -49,7 -47,9 +49,9 @@@
          ],
          "post-install-cmd": [
              "Illuminate\\Foundation\\ComposerScripts::postInstall",
-             "php artisan optimize"
+             "php artisan optimize",
+             "php artisan cache:clear",
+             "php artisan view:clear"
          ],
          "post-update-cmd": [
              "Illuminate\\Foundation\\ComposerScripts::postUpdate",