From 193da246b01c8ad302a1924e23bc4a8089302856 Mon Sep 17 00:00:00 2001
From: Christopher Pitt <cgpitt@gmail.com>
Date: Sat, 28 Oct 2017 23:21:16 +0300
Subject: [PATCH 1/2] Refactor for new plugin

---
 composer.json                             | 22 +++++++-----
 phpunit.xml                               |  2 +-
 {src => source}/ImmutableClassesTrait.php |  0
 {src => source}/macros.yay                |  0
 tests/MacroTest.php                       | 42 ++++++++++++++++++++---
 tests/bootstrap.php                       | 18 ----------
 tests/specs/fallbacks.spec                |  8 +----
 tests/specs/immutability.spec             | 10 ++----
 tests/stubs.php                           |  9 +++++
 9 files changed, 63 insertions(+), 48 deletions(-)
 rename {src => source}/ImmutableClassesTrait.php (100%)
 rename {src => source}/macros.yay (100%)
 delete mode 100644 tests/bootstrap.php
 create mode 100644 tests/stubs.php

diff --git a/composer.json b/composer.json
index db60c7c..b7d70c2 100644
--- a/composer.json
+++ b/composer.json
@@ -2,25 +2,29 @@
     "type": "pre-macro",
     "name": "pre/immutable-classes",
     "license": "MIT",
+    "repositories": [
+        {
+            "type": "path",
+            "url": "../pre-plugin"
+        }
+    ],
     "require": {
-        "pre/plugin": "^0.7.3"
+        "pre/plugin": "*"
     },
     "autoload": {
         "psr-4": {
-            "Pre\\ImmutableClasses\\": "src"
+            "Pre\\ImmutableClasses\\": "source"
         }
     },
     "require-dev": {
         "phpunit/phpunit": "^5.0|^6.0"
     },
     "autoload-dev": {
-        "psr-4": {
-            "Pre\\ImmutableClasses\\": "tests"
-        }
+        "files": ["tests/stubs.php"]
     },
     "extra": {
-        "macros": [
-            "src/macros.yay"
-        ]
-    }
+        "macros": ["source/macros.yay"]
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }
diff --git a/phpunit.xml b/phpunit.xml
index 829414b..5543800 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -2,7 +2,7 @@
 <phpunit
     backupGlobals="false"
     backupStaticAttributes="false"
-    bootstrap="tests/bootstrap.php"
+    bootstrap="vendor/autoload.php"
     colors="true"
     convertErrorsToExceptions="true"
     convertNoticesToExceptions="true"
diff --git a/src/ImmutableClassesTrait.php b/source/ImmutableClassesTrait.php
similarity index 100%
rename from src/ImmutableClassesTrait.php
rename to source/ImmutableClassesTrait.php
diff --git a/src/macros.yay b/source/macros.yay
similarity index 100%
rename from src/macros.yay
rename to source/macros.yay
diff --git a/tests/MacroTest.php b/tests/MacroTest.php
index 7d0dd65..4f3ffe7 100644
--- a/tests/MacroTest.php
+++ b/tests/MacroTest.php
@@ -1,13 +1,45 @@
 <?php
 
-namespace Pre\ImmutableClasses;
+use PHPUnit\Framework\TestCase;
 
-use Pre\Plugin\Testing\Runner;
+putenv("PRE_BASE_DIR=" . realpath(__DIR__ . "/../"));
 
-class MacroTest extends Runner
+class MacroTest extends TestCase
 {
-    protected function path(): string
+    /**
+     * @test
+     * @dataProvider specs
+     */
+    public function can_transform_code($from, $expected)
     {
-        return __DIR__ . "/specs";
+        Pre\Plugin\addMacro(__DIR__ . "/../source/macros.yay");
+
+        $actual = Pre\plugin\format(Pre\Plugin\parse($this->format($from)));
+        $this->assertEquals($this->format($expected), $actual);
+    }
+
+    private function format($code)
+    {
+        return "<?php\n\n" . trim($code) . "\n";
+    }
+
+    public static function specs()
+    {
+        $specs = [];
+
+        $files = [
+            __DIR__ . "/specs/fallbacks.spec",
+            __DIR__ . "/specs/immutability.spec",
+        ];
+
+        foreach ($files as $file) {
+            $contents = file_get_contents($file);
+            
+            foreach (explode("---", $contents) as $spec) {
+                array_push($specs, explode("~~~", $spec));
+            }
+        }
+
+        return $specs;
     }
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index e45a934..0000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace
-{
-    require __DIR__ . "/../vendor/autoload.php";
-
-    putenv("PRE_BASE_DIR=" . __DIR__ . "/../");
-
-    Pre\Plugin\addMacroPath(__DIR__ . "/../src/macros.yay");
-}
-
-namespace Yay
-{
-    function md5($value)
-    {
-        return $value;
-    }
-}
diff --git a/tests/specs/fallbacks.spec b/tests/specs/fallbacks.spec
index 05c8db3..958ae5f 100644
--- a/tests/specs/fallbacks.spec
+++ b/tests/specs/fallbacks.spec
@@ -1,9 +1,3 @@
---DESCRIPTION--
-
-Test immutability fallbacks
-
---GIVEN--
-
 immutable class MyImmutableClass
 {
     public function __call($method, $parameters)
@@ -14,7 +8,7 @@ immutable class MyImmutableClass
     }
 }
 
