Merge remote-tracking branch 'upstream/5.3-dev' into 5.4-dev-upmerge-2025-04-06

Author: richard67

administrator/components/com_admin/script.php

@@ -2465,6 +2465,11 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/libraries/vendor/joomla/uri/.drone.yml',
             '/libraries/vendor/joomla/utilities/.drone.jsonnet',
             '/libraries/vendor/joomla/utilities/.drone.yml',
+            // From 5.3.0-rc1 to 5.3.0-rc2
+            '/libraries/vendor/algo26-matthias/idna-convert/Dockerfile',
+            '/libraries/vendor/algo26-matthias/idna-convert/compose.yml',
+            '/libraries/vendor/algo26-matthias/idna-convert/src/Exception/Std3AsciiRulesViolationException.php',
+            '/libraries/vendor/algo26-matthias/idna-convert/src/TranscodeUnicode/ByteLengthTrait.php',
         ];
 
         $folders = [

composer.json

@@ -58,7 +58,7 @@
     "joomla/console": "^3.0.1",
     "joomla/crypt": "^3.0.1",
     "joomla/data": "^3.0.1",
-    "joomla/database": "^3.3.1",
+    "joomla/database": "^3.4",
     "joomla/di": "^3.0.1",
     "joomla/event": "^3.0.1",
     "joomla/filter": "^3.0.2",
@@ -74,7 +74,7 @@
     "joomla/string": "^3.0.1",
     "joomla/uri": "~3.0",
     "joomla/utilities": "~3.0",
-    "algo26-matthias/idna-convert": "^4.0.4",
+    "algo26-matthias/idna-convert": "^3.2.0",
     "defuse/php-encryption": "^2.4.0",
     "doctrine/inflector": "^1.4.4",
     "fig/link-util": "^1.2.0",
@@ -90,7 +90,7 @@
     "symfony/polyfill-mbstring": "^1.31.0",
     "symfony/web-link": "^6.4.13",
     "symfony/yaml": "^6.4.18",
-    "typo3/phar-stream-wrapper": "^4.0.0",
+    "typo3/phar-stream-wrapper": "^3.1.8",
     "wamania/php-stemmer": "^4.0.0",
     "tobscure/json-api": "dev-joomla-backports",
     "willdurand/negotiation": "^3.1.0",

composer.lock

@@ -62,17 +62,6 @@ class_exists('\\Joomla\\CMS\\Autoload\\ClassLoader');
     set_error_handler(['Joomla\CMS\Exception\ExceptionHandler', 'handleUserDeprecatedErrors'], E_USER_DEPRECATED);
 }
 
-// Suppress phar stream wrapper for non .phar files
-$behavior = new \TYPO3\PharStreamWrapper\Behavior();
-\TYPO3\PharStreamWrapper\Manager::initialize(
-    $behavior->withAssertion(new \TYPO3\PharStreamWrapper\Interceptor\PharExtensionInterceptor())
-);
-
-if (in_array('phar', stream_get_wrappers())) {
-    stream_wrapper_unregister('phar');
-    stream_wrapper_register('phar', 'TYPO3\\PharStreamWrapper\\PharStreamWrapper');
-}
-
 // Define the Joomla version if not already defined.
 defined('JVERSION') or define('JVERSION', (new \Joomla\CMS\Version())->getShortVersion());
 

libraries/bootstrap.php

@@ -49,17 +49,6 @@ class_exists('\\Joomla\\CMS\\Autoload\\ClassLoader');
 // Decorate Composer autoloader
 spl_autoload_register([new \Joomla\CMS\Autoload\ClassLoader($loader), 'loadClass'], true, true);
 
-// Suppress phar stream wrapper for non .phar files
-$behavior = new \TYPO3\PharStreamWrapper\Behavior();
-\TYPO3\PharStreamWrapper\Manager::initialize(
-    $behavior->withAssertion(new \TYPO3\PharStreamWrapper\Interceptor\PharExtensionInterceptor())
-);
-
-if (in_array('phar', stream_get_wrappers())) {
-    stream_wrapper_unregister('phar');
-    stream_wrapper_register('phar', 'TYPO3\\PharStreamWrapper\\PharStreamWrapper');
-}
-
 // Define the Joomla version if not already defined
 if (!defined('JVERSION')) {
     define('JVERSION', (new \Joomla\CMS\Version())->getShortVersion());

libraries/cms.php

@@ -121,15 +121,13 @@ public static function getInstance($client, $options = [])
             // Create a Router object
             $classname = 'JRouter' . ucfirst($client);
 
-            if (!class_exists($classname)) {
-                throw new \RuntimeException(Text::sprintf('JLIB_APPLICATION_ERROR_ROUTER_LOAD', $client), 500);
-            }
-
-            // Check for a possible service from the container otherwise manually instantiate the class
+            // Check for a possible service from the container, otherwise manually instantiate the class if it exists
             if (Factory::getContainer()->has($classname)) {
                 self::$instances[$client] = Factory::getContainer()->get($classname);
-            } else {
+            } elseif (class_exists($classname)) {
                 self::$instances[$client] = new $classname();
+            } else {
+                throw new \RuntimeException(Text::sprintf('JLIB_APPLICATION_ERROR_ROUTER_LOAD', $client), 500);
             }
         }
 

libraries/src/Router/Router.php

@@ -771,6 +771,11 @@ public function save($updateOnly = false)
                 }
             }
 
+            // Unset the activation token, if the mail address changes - that affects both, activation and PW resets
+            if ($this->email !== $oldUser->email && $this->id !== 0 && !empty($this->activation) && !$this->block) {
+                $table->activation = '';
+            }
+
             // Fire the onUserBeforeSave event.
             $dispatcher = Factory::getApplication()->getDispatcher();
             PluginHelper::importPlugin('user', null, true, $dispatcher);