MinifyVars: ignore static properties

s9e · May 27, 2015 · 3040e10 · 3040e10
1 parent 3114251
commit 3040e10
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 10 deletions.
diff --git a/bin/source-optimizer b/bin/source-optimizer
@@ -620,12 +620,23 @@ class MinifyVars extends Pass
 	{
 		$this->resetNames();
 		$this->stream->seek($startOffset);
-		while($this->stream->skipTo(\T_VARIABLE)&&$this->stream->key()<=$endOffset)
+		while($this->stream->valid()&&$this->stream->key()<=$endOffset)
 		{
-			$varName=$this->stream->currentText();
-			if(!isset($this->varNames[$varName]))
-				$this->varNames[$varName]=$this->getName($varName);
-			$this->stream->replace([\T_VARIABLE,$this->varNames[$varName]]);
+			if($this->stream->is(\T_DOUBLE_COLON))
+			{
+				$this->stream->next();
+				$this->stream->skipNoise();
+				$this->stream->next();
+				continue;
+			}
+			if($this->stream->is(\T_VARIABLE))
+			{
+				$varName=$this->stream->currentText();
+				if(!isset($this->varNames[$varName]))
+					$this->varNames[$varName]=$this->getName($varName);
+				$this->stream->replace([\T_VARIABLE,$this->varNames[$varName]]);
+			}
+			$this->stream->next();
 		}
 	}
 	protected function resetNames()

diff --git a/src/Passes/MinifyVars.php b/src/Passes/MinifyVars.php
@@ -99,14 +99,26 @@ protected function optimizeBlock($startOffset, $endOffset)
 	{
 		$this->resetNames();
 		$this->stream->seek($startOffset);
-		while ($this->stream->skipTo(T_VARIABLE) && $this->stream->key() <= $endOffset)
+		while ($this->stream->valid() && $this->stream->key() <= $endOffset)
 		{
-			$varName = $this->stream->currentText();
-			if (!isset($this->varNames[$varName]))
+			// Skip the next significant token after a double colon, e.g. foo::$bar
+			if ($this->stream->is(T_DOUBLE_COLON))
 			{
-				$this->varNames[$varName] = $this->getName($varName);
+				$this->stream->next();
+				$this->stream->skipNoise();
+				$this->stream->next();
+				continue;
 			}
-			$this->stream->replace([T_VARIABLE, $this->varNames[$varName]]);
+			if ($this->stream->is(T_VARIABLE))
+			{
+				$varName = $this->stream->currentText();
+				if (!isset($this->varNames[$varName]))
+				{
+					$this->varNames[$varName] = $this->getName($varName);
+				}
+				$this->stream->replace([T_VARIABLE, $this->varNames[$varName]]);
+			}
+			$this->stream->next();
 		}
 	}
 

diff --git a/tests/Passes/MinifyVars/005.optimized.php b/tests/Passes/MinifyVars/005.optimized.php
@@ -0,0 +1,13 @@
+<?php
+
+class foo
+{
+	public static $bar = 'bar';
+}
+
+function bar()
+{
+	echo foo::$bar;
+}
+
+bar();
diff --git a/tests/Passes/MinifyVars/005.original.php b/tests/Passes/MinifyVars/005.original.php
@@ -0,0 +1,13 @@
+<?php
+
+class foo
+{
+	public static $bar = 'bar';
+}
+
+function bar()
+{
+	echo foo::$bar;
+}
+
+bar();