PCBC-968 Support for maxTTL value of -1 for collection "no expiry" (#144)

* Add maxTTL check and tests

* Update core and package.xml

* update core to latest

* fix bug with null expiry

---------

Co-authored-by: Sergey Avseyev <sergey.avseyev@gmail.com>

Author: Matt-Woz

Couchbase/Management/CreateCollectionSettings.php

@@ -20,17 +20,29 @@
 
 namespace Couchbase\Management;
 
+use Couchbase\Exception\InvalidArgumentException;
+
 class CreateCollectionSettings
 {
     private ?int $maxExpiry;
     private ?bool $history;
 
+
+    /**
+     * @throws InvalidArgumentException
+     */
     public function __construct(int $maxExpiry = null, bool $history = null)
     {
+        if ($maxExpiry && $maxExpiry < -1) {
+            throw new InvalidArgumentException("Collection max expiry must be greater than or equal to -1.");
+        }
         $this->maxExpiry = $maxExpiry;
         $this->history = $history;
     }
 
+    /**
+     * @throws InvalidArgumentException
+     */
     public static function build(int $maxExpiry = null, bool $history = null): CreateCollectionSettings
     {
         return new CreateCollectionSettings($maxExpiry, $history);
@@ -52,6 +64,12 @@ public function history(): ?bool
         return $this->history;
     }
 
+    /**
+     * @param CreateCollectionSettings|null $settings
+     * @return array
+     *
+     * @internal
+     */
     public static function export(?CreateCollectionSettings $settings): array
     {
         if ($settings == null) {

Couchbase/Management/UpdateCollectionSettings.php

@@ -20,17 +20,28 @@
 
 namespace Couchbase\Management;
 
+use Couchbase\Exception\InvalidArgumentException;
+
 class UpdateCollectionSettings
 {
     private ?int $maxExpiry;
     private ?bool $history;
 
+    /**
+     * @throws InvalidArgumentException
+     */
     public function __construct(int $maxExpiry = null, bool $history = null)
     {
+        if ($maxExpiry && $maxExpiry < -1) {
+            throw new InvalidArgumentException("Collection max expiry must be greater than or equal to -1.");
+        }
         $this->maxExpiry = $maxExpiry;
         $this->history = $history;
     }
 
+    /**
+     * @throws InvalidArgumentException
+     */
     public static function build(int $maxExpiry = null, bool $history = null): UpdateCollectionSettings
     {
         return new UpdateCollectionSettings($maxExpiry, $history);

tests/CollectionManagerTest.php

@@ -3,6 +3,8 @@
 use Couchbase\Exception\CollectionExistsException;
 use Couchbase\Exception\CollectionNotFoundException;
 use Couchbase\Exception\CouchbaseException;
+use Couchbase\Exception\FeatureNotAvailableException;
+use Couchbase\Exception\InvalidArgumentException;
 use Couchbase\Exception\ScopeExistsException;
 use Couchbase\Exception\ScopeNotFoundException;
 use Couchbase\Management\BucketSettings;
@@ -293,6 +295,57 @@ public function testCollectionHistory(): void
         $bucketManager->dropBucket($bucketName);
     }
 
+    public function testCreateCollectionNoExpiry()
+    {
+        $this->skipIfCaves();
+        $this->skipIfProtostellar();
+        $this->skipIfUnsupported($this->version()->supportsCollectionMaxTTLNoExpiry());
+
+        $collectionName = $this->uniqueId("collection");
+        $scopeName = $this->uniqueId("scope");
+        $this->manager->createScope($scopeName);
+        $this->manager->createCollection($scopeName, $collectionName, CreateCollectionSettings::build(-1, false));
+
+        $selectedScope = $this->getScope($scopeName);
+
+        $found = false;
+        foreach ($selectedScope->collections() as $collection) {
+            if ($collection->name() == $collectionName) {
+                $found = true;
+                $foundCollection = $collection;
+            }
+        }
+        $this->assertTrue($found);
+
+        $this->assertEquals(-1, $foundCollection->maxExpiry());
+    }
+
+    public function testCreateCollectionNoExpiryNotSupported()
+    {
+        $this->skipIfCaves();
+        $this->skipIfProtostellar();
+        $this->skipIfUnsupported(!$this->version()->supportsCollectionMaxTTLNoExpiry());
+
+        $collectionName = $this->uniqueId("collection");
+        $scopeName = $this->uniqueId("scope");
+        $this->manager->createScope($scopeName);
+
+        $this->expectException(FeatureNotAvailableException::class);
+        $this->manager->createCollection($scopeName, $collectionName, CreateCollectionSettings::build(-1, false));
+    }
+
+    public function testCreateCollectionInvalidExpiry()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        CreateCollectionSettings::build(-5, false);
+    }
+
+    public function testCreateCollectionZeroExpiry(): void
+    {
+        $settings = CreateCollectionSettings::build(0);
+        $this->assertNotNull($settings);
+    }
+
     /**
      * @throws ScopeNotFoundException
      */

tests/Helpers/ServerVersion.php

@@ -279,6 +279,11 @@ public function supportsDocNotLockedException(): bool
         return ($this->major == 7 && $this->minor >= 6) || $this->major > 7;
     }
 
+    public function supportsCollectionMaxTTLNoExpiry(): bool
+    {
+        return ($this->major == 7 && $this->minor >= 6) || $this->major > 7;
+    }
+
     /**
      * @return int
      */