Merge pull request #1044 from magento-engcom/2.1-develop-prs

Public Pull Requests: 
 - #9092
 - #8880

Author: Oleksii Korshenko

app/code/Magento/Theme/view/adminhtml/ui_component/design_config_form.xml

@@ -67,7 +67,7 @@
                         <item name="componentType" xsi:type="string">fileUploader</item>
                         <item name="notice" xsi:type="string" translate="true">Allowed file types: ico, png, gif, jpg, jpeg, apng, svg. Not all browsers support all these formats!</item>
                         <item name="maxFileSize" xsi:type="number">2097152</item>
-                        <item name="allowedExtensions" xsi:type="string">jpg jpeg gif png svg</item>
+                        <item name="allowedExtensions" xsi:type="string">ico jpg jpeg gif png svg apng</item>
                         <item name="uploaderConfig" xsi:type="array">
                             <item name="url" xsi:type="string">theme/design_config_fileUploader/save</item>
                         </item>

lib/internal/Magento/Framework/View/Layout/Data/Structure.php

@@ -119,7 +119,7 @@ public function reorderChildElement($parentName, $childName, $offsetOrSibling, $
                 $siblingParentName = $this->getParentId($sibling);
                 if ($parentName !== $siblingParentName) {
                     if ($this->state->getMode() === State::MODE_DEVELOPER) {
-                        $this->logger->critical(
+                        $this->logger->info(
                             "Broken reference: the '{$childName}' tries to reorder itself towards '{$sibling}', but " .
                             "their parents are different: '{$parentName}' and '{$siblingParentName}' respectively."
                         );

lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php

@@ -201,7 +201,7 @@ public function scheduleElement(
                 $scheduledStructure->setElementToBrokenParentList($key);
 
                 if ($this->state->getMode() === State::MODE_DEVELOPER) {
-                    $this->logger->critical(
+                    $this->logger->info(
                         "Broken reference: the '{$name}' element cannot be added as child to '{$parentName}', " .
                         'because the latter doesn\'t exist'
                     );

lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php

@@ -64,7 +64,7 @@ public function testReorderChildElementLog($loggerExpects, $stateMode)
             ->method('getMode')
             ->willReturn($stateMode);
         $this->loggerMock->expects($loggerExpects)
-            ->method('critical')
+            ->method('info')
             ->with(
                 "Broken reference: the '{$childName}' tries to reorder itself towards '', but " .
                 "their parents are different: '{$parentName}' and '' respectively."

lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php

@@ -181,7 +181,7 @@ public function testScheduleElementLog($loggerExpects, $stateMode)
             ->method('getMode')
             ->willReturn($stateMode);
         $this->loggerMock->expects($loggerExpects)
-            ->method('critical')
+            ->method('info')
             ->with(
                 "Broken reference: the '{$key}' element cannot be added as child to '{$parentName}', " .
                 'because the latter doesn\'t exist'