Updated various files after upgrade to laravel 5.2

composer.json

@@ -11,27 +11,26 @@
       "email": "thegrumpydictator@gmail.com",
       "homepage": "https://github.com/JC5",
       "role": "Developer"
-        }
-    ],
-    "support": {
-        "email": "thegrumpydictator@gmail.com",
-        "issues": "https://github.com/JC5/firefly-iii/issues?state=open",
-        "source": "https://github.com/JC5/firefly-iii"
+    }],
 
-    },
   "require": {
-        "laravel/framework": "5.1.*",
-		"php": ">=5.6.4",
+    "php": ">=5.6.11",
+    "laravel/framework": "5.2.*",
     "davejamesmiller/laravel-breadcrumbs": "~3.0",
-        "watson/validating": "~1.0",
+    "watson/validating": "~2.0",
     "doctrine/dbal": "~2.5",
-        "illuminate/html": "~5.0",
     "league/commonmark": "~0.7",
     "rcrowe/twigbridge": "~0.9",
     "zizaco/entrust": "dev-laravel-5",
-        "league/csv": "^7.1"
+    "league/csv": "^7.1",
+    "laravelcollective/html": "^5.2"
   },
   "require-dev": {
+    "fzaninotto/faker": "~1.4",
+    "mockery/mockery": "0.9.*",
+    "phpunit/phpunit": "~4.0",
+    "symfony/css-selector": "2.8.*|3.0.*",
+    "symfony/dom-crawler": "2.8.*|3.0.*",
     "barryvdh/laravel-debugbar": "@stable",
     "barryvdh/laravel-ide-helper": "~2.0"
   },
@@ -49,17 +48,21 @@
     ]
   },
   "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"
     ],
-        "post-update-cmd": [
-            "php artisan clear-compiled",
-            "php artisan optimize"
+    "pre-update-cmd": [
+      "php artisan clear-compiled"
     ],
-        "post-create-project-cmd": [
-            "php -r \"copy('.env.example', '.env');\"",
-            "php artisan key:generate"
+    "post-update-cmd": [
+      "php artisan optimize"
     ]
   },
   "config": {

gulpfile.js

@@ -1,4 +1,3 @@
-/* globals require */
 var elixir = require('laravel-elixir');
 
 /*
@@ -7,12 +6,11 @@ var elixir = require('laravel-elixir');
  |--------------------------------------------------------------------------
  |
  | Elixir provides a clean, fluent API for defining some basic Gulp tasks
- | for your Laravel application. By default, we are compiling the Less
+ | for your Laravel application. By default, we are compiling the Sass
  | file for our application, as well as publishing vendor resources.
  |
  */
 
 elixir(function(mix) {
-    "use strict";
-    mix.less('app.less');
+    mix.sass('app.scss');
 });

package.json

@@ -1,6 +1,10 @@
 {
+  "private": true,
   "devDependencies": {
-    "gulp": "^3.8.8",
-    "laravel-elixir": "*"
+    "gulp": "^3.8.8"
+  },
+  "dependencies": {
+    "laravel-elixir": "^4.0.0",
+    "bootstrap-sass": "^3.0.0"
   }
 }

phpunit.xml

@@ -7,25 +7,17 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="true"
-         syntaxCheck="false">
+         stopOnFailure="false">
     <testsuites>
         <testsuite name="Application Test Suite">
-            <directory>./tests</directory>
+            <directory>./tests/</directory>
         </testsuite>
     </testsuites>
     <filter>
         <whitelist>
-            <directory suffix=".php">./app</directory>
+            <directory suffix=".php">app/</directory>
         </whitelist>
     </filter>
-
-    <!-- code coverage
-    <logging>
-        <log type="coverage-clover" target="./build/logs/clover.xml" charset="UTF-8" />
-    </logging>
-     -->
-
     <php>
         <env name="APP_ENV" value="testing"/>
         <env name="CACHE_DRIVER" value="array"/>

server.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Laravel - A PHP Framework For Web Artisans
  *