Skip to content

Commit 8ca2929

Browse files
fabpotfabpot
committed
switched array() to []
1 parent 6722970 commit 8ca2929

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+698
-698
lines changed

‎Node/FunctionNode.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class FunctionNode extends AbstractNode
3434
* @param string $name
3535
* @param Token[] $arguments
3636
*/
37-
public function __construct(NodeInterface $selector, $name, array $arguments = array())
37+
public function __construct(NodeInterface $selector, $name, array $arguments = [])
3838
{
3939
$this->selector = $selector;
4040
$this->name = strtolower($name);

‎Parser/Handler/StringHandler.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function handle(Reader $reader, TokenStream $stream)
4747
{
4848
$quote = $reader->getSubstring(1);
4949

50-
if (!\in_array($quote, array("'", '"'))) {
50+
if (!\in_array($quote, ["'", '"'])) {
5151
return false;
5252
}
5353

‎Parser/Parser.php‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -76,22 +76,22 @@ public static function parseSeries(array $tokens)
7676

7777
switch (true) {
7878
case 'odd' === $joined:
79-
return array(2, 1);
79+
return [2, 1];
8080
case 'even' === $joined:
81-
return array(2, 0);
81+
return [2, 0];
8282
case 'n' === $joined:
83-
return array(1, 0);
83+
return [1, 0];
8484
case false === strpos($joined, 'n'):
85-
return array(0, $int($joined));
85+
return [0, $int($joined)];
8686
}
8787

8888
$split = explode('n', $joined);
8989
$first = isset($split[0]) ? $split[0] : null;
9090

91-
return array(
91+
return [
9292
$first ? ('-' === $first || '+' === $first ? $int($first.'1') : $int($first)) : 1,
9393
isset($split[1]) && $split[1] ? $int($split[1]) : 0,
94-
);
94+
];
9595
}
9696

9797
/**
@@ -102,12 +102,12 @@ public static function parseSeries(array $tokens)
102102
private function parseSelectorList(TokenStream $stream)
103103
{
104104
$stream->skipWhitespace();
105-
$selectors = array();
105+
$selectors = [];
106106

107107
while (true) {
108108
$selectors[] = $this->parserSelectorNode($stream);
109109

110-
if ($stream->getPeek()->isDelimiter(array(','))) {
110+
if ($stream->getPeek()->isDelimiter([','])) {
111111
$stream->getNext();
112112
$stream->skipWhitespace();
113113
} else {
@@ -133,15 +133,15 @@ private function parserSelectorNode(TokenStream $stream)
133133
$stream->skipWhitespace();
134134
$peek = $stream->getPeek();
135135

136-
if ($peek->isFileEnd() || $peek->isDelimiter(array(','))) {
136+
if ($peek->isFileEnd() || $peek->isDelimiter([','])) {
137137
break;
138138
}
139139

140140
if (null !== $pseudoElement) {
141141
throw SyntaxErrorException::pseudoElementFound($pseudoElement, 'not at the end of a selector');
142142
}
143143

144-
if ($peek->isDelimiter(array('+', '>', '~'))) {
144+
if ($peek->isDelimiter(['+', '>', '~'])) {
145145
$combinator = $stream->getNext()->getValue();
146146
$stream->skipWhitespace();
147147
} else {
@@ -177,8 +177,8 @@ private function parseSimpleSelector(TokenStream $stream, $insideNegation = fals
177177
$peek = $stream->getPeek();
178178
if ($peek->isWhitespace()
179179
|| $peek->isFileEnd()
180-
|| $peek->isDelimiter(array(',', '+', '>', '~'))
181-
|| ($insideNegation && $peek->isDelimiter(array(')')))
180+
|| $peek->isDelimiter([',', '+', '>', '~'])
181+
|| ($insideNegation && $peek->isDelimiter([')']))
182182
) {
183183
break;
184184
}
@@ -189,32 +189,32 @@ private function parseSimpleSelector(TokenStream $stream, $insideNegation = fals
189189

190190
if ($peek->isHash()) {
191191
$result = new Node\HashNode($result, $stream->getNext()->getValue());
192-
} elseif ($peek->isDelimiter(array('.'))) {
192+
} elseif ($peek->isDelimiter(['.'])) {
193193
$stream->getNext();
194194
$result = new Node\ClassNode($result, $stream->getNextIdentifier());
195-
} elseif ($peek->isDelimiter(array('['))) {
195+
} elseif ($peek->isDelimiter(['['])) {
196196
$stream->getNext();
197197
$result = $this->parseAttributeNode($result, $stream);
198-
} elseif ($peek->isDelimiter(array(':'))) {
198+
} elseif ($peek->isDelimiter([':'])) {
199199
$stream->getNext();
200200

201-
if ($stream->getPeek()->isDelimiter(array(':'))) {
201+
if ($stream->getPeek()->isDelimiter([':'])) {
202202
$stream->getNext();
203203
$pseudoElement = $stream->getNextIdentifier();
204204

205205
continue;
206206
}
207207

208208
$identifier = $stream->getNextIdentifier();
209-
if (\in_array(strtolower($identifier), array('first-line', 'first-letter', 'before', 'after'))) {
209+
if (\in_array(strtolower($identifier), ['first-line', 'first-letter', 'before', 'after'])) {
210210
// Special case: CSS 2.1 pseudo-elements can have a single ':'.
211211
// Any new pseudo-element must have two.
212212
$pseudoElement = $identifier;
213213

214214
continue;
215215
}
216216

217-
if (!$stream->getPeek()->isDelimiter(array('('))) {
217+
if (!$stream->getPeek()->isDelimiter(['('])) {
218218
$result = new Node\PseudoNode($result, $identifier);
219219

220220
continue;
@@ -235,13 +235,13 @@ private function parseSimpleSelector(TokenStream $stream, $insideNegation = fals
235235
throw SyntaxErrorException::pseudoElementFound($argumentPseudoElement, 'inside ::not()');
236236
}
237237

238-
if (!$next->isDelimiter(array(')'))) {
238+
if (!$next->isDelimiter([')'])) {
239239
throw SyntaxErrorException::unexpectedToken('")"', $next);
240240
}
241241

242242
$result = new Node\NegationNode($result, $argument);
243243
} else {
244-
$arguments = array();
244+
$arguments = [];
245245
$next = null;
246246

247247
while (true) {
@@ -251,10 +251,10 @@ private function parseSimpleSelector(TokenStream $stream, $insideNegation = fals
251251
if ($next->isIdentifier()
252252
|| $next->isString()
253253
|| $next->isNumber()
254-
|| $next->isDelimiter(array('+', '-'))
254+
|| $next->isDelimiter(['+', '-'])
255255
) {
256256
$arguments[] = $next;
257-
} elseif ($next->isDelimiter(array(')'))) {
257+
} elseif ($next->isDelimiter([')'])) {
258258
break;
259259
} else {
260260
throw SyntaxErrorException::unexpectedToken('an argument', $next);
@@ -276,7 +276,7 @@ private function parseSimpleSelector(TokenStream $stream, $insideNegation = fals
276276
throw SyntaxErrorException::unexpectedToken('selector', $stream->getPeek());
277277
}
278278

279-
return array($result, $pseudoElement);
279+
return [$result, $pseudoElement];
280280
}
281281

282282
/**
@@ -288,15 +288,15 @@ private function parseElementNode(TokenStream $stream)
288288
{
289289
$peek = $stream->getPeek();
290290

291-
if ($peek->isIdentifier() || $peek->isDelimiter(array('*'))) {
291+
if ($peek->isIdentifier() || $peek->isDelimiter(['*'])) {
292292
if ($peek->isIdentifier()) {
293293
$namespace = $stream->getNext()->getValue();
294294
} else {
295295
$stream->getNext();
296296
$namespace = null;
297297
}
298298

299-
if ($stream->getPeek()->isDelimiter(array('|'))) {
299+
if ($stream->getPeek()->isDelimiter(['|'])) {
300300
$stream->getNext();
301301
$element = $stream->getNextIdentifierOrStar();
302302
} else {
@@ -322,14 +322,14 @@ private function parseAttributeNode(Node\NodeInterface $selector, TokenStream $s
322322
$stream->skipWhitespace();
323323
$attribute = $stream->getNextIdentifierOrStar();
324324

325-
if (null === $attribute && !$stream->getPeek()->isDelimiter(array('|'))) {
325+
if (null === $attribute && !$stream->getPeek()->isDelimiter(['|'])) {
326326
throw SyntaxErrorException::unexpectedToken('"|"', $stream->getPeek());
327327
}
328328

329-
if ($stream->getPeek()->isDelimiter(array('|'))) {
329+
if ($stream->getPeek()->isDelimiter(['|'])) {
330330
$stream->getNext();
331331

332-
if ($stream->getPeek()->isDelimiter(array('='))) {
332+
if ($stream->getPeek()->isDelimiter(['='])) {
333333
$namespace = null;
334334
$stream->getNext();
335335
$operator = '|=';
@@ -346,12 +346,12 @@ private function parseAttributeNode(Node\NodeInterface $selector, TokenStream $s
346346
$stream->skipWhitespace();
347347
$next = $stream->getNext();
348348

349-
if ($next->isDelimiter(array(']'))) {
349+
if ($next->isDelimiter([']'])) {
350350
return new Node\AttributeNode($selector, $namespace, $attribute, 'exists', null);
351-
} elseif ($next->isDelimiter(array('='))) {
351+
} elseif ($next->isDelimiter(['='])) {
352352
$operator = '=';
353-
} elseif ($next->isDelimiter(array('^', '$', '*', '~', '|', '!'))
354-
&& $stream->getPeek()->isDelimiter(array('='))
353+
} elseif ($next->isDelimiter(['^', '$', '*', '~', '|', '!'])
354+
&& $stream->getPeek()->isDelimiter(['='])
355355
) {
356356
$operator = $next->getValue().'=';
357357
$stream->getNext();
@@ -375,7 +375,7 @@ private function parseAttributeNode(Node\NodeInterface $selector, TokenStream $s
375375
$stream->skipWhitespace();
376376
$next = $stream->getNext();
377377

378-
if (!$next->isDelimiter(array(']'))) {
378+
if (!$next->isDelimiter([']'])) {
379379
throw SyntaxErrorException::unexpectedToken('"]"', $next);
380380
}
381381

‎Parser/Shortcut/ClassParser.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ public function parse($source)
4141
// 2 => string 'input' (length=5)
4242
// 3 => string 'ab6bd_field' (length=11)
4343
if (preg_match('/^(?:([a-z]++)\|)?+([\w-]++|\*)?+\.([\w-]++)$/i', trim($source), $matches)) {
44-
return array(
44+
return [
4545
new SelectorNode(new ClassNode(new ElementNode($matches[1] ?: null, $matches[2] ?: null), $matches[3])),
46-
);
46+
];
4747
}
4848

49-
return array();
49+
return [];
5050
}
5151
}

‎Parser/Shortcut/ElementParser.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ public function parse($source)
3939
// 1 => string 'testns' (length=6)
4040
// 2 => string 'testel' (length=6)
4141
if (preg_match('/^(?:([a-z]++)\|)?([\w-]++|\*)$/i', trim($source), $matches)) {
42-
return array(new SelectorNode(new ElementNode($matches[1] ?: null, $matches[2])));
42+
return [new SelectorNode(new ElementNode($matches[1] ?: null, $matches[2]))];
4343
}
4444

45-
return array();
45+
return [];
4646
}
4747
}

‎Parser/Shortcut/EmptyStringParser.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ public function parse($source)
3838
{
3939
// Matches an empty string
4040
if ('' == $source) {
41-
return array(new SelectorNode(new ElementNode(null, '*')));
41+
return [new SelectorNode(new ElementNode(null, '*'))];
4242
}
4343

44-
return array();
44+
return [];
4545
}
4646
}

‎Parser/Shortcut/HashParser.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ public function parse($source)
4141
// 2 => string 'input' (length=5)
4242
// 3 => string 'ab6bd_field' (length=11)
4343
if (preg_match('/^(?:([a-z]++)\|)?+([\w-]++|\*)?+#([\w-]++)$/i', trim($source), $matches)) {
44-
return array(
44+
return [
4545
new SelectorNode(new HashNode(new ElementNode($matches[1] ?: null, $matches[2] ?: null), $matches[3])),
46-
);
46+
];
4747
}
4848

49-
return array();
49+
return [];
5050
}
5151
}

‎Parser/Token.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public function isFileEnd()
8282
/**
8383
* @return bool
8484
*/
85-
public function isDelimiter(array $values = array())
85+
public function isDelimiter(array $values = [])
8686
{
8787
if (self::TYPE_DELIMITER !== $this->type) {
8888
return false;

‎Parser/TokenStream.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ class TokenStream
2929
/**
3030
* @var Token[]
3131
*/
32-
private $tokens = array();
32+
private $tokens = [];
3333

3434
/**
3535
* @var Token[]
3636
*/
37-
private $used = array();
37+
private $used = [];
3838

3939
/**
4040
* @var int
@@ -154,7 +154,7 @@ public function getNextIdentifierOrStar()
154154
return $next->getValue();
155155
}
156156

157-
if ($next->isDelimiter(array('*'))) {
157+
if ($next->isDelimiter(['*'])) {
158158
return;
159159
}
160160

‎Parser/Tokenizer/Tokenizer.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ public function __construct()
3838
$patterns = new TokenizerPatterns();
3939
$escaping = new TokenizerEscaping($patterns);
4040

41-
$this->handlers = array(
41+
$this->handlers = [
4242
new Handler\WhitespaceHandler(),
4343
new Handler\IdentifierHandler($patterns, $escaping),
4444
new Handler\HashHandler($patterns, $escaping),
4545
new Handler\StringHandler($patterns, $escaping),
4646
new Handler\NumberHandler($patterns),
4747
new Handler\CommentHandler(),
48-
);
48+
];
4949
}
5050

5151
/**

0 commit comments

Comments
 (0)