Skip to content

Style fixes #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 22, 2018
Merged

Style fixes #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions easy-coding-standard.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,9 @@ parameters:
- src/Types/Static_.php
- src/Types/String_.php
- src/Types/Void_.php
PhpCsFixer\Fixer\Import\OrderedImportsFixer:
- *tests/unit/Types/ContextFactoryTest.php
PhpCsFixer\Fixer\Import\SingleImportPerStatementFixer:
- *tests/unit/Types/ContextFactoryTest.php
PhpCsFixer\Fixer\Import\SingleLineAfterImportsFixer:
- *tests/unit/Types/ContextFactoryTest.php
15 changes: 7 additions & 8 deletions src/Types/ContextFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ private function extractUseStatements(\ArrayIterator $tokens)
$groupedNs = '';
$currentNs = '';
$currentAlias = null;
$state = "start";
$state = 'start';

$i = 0;
while ($tokens->valid()) {
Expand All @@ -233,7 +233,7 @@ private function extractUseStatements(\ArrayIterator $tokens)
$tokenId = is_string($currentToken) ? $currentToken : $currentToken[0];
$tokenValue = is_string($currentToken) ? null : $currentToken[1];
switch ($state) {
case "start":
case 'start':
switch ($tokenId) {
case T_STRING:
case T_NS_SEPARATOR:
Expand All @@ -255,7 +255,7 @@ private function extractUseStatements(\ArrayIterator $tokens)
break;
}
break;
case "start-alias":
case 'start-alias':
switch ($tokenId) {
case T_STRING:
$currentAlias .= $tokenValue;
Expand All @@ -268,7 +268,7 @@ private function extractUseStatements(\ArrayIterator $tokens)
break;
}
break;
case "grouped":
case 'grouped':
switch ($tokenId) {
case T_STRING:
case T_NS_SEPARATOR:
Expand All @@ -290,7 +290,7 @@ private function extractUseStatements(\ArrayIterator $tokens)
break;
}
break;
case "grouped-alias":
case 'grouped-alias':
switch ($tokenId) {
case T_STRING:
$currentAlias .= $tokenValue;
Expand All @@ -309,18 +309,17 @@ private function extractUseStatements(\ArrayIterator $tokens)
}
}

if ($state == "end") {
if ($state === 'end') {
break;
}

$tokens->next();
}

if ($groupedNs != $currentNs) {
if ($groupedNs !== $currentNs) {
$extractedUseStatements[$currentAlias ?: $currentNs] = $currentNs;
}


return $extractedUseStatements;
}
}