Skip to content

Commit c9e1ebb

Browse files
Merge branch '3.3' into 3.4
* 3.3: Fix optional cache warmers are always instantiated whereas they should be lazy-loaded add some \ on PHP_VERSION_ID for 2.8 [Di] Remove closure-proxy arguments [PropertyInfo][DoctrineBridge] The bigint Doctrine's type must be converted to string
1 parent dfef518 commit c9e1ebb

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Store/SemaphoreStore.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ private function lock(Key $key, $blocking)
6060

6161
$resource = sem_get(crc32($key));
6262

63-
if (PHP_VERSION_ID < 50601) {
63+
if (\PHP_VERSION_ID < 50601) {
6464
if (!$blocking) {
6565
throw new NotSupportedException(sprintf('The store "%s" does not supports non blocking locks.', get_class($this)));
6666
}

Tests/Store/BlockingStoreTestTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function testBlockingLocks()
3737
// Amount a microsecond used to order async actions
3838
$clockDelay = 50000;
3939

40-
if (PHP_VERSION_ID < 50600 || defined('HHVM_VERSION_ID')) {
40+
if (\PHP_VERSION_ID < 50600 || defined('HHVM_VERSION_ID')) {
4141
$this->markTestSkipped('The PHP engine does not keep resource in child forks');
4242

4343
return;

Tests/Store/SemaphoreStoreTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class SemaphoreStoreTest extends AbstractStoreTest
2727
*/
2828
protected function getStore()
2929
{
30-
if (PHP_VERSION_ID < 50601) {
30+
if (\PHP_VERSION_ID < 50601) {
3131
$this->markTestSkipped('Non blocking semaphore are supported by PHP version greater or equals than 5.6.1');
3232
}
3333

0 commit comments

Comments
 (0)