Merge branch '6.0-dev' into upmerges/2025-02-12

Author: Bodge-IT

build/phpstan/joomla-bootstrap.php

@@ -10,7 +10,6 @@
  */
 
 \define('_JEXEC', 1);
-\define('JPATH_PLATFORM', 1);
 \define('JPATH_BASE', \dirname(__DIR__, 2));
 
 // Load the Joomla environment

build/psr12/clean_errors.php

@@ -40,10 +40,6 @@
                                     "defined('_JEXEC') or die();",
                                     "\defined('_JEXEC') or die;",
                                     "defined('_JEXEC') or die;",
-                                    "\defined('JPATH_PLATFORM') or die();",
-                                    "defined('JPATH_PLATFORM') or die();",
-                                    "\defined('JPATH_PLATFORM') or die;",
-                                    "defined('JPATH_PLATFORM') or die;",
                                     "\defined('JPATH_BASE') or die();",
                                     "defined('JPATH_BASE') or die();",
                                     "\defined('JPATH_BASE') or die;",

libraries/bootstrap.php

@@ -10,14 +10,6 @@
 
 defined('_JEXEC') or die;
 
-/**
- * Set the platform root path as a constant if necessary.
- *
- * @deprecated 4.4.0 will be removed in 6.0
- *             Use defined('_JEXEC') or die; to detect if the CMS is loaded correctly
- **/
-defined('JPATH_PLATFORM') or define('JPATH_PLATFORM', __DIR__);
-
 // Detect the native operating system type.
 $os = strtoupper(substr(PHP_OS, 0, 3));
 

libraries/cms.php

@@ -18,16 +18,6 @@
     E_USER_DEPRECATED
 );
 
-/**
- * Set the platform root path as a constant if necessary.
- *
- * @deprecated 4.4.0 will be removed in 6.0
- *             Use defined('_JEXEC') or die; to detect if the CMS is loaded correctly
- **/
-if (!defined('JPATH_PLATFORM')) {
-    define('JPATH_PLATFORM', __DIR__);
-}
-
 // Import the library loader if necessary
 if (!class_exists('JLoader')) {
     require_once JPATH_LIBRARIES . '/loader.php';

libraries/import.legacy.php

@@ -17,16 +17,6 @@
     E_USER_DEPRECATED
 );
 
-/**
- * Set the platform root path as a constant if necessary.
- *
- * @deprecated 4.4.0 will be removed in 6.0
- *             Use defined('_JEXEC') or die; to detect if the CMS is loaded correctly
- **/
-if (!defined('JPATH_PLATFORM')) {
-    define('JPATH_PLATFORM', __DIR__);
-}
-
 // Detect the native operating system type.
 $os = strtoupper(substr(PHP_OS, 0, 3));
 

libraries/import.php

@@ -17,16 +17,6 @@
     E_USER_DEPRECATED
 );
 
-/**
- * Set the platform root path as a constant if necessary.
- *
- * @deprecated 4.4.0 will be removed in 6.0
- *             Use defined('_JEXEC') or die; to detect if the CMS is loaded correctly
- **/
-if (!defined('JPATH_PLATFORM')) {
-    define('JPATH_PLATFORM', __DIR__);
-}
-
 // Detect the native operating system type.
 $os = strtoupper(substr(PHP_OS, 0, 3));
 

plugins/behaviour/compat/src/Extension/Compat.php

@@ -74,6 +74,12 @@ public function __construct(DispatcherInterface $dispatcher, array $config = [])
         if ($this->params->get('classes_aliases', '1')) {
             require_once \dirname(__DIR__) . '/classmap/classmap.php';
         }
+
+        /**
+         * Load the constant early as it is used in class files before the class itself is loaded.
+         * @deprecated 4.4.0 will be removed in 7.0
+         */
+        \defined('JPATH_PLATFORM') or \define('JPATH_PLATFORM', __DIR__);
     }
 
     /**

tests/Unit/bootstrap.php

@@ -35,13 +35,6 @@
     \define('JPATH_ROOT', JPATH_BASE);
 }
 
-/**
- * @deprecated 4.4.0 will be removed in 6.0
- **/
-if (!\defined('JPATH_PLATFORM')) {
-    \define('JPATH_PLATFORM', JPATH_BASE . DIRECTORY_SEPARATOR . 'libraries');
-}
-
 if (!\defined('JPATH_LIBRARIES')) {
     \define('JPATH_LIBRARIES', JPATH_BASE . DIRECTORY_SEPARATOR . 'libraries');
 }