ACP2E-961: Customer attribute 'Is required' attribute is not properly overridden per website scope in Admin

viktym · viktym · commit 664d61ddb275 · 2022-08-24T16:32:18.000-05:00
diff --git a/app/code/Magento/Customer/Model/FileUploaderDataResolver.php b/app/code/Magento/Customer/Model/FileUploaderDataResolver.php
@@ -100,7 +100,7 @@ private function getFileUploaderData(
                 [
                     'file' => $file,
                     'size' => null !== $stat ? $stat['size'] : 0,
-                    'url' => $viewUrl ?? '',
+                    'url' => $viewUrl,
                     // phpcs:ignore Magento2.Functions.DiscouragedFunction
                     'name' => basename($file),
                     'type' => $fileProcessor->getMimeType($file),
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php
@@ -966,7 +966,8 @@ function ($origName) {
                                         'max_file_size' => $maxFileSize,
                                         'file_extensions' => 'ext1, eXt2 '
                                     ],
-                                    'label' => __('frontend_label')
+                                    'label' => __('frontend_label'),
+                                    'attributeId' => null
                                 ]
                             ]
                         ]

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ private function getFileUploaderData(`
`100`	`100`	`[`
`101`	`101`	`'file' => $file,`
`102`	`102`	`'size' => null !== $stat ? $stat['size'] : 0,`
`103`		`- 'url' => $viewUrl ?? '',`
	`103`	`+ 'url' => $viewUrl,`
`104`	`104`	`// phpcs:ignore Magento2.Functions.DiscouragedFunction`
`105`	`105`	`'name' => basename($file),`
`106`	`106`	`'type' => $fileProcessor->getMimeType($file),`