Issue #3431022 by Project Update Bot, michaellander, steven jones, acbramley:...

Issue #3431022 by Project Update Bot, michaellander, steven jones, acbramley: Automated Drupal 11 compatibility fixes for imageapi_optimize

.gitlab-ci.yml

@@ -5,7 +5,9 @@ include:
       - '/includes/include.drupalci.main.yml'
       - '/includes/include.drupalci.variables.yml'
       - '/includes/include.drupalci.workflows.yml'
+
 variables:
+  _PHPUNIT_CONCURRENT: 1
   SKIP_CSPELL: '1'
   SKIP_ESLINT: '1'
   SKIP_PHPCS: '1'

imageapi_optimize.info.yml

@@ -2,5 +2,5 @@ name: Image Optimize (or ImageAPI Optimize)
 type: module
 package: Image Optimize
 description: 'Define pipelines for image optimization and provide integration with core image styles.'
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^9 || ^10 || ^11
 configure: entity.imageapi_optimize_pipeline.collection

tests/src/Functional/ImageAdminStylesTest.php

@@ -14,6 +14,6 @@ class ImageAdminStylesTest extends OriginalImageAdminStylesTest {
  /**
   * {@inheritdoc}
   */
-  public static $modules = ['imageapi_optimize'];
+  protected static $modules = ['imageapi_optimize'];
 
 }

tests/src/Functional/ImageDimensionsTest.php

@@ -14,6 +14,6 @@ class ImageDimensionsTest extends OriginalImageDimensionsTest {
  /**
   * {@inheritdoc}
   */
-  public static $modules = ['imageapi_optimize'];
+  protected static $modules = ['imageapi_optimize'];
 
 }

tests/src/Functional/ImageFieldDefaultImagesTest.php

@@ -14,6 +14,6 @@ class ImageFieldDefaultImagesTest extends OriginalImageFieldDefaultImagesTest {
  /**
   * {@inheritdoc}
   */
-  public static $modules = ['imageapi_optimize'];
+  protected static $modules = ['imageapi_optimize'];
 
 }

tests/src/Functional/ImageFieldDisplayTest.php

@@ -14,6 +14,6 @@ class ImageFieldDisplayTest extends OriginalImageFieldDisplayTest {
  /**
   * {@inheritdoc}
   */
-  public static $modules = ['imageapi_optimize'];
+  protected static $modules = ['imageapi_optimize'];
 
 }

tests/src/Functional/ImageFieldValidateTest.php

@@ -14,6 +14,6 @@ class ImageFieldValidateTest extends OriginalImageFieldValidateTest {
  /**
   * {@inheritdoc}
   */
-  public static $modules = ['imageapi_optimize'];
+  protected static $modules = ['imageapi_optimize'];
 
 }

tests/src/Functional/ImageFieldWidgetTest.php

@@ -14,6 +14,6 @@ class ImageFieldWidgetTest extends OriginalImageFieldWidgetTest {
  /**
   * {@inheritdoc}
   */
-  public static $modules = ['imageapi_optimize'];
+  protected static $modules = ['imageapi_optimize'];
 
 }

tests/src/Functional/ImageOnTranslatedEntityTest.php

@@ -14,6 +14,6 @@ class ImageOnTranslatedEntityTest extends OriginalImageOnTranslatedEntityTest {
  /**
   * {@inheritdoc}
   */
-  public static $modules = ['imageapi_optimize'];
+  protected static $modules = ['imageapi_optimize'];
 
 }

tests/src/Functional/ImageStyleDeleteTest.php

@@ -14,6 +14,6 @@ class ImageStyleDeleteTest extends OriginalImageStyleDeleteTest {
  /**
   * {@inheritdoc}
   */
-  public static $modules = ['imageapi_optimize'];
+  protected static $modules = ['imageapi_optimize'];
 
 }

tests/src/Functional/ImageStyleFlushTest.php

@@ -14,6 +14,6 @@ class ImageStyleFlushTest extends OriginalImageStyleFlushTest {
  /**
   * {@inheritdoc}
   */
-  public static $modules = ['imageapi_optimize'];
+  protected static $modules = ['imageapi_optimize'];
 
 }

