Merge pull request #248 from mikemadison13/247

Fixes #247 to support PHP 8.1.x and Drupal 10.x.

.gitignore

@@ -5,3 +5,5 @@ composer.lock
 reports
 vendor
 drush
+
+.phpunit.result.cache

.travis.yml

@@ -1,8 +1,9 @@
 language: php
 
 php:
-  - 7.3
   - 7.4
+  - 8.0
+  - 8.1
 
 install:
   - composer install

composer.json

@@ -12,18 +12,19 @@
      }
   ],
   "require": {
-    "php": ">=5.6",
-    "symfony/process": "~2.5|~3.0|~4.4",
-    "symfony/dependency-injection": "~2.6|~3.0|~4.4",
-    "drupal/core-utility": "^8.4 || ^9"
+    "php": ">=7.4",
+    "symfony/process": "~2.5|~3.0|~4.4|^6",
+    "symfony/dependency-injection": "~2.6|~3.0|~4.4|^6",
+    "drupal/core-utility": "^8.4 || ^9 || ^10.0.0-alpha1"
   },
   "require-dev": {
     "drupal/coder": "~8.3.0",
-    "phpspec/phpspec": "~2.0 || ~4.0 || ~6.1",
-    "phpunit/phpunit": "~6.0 || ~7.0",
-    "mockery/mockery": "0.9.4",
+    "phpspec/phpspec": "~2.0 || ~4.0 || ~6.1 || dev-main",
+    "phpunit/phpunit": "~6.0 || ~7.0 || ^9",
+    "mockery/mockery": "^0.9.4",
     "drush-ops/behat-drush-endpoint": "*",
-    "jakub-onderka/php-parallel-lint": "^1.0"
+    "php-parallel-lint/php-parallel-lint": "^1.0",
+    "dms/phpunit-arraysubset-asserts": "^0.4.0"
   },
   "scripts": {
     "test": [
@@ -45,5 +46,10 @@
     "branch-alias": {
       "dev-master": "2.2.x-dev"
     }
+  },
+  "config": {
+    "allow-plugins": {
+      "dealerdirect/phpcodesniffer-composer-installer": true
+    }
   }
 }

tests/Drupal/Tests/Driver/Drupal7FieldHandlerTest.php

@@ -2,6 +2,8 @@
 
 namespace Drupal\Tests\Driver;
 
+use DMS\PHPUnitExtensions\ArraySubset\Assert;
+
 /**
  * Tests the Drupal 7 field handlers.
  */
@@ -32,7 +34,7 @@ public function testFieldHandlers($class_name, $entity, $entity_type, array $fie
 
     $field_name = $field['field_name'];
     $expanded_values = $handler->expand($this->values($entity->$field_name));
-    $this->assertArraySubset($expected_values, $expanded_values);
+    Assert::assertArraySubset($expected_values, $expanded_values);
   }
 
   /**

tests/Drupal/Tests/Driver/FieldHandlerAbstractTest.php

@@ -12,7 +12,7 @@ abstract class FieldHandlerAbstractTest extends TestCase {
   /**
    * {@inheritdoc}
    */
-  public function tearDown() {
+  public function tearDown(): void {
     \Mockery::close();
   }