Skip to content

[6.1] Upmerges - 2026-02-11 #46872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HLeithner merged 3 commits into from
Feb 11, 2026
Merged

[6.1] Upmerges - 2026-02-11 #46872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
144eadb
Joomla! 6.0.3 Release Candidate 1
Bodge-IT Feb 6, 2026
7a43d80
Reset to dev
Bodge-IT Feb 6, 2026
6510fac
Merge branch '6.0-dev' into 6.1/maint/upmerge-260211
tecpromotion Feb 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tests/Unit/Libraries/Cms/Form/Rule/BooleanRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/**
* Test class for BooleanRule.
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
*/
class BooleanRuleTest extends UnitTestCase
{
Expand All @@ -25,7 +25,7 @@ class BooleanRuleTest extends UnitTestCase
*
* @return array
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
*/
public function dataTest(): array
{
Expand Down Expand Up @@ -60,7 +60,7 @@ public function dataTest(): array
*
* @return void
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
* @dataProvider dataTest
*/
public function testRule(bool $expected, \SimpleXMLElement $element, string $value): void
Expand Down
6 changes: 3 additions & 3 deletions tests/Unit/Libraries/Cms/Form/Rule/CalendarRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/**
* Test class for CalendarRule.
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
*/
class CalendarRuleTest extends UnitTestCase
{
Expand All @@ -25,7 +25,7 @@ class CalendarRuleTest extends UnitTestCase
*
* @return array
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
*/
public function dataTest(): array
{
Expand Down Expand Up @@ -59,7 +59,7 @@ public function dataTest(): array
*
* @return void
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
* @dataProvider dataTest
*/
public function testRule(bool $expected, \SimpleXMLElement $element, string $value): void
Expand Down
6 changes: 3 additions & 3 deletions tests/Unit/Libraries/Cms/Form/Rule/ColorRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/**
* Test class for ColorRule.
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
*/
class ColorRuleTest extends UnitTestCase
{
Expand All @@ -25,7 +25,7 @@ class ColorRuleTest extends UnitTestCase
*
* @return array
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
*/
public function dataTest(): array
{
Expand Down Expand Up @@ -62,7 +62,7 @@ public function dataTest(): array
*
* @return void
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
* @dataProvider dataTest
*/
public function testRule(bool $expected, \SimpleXMLElement $element, string $value): void
Expand Down
6 changes: 3 additions & 3 deletions tests/Unit/Libraries/Cms/Form/Rule/CssIdentifierRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/**
* Test class for CssIdentifierRule.
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
*/
class CssIdentifierRuleTest extends UnitTestCase
{
Expand All @@ -25,7 +25,7 @@ class CssIdentifierRuleTest extends UnitTestCase
*
* @return array
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
*/
public function dataTest(): array
{
Expand Down Expand Up @@ -63,7 +63,7 @@ public function dataTest(): array
*
* @return void
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
* @dataProvider dataTest
*/
public function testRule(bool $expected, \SimpleXMLElement $element, string $value): void
Expand Down
6 changes: 3 additions & 3 deletions tests/Unit/Libraries/Cms/Form/Rule/EmailRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
/**
* Test class for EmailRule.
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
*/
class EmailRuleTest extends UnitTestCase
{
Expand All @@ -26,7 +26,7 @@ class EmailRuleTest extends UnitTestCase
*
* @return array
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
*/
public function dataTest(): array
{
Expand Down Expand Up @@ -66,7 +66,7 @@ public function dataTest(): array
*
* @return void
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
* @dataProvider dataTest
*/
public function testRule(bool $expected, \SimpleXMLElement $element, string $value): void
Expand Down
6 changes: 3 additions & 3 deletions tests/Unit/Libraries/Cms/Form/Rule/EqualsRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/**
* Test class for EqualsRule.
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
*/
class EqualsRuleTest extends UnitTestCase
{
Expand All @@ -27,7 +27,7 @@ class EqualsRuleTest extends UnitTestCase
*
* @return array
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
*/
public function dataTest(): array
{
Expand Down Expand Up @@ -84,7 +84,7 @@ public function dataTest(): array
*
* @return void
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
* @dataProvider dataTest
*/
public function testRule(bool|string $expected, \SimpleXMLElement $element, string|int $value, ?string $group, ?Registry $input, ?Form $form): void
Expand Down
6 changes: 3 additions & 3 deletions tests/Unit/Libraries/Cms/Form/Rule/ModuleLayoutRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/**
* Test class for ModuleLayoutRule.
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
*/
class ModuleLayoutRuleTest extends UnitTestCase
{
Expand All @@ -25,7 +25,7 @@ class ModuleLayoutRuleTest extends UnitTestCase
*
* @return array
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
*/
public function dataTest(): array
{
Expand Down Expand Up @@ -87,7 +87,7 @@ public function dataTest(): array
*
* @return void
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
* @dataProvider dataTest
*/
public function testRule(bool $expected, \SimpleXMLElement $element, string $value): void
Expand Down
6 changes: 3 additions & 3 deletions tests/Unit/Libraries/Cms/Form/Rule/NotequalsRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/**
* Test class for NotequalsRule.
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
*/
class NotequalsRuleTest extends UnitTestCase
{
Expand All @@ -27,7 +27,7 @@ class NotequalsRuleTest extends UnitTestCase
*
* @return array
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
*/
public function dataTest(): array
{
Expand Down Expand Up @@ -81,7 +81,7 @@ public function dataTest(): array
*
* @return void
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
* @dataProvider dataTest
*/
public function testRule(bool|string $expected, \SimpleXMLElement $element, string|int $value, ?string $group, ?Registry $input, ?Form $form): void
Expand Down
6 changes: 3 additions & 3 deletions tests/Unit/Libraries/Cms/Form/Rule/NumberRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/**
* Test class for NumberRule.
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
*/
class NumberRuleTest extends UnitTestCase
{
Expand All @@ -25,7 +25,7 @@ class NumberRuleTest extends UnitTestCase
*
* @return array
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
*/
public function dataTest(): array
{
Expand Down Expand Up @@ -71,7 +71,7 @@ public function dataTest(): array
*
* @return void
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
* @dataProvider dataTest
*/
public function testRule(bool $expected, \SimpleXMLElement $element, string $value): void
Expand Down
6 changes: 3 additions & 3 deletions tests/Unit/Libraries/Cms/Form/Rule/OptionsRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/**
* Test class for OptionsRule.
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
*/
class OptionsRuleTest extends UnitTestCase
{
Expand All @@ -25,7 +25,7 @@ class OptionsRuleTest extends UnitTestCase
*
* @return array
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
*/
public function dataTest(): array
{
Expand Down Expand Up @@ -75,7 +75,7 @@ public function dataTest(): array
*
* @return void
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
* @dataProvider dataTest
*/
public function testRule(bool $expected, \SimpleXMLElement $element, null|string|array $value): void
Expand Down
6 changes: 3 additions & 3 deletions tests/Unit/Libraries/Cms/Form/Rule/UrlRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/**
* Test class for UrlRule.
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
*/
class UrlRuleTest extends UnitTestCase
{
Expand All @@ -25,7 +25,7 @@ class UrlRuleTest extends UnitTestCase
*
* @return array
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
*/
public function dataTest(): array
{
Expand Down Expand Up @@ -84,7 +84,7 @@ public function dataTest(): array
*
* @return void
*
* @since __DEPLOY_VERSION__
* @since 6.0.3
* @dataProvider dataTest
*/
public function testRule(bool $expected, \SimpleXMLElement $element, string $value): void
Expand Down