From e96e28f907f7d0999899c82ebf371f7a38e25150 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Wed, 2 Aug 2023 08:54:34 +0200 Subject: [PATCH] Start development of PHPUnit 10.4 --- .github/workflows/ci.yml | 2 +- ChangeLog-10.3.md | 22 ------------------- ChangeLog-10.4.md | 7 ++++++ composer.json | 2 +- phpunit.xsd | 2 +- src/Runner/Version.php | 2 +- .../XmlConfigurationMigration/output-9.2.xml | 2 +- .../XmlConfigurationMigration/output-9.5.xml | 2 +- 8 files changed, 13 insertions(+), 28 deletions(-) delete mode 100644 ChangeLog-10.3.md create mode 100644 ChangeLog-10.4.md diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 98c238b1f74..15644379103 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: name: CI env: - COMPOSER_ROOT_VERSION: "10.3-dev" + COMPOSER_ROOT_VERSION: "10.4-dev" permissions: contents: read diff --git a/ChangeLog-10.3.md b/ChangeLog-10.3.md deleted file mode 100644 index 1ab21bd3828..00000000000 --- a/ChangeLog-10.3.md +++ /dev/null @@ -1,22 +0,0 @@ -# Changes in PHPUnit 10.3 - -All notable changes of the PHPUnit 10.3 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles. - -## [10.3.0] - 2023-08-04 - -### Added - -* [#5368](https://github.com/sebastianbergmann/phpunit/pull/5368): Control when PHP's garbage collector is triggered -* [#5428](https://github.com/sebastianbergmann/phpunit/issues/5428): Attribute `#[WithoutErrorHandler]` to disable PHPUnit's error handler for a test method -* [#5431](https://github.com/sebastianbergmann/phpunit/pull/5431): Add more garbage collector details to event telemetry - -### Changed - -* Errors (`E_USER_ERROR`), deprecations (`E_DEPRECATED`, `E_USER_DEPRECATED`), notices (`E_STRICT`, `E_NOTICE`, `E_USER_NOTICE`), and warnings (`E_WARNING`, `E_USER_WARNINGS`) are now displayed grouped by issue -* When a test case class inherits test methods from a parent class then, by default (when no test reordering is requested), the test methods from the class that is highest in the inheritance tree (instead of the class that is lowest in the inheritance tree) are now run first -* Invocation count expectation failure messages have been slightly improved -* When a test case class inherits test methods from a parent class then the TestDox output for such a test case class now starts with test methods from the class that is highest in the inheritance tree (instead of the class that is lowest in the inheritance tree) -* `TestCase::createStub()`, `TestCase::createStubForIntersectionOfInterfaces()`, and `TestCase::createConfiguredStub()` are now static (and can be used from static data provider methods) -* The internal methods `__phpunit_*()` have been removed from the `Stub` and `MockObject` interfaces - -[10.3.0]: https://github.com/sebastianbergmann/phpunit/compare/10.2...main diff --git a/ChangeLog-10.4.md b/ChangeLog-10.4.md new file mode 100644 index 00000000000..41c024c7df1 --- /dev/null +++ b/ChangeLog-10.4.md @@ -0,0 +1,7 @@ +# Changes in PHPUnit 10.4 + +All notable changes of the PHPUnit 10.4 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles. + +## [10.4.0] - 2023-10-06 + +[10.4.0]: https://github.com/sebastianbergmann/phpunit/compare/10.3...main diff --git a/composer.json b/composer.json index 96e30b68631..ead028fd2e2 100644 --- a/composer.json +++ b/composer.json @@ -84,7 +84,7 @@ }, "extra": { "branch-alias": { - "dev-main": "10.3-dev" + "dev-main": "10.4-dev" } } } diff --git a/phpunit.xsd b/phpunit.xsd index 03a54ee0b08..c4c961d6db5 100644 --- a/phpunit.xsd +++ b/phpunit.xsd @@ -2,7 +2,7 @@ - This Schema file defines the rules by which the XML configuration file of PHPUnit 10.3 may be structured. + This Schema file defines the rules by which the XML configuration file of PHPUnit 10.4 may be structured. diff --git a/src/Runner/Version.php b/src/Runner/Version.php index 850ccfb7e71..3695d1cacf6 100644 --- a/src/Runner/Version.php +++ b/src/Runner/Version.php @@ -34,7 +34,7 @@ public static function id(): string } if (self::$version === '') { - self::$version = (new VersionId('10.3', dirname(__DIR__, 2)))->asString(); + self::$version = (new VersionId('10.4', dirname(__DIR__, 2)))->asString(); } return self::$version; diff --git a/tests/_files/XmlConfigurationMigration/output-9.2.xml b/tests/_files/XmlConfigurationMigration/output-9.2.xml index 393988f7d71..25f0dff4be5 100644 --- a/tests/_files/XmlConfigurationMigration/output-9.2.xml +++ b/tests/_files/XmlConfigurationMigration/output-9.2.xml @@ -1,6 +1,6 @@