Skip to content

Commit 9ef9432

Browse files
authored
Update dependencies (librenms#13310)
* Bump composer dependencies - Upgrading brick/math (0.9.2 => 0.9.3) - Upgrading composer/ca-bundle (1.2.10 => 1.2.11) - Upgrading composer/composer (2.1.3 => 2.1.8) - Upgrading composer/xdebug-handler (2.0.1 => 2.0.2) - Upgrading dapphp/radius (2.5.5 => 2.5.6) - Upgrading doctrine/annotations (1.13.1 => 1.13.2) - Upgrading doctrine/cache (2.0.3 => 2.1.1) - Upgrading doctrine/dbal (2.13.2 => 2.13.3) - Upgrading facade/flare-client-php (1.8.1 => 1.9.1) - Upgrading facade/ignition (2.11.0 => 2.14.0) - Upgrading fakerphp/faker (v1.15.0 => v1.16.0) - Upgrading filp/whoops (2.13.0 => 2.14.3) - Upgrading friendsofphp/php-cs-fixer (v2.19.0 => v2.19.2) - Upgrading graham-campbell/result-type (v1.0.1 => v1.0.2) - Upgrading laravel/dusk (v6.15.1 => v6.18.1) - Upgrading laravel/framework (v8.49.2 => v8.62.0) - Locking laravel/serializable-closure (v1.0.2) - Upgrading laravel/tinker (v2.6.1 => v2.6.2) - Upgrading league/commonmark (1.6.5 => 1.6.6) - Upgrading league/flysystem (1.1.4 => 1.1.5) - Upgrading league/mime-type-detection (1.7.0 => 1.8.0) - Upgrading maximebf/debugbar (v1.16.5 => v1.17.1) - Upgrading mockery/mockery (1.4.3 => 1.4.4) - Upgrading monolog/monolog (2.3.0 => 2.3.4) - Upgrading nesbot/carbon (2.50.0 => 2.53.1) - Upgrading nikic/php-parser (v4.11.0 => v4.13.0) - Upgrading nunomaduro/collision (v5.5.0 => v5.10.0) - Upgrading phar-io/manifest (2.0.1 => 2.0.3) - Upgrading php-parallel-lint/php-parallel-lint (v1.3.0 => v1.3.1) - Upgrading phpdocumentor/type-resolver (1.4.0 => 1.5.0) - Upgrading phpmailer/phpmailer (v6.5.0 => v6.5.1) - Upgrading phpoption/phpoption (1.7.5 => 1.8.0) - Upgrading phpseclib/phpseclib (3.0.9 => 3.0.10) - Upgrading phpspec/prophecy (1.13.0 => 1.14.0) - Upgrading phpstan/phpstan (0.12.92 => 0.12.99) - Upgrading phpunit/php-code-coverage (9.2.6 => 9.2.7) - Upgrading phpunit/phpunit (9.5.6 => 9.5.10) - Upgrading predis/predis (v1.1.7 => v1.1.8) - Upgrading ramsey/collection (1.1.3 => 1.2.1) - Upgrading ramsey/uuid (4.1.1 => 4.2.3) - Upgrading seld/phar-utils (1.1.1 => 1.1.2) - Upgrading symfony/console (v5.3.2 => v5.3.7) - Upgrading symfony/css-selector (v5.3.0 => v5.3.4) - Upgrading symfony/debug (v4.4.25 => v4.4.31) - Upgrading symfony/error-handler (v5.3.3 => v5.3.7) - Upgrading symfony/event-dispatcher (v5.3.0 => v5.3.7) - Upgrading symfony/filesystem (v5.3.3 => v5.3.4) - Upgrading symfony/finder (v5.3.0 => v5.3.7) - Upgrading symfony/http-foundation (v5.3.3 => v5.3.7) - Upgrading symfony/http-kernel (v5.3.3 => v5.3.9) - Upgrading symfony/mime (v5.3.2 => v5.3.8) - Upgrading symfony/options-resolver (v5.3.0 => v5.3.7) - Upgrading symfony/polyfill-intl-grapheme (v1.23.0 => v1.23.1) - Upgrading symfony/polyfill-mbstring (v1.23.0 => v1.23.1) - Upgrading symfony/polyfill-php80 (v1.23.0 => v1.23.1) - Locking symfony/polyfill-php81 (v1.23.0) - Upgrading symfony/process (v5.3.2 => v5.3.7) - Upgrading symfony/routing (v5.3.0 => v5.3.7) - Upgrading symfony/stopwatch (v5.3.0 => v5.3.4) - Upgrading symfony/string (v5.3.3 => v5.3.7) - Upgrading symfony/translation (v5.3.3 => v5.3.9) - Upgrading symfony/var-dumper (v5.3.3 => v5.3.8) - Upgrading symfony/yaml (v4.4.26 => v4.4.29) - Upgrading tecnickcom/tcpdf (6.4.1 => 6.4.2) - Upgrading theseer/tokenizer (1.2.0 => 1.2.1) * Update npm dependecies * Update phpstan ignores after laravel upgrades * Merge laravel/laravel repo changes
1 parent 30c20fa commit 9ef9432

27 files changed

+1357
-1305
lines changed

.editorconfig

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,8 @@ trim_trailing_whitespace = true
1111
[*.md]
1212
trim_trailing_whitespace = false
1313

14-
[*.yml]
14+
[*.{yml,yaml}]
1515
indent_size = 2
16+
17+
[docker-compose.yml]
18+
indent_size = 4

app/Exceptions/Handler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
class Handler extends ExceptionHandler
99
{
1010
/**
11-
* A list of the exception types that should not be reported.
11+
* A list of the exception types that are not reported.
1212
*
1313
* @var array
1414
*/
@@ -22,7 +22,7 @@ class Handler extends ExceptionHandler
2222
];
2323

2424
/**
25-
* A list of the exceptions that can be upgraded. Checked in order.
25+
* A list of the inputs that are never flashed for validation exceptions.
2626
*
2727
* @var array
2828
*/

app/Http/Middleware/TrimStrings.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ class TrimStrings extends Middleware
1212
* @var array
1313
*/
1414
protected $except = [
15+
'current_password',
1516
'password',
1617
'password_confirmation',
1718
];

app/Http/Middleware/TrustProxies.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace App\Http\Middleware;
44

5-
use Fideloper\Proxy\TrustProxies as Middleware;
5+
use Illuminate\Http\Middleware\TrustProxies as Middleware;
66
use Illuminate\Http\Request;
77

88
class TrustProxies extends Middleware
@@ -19,5 +19,10 @@ class TrustProxies extends Middleware
1919
*
2020
* @var int
2121
*/
22-
protected $headers = Request::HEADER_X_FORWARDED_ALL;
22+
protected $headers =
23+
Request::HEADER_X_FORWARDED_FOR |
24+
Request::HEADER_X_FORWARDED_HOST |
25+
Request::HEADER_X_FORWARDED_PORT |
26+
Request::HEADER_X_FORWARDED_PROTO |
27+
Request::HEADER_X_FORWARDED_AWS_ELB;
2328
}

app/Http/Middleware/VerifyCsrfToken.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@
66

77
class VerifyCsrfToken extends Middleware
88
{
9-
/**
10-
* Indicates whether the XSRF-TOKEN cookie should be set on the response.
11-
*
12-
* @var bool
13-
*/
14-
protected $addHttpCookie = true;
15-
169
/**
1710
* The URIs that should be excluded from CSRF verification.
1811
*

artisan

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ define('LARAVEL_START', microtime(true));
1111
| Composer provides a convenient, automatically generated class loader
1212
| for our application. We just need to utilize it! We'll require it
1313
| into the script here so that we do not have to worry about the
14-
| loading of any our classes "manually". Feels great to relax.
14+
| loading of any of our classes manually. It's great to relax.
1515
|
1616
*/
1717

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"easybook/geshi": "^1.0.8",
3131
"ezyang/htmlpurifier": "^4.8",
3232
"fico7489/laravel-pivot": "^3.0",
33-
"fideloper/proxy": "^4.4",
3433
"fruitcake/laravel-cors": "^2.0",
3534
"genealabs/laravel-caffeine": "^8.0",
3635
"guzzlehttp/guzzle": "^7.0.1",

0 commit comments

Comments
 (0)