Merge branch '5.1-dev' into cleanup/cli-options

joomla · Oct 22, 2023 · 4e2c60a · 4e2c60a
2 parents a2742c8 + 3d55e78
commit 4e2c60a
Show file tree

Hide file tree

Showing 20 changed files with 46 additions and 39 deletions.
diff --git a/README.md b/README.md
@@ -1,21 +1,21 @@
 Joomla! CMS™
 ====================
 
-The Joomla! 5.0 branch is under heavy development and not all links in this document are available yet
+The Joomla! 5.1 branch is under heavy development and not all links in this document are available yet
 ------------------------------------------------------------------------------------------------------
 
 Build Status
 ---------------------
 | Drone-CI                                                                                                                                 | AppVeyor                                                                                                                                                           | PHP                                                                           | Node                                                                                 | npm                                                                             |
 |------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------|--------------------------------------------------------------------------------------|---------------------------------------------------------------------------------|
-| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=5.0-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/5.0-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V8.1.0-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V18.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v9.6.7-green)](https://nodejs.org/en/) |
+| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=5.1-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/5.1-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V8.1.0-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V18.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v9.6.7-green)](https://nodejs.org/en/) |
 
 Overview
 ---------------------
 * This is the source of Joomla! 5.x.
 * Joomla's [Official website](https://www.joomla.org).
-* Joomla! 5.0 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_5.0_version_history).
-* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/5.0-dev).
+* Joomla! 5.1 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_5.1_version_history).
+* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/5.1-dev).
 
 What is Joomla?
 ---------------------
@@ -48,9 +48,9 @@ git clone https://github.com/joomla/joomla-cms.git
 ```bash
 cd joomla-cms
 ```
