🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #11513: Modify Report processor to return 500 (by @andrewhowdencom)
 - #13914: Pass Expected Data Type in backgroundColor Call (2.2) (by @northernco)


Fixed GitHub Issues:
 - #11512: Incorrect use of 503 status code (reported by @andrewhowdencom) has been fixed in #11513 by @andrewhowdencom in 2.2-develop branch
   Related commits:
     1. b4bfe4b

Author: magento-engcom-team

app/code/Magento/Swatches/Helper/Media.php

@@ -207,7 +207,7 @@ protected function setupImageProperties(\Magento\Framework\Image $image, $isSwat
         if ($isSwatch) {
             $image->keepFrame(true);
             $image->keepTransparency(true);
-            $image->backgroundColor('#FFF');
+            $image->backgroundColor([255, 255, 255]);
         }
         return $this;
     }

app/code/Magento/Swatches/Test/Unit/Helper/MediaTest.php

@@ -166,6 +166,7 @@ public function testGenerateSwatchVariations()
         $this->imageFactoryMock->expects($this->any())->method('create')->willReturn($image);
         $this->generateImageConfig();
         $image->expects($this->any())->method('resize')->will($this->returnSelf());
+        $image->expects($this->atLeastOnce())->method('backgroundColor')->with([255, 255, 255])->willReturnSelf();
         $this->mediaHelperObject->generateSwatchVariations('/e/a/earth.png');
     }
 

pub/errors/processor.php

@@ -215,7 +215,7 @@ public function process503()
     public function processReport()
     {
         $this->pageTitle = 'There has been an error processing your request';
-        $this->_response->setHttpResponseCode(503);
+        $this->_response->setHttpResponseCode(500);
 
         $this->showErrorMsg = false;
         $this->showSentMsg  = false;