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

Oleksii Korshenko · web-flow · commit 8844ce348897 · 2017-02-27T20:00:15.000-06:00
Public Pull Requests: #2275 #8683 #8682
diff --git a/app/code/Magento/Sales/Model/OrderRepository.php b/app/code/Magento/Sales/Model/OrderRepository.php
@@ -99,7 +99,7 @@ public function get($id)
      * Find entities by criteria
      *
      * @param \Magento\Framework\Api\SearchCriteria $searchCriteria
-     * @return OrderInterface[]
+     * @return \Magento\Sales\Api\Data\OrderSearchResultInterface
      */
     public function getList(\Magento\Framework\Api\SearchCriteria $searchCriteria)
     {
diff --git a/lib/internal/Magento/Framework/App/Bootstrap.php b/lib/internal/Magento/Framework/App/Bootstrap.php
@@ -135,7 +135,7 @@ public static function populateAutoloader($rootDir, $initParams)
     {
         $dirList = self::createFilesystemDirectoryList($rootDir, $initParams);
         $autoloadWrapper = AutoloaderRegistry::getAutoloader();
-        Populator::populateMappings($autoloadWrapper, $dirList, new ComponentRegistrar());
+        Populator::populateMappings($autoloadWrapper, $dirList);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public function get($id)`
`99`	`99`	`* Find entities by criteria`
`100`	`100`	`*`
`101`	`101`	`* @param \Magento\Framework\Api\SearchCriteria $searchCriteria`
`102`		`- * @return OrderInterface[]`
	`102`	`+ * @return \Magento\Sales\Api\Data\OrderSearchResultInterface`
`103`	`103`	`*/`
`104`	`104`	`public function getList(\Magento\Framework\Api\SearchCriteria $searchCriteria)`
`105`	`105`	`{`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ public static function populateAutoloader($rootDir, $initParams)`
`135`	`135`	`{`
`136`	`136`	`$dirList = self::createFilesystemDirectoryList($rootDir, $initParams);`
`137`	`137`	`$autoloadWrapper = AutoloaderRegistry::getAutoloader();`
`138`		`- Populator::populateMappings($autoloadWrapper, $dirList, new ComponentRegistrar());`
	`138`	`+ Populator::populateMappings($autoloadWrapper, $dirList);`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`/**`