Merge pull request #2 from preprocess/develop

The great refactoring!
preprocess · May 13, 2017 · 43a44af · 43a44af
2 parents 8ff745f + 9ce8a11
commit 43a44af
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 23 deletions.
diff --git a/composer.json b/composer.json
@@ -1,24 +1,29 @@
 {
+    "type": "pre-macro",
     "name": "pre/class-accessors",
     "license": "MIT",
     "require": {
-        "pre/plugin": "^0.6"
+        "pre/plugin": "^0.7"
     },
     "autoload": {
         "files": [
-            "src/bootstrap.php",
             "src/expanders.php"
         ],
         "psr-4": {
             "Pre\\ClassAccessors\\": "src"
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.0"
+        "phpunit/phpunit": "^5.0|^6.0"
     },
     "autoload-dev": {
         "psr-4": {
             "Pre\\ClassAccessors\\": "tests"
         }
+    },
+    "extra": {
+        "macros": [
+            "src/macros.yay"
+        ]
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
@@ -9,7 +9,8 @@
     convertWarningsToExceptions="false"
     processIsolation="false"
     stopOnFailure="false"
-    syntaxCheck="false">
+    syntaxCheck="false"
+>
     <testsuites>
         <testsuite>
             <directory suffix="Test.php">tests</directory>

diff --git a/readme.md b/readme.md
@@ -1,9 +1,3 @@
 # Pre Class Accessors
 
 Documentation can be found at [preprocess.io](https://preprocess.io/docs#class-accessors).
-
-## Versioning
-
-This library follows [Semver](http://semver.org). According to Semver, you will be able to upgrade to any minor or patch version of this library without any breaking changes to the public API. Semver also requires that we clearly define the public API for this library.
-
-All methods, with `public` visibility, are part of the public API. All other methods are not part of the public API. Where possible, we'll try to keep `protected` methods backwards-compatible in minor/patch versions, but if you're overriding methods then please test your work before upgrading.
diff --git a/src/bootstrap.php b/src/bootstrap.php
diff --git a/src/expanders.php b/src/expanders.php
@@ -3,16 +3,15 @@
 namespace Yay\DSL\Expanders;
 
 use Yay\Engine;
-use Yay\Token;
 use Yay\TokenStream;
 
-function class_accessors_return($stream, Engine $engine): TokenStream
+function class_accessors_return(TokenStream $stream, Engine $engine): TokenStream
 {
     if (!empty($stream->current())) {
         $stream = ": {$stream}";
     }
 
     return TokenStream::fromSource(
-        $engine->expand($stream, '', Engine::GC_ENGINE_DISABLED)
+        $engine->expand($stream, "", Engine::GC_ENGINE_DISABLED)
     );
 }
diff --git a/src/macros.pre → src/macros.yay b/src/macros.pre → src/macros.yay
diff --git a/tests/SpecTest.php b/tests/SpecTest.php
@@ -2,7 +2,7 @@
 
 namespace Pre\ClassAccessors;
 
-use Pre\Testing\Runner;
+use Pre\Plugin\Testing\Runner;
 
 class SpecTest extends Runner
 {

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -2,12 +2,12 @@
 
 namespace Yay;
 
-// let's use a namespace trick, to make non-colliding variables predictable.
-
 function md5($value) {
     return $value;
 }
 
-putenv("PRE_BASE_DIR=" . __DIR__ . "/..");
-
 require __DIR__ . "/../vendor/autoload.php";
+
+putenv("PRE_BASE_DIR=" . __DIR__ . "/../");
+
+\Pre\Plugin\addMacroPath(__DIR__ . "/../src/macros.yay");
diff --git a/tests/specs/accessors.spec b/tests/specs/accessors.spec
@@ -1,6 +1,6 @@
 --DESCRIPTION--
 
-Test accessors
+Test class accessors macros
 
 --GIVEN--
 

diff --git a/tests/specs/fallbacks.spec b/tests/specs/fallbacks.spec
@@ -1,6 +1,6 @@
 --DESCRIPTION--
 
-Test accessor fallbacks
+Test class accessors fallback macros
 
 --GIVEN--