joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-26 07:13:21 +00:00
Code Packages Releases Activity

Merge branch '6.0-dev' into stdclass/item

Browse Source
This commit is contained in:
Allon Moritz 2024-03-08 06:51:10 +01:00 committed by GitHub
commit 16f3f4c9ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 38 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.drone.yml
View File

@ -380,7 +380,7 @@ steps:
- rclone delete nightly:/home/devj/public_html/nightlies/ --include "Joomla_$MINORVERSION.*"
- rclone delete nightly:/home/devj/public_html/cache/com_content/
- rclone copy ./transfer/ nightly:/home/devj/public_html/nightlies/
- curl -i -X POST -H 'Content-Type:application/json' -d '{"text":"Nightly Build for [Joomla 5.1](https://developer.joomla.org/nightly-builds.html) successfully built."}' $MATTERMOST_NIGHTLY_HOOK
- curl -i -X POST -H 'Content-Type:application/json' -d '{"text":"Nightly Build for [Joomla 6.0](https://developer.joomla.org/nightly-builds.html) successfully built."}' $MATTERMOST_NIGHTLY_HOOK
- name: buildfailure
image: joomlaprojects/docker-images:packager
@ -388,7 +388,7 @@ steps:
MATTERMOST_NIGHTLY_HOOK:
from_secret: mattermost_nightly_hook
commands:
- curl -i -X POST -H 'Content-Type:application/json' -d '{"text":"Nightly Build for [Joomla 5.1](https://developer.joomla.org/nightly-builds.html) FAILED to built."}' $MATTERMOST_NIGHTLY_HOOK
- curl -i -X POST -H 'Content-Type:application/json' -d '{"text":"Nightly Build for [Joomla 6.0](https://developer.joomla.org/nightly-builds.html) FAILED to built."}' $MATTERMOST_NIGHTLY_HOOK
when:
status:
- failure
@ -403,6 +403,6 @@ trigger:
---
kind: signature
hmac: c1434b09300896f8627ccb11c92e97878caf7a303772db01a647dca53a92fa3f
hmac: bab6a0eee160708fd4852f35e377cf8ca909cd0e90047e5de100e56605d90f0c
...

18
README.md
View File

