Skip to content

Commit f9e238b

Browse files
PHP 8.4 Compatibility - closes #4979
1 parent ab7073f commit f9e238b

File tree

8 files changed

+2685
-4
lines changed

8 files changed

+2685
-4
lines changed

composer.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@
170170
"Illuminate\\Console\\": "overrides/laravel/framework/src/Illuminate/Console/",
171171
"Illuminate\\Log\\": "overrides/laravel/framework/src/Illuminate/Log/",
172172
"Illuminate\\Validation\\": "overrides/laravel/framework/src/Illuminate/Validation/",
173+
"Illuminate\\Contracts\\Container\\": "overrides/laravel/framework/src/Illuminate/Contracts/Container/",
173174
"Symfony\\Component\\Routing\\": "overrides/symfony/routing/",
174175
"Symfony\\Component\\VarDumper\\Cloner\\": "overrides/symfony/var-dumper/Cloner/",
175176
"Symfony\\Component\\VarDumper\\Dumper\\": "overrides/symfony/var-dumper/Dumper/",
@@ -301,6 +302,7 @@
301302
"vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php",
302303
"vendor/laravel/framework/src/Illuminate/Support/Carbon.php",
303304
"vendor/laravel/framework/src/Illuminate/Support/Str.php",
305+
"vendor/laravel/framework/src/Illuminate/Support/Arr.php",
304306
"vendor/laravel/framework/src/Illuminate/Support/ViewErrorBag.php",
305307
"vendor/laravel/framework/src/Illuminate/Support/MessageBag.php",
306308
"vendor/laravel/framework/src/Illuminate/Support/Optional.php",
@@ -484,7 +486,8 @@
484486
"vendor/psy/psysh/src/Exception/ErrorException.php",
485487
"vendor/psy/psysh/src/Exception/BreakException.php",
486488
"vendor/psy/psysh/src/VarDumper/Dumper.php",
487-
"vendor/laravel/framework/src/Illuminate/Foundation/Application.php"
489+
"vendor/laravel/framework/src/Illuminate/Foundation/Application.php",
490+
"vendor/laravel/framework/src/Illuminate/Contracts/Container/Container.php"
488491
]
489492
},
490493
"autoload-dev": {
@@ -508,6 +511,12 @@
508511
"pre-install-cmd": [
509512
"@php -r \"@mkdir('vendor/natxet/cssmin/src', 775);\""
510513
],
514+
"pre-autoload-dump": [
515+
"@php -r \"file_put_contents('vendor/guzzlehttp/promises/src/functions_include.php', str_replace('/functions.php', '/../../../../overrides/guzzlehttp/promises/src/functions.php', file_get_contents('vendor/guzzlehttp/promises/src/functions_include.php')));\"",
516+
"@php -r \"file_put_contents('vendor/psy/psysh/src/functions.php', '<?php require_once __DIR__ . \\'/../../../../overrides/psy/psysh/src/functions.php\\';');\"",
517+
"@php -r \"file_put_contents('vendor/laravel/framework/src/Illuminate/Support/helpers.php', '<?php require_once __DIR__ . \\'/../../../../../../overrides/laravel/framework/src/Illuminate/Support/helpers.php\\';');\"",
518+
"@php -r \"file_put_contents('vendor/spatie/laravel-activitylog/src/helpers.php', '<?php require_once __DIR__ . \\'/../../../../overrides/spatie/laravel-activitylog/src/helpers.php\\';');\""
519+
],
511520
"post-autoload-dump": [
512521
"@php -r \"file_put_contents('vendor/composer/ClassLoader.php', preg_replace('/function includeFile.*/s', base64_decode('DQpmdW5jdGlvbiBpbmNsdWRlRmlsZSgkZmlsZSkNCnsNCiAgICB0cnkgew0KICAgICAgICBpbmNsdWRlICRmaWxlOw0KICAgIH0gY2F0Y2ggKFxFeGNlcHRpb24gJGUpIHsNCiAgICAgICAgJG1zZyA9ICRlLT5nZXRNZXNzYWdlKCk7DQogICAgICAgIGlmIChzdHJzdHIoJG1zZywgJ05vIHN1Y2ggZmlsZSBvciBkaXJlY3RvcnknKSkgew0KICAgICAgICAgICAgaWYgKHN0cnN0cigkbXNnLCAnL3ZlbmRvci9jb21wb3Nlci8uLi8uLi9vdmVycmlkZXMvJykpIHsNCiAgICAgICAgICAgICAgICAkbmV3X2ZpbGUgPSBzdHJfcmVwbGFjZSgnL3ZlbmRvci9jb21wb3Nlci8uLi8uLi9vdmVycmlkZXMvJywgJy92ZW5kb3IvY29tcG9zZXIvLi4vJywgJGZpbGUpOw0KICAgICAgICAgICAgfSBlbHNlIHsNCiAgICAgICAgICAgICAgICAkbmV3X2ZpbGUgPSBzdHJfcmVwbGFjZSgnL3ZlbmRvci9jb21wb3Nlci8uLi8nLCAnL3ZlbmRvci9jb21wb3Nlci8uLi8uLi9vdmVycmlkZXMvJywgJGZpbGUpOw0KICAgICAgICAgICAgfQ0KICAgICAgICAgICAgaW5jbHVkZSAkbmV3X2ZpbGU7DQogICAgICAgIH0gZWxzZSB7DQogICAgICAgICAgICB0aHJvdyAkZTsNCiAgICAgICAgfQ0KICAgIH0NCn0='), file_get_contents('vendor/composer/ClassLoader.php')));\"",
513522
"@php -r \"(error_reporting(0) || !error_reporting(0)) && array_map('unlink', json_decode(file_get_contents('composer.json'), true)['autoload']['exclude-from-classmap']);\"",

0 commit comments

Comments
 (0)