Updated laravel, removed GitHub move announcement.

app/Console/Commands/MoveRepository.php

@@ -1,86 +0,0 @@
-<?php
-/**
- * MoveRepository.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
-declare(strict_types = 1);
-
-namespace FireflyIII\Console\Commands;
-
-use Carbon\Carbon;
-use Illuminate\Console\Command;
-
-/**
- * Class MoveRepository
- *
- * @package FireflyIII\Console\Commands
- */
-class MoveRepository extends Command
-{
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Alerts the user that the Github repository will move, if they are interested to know this.';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'firefly:github-move';
-
-    /**
-     * Create a new command instance.
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        $moveDate = new Carbon('2017-01-01');
-        $final    = new Carbon('2017-03-01');
-        $now      = new Carbon;
-
-        // display message before 2017-01-01
-        if ($moveDate > $now) {
-            $this->line('+------------------------------------------------------------------------------+');
-            $this->line('');
-            $this->line('The Github repository for Firefly III will MOVE');
-            $this->line('This move will be on January 1st 2017');
-            $this->line('');
-            $this->error('READ THIS WIKI PAGE FOR MORE INFORMATION');
-            $this->line('');
-            $this->info('https://github.com/firefly-iii/help/wiki/New-Github-repository');
-            $this->line('');
-            $this->line('+------------------------------------------------------------------------------+');
-        }
-
-        // display message after 2017-01-01 but before 2017-03-01
-        if ($moveDate <= $now && $now <= $final) {
-            $this->line('+------------------------------------------------------------------------------+');
-            $this->line('');
-            $this->line('The Github repository for Firefly III has MOVED');
-            $this->line('This move was on January 1st 2017!');
-            $this->line('');
-            $this->error('READ THIS WIKI PAGE FOR MORE INFORMATION');
-            $this->line('');
-            $this->info('https://github.com/firefly-iii/help/wiki/New-Github-repository');
-            $this->line('');
-            $this->line('+------------------------------------------------------------------------------+');
-        }
-
-    }
-}

app/Console/Kernel.php

@@ -63,7 +63,6 @@ class Kernel extends ConsoleKernel
             EncryptFile::class,
             ScanAttachments::class,
             UpgradeDatabase::class,
-            MoveRepository::class,
         ];
 
     /**

app/Http/Middleware/VerifyCsrfToken.php

@@ -13,7 +13,8 @@ declare(strict_types = 1);
 namespace FireflyIII\Http\Middleware;
 
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
-
+use Symfony\Component\HttpFoundation\Cookie;
+use Carbon\Carbon;
 /**
  * Class VerifyCsrfToken
  *
@@ -30,4 +31,25 @@ class VerifyCsrfToken extends BaseVerifier
         = [
             //
         ];
+
+    /**
+     * Add the CSRF token to the response cookies.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Symfony\Component\HttpFoundation\Response  $response
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    protected function addCookieToResponse($request, $response)
+    {
+        $config = config('session');
+
+        $response->headers->setCookie(
+            new Cookie(
+                'XSRF-TOKEN', $request->session()->token(), Carbon::now()->getTimestamp() + 60 * $config['lifetime'],
+                $config['path'], $config['domain'], $config['secure'], true
+            )
+        );
+
+        return $response;
+    }
 }

composer.json

@@ -28,7 +28,7 @@
   "require": {
     "php": ">=7.0.0",
     "ext-intl": "*",
-    "laravel/framework": "5.3.18",
+    "laravel/framework": "5.3.28",
     "davejamesmiller/laravel-breadcrumbs": "^3.0",
     "watson/validating": "3.*",
     "doctrine/dbal": "^2.5",
@@ -72,7 +72,6 @@
     ],
     "post-install-cmd": [
       "Illuminate\\Foundation\\ComposerScripts::postInstall",
-      "php artisan firefly:github-move",
       "php artisan optimize"
     ],
     "post-update-cmd": [
@@ -80,7 +79,6 @@
       "php artisan firefly:upgrade-instructions",
       "php artisan firefly:upgrade-database",
       "php artisan firefly:verify",
-      "php artisan firefly:github-move",
       "php artisan optimize"
     ]
   },

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "38cc0ca42a8c6c518d99045c4bfe5d19",
+    "content-hash": "977583861ece20e991f3f68223551012",
     "packages": [
         {
             "name": "bacon/bacon-qr-code",
@@ -854,16 +854,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v5.3.18",
+            "version": "v5.3.28",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "9bee167d173857c25966c19afdaa66f127ca6784"
+                "reference": "a64fc4f8958091ca39623b2e8c8f173cb34fa47a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/9bee167d173857c25966c19afdaa66f127ca6784",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/a64fc4f8958091ca39623b2e8c8f173cb34fa47a",
-                "reference": "9bee167d173857c25966c19afdaa66f127ca6784",
+                "reference": "a64fc4f8958091ca39623b2e8c8f173cb34fa47a",
                 "shasum": ""
             },
             "require": {
@@ -878,7 +878,7 @@
                 "nesbot/carbon": "~1.20",
                 "paragonie/random_compat": "~1.4|~2.0",
                 "php": ">=5.6.4",
-                "psy/psysh": "0.7.*",
+                "psy/psysh": "0.7.*|0.8.*",
                 "ramsey/uuid": "~3.0",
                 "swiftmailer/swiftmailer": "~5.1",
                 "symfony/console": "3.1.*",
@@ -945,7 +945,7 @@
                 "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0).",
                 "symfony/css-selector": "Required to use some of the crawler integration testing tools (3.1.*).",
                 "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (3.1.*).",
-                "symfony/psr-http-message-bridge": "Required to psr7 bridging features (0.2.*)."
+                "symfony/psr-http-message-bridge": "Required to use psr7 bridging features (0.2.*)."
             },
             "type": "library",
             "extra": {
@@ -978,7 +978,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2016-10-08T01:51:20+00:00"
+            "time": "2016-12-15T18:03:17+00:00"
         },
         {
             "name": "laravelcollective/html",
@@ -1414,24 +1414,24 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v2.1.1",
+            "version": "v3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "4dd659edadffdc2143e4753df655d866dbfeedf0"
+                "reference": "adf44419c0fc014a0f191db6f89d3e55d4211744"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4dd659edadffdc2143e4753df655d866dbfeedf0",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/adf44419c0fc014a0f191db6f89d3e55d4211744",
-                "reference": "4dd659edadffdc2143e4753df655d866dbfeedf0",
+                "reference": "adf44419c0fc014a0f191db6f89d3e55d4211744",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "php": ">=5.4"
+                "php": ">=5.5"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.0"
+                "phpunit/phpunit": "~4.0|~5.0"
             },
             "bin": [
                 "bin/php-parse"
@@ -1439,7 +1439,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -1461,7 +1461,7 @@
                 "parser",
                 "php"
             ],
-            "time": "2016-09-16T12:04:44+00:00"
+            "time": "2016-12-06T11:30:35+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -1621,37 +1621,38 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.7.2",
+            "version": "v0.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "e64e10b20f8d229cac76399e1f3edddb57a0f280"
+                "reference": "4a8860e13aa68a4bbf2476c014f8a1f14f1bf991"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/e64e10b20f8d229cac76399e1f3edddb57a0f280",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/4a8860e13aa68a4bbf2476c014f8a1f14f1bf991",
-                "reference": "e64e10b20f8d229cac76399e1f3edddb57a0f280",
+                "reference": "4a8860e13aa68a4bbf2476c014f8a1f14f1bf991",
                 "shasum": ""
             },
             "require": {
                 "dnoegel/php-xdg-base-dir": "0.1",
                 "jakub-onderka/php-console-highlighter": "0.3.*",
-                "nikic/php-parser": "^1.2.1|~2.0",
+                "nikic/php-parser": "~1.3|~2.0|~3.0",
                 "php": ">=5.3.9",
                 "symfony/console": "~2.3.10|^2.4.2|~3.0",
                 "symfony/var-dumper": "~2.7|~3.0"
             },
             "require-dev": {
-                "fabpot/php-cs-fixer": "~1.5",
+                "friendsofphp/php-cs-fixer": "~1.11",
-                "phpunit/phpunit": "~3.7|~4.0|~5.0",
+                "hoa/console": "~3.16|~1.14",
-                "squizlabs/php_codesniffer": "~2.0",
+                "phpunit/phpunit": "~4.4|~5.0",
                 "symfony/finder": "~2.1|~3.0"
             },
             "suggest": {
                 "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
                 "ext-pdo-sqlite": "The doc command requires SQLite to work.",
                 "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.",
-                "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history."
+                "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history.",
+                "hoa/console": "A pure PHP readline implementation. You'll want this if your PHP install doesn't already support readline or libedit."
             },
             "bin": [
                 "bin/psysh"
@@ -1689,7 +1690,7 @@
                 "interactive",
                 "shell"
             ],
-            "time": "2016-03-09T05:03:14+00:00"
+            "time": "2016-12-07T17:15:07+00:00"
         },
         {
             "name": "ramsey/uuid",