Use bundleted trait instead

Author: sanmai

composer.json

@@ -36,8 +36,7 @@
         "json-schema/json-schema-test-suite": "1.2.0",
         "phpunit/phpunit": ">=4.8.36 <10",
         "sanmai/phpunit-legacy-adapter": "^6.4 || ^8.2.1",
-        "phpspec/prophecy-phpunit": ">=1.0",
-        "phpunitgoodpractices/polyfill": "^1.6"
+        "phpspec/prophecy-phpunit": ">=1.0"
     },
     "extra": {
         "branch-alias": {

tests/ConstraintErrorTest.php

@@ -11,7 +11,6 @@
 
 use JsonSchema\ConstraintError;
 use LegacyPHPUnit\TestCase;
-use PHPUnitGoodPractices\Polyfill\PolyfillTrait;
 
 class ConstraintErrorTest extends TestCase
 {

tests/Constraints/FactoryTest.php

@@ -12,8 +12,8 @@
 use JsonSchema\Constraints\Constraint;
 use JsonSchema\Constraints\Factory;
 use JsonSchema\Entity\JsonPointer;
+use JsonSchema\Tests\PolyfillTrait;
 use LegacyPHPUnit\TestCase;
-use PHPUnitGoodPractices\Polyfill\PolyfillTrait;
 
 /**
  * Class MyBadConstraint

tests/Constraints/SchemaValidationTest.php

@@ -10,9 +10,9 @@
 namespace JsonSchema\Tests\Constraints;
 
 use JsonSchema\Constraints\Constraint;
+use JsonSchema\Tests\PolyfillTrait;
 use JsonSchema\Validator;
 use LegacyPHPUnit\TestCase;
-use PHPUnitGoodPractices\Polyfill\PolyfillTrait;
 
 class SchemaValidationTest extends TestCase
 {

tests/Constraints/SelfDefinedSchemaTest.php

@@ -9,8 +9,8 @@
 
 namespace JsonSchema\Tests\Constraints;
 
+use JsonSchema\Tests\PolyfillTrait;
 use JsonSchema\Validator;
-use PHPUnitGoodPractices\Polyfill\PolyfillTrait;
 
 class SelfDefinedSchemaTest extends BaseTestCase
 {

tests/Constraints/TypeTest.php

@@ -11,8 +11,8 @@
 
 use JsonSchema\Constraints\TypeCheck\LooseTypeCheck;
 use JsonSchema\Constraints\TypeConstraint;
+use JsonSchema\Tests\PolyfillTrait;
 use LegacyPHPUnit\TestCase;
-use PHPUnitGoodPractices\Polyfill\PolyfillTrait;
 
 /**
  * Class TypeTest

tests/Constraints/ValidationExceptionTest.php

@@ -11,9 +11,9 @@
 
 use JsonSchema\Constraints\Constraint;
 use JsonSchema\Exception\ValidationException;
+use JsonSchema\Tests\PolyfillTrait;
 use JsonSchema\Validator;
 use LegacyPHPUnit\TestCase;
-use PHPUnitGoodPractices\Polyfill\PolyfillTrait;
 
 class ValidationExceptionTest extends TestCase
 {

tests/Entity/JsonPointerTest.php

@@ -10,8 +10,8 @@
 namespace JsonSchema\Tests\Entity;
 
 use JsonSchema\Entity\JsonPointer;
+use JsonSchema\Tests\PolyfillTrait;
 use LegacyPHPUnit\TestCase;
-use PHPUnitGoodPractices\Polyfill\PolyfillTrait;
 
 /**
  * @package JsonSchema\Tests\Entity

tests/PolyfillTrait.php

@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the JsonSchema package.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace JsonSchema\Tests;
+
+if (version_compare(\PHPUnit\Runner\Version::id(), '6.0.0') < 0) {
+    /**
+     * Inspired by https://github.com/PHPUnitGoodPractices/polyfill
+     *
+     * @license MIT
+     */
+    trait PolyfillTrait
+    {
+        public function expectException($exception)
+        {
+            if (\is_callable(array(parent::class, 'expectException'))) {
+                parent::expectException($exception);
+            } else {
+                $this->setExpectedException($exception);
+            }
+        }
+
+        public static function assertIsArray($actual, $message = '')
+        {
+            if (\is_callable(array(parent::class, 'assertIsArray'))) {
+                parent::assertIsArray($actual, $message);
+            } else {
+                static::assertInternalType('array', $actual, $message);
+            }
+        }
+    }
+} else {
+    trait PolyfillTrait
+    {
+    }
+}

tests/RefTest.php

@@ -11,7 +11,6 @@
 
 use JsonSchema\Validator;
 use LegacyPHPUnit\TestCase;
-use PHPUnitGoodPractices\Polyfill\PolyfillTrait;
 
 class RefTest extends TestCase
 {