Skip to content
This repository has been archived by the owner on Jul 6, 2023. It is now read-only.

Commit

Permalink
Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev
Browse files Browse the repository at this point in the history 
# Conflicts:
#	libraries/src/Version.php
  • Loading branch information
@bembelimen
bembelimen committed Aug 15, 2021
2 parents a2aab9c + a5f0424 commit bc896d2
Show file tree
Hide file tree
Showing 24 changed files with 72 additions and 70 deletions.
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ Do you want to improve Joomla?
* Get Involved: Joomla! is community developed software. [Join the community](https://volunteers.joomla.org).
* Documentation for [Developers](https://docs.joomla.org/Special:MyLanguage/Portal:Developers).
* Documentation for [Web designers](https://docs.joomla.org/Special:MyLanguage/Web_designers).
* Provide a translation for Joomla: [Joomla Crowdin Project](https://joomla.crowdin.com/cms)

Copyright
---------------------
Expand Down
28 changes: 28 additions & 0 deletions administrator/components/com_admin/script.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6064,6 +6064,24 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
'/templates/cassiopeia/css/vendor/fontawesome-free/fontawesome.min.css',
'/templates/cassiopeia/css/vendor/fontawesome-free/fontawesome.min.css.gz',
'/templates/cassiopeia/scss/vendor/fontawesome-free/fontawesome.scss',
// 4.0 from RC 6 to 4.0.0 (stable)
'/libraries/vendor/algo26-matthias/idna-convert/tests/integration/ToIdnTest.php',
'/libraries/vendor/algo26-matthias/idna-convert/tests/integration/ToUnicodeTest.php',
'/libraries/vendor/algo26-matthias/idna-convert/tests/unit/.gitkeep',
'/libraries/vendor/algo26-matthias/idna-convert/tests/unit/namePrepTest.php',
'/libraries/vendor/doctrine/inflector/docs/en/index.rst',
'/libraries/vendor/jakeasmith/http_build_url/tests/HttpBuildUrlTest.php',
'/libraries/vendor/jakeasmith/http_build_url/tests/bootstrap.php',
'/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/AcceptLanguageTest.php',
'/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/AcceptTest.php',
'/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/BaseAcceptTest.php',
'/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/CharsetNegotiatorTest.php',
'/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/EncodingNegotiatorTest.php',
'/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/LanguageNegotiatorTest.php',
'/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/MatchTest.php',
'/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/NegotiatorTest.php',
'/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/TestCase.php',
'/libraries/vendor/willdurand/negotiation/tests/bootstrap.php',
);

$folders = array(
Expand Down Expand Up @@ -7311,6 +7329,16 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
'/media/templates/cassiopeia/js/mod_menu',
'/media/templates/cassiopeia/js',
'/media/templates/cassiopeia',
// 4.0 from RC 6 to 4.0.0 (stable)
'/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests',
'/libraries/vendor/willdurand/negotiation/tests/Negotiation',
'/libraries/vendor/willdurand/negotiation/tests',
'/libraries/vendor/jakeasmith/http_build_url/tests',
'/libraries/vendor/doctrine/inflector/docs/en',
'/libraries/vendor/doctrine/inflector/docs',
'/libraries/vendor/algo26-matthias/idna-convert/tests/unit',
'/libraries/vendor/algo26-matthias/idna-convert/tests/integration',
'/libraries/vendor/algo26-matthias/idna-convert/tests',
);

$status['files_checked'] = $files;
Expand Down
1 change: 1 addition & 0 deletions administrator/components/com_joomlaupdate/src/Controller/DisplayController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\Controller\BaseController;
use Joomla\CMS\Response\JsonResponse;
use Joomla\CMS\Router\Route;

/**
* Joomla! Update Controller
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_mails/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
label="JCONFIG_PERMISSIONS_LABEL"
filter="rules"
validate="rules"
component="com_messages"
component="com_mails"
section="component"
/>
</fieldset>
Expand Down
2 changes: 1 addition & 1 deletion administrator/language/en-GB/install.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<name>English (en-GB)</name>
<tag>en-GB</tag>
<version>4.0.0</version>
<creationDate>July 2021</creationDate>
<creationDate>August 2021</creationDate>
<author>Joomla! Project</author>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
2 changes: 1 addition & 1 deletion administrator/language/en-GB/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="administrator">
<name>English (en-GB)</name>
<version>4.0.0</version>
<creationDate>July 2021</creationDate>
<creationDate>August 2021</creationDate>
<author>Joomla! Project</author>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions administrator/manifests/files/joomla.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<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>4.0.0-rc6-dev</version>
<creationDate>July 2021</creationDate>
<version>4.0.0-rc7-dev</version>
<creationDate>August 2021</creationDate>
<description>FILES_JOOMLA_XML_DESCRIPTION</description>

<scriptfile>administrator/components/com_admin/script.php</scriptfile>
Expand Down
2 changes: 1 addition & 1 deletion administrator/manifests/packages/pkg_en-GB.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<name>English (en-GB) Language Pack</name>
<packagename>en-GB</packagename>
<version>4.0.0.1</version>
<creationDate>July 2021</creationDate>
<creationDate>August 2021</creationDate>
<author>Joomla! Project</author>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
2 changes: 1 addition & 1 deletion api/language/en-GB/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="api">
<name>English (en-GB)</name>
<version>4.0.0</version>
<creationDate>July 2021</creationDate>
<creationDate>August 2021</creationDate>
<author>Joomla! Project</author>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
12 changes: 12 additions & 0 deletions build/build.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,16 +110,25 @@ function clean_checkout(string $dir)
system('find libraries/vendor -name _config.yml | xargs rm -rf -');
system('rm -rf libraries/vendor/bin');

// aldo26-matthias/idna-convert
system('rm -rf libraries/vendor/algo26-matthias/idna-convert/tests');

// defuse/php-encryption
system('rm -rf libraries/vendor/defuse/php-encryption/docs');

// doctrine/inflector
system('rm -rf libraries/vendor/doctrine/inflector/docs');

// fig/link-util
system('rm -rf libraries/vendor/fig/link-util/test');

// google/recaptcha
system('rm -rf libraries/vendor/google/recaptcha/examples');
system('rm -rf libraries/vendor/google/recaptcha/tests');

// jakeasmith/http_build_url
system ('rm -rf libraries/vendor/jakeasmith/http_build_url/tests');

// joomla/*
system('rm -rf libraries/vendor/joomla/*/docs');
system('rm -rf libraries/vendor/joomla/*/tests');
Expand Down Expand Up @@ -149,6 +158,9 @@ function clean_checkout(string $dir)
// wamania/php-stemmer
system('rm -rf libraries/vendor/wamania/php-stemmer/test');

// willdurand/negotiation
system('rm -rf libraries/vendor/willdurand/negotiation/tests');

echo "Cleanup complete.\n";

chdir($cwd);
Expand Down
2 changes: 1 addition & 1 deletion build/bump.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function usage($command)
'/language/en-GB/install.xml',
'/administrator/language/en-GB/langmetadata.xml',
'/administrator/language/en-GB/install.xml',
'/installation/language/en-GB/en-GB.xml',
'/installation/language/en-GB/langmetadata.xml',
'/api/language/en-GB/langmetadata.xml'
);

Expand Down
8 changes: 8 additions & 0 deletions build/media_source/com_categories/joomla.asset.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@
"description": "Joomla CMS",
"license": "GPL-2.0-or-later",
"assets": [
{
"name": "com_categories.shared-categories-accordion",
"type": "preset",
"dependencies": [
"com_categories.shared-categories-accordion#style",
"com_categories.shared-categories-accordion#script"
]
},
{
"name": "com_categories.shared-categories-accordion.es5",
"type": "script",
Expand Down
3 changes: 2 additions & 1 deletion build/media_source/com_categories/js/shared-categories-accordion.es6.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ const handleCategoryToggleButtonClick = ({ currentTarget }) => {
),
);

const target = button.nextElementSibling;
const { categoryId } = button.dataset;
const target = document.getElementById(`category-${categoryId}`);
target.toggleAttribute('hidden');
};

Expand Down
3 changes: 1 addition & 2 deletions components/com_content/tmpl/categories/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa->getRegistry()->addExtensionRegistryFile('com_categories');
$wa->useStyle('com_categories.shared-categories-accordion');
$wa->useScript('com_categories.shared-categories-accordion');
$wa->usePreset('com_categories.shared-categories-accordion');

?>
<div class="com-content-categories categories-list">
Expand Down
1 change: 1 addition & 0 deletions components/com_content/tmpl/categories/default_items.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
<button
type="button"
id="category-btn-<?php echo $item->id; ?>"
data-category-id="<?php echo $item->id; ?>"
class="btn btn-secondary btn-sm"
aria-expanded="false"
aria-label="<?php echo Text::_('JGLOBAL_EXPAND_CATEGORIES'); ?>"
Expand Down
47 changes: 0 additions & 47 deletions crowdin.yml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion installation/language/en-GB/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>English (United Kingdom)</name>
<version>4.0.0</version>
<creationDate>October 2019</creationDate>
<creationDate>August 2021</creationDate>
<author>Joomla! Project</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/en-US/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>English (United States)</name>
<version>4.0.0</version>
<creationDate>October 2019</creationDate>
<creationDate>August 2021</creationDate>
<author>Joomla! Project</author>
<copyright>(C) 2008 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion language/en-GB/install.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<name>English (en-GB)</name>
<tag>en-GB</tag>
<version>4.0.0</version>
<creationDate>July 2021</creationDate>
<creationDate>August 2021</creationDate>
<author>Joomla! Project</author>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
2 changes: 1 addition & 1 deletion language/en-GB/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="site">
<name>English (en-GB)</name>
<version>4.0.0</version>
<creationDate>July 2021</creationDate>
<creationDate>August 2021</creationDate>
<author>Joomla! Project</author>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
3 changes: 1 addition & 2 deletions libraries/src/Factory.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,8 +418,7 @@ public static function getDbo()
@trigger_error(
sprintf(
'%1$s() is deprecated. Load the database from the dependency injection container.',
__METHOD__,
__CLASS__
__METHOD__
),
E_USER_DEPRECATED
);
Expand Down
4 changes: 2 additions & 2 deletions libraries/src/Helper/MediaHelper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class MediaHelper
* Joomla\CMS\Filter\InputFilter
*
* @var string[]
* @since __DEPLOY_VERSION__
* @since 4.0.0
*/
public const EXECUTABLES = array(
'js', 'exe', 'dll', 'go', 'ade', 'adp', 'bat', 'chm', 'cmd', 'com', 'cpl', 'hta',
Expand Down Expand Up @@ -165,7 +165,7 @@ private function checkMimeType($mime, $component = 'com_media'): bool
*
* @return boolean true if it passes the checks else false
*
* @since __DEPLOY_VERSION__
* @since 4.0.0
*/
public static function checkFileExtension($extension, $component = 'com_media', $allowedExecutables = array()): bool
{
Expand Down
4 changes: 2 additions & 2 deletions libraries/src/Version.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@ final class Version
* @var string
* @since 3.5
*/
const RELDATE = '27-July-2021';
const RELDATE = '10-August-2021';

/**
* Release time.
*
* @var string
* @since 3.5
*/
const RELTIME = '22:48';
const RELTIME = '23:02';

/**
* Release timezone.
Expand Down
3 changes: 1 addition & 2 deletions plugins/installer/webinstaller/webinstaller.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
<version>1.1.1</version>
<version>4.0.0</version>
<description>PLG_INSTALLER_WEBINSTALLER_XML_DESCRIPTION</description>

<files>
<filename plugin="webinstaller">webinstaller.php</filename>
</files>
Expand Down

0 comments on commit bc896d2

Please sign in to comment.