Merge pull request #166 from HACManchester/laravel56

Upgrade to Laravel 5.6

.editorconfig

@@ -0,0 +1,16 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.yml]
+indent_style = space
+indent_size = 2

.gitignore

@@ -13,6 +13,7 @@ yarn-error.log
 /public/css/*.css
 /public/fonts
 /public/js
+.phpunit.result.cache
 
 # IDE-helper related
 _ide_helper*

app/Helpers/GoCardlessHelper.php

@@ -16,7 +16,7 @@ public function __construct()
     public function setup()
     {
         $this->client = new \GoCardlessPro\Client([
-            'access_token' => env('GOCARDLESS_ACCESS_TOKEN'),
+            'access_token' => env('GOCARDLESS_ACCESS_TOKEN', ''),
             'environment' => (env('NEW_GOCARDLESS_ENV', 'LIVE') == 'LIVE')? \GoCardlessPro\Environment::LIVE: \GoCardlessPro\Environment::SANDBOX,
         ]);
     }

app/Http/Kernel.php

@@ -14,7 +14,7 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middleware = [
-        \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
+        \BB\Http\Middleware\CheckForMaintenanceMode::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \BB\Http\Middleware\HttpsProtocol::class,
         \BB\Http\Middleware\TrustProxies::class,

app/Http/Middleware/CheckForMaintenanceMode.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace BB\Http\Middleware;
+
+use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode as Middleware;
+
+class CheckForMaintenanceMode extends Middleware
+{
+    /**
+     * The URIs that should be reachable while maintenance mode is enabled.
+     *
+     * @var array
+     */
+    protected $except = [
+        //
+    ];
+}

app/Http/Middleware/TrustProxies.php

@@ -19,11 +19,5 @@ class TrustProxies extends Middleware
      *
      * @var array
      */
-    protected $headers = [
-        Request::HEADER_FORWARDED => 'FORWARDED',
-        Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR',
-        Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST',
-        Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
-        Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
-    ];
+    protected $headers = Request::HEADER_X_FORWARDED_ALL;
 }

app/Providers/AppServiceProvider.php

@@ -1,8 +1,12 @@
-<?php namespace BB\Providers;
+<?php
 
+namespace BB\Providers;
+
+use Illuminate\Pagination\Paginator;
 use Illuminate\Support\ServiceProvider;
 
-class AppServiceProvider extends ServiceProvider {
+class AppServiceProvider extends ServiceProvider
+{
 
 	/**
 	 * Bootstrap any application services.
@@ -29,7 +33,7 @@ public function boot()
 	public function register()
 	{
 		// We're running a higher PHP version than Laravel 5.2 supports. Temporarily ignore certain notices.
-		if(version_compare(PHP_VERSION, '7.2.0', '>=')) {
+		if (version_compare(PHP_VERSION, '7.2.0', '>=')) {
 			error_reporting(E_ALL ^ E_NOTICE ^ E_WARNING);
 		}
 

composer.json

@@ -10,15 +10,15 @@
     "license": "MIT",
     "type": "project",
     "require": {
+        "php": "^7.1.3",
         "arthurguy/notifications": "~1.0",
-        "doctrine/dbal": "^2.5",
         "gocardless/gocardless-pro": "~1.1",
         "guzzlehttp/psr7": "^1.9",
         "intervention/image": "2.*",
         "itsgoingd/clockwork": "~1.8",
         "laracasts/presenter": "~0.2",
         "laravel-notification-channels/telegram": "^0.0.5",
-        "laravel/framework": "5.5.*",
+        "laravel/framework": "5.6.*",
         "laravel/tinker": "^1.0",
         "laravelcollective/html": "^5.5",
         "michelf/php-markdown": "~1.4",
@@ -30,18 +30,19 @@
         "rap2hpoutre/laravel-log-viewer": "^2.3",
         "sentry/sentry-laravel": "^1.5",
         "zircote/swagger-php": "^2.0",
-        "fideloper/proxy": "~3.3"
+        "fideloper/proxy": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~6.0",
-        "phpspec/phpspec": "~2.1",
-        "mockery/mockery": "~0.9",
-        "fzaninotto/faker": "~1.4",
+        "phpunit/phpunit": "~7.0",
+        "mockery/mockery": "^1.0",
+        "fzaninotto/faker": "^1.4",
         "barryvdh/laravel-ide-helper": "^2.4",
-        "symfony/dom-crawler": "~3.1",
-        "symfony/css-selector": "~3.1",
-        "laravel/browser-kit-testing": "2.*",
-        "filp/whoops": "~2.0"
+        "symfony/css-selector": "~4.0",
+        "symfony/dom-crawler": "~4.0",
+        "laravel/browser-kit-testing": "4.*",
+        "filp/whoops": "~2.0",        
+        "doctrine/dbal": "~2.6",
+        "nunomaduro/collision": "^2.0"
     },
     "autoload": {
         "classmap": [