Skip to content

Commit 28f0ea0

Browse files
Merge branch '3.3' into 3.4
* 3.3: [CS][2.7] yoda_style, no_unneeded_curly_braces, no_unneeded_final_method, semicolon_after_instruction [Filesystem] mirror - fix copying content with same name as source/target. Removed unnecessary getDefinition() call. .php_cs.dist - simplify config [WebProfilerBundle] fixed TemplateManager when using Twig 2 without compat interfaces
1 parent 4fdd691 commit 28f0ea0

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Store/MemcachedStore.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ private function getValueAndCas(Key $key)
172172

173173
if ($this->useExtendedReturn) {
174174
$extendedReturn = $this->memcached->get((string) $key, null, \Memcached::GET_EXTENDED);
175-
if ($extendedReturn === \Memcached::GET_ERROR_RETURN_VALUE) {
175+
if (\Memcached::GET_ERROR_RETURN_VALUE === $extendedReturn) {
176176
return array($extendedReturn, 0.0);
177177
}
178178

Store/SemaphoreStore.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static function isSupported($blocking = null)
3939
return false;
4040
}
4141

42-
if ($blocking === false && \PHP_VERSION_ID < 50601) {
42+
if (false === $blocking && \PHP_VERSION_ID < 50601) {
4343
return false;
4444
}
4545

Strategy/UnanimousStrategy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ public function isMet($numberOfSuccess, $numberOfItems)
3131
*/
3232
public function canBeMet($numberOfFailure, $numberOfItems)
3333
{
34-
return $numberOfFailure === 0;
34+
return 0 === $numberOfFailure;
3535
}
3636
}

0 commit comments

Comments
 (0)