timw4mail/HummingBirdAnimeClient
1
1
Fork 1
Code Issues 5 Pull Requests Projects 1 Releases Wiki Activity

Version 5.1 - All the GraphQL #32

Closed
timw4mail wants to merge 1160 commits from develop into master
pull from: develop
merge into: timw4mail:master
Conversation 0 Commits 1160 Files Changed 547 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fb8db698a6 - Show all commits

2
build/CodeIgniter/Sniffs/WhiteSpace/ElseOnNewLineSniff.php
View File

@ -71,7 +71,7 @@ class ElseOnNewLineSniff implements Sniff
$previous_non_blank_token = $tokens[$previous_non_blank_token_ptr]; $previous_non_blank_token = $tokens[$previous_non_blank_token_ptr];
if ($previous_non_blank_token['line'] === $else_token['line']) { if ($previous_non_blank_token['line'] === $else_token['line']) {
$error = '"' . $else_token['content'] . '" should be on a new line.'; $error = '"' . $else_token['content'] . '" should be on a new line.';
$phpcsFile->addError($error, $stackPtr); $phpcsFile->addError($error, $stackPtr, 123423);
} }
}//end process() }//end process()

4
phpdoc.dist.xml
View File

@ -12,7 +12,7 @@
</transformations> </transformations>
<files> <files>
<directory>src</directory> <directory>src</directory>
<!-- <directory>vendor/aviat/ion/src</directory> <directory>vendor/aviat/ion/src</directory>
<directory>vendor/container-interop/container-interop/src</directory> --> <directory>vendor/container-interop/container-interop/src</directory>
</files> </files>
</phpdoc> </phpdoc>