Merge branch 'release/2.0.2'

sebastiaanluca · Mar 8, 2019 · 2f7ca7d · 2f7ca7d
2 parents 7cc4dc9 + ba3b206
commit 2f7ca7d
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 54 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: php
 php:
   - "7.2"
   - "7.3"
-  - nightly
+  - 7.4snapshot
 
 cache:
   directories:
@@ -18,12 +18,13 @@ env:
 
 matrix:
   allow_failures:
-    - php: nightly
+    - php: 7.4snapshot
     - env: LARAVEL_VERSION="dev-master" ORCHESTRA_VERSION="dev-master" COMPOSER_FLAGS="--prefer-lowest" MINIMUM_STABILITY="dev"
     - env: LARAVEL_VERSION="dev-master" ORCHESTRA_VERSION="dev-master" COMPOSER_FLAGS="--prefer-stable" MINIMUM_STABILITY="dev"
   fast_finish: true
 
 before_install:
+  - composer validate --strict
   - travis_retry composer self-update
   - if [[ -n ${MINIMUM_STABILITY} ]]; then composer config minimum-stability ${MINIMUM_STABILITY}; echo "Minimum stability set to ${MINIMUM_STABILITY}"; else echo "Minimum stability left unchanged"; fi
   - if [[ -n ${ORCHESTRA_VERSION} ]]; then composer require orchestra/testbench=${ORCHESTRA_VERSION} --dev --no-update; else echo "orchestra/testbench version requirement left unchanged"; fi

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,12 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 
 ##  Unreleased
 
+## 2.0.2 (2019-03-08)
+
+### Changed
+
+- Replaced custom array subset with package
+
 ## 2.0.1 (2019-02-27)
 
 ### Fixed

diff --git a/composer.json b/composer.json
@@ -24,14 +24,15 @@
         }
     ],
     "require": {
+        "php": "^7.2",
+        "dms/phpunit-arraysubset-asserts": "^0.1.0",
         "laravel/framework": "~5.8.0",
-        "nesbot/carbon": "^1.22.1|^2.0",
-        "php": "^7.2"
+        "nesbot/carbon": "^1.22.1|^2.0"
     },
     "require-dev": {
         "kint-php/kint": "^3.1",
         "mockery/mockery": "^1.2",
-        "orchestra/testbench": "^3.8",
+        "orchestra/testbench": "~3.8.0",
         "phpunit/phpunit": "^8.0"
     },
     "autoload": {
@@ -56,7 +57,13 @@
     },
     "scripts": {
         "test": "vendor/bin/phpunit",
-        "test-lowest": "composer update --prefer-lowest --prefer-dist --no-interaction && vendor/bin/phpunit",
-        "test-stable": "composer update --prefer-stable --prefer-dist --no-interaction &&vendor/bin/phpunit"
+        "test-lowest": [
+            "composer update --prefer-lowest --prefer-dist --no-interaction --ansi",
+            "@test"
+        ],
+        "test-stable": [
+            "composer update --prefer-stable --prefer-dist --no-interaction --ansi",
+            "@test"
+        ]
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
@@ -13,7 +13,9 @@
          stopOnFailure="false"
          failOnRisky="true"
          failOnWarning="true"
-         stopOnError="false">
+         stopOnError="false"
+         cacheResult="false"
+>
     <testsuites>
         <testsuite name="Feature Tests">
             <directory suffix="Test.php">./tests/Feature</directory>

diff --git a/tests/Assert.php b/tests/Assert.php
diff --git a/tests/Feature/BooleanArrayTest.php b/tests/Feature/BooleanArrayTest.php
@@ -5,12 +5,14 @@
 namespace SebastiaanLuca\BooleanDates\Tests\Feature;
 
 use Carbon\Carbon;
-use SebastiaanLuca\BooleanDates\Tests\Assert;
+use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts;
 use SebastiaanLuca\BooleanDates\Tests\resources\TestModel;
 use SebastiaanLuca\BooleanDates\Tests\TestCase;
 
 class BooleanArrayTest extends TestCase
 {
+    use ArraySubsetAsserts;
+
     /**
      * @test
      */
@@ -59,7 +61,7 @@ public function it returns all attributes() : void
             'agreed_to_something_at' => null,
         ];
 
-        Assert::assertArraySubset(
+        ArraySubsetAsserts::assertArraySubset(
             $expected,
             $model->toArray()
         );