Only store and process structures that use braces

src/Passes/OptimizeControlStructures.php

@@ -40,7 +40,11 @@ public function optimize(TokenStream $stream)
 		{
 			if ($this->isControlStructure())
 			{
-				$structures[] = $this->parseControlStructure();
+				$structure = $this->parseControlStructure();
+				if ($structure)
+				{
+					$structures[] = $structure;
+				}
 			}
 			$this->stream->next();
 		}
@@ -95,11 +99,6 @@ protected function optimizeStructure(array $structure)
 			$this->optimizeStructures($structure['structures']);
 		}
 
-		if (!isset($structure['offsetRightBrace']))
-		{
-			return;
-		}
-
 		if ($structure['isIf'] || $structure['isElseif'])
 		{
 			$this->markPreservedBraces($structure['offsetRightBrace']);
@@ -132,7 +131,7 @@ protected function optimizeStructures(array $structures)
 	/**
 	* Parse the control structure starting at current offset
 	*
-	* @return array
+	* @return array|false
 	*/
 	protected function parseControlStructure()
 	{
@@ -159,7 +158,7 @@ protected function parseControlStructure()
 
 		if ($this->stream->current() !== '{')
 		{
-			return $structure;
+			return false;
 		}
 
 		$braces = 0;
@@ -190,7 +189,11 @@ protected function parseControlStructure()
 					++$structure['statements'];
 				}
 
-				$structure['structures'][] = $this->parseControlStructure();
+				$innerStructure = $this->parseControlStructure();
+				if ($innerStructure)
+				{
+					$structure['structures'][] = $innerStructure;
+				}
 			}
 
 			$this->stream->next();