Commit c2ffb9f4 authored by mondrake's avatar mondrake
Browse files

Issue #3296322 by mondrake, pmagunia, cgmonroe: Bump Drupal to ^9.3 | ^10 and... 

Issue #3296322 by mondrake, pmagunia, cgmonroe: Bump Drupal to ^9.3 | ^10 and cleanup deprecated functions
parent 4546653c

composer.json

+5 −7
Original line number Diff line number Diff line
@@ -3,18 +3,16 @@ 
    "type": "drupal-module",

    "description": "Provides effects and operations for the Image API.",

    "require": {

        "drupal/core": "^9.2",

        "drupal/file_mdm_exif": "^2.4",

        "drupal/file_mdm_font": "^2.4"

        "drupal/core": "^9.3 || ^10",

        "drupal/file_mdm": "^2.5"

    },

    "conflict": {

        "drupal/imagemagick": "<3",

        "drupal/imagemagick": "<3.4",

        "drupal/jquery_colorpicker": "<2"

    },

    "require-dev": {

        "drupal/imagemagick": "^3.3",

        "drupal/jquery_colorpicker": "^2",

        "drupal/vendor_stream_wrapper": "^1 | ^2",

        "drupal/imagemagick": "^3.4",

        "drupal/vendor_stream_wrapper": "^1.2 | ^2",

        "fileeye/linuxlibertine-fonts": "^5.3"

    },

    "extra": {

drupalci.yml

+3 −3
Original line number Diff line number Diff line
@@ -25,15 +25,15 @@ build: 
      run_tests.phpunit:

        types: 'PHPUnit-Unit'

        testgroups: '--all'

        suppress-deprecations: true

        suppress-deprecations: false

        halt-on-fail: false

      run_tests.kernel:

        types: 'PHPUnit-Kernel'

        testgroups: '--all'

        suppress-deprecations: true

        suppress-deprecations: false

        halt-on-fail: false

      run_tests.functional:

        types: 'PHPUnit-Functional'

        testgroups: '--all'

        suppress-deprecations: true

        suppress-deprecations: false

        halt-on-fail: false

image_effects.info.yml

+1 −1
Original line number Diff line number Diff line 
type: module

core_version_requirement: ^9.2

core_version_requirement: ^9.3 || ^10

name: Image Effects

description: 'Provides effects and operations for the Image API.'

package: Media

tests/modules/image_effects_module_test/image_effects_module_test.info.yml

+1 −1
Original line number Diff line number Diff line 
type: module

core_version_requirement: ^9.2

core_version_requirement: ^9.3 || ^10

name: 'Image Effects test module'

description: 'Provides implementations for testing Image Effects module functionality.'

package: Testing

tests/src/Functional/Effect/AspectSwitcherTest.php

+3 −3
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ class AspectSwitcherTest extends ImageEffectsTestBase { 
    // landscape.

    // Check that ::transformDimensions returns expected dimensions.

    $original_landscape_image = $image_factory->get($original_landscape_uri);

    $derivative_landscape_url = file_url_transform_relative($this->testImageStyle->buildUrl($original_landscape_uri));

    $derivative_landscape_url = $this->fileUrlGenerator->transformRelative($this->testImageStyle->buildUrl($original_landscape_uri));

    $variables = [

      '#theme' => 'image_style',

      '#style_name' => $this->testImageStyleName,
@@ -138,7 +138,7 @@ class AspectSwitcherTest extends ImageEffectsTestBase { 
    // portrait.

    // Check that ::transformDimensions returns expected dimensions.

    $original_portrait_image = $image_factory->get($original_portrait_uri);

    $derivative_portrait_url = file_url_transform_relative($this->testImageStyle->buildUrl($original_portrait_uri));

    $derivative_portrait_url = $this->fileUrlGenerator->transformRelative($this->testImageStyle->buildUrl($original_portrait_uri));

    $variables = [

      '#theme' => 'image_style',

      '#style_name' => $this->testImageStyleName,
@@ -190,7 +190,7 @@ class AspectSwitcherTest extends ImageEffectsTestBase { 
    // Check that no changes are made when source image is portrait.

    // Check that ::transformDimensions returns expected dimensions.

    $original_portrait_image = $image_factory->get($original_portrait_uri);

    $derivative_portrait_url = file_url_transform_relative($this->testImageStyle->buildUrl($original_portrait_uri));

    $derivative_portrait_url = $this->fileUrlGenerator->transformRelative($this->testImageStyle->buildUrl($original_portrait_uri));

    $variables = [

      '#theme' => 'image_style',

      '#style_name' => $this->testImageStyleName,