Merge branch 'master' into nested-higher-order-expectations

# Conflicts:
#	tests/.snapshots/success.txt

.github/FUNDING.yml

@@ -2,4 +2,3 @@
 
 github: [nunomaduro,owenvoke,olivernybroe,octoper]
 patreon: nunomaduro
-custom: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66BYDWAT92N6L

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [v1.6.0 (2021-06-18)](https://github.com/pestphp/pest/compare/v1.5.0...v1.6.0)
+### Added
+- Adds a new `json` expectation method to improve testing with JSON strings ([#325](https://github.com/pestphp/pest/pull/325))
+- Adds dot notation support to the `toHaveKey` and `toHaveKeys` expectations ([#322](https://github.com/pestphp/pest/pull/322))
+
 ## [v1.5.0 (2021-06-15)](https://github.com/pestphp/pest/compare/v1.4.0...v1.5.0)
 ### Changed
 - Moves plugins from the `require` section to the core itself ([#317](https://github.com/pestphp/pest/pull/317)), ([#318](https://github.com/pestphp/pest/pull/318)), ([#320](https://github.com/pestphp/pest/pull/320))

src/Expectation.php

@@ -64,6 +64,14 @@ final class Expectation
         return new self($value);
     }
 
+    /**
+     * Creates a new expectation with the decoded JSON value.
+     */
+    public function json(): Expectation
+    {
+        return $this->toBeJson()->and(json_decode($this->value, true));
+    }
+
     /**
      * Dump the expectation value and end the script.
      *

src/Pest.php

@@ -6,7 +6,7 @@ namespace Pest;
 
 function version(): string
 {
-    return '1.5.0';
+    return '1.6.0';
 }
 
 function testDirectory(string $file = ''): string

tests/.snapshots/success.txt

@@ -111,11 +111,9 @@
   ✓ it works inside of each
   ✓ it works with sequence
   ✓ it can compose complex expectations
-  ✓ it can handle nested method calls
 
    PASS  Tests\Features\Expect\HigherOrder\methodsAndProperties
   ✓ it can access methods and properties
-  ✓ it can handle nested methods and properties
 
    PASS  Tests\Features\Expect\HigherOrder\properties
   ✓ it allows properties to be accessed from the value
@@ -126,7 +124,6 @@
   ✓ it works with sequence
   ✓ it can compose complex expectations
   ✓ it works with objects
-  ✓ it works with nested properties
 
    PASS  Tests\Features\Expect\each
   ✓ an exception is thrown if the the type is not iterable
@@ -143,6 +140,10 @@
   ✓ it macros true is true with argument
   ✓ it macros false is not true with argument
 
+   PASS  Tests\Features\Expect\json
+  ✓ it properly parses json string
+  ✓ fails with broken json string
+
    PASS  Tests\Features\Expect\not
   ✓ not property calls
 
@@ -572,5 +573,5 @@
   ✓ it is a test
   ✓ it uses correct parent class
 
-  Tests:  4 incompleted, 7 skipped, 358 passed
+  Tests:  4 incompleted, 7 skipped, 357 passed
   

tests/Features/Expect/json.php

@@ -0,0 +1,14 @@
+<?php
+
+use PHPUnit\Framework\ExpectationFailedException;
+
+test('it properly parses json string', function () {
+    expect('{"name":"Nuno"}')
+        ->json()
+        ->name
+        ->toBe('Nuno');
+});
+
+test('fails with broken json string', function () {
+    expect('{":"Nuno"}')->json();
+})->throws(ExpectationFailedException::class);