Handle alone variables

Author: kylekatarnls

examples/varname.js

@@ -0,0 +1 @@
+user

examples/varname.php

@@ -0,0 +1 @@
+$user;

phpunit.xml

@@ -1,19 +1,22 @@
 <phpunit
-	bootstrap="tests/bootstrap.php"
-	backupGlobals="false"
-	colors="true"
-	convertErrorsToExceptions="true"
-	convertNoticesToExceptions="true"
-	convertWarningsToExceptions="true"
-	>
-	<testsuites>
-		<testsuite name="Examples">
-			<file>tests/examples.php</file>
-		</testsuite>
-	</testsuites>
-	<filter>
-		<whitelist processUncoveredFilesFromWhitelist="true">
-			<directory suffix=".php">src</directory>
-		</whitelist>
-	</filter>
+    bootstrap="tests/bootstrap.php"
+    backupGlobals="false"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+    >
+    <testsuites>
+        <testsuite name="render">
+            <file>tests/render.php</file>
+        </testsuite>
+        <testsuite name="compile">
+            <file>tests/compile.php</file>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">src</directory>
+        </whitelist>
+    </filter>
 </phpunit>

src/JsPhpize/Parser/Visitor.php

@@ -19,7 +19,9 @@ protected function visitNumber($token)
     protected function visitVariable($token)
     {
         $variable = (substr($token->value, 0, 1) === '$' ? '' : '$') . $token->value;
-        $next = $this->current();
+        if (!($next = $this->current())) {
+            return $variable;
+        }
         if ($next->type === '(') {
             $this->skip();
 

tests/compile.php

@@ -0,0 +1,35 @@
+<?php
+
+use JsPhpize\JsPhpize;
+
+class CompileTest extends \PHPUnit_Framework_TestCase
+{
+    public function caseProvider()
+    {
+        $cases = array();
+
+        $examples = __DIR__ . '/../examples';
+        foreach (scandir($examples) as $file) {
+            if (substr($file, -4) === '.php') {
+                $cases[] = array($examples . '/' . $file, $examples . '/' . substr($file, 0, -4) . '.js');
+            }
+        }
+
+        return $cases;
+    }
+
+    /**
+     * @dataProvider caseProvider
+     */
+    public function testJsPhpizeGeneration($phpFile, $jsFile)
+    {
+        $jsPhpize = new JsPhpize();
+        $expected = file_get_contents($phpFile);
+        $result = $jsPhpize->compile($jsFile);
+
+        $expected = trim($expected);
+        $actual = trim($result);
+
+        $this->assertSame($expected, $actual, $jsFile . ' should compile into ' . $expected);
+    }
+}

tests/examples.php renamed to tests/render.php

@@ -2,16 +2,16 @@
 
 use JsPhpize\JsPhpize;
 
-class ExamplesTest extends \PHPUnit_Framework_TestCase
+class RenderTest extends \PHPUnit_Framework_TestCase
 {
     public function caseProvider()
     {
         $cases = array();
 
         $examples = __DIR__ . '/../examples';
         foreach (scandir($examples) as $file) {
-            if (substr($file, -3) === '.js') {
-                $cases[] = array($examples . '/' . substr($file, 0, -3) . '.return', $examples . '/' . $file);
+            if (substr($file, -7) === '.return') {
+                $cases[] = array($examples . '/' . $file, $examples . '/' . substr($file, 0, -7) . '.js');
             }
         }
 
@@ -30,6 +30,6 @@ public function testJsPhpizeGeneration($returnFile, $jsFile)
         $expected = trim($expected);
         $actual = trim($result);
 
-        $this->assertSame($expected, $actual, $jsFile . ' should return ' . $expected);
+        $this->assertSame($expected, $actual, $jsFile . ' should render ' . $expected);
     }
 }