Skip to content
Snippets Groups Projects
Commit 1a3d72bc authored by catch's avatar catch
Browse files

Issue #3292350 by O'Briat, KlemenDEV, hswong3i, smustgrave, quietone: Update...

Issue #3292350 by O'Briat, KlemenDEV, hswong3i, smustgrave, quietone: Update the file size in file_validate_image_resolution after resizing
parent f742d155
No related branches found
No related tags found
31 merge requests!11131[10.4.x-only-DO-NOT-MERGE]: Issue ##2842525 Ajax attached to Views exposed filter form does not trigger callbacks,!9470[10.3.x-only-DO-NOT-MERGE]: #3331771 Fix file_get_contents(): Passing null to parameter,!8540Issue #3457061: Bootstrap Modal dialog Not closing after 10.3.0 Update,!8528Issue #3456871 by Tim Bozeman: Support NULL services,!8373Issue #3427374 by danflanagan8, Vighneshh: taxonomy_tid ViewsArgumentDefault...,!7526Expose roles in response,!7352Draft: Resolve #3203489 "Set filename as",!6791Issue #3163299: Ajax exposed filters not working for multiple instances of the same Views block placed on one page,!3878Removed unused condition head title for views,!3818Issue #2140179: $entity->original gets stale between updates,!3742Issue #3328429: Create item list field formatter for displaying ordered and unordered lists,!3731Claro: role=button on status report items,!3668Resolve #3347842 "Deprecate the trusted",!3651Issue #3347736: Create new SDC component for Olivero (header-search),!3531Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!3355Issue #3209129: Scrolling problems when adding a block via layout builder,!3154Fixes #2987987 - CSRF token validation broken on routes with optional parameters.,!3133core/modules/system/css/components/hidden.module.css,!2812Issue #3312049: [Followup] Fix Drupal.Commenting.FunctionComment.MissingReturnType returns for NULL,!2794Issue #3100732: Allow specifying `meta` data on JSON:API objects,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2334Issue #3228209: Add hasRole() method to AccountInterface,!2062Issue #3246454: Add weekly granularity to views date sort,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!877Issue #2708101: Default value for link text is not saved,!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493
Pipeline #104109 canceled
Pipeline: drupal

#104110

    ...@@ -289,6 +289,8 @@ function file_validate_image_resolution(FileInterface $file, $maximum_dimensions ...@@ -289,6 +289,8 @@ function file_validate_image_resolution(FileInterface $file, $maximum_dimensions
    if ($image->scale($width, $height)) { if ($image->scale($width, $height)) {
    $scaling = TRUE; $scaling = TRUE;
    $image->save(); $image->save();
    // Update the file size now that the image has been resized.
    $file->setSize($image->getFileSize());
    if (!empty($width) && !empty($height)) { if (!empty($width) && !empty($height)) {
    $message = t('The image was resized to fit within the maximum allowed dimensions of %dimensions pixels. The new dimensions of the resized image are %new_widthx%new_height pixels.', $message = t('The image was resized to fit within the maximum allowed dimensions of %dimensions pixels. The new dimensions of the resized image are %new_widthx%new_height pixels.',
    [ [
    ......
    ...@@ -37,6 +37,7 @@ protected function setUp(): void { ...@@ -37,6 +37,7 @@ protected function setUp(): void {
    /** @var \Drupal\Core\File\FileSystemInterface $file_system */ /** @var \Drupal\Core\File\FileSystemInterface $file_system */
    $file_system = \Drupal::service('file_system'); $file_system = \Drupal::service('file_system');
    $this->image->setFilename($file_system->basename($this->image->getFileUri())); $this->image->setFilename($file_system->basename($this->image->getFileUri()));
    $this->image->setSize(@filesize($this->image->getFileUri()));
    $this->nonImage = File::create(); $this->nonImage = File::create();
    $this->nonImage->setFileUri('core/assets/vendor/jquery/jquery.min.js'); $this->nonImage->setFileUri('core/assets/vendor/jquery/jquery.min.js');
    ...@@ -191,6 +192,8 @@ public function testFileValidateImageResolution() { ...@@ -191,6 +192,8 @@ public function testFileValidateImageResolution() {
    // Verify that the image was scaled to the correct width and height. // Verify that the image was scaled to the correct width and height.
    $this->assertLessThanOrEqual(10, $image->getWidth()); $this->assertLessThanOrEqual(10, $image->getWidth());
    $this->assertLessThanOrEqual(5, $image->getHeight()); $this->assertLessThanOrEqual(5, $image->getHeight());
    // Verify that the file size has been updated after resizing.
    $this->assertEquals($this->image->getSize(), $image->getFileSize());
    // Once again, now with negative width and height to force an error. // Once again, now with negative width and height to force an error.
    copy('core/misc/druplicon.png', 'temporary://druplicon.png'); copy('core/misc/druplicon.png', 'temporary://druplicon.png');
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment