Simplified some code

s9e · Jan 12, 2015 · d6e8a70 · d6e8a70
1 parent 0a04c87
commit d6e8a70
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/Passes/OptimizeControlStructures.php b/src/Passes/OptimizeControlStructures.php
@@ -95,14 +95,17 @@ protected function optimizeStructure(array $structure)
 			$this->optimizeStructures($structure['structures']);
 		}
 
+		if (!isset($structure['offsetRightBrace']))
+		{
+			return;
+		}
+
 		if ($structure['isIf'] || $structure['isElseif'])
 		{
 			$this->markPreservedBraces($structure['offsetRightBrace']);
 		}
 
-		if ($structure['statements'] <= 1
-		 && isset($structure['offsetRightBrace'])
-		 && !isset($this->preservedBraces[$structure['offsetRightBrace']]))
+		if ($structure['statements'] <= 1 && !isset($this->preservedBraces[$structure['offsetRightBrace']]))
 		{
 			if ($structure['isElse'])
 			{

diff --git a/src/TokenStream.php b/src/TokenStream.php
@@ -173,11 +173,11 @@ public function offsetUnset($offset)
 	/**
 	* Return the current token
 	*
-	* @return array|string|null
+	* @return array|string
 	*/
 	public function current()
 	{
-		return (isset($this->tokens[$this->offset])) ? $this->tokens[$this->offset] : null;
+		return $this->tokens[$this->offset];
 	}
 
 	/**