Skip to content

Commit 54f4d0f

Browse files
committed
Merge branch 'v1.6' into v1.7
* v1.6: Fix failing phpcs task
2 parents f143c25 + 4bb040c commit 54f4d0f

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

phpcs.xml.dist

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@
6161

6262
<!-- Sniff currently breaks, see https://github.com/slevomat/coding-standard/issues/727 -->
6363
<exclude name="SlevomatCodingStandard.Namespaces.NamespaceSpacing" />
64+
65+
<!-- Sniff currently broken when casting arrays, see https://github.com/squizlabs/PHP_CodeSniffer/issues/2937#issuecomment-615498860 -->
66+
<exclude name="Squiz.Arrays.ArrayDeclaration.ValueNoNewline" />
6467
</rule>
6568

6669
<!-- Change use statement sorting to be compatible with PSR-12 -->

tests/Database/DatabaseFunctionalTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use MongoDB\Driver\Cursor;
88
use MongoDB\Driver\ReadConcern;
99
use MongoDB\Driver\ReadPreference;
10-
use MongoDB\Driver\Server;
1110
use MongoDB\Driver\WriteConcern;
1211
use MongoDB\Exception\InvalidArgumentException;
1312
use MongoDB\Operation\CreateIndexes;

0 commit comments

Comments
 (0)