Merge remote-tracking branch 'upstream/2.2-develop' into 2.2-develop-pr

Author: Joan He

app/code/Magento/Deploy/Service/DeployPackage.php

@@ -112,6 +112,8 @@ function () use ($package, $options, $skipLogging) {
     }
 
     /**
+     * Execute package deploy procedure when area already emulated
+     *
      * @param Package $package
      * @param array $options
      * @param bool $skipLogging
@@ -141,7 +143,9 @@ public function deployEmulated(Package $package, array $options, $skipLogging =
                 $this->errorsCount++;
                 $this->logger->critical($errorMessage);
             } catch (\Exception $exception) {
-                $this->logger->critical($exception->getTraceAsString());
+                $this->logger->critical(
+                    'Compilation from source ' . $file->getSourcePath() . ' failed' . PHP_EOL . (string)$exception
+                );
                 $this->errorsCount++;
             }
         }
@@ -224,7 +228,9 @@ private function checkIfCanCopy(PackageFile $file, Package $package, Package $pa
     private function checkFileSkip($filePath, array $options)
     {
         if ($filePath !== '.') {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $ext = strtolower(pathinfo($filePath, PATHINFO_EXTENSION));
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $basename = pathinfo($filePath, PATHINFO_BASENAME);
             if ($ext === 'less' && strpos($basename, '_') === 0) {
                 return true;

app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml

@@ -14,14 +14,16 @@
         </thead>
         <?php $_items = $block->getShipment()->getAllItems() ?>
         <?php $_i = 0; foreach ($_items as $_item) :
-            if ($_item->getOrderItem()->getParentItem()) :
-                continue;
-            endif;
-            $_i++ ?>
-            <tbody class="<?= /* @noEscape */ $_i%2 ? 'odd' : 'even' ?>">
-                <?= $block->getItemHtml($_item) ?>
-                <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
-            </tbody>
+            if (!empty($_item->getOrderItem())) :
+                if ($_item->getOrderItem()->getParentItem()) :
+                    continue;
+                endif;
+                $_i++ ?>
+                <tbody class="<?= /* @noEscape */ $_i%2 ? 'odd' : 'even' ?>">
+                    <?= $block->getItemHtml($_item) ?>
+                    <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
+                </tbody>
+            <?php endif; ?>
         <?php endforeach; ?>
     </table>
 </div>