Merge pull request #876 from magento-engcom/develop-prs

Public Pull Requests #8513 #8668
magento · Feb 25, 2017 · 53591c6 · 53591c6
2 parents da52d4a + 17b632e
commit 53591c6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/code/Magento/Sales/Model/Service/OrderService.php b/app/code/Magento/Sales/Model/Service/OrderService.php
@@ -210,7 +210,7 @@ public function place(\Magento\Sales\Api\Data\OrderInterface $order)
      * @param string $comment
      * @param bool $isCustomerNotified
      * @param bool $shouldProtectState
-     * @return \Magento\Sales\Model\Order
+     * @return \Magento\Sales\Model\Service\OrderService
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function setState(

diff --git a/setup/src/Magento/Setup/Model/PhpInformation.php b/setup/src/Magento/Setup/Model/PhpInformation.php
@@ -45,7 +45,9 @@ public function getRequiredMinimumXDebugNestedLevel()
     public function getCurrent()
     {
         if (!$this->current) {
-            $this->current = array_map('strtolower', get_loaded_extensions());
+            $this->current = array_map(function ($ext) {
+                return str_replace(' ', '-', strtolower($ext));
+            }, get_loaded_extensions());
         }
         return $this->current;
     }