Remove Atlas from the exception name, as this is no longer specific to Atlas, thanks to Community Search

Author: GromNaN

…ion/AtlasSearchNotSupportedException.php …xception/SearchNotSupportedException.phpsrc/Exception/AtlasSearchNotSupportedException.php renamed to src/Exception/SearchNotSupportedException.php src/Exception/AtlasSearchNotSupportedException.php renamed to src/Exception/SearchNotSupportedException.php

@@ -5,7 +5,7 @@
 use MongoDB\Driver\Exception\ServerException;
 use Throwable;
 
-final class AtlasSearchNotSupportedException extends ServerException
+final class SearchNotSupportedException extends ServerException
 {
     /** @internal */
     public static function create(ServerException $e): self
@@ -16,7 +16,7 @@ public static function create(ServerException $e): self
     }
 
     /** @internal */
-    public static function isAtlasSearchNotSupportedError(Throwable $e): bool
+    public static function isSearchNotSupportedError(Throwable $e): bool
     {
         if (! $e instanceof ServerException) {
             return false;

src/Operation/Aggregate.php

@@ -27,7 +27,7 @@
 use MongoDB\Driver\Server;
 use MongoDB\Driver\Session;
 use MongoDB\Driver\WriteConcern;
-use MongoDB\Exception\AtlasSearchNotSupportedException;
+use MongoDB\Exception\SearchNotSupportedException;
 use MongoDB\Exception\InvalidArgumentException;
 use MongoDB\Exception\UnexpectedValueException;
 use MongoDB\Exception\UnsupportedException;
@@ -238,8 +238,8 @@ public function execute(Server $server): CursorInterface
         try {
             $cursor = $this->executeCommand($server, $command);
         } catch (ServerException $exception) {
-            if (AtlasSearchNotSupportedException::isAtlasSearchNotSupportedError($exception)) {
-                throw AtlasSearchNotSupportedException::create($exception);
+            if (SearchNotSupportedException::isSearchNotSupportedError($exception)) {
+                throw SearchNotSupportedException::create($exception);
             }
 
             throw $exception;

src/Operation/CreateSearchIndexes.php

@@ -21,7 +21,7 @@
 use MongoDB\Driver\Exception\RuntimeException as DriverRuntimeException;
 use MongoDB\Driver\Exception\ServerException;
 use MongoDB\Driver\Server;
-use MongoDB\Exception\AtlasSearchNotSupportedException;
+use MongoDB\Exception\SearchNotSupportedException;
 use MongoDB\Exception\InvalidArgumentException;
 use MongoDB\Exception\UnsupportedException;
 use MongoDB\Model\SearchIndexInput;
@@ -88,8 +88,8 @@ public function execute(Server $server): array
         try {
             $cursor = $server->executeCommand($this->databaseName, new Command($cmd));
         } catch (ServerException $exception) {
-            if (AtlasSearchNotSupportedException::isAtlasSearchNotSupportedError($exception)) {
-                throw AtlasSearchNotSupportedException::create($exception);
+            if (SearchNotSupportedException::isSearchNotSupportedError($exception)) {
+                throw SearchNotSupportedException::create($exception);
             }
 
             throw $exception;

tests/Collection/CollectionFunctionalTest.php

@@ -783,7 +783,7 @@ public function testMethodInTransactionWithReadConcernOption($method): void
 
     public function testListSearchIndexesInheritTypeMap(): void
     {
-        $this->skipIfAtlasSearchIndexIsNotSupported();
+        $this->skipIfSearchIndexIsNotSupported();
 
         $collection = new Collection($this->manager, $this->getDatabaseName(), $this->getCollectionName(), ['typeMap' => ['root' => 'array']]);
 

tests/ExamplesTest.php

@@ -229,9 +229,7 @@ public static function provideExamples(): Generator
     #[Group('atlas')]
     public function testAtlasSearch(): void
     {
-        if (! $this->isAtlas()) {
-            $this->markTestSkipped('Atlas Search examples are only supported on MongoDB Atlas');
-        }
+        $this->skipIfSearchIndexIsNotSupported();
 
         $this->skipIfServerVersion('<', '7.0', 'Atlas Search examples require MongoDB 7.0 or later');
 

tests/Exception/SearchNotSupportedExceptionTest.php

@@ -5,11 +5,11 @@
 use MongoDB\Collection;
 use MongoDB\Driver\Command;
 use MongoDB\Driver\Exception\ServerException;
-use MongoDB\Exception\AtlasSearchNotSupportedException;
+use MongoDB\Exception\SearchNotSupportedException;
 use MongoDB\Tests\Collection\FunctionalTestCase;
 use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
 
-class AtlasSearchNotSupportedExceptionTest extends FunctionalTestCase
+class SearchNotSupportedExceptionTest extends FunctionalTestCase
 {
     #[DoesNotPerformAssertions]
     public function testListSearchIndexesNotSupportedException(): void
@@ -18,7 +18,7 @@ public function testListSearchIndexesNotSupportedException(): void
 
         try {
             $collection->listSearchIndexes();
-        } catch (AtlasSearchNotSupportedException) {
+        } catch (SearchNotSupportedException) {
             // If an exception is thrown because Atlas Search is not supported,
             // then the test is successful because it has the correct exception class.
         }
@@ -31,7 +31,7 @@ public function testCreateSearchIndexNotSupportedException(): void
 
         try {
             $collection->createSearchIndex(['mappings' => ['dynamic' => false]], ['name' => 'test-search-index']);
-        } catch (AtlasSearchNotSupportedException) {
+        } catch (SearchNotSupportedException) {
             // If an exception is thrown because Atlas Search is not supported,
             // then the test is successful because it has the correct exception class.
         }
@@ -47,7 +47,7 @@ public function testOtherStageNotFound(): void
             ]);
             self::fail('Expected ServerException was not thrown');
         } catch (ServerException $exception) {
-            self::assertNotInstanceOf(AtlasSearchNotSupportedException::class, $exception, $exception);
+            self::assertNotInstanceOf(SearchNotSupportedException::class, $exception, $exception);
         }
     }
 
@@ -57,7 +57,7 @@ public function testOtherCommandNotFound(): void
             $this->manager->executeCommand($this->getDatabaseName(), new Command(['nonExistingCommand' => 1]));
             self::fail('Expected ServerException was not thrown');
         } catch (ServerException $exception) {
-            self::assertFalse(AtlasSearchNotSupportedException::isAtlasSearchNotSupportedError($exception));
+            self::assertFalse(SearchNotSupportedException::isSearchNotSupportedError($exception));
         }
     }
 }

tests/FunctionalTestCase.php

@@ -432,7 +432,7 @@ protected function skipIfServerVersion(string $operator, string $version, ?strin
         }
     }
 
-    protected function skipIfAtlasSearchIndexIsNotSupported(): void
+    protected function skipIfSearchIndexIsNotSupported(): void
     {
         try {
             $this->manager->executeReadCommand($this->getDatabaseName(), new Command([

tests/SpecTests/SearchIndexSpecTest.php

@@ -31,7 +31,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->skipIfAtlasSearchIndexIsNotSupported();
+        $this->skipIfSearchIndexIsNotSupported();
     }
 
     /**

tests/UnifiedSpecTests/UnifiedSpecTest.php

@@ -366,7 +366,7 @@ public static function provideFailingTests(): Generator
     #[DataProvider('provideIndexManagementTests')]
     public function testIndexManagement(UnifiedTestCase $test): void
     {
-        $this->skipIfAtlasSearchIndexIsNotSupported();
+        $this->skipIfSearchIndexIsNotSupported();
 
         if (! self::isEnterprise()) {
             self::markTestSkipped('Specific Atlas error messages are only available on Enterprise server');