Skip to content

Commit d1a5799

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.3
* 2.8: [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. .php_cs.dist - simplify config [WebProfilerBundle] fixed TemplateManager when using Twig 2 without compat interfaces
2 parents 0cb8b26 + 16e6a8b commit d1a5799

File tree

6 files changed

+28
-28
lines changed

6 files changed

+28
-28
lines changed

‎Loader/MoFileLoader.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ protected function loadResource($resource)
5959
$magic = unpack('V1', fread($stream, 4));
6060
$magic = hexdec(substr(dechex(current($magic)), -8));
6161

62-
if ($magic == self::MO_LITTLE_ENDIAN_MAGIC) {
62+
if (self::MO_LITTLE_ENDIAN_MAGIC == $magic) {
6363
$isBigEndian = false;
64-
} elseif ($magic == self::MO_BIG_ENDIAN_MAGIC) {
64+
} elseif (self::MO_BIG_ENDIAN_MAGIC == $magic) {
6565
$isBigEndian = true;
6666
} else {
6767
throw new InvalidResourceException('MO stream content has an invalid format.');
@@ -95,7 +95,7 @@ protected function loadResource($resource)
9595
fseek($stream, $offset);
9696
$singularId = fread($stream, $length);
9797

98-
if (strpos($singularId, "\000") !== false) {
98+
if (false !== strpos($singularId, "\000")) {
9999
list($singularId, $pluralId) = explode("\000", $singularId);
100100
}
101101

@@ -110,7 +110,7 @@ protected function loadResource($resource)
110110
fseek($stream, $offset);
111111
$translated = fread($stream, $length);
112112

113-
if (strpos($translated, "\000") !== false) {
113+
if (false !== strpos($translated, "\000")) {
114114
$translated = explode("\000", $translated);
115115
}
116116

‎Loader/PoFileLoader.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,24 +76,24 @@ protected function loadResource($resource)
7676
while ($line = fgets($stream)) {
7777
$line = trim($line);
7878

79-
if ($line === '') {
79+
if ('' === $line) {
8080
// Whitespace indicated current item is done
8181
if (!in_array('fuzzy', $flags)) {
8282
$this->addMessage($messages, $item);
8383
}
8484
$item = $defaults;
8585
$flags = array();
86-
} elseif (substr($line, 0, 2) === '#,') {
86+
} elseif ('#,' === substr($line, 0, 2)) {
8787
$flags = array_map('trim', explode(',', substr($line, 2)));
88-
} elseif (substr($line, 0, 7) === 'msgid "') {
88+
} elseif ('msgid "' === substr($line, 0, 7)) {
8989
// We start a new msg so save previous
9090
// TODO: this fails when comments or contexts are added
9191
$this->addMessage($messages, $item);
9292
$item = $defaults;
9393
$item['ids']['singular'] = substr($line, 7, -1);
94-
} elseif (substr($line, 0, 8) === 'msgstr "') {
94+
} elseif ('msgstr "' === substr($line, 0, 8)) {
9595
$item['translated'] = substr($line, 8, -1);
96-
} elseif ($line[0] === '"') {
96+
} elseif ('"' === $line[0]) {
9797
$continues = isset($item['translated']) ? 'translated' : 'ids';
9898

9999
if (is_array($item[$continues])) {
@@ -102,9 +102,9 @@ protected function loadResource($resource)
102102
} else {
103103
$item[$continues] .= substr($line, 1, -1);
104104
}
105-
} elseif (substr($line, 0, 14) === 'msgid_plural "') {
105+
} elseif ('msgid_plural "' === substr($line, 0, 14)) {
106106
$item['ids']['plural'] = substr($line, 14, -1);
107-
} elseif (substr($line, 0, 7) === 'msgstr[') {
107+
} elseif ('msgstr[' === substr($line, 0, 7)) {
108108
$size = strpos($line, ']');
109109
$item['translated'][(int) substr($line, 7, 1)] = substr($line, $size + 3, -1);
110110
}

‎Loader/QtFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function load($resource, $locale, $domain = 'messages')
5050
$nodes = $xpath->evaluate('//TS/context/name[text()="'.$domain.'"]');
5151

5252
$catalogue = new MessageCatalogue($locale);
53-
if ($nodes->length == 1) {
53+
if (1 == $nodes->length) {
5454
$translations = $nodes->item(0)->nextSibling->parentNode->parentNode->getElementsByTagName('message');
5555
foreach ($translations as $translation) {
5656
$translationValue = (string) $translation->getElementsByTagName('translation')->item(0)->nodeValue;

‎Loader/XliffFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ private function getVersionNumber(\DOMDocument $dom)
283283

284284
$namespace = $xliff->attributes->getNamedItem('xmlns');
285285
if ($namespace) {
286-
if (substr_compare('urn:oasis:names:tc:xliff:document:', $namespace->nodeValue, 0, 34) !== 0) {
286+
if (0 !== substr_compare('urn:oasis:names:tc:xliff:document:', $namespace->nodeValue, 0, 34)) {
287287
throw new InvalidArgumentException(sprintf('Not a valid XLIFF namespace "%s"', $namespace));
288288
}
289289

‎PluralizationRules.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public static function get($number, $locale)
123123
case 'tk':
124124
case 'ur':
125125
case 'zu':
126-
return ($number == 1) ? 0 : 1;
126+
return (1 == $number) ? 0 : 1;
127127

128128
case 'am':
129129
case 'bh':
@@ -138,49 +138,49 @@ public static function get($number, $locale)
138138
case 'xbr':
139139
case 'ti':
140140
case 'wa':
141-
return (($number == 0) || ($number == 1)) ? 0 : 1;
141+
return ((0 == $number) || (1 == $number)) ? 0 : 1;
142142

143143
case 'be':
144144
case 'bs':
145145
case 'hr':
146146
case 'ru':
147147
case 'sr':
148148
case 'uk':
149-
return (($number % 10 == 1) && ($number % 100 != 11)) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
149+
return ((1 == $number % 10) && (11 != $number % 100)) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
150150

151151
case 'cs':
152152
case 'sk':
153-
return ($number == 1) ? 0 : ((($number >= 2) && ($number <= 4)) ? 1 : 2);
153+
return (1 == $number) ? 0 : ((($number >= 2) && ($number <= 4)) ? 1 : 2);
154154

155155
case 'ga':
156-
return ($number == 1) ? 0 : (($number == 2) ? 1 : 2);
156+
return (1 == $number) ? 0 : ((2 == $number) ? 1 : 2);
157157

158158
case 'lt':
159-
return (($number % 10 == 1) && ($number % 100 != 11)) ? 0 : ((($number % 10 >= 2) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
159+
return ((1 == $number % 10) && (11 != $number % 100)) ? 0 : ((($number % 10 >= 2) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
160160

161161
case 'sl':
162-
return ($number % 100 == 1) ? 0 : (($number % 100 == 2) ? 1 : ((($number % 100 == 3) || ($number % 100 == 4)) ? 2 : 3));
162+
return (1 == $number % 100) ? 0 : ((2 == $number % 100) ? 1 : (((3 == $number % 100) || (4 == $number % 100)) ? 2 : 3));
163163

164164
case 'mk':
165-
return ($number % 10 == 1) ? 0 : 1;
165+
return (1 == $number % 10) ? 0 : 1;
166166

167167
case 'mt':
168-
return ($number == 1) ? 0 : ((($number == 0) || (($number % 100 > 1) && ($number % 100 < 11))) ? 1 : ((($number % 100 > 10) && ($number % 100 < 20)) ? 2 : 3));
168+
return (1 == $number) ? 0 : (((0 == $number) || (($number % 100 > 1) && ($number % 100 < 11))) ? 1 : ((($number % 100 > 10) && ($number % 100 < 20)) ? 2 : 3));
169169

170170
case 'lv':
171-
return ($number == 0) ? 0 : ((($number % 10 == 1) && ($number % 100 != 11)) ? 1 : 2);
171+
return (0 == $number) ? 0 : (((1 == $number % 10) && (11 != $number % 100)) ? 1 : 2);
172172

173173
case 'pl':
174-
return ($number == 1) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 12) || ($number % 100 > 14))) ? 1 : 2);
174+
return (1 == $number) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 12) || ($number % 100 > 14))) ? 1 : 2);
175175

176176
case 'cy':
177-
return ($number == 1) ? 0 : (($number == 2) ? 1 : ((($number == 8) || ($number == 11)) ? 2 : 3));
177+
return (1 == $number) ? 0 : ((2 == $number) ? 1 : (((8 == $number) || (11 == $number)) ? 2 : 3));
178178

179179
case 'ro':
180-
return ($number == 1) ? 0 : ((($number == 0) || (($number % 100 > 0) && ($number % 100 < 20))) ? 1 : 2);
180+
return (1 == $number) ? 0 : (((0 == $number) || (($number % 100 > 0) && ($number % 100 < 20))) ? 1 : 2);
181181

182182
case 'ar':
183-
return ($number == 0) ? 0 : (($number == 1) ? 1 : (($number == 2) ? 2 : ((($number % 100 >= 3) && ($number % 100 <= 10)) ? 3 : ((($number % 100 >= 11) && ($number % 100 <= 99)) ? 4 : 5))));
183+
return (0 == $number) ? 0 : ((1 == $number) ? 1 : ((2 == $number) ? 2 : ((($number % 100 >= 3) && ($number % 100 <= 10)) ? 3 : ((($number % 100 >= 11) && ($number % 100 <= 99)) ? 4 : 5))));
184184

185185
default:
186186
return 0;

‎Translator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ protected function computeFallbackLocales($locale)
409409
$locales[] = $fallback;
410410
}
411411

412-
if (strrchr($locale, '_') !== false) {
412+
if (false !== strrchr($locale, '_')) {
413413
array_unshift($locales, substr($locale, 0, -strlen(strrchr($locale, '_'))));
414414
}
415415

0 commit comments

Comments
 (0)