Update meta files for 5.7.0 #5757

app/Http/Middleware/TrustProxies.php

@@ -22,8 +22,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Middleware;
 
-use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
-use Illuminate\Contracts\Config\Repository;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Class TrustProxies
@@ -32,14 +32,19 @@ use Illuminate\Contracts\Config\Repository;
  */
 class TrustProxies extends Middleware
 {
+    // After...
+    protected $headers =
+        Request::HEADER_X_FORWARDED_FOR |
+        Request::HEADER_X_FORWARDED_HOST |
+        Request::HEADER_X_FORWARDED_PORT |
+        Request::HEADER_X_FORWARDED_PROTO |
+        Request::HEADER_X_FORWARDED_AWS_ELB;
+
     /**
      * TrustProxies constructor.
-     *
-     * @param Repository $config
      */
-    public function __construct(Repository $config)
+    public function __construct()
     {
         $this->proxies = (string)config('firefly.trusted_proxies');
-        parent::__construct($config);
     }
 }

app/Support/Authentication/RemoteUserGuard.php

@@ -140,4 +140,12 @@ class RemoteUserGuard implements Guard
     {
         throw new FireflyException('Did not implement RemoteUserGuard::validate()');
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function hasUser()
+    {
+        // TODO: Implement hasUser() method.
+    }
 }

composer.json

@@ -49,7 +49,7 @@
   "support": {
     "email": "james@firefly-iii.org",
     "issues": "https://github.com/firefly-iii/firefly-iii/issues",
-    "forum": "https://reddit.com/r/FireflyIII",
+    "forum": "https://gitter.im/firefly-iii/firefly-iii",
     "wiki": "https://github.com/firefly-iii/help/wiki",
     "source": "https://github.com/firefly-iii/firefly-iii",
     "docs": "https://docs.firefly-iii.org/"
@@ -62,10 +62,6 @@
     {
       "type": "github",
       "url": "https://github.com/sponsors/JC5"
-    },
-    {
-      "type": "paypal",
-      "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=L62W7DVD5ETPC&source=url"
     }
   ],
   "require": {
@@ -89,12 +85,11 @@
     "bacon/bacon-qr-code": "2.*",
     "diglactic/laravel-breadcrumbs": "^7.1",
     "doctrine/dbal": "3.*",
-    "fideloper/proxy": "4.*",
     "gdbots/query-parser": "^2.0",
     "guzzlehttp/guzzle": "^7.4",
     "jc5/google2fa-laravel": "2.0.6",
     "jc5/recovery": "^2",
-    "laravel/framework": "^8.83",
+    "laravel/framework": "^9",
     "laravel/passport": "10.*",
     "laravel/sanctum": "^2.14",
     "laravel/ui": "^3.4",
@@ -107,7 +102,8 @@
     "psr/log": "<3",
     "ramsey/uuid": "^4.2",
     "rcrowe/twigbridge": "^0.13",
-    "spatie/data-transfer-object": "^3.7"
+    "spatie/data-transfer-object": "^3.7",
+    "nunomaduro/collision": "^6.1"
   },
   "require-dev": {
     "barryvdh/laravel-debugbar": "^3.6",

config/database.php

@@ -50,7 +50,7 @@ $mysql_ssl_ciphers = envNonEmpty('MYSQL_SSL_CIPHER', null);
 $mysql_ssl_verify  = envNonEmpty('MYSQL_SSL_VERIFY_SERVER_CERT', null);
 
 $mySqlSSLOptions = [];
-$useSSL = envNonEmpty('MYSQL_USE_SSL', false);
+$useSSL          = envNonEmpty('MYSQL_USE_SSL', false);
 if (false !== $useSSL && null !== $useSSL) {
     if (null !== $mysql_ssl_ca_dir) {
         $mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_CAPATH] = $mysql_ssl_ca_dir;
@@ -75,7 +75,7 @@ if (false !== $useSSL && null !== $useSSL) {
 return [
     'default'     => envNonEmpty('DB_CONNECTION', 'mysql'),
     'connections' => [
-        'sqlite' => [
+        'sqlite'      => [
             'driver'   => 'sqlite',
             'database' => envNonEmpty('DB_DATABASE', storage_path('database/database.sqlite')),
             'prefix'   => '',
@@ -85,7 +85,7 @@ return [
             'database' => envNonEmpty('DB_DATABASE', storage_path('database/test_db.sqlite')),
             'prefix'   => '',
         ],
-        'mysql'  => [
+        'mysql'       => [
             'driver'      => 'mysql',
             'host'        => envNonEmpty('DB_HOST', $host),
             'port'        => envNonEmpty('DB_PORT', $port),
@@ -100,7 +100,7 @@ return [
             'engine'      => 'InnoDB',
             'options'     => $mySqlSSLOptions,
         ],
-        'pgsql'  => [
+        'pgsql'       => [
             'driver'      => 'pgsql',
             'host'        => envNonEmpty('DB_HOST', $host),
             'port'        => envNonEmpty('DB_PORT', $port),
@@ -109,13 +109,13 @@ return [
             'password'    => env('DB_PASSWORD', $password),
             'charset'     => 'utf8',
             'prefix'      => '',
-            'schema'      => envNonEmpty('PGSQL_SCHEMA', 'public'),
+            'search_path' => envNonEmpty('PGSQL_SCHEMA', 'public'),
             'sslmode'     => envNonEmpty('PGSQL_SSL_MODE', 'prefer'),
             'sslcert'     => envNonEmpty('PGSQL_SSL_CERT'),
             'sslkey'      => envNonEmpty('PGSQL_SSL_KEY'),
             'sslrootcert' => envNonEmpty('PGSQL_SSL_ROOT_CERT'),
         ],
-        'sqlsrv' => [
+        'sqlsrv'      => [
             'driver'   => 'sqlsrv',
             'host'     => env('DB_HOST', 'localhost'),
             'port'     => env('DB_PORT', '1433'),