fix Drush phpunit bootstrap

Author: WengerK

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        drupal_version: ['9.5', '10.0', '10.1', '10.2', '10.3', '10.4', '11.0', '11.1']
+        drupal_version: ['10.4', '11.0', '11.1']
         module: ['entity_to_text']
         include:
           - drupal_version: '11.2'
@@ -22,6 +22,14 @@ jobs:
       - run: docker compose -f docker-compose.yml pull --include-deps drupal
       - name: Build the docker compose stack
         run: docker compose -f docker-compose.yml build --pull --build-arg BASE_IMAGE_TAG=${{ matrix.drupal_version }} drupal
+      - name: Up a persistent Docker Container
+        run: docker compose -f docker-compose.yml up -d drupal
+      - name: wait on Docker to be ready, especially Apache that takes many seconds to be up
+        run: docker compose exec -T drupal wait-for-it drupal:80 -t 60
+      - name: wait on Docker to be ready, especially MariaDB that takes many seconds to be up
+        run: docker compose exec -T drupal wait-for-it db:3306 -t 60
+      - name: Bootstrap Drupal
+        run: docker compose -f docker-compose.yml exec -T -u www-data drupal drush site-install standard --db-url="mysql://drupal:drupal@db/drupal" -y
       - name: Run unit tests
         run: docker compose -f docker-compose.yml run -u www-data drupal phpunit --no-coverage --group=${{ matrix.module }} --exclude-group=${{ matrix.module }}_functional --configuration=/var/www/html/phpunit.xml
 
@@ -30,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        drupal_version: ['9.5', '10.0', '10.1', '10.2', '10.3', '10.4', '11.0', '11.1']
+        drupal_version: ['10.4', '11.0', '11.1']
         module: ['entity_to_text']
         include:
           - drupal_version: '11.2'
@@ -58,7 +66,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        drupal_version: ['10.3']
+        drupal_version: ['10.4']
         module: ['entity_to_text']
 
     steps:

composer.json

