Drop compileWithoutDependencies and handle catchDependencies as an option

Author: kylekatarnls

src/JsPhpize/Compiler/Compiler.php

@@ -267,7 +267,6 @@ protected function visitVariable(Variable $variable, $indent)
     public function compile(Block $block, $indent = '')
     {
         $output = '';
-        $line = array();
 
         foreach ($block->instructions as $instruction) {
             $output .= $this->visitNode($instruction, $indent);

src/JsPhpize/JsPhpize.php

@@ -38,11 +38,10 @@ class JsPhpize extends JsPhpizeOptions
      *
      * @param string $input             file or content
      * @param string $filename          if specified, input is used as content and filename as its name
-     * @param bool   $catchDependencies if true, dependencies are not compiled and can be grouped and get separatly
      *
      * @return string
      */
-    public function compile($input, $filename = null, $catchDependencies = false)
+    public function compile($input, $filename = null)
     {
         if ($filename === null) {
             $filename = file_exists($input) ? $input : null;
@@ -54,7 +53,7 @@ public function compile($input, $filename = null, $catchDependencies = false)
         $php = $compiler->compile($block);
 
         $dependencies = $compiler->getDependencies();
-        if ($catchDependencies) {
+        if ($this->getOption('catchDependencies')) {
             $this->dependencies = $dependencies;
             $dependencies = array();
         }
@@ -67,39 +66,24 @@ public function compile($input, $filename = null, $catchDependencies = false)
      * Compile a file.
      *
      * @param string $file              input file
-     * @param bool   $catchDependencies if true, dependencies are not compiled and can be grouped and get separatly
      *
      * @return string
      */
-    public function compileFile($file, $catchDependencies = false)
+    public function compileFile($file)
     {
-        return $this->compile(file_get_contents($file), $file, $catchDependencies);
+        return $this->compile(file_get_contents($file), $file);
     }
 
     /**
      * Compile raw code.
      *
      * @param string $code              input code
-     * @param bool   $catchDependencies if true, dependencies are not compiled and can be grouped and get separatly
      *
      * @return string
      */
-    public function compileCode($code, $catchDependencies = false)
+    public function compileCode($code)
     {
-        return $this->compile($code, 'source.js', $catchDependencies);
-    }
-
-    /**
-     * Compile without the dependencies.
-     *
-     * @param string $input    file or content
-     * @param string $filename if specified, input is used as content and filename as its name
-     *
-     * @return string
-     */
-    public function compileWithoutDependencies($input, $filename = null)
-    {
-        return $this->compile($input, $filename, true);
+        return $this->compile($code, 'source.js');
     }
 
     /**

tests/compile.php

@@ -36,8 +36,10 @@ public function testJsPhpizeGeneration($phpFile, $jsFile)
 
     public function testCompileWithoutDependencies()
     {
-        $jsPhpize = new JsPhpize();
-        $result = $jsPhpize->compileWithoutDependencies('4 + 5');
+        $jsPhpize = new JsPhpize(array(
+            'catchDependencies' => true,
+        ));
+        $result = $jsPhpize->compileCode('4 + 5');
 
         $expected = str_replace("\r", '', trim("call_user_func(\$GLOBALS['__jpv_plus'], 4, 5);"));
         $actual = str_replace("\r", '', trim($result));

tests/mainMethods.php

@@ -20,7 +20,10 @@ public function testCompileFile()
         $this->assertSame($expected, $actual);
         $this->assertSame('', $jsPhpize->compileDependencies());
 
-        $actual = $jsPhpize->compileFile(__DIR__ . '/../examples/basic.js', true);
+        $jsPhpizeCatchDeps = new JsPhpize(array(
+            'catchDependencies' => true,
+        ));
+        $actual = $jsPhpizeCatchDeps->compileFile(__DIR__ . '/../examples/basic.js');
         $expected = <<<'EOD'
 $foo = array( 'bar' => array( "baz" => "hello" ) );
 $biz = 'bar';
@@ -30,16 +33,16 @@ public function testCompileFile()
         $expected = preg_replace('/\s/', '', $expected);
         $this->assertSame($expected, $actual);
 
-        $actual = $jsPhpize->compileDependencies();
+        $actual = $jsPhpizeCatchDeps->compileDependencies();
         $expected = '$GLOBALS[\'__jpv_dot\'] = ' . file_get_contents(__DIR__ . '/../src/JsPhpize/Compiler/Helpers/Dot.h') . ';';
         $expected .= '$GLOBALS[\'__jpv_plus\'] = ' . file_get_contents(__DIR__ . '/../src/JsPhpize/Compiler/Helpers/Plus.h') . ';';
 
         $actual = preg_replace('/\s/', '', $actual);
         $expected = preg_replace('/\s/', '', $expected);
         $this->assertSame($expected, $actual);
 
-        $jsPhpize->compileFile(__DIR__ . '/../examples/calcul.js', true);
-        $actual = $jsPhpize->compileDependencies();
+        $jsPhpizeCatchDeps->compileFile(__DIR__ . '/../examples/calcul.js');
+        $actual = $jsPhpizeCatchDeps->compileDependencies();
         $expected = '$GLOBALS[\'__jpv_plus\'] = ' . file_get_contents(__DIR__ . '/../src/JsPhpize/Compiler/Helpers/Plus.h') . ';';
         $actual = preg_replace('/\s/', '', $actual);
         $expected = preg_replace('/\s/', '', $expected);