@ -1,21 +1,21 @@
Joomla! CMS™
====================
The Joomla! 5.1 branch is under heavy development and not all links in this document are available yet
The Joomla! 6.0 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.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/) |
| Drone-CI | AppVeyor | PHP | Node | npm |
|--------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------|--------------------------------------------------------------------------------------|---------------------------------------------------------------------------------|
| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=6.0-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/6.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/) |
Overview
---------------------
* This is the source of Joomla! 5.x.
* This is the source of Joomla! 6.x.
* Joomla's [Official website](https://www.joomla.org).
* 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).
* Joomla! 6.0 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_6.0_version_history).
* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/6.0-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.1-dev branch:
- Go to the 6.0-dev branch:
```bash
git checkout 5.1-dev
git checkout 6.0-dev
```
- Install all the needed composer packages:
```bash

19
README.txt
View File

@ -1,13 +1,13 @@
Joomla! CMS™
The Joomla! 5.1 branch is under heavy development and not all links in this document are available yet
The Joomla! 6.0 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.
* This is a Joomla! 6.x installation/upgrade package.
* Joomla! Official site: https://www.joomla.org
* 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
* Joomla! 6.0 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_6.0_version_history
* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/6.0-dev
2- What is Joomla?
* Joomla! is a Content Management System (CMS) which enables you to build websites and powerful online applications.
@ -23,10 +23,10 @@ The Joomla! 5.1 branch is under heavy development and not all links in this docu
4- How to find a Joomla! translation?
* Repository of accredited language packs: https://downloads.joomla.org/language-packs
* You can also add languages directly to your website via your Joomla! administration panel: https://docs.joomla.org/Special:MyLanguage/J5.x:Setup_a_Multilingual_Site/Installing_New_Language
* Learn how to setup a Multilingual Joomla! Site: https://docs.joomla.org/Special:MyLanguage/J5.x:Setup_a_Multilingual_Site
* Learn how to setup a Multilingual Joomla! Site: https://docs.joomla.org/Special:MyLanguage/J6.x:Setup_a_Multilingual_Site
5- Learn Joomla!
* Read Getting Started with Joomla to find out the basics: https://docs.joomla.org/Special:MyLanguage/J5.x:Getting_Started_with_Joomla!
* Read Getting Started with Joomla to find out the basics: https://docs.joomla.org/Special:MyLanguage/J6.x:Getting_Started_with_Joomla!
* Before installing, read the beginners guide: https://docs.joomla.org/Special:MyLanguage/Portal:Beginners
6- What are the benefits of Joomla?
@ -57,9 +57,10 @@ The Joomla! 5.1 branch is under heavy development and not all links in this docu
* Post questions at our forums: https://forum.joomla.org
* Joomla! Resources Directory (JRD): https://community.joomla.org/service-providers-directory/
11- Do you already have a Joomla! site that's not built with Joomla! 5.x ?
* What's new in Joomla! 5.x: https://www.joomla.org/5
* What are the main differences between 4.x and 5.x? https://docs.joomla.org/Special:MyLanguage/What_are_the_major_differences_between_Joomla!_4.x_and_5.x
11- Do you already have a Joomla! site that's not built with Joomla! 6.x ?
* What's new in Joomla! 6.x: https://www.joomla.org/6
* What are the main differences between 5.x and 6.x? https://docs.joomla.org/Special:MyLanguage/What_are_the_major_differences_between_Joomla!_5.x_and_6.x
* How to migrate from 5.x to 6.x? Tutorial: https://docs.joomla.org/Special:MyLanguage/Joomla_5.x_to_6.x_Step_by_Step_Migration
* How to migrate from 4.x to 5.x? Tutorial: https://docs.joomla.org/Special:MyLanguage/Joomla_4.x_to_5.x_Step_by_Step_Migration
* How to migrate from 3.x to 4.x? Tutorial: https://docs.joomla.org/Special:MyLanguage/Joomla_3.x_to_4.x_Step_by_Step_Migration
* How to migrate from 2.5.x to 3.x? Tutorial: https://docs.joomla.org/Special:MyLanguage/Joomla_2.5_to_3.x_Step_by_Step_Migration

24
components/com_content/tmpl/article/default_links.php
View File

@ -10,7 +10,8 @@
defined('_JEXEC') or die;
use Joomla\CMS\HTML\HTMLHelper;
/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->getDocument()->getWebAssetManager();
// Create shortcut
$urls = json_decode($this->item->urls);
@ -61,22 +62,13 @@ if ($urls && (!empty($urls->urla) || !empty($urls->urlb) || !empty($urls->urlc))
htmlspecialchars($label, ENT_COMPAT, 'UTF-8') . '</a>';
break;
case 3:
echo '<a href="' . htmlspecialchars($link, ENT_COMPAT, 'UTF-8') . '" rel="noopener noreferrer" data-bs-toggle="modal" data-bs-target="#linkModal">' .
$wa->useScript('joomla.dialog-autocreate');
$popupOptions = ['textHeader' => $label, 'className' => 'dialog-content-link', 'width' => '800px', 'height' => '500px', 'preferredParent' => 'body'];
echo '<a href="' . htmlspecialchars($link, ENT_COMPAT, 'UTF-8') . '" rel="noopener noreferrer"'
. ' data-joomla-dialog="' . htmlspecialchars(json_encode($popupOptions, JSON_UNESCAPED_SLASHES), ENT_COMPAT, 'UTF-8') . '">' .
htmlspecialchars($label, ENT_COMPAT, 'UTF-8') . ' </a>';
echo HTMLHelper::_(
'bootstrap.renderModal',
'linkModal',
[
'url' => $link,
'title' => $label,
'height' => '100%',
'width' => '100%',
'modalWidth' => '500',
'bodyHeight' => '500',
'footer' => '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" aria-hidden="true">'
. \Joomla\CMS\Language\Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
]
);
break;
default:

6
libraries/src/Version.php
View File

@ -39,7 +39,7 @@ final class Version
* @var integer
* @since 3.8.0
*/
public const MAJOR_VERSION = 5;
public const MAJOR_VERSION = 6;
/**
* Minor release version.
@ -47,7 +47,7 @@ final class Version
* @var integer
* @since 3.8.0
*/
public const MINOR_VERSION = 1;
public const MINOR_VERSION = 0;
/**
* Patch release version.
@ -66,7 +66,7 @@ final class Version
* @var string
* @since 3.8.0
*/
public const EXTRA_VERSION = 'beta1-dev';
public const EXTRA_VERSION = 'alpha-dev';
/**
* Development status.

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "joomla",
"version": "5.1.0",
"version": "6.0.0",
"description": "Joomla CMS",
"license": "GPL-2.0-or-later",
"repository": {

4
renovate.json
View File

@ -10,11 +10,11 @@
"lockFileMaintenance": { "enabled": true },
"composerIgnorePlatformReqs": ["ext-*", "lib-*"],
"rangeStrategy": "update-lockfile",
"baseBranches": ["4.2-dev", "4.3-dev", "5.0-dev"],
"baseBranches": ["4.4-dev", "5.0-dev", "5.1-dev", "5.2-dev", "6.0-dev"],
"packageRules": [
{
"enabled": false,
"matchBaseBranches": "4.2-dev",
"matchBaseBranches": "6.0-dev",
"matchPackagePatterns": ["*"]
}
],

4
tests/Unit/Libraries/Cms/Updater/ConstraintCheckerTest.php
View File

@ -197,11 +197,11 @@ class ConstraintCheckerTest extends UnitTestCase
[(array) ["name" => "foobar", "version" => "4.*"], false],
[(array) ["name" => "joomla", "version" => "1.*"], false],
[(array) ["name" => "joomla", "version" => "3.1.2"], false],
[(array) ["name" => "joomla", "version" => "6.*"], false],
[(array) ["name" => "joomla", "version" => "6.*"], true],
[(array) ["name" => "joomla", "version" => ""], true],
[(array) ["name" => "joomla", "version" => ".*"], true],
[(array) ["name" => "joomla", "version" => JVERSION], true],
[(array) ["name" => "joomla", "version" => "5.*"], true],
[(array) ["name" => "joomla", "version" => "5.*"], false],
];
}