donatj / printf-parser

src/Parser.php

Spacing +21 added lines, -21 removed lines

@@ -14,16 +14,16 @@ 
 	 *
 	 * @param Emitter $emitter
 	 */
-	public function __construct( Emitter $emitter ) {
+	public function __construct(Emitter $emitter) {
 		$this->emitter = $emitter;
 	}
 
-	public function parseStr( string $string ) : void {
+	public function parseStr(string $string) : void {
 		$lexer = new StringLexer($string);
 
-		while( ($next = $lexer->next()) && !$next->isEof() ) {
-			if( $next->getString() === '%' ) {
-				if( $lexer->hasPrefix('%') ) {
+		while (($next = $lexer->next()) && !$next->isEof()) {
+			if ($next->getString() === '%') {
+				if ($lexer->hasPrefix('%')) {
 					$this->emitter->emit(
 						new Lexeme(Lexeme::T_LITERAL_STRING, '%', $lexer->pos())
 					);
@@ -42,11 +42,11 @@ 
 		}
 	}
 
-	private function lexString( Emitter $emitter, StringLexer $lexer ) : void {
+	private function lexString(Emitter $emitter, StringLexer $lexer) : void {
 		$pos    = $lexer->pos();
 		$buffer = '';
-		while( ($next = $lexer->next()) && !$next->isEof() ) {
-			if( $next->getString() === '%' ) {
+		while (($next = $lexer->next()) && !$next->isEof()) {
+			if ($next->getString() === '%') {
 				$lexer->rewind();
 				break;
 			}
@@ -59,7 +59,7 @@ 
 		);
 	}
 
-	private function lexSprintf( Emitter $emitter, StringLexer $lexer ) : void {
+	private function lexSprintf(Emitter $emitter, StringLexer $lexer) : void {
 		$pos  = $lexer->pos();
 		$next = $lexer->next();
 
@@ -70,17 +70,17 @@ 
 		$leftJustified = null;
 		$precision     = null;
 
-		if( $next->getString() !== '0' && ctype_digit($next->getString()) ) {
+		if ($next->getString() !== '0' && ctype_digit($next->getString())) {
 			$lexer->rewind();
 			$int = $this->eatInt($lexer);
-			if( $lexer->hasPrefix('$') ) {
+			if ($lexer->hasPrefix('$')) {
 				$lexer->next();
 				$next = $lexer->next();
 				$arg  = $int;
 			}
 		}
 
-		switch( $next->getString() ) {
+		switch ($next->getString()) {
 			case '0':
 				$padChar = '0';
 				$next    = $lexer->next();
@@ -95,23 +95,23 @@ 
 				$next    = $lexer->next();
 		}
 
-		if( $next->getString() === '-' ) {
+		if ($next->getString() === '-') {
 			$leftJustified = true;
 			$next          = $lexer->next();
 		}
 
-		if( $padChar !== null ) {
+		if ($padChar !== null) {
 			$lexer->rewind();
 			$peek = $lexer->peek();
-			if( ctype_digit($peek->getString()) ) {
+			if (ctype_digit($peek->getString())) {
 				$padWidth = $this->eatInt($lexer);
 			}
 
 			$next = $lexer->next();
 		}
 
-		if( $next->getString() === '.' ) {
-			if( ctype_digit($lexer->peek()->getString()) ) {
+		if ($next->getString() === '.') {
+			if (ctype_digit($lexer->peek()->getString())) {
 				$precision = $this->eatInt($lexer);
 			}
 
@@ -119,7 +119,7 @@ 
 		}
 
 		$tType = Lexeme::T_INVALID;
-		if( isset(PrintfLexeme::CHAR_MAP[$next->getString()]) ) {
+		if (isset(PrintfLexeme::CHAR_MAP[$next->getString()])) {
 			$tType = PrintfLexeme::CHAR_MAP[$next->getString()];
 		}
 
@@ -140,10 +140,10 @@ 
 		);
 	}
 
-	private function eatInt( StringLexer $lexer ) : string {
+	private function eatInt(StringLexer $lexer) : string {
 		$int = '';
-		while( ($next = $lexer->next()) && !$next->isEof() ) {
-			if( !ctype_digit($next->getString()) ) {
+		while (($next = $lexer->next()) && !$next->isEof()) {
+			if (!ctype_digit($next->getString())) {
 				$lexer->rewind();
 				break;
 			}

src/PrintfLexeme.php

Spacing +4 added lines, -4 removed lines

@@ -42,7 +42,7 @@ 
 	public const ARG_TYPE_STRING  = 'string';
 
 	/** @var int[] string    s */
-	public const STRING_TYPES = [ self::T_STRING ];
+	public const STRING_TYPES = [self::T_STRING];
 
 	/** @var int[] integer    d, u, c, o, x, X, b */
 	public const INTEGER_TYPES = [
@@ -112,15 +112,15 @@ 
 	 *   PrintfLexeme::ARG_TYPE_STRING
 	 */
 	public function argType() : string {
-		if( in_array($this->lexItemType, self::INTEGER_TYPES, true) ) {
+		if (in_array($this->lexItemType, self::INTEGER_TYPES, true)) {
 			return self::ARG_TYPE_INT;
 		}
 
-		if( in_array($this->lexItemType, self::DOUBLE_TYPES, true) ) {
+		if (in_array($this->lexItemType, self::DOUBLE_TYPES, true)) {
 			return self::ARG_TYPE_DOUBLE;
 		}
 
-		if( in_array($this->lexItemType, self::STRING_TYPES, true) ) {
+		if (in_array($this->lexItemType, self::STRING_TYPES, true)) {
 			return self::ARG_TYPE_STRING;
 		}
 

src/LexemeEmitter.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 	/**
 	 * @internal This is for use by the Parser
 	 */
-	public function emit( Lexeme $lexItem ) {
+	public function emit(Lexeme $lexItem) {
 		$this->lexemes[] = $lexItem;
 	}
 

src/StringLexer.php

Spacing +5 added lines, -5 removed lines

@@ -14,11 +14,11 @@ 
 	/**
 	 * StringScanner constructor.
 	 */
-	public function __construct( string $string ) {
+	public function __construct(string $string) {
 		$this->string = $string;
 	}
 
-	public function peek( $size = 1 ) : CharData {
+	public function peek($size = 1) : CharData {
 		$str = substr($this->string, $this->pos, $size);
 
 		return new CharData($str, strlen($str) < $size);
@@ -38,19 +38,19 @@ 
 
 	public function rewind() : void {
 		$this->pos--;
-		if( $this->pos < 0 ) {
+		if ($this->pos < 0) {
 			//@todo custom exception
 			throw new \RuntimeException('cannot rewind');
 		}
 	}
 
-	public function hasPrefix( string $prefix ) : bool {
+	public function hasPrefix(string $prefix) : bool {
 		$peek = $this->peek(strlen($prefix));
 
 		return $peek->getString() === $prefix;
 	}
 
-	public function substr( $start, $length ) : string {
+	public function substr($start, $length) : string {
 		return substr($this->string, $start, $length);
 	}
 }

src/Lexeme.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 	/**
 	 * LexItem constructor.
 	 */
-	public function __construct( string $lexItemType, string $val, int $pos ) {
+	public function __construct(string $lexItemType, string $val, int $pos) {
 		$this->lexItemType = $lexItemType;
 		$this->val         = $val;
 		$this->pos         = $pos;

src/CharData.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 	 */
 	private $eof;
 
-	public function __construct( string $string, bool $eof ) {
+	public function __construct(string $string, bool $eof) {
 		$this->string = $string;
 		$this->eof    = $eof;
 	}

src/Emitter.php

Spacing +1 added lines, -1 removed lines

@@ -7,5 +7,5 @@
 	/**
 	 * @internal This is for use by the Parser
 	 */
-	public function emit( Lexeme $lexItem );
+	public function emit(Lexeme $lexItem);
 }

src/LexemeCollection.php

Spacing +11 added lines, -11 removed lines

@@ -12,7 +12,7 @@ 
 	/**
 	 * LexemeCollection constructor.
 	 */
-	public function __construct( Lexeme ...$lexItems ) {
+	public function __construct(Lexeme ...$lexItems) {
 		$this->lexItems = $lexItems;
 	}
 
@@ -20,8 +20,8 @@ 
 	 * Retrieve the first invalid Lexeme or null if all are valid.
 	 */
 	public function getInvalid() : ?Lexeme {
-		foreach( $this->lexItems as $lexItem ) {
-			if( $lexItem->getLexItemType() === Lexeme::T_INVALID ) {
+		foreach ($this->lexItems as $lexItem) {
+			if ($lexItem->getLexItemType() === Lexeme::T_INVALID) {
 				return $lexItem;
 			}
 		}
@@ -29,23 +29,23 @@ 
 		return null;
 	}
 
-	public function offsetSet( $offset, $value ) {
-		if( $offset === null ) {
+	public function offsetSet($offset, $value) {
+		if ($offset === null) {
 			$this->lexItems[] = $value;
 		} else {
 			$this->lexItems[$offset] = $value;
 		}
 	}
 
-	public function offsetExists( $offset ) {
+	public function offsetExists($offset) {
 		return isset($this->lexItems[$offset]);
 	}
 
-	public function offsetUnset( $offset ) {
+	public function offsetUnset($offset) {
 		unset($this->lexItems[$offset]);
 	}
 
-	public function offsetGet( $offset ) {
+	public function offsetGet($offset) {
 		return isset($this->lexItems[$offset]) ? $this->lexItems[$offset] : null;
 	}
 
@@ -73,11 +73,11 @@ 
 	public function argTypes() : array {
 		$noNumInc = 1;
 		$args     = [];
-		foreach( $this->lexItems as $item ) {
-			if( $item instanceof PrintfLexeme ) {
+		foreach ($this->lexItems as $item) {
+			if ($item instanceof PrintfLexeme) {
 				$type = $item->argType();
 
-				if( $item->getArg() !== null ) {
+				if ($item->getArg() !== null) {
 					$args[$item->getArg()] = $type;
 				} else {
 					$args[$noNumInc] = $type;