---EXPECT--
+~~~
 
 class MyImmutableClass
 {
diff --git a/tests/specs/immutability.spec b/tests/specs/immutability.spec
index f37894e..53b3ef7 100644
--- a/tests/specs/immutability.spec
+++ b/tests/specs/immutability.spec
@@ -1,15 +1,9 @@
---DESCRIPTION--
-
-Test immutability
-
---GIVEN--
-
 immutable class MyImmutableClass
 {
-    // nothign to see here
+    // nothing to see here
 }
 
---EXPECT--
+~~~
 
 class MyImmutableClass
 {
diff --git a/tests/stubs.php b/tests/stubs.php
new file mode 100644
index 0000000..d714f68
--- /dev/null
+++ b/tests/stubs.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Yay
+{
+    function md5($foo)
+    {
+        return $foo;
+    }
+}

From 5646d98bd6222991c4844af46fa93a4d7ba698f8 Mon Sep 17 00:00:00 2001
From: Christopher Pitt <cgpitt@gmail.com>
Date: Sun, 29 Oct 2017 00:09:12 +0300
Subject: [PATCH 2/2] Use tagged plugin

---
 composer.json              | 15 ++-------------
 source/macros.yay          |  2 +-
 tests/MacroTest.php        |  2 --
 tests/specs/fallbacks.spec |  4 ++--
 tests/stubs.php            |  9 ---------
 5 files changed, 5 insertions(+), 27 deletions(-)
 delete mode 100644 tests/stubs.php

diff --git a/composer.json b/composer.json
index b7d70c2..d3acb55 100644
--- a/composer.json
+++ b/composer.json
@@ -2,14 +2,8 @@
     "type": "pre-macro",
     "name": "pre/immutable-classes",
     "license": "MIT",
-    "repositories": [
-        {
-            "type": "path",
-            "url": "../pre-plugin"
-        }
-    ],
     "require": {
-        "pre/plugin": "*"
+        "pre/plugin": "^0.10.0"
     },
     "autoload": {
         "psr-4": {
@@ -19,12 +13,7 @@
     "require-dev": {
         "phpunit/phpunit": "^5.0|^6.0"
     },
-    "autoload-dev": {
-        "files": ["tests/stubs.php"]
-    },
     "extra": {
         "macros": ["source/macros.yay"]
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
+    }
 }
diff --git a/source/macros.yay b/source/macros.yay
index df002f7..3e02d15 100644
--- a/source/macros.yay
+++ b/source/macros.yay
@@ -12,7 +12,7 @@ macro {
     }
 }
 
-macro {
+macro ·unsafe {
     function __call(···parameters) {
         immutability;
         ···body
diff --git a/tests/MacroTest.php b/tests/MacroTest.php
index 4f3ffe7..6e52754 100644
--- a/tests/MacroTest.php
+++ b/tests/MacroTest.php
@@ -2,8 +2,6 @@
 
 use PHPUnit\Framework\TestCase;
 
-putenv("PRE_BASE_DIR=" . realpath(__DIR__ . "/../"));
-
 class MacroTest extends TestCase
 {
     /**
diff --git a/tests/specs/fallbacks.spec b/tests/specs/fallbacks.spec
index 958ae5f..60faf50 100644
--- a/tests/specs/fallbacks.spec
+++ b/tests/specs/fallbacks.spec
@@ -16,8 +16,8 @@ class MyImmutableClass
 
     public function __call($method, $parameters)
     {
-        if ($result·1 = $this->handleCallImmutableClassSetters($method, $parameters)) {
-            return $result·1;
+        if ($result = $this->handleCallImmutableClassSetters($method, $parameters)) {
+            return $result;
         }
 
         print "fallback";
diff --git a/tests/stubs.php b/tests/stubs.php
deleted file mode 100644
index d714f68..0000000
--- a/tests/stubs.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Yay
-{
-    function md5($foo)
-    {
-        return $foo;
-    }
-}