PHPLIB-1541: Include specs repository as a submodule

CONTRIBUTING.md

@@ -13,8 +13,8 @@ $ composer update
 
 In addition to installing project dependencies, Composer will check that the
 required extension version is installed. Directions for installing the extension
-may be found [here](https://php.net/manual/en/mongodb.installation.php). Composer will also install the submodule required for
-running spec tests.
+may be found [here](https://php.net/manual/en/mongodb.installation.php).
+Composer will also install the submodule required for running spec tests.
 
 Installation directions for Composer may be found in its
 [Getting Started](https://getcomposer.org/doc/00-intro.md) guide.

tests/UnifiedSpecTests/UnifiedSpecTest.php

@@ -11,11 +11,10 @@
 use PHPUnit\Framework\Warning;
 
 use function array_flip;
 use function basename;
 use function dirname;
 use function glob;
-use function preg_match;
-use function sprintf;
+use function str_starts_with;
 
 /**
  * Unified test format spec tests.
@@ -25,8 +24,11 @@
 class UnifiedSpecTest extends FunctionalTestCase
 {
     /**
-     * Incomplete test groups are listed here. These are checked using a left-
-     * anchored regex. Note that regex placeholder can't be used.
+     * Incomplete test groups are listed here. Any data set that starts with a
+     * string listed in this index will be skipped with the message given as
+     * value.
+     *
+     * @var array<string, string>
      */
     private static array $incompleteTestGroups = [
         // Many load balancer tests use CMAP events and/or assertNumberConnectionsCheckedOut
@@ -37,8 +39,14 @@
         // mongoc_cluster_stream_for_server does not retry handshakes (CDRIVER-4532, PHPLIB-1033, PHPLIB-1042)
         'retryable-reads/retryable reads handshake failures' => 'Handshakes are not retried (CDRIVER-4532)',
         'retryable-writes/retryable writes handshake failures' => 'Handshakes are not retried (CDRIVER-4532)',
+        // sort option for update operations is not supported (PHPLIB-1492)
+        'crud/BulkWrite replaceOne-sort' => 'Sort for replace operations is not supported (PHPLIB-1492)',
+        'crud/BulkWrite updateOne-sort' => 'Sort for update operations is not supported (PHPLIB-1492)',
+        'crud/replaceOne-sort' => 'Sort for replace operations is not supported (PHPLIB-1492)',
+        'crud/updateOne-sort' => 'Sort for update operations is not supported (PHPLIB-1492)',
     ];
 
+    /** @var array<string, string> */
     private static array $incompleteTests = [
         // Many load balancer tests use CMAP events and/or assertNumberConnectionsCheckedOut
         'load-balancers/monitoring events include correct fields: poolClearedEvent events include serviceId' => 'PHPC does not implement CMAP',
@@ -64,12 +72,17 @@
      * Any tests with duplicate names are skipped here. While test names should
      * not be reused in spec tests, this offers a way to skip such tests until
      * the name is changed.
+     *
+     * @var array<string, string>
      */
-    private static array $duplicateTests = ['crud/client bulkWrite partial results: partialResult is set when first operation fails during an unordered bulk write (summary)'];
+    private static array $duplicateTests = [];
 
     /**
      * Any tests that rely on session pinning (including targetedFailPoint) must
-     * be skipped since libmongoc does not pin on load-balanced toplogies. */
+     * be skipped since libmongoc does not pin on load-balanced toplogies.
+     *
+     * @var array<string, string>
+     */
     private static array $incompleteLoadBalancerTests = [
         'transactions/mongos-recovery-token: commitTransaction explicit retries include recoveryToken' => 'libmongoc omits recoveryToken for load-balanced topology (CDRIVER-4718)',
         'transactions/pin-mongos: multiple commits' => 'libmongoc does not pin for load-balanced topology',
@@ -101,7 +114,7 @@
         }
 
         foreach (self::$incompleteTestGroups as $testGroup => $reason) {
-            if (preg_match(sprintf('#^%s#', $testGroup), $this->dataDescription())) {
+            if (str_starts_with($this->dataDescription(), $testGroup)) {
                 $this->markTestIncomplete($reason);
             }
         }
@@ -371,15 +384,13 @@
         yield from self::provideTests('index-management/tests', 'index-management');
     }
 
-    private static function provideTests(string $directory, ?string $group = null): Generator
+    private static function provideTests(string $directory, string $testGroup): Generator
     {
         $pattern = self::$testDir . '/' . $directory . '/*.json';
 
         $duplicateTests = array_flip(self::$duplicateTests);
 
         foreach (glob($pattern) as $filename) {
-            $testGroup = $group ?? dirname(basename($filename));
-
             foreach (UnifiedTestCase::fromFile($filename) as $name => $test) {
                 $testKey = $testGroup . '/' . $name;