Merge remote-tracking branch 'origin/master'

kylekatarnls · kylekatarnls · commit 791e048d43b9 · 2017-06-13T10:20:49.000+02:00
# Conflicts:
#	src/JsPhpize/JsPhpizePhugFormatter.php
diff --git a/src/JsPhpize/JsPhpizePhugFormatter.php b/src/JsPhpize/JsPhpizePhugFormatter.php
@@ -31,7 +31,7 @@ public function injectFormatter(Formatter $formatter)
                     /** @var JsPhpize $jsPhpize */
                     $jsPhpize = $compiler->getOption('jsphpize_engine');
                     $pugModuleName = $formatter->getOption('dependencies_storage');
-                    $newCode = str_replace('$'.$pugModuleName, $pugModuleName, $jsCode);
+                    $newCode = str_replace('$' . $pugModuleName, $pugModuleName, $jsCode);
 
                     try {
                         return rtrim(trim(preg_replace(
diff --git a/tests/JsPhpize/JsPhpizePhugTest.php b/tests/JsPhpize/JsPhpizePhugTest.php
@@ -3,9 +3,7 @@
 namespace Tests\JsPhpize;
 
 use JsPhpize\JsPhpizePhug;
-use JsPhpize\JsPhpizePhugFormatter;
 use Phug\Compiler;
-use Phug\Formatter;
 
 class JsPhpizePhugTest extends \PHPUnit_Framework_TestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,7 @@`
`3`	`3`	`namespace Tests\JsPhpize;`
`4`	`4`
`5`	`5`	`use JsPhpize\JsPhpizePhug;`
`6`		`-use JsPhpize\JsPhpizePhugFormatter;`
`7`	`6`	`use Phug\Compiler;`
`8`		`-use Phug\Formatter;`
`9`	`7`
`10`	`8`	`class JsPhpizePhugTest extends \PHPUnit_Framework_TestCase`
`11`	`9`	`{`