Merge pull request #4 from preprocess/feature/update-plugin

Update plugin
preprocess · Oct 8, 2018 · 7012018 · 7012018
2 parents d7fc3b4 + b6e28db
commit 7012018
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 232 deletions.
diff --git a/composer.json b/composer.json
@@ -3,9 +3,7 @@
     "type": "pre-compiler",
     "license": "MIT",
     "require": {
-        "pre/plugin": "^0.11.0",
-        "nikic/php-parser": "^4.0",
-        "gajus/dindent": "^2.0"
+        "pre/plugin": "^0.11.3"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.0|^6.0"

diff --git a/composer.lock b/composer.lock
diff --git a/source/Parser.php b/source/Parser.php
@@ -3,21 +3,11 @@
 namespace Pre\Phpx;
 
 use Exception;
-use PhpParser\Error;
-use PhpParser\NodeDumper;
-use PhpParser\ParserFactory;
 
 class Parser
 {
     private $printer;
 
-    public function __construct($printer = null)
-    {
-        if (is_null($printer)) {
-            $this->printer = new Printer();
-        }
-    }
-
     public function tokens($code)
     {
         $tokens = [];
@@ -353,15 +343,7 @@ public function translate($nodes, $quoteLiterals = false, $combineChildren = fal
 
     public function format($code)
     {
-        $parser = (new ParserFactory())->create(ParserFactory::PREFER_PHP7);
-
-        try {
-            $parsed = $parser->parse($code);
-        } catch (Exception $e) {
-            // can't format, but we can still return...
-            return $code;
-        }
-
-        return $this->printer->prettyPrintFile($parsed);
+        // left to avoid a version bump
+        return $code;
     }
 }
diff --git a/source/Printer.php b/source/Printer.php
diff --git a/tests/CompileTest.php b/tests/CompileTest.php
@@ -13,15 +13,15 @@ public function test_can_compile()
     {
         $this->assertEquals(
             $this->fixtureCode("compile/can-compile", "php"),
-            \Pre\Phpx\compile($this->fixtureCode("compile/can-compile", "pre"))
+            \Pre\Plugin\format(\Pre\Phpx\compile($this->fixtureCode("compile/can-compile", "pre")))
         );
     }
 
     public function test_supports_nested_component_names()
     {
         $this->assertEquals(
             $this->fixtureCode("compile/supports-nested-component-names", "php"),
-            \Pre\Phpx\compile($this->fixtureCode("compile/supports-nested-component-names", "pre"))
+            \Pre\Plugin\format(\Pre\Phpx\compile($this->fixtureCode("compile/supports-nested-component-names", "pre")))
         );
     }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -11,7 +11,7 @@ protected function parser()
 
     protected function fixtureCode($path, $extension = "txt")
     {
-        return trim(file_get_contents(__DIR__ . "/fixtures/{$path}.{$extension}"));
+        return file_get_contents(__DIR__ . "/fixtures/{$path}.{$extension}");
     }
 
     protected function fixtureData($path, $extension = "php")

diff --git a/tests/fixtures/compile/can-compile.php b/tests/fixtures/compile/can-compile.php
@@ -7,17 +7,17 @@ function Error($props)
         "render" => function ($error) {
             return render("span", [
                 "className" => "error",
-                "children" => $error,
+                "children" => $error
             ]);
         },
         "children" => [
             render("span", [
-                "className" => "icon",
+                "className" => "icon"
             ]),
             "You forgot the",
             $props->name,
-            "field",
-        ],
+            "field"
+        ]
     ]);
 }
 
@@ -26,15 +26,15 @@ function ErrorRenderer($props)
     return render("Error", [
         "children" => function ($error) {
             return render("span", [
-                "children" => $error,
+                "children" => $error
             ]);
-        },
+        }
     ]);
 }
 
 function InputRenderer($props)
 {
     return render("input", [
-        "type" => $props->type,
+        "type" => $props->type
     ]);
 }
diff --git a/tests/fixtures/compile/supports-nested-component-names.php b/tests/fixtures/compile/supports-nested-component-names.php
@@ -1,21 +1,19 @@
 <?php
 
-namespace Example
-{
+namespace Example {
     function MyComponent()
     {
         return render("div", [
-            "children" => "hello world",
+            "children" => "hello world"
         ]);
     }
 }
 
-namespace
-{
+namespace {
     function render($name, $props = null)
     {
         print $name;
     }
-    
-    print render("Example\\MyComponent", []);
+
+    print render("Example\MyComponent", []);
 }
diff --git a/tests/fixtures/nodes/can-arrange-nodes.php b/tests/fixtures/nodes/can-arrange-nodes.php
@@ -16,7 +16,7 @@ function Error(\$props) {
             [
                 [
                     "type" => "literal",
-                    "value" => "\$error ⇒",
+                    "value" => "\$error ~>",
                 ],
                 [
                     "type" => "tag",
@@ -38,11 +38,11 @@ function Error(\$props) {
                                     "value" => "\$error",
                                 ],
                             ],
-                            "started" => 37,
+                            "started" => 36,
                         ],
                     ],
                     "name" => "span",
-                    "started" => 30,
+                    "started" => 29,
                 ],
             ],
         ],

diff --git a/tests/fixtures/nodes/can-arrange-nodes.txt b/tests/fixtures/nodes/can-arrange-nodes.txt
@@ -1,6 +1,6 @@
 function Error($props) {
     return (
-        <div render={$error ⇒ <span className={"error"}>{$error}</span>}>
+        <div render={$error ~> <span className={"error"}>{$error}</span>}>
             You forgot the {$props->name} field
         </div>
     );