Skip to content

Commit 62dd5ff

Browse files
authored
Fix deprecations in tests (#1458)
* Reflection method setAccessible is useless As of PHP 8.1.0, calling this method has no effect; all properties are accessible by default. https://www.php.net/manual/en/reflectionproperty.setaccessible.php * Replace deprecated ObjectHasAttribute with ObjectHasProperty
1 parent 1837a75 commit 62dd5ff

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

tests/GridFS/BucketFunctionalTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -951,8 +951,6 @@ public function testResolveStreamContextForRead(): void
951951
fclose($stream);
952952

953953
$method = new ReflectionMethod($this->bucket, 'resolveStreamContext');
954-
$method->setAccessible(true);
955-
956954
$context = $method->invokeArgs($this->bucket, ['gridfs://bucket/filename', 'rb', []]);
957955

958956
$this->assertIsArray($context);
@@ -967,8 +965,6 @@ public function testResolveStreamContextForRead(): void
967965
public function testResolveStreamContextForWrite(): void
968966
{
969967
$method = new ReflectionMethod($this->bucket, 'resolveStreamContext');
970-
$method->setAccessible(true);
971-
972968
$context = $method->invokeArgs($this->bucket, ['gridfs://bucket/filename', 'wb', []]);
973969

974970
$this->assertIsArray($context);

tests/Operation/WatchFunctionalTest.php

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
use MongoDB\Operation\InsertOne;
2626
use MongoDB\Operation\Watch;
2727
use MongoDB\Tests\CommandObserver;
28+
use PHPUnit\Framework\Constraint\ObjectHasProperty;
2829
use PHPUnit\Framework\ExpectationFailedException;
2930
use ReflectionClass;
3031
use stdClass;
@@ -724,10 +725,7 @@ public function testInitialCursorIsNotClosed(): void
724725
$this->assertNotEquals('0', (string) $changeStream->getCursorId(true));
725726

726727
$rc = new ReflectionClass(ChangeStream::class);
727-
$rp = $rc->getProperty('iterator');
728-
$rp->setAccessible(true);
729-
730-
$iterator = $rp->getValue($changeStream);
728+
$iterator = $rc->getProperty('iterator')->getValue($changeStream);
731729

732730
$this->assertInstanceOf('IteratorIterator', $iterator);
733731

@@ -1225,7 +1223,6 @@ public function testSessionFreed(): void
12251223

12261224
$rc = new ReflectionClass($changeStream);
12271225
$rp = $rc->getProperty('resumeCallable');
1228-
$rp->setAccessible(true);
12291226

12301227
$this->assertIsCallable($rp->getValue($changeStream));
12311228

@@ -1282,19 +1279,19 @@ function (array $event) use (&$aggregateCommands): void {
12821279
$aggregateCommands[0]['pipeline'][0]->{'$changeStream'},
12831280
$this->logicalNot(
12841281
$this->logicalOr(
1285-
$this->objectHasAttribute('resumeAfter'),
1286-
$this->objectHasAttribute('startAfter'),
1287-
$this->objectHasAttribute('startAtOperationTime'),
1282+
new ObjectHasProperty('resumeAfter'),
1283+
new ObjectHasProperty('startAfter'),
1284+
new ObjectHasProperty('startAtOperationTime'),
12881285
),
12891286
),
12901287
);
12911288

12921289
$this->assertThat(
12931290
$aggregateCommands[1]['pipeline'][0]->{'$changeStream'},
12941291
$this->logicalOr(
1295-
$this->objectHasAttribute('resumeAfter'),
1296-
$this->objectHasAttribute('startAfter'),
1297-
$this->objectHasAttribute('startAtOperationTime'),
1292+
new ObjectHasProperty('resumeAfter'),
1293+
new ObjectHasProperty('startAfter'),
1294+
new ObjectHasProperty('startAtOperationTime'),
12981295
),
12991296
);
13001297

0 commit comments

Comments
 (0)