Skip to content

Commit 128ac80

Browse files
Merge branch '3.2' into 3.3
* 3.2: Fix optional cache warmers are always instantiated whereas they should be lazy-loaded add some \ on PHP_VERSION_ID for 2.8 [PropertyInfo][DoctrineBridge] The bigint Doctrine's type must be converted to string
2 parents f6780ab + e5533fc commit 128ac80

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Tests/Resource/ReflectionClassResourceTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,10 @@ public function provideHashedSignature()
124124
yield array(0, 8, '/** priv docblock */');
125125
yield array(0, 9, 'private $priv = 123;');
126126
yield array(1, 10, '/** pub docblock */');
127-
if (PHP_VERSION_ID >= 50600) {
127+
if (\PHP_VERSION_ID >= 50600) {
128128
yield array(1, 11, 'public function pub(...$arg) {}');
129129
}
130-
if (PHP_VERSION_ID >= 70000) {
130+
if (\PHP_VERSION_ID >= 70000) {
131131
yield array(1, 11, 'public function pub($arg = null): Foo {}');
132132
}
133133
yield array(0, 11, "public function pub(\$arg = null) {\nreturn 123;\n}");

0 commit comments

Comments
 (0)