Merge branch 'master' into object_driver

Author: sebastiandedeyne

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: https://spatie.be/open-source/support-us

.github/workflows/run-tests.yml

@@ -0,0 +1,39 @@
+name: run-tests
+
+on: [push, pull_request]
+
+jobs:
+  test:
+
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [ubuntu-latest]
+        php: [7.4]
+        dependency-version: [prefer-lowest, prefer-stable]
+
+    name: P${{ matrix.php }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v1
+
+      - name: Cache dependencies
+        uses: actions/cache@v1
+        with:
+          path: ~/.composer/cache/files
+          key: dependencies-php-${{ matrix.php }}-${{ matrix.os }}-composer-${{ hashFiles('composer.json') }}
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v1
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
+          coverage: none
+
+      - name: Install dependencies
+        run: composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
+
+      - name: Execute tests
+        run: vendor/bin/phpunit

.travis.yml

@@ -2,6 +2,9 @@
 
 All notable changes to `phpunit-snapshot-assertions` will be documented in this file
 
+## 3.1.1 - 2019-02-10
+- add support for PHPUnit 9 (#86)
+
 ## 3.1.0 - 2019-12-02
 - drop support for PHP 7.3
 

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/spatie/phpunit-snapshot-assertions.svg?style=flat-square)](https://packagist.org/packages/spatie/phpunit-snapshot-assertions)
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.md)
-[![Build Status](https://img.shields.io/travis/spatie/phpunit-snapshot-assertions/master.svg?style=flat-square)](https://travis-ci.org/spatie/phpunit-snapshot-assertions)
+[![GitHub Tests Action Status](https://img.shields.io/github/workflow/status/spatie/phpunit-snapshot-assertions/run-tests?label=tests)](https://github.com/spatie/phpunit-snapshot-assertions/actions?query=workflow%3Arun-tests+branch%3Amaster)
 [![Quality Score](https://img.shields.io/scrutinizer/g/spatie/phpunit-snapshot-assertions.svg?style=flat-square)](https://scrutinizer-ci.com/g/spatie/phpunit-snapshot-assertions)
 [![StyleCI](https://styleci.io/repos/75926188/shield?branch=master)](https://styleci.io/repos/75926188)
 [![Total Downloads](https://img.shields.io/packagist/dt/spatie/phpunit-snapshot-assertions.svg?style=flat-square)](https://packagist.org/packages/spatie/phpunit-snapshot-assertions)
@@ -68,6 +68,12 @@ FAILURES!
 Tests: 1, Assertions: 1, Failures: 1.
 ```
 
+## Support us
+
+We invest a lot of resources into creating [best in class open source packages](https://spatie.be/open-source). You can support us by [buying one of our paid products](https://spatie.be/open-source/support-us). 
+
+We highly appreciate you sending us a postcard from your hometown, mentioning which of our package(s) you are using. You'll find our address on [our contact page](https://spatie.be/about-us). We publish all received postcards on [our virtual postcard wall](https://spatie.be/open-source/postcards).
+
 ## Installation
 
 You can install the package via composer:
@@ -297,13 +303,6 @@ We publish all received postcards [on our company website](https://spatie.be/en/
 - [Alex Vanderbist](https://github.com/alexvanderbist)
 - [All Contributors](../../contributors)
 
-## Support us
-
-Spatie is a webdesign agency based in Antwerp, Belgium. You'll find an overview of all our open source projects [on our website](https://spatie.be/opensource).
-
-Does your business depend on our contributions? Reach out and support us on [Patreon](https://www.patreon.com/spatie). 
-All pledges will be dedicated to allocating workforce on maintenance and new awesome stuff.
-
 ## License
 
 The MIT License (MIT). Please see [License File](LICENSE.md) for more information.

README.md

@@ -22,7 +22,7 @@
     "require": {
         "php": "^7.4",
         "ext-dom": "*",
-        "phpunit/phpunit": "^8.3",
+        "phpunit/phpunit": "^8.3|^9.0",
         "symfony/property-access": "^4.0|^5.0",
         "symfony/serializer": "^4.0|^5.0",
         "symfony/yaml": "^4.0|^5.0"

composer.json

@@ -23,7 +23,6 @@
         </whitelist>
     </filter>
     <logging>
-        <log type="tap" target="build/report.tap"/>
         <log type="junit" target="build/report.junit.xml"/>
         <log type="coverage-html" target="build/coverage"/>
         <log type="coverage-text" target="build/coverage.txt"/>

phpunit.xml.dist

@@ -36,7 +36,7 @@ public function markTestIncompleteIfSnapshotsHaveChanged()
             return;
         }
 
-        $formattedMessages = implode(PHP_EOL, array_map(fn(string $message) => "- {$message}", $this->snapshotChanges));
+        $formattedMessages = implode(PHP_EOL, array_map(fn (string $message) => "- {$message}", $this->snapshotChanges));
 
         $this->markTestIncomplete($formattedMessages);
     }

src/MatchesSnapshots.php

@@ -14,7 +14,7 @@ public function it_can_serialize_a_json_string_to_pretty_json()
         $driver = new JsonDriver();
 
         $expected = implode(PHP_EOL, [
-           '{',
+            '{',
             '    "foo": "bar"',
             '}',
             '',

tests/Unit/Drivers/JsonDriverTest.php

@@ -30,7 +30,7 @@ public function it_can_serialize_a_yaml_array()
             'foo: bar',
             'baz: qux',
             '',
-         ]);
+        ]);
 
         $this->assertEquals($expected, $driver->serialize([
             'foo' => 'bar',