tests/src/Functional/ImageStylesPathAndUrlTest.php

@@ -14,6 +14,6 @@ class ImageStylesPathAndUrlTest extends OriginalImageStylesPathAndUrlTest {
  /**
   * {@inheritdoc}
   */
-  public static $modules = ['imageapi_optimize'];
+  protected static $modules = ['imageapi_optimize'];
 
 }

tests/src/FunctionalJavascript/ImageAdminStylesTest.php

@@ -14,6 +14,6 @@ class ImageAdminStylesTest extends OriginalImageAdminStylesTest {
  /**
   * {@inheritdoc}
   */
-  public static $modules = ['imageapi_optimize'];
+  protected static $modules = ['imageapi_optimize'];
 
 }

tests/src/FunctionalJavascript/ImageFieldValidateTest.php

@@ -14,6 +14,6 @@ class ImageFieldValidateTest extends OriginalImageFieldValidateTest {
  /**
   * {@inheritdoc}
   */
-  public static $modules = ['imageapi_optimize'];
+  protected static $modules = ['imageapi_optimize'];
 
 }

tests/src/Kernel/ImageEffectsTest.php

@@ -14,6 +14,6 @@ class ImageEffectsTest extends OriginalImageEffectsTest {
  /**
   * {@inheritdoc}
   */
-  public static $modules = ['imageapi_optimize'];
+  protected static $modules = ['imageapi_optimize'];
 
 }

tests/src/Kernel/ImageFormatterTest.php

@@ -14,6 +14,6 @@ class ImageFormatterTest extends OriginalImageFormatterTest {
  /**
   * {@inheritdoc}
   */
-  public static $modules = ['imageapi_optimize'];
+  protected static $modules = ['imageapi_optimize'];
 
 }

tests/src/Kernel/ImageImportTest.php

@@ -14,6 +14,6 @@ class ImageImportTest extends OriginalImageImportTest {
  /**
   * {@inheritdoc}
   */
-  public static $modules = ['imageapi_optimize'];
+  protected static $modules = ['imageapi_optimize'];
 
 }

tests/src/Kernel/ImageItemTest.php

@@ -14,6 +14,6 @@ class ImageItemTest extends OriginalImageItemTest {
  /**
   * {@inheritdoc}
   */
-  public static $modules = ['imageapi_optimize'];
+  protected static $modules = ['imageapi_optimize'];
 
 }

tests/src/Kernel/ImageOptimizePipelineTest.php

@@ -15,7 +15,7 @@ class ImageOptimizePipelineTest extends KernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['system', 'imageapi_optimize', 'imageapi_optimize_module_test'];
+  protected static $modules = ['system', 'imageapi_optimize', 'imageapi_optimize_module_test'];
 
   /**
    * Test using image pipeline
@@ -148,15 +148,7 @@ class ImageOptimizePipelineTest extends KernelTestBase {
   {
     self::assertFileExists($actualFile, $message);
 
-    self::assertEquals(
-      $extectedString,
-      file_get_contents($actualFile),
-      $message,
-      0,
-      10,
-      $canonicalize,
-      $ignoreCase
-    );
+    self::assertEqualsIgnoringCase($extectedString, file_get_contents($actualFile), $message);
   }
 
   /**
@@ -201,7 +193,7 @@ class ImageOptimizePipelineTest extends KernelTestBase {
 
     // Include special characters in the filename.
     $image_uri = \Drupal::config('system.file')->get('default_scheme') . '://Файл для тестирования ' . $this->randomMachineName() . '.png';
-    $this->assertFileNotExists($image_uri, t('The test file does not exist on the disk.'));
+    $this->assertFileDoesNotExist($image_uri, t('The test file does not exist on the disk.'));
 
     // Setup our pipeline.
     $pipeline = ImageAPIOptimizePipeline::create([

tests/src/Kernel/ImageStyleCustomStreamWrappersTest.php

@@ -14,6 +14,6 @@ class ImageStyleCustomStreamWrappersTest extends OriginalImageStyleCustomStreamW
  /**
   * {@inheritdoc}
   */
-  public static $modules = ['imageapi_optimize'];
+  protected static $modules = ['imageapi_optimize'];
 
 }