Skip to content

Commit 39804ee

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 63c48c2 + 4c7cfb5 commit 39804ee

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

CompiledRoute.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function serialize()
7373
*/
7474
public function unserialize($serialized)
7575
{
76-
if (PHP_VERSION_ID >= 70000) {
76+
if (\PHP_VERSION_ID >= 70000) {
7777
$data = unserialize($serialized, array('allowed_classes' => false));
7878
} else {
7979
$data = unserialize($serialized);

Route.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public function serialize()
116116
*/
117117
public function unserialize($serialized)
118118
{
119-
if (PHP_VERSION_ID >= 70000) {
119+
if (\PHP_VERSION_ID >= 70000) {
120120
$data = unserialize($serialized, array('allowed_classes' => array(CompiledRoute::class)));
121121
} else {
122122
$data = unserialize($serialized);

0 commit comments

Comments
 (0)