From 7aa55fac4f6710b26a2dd4cbb9b0863125f388f1 Mon Sep 17 00:00:00 2001
From: Toni Vega <toni@flexvega.com>
Date: Sun, 20 Apr 2025 02:41:25 +0200
Subject: [PATCH 1/4] [5.x] Replaced a too strict assertion in
 DatabaseSessionHandler.php that prevented to use the sessions at all with a
 more simple sanity check. Test already failed on that, now they pass.

---
 src/Session/MongoDbSessionHandler.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Session/MongoDbSessionHandler.php b/src/Session/MongoDbSessionHandler.php
index 517d422a6..30cc0892f 100644
--- a/src/Session/MongoDbSessionHandler.php
+++ b/src/Session/MongoDbSessionHandler.php
@@ -56,9 +56,9 @@ public function read($sessionId): string|false
                 'typeMap' => ['root' => 'bson'],
             ],
         );
-        assert($result instanceof Document);
 
-        return $result ? (string) $result->payload : false;
+
+        return $result?->payload ? (string) $result->payload : false;
     }
 
     public function write($sessionId, $data): bool

From fd9a6464bf73336768524901841fc7e2de7600d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?=
 <jerome.tamarelle@mongodb.com>
Date: Sun, 20 Apr 2025 09:59:11 +0200
Subject: [PATCH 2/4] Always check the assert expectations in tests

---
 phpunit.xml.dist | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 7044f9069..a4b9dda92 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -23,6 +23,7 @@
         <env name="QUEUE_CONNECTION" value="database"/>
         <ini name="xdebug.mode" value="coverage"/>
         <ini name="memory_limit" value="-1"/>
+        <ini name="zend.assertions" value="1"/>
     </php>
 
     <source restrictDeprecations="true"

From 69115450b402392fd64c8ba6028d2dde57bf8637 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?=
 <jerome.tamarelle@mongodb.com>
Date: Sun, 20 Apr 2025 10:04:35 +0200
Subject: [PATCH 3/4] Fix CS

---
 src/Session/MongoDbSessionHandler.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Session/MongoDbSessionHandler.php b/src/Session/MongoDbSessionHandler.php
index 30cc0892f..dd57f2a3c 100644
--- a/src/Session/MongoDbSessionHandler.php
+++ b/src/Session/MongoDbSessionHandler.php
@@ -17,7 +17,6 @@
 use MongoDB\BSON\UTCDateTime;
 use MongoDB\Collection;
 
-use function assert;
 use function tap;
 use function time;
 
@@ -57,8 +56,11 @@ public function read($sessionId): string|false
             ],
         );
 
+        if ($result instanceof Document) {
+            return (string) $result->payload;
+        }
 
-        return $result?->payload ? (string) $result->payload : false;
+        return false;
     }
 
     public function write($sessionId, $data): bool

From 04a049f35f571557c854b617db083fc182d67440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?=
 <jerome.tamarelle@mongodb.com>
Date: Sun, 20 Apr 2025 10:41:17 +0200
Subject: [PATCH 4/4] Set zend.assertions=1

---
 .github/workflows/build-ci-atlas.yml | 2 +-
 .github/workflows/build-ci.yml       | 2 +-
 phpunit.xml.dist                     | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-ci-atlas.yml b/.github/workflows/build-ci-atlas.yml
index c699d2023..46f30150d 100644
--- a/.github/workflows/build-ci-atlas.yml
+++ b/.github/workflows/build-ci-atlas.yml
@@ -91,4 +91,4 @@ jobs:
             -   name: "Run tests"
                 run: |
                   export MONGODB_URI="mongodb://127.0.0.1:27017/?directConnection=true"
-                  ./vendor/bin/phpunit --coverage-clover coverage.xml --group atlas-search
+                  php -d zend.assertions=1 ./vendor/bin/phpunit --coverage-clover coverage.xml --group atlas-search
diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml
index 6fec7bb28..bbc8b53d1 100644
--- a/.github/workflows/build-ci.yml
+++ b/.github/workflows/build-ci.yml
@@ -118,4 +118,4 @@ jobs:
             -   name: "Run tests"
                 run: |
                   export MONGODB_URI="mongodb://127.0.0.1:27017/?replicaSet=rs"
-                  ./vendor/bin/phpunit --coverage-clover coverage.xml --exclude-group atlas-search
+                  php -d zend.assertions=1 ./vendor/bin/phpunit --coverage-clover coverage.xml --exclude-group atlas-search
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index a4b9dda92..d7f066483 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -23,7 +23,8 @@
         <env name="QUEUE_CONNECTION" value="database"/>
         <ini name="xdebug.mode" value="coverage"/>
         <ini name="memory_limit" value="-1"/>
-        <ini name="zend.assertions" value="1"/>
+        <!-- Evaluate assertions, requires running with "php -d zend.assertions=1 vendor/bin/phpunit" -->
+        <!-- <ini name="zend.assertions=1" value="1" /> -->
     </php>
 
     <source restrictDeprecations="true"