@@ -32,8 +32,11 @@
   },
   "require-dev": {
     "drupal/coder": "^8.3.1",
-    "drupal/paragraphs": "^1.0",
-    "vaites/php-apache-tika": "^1"
+    "drupal/paragraphs": "^1.14",
+    "vaites/php-apache-tika": "^1",
+    "drupal/feeds": "^3.0",
+    "drupal/pathauto": "^1.13",
+    "drupal/entity_browser": "^2.12"
   },
   "config": {
     "allow-plugins": {

docker-compose.yml

@@ -8,6 +8,7 @@ services:
     volumes:
       # Mount the module in the proper contrib module directory.
       - .:/var/www/html/modules/contrib/entity_to_text
+
     restart: unless-stopped
 
   db:

modules/entity_to_text_tika/src/Commands/OcrLocalFileCacheWarmup.php

@@ -172,8 +172,9 @@ public function warmup(
         $progressbar_objects->setMessage((string) $page, 'page_current');
         $base_query->range($page * self::LIMIT_PAGER, self::LIMIT_PAGER);
         $files = $base_query->execute();
-        foreach ($files as $file) {
-          $file = $this->fileStorage->load($file);
+
+        foreach ($files as $fid) {
+          $file = $this->fileStorage->load($fid);
 
           $this->output()->writeln(sprintf('Processing file (%s) "%s".', $file->id(), $file->getFileUri()), OutputInterface::VERBOSITY_VERBOSE);
 

modules/entity_to_text_tika/tests/src/Kernel/LocalFileStorageTest.php

@@ -3,9 +3,12 @@
 namespace Drupal\Tests\entity_to_text_tika\Kernel;
 
 use Drupal\Core\File\FileSystemInterface;
+use Drupal\Core\StreamWrapper\PrivateStream;
+use Drupal\Core\StreamWrapper\StreamWrapperInterface;
 use Drupal\entity_to_text_tika\Storage\LocalFileStorage;
 use Drupal\file\Entity\File;
 use Drupal\KernelTests\Core\File\FileTestBase;
+use Drupal\Core\File\FileExists;
 
 /**
  * Tests the Plaintext File Storage.
@@ -22,7 +25,7 @@ final class LocalFileStorageTest extends FileTestBase {
   /**
    * {@inheritdoc}
    */
-  protected static $modules = ['file', 'entity_to_text_tika', 'user'];
+  protected static $modules = ['system', 'file', 'entity_to_text_tika', 'user'];
 
   /**
    * The file system service.
@@ -61,7 +64,7 @@ protected function setUp(): void {
   public function testloadPublic(): void {
     // Create an OCR file for testing.
     $file_uri = $this->createUri('390-foo.txt.en.ocr.txt', 'Ipsum excepteur id cupidatat commodo', 'private');
-    $this->fileSystem->move($file_uri, 'private://entity-to-text/ocr/390-foo.txt.en.ocr.txt', FileSystemInterface::EXISTS_REPLACE);
+    $this->fileSystem->move($file_uri, 'private://entity-to-text/ocr/390-foo.txt.en.ocr.txt', FileExists::Replace);
 
     // Create a file that correspond to the previous OCR file.
     $file = File::create([
@@ -79,7 +82,7 @@ public function testloadPublic(): void {
   public function testloadPrivate(): void {
     // Create an OCR file for testing.
     $file_uri = $this->createUri('390-foo.txt.en.ocr.txt', 'Ipsum excepteur id cupidatat commodo', 'private');
-    $this->fileSystem->move($file_uri, 'private://entity-to-text/ocr/390-foo.txt.en.ocr.txt', FileSystemInterface::EXISTS_REPLACE);
+    $this->fileSystem->move($file_uri, 'private://entity-to-text/ocr/390-foo.txt.en.ocr.txt', FileExists::Replace);
 
     // Create a file that correspond to the previous OCR file.
     $file = File::create([
@@ -97,7 +100,7 @@ public function testloadPrivate(): void {
   public function testloadSubDirectory(): void {
     // Create an OCR file for testing.
     $file_uri = $this->createUri('420-foo.txt.en.ocr.txt', 'Ipsum excepteur id cupidatat commodo', 'private');
-    $this->fileSystem->move($file_uri, 'private://entity-to-text/ocr/420-foo.txt.en.ocr.txt', FileSystemInterface::EXISTS_REPLACE);
+    $this->fileSystem->move($file_uri, 'private://entity-to-text/ocr/420-foo.txt.en.ocr.txt', FileExists::Replace);
 
     // Create a file that correspond to the previous OCR file.
     $file = File::create([
@@ -148,7 +151,7 @@ public function testSave(): void {
   public function testSaveWhenOcrFileAlreadyExists(): void {
     // Create an OCR file for testing.
     $file_ocr_uri = $this->createUri('400-foo.txt.en.ocr.txt', 'Ipsum excepteur id cupidatat commodo', 'private');
-    $this->fileSystem->move($file_ocr_uri, 'private://entity-to-text/ocr/400-foo.txt.en.ocr.txt', FileSystemInterface::EXISTS_REPLACE);
+    $this->fileSystem->move($file_ocr_uri, 'private://entity-to-text/ocr/400-foo.txt.en.ocr.txt', FileExists::Replace);
 
     // Create a file for testing.
     $file = File::create([

modules/entity_to_text_tika/tests/src/Unit/EntityToTextTikaEventsTest.php

@@ -18,7 +18,7 @@ class EntityToTextTikaEventsTest extends UnitTestCase {
    *
    * @dataProvider eventNames
    */
-  public function testEventNames($event_name, $expected) {
+  public function testEventNames($event_name, $expected): void {
     $this->assertEquals($expected, $event_name);
   }
 
@@ -28,7 +28,7 @@ public function testEventNames($event_name, $expected) {
    * @return array
    *   The list of CONST names & string expected value.
    */
-  public function eventNames() {
+  public static function eventNames(): iterable {
     return [
       [
         EntityToTextTikaEvents::PRE_PROCESS_FILE,

modules/entity_to_text_tika/tests/src/Unit/OcrLocalFileCacheWarmupTest.php

@@ -282,7 +282,7 @@ public function testWarmupForce(): void {
     $file200->expects(self::once())
       ->method('getFileUri')
       ->willReturn('public://file/test.txt');
-    $file200->expects(self::once())
+    $file200->expects(self::any())
       ->method('id')
       ->willReturn(200);
 
@@ -291,7 +291,7 @@ public function testWarmupForce(): void {
     $file2039->expects(self::once())
       ->method('getFileUri')
       ->willReturn('public://file/foo.pdf');
-    $file2039->expects(self::once())
+    $file2039->expects(self::any())
       ->method('id')
       ->willReturn(2039);
 
@@ -319,10 +319,16 @@ public function testWarmupForce(): void {
     $this->localFileStorage->expects($this->exactly(2))
       ->method('save')
       ->with(
+        $this->callback(function ($arg) use ($file200, $file2039) {
+          // First arg should be a File object (one of our two mocks)
+          $isCorrectFile = ($arg === $file200 || $arg === $file2039);
+          return $isCorrectFile;
+        }),
         $this->logicalOr(
-          $this->equalTo([$file2039, 'doloreum', 'eng+fra']),
-          $this->equalTo([$file2039, 'ipsum', 'eng+fra'])
-        )
+          $this->equalTo('doloreum'),
+          $this->equalTo('ipsum')
+        ),
+        $this->equalTo('eng+fra')
       );
 
     $this->warmupCommand->warmup([

phpstan.neon

@@ -4,12 +4,3 @@ includes:
 parameters:
   level: 1
   reportUnmatchedIgnoredErrors: false
-  ignoreErrors:
-    # The module support Drupal 9, 10 and Drupal 11, so we cannot fix that deprecation without dropping support of 10.3.x and below.
-    -
-      message: """
-        #^Fetching deprecated class constant EXISTS_REPLACE of interface#
-      """
-      count: 4
-      path: tests/src/Kernel/LocalFileStorageTest.php
-