Skip to content

Commit 9903865

Browse files
Merge branch '3.4'
* 3.4: [DI] prepare for signature change in 4.0 [DI] Add missing deprecation on Extension::getClassesToCompile [Lock] Re-add the Lock component in 3.4 [Routing] remove an unused routing fixture [Yaml] fix multiline block handling [WebProfilerBundle] Fix sub-requests display in time profiler panel [FrameworkBundle] Handle project dir in cache:clear command [WebServerBundle] Mark ServerCommand as internal [DI] Fix autowire error for inlined services Close PHP code in phpt file [Profiler][VarDumper] Fix searchbar css when in toolbar Prevent auto-registration of UserPasswordEncoderCommand [Process] Fixed incorrectly escaping arguments on Windows when inheritEnvironmentVariables is set to false avoid double blanks while rendering form attributes use getProjectDir() when possible [PhpUnitBridge] add a changelog file [FrameworkBundle][Validator] Deprecate passing validator instances/aliases over using the service locator
1 parent dfef518 commit 9903865

File tree

4 files changed

+3
-22
lines changed

4 files changed

+3
-22
lines changed

Store/SemaphoreStore.php

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,7 @@ private function lock(Key $key, $blocking)
5959
}
6060

6161
$resource = sem_get(crc32($key));
62-
63-
if (PHP_VERSION_ID < 50601) {
64-
if (!$blocking) {
65-
throw new NotSupportedException(sprintf('The store "%s" does not supports non blocking locks.', get_class($this)));
66-
}
67-
68-
$acquired = sem_acquire($resource);
69-
} else {
70-
$acquired = sem_acquire($resource, !$blocking);
71-
}
62+
$acquired = sem_acquire($resource, !$blocking);
7263

7364
if (!$acquired) {
7465
throw new LockConflictedException();

Tests/Store/BlockingStoreTestTrait.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,6 @@ 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')) {
41-
$this->markTestSkipped('The PHP engine does not keep resource in child forks');
42-
43-
return;
44-
}
45-
4640
/** @var StoreInterface $store */
4741
$store = $this->getStore();
4842
$key = new Key(uniqid(__METHOD__, true));

Tests/Store/SemaphoreStoreTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ class SemaphoreStoreTest extends AbstractStoreTest
2727
*/
2828
protected function getStore()
2929
{
30-
if (PHP_VERSION_ID < 50601) {
31-
$this->markTestSkipped('Non blocking semaphore are supported by PHP version greater or equals than 5.6.1');
32-
}
33-
3430
return new SemaphoreStore();
3531
}
3632
}

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=5.5.9",
19+
"php": "^7.1.3",
2020
"symfony/polyfill-php70": "~1.0",
2121
"psr/log": "~1.0"
2222
},
@@ -32,7 +32,7 @@
3232
"minimum-stability": "dev",
3333
"extra": {
3434
"branch-alias": {
35-
"dev-master": "3.4-dev"
35+
"dev-master": "4.0-dev"
3636
}
3737
}
3838
}

0 commit comments

Comments
 (0)