Updated dependencies + tests

Author: assertchris

composer.json

@@ -1,23 +1,26 @@
 {
+    "type": "pre-macro",
     "name": "pre/deferred",
     "license": "MIT",
     "require": {
-        "pre/plugin": "^0.6"
+        "pre/plugin": "^0.7.3"
     },
     "autoload": {
-        "files": [
-            "src/bootstrap.php"
-        ],
         "psr-4": {
             "Pre\\Deferred\\": "src"
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.0"
+        "phpunit/phpunit": "^5.0|^6.0"
     },
     "autoload-dev": {
         "psr-4": {
             "Pre\\Deferred\\": "tests"
         }
+    },
+    "extra": {
+        "macros": [
+            "src/macros.yay"
+        ]
     }
 }

src/bootstrap.php

@@ -31,7 +31,7 @@ macro ·recursion {
         $context = func_get_args();
 
         return function() use ($context) {
-            call_user_func_array(→(·function), $context);
+            call_user_func_array(··stringify(·function), $context);
         };
     }, ·parameters));
 }

src/macros.pre src/macros.yaysrc/macros.pre renamed to src/macros.yay

@@ -2,9 +2,9 @@
 
 namespace Pre\Deferred;
 
-use Pre\Testing\Runner;
+use Pre\Plugin\Testing\Runner;
 
-class SpecTest extends Runner
+class MacroTest extends Runner
 {
     protected function path(): string
     {

tests/SpecTest.php tests/MacroTest.phptests/SpecTest.php renamed to tests/MacroTest.php

@@ -1,14 +1,18 @@
 <?php
 
-namespace Yay;
+namespace
+{
+    require __DIR__ . "/../vendor/autoload.php";
 
-// let's use a namespace trick, to make non-colliding variables predictable.
+    putenv("PRE_BASE_DIR=" . __DIR__ . "/../");
 
-function md5($value)
-{
-    return $value;
+    Pre\Plugin\addMacroPath(__DIR__ . "/../src/macros.yay");
 }
 
-putenv("PRE_BASE_DIR=" . __DIR__ . "/..");
-
-require __DIR__ . "/../vendor/autoload.php";
+namespace Yay
+{
+    function md5($value)
+    {
+        return $value;
+    }
+}

tests/bootstrap.php

@@ -21,9 +21,9 @@ $deferred·0 = new \Pre\Deferred\Deferred(call_user_func(function () {
     };
 }, "path/to/file"));
 
-$deferred·2 = new \Pre\Deferred\Deferred(call_user_func(function ($context·2) {
-    return function () use ($context·2) {
-        extract($context·2);
+$deferred·1 = new \Pre\Deferred\Deferred(call_user_func(function ($context·1) {
+    return function () use ($context·1) {
+        extract($context·1);
         fclose($handle);
         print "all done";
     };