Merge pull request #85 from zvirusz/patch-2

Add a support for "not so simple" includes, resolves #60
goaop · Aug 15, 2013 · df96f1c · df96f1c
2 parents 98641c8 + c7cb794
commit df96f1c
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/src/Go/Instrument/Transformer/FilterInjectorTransformer.php b/src/Go/Instrument/Transformer/FilterInjectorTransformer.php
@@ -150,8 +150,15 @@ public function transform(StreamMetaData $metadata)
 
         $transformedSource = '';
         $isWaitingEnd      = false;
+        $openedBraces      = 0;
         foreach ($tokenStream as $token) {
-            if ($isWaitingEnd && ($token === ';' || $token === ',')) {
+            if ($isWaitingEnd && $token == '(') {
+                $openedBraces++;
+            } elseif ($isWaitingEnd && $token == ')') {
+                $openedBraces--;
+            }
+
+            if ($isWaitingEnd && $openedBraces == 0 && ($token === ';' || $token === ',')) {
                 $isWaitingEnd = false;
                 $transformedSource .= ', __DIR__)';
             }

diff --git a/tests/Go/Instrument/Transformer/FilterInjectorTransformerTest.php b/tests/Go/Instrument/Transformer/FilterInjectorTransformerTest.php
@@ -109,4 +109,11 @@ public function testCanRewriteRelativePathsWithFilter()
         $this->assertEquals($this->metadata->source, $output);
     }
 
+    public function testCanTransformWithBraces()
+    {
+        $this->metadata->source = file_get_contents(__DIR__ . '/_files/yii_style.php');
+        self::$transformer->transform($this->metadata);
+        $this->assertEquals($this->metadata->source, file_get_contents(__DIR__ . '/_files/yii_style_output.php'));
+    }
+
 }
diff --git a/tests/Go/Instrument/Transformer/_files/yii_style.php b/tests/Go/Instrument/Transformer/_files/yii_style.php
@@ -0,0 +1,6 @@
+<?php
+
+include($class->method('filename'));
+include_once($class->method('filename'));
+require($class->method('filename'));
+require_once($class->method('filename'));
diff --git a/tests/Go/Instrument/Transformer/_files/yii_style_output.php b/tests/Go/Instrument/Transformer/_files/yii_style_output.php
@@ -0,0 +1,6 @@
+<?php
+
+include \Go\Instrument\Transformer\FilterInjectorTransformer::rewrite(($class->method('filename')), __DIR__);
+include_once \Go\Instrument\Transformer\FilterInjectorTransformer::rewrite(($class->method('filename')), __DIR__);
+require \Go\Instrument\Transformer\FilterInjectorTransformer::rewrite(($class->method('filename')), __DIR__);
+require_once \Go\Instrument\Transformer\FilterInjectorTransformer::rewrite(($class->method('filename')), __DIR__);