Use new PHP 8.5 RFC 3986 compliant Uri class

Including polyfill for prior PHP versions without native support See also https://wiki.php.net/rfc/url_parsing_api

Author: jnoordsij

composer.json

@@ -37,6 +37,7 @@
  "league/flysystem": "^3.25.1",
  "league/flysystem-local": "^3.25.1",
  "league/uri": "^7.5.1",
+ "league/uri-polyfill": "^7.7.0",
  "monolog/monolog": "^3.0",
  "nesbot/carbon": "^3.8.4",
  "nunomaduro/termwind": "^2.0",

config/mail.php

@@ -1,5 +1,7 @@
 <?php
 
+use Uri\Rfc3986\Uri;
+
 return [
 
  /*
@@ -46,7 +48,7 @@
  'username' => env('MAIL_USERNAME'),
  'password' => env('MAIL_PASSWORD'),
  'timeout' => null,
- 'local_domain' => env('MAIL_EHLO_DOMAIN', parse_url((string) env('APP_URL', 'http://localhost'), PHP_URL_HOST)),
+ 'local_domain' => env('MAIL_EHLO_DOMAIN', (new Uri((string) env('APP_URL', 'http://localhost')))->getHost()),
  ],
 
  'ses' => [

src/Illuminate/Filesystem/FilesystemAdapter.php

@@ -38,6 +38,7 @@
 use RuntimeException;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use Throwable;
+use Uri\Rfc3986\Uri;
 
 /**
  * @mixin \League\Flysystem\FilesystemOperator
@@ -858,12 +859,12 @@ protected function concatPathToUrl($url, $path)
  */
  protected function replaceBaseUrl($uri, $url)
  {
- $parsed = parse_url($url);
+ $parsed = new Uri($url);
 
  return $uri
- ->withScheme($parsed['scheme'])
- ->withHost($parsed['host'])
- ->withPort($parsed['port'] ?? null);
+ ->withScheme($parsed->getScheme())
+ ->withHost($parsed->getHost())
+ ->withPort($parsed->getPort());
  }
 
  /**

src/Illuminate/Filesystem/FilesystemServiceProvider.php

@@ -6,6 +6,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\ServiceProvider;
+use Uri\Rfc3986\Uri;
 
 class FilesystemServiceProvider extends ServiceProvider
 {
@@ -90,7 +91,7 @@ protected function serveFiles()
 
  $this->app->booted(function ($app) use ($disk, $config) {
  $uri = isset($config['url'])
- ? rtrim(parse_url($config['url'])['path'], '/')
+ ? rtrim((new Uri($config['url']))->getPath(), '/')
  : '/storage';
 
  $isProduction = $app->isProduction();

src/Illuminate/Filesystem/composer.json

@@ -19,6 +19,7 @@
  "illuminate/contracts": "^12.0",
  "illuminate/macroable": "^12.0",
  "illuminate/support": "^12.0",
+ "league/uri-polyfill": "^7.7.0",
  "symfony/finder": "^7.2.0"
  },
  "autoload": {

src/Illuminate/Foundation/Bootstrap/SetRequestForConsole.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Http\Request;
+use Uri\Rfc3986\Uri;
 
 class SetRequestForConsole
 {
@@ -17,14 +18,14 @@ public function bootstrap(Application $app)
  {
  $uri = $app->make('config')->get('app.url', 'http://localhost');
 
- $components = parse_url($uri);
+ $components = new Uri($uri);
 
  $server = $_SERVER;
 
- if (isset($components['path'])) {
+ if ($path = $components->getPath()) {
  $server = array_merge($server, [
- 'SCRIPT_FILENAME' => $components['path'],
- 'SCRIPT_NAME' => $components['path'],
+ 'SCRIPT_FILENAME' => $path,
+ 'SCRIPT_NAME' => $path,
  ]);
  }
 

src/Illuminate/Foundation/Console/stubs/maintenance-mode.stub

@@ -1,5 +1,7 @@
 <?php
 
+use Uri\Rfc3986\Uri;
+
 // Check if the application is in maintenance mode...
 if (! file_exists($down = __DIR__.'/down')) {
  return;
@@ -15,7 +17,7 @@ if (! isset($data['template'])) {
 
 // Allow framework to handle request if request URI is in the exclude list...
 if (isset($data['except'])) {
- $uri = parse_url($_SERVER['REQUEST_URI'])['path'];
+ $uri = (new Uri($_SERVER['REQUEST_URI']))->getPath();
 
  $uri = rawurldecode($uri !== '/' ? trim($uri, '/') : $uri);
 

src/Illuminate/Foundation/Providers/FoundationServiceProvider.php

@@ -35,6 +35,7 @@
 use Symfony\Component\ErrorHandler\ErrorRenderer\HtmlErrorRenderer;
 use Symfony\Component\VarDumper\Caster\StubCaster;
 use Symfony\Component\VarDumper\Cloner\AbstractCloner;
+use Uri\Rfc3986\Uri as Rfc3986Uri;
 
 class FoundationServiceProvider extends AggregateServiceProvider
 {
@@ -133,7 +134,7 @@ public function registerDumper()
  'html' == $format => HtmlDumper::register($basePath, $compiledViewPath),
  'cli' == $format => CliDumper::register($basePath, $compiledViewPath),
  'server' == $format => null,
- $format && 'tcp' == parse_url($format, PHP_URL_SCHEME) => null,
+ $format && 'tcp' == Rfc3986Uri::parse($format)?->getScheme() => null,
  default => in_array(PHP_SAPI, ['cli', 'phpdbg']) ? CliDumper::register($basePath, $compiledViewPath) : HtmlDumper::register($basePath, $compiledViewPath),
  };
  }

src/Illuminate/Http/Middleware/TrustHosts.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Http\Request;
+use Uri\Rfc3986\Uri;
 
 class TrustHosts
 {
@@ -109,7 +110,7 @@ protected function shouldSpecifyTrustedHosts()
  */
  protected function allSubdomainsOfApplicationUrl()
  {
- if ($host = parse_url($this->app['config']->get('app.url'), PHP_URL_HOST)) {
+ if ($host = Uri::parse($this->app['config']->get('app.url'))?->getHost()) {
  return '^(.+\.)?'.preg_quote($host).'$';
  }
  }

src/Illuminate/Http/composer.json

@@ -23,6 +23,7 @@
  "illuminate/macroable": "^12.0",
  "illuminate/session": "^12.0",
  "illuminate/support": "^12.0",
+ "league/uri-polyfill": "^7.7.0",
  "symfony/http-foundation": "^7.2.0",
  "symfony/http-kernel": "^7.2.0",
  "symfony/polyfill-php83": "^1.33",