Merge branch 'master' into scoped

# Conflicts:
#	src/Expectations/HigherOrderExpectation.php
#	tests/Features/Expect/HigherOrder/methods.php

tests/Features/Expect/HigherOrder/methods.php

@@ -91,8 +91,20 @@ it('can use the scoped method to lock into the given level for expectations', fu
         );
 });
 
+it('works consistently with the json expectation method', function () {
+    expect(new HasMethods())
+        ->jsonString()->json()->id->toBe(1)
+        ->jsonString()->json()->name->toBe('Has Methods')->toBeString()
+        ->jsonString()->json()->quantity->toBe(20)->toBeInt();
+});
+
 class HasMethods
 {
+    public function jsonString(): string
+    {
+        return '{ "id": 1, "name": "Has Methods", "quantity": 20 }';
+    }
+
     public function name()
     {
         return 'Has Methods';

tests/Features/HigherOrderTests.php

@@ -21,9 +21,9 @@ it('resolves expect callables correctly')
 test('does not treat method names as callables')
     ->expect('it')->toBeString();
 
-it('can tap into the test')
+it('can defer a method until after test setup')
     ->expect('foo')->toBeString()
-    ->tap(function () { expect($this)->toBeInstanceOf(TestCase::class); })
+    ->defer(function () { expect($this)->toBeInstanceOf(TestCase::class); })
     ->toBe('foo')
     ->and('hello world')->toBeString();
 
@@ -32,15 +32,15 @@ it('can pass datasets into the expect callables')
     ->expect(function (...$numbers) { return $numbers; })->toBe([1, 2, 3])
     ->and(function (...$numbers) { return $numbers; })->toBe([1, 2, 3]);
 
-it('can pass datasets into the tap callable')
+it('can pass datasets into the defer callable')
     ->with([[1, 2, 3]])
-    ->tap(function (...$numbers) { expect($numbers)->toBe([1, 2, 3]); });
+    ->defer(function (...$numbers) { expect($numbers)->toBe([1, 2, 3]); });
 
 it('can pass shared datasets into callables')
     ->with('numbers.closure.wrapped')
     ->expect(function ($value) { return $value; })
     ->and(function ($value) { return $value; })
-    ->tap(function ($value) { expect($value)->toBeInt(); })
+    ->defer(function ($value) { expect($value)->toBeInt(); })
     ->toBeInt();
 
 afterEach()->assertTrue(true);