diff --git a/UPGRADE-2.6.md b/UPGRADE-2.6.md index d4677e26a8..87d827e3ea 100644 --- a/UPGRADE-2.6.md +++ b/UPGRADE-2.6.md @@ -4,3 +4,12 @@ * MongoDB ODM 2.6 requires PHP 8.1 or newer. If you're not running PHP 8.1 yet, it's recommended that you upgrade to PHP 8.1 before upgrading ODM. + +## `Match` classes were removed + +Minimal requirement of PHP 8.1 has rendered `Match` classes useless as one may +not use them for backward compatibility purposes as `match` is a reserved keyword. + +Following classes were removed: +- `\Doctrine\ODM\MongoDB\Aggregation\Stage\GraphLookup\Match` +- `\Doctrine\ODM\MongoDB\Aggregation\Stage\Match` diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/GraphLookup/Match.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/GraphLookup/Match.php deleted file mode 100644 index 921dfb9947..0000000000 --- a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/GraphLookup/Match.php +++ /dev/null @@ -1,29 +0,0 @@ -tests/PersistentCollections* tests/Doctrine/ODM/MongoDB/Tests/PersistentCollection/CollWithPHP80Types.php - lib/Doctrine/ODM/MongoDB/Aggregation/Stage/GraphLookup/Match.php - lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Match.php tests/Doctrine/ODM/MongoDB/Tests/PersistentCollection/CollWithPHP81Types.php diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 16042db4cc..d3baf7e4db 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -9,8 +9,6 @@ parameters: - lib - tests excludePaths: - - lib/Doctrine/ODM/MongoDB/Aggregation/Stage/GraphLookup/Match.php - - lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Match.php - tests/Doctrine/ODM/MongoDB/Tests/Mapping/Driver/fixtures/User.php - tests/Hydrators/ - tests/PersistentCollections/ diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 1d201d5492..89669c1ce2 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -19,10 +19,6 @@ ./lib/Doctrine/ODM/MongoDB - - ./lib/Doctrine/ODM/MongoDB/Aggregation/Stage/GraphLookup/Match.php - ./lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Match.php - diff --git a/psalm.xml.dist b/psalm.xml.dist index 5747873000..bf91b31456 100644 --- a/psalm.xml.dist +++ b/psalm.xml.dist @@ -16,8 +16,6 @@ - -