From 0fc837e33067e6337893d9478669c657f4d42e42 Mon Sep 17 00:00:00 2001 From: peterjaap Date: Thu, 11 Oct 2018 21:09:35 +0200 Subject: [PATCH] Fixed typo from heght to height for image validation rule --- app/code/Magento/Customer/Model/Metadata/Form/Image.php | 2 +- .../Customer/Test/Unit/Model/Metadata/Form/ImageTest.php | 2 +- app/code/Magento/Eav/Model/Attribute/Data/Image.php | 6 +++--- .../Eav/Test/Unit/Model/Attribute/Data/ImageTest.php | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Image.php b/app/code/Magento/Customer/Model/Metadata/Form/Image.php index 2104f941a6bc2..692d08aae8d78 100644 --- a/app/code/Magento/Customer/Model/Metadata/Form/Image.php +++ b/app/code/Magento/Customer/Model/Metadata/Form/Image.php @@ -133,7 +133,7 @@ protected function _validateByRules($value) $maxImageHeight = ArrayObjectSearch::getArrayElementByName( $rules, - 'max_image_heght' + 'max_image_height' ); if ($maxImageHeight !== null) { if ($maxImageHeight < $imageProp[1]) { diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php index 0278e2b2d791d..31d2a31ceae4c 100644 --- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php +++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php @@ -259,7 +259,7 @@ public function testValidateMaxImageHeight() )->getMockForAbstractClass(); $validationRuleMock->expects($this->any()) ->method('getName') - ->willReturn('max_image_heght'); + ->willReturn('max_image_height'); $validationRuleMock->expects($this->any()) ->method('getValue') ->willReturn($maxImageHeight); diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Image.php b/app/code/Magento/Eav/Model/Attribute/Data/Image.php index d04b7e9b940cf..0020256dfb148 100644 --- a/app/code/Magento/Eav/Model/Attribute/Data/Image.php +++ b/app/code/Magento/Eav/Model/Attribute/Data/Image.php @@ -54,9 +54,9 @@ protected function _validateByRules($value) $errors[] = __('"%1" width exceeds allowed value of %2 px.', $label, $r); } } - if (!empty($rules['max_image_heght'])) { - if ($rules['max_image_heght'] < $imageProp[1]) { - $r = $rules['max_image_heght']; + if (!empty($rules['max_image_height'])) { + if ($rules['max_image_height'] < $imageProp[1]) { + $r = $rules['max_image_height']; $errors[] = __('"%1" height exceeds allowed value of %2 px.', $label, $r); } } diff --git a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/ImageTest.php b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/ImageTest.php index c89f581daac82..2df87c39868a1 100644 --- a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/ImageTest.php +++ b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/ImageTest.php @@ -143,7 +143,7 @@ public function validateValueDataProvider() 'originalValue' => 'value', 'isRequired' => true, 'isAjaxRequest' => false, - 'rules' => ['max_image_heght' => 2], + 'rules' => ['max_image_height' => 2], 'expectedResult' => ['"Label" height exceeds allowed value of 2 px.'] ], [ @@ -151,7 +151,7 @@ public function validateValueDataProvider() 'originalValue' => 'value', 'isRequired' => true, 'isAjaxRequest' => false, - 'rules' => ['max_image_heght' => 2000], + 'rules' => ['max_image_height' => 2000], 'expectedResult' => true ], [ @@ -159,7 +159,7 @@ public function validateValueDataProvider() 'originalValue' => 'value', 'isRequired' => true, 'isAjaxRequest' => false, - 'rules' => ['max_image_heght' => 2, 'max_image_width' => 2], + 'rules' => ['max_image_height' => 2, 'max_image_width' => 2], 'expectedResult' => [ '"Label" width exceeds allowed value of 2 px.', '"Label" height exceeds allowed value of 2 px.',