PHPLIB-933: Test on PHP 8.2 (#953)

* Add testing for feature branches to GitHub Actions

* Test on PHP 8.2

* Handle upcoming return type changes

* Handle missing class properties

* No longer use self in callable

Author: alcaeus

.github/workflows/tests.yml

@@ -5,10 +5,12 @@ on:
     branches:
       - "v*.*"
       - "master"
+      - "feature/*"
   push:
     branches:
       - "v*.*"
       - "master"
+      - "feature/*"
 
 jobs:
   phpunit:
@@ -24,6 +26,7 @@ jobs:
           - "7.4"
           - "8.0"
           - "8.1"
+          - "8.2"
         mongodb-version:
           - "4.4"
         driver-version:

src/Model/BSONArray.php

@@ -71,6 +71,7 @@ public static function __set_state(array $properties)
      * @see https://php.net/mongodb-bson-serializable.bsonserialize
      * @return array
      */
+    #[ReturnTypeWillChange]
     public function bsonSerialize()
     {
         return array_values($this->getArrayCopy());
@@ -82,6 +83,7 @@ public function bsonSerialize()
      * @see https://php.net/mongodb-bson-unserializable.bsonunserialize
      * @param array $data Array data
      */
+    #[ReturnTypeWillChange]
     public function bsonUnserialize(array $data)
     {
         self::__construct($data);

src/Model/BSONDocument.php

@@ -81,6 +81,7 @@ public static function __set_state(array $properties)
      * @see https://php.net/mongodb-bson-serializable.bsonserialize
      * @return object
      */
+    #[ReturnTypeWillChange]
     public function bsonSerialize()
     {
         return (object) $this->getArrayCopy();
@@ -92,6 +93,7 @@ public function bsonSerialize()
      * @see https://php.net/mongodb-bson-unserializable.bsonunserialize
      * @param array $data Array data
      */
+    #[ReturnTypeWillChange]
     public function bsonUnserialize(array $data)
     {
         parent::__construct($data, ArrayObject::ARRAY_AS_PROPS);

src/Model/ChangeStreamIterator.php

@@ -100,12 +100,12 @@ public function __construct(Cursor $cursor, $firstBatchSize, $initialResumeToken
     }
 
     /** @internal */
-    final public function commandFailed(CommandFailedEvent $event)
+    final public function commandFailed(CommandFailedEvent $event): void
     {
     }
 
     /** @internal */
-    final public function commandStarted(CommandStartedEvent $event)
+    final public function commandStarted(CommandStartedEvent $event): void
     {
         if ($event->getCommandName() !== 'getMore') {
             return;
@@ -117,7 +117,7 @@ final public function commandStarted(CommandStartedEvent $event)
     }
 
     /** @internal */
-    final public function commandSucceeded(CommandSucceededEvent $event)
+    final public function commandSucceeded(CommandSucceededEvent $event): void
     {
         if ($event->getCommandName() !== 'getMore') {
             return;

src/Model/IndexInput.php

@@ -19,6 +19,7 @@
 
 use MongoDB\BSON\Serializable;
 use MongoDB\Exception\InvalidArgumentException;
+use ReturnTypeWillChange;
 
 use function is_array;
 use function is_float;
@@ -91,6 +92,7 @@ public function __toString()
      * @see https://php.net/mongodb-bson-serializable.bsonserialize
      * @return array
      */
+    #[ReturnTypeWillChange]
     public function bsonSerialize()
     {
         return $this->index;

src/Operation/Watch.php

@@ -271,12 +271,12 @@ public function __construct(Manager $manager, $databaseName, $collectionName, ar
     }
 
     /** @internal */
-    final public function commandFailed(CommandFailedEvent $event)
+    final public function commandFailed(CommandFailedEvent $event): void
     {
     }
 
     /** @internal */
-    final public function commandStarted(CommandStartedEvent $event)
+    final public function commandStarted(CommandStartedEvent $event): void
     {
         if ($event->getCommandName() !== 'aggregate') {
             return;
@@ -287,7 +287,7 @@ final public function commandStarted(CommandStartedEvent $event)
     }
 
     /** @internal */
-    final public function commandSucceeded(CommandSucceededEvent $event)
+    final public function commandSucceeded(CommandSucceededEvent $event): void
     {
         if ($event->getCommandName() !== 'aggregate') {
             return;

tests/GridFS/UnusableStream.php

@@ -12,6 +12,8 @@
 
 final class UnusableStream
 {
+    public $context;
+
     public static function register($protocol = 'unusable'): void
     {
         if (in_array($protocol, stream_get_wrappers())) {

tests/UnifiedSpecTests/Constraint/IsBsonTypeTest.php

@@ -163,15 +163,15 @@ private function assertResult($expected, Constraint $constraint, $value, string
 // phpcs:disable Squiz.Classes.ClassFileName.NoMatch
 class SerializableArray implements Serializable
 {
-    public function bsonSerialize()
+    public function bsonSerialize(): array
     {
         return ['foo'];
     }
 }
 
 class SerializableObject implements Serializable
 {
-    public function bsonSerialize()
+    public function bsonSerialize(): array
     {
         return ['x' => 1];
     }

tests/UnifiedSpecTests/Constraint/Matches.php

@@ -68,6 +68,9 @@ class Matches extends Constraint
     /** @var ComparisonFailure|null */
     private $lastFailure;
 
+    /** @var Factory */
+    private $comparatorFactory;
+
     public function __construct($value, ?EntityMap $entityMap = null, $allowExtraRootKeys = true, $allowOperators = true)
     {
         $this->value = self::prepare($value);

tests/UnifiedSpecTests/Operation.php

@@ -85,10 +85,10 @@ final class Operation
     private $entityMap;
 
     /** @var ExpectedError */
-    private $expectedError;
+    private $expectError;
 
     /** @var ExpectedResult */
-    private $expectedResult;
+    private $expectResult;
 
     /** @var bool */
     private $ignoreResultAndError;
@@ -295,7 +295,12 @@ private function executeForCollection(Collection $collection)
                 assertIsArray($args['requests']);
 
                 return $collection->bulkWrite(
-                    array_map('self::prepareBulkWriteRequest', $args['requests']),
+                    array_map(
+                        static function ($request) {
+                            return self::prepareBulkWriteRequest($request);
+                        },
+                        $args['requests']
+                    ),
                     array_diff_key($args, ['requests' => 1])
                 );