-- Go to the 5.0-dev branch:
+- Go to the 5.1-dev branch:
 ```bash
-git checkout 5.0-dev
+git checkout 5.1-dev
 ```
 - Install all the needed composer packages:
 ```bash

diff --git a/README.txt b/README.txt
@@ -1,13 +1,13 @@
 Joomla! CMS™
 
-The Joomla! 5.0 branch is under heavy development and not all links in this document are available yet
+The Joomla! 5.1 branch is under heavy development and not all links in this document are available yet
 ------------------------------------------------------------------------------------------------------
 
 1- Overview
 	* This is a Joomla! 5.x installation/upgrade package.
 	* Joomla! Official site: https://www.joomla.org
-	* Joomla! 5.0 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_5.0_version_history
-	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/5.0-dev
+	* Joomla! 5.1 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_5.1_version_history
+	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/5.1-dev
 
 2- What is Joomla?
 	* Joomla! is a Content Management System (CMS) which enables you to build websites and powerful online applications.

diff --git a/administrator/components/com_media/resources/scripts/store/state.es6.js b/administrator/components/com_media/resources/scripts/store/state.es6.js
@@ -69,7 +69,7 @@ function getCurrentPath() {
     return defaultDisk.drives[0].root;
   }
 
-  // Session missmatch
+  // Session mismatch
   setSession(path);
   return path;
 }

diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
@@ -2,7 +2,7 @@
 <extension client="administrator" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>5.0.1</version>
+	<version>5.1.0</version>
 	<creationDate>2023-10</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/administrator/language/en-GB/langmetadata.xml b/administrator/language/en-GB/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="administrator">
 	<name>English (en-GB)</name>
-	<version>5.0.1</version>
+	<version>5.1.0</version>
 	<creationDate>2023-10</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
@@ -6,7 +6,7 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>5.0.1-dev</version>
+	<version>5.1.0-alpha1-dev</version>
 	<creationDate>2023-10</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 

diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml
@@ -2,7 +2,7 @@
 <extension type="package" method="upgrade">
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
-	<version>5.0.1.1</version>
+	<version>5.1.0.1</version>
 	<creationDate>2023-10</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/api/language/en-GB/install.xml b/api/language/en-GB/install.xml
@@ -2,7 +2,7 @@
 <extension client="api" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>5.0.1</version>
+	<version>5.1.0</version>
 	<creationDate>2023-10</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/api/language/en-GB/langmetadata.xml b/api/language/en-GB/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="api">
 	<name>English (en-GB)</name>
-	<version>5.0.1</version>
+	<version>5.1.0</version>
 	<creationDate>2023-10</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/build.xml b/build.xml
@@ -85,7 +85,7 @@
 			<arg value="--template" />
 			<arg value="joomla" />
 			<arg value="--title" />
-			<arg value="Joomla! CMS 5.0 API" />
+			<arg value="Joomla! CMS 5.1 API" />
 		</exec>
 	</target>
 

diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss b/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss
@@ -79,7 +79,7 @@
     }
 
     &.btn-secondary {
-      --subhead-btn-accent: var(--template-special-color);
+      --subhead-btn-accent: var(--secondary-bg);
     }
 
     &.btn-info {

diff --git a/installation/joomla.php b/installation/joomla.php
@@ -14,7 +14,7 @@
 /**
  * Define the application's minimum supported PHP version as a constant so it can be referenced within the application.
  */
-\define('JOOMLA_MINIMUM_PHP', '7.2.5');
+\define('JOOMLA_MINIMUM_PHP', '8.1.0');
 
 if (version_compare(PHP_VERSION, JOOMLA_MINIMUM_PHP, '<')) {
     echo 'Sorry, your PHP version is not supported.' . PHP_EOL;

diff --git a/installation/language/en-GB/langmetadata.xml b/installation/language/en-GB/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>English (United Kingdom)</name>
-	<version>5.0.1</version>
+	<version>5.1.0</version>
 	<creationDate>2023-10</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

diff --git a/installation/src/Console/InstallCommand.php b/installation/src/Console/InstallCommand.php
@@ -175,6 +175,8 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
             $cleanupModel = $app->getMVCFactory()->createModel('Cleanup', 'Installation');
 
             if (!$cleanupModel->deleteInstallationFolder()) {
+                $this->ioStyle->error('Unable to delete installation folder!');
+
                 return Command::FAILURE;
             }
 
@@ -184,7 +186,11 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
         if (!empty($cfg['public_folder'])) {
             $this->ioStyle->write('Creating the public folder...');
 
-            if (!(new PublicFolderGeneratorHelper())->createPublicFolder($cfg['public_folder'])) {
+            try {
+                (new PublicFolderGeneratorHelper())->createPublicFolder($cfg['public_folder']);
+            } catch (\Exception $e) {
+                $this->ioStyle->error($e->getMessage());
+
                 return Command::FAILURE;
             }
 

diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml
@@ -2,7 +2,7 @@
 <extension client="site" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>5.0.1</version>
+	<version>5.1.0</version>
 	<creationDate>2023-10</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/language/en-GB/langmetadata.xml b/language/en-GB/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="site">
 	<name>English (en-GB)</name>
-	<version>5.0.1</version>
+	<version>5.1.0</version>
 	<creationDate>2023-10</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/libraries/src/Helper/PublicFolderGeneratorHelper.php b/libraries/src/Helper/PublicFolderGeneratorHelper.php
@@ -161,19 +161,18 @@ public function createPublicFolder(string $destinationPath): void
         // The API root index.php
         $this->createFile($fullDestinationPath . 'api/index.php', str_replace(['{{APPLICATIONPATH}}', '{{DEFINESPATH}}'], ['\'' . DIRECTORY_SEPARATOR . 'api\'', 'dirname(__DIR__)'], $this->indexTemplate));
 
-        if (is_dir(JPATH_ROOT . '/images')) {
-            $this->createSymlink($root . 'images', $destinationPath . 'images', JPATH_ROOT . '/');
-        }
-
-        // Create symlinks for all the local filesystem directories
-        if (PluginHelper::isEnabled('filesystem', 'local')) {
+        // Get all the local filesystem directories
+        if (\defined('_JCLI_INSTALLATION')) {
+            $localDirectories = [(object)['directory' => 'images']];
+        } elseif (PluginHelper::isEnabled('filesystem', 'local')) {
             $local            = PluginHelper::getPlugin('filesystem', 'local');
             $localDirectories = (new Registry($local->params))->get('directories', [(object)['directory' => 'images']]);
+        }
 
-            foreach ($localDirectories as $localDirectory) {
-                if (!is_link($destinationPath . '/' . $localDirectory->directory)) {
-                    $this->createSymlink($root . $localDirectory->directory, $destinationPath . $localDirectory->directory, JPATH_ROOT . '/');
-                }
+        // Symlink all the local filesystem directories
+        foreach ($localDirectories as $localDirectory) {
+            if (!is_link($destinationPath . '/' . $localDirectory->directory)) {
+                $this->createSymlink($root . $localDirectory->directory, $destinationPath . $localDirectory->directory, JPATH_ROOT . '/');
             }
         }
     }

diff --git a/libraries/src/MVC/Model/AdminModel.php b/libraries/src/MVC/Model/AdminModel.php
@@ -254,6 +254,7 @@ public function __construct($config = [], MVCFactoryInterface $factory = null, F
                 'save'         => 'content',
                 'change_state' => 'content',
                 'validate'     => 'content',
+                'batch'        => 'content',
             ],
             $config['events_map']
         );
@@ -295,6 +296,7 @@ public function batch($commands, $pks, $contexts)
         }
 
         $done = false;
+        PluginHelper::importPlugin($this->events_map['batch']);
 
         // Initialize re-usable member properties
         $this->initBatch();

diff --git a/libraries/src/Version.php b/libraries/src/Version.php
@@ -47,7 +47,7 @@ final class Version
      * @var    integer
      * @since  3.8.0
      */
-    public const MINOR_VERSION = 0;
+    public const MINOR_VERSION = 1;
 
     /**
      * Patch release version.
@@ -66,7 +66,7 @@ final class Version
      * @var    string
      * @since  3.8.0
      */
-    public const EXTRA_VERSION = 'dev';
+    public const EXTRA_VERSION = 'alpha1-dev';
 
     /**
      * Development status.
@@ -82,23 +82,23 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const CODENAME = 'Kuboresha';
+    public const CODENAME = 'Kudumisha';
 
     /**
      * Release date.
      *
      * @var    string
      * @since  3.5
      */
-    public const RELDATE = '17-October-2023';
+    public const RELDATE = '5-October-2023';
 
     /**
      * Release time.
      *
      * @var    string
      * @since  3.5
      */
-    public const RELTIME = '16:35';
+    public const RELTIME = '19:48';
 
     /**
      * Release timezone.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "joomla",
-  "version": "5.0.1",
+  "version": "5.1.0",
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "repository": {