Update libraries.

app/Providers/FireflyServiceProvider.php

@@ -96,7 +96,7 @@ class FireflyServiceProvider extends ServiceProvider
             }
         );
         $config = app('config');
-        Twig::addExtension(new Functions($config));
+        //Twig::addExtension(new Functions($config));
         Twig::addRuntimeLoader(new TransactionLoader);
         Twig::addRuntimeLoader(new AccountLoader);
         Twig::addRuntimeLoader(new TransactionJournalLoader);
@@ -106,7 +106,7 @@ class FireflyServiceProvider extends ServiceProvider
         Twig::addExtension(new Transaction);
         Twig::addExtension(new Rule);
         Twig::addExtension(new AmountFormat);
-        Twig::addExtension(new Twig_Extension_Debug);
+        //Twig::addExtension(new Twig_Extension_Debug);
     }
 
     /**

composer.json

@@ -62,33 +62,30 @@
     "ext-tokenizer": "*",
     "ext-intl": "*",
     "ext-xml": "*",
-    "ext-ldap": "*",
     "ext-zip": "*",
     "ext-json": "*",
     "ext-fileinfo": "*",
     "ext-openssl": "*",
     "ext-simplexml": "*",
-    "adldap2/adldap2-laravel": "^5.0",
-    "bacon/bacon-qr-code": "1.*",
+    "adldap2/adldap2-laravel": "5.*",
+    "bacon/bacon-qr-code": "2.*",
     "bunq/sdk_php": "dev-master",
-    "danhunsaker/laravel-flysystem-others": "^1.3",
+    "danhunsaker/laravel-flysystem-others": "1.*",
     "davejamesmiller/laravel-breadcrumbs": "5.*",
     "doctrine/dbal": "2.*",
     "fideloper/proxy": "4.*",
-    "laravel/framework": "5.7.*",
-    "laravel/passport": "^7.0",
-    "laravelcollective/html": "5.7.*",
+    "laravel/framework": "5.8.*",
+    "laravel/passport": "7.*",
+    "laravelcollective/html": "5.8.*",
     "league/commonmark": "0.*",
     "league/csv": "9.*",
-    "league/flysystem-replicate-adapter": "^1.0",
-    "league/flysystem-sftp": "^1.0",
-    "league/fractal": "^0.17.0",
-    "litipk/flysystem-fallback-adapter": "0.1.2",
-    "mschindler83/fints-hbci-php": "^1.0",
-    "pragmarx/google2fa": "3.*",
+    "league/flysystem-replicate-adapter": "1.*",
+    "league/flysystem-sftp": "1.*",
+    "league/fractal": "0.*",
+    "litipk/flysystem-fallback-adapter": "0.*",
+    "mschindler83/fints-hbci-php": "1.*",
     "pragmarx/google2fa-laravel": "0.*",
-    "rcrowe/twigbridge": "0.9.*",
-    "twig/twig": "1.*"
+    "rcrowe/twigbridge": "0.9.*"
   },
   "require-dev": {
     "barryvdh/laravel-ide-helper": "2.*",
@@ -96,8 +93,7 @@
     "fzaninotto/faker": "1.*",
     "johnkary/phpunit-speedtrap": "^3.0",
     "mockery/mockery": "1.*",
-    "php-coveralls/php-coveralls": "^2.0",
-    "phpunit/phpunit": "7.*",
+    "phpunit/phpunit": "8.*",
     "roave/security-advisories": "dev-master"
   },
   "suggest": {

config/app.php

@@ -74,7 +74,7 @@ return [
         FireflyIII\Providers\RouteServiceProvider::class,
 
         // own stuff:
-        TwigBridge\ServiceProvider::class,
+//        TwigBridge\ServiceProvider::class,
         PragmaRX\Google2FALaravel\ServiceProvider::class,
 
 
@@ -134,7 +134,7 @@ return [
         'URL'           => Illuminate\Support\Facades\URL::class,
         'Validator'     => Illuminate\Support\Facades\Validator::class,
         'View'          => Illuminate\Support\Facades\View::class,
-        'Twig'          => TwigBridge\Facade\Twig::class,
+        //'Twig'          => TwigBridge\Facade\Twig::class,
         'Form'          => Collective\Html\FormFacade::class,
         'Html'          => Collective\Html\HtmlFacade::class,
         'Preferences'   => \FireflyIII\Support\Facades\Preferences::class,

config/twigbridge.php

@@ -1,40 +1,27 @@
 <?php
 
-/**
- * twigbridge.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
- *
- * This file is part of Firefly III.
- *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Firefly III is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-use TwigBridge\Extension\Laravel\Auth;
-use TwigBridge\Extension\Laravel\Config;
-use TwigBridge\Extension\Laravel\Dump;
-use TwigBridge\Extension\Laravel\Input;
-use TwigBridge\Extension\Laravel\Session;
+use TwigBridge\Extension\Laravel\Url;
 use TwigBridge\Extension\Laravel\Str;
 use TwigBridge\Extension\Laravel\Translator;
-use TwigBridge\Extension\Laravel\Url;
-use TwigBridge\Extension\Loader\Facades;
+use TwigBridge\Extension\Laravel\Session;
+use TwigBridge\Extension\Laravel\Dump;
+use TwigBridge\Extension\Laravel\Input;
+use TwigBridge\Extension\Laravel\Config;
+use TwigBridge\Extension\Laravel\Auth;
 use TwigBridge\Extension\Loader\Filters;
 use TwigBridge\Extension\Loader\Functions;
+use TwigBridge\Extension\Loader\Facades;
 use TwigBridge\Twig\Template;
 
+/**
+ * This file is part of the TwigBridge package.
+ *
+ * @copyright Robert Crowe <hello@vivalacrowe.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * Configuration options for Twig.
  */
@@ -67,6 +54,7 @@ return [
             'debug'               => env('APP_DEBUG', false),
 
             // The charset used by the templates.
+            // default: utf-8
             'charset'             => 'utf-8',
 
             // The base template class to use for generated templates.
@@ -119,7 +107,7 @@ return [
         |
         | Enabled extensions.
         |
-        | `Twig_Extension_Debug` is enabled automatically if twig.debug is TRUE.
+        | `Twig\Extension\DebugExtension` is enabled automatically if twig.debug is TRUE.
         |
         */
         'enabled'   => [
@@ -202,7 +190,7 @@ return [
         | Available functions. Access like `{{ secure_url(...) }}`.
         |
         | Each function can take an optional array of options. These options are
-        | passed directly to `Twig_SimpleFunction`.
+        | passed directly to `Twig\TwigFunction`.
         |
         | So for example, to mark a function as safe you can do the following:
         |
@@ -226,7 +214,7 @@ return [
             'elixir',
             'head',
             'last',
-            'old',
+            'mix',
         ],
 
         /*
@@ -237,7 +225,7 @@ return [
         | Available filters. Access like `{{ variable|filter }}`.
         |
         | Each filter can take an optional array of options. These options are
-        | passed directly to `Twig_SimpleFilter`.
+        | passed directly to `Twig\TwigFilter`.
         |
         | So for example, to mark a filter as safe you can do the following:
         |