Skip to content

Commit f8c4976

Browse files
committed
apply styleci fixes
1 parent 7932b8a commit f8c4976

38 files changed

+23
-78
lines changed

src/PHPCR/Util/CND/Parser/CndParser.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,13 @@ private function parse(ReaderInterface $reader)
120120
$this->tokenQueue = $scanner->scan($reader);
121121

122122
while (!$this->tokenQueue->isEof()) {
123-
124123
while ($this->checkToken(Token::TK_SYMBOL, '<')) {
125124
$this->parseNamespaceMapping();
126125
}
127126

128127
if (!$this->tokenQueue->isEof()) {
129128
$this->parseNodeType();
130129
}
131-
132130
}
133131

134132
return array(
@@ -732,10 +730,8 @@ protected function parseQueryOpsAttribute()
732730

733731
$ops = array();
734732
do {
735-
736733
$op = $this->parseQueryOperator();
737734
$ops[] = $op;
738-
739735
} while ($op && $this->checkAndExpectToken(Token::TK_SYMBOL, ','));
740736

741737
if (empty($ops)) {

src/PHPCR/Util/CND/Reader/BufferReader.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,5 +167,4 @@ public function consume()
167167

168168
return $current;
169169
}
170-
171170
}

src/PHPCR/Util/CND/Scanner/AbstractScanner.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public function resetQueue()
3838
public function applyFilters(Token $token)
3939
{
4040
foreach ($this->context->getTokenFilters() as $filter) {
41-
4241
$token = $filter->filter($token);
4342

4443
if (null === $token) {

src/PHPCR/Util/CND/Scanner/Context/DefaultScannerContextWithoutSpacesAndComments.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@ public function __construct()
2020
$this->addTokenFilter(new TokenFilter\NoWhitespacesFilter());
2121
$this->addTokenFilter(new TokenFilter\NoCommentsFilter());
2222
}
23-
2423
}

src/PHPCR/Util/CND/Scanner/GenericScanner.php

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ public function scan(ReaderInterface $reader)
4848
$this->addToken($reader, $token);
4949
}
5050
}
51-
5251
}
5352

5453
return $this->getQueue();
@@ -64,7 +63,6 @@ public function scan(ReaderInterface $reader)
6463
protected function consumeSpaces(ReaderInterface $reader)
6564
{
6665
if (in_array($reader->currentChar(), $this->context->getWhitespaces())) {
67-
6866
$char = $reader->forwardChar();
6967
while (in_array($char, $this->context->getWhitespaces())) {
7068
$char = $reader->forwardChar();
@@ -91,7 +89,6 @@ protected function consumeSpaces(ReaderInterface $reader)
9189
protected function consumeNewLine(ReaderInterface $reader)
9290
{
9391
if ($reader->currentChar() === "\n") {
94-
9592
$token = new GenericToken(GenericToken::TK_NEWLINE, "\n");
9693
$this->addToken($reader, $token);
9794

@@ -120,10 +117,8 @@ protected function consumeString(ReaderInterface $reader)
120117
{
121118
$curDelimiter = $reader->currentChar();
122119
if (in_array($curDelimiter, $this->context->getStringDelimiters())) {
123-
124120
$char = $reader->forwardChar();
125121
while ($char !== $curDelimiter) {
126-
127122
if ($char === "\n") {
128123
throw new ScannerException($reader, "Newline detected in string");
129124
}
@@ -170,7 +165,6 @@ protected function consumeBlockComments(ReaderInterface $reader)
170165
{
171166
$nextChar = $reader->currentChar();
172167
foreach ($this->context->getBlockCommentDelimiters() as $beginDelim => $endDelim) {
173-
174168
if ($nextChar === $beginDelim[0]) {
175169

176170
// Lookup the start delimiter
@@ -183,9 +177,7 @@ protected function consumeBlockComments(ReaderInterface $reader)
183177
$nextChar = $reader->forwardChar();
184178

185179
while (! $reader->isEof()) {
186-
187180
if ($nextChar === $endDelim[0]) {
188-
189181
for ($i = 1; $i <= strlen($endDelim); $i++) {
190182
$reader->forward();
191183
}
@@ -203,21 +195,17 @@ protected function consumeBlockComments(ReaderInterface $reader)
203195

204196
// End of file reached and no end delimiter found, error
205197
throw new ScannerException($reader, "Unterminated block comment");
206-
207198
} else {
208199

209200
// Start delimiter not found, rewind the looked up characters
210201
$reader->rewind();
211202

212203
return false;
213204
}
214-
215205
}
216-
217206
}
218207

219208
return false;
220-
221209
}
222210

223211
/**
@@ -231,9 +219,7 @@ protected function consumeLineComments(ReaderInterface $reader)
231219
{
232220
$nextChar = $reader->currentChar();
233221
foreach ($this->context->getLineCommentDelimiters() as $delimiter) {
234-
235222
if ($delimiter && $nextChar === $delimiter[0]) {
236-
237223
for ($i = 1; $i <= strlen($delimiter); $i++) {
238224
$reader->forward();
239225
}
@@ -249,15 +235,13 @@ protected function consumeLineComments(ReaderInterface $reader)
249235
$this->addToken($reader, $token);
250236

251237
return true;
252-
253238
} else {
254239

255240
// Rewind the looked up characters
256241
$reader->rewind();
257242

258243
return false;
259244
}
260-
261245
}
262246
}
263247

src/PHPCR/Util/CND/Scanner/GenericToken.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,4 @@ public function __toString()
3838
{
3939
return sprintf("TOKEN(%s, '%s', %s, %s)", self::getTypeName($this->getType()), trim($this->data), $this->line, $this->row);
4040
}
41-
4241
}

src/PHPCR/Util/CND/Scanner/Token.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,5 +110,4 @@ public function getRow()
110110
{
111111
return $this->row;
112112
}
113-
114113
}

src/PHPCR/Util/CND/Scanner/TokenFilter/TokenFilterChain.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ public function addFilter(TokenFilterInterface $filter)
2929
public function filter(Token $token)
3030
{
3131
foreach ($this->filters as $filter) {
32-
3332
$token = $filter->filter($token);
3433

3534
if (!$token) {

src/PHPCR/Util/Console/Command/BaseCommand.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
use Symfony\Component\Console\Command\Command;
66
use Symfony\Component\Console\Input\InputInterface;
77
use Symfony\Component\Console\Output\OutputInterface;
8-
98
use PHPCR\SessionInterface;
109
use PHPCR\Util\Console\Helper\PhpcrHelper;
1110
use PHPCR\Util\Console\Helper\PhpcrConsoleDumperHelper;

src/PHPCR/Util/Console/Command/NodeDumpCommand.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
use PHPCR\ItemNotFoundException;
66
use PHPCR\RepositoryException;
77
use PHPCR\PathNotFoundException;
8-
98
use PHPCR\Util\UUIDHelper;
10-
119
use Symfony\Component\Console\Input\InputArgument;
1210
use Symfony\Component\Console\Input\InputOption;
1311
use Symfony\Component\Console\Input\InputInterface;
@@ -99,5 +97,4 @@ protected function execute(InputInterface $input, OutputInterface $output)
9997

10098
return 0;
10199
}
102-
103100
}

0 commit comments

Comments
 (0)