Merge pull request #155 from phpcr/styleci

added styleci

Author: lsmith77

.styleci.yml

@@ -0,0 +1,8 @@
+preset: psr2
+
+enabled:
+  - long_array_syntax
+  - duplicate_semicolon
+
+disabled:
+  - short_array_syntax

.travis.yml

@@ -10,6 +10,8 @@ php:
 env:
   - PACKAGE_VERSION=high
 
+sudo: false
+
 matrix:
   include:
     - php: 5.3.3

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

@@ -120,15 +120,13 @@ private function parse(ReaderInterface $reader)
         $this->tokenQueue = $scanner->scan($reader);
 
         while (!$this->tokenQueue->isEof()) {
-
             while ($this->checkToken(Token::TK_SYMBOL, '<')) {
                 $this->parseNamespaceMapping();
             }
 
             if (!$this->tokenQueue->isEof()) {
                 $this->parseNodeType();
             }
-
         }
 
         return array(
@@ -732,10 +730,8 @@ protected function parseQueryOpsAttribute()
 
         $ops = array();
         do {
-
             $op = $this->parseQueryOperator();
             $ops[] = $op;
-
         } while ($op && $this->checkAndExpectToken(Token::TK_SYMBOL, ','));
 
         if (empty($ops)) {

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

@@ -167,5 +167,4 @@ public function consume()
 
         return $current;
     }
-
 }

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

@@ -38,7 +38,6 @@ public function resetQueue()
     public function applyFilters(Token $token)
     {
         foreach ($this->context->getTokenFilters() as $filter) {
-
             $token = $filter->filter($token);
 
             if (null === $token) {

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

@@ -20,5 +20,4 @@ public function __construct()
         $this->addTokenFilter(new TokenFilter\NoWhitespacesFilter());
         $this->addTokenFilter(new TokenFilter\NoCommentsFilter());
     }
-
 }

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

@@ -48,7 +48,6 @@ public function scan(ReaderInterface $reader)
                     $this->addToken($reader, $token);
                 }
             }
-
         }
 
         return $this->getQueue();
@@ -64,7 +63,6 @@ public function scan(ReaderInterface $reader)
     protected function consumeSpaces(ReaderInterface $reader)
     {
         if (in_array($reader->currentChar(), $this->context->getWhitespaces())) {
-
             $char = $reader->forwardChar();
             while (in_array($char, $this->context->getWhitespaces())) {
                 $char = $reader->forwardChar();
@@ -91,7 +89,6 @@ protected function consumeSpaces(ReaderInterface $reader)
     protected function consumeNewLine(ReaderInterface $reader)
     {
         if ($reader->currentChar() === "\n") {
-
             $token = new GenericToken(GenericToken::TK_NEWLINE, "\n");
             $this->addToken($reader, $token);
 
@@ -120,10 +117,8 @@ protected function consumeString(ReaderInterface $reader)
     {
         $curDelimiter = $reader->currentChar();
         if (in_array($curDelimiter, $this->context->getStringDelimiters())) {
-
             $char = $reader->forwardChar();
             while ($char !== $curDelimiter) {
-
                 if ($char === "\n") {
                     throw new ScannerException($reader, "Newline detected in string");
                 }
@@ -170,7 +165,6 @@ protected function consumeBlockComments(ReaderInterface $reader)
     {
         $nextChar = $reader->currentChar();
         foreach ($this->context->getBlockCommentDelimiters() as $beginDelim => $endDelim) {
-
             if ($nextChar === $beginDelim[0]) {
 
                 // Lookup the start delimiter
@@ -183,9 +177,7 @@ protected function consumeBlockComments(ReaderInterface $reader)
                     $nextChar = $reader->forwardChar();
 
                     while (! $reader->isEof()) {
-
                         if ($nextChar === $endDelim[0]) {
-
                             for ($i = 1; $i <= strlen($endDelim); $i++) {
                                 $reader->forward();
                             }
@@ -203,21 +195,17 @@ protected function consumeBlockComments(ReaderInterface $reader)
 
                     // End of file reached and no end delimiter found, error
                     throw new ScannerException($reader, "Unterminated block comment");
-
                 } else {
 
                     // Start delimiter not found, rewind the looked up characters
                     $reader->rewind();
 
                     return false;
                 }
-
             }
-
         }
 
         return false;
-
     }
 
     /**
@@ -231,9 +219,7 @@ protected function consumeLineComments(ReaderInterface $reader)
     {
         $nextChar = $reader->currentChar();
         foreach ($this->context->getLineCommentDelimiters() as $delimiter) {
-
             if ($delimiter && $nextChar === $delimiter[0]) {
-
                 for ($i = 1; $i <= strlen($delimiter); $i++) {
                     $reader->forward();
                 }
@@ -249,15 +235,13 @@ protected function consumeLineComments(ReaderInterface $reader)
                     $this->addToken($reader, $token);
 
                     return true;
-
                 } else {
 
                     // Rewind the looked up characters
                     $reader->rewind();
 
                     return false;
                 }
-
             }
         }
 

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

@@ -38,5 +38,4 @@ public function __toString()
     {
         return sprintf("TOKEN(%s, '%s', %s, %s)", self::getTypeName($this->getType()), trim($this->data), $this->line, $this->row);
     }
-
 }

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

@@ -110,5 +110,4 @@ public function getRow()
     {
         return $this->row;
     }
-
 }

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

@@ -29,7 +29,6 @@ public function addFilter(TokenFilterInterface $filter)
     public function filter(Token $token)
     {
         foreach ($this->filters as $filter) {
-
             $token = $filter->filter($token);
 
             if (!$token) {