Merge pull request #2557 from malarzm/remove-match-classes

Remove unusable Match classes
doctrine · Oct 25, 2023 · 17209c8 · 17209c8
2 parents ea9aa1c + af55e96
commit 17209c8
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 67 deletions.
diff --git 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
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Match.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Match.php
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -21,8 +21,6 @@
     <exclude-pattern>tests/PersistentCollections*</exclude-pattern>
     <!-- Figure out what to do with "Scope keyword "static" must be followed by a single space; found newline" -->
     <exclude-pattern>tests/Doctrine/ODM/MongoDB/Tests/PersistentCollection/CollWithPHP80Types.php</exclude-pattern>
-    <exclude-pattern>lib/Doctrine/ODM/MongoDB/Aggregation/Stage/GraphLookup/Match.php</exclude-pattern>
-    <exclude-pattern>lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Match.php</exclude-pattern>
     <!-- Figure out what to do with PHP 8.1 errors in coding standard -->
     <exclude-pattern>tests/Doctrine/ODM/MongoDB/Tests/PersistentCollection/CollWithPHP81Types.php</exclude-pattern>
 

diff --git 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
@@ -19,10 +19,6 @@
         <include>
             <directory suffix=".php">./lib/Doctrine/ODM/MongoDB</directory>
         </include>
-        <exclude>
-            <file>./lib/Doctrine/ODM/MongoDB/Aggregation/Stage/GraphLookup/Match.php</file>
-            <file>./lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Match.php</file>
-        </exclude>
     </coverage>
     <groups>
         <exclude>

diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -16,8 +16,6 @@
         <directory name="tests/Doctrine" />
         <directory name="tests/Documents" />
         <ignoreFiles>
-            <file name="lib/Doctrine/ODM/MongoDB/Aggregation/Stage/GraphLookup/Match.php" />
-            <file name="lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Match.php" />
             <file name="tests/Doctrine/ODM/MongoDB/Tests/Mapping/Driver/fixtures/User.php" />
             <directory name="vendor" />
         </ignoreFiles>