OptimizeControlStructures: always mark braces that need to be preserved

src/Passes/OptimizeControlStructures.php

@@ -95,6 +95,11 @@ protected function optimizeStructure(array $structure)
 			$this->optimizeStructures($structure['structures']);
 		}
 
+		if ($structure['isIf'] || $structure['isElseif'])
+		{
+			$this->markPreservedBraces($structure['offsetRightBrace']);
+		}
+
 		if ($structure['statements'] <= 1
 		 && isset($structure['offsetRightBrace'])
 		 && !isset($this->preservedBraces[$structure['offsetRightBrace']]))
@@ -237,11 +242,6 @@ protected function markPreservedBraces($offset)
 	*/
 	protected function removeBraces(array $structure)
 	{
-		if ($structure['isIf'] || $structure['isElseif'])
-		{
-			$this->markPreservedBraces($structure['offsetRightBrace']);
-		}
-
 		// Replace the opening brace with a semicolon if the control structure is empty, remove the
 		// brace if possible or replace it with whitespace otherwise (e.g. in "else foreach")
 		$this->stream->seek($structure['offsetLeftBrace']);

src/TokenStream.php

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

tests/Passes/OptimizeControlStructures/033.optimized.php

@@ -0,0 +1,11 @@
+<?php
+if (1)
+{
+	if (0)
+	{
+		echo __LINE__, "\n";
+		echo __LINE__, "\n";
+	}
+}
+else
+	echo __LINE__, "\n";

tests/Passes/OptimizeControlStructures/033.original.php

@@ -0,0 +1,13 @@
+<?php
+if (1)
+{
+	if (0)
+	{
+		echo __LINE__, "\n";
+		echo __LINE__, "\n";
+	}
+}
+else
+{
+	echo __LINE__, "\n";
+}