From 845001b7b4c414e3ea817d1d80253389de93b50f Mon Sep 17 00:00:00 2001
From: Zaher Madi <114478964+ZaherMadi@users.noreply.github.com>
Date: Thu, 16 Oct 2025 15:18:12 +0200
Subject: [PATCH 1/2] Refactor applyAliasFor method formatting

// applyAliasFor($class) : Check that the alias does not already exist before creating it. in order to avoid an error such as: Cannot declare class joomla\cms\filesystem\folder, because the name is already in use
---
 libraries/loader.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/libraries/loader.php b/libraries/loader.php
index 5883847634300..19c1f1c7ee8c4 100644
--- a/libraries/loader.php
+++ b/libraries/loader.php
@@ -567,16 +567,20 @@ class_alias(self::$classAliases[$class], $class);
      *
      * @since   3.4
      */
-    public static function applyAliasFor($class)
-    {
-        $class = self::stripFirstBackslash($class);
+    
+   public static function applyAliasFor($class)
+{
+    $class = self::stripFirstBackslash($class);
 
-        if (isset(self::$classAliasesInverse[$class])) {
-            foreach (self::$classAliasesInverse[$class] as $alias) {
+    if (isset(self::$classAliasesInverse[$class])) {
+        foreach (self::$classAliasesInverse[$class] as $alias) {
+            if (!class_exists($alias, false) && !interface_exists($alias, false) && !trait_exists($alias, false)) {
                 class_alias($class, $alias);
             }
         }
     }
+}
+
 
     /**
      * Autoload a class based on name.

From 9783d36a9b99bd3900c424b6ea7b7297d10cfc37 Mon Sep 17 00:00:00 2001
From: Zaher Madi <114478964+ZaherMadi@users.noreply.github.com>
Date: Tue, 4 Nov 2025 17:20:12 +0100
Subject: [PATCH 2/2] Whitespaces fixed

---
 libraries/loader.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/loader.php b/libraries/loader.php
index 19c1f1c7ee8c4..f33504365a9df 100644
--- a/libraries/loader.php
+++ b/libraries/loader.php
@@ -568,18 +568,18 @@ class_alias(self::$classAliases[$class], $class);
      * @since   3.4
      */
     
-   public static function applyAliasFor($class)
-{
-    $class = self::stripFirstBackslash($class);
+    public static function applyAliasFor($class)
+    {
+        $class = self::stripFirstBackslash($class);
 
-    if (isset(self::$classAliasesInverse[$class])) {
-        foreach (self::$classAliasesInverse[$class] as $alias) {
-            if (!class_exists($alias, false) && !interface_exists($alias, false) && !trait_exists($alias, false)) {
-                class_alias($class, $alias);
+        if (isset(self::$classAliasesInverse[$class])) {
+            foreach (self::$classAliasesInverse[$class] as $alias) {
+                if (!class_exists($alias, false) && !interface_exists($alias, false) && !trait_exists($alias, false)) {
+                    class_alias($class, $alias);
+                }
             }
         }
     }
-}
 
 
     /**