MAGETWO-45480: Error in the install sample data

Alex Bomko · Alex Bomko · commit 6ca3ecfc0b1c · 2015-11-14T02:19:15.000+02:00
diff --git a/app/code/Magento/BundleSampleData/Setup/Installer.php b/app/code/Magento/BundleSampleData/Setup/Installer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright � 2015 Magento. All rights reserved.
+ * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\BundleSampleData\Setup;
diff --git a/app/code/Magento/CatalogRuleSampleData/Setup/Installer.php b/app/code/Magento/CatalogRuleSampleData/Setup/Installer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright � 2015 Magento. All rights reserved.
+ * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\CatalogRuleSampleData\Setup;
diff --git a/app/code/Magento/CatalogSampleData/Setup/Installer.php b/app/code/Magento/CatalogSampleData/Setup/Installer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright � 2015 Magento. All rights reserved.
+ * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\CatalogSampleData\Setup;
diff --git a/app/code/Magento/CmsSampleData/Setup/Installer.php b/app/code/Magento/CmsSampleData/Setup/Installer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright � 2015 Magento. All rights reserved.
+ * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\CmsSampleData\Setup;
diff --git a/app/code/Magento/ConfigurableSampleData/Setup/Installer.php b/app/code/Magento/ConfigurableSampleData/Setup/Installer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright � 2015 Magento. All rights reserved.
+ * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\ConfigurableSampleData\Setup;
@@ -67,6 +67,5 @@ public function install()
             ['Magento_ConfigurableSampleData::fixtures/Links/upsell.csv'],
             ['Magento_ConfigurableSampleData::fixtures/Links/crossell.csv']
         );
-        $this->order->install(['Magento_ConfigurableSampleData::fixtures/orders.csv']);
     }
 }
diff --git a/app/code/Magento/CustomerSampleData/Setup/Installer.php b/app/code/Magento/CustomerSampleData/Setup/Installer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright � 2015 Magento. All rights reserved.
+ * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\CustomerSampleData\Setup;
diff --git a/app/code/Magento/DownloadableSampleData/Setup/Installer.php b/app/code/Magento/DownloadableSampleData/Setup/Installer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright � 2015 Magento. All rights reserved.
+ * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\DownloadableSampleData\Setup;
diff --git a/app/code/Magento/GroupedProductSampleData/Setup/Installer.php b/app/code/Magento/GroupedProductSampleData/Setup/Installer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright � 2015 Magento. All rights reserved.
+ * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\GroupedProductSampleData\Setup;
diff --git a/app/code/Magento/MsrpSampleData/Setup/Installer.php b/app/code/Magento/MsrpSampleData/Setup/Installer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright � 2015 Magento. All rights reserved.
+ * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\MsrpSampleData\Setup;
diff --git a/app/code/Magento/OfflineShippingSampleData/Setup/Installer.php b/app/code/Magento/OfflineShippingSampleData/Setup/Installer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright � 2015 Magento. All rights reserved.
+ * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\OfflineShippingSampleData\Setup;
diff --git a/app/code/Magento/ProductLinksSampleData/Setup/Installer.php b/app/code/Magento/ProductLinksSampleData/Setup/Installer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright � 2015 Magento. All rights reserved.
+ * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\ProductLinksSampleData\Setup;
diff --git a/app/code/Magento/ReviewSampleData/Setup/Installer.php b/app/code/Magento/ReviewSampleData/Setup/Installer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright � 2015 Magento. All rights reserved.
+ * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\ReviewSampleData\Setup;
diff --git a/app/code/Magento/SalesRuleSampleData/Setup/Installer.php b/app/code/Magento/SalesRuleSampleData/Setup/Installer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright � 2015 Magento. All rights reserved.
+ * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\SalesRuleSampleData\Setup;
diff --git a/app/code/Magento/SalesSampleData/Model/Order/Processor.php b/app/code/Magento/SalesSampleData/Model/Order/Processor.php
@@ -69,6 +69,16 @@ class Processor
      */
     protected $creditmemoManagement;
 
+    /**
+     * @var \Magento\Backend\Model\Session\QuoteFactory
+     */
+    protected $sessionQuoteFactory;
+
+    /**
+     * @var \Magento\Backend\Model\Session\Quote
+     */
+    protected $currentSession;
+
     /**
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Phrase\Renderer\CompositeFactory $rendererCompositeFactory
@@ -147,6 +157,9 @@ public function createOrder($orderData)
                 'current_shipment',
             ];
             $this->unsetRegistryData($registryItems);
+            $this->currentSession->unsQuoteId();
+            $this->currentSession->unsStoreId();
+            $this->currentSession->unsCustomerId();
         }
     }
 
@@ -156,9 +169,10 @@ public function createOrder($orderData)
      */
     protected function processQuote($data = [])
     {
+        $this->currentSession = $this->sessionQuoteFactory->create();
         /** @var \Magento\Sales\Model\AdminOrder\Create $orderCreateModel */
         $orderCreateModel = $this->createOrderFactory->create(
-            ['quoteSession' => $this->sessionQuoteFactory->create()]
+            ['quoteSession' => $this->currentSession]
         );
         if (!empty($data['order'])) {
             $orderCreateModel->importPostData($data['order']);
@@ -216,7 +230,7 @@ protected function invoiceOrder(\Magento\Sales\Model\Order\Item $orderItem)
     /**
      * @param int $orderId
      * @param array $invoiceData
-     * @return bool
+     * @return bool | \Magento\Sales\Model\Order\Invoice
      */
     protected function createInvoice($orderId, $invoiceData)
     {
diff --git a/app/code/Magento/SalesSampleData/Setup/InstallData.php b/app/code/Magento/SalesSampleData/Setup/InstallData.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright � 2015 Magento. All rights reserved.
+ * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\SalesSampleData\Setup;
diff --git a/app/code/Magento/SalesSampleData/Setup/Installer.php b/app/code/Magento/SalesSampleData/Setup/Installer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright � 2015 Magento. All rights reserved.
+ * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\SalesSampleData\Setup;
@@ -27,6 +27,6 @@ public function __construct(\Magento\SalesSampleData\Model\Order $order)
      */
     public function install()
     {
-        return;
+        $this->order->install(['Magento_SalesSampleData::fixtures/orders.csv']);
     }
 }
diff --git a/app/code/Magento/SalesSampleData/composer.json b/app/code/Magento/SalesSampleData/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0|~7.0.0",
+        "magento/module-sales": "100.0.*",
         "magento/module-sample-data": "100.0.*"
     },
     "type": "magento2-module",
diff --git a/app/code/Magento/SalesSampleData/fixtures/orders.csv b/app/code/Magento/SalesSampleData/fixtures/orders.csv
diff --git a/app/code/Magento/SwatchesSampleData/Setup/Installer.php b/app/code/Magento/SwatchesSampleData/Setup/Installer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright � 2015 Magento. All rights reserved.
+ * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\SwatchesSampleData\Setup;
diff --git a/app/code/Magento/TaxSampleData/Setup/Installer.php b/app/code/Magento/TaxSampleData/Setup/Installer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright � 2015 Magento. All rights reserved.
+ * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\TaxSampleData\Setup;
diff --git a/app/code/Magento/ThemeSampleData/Setup/Installer.php b/app/code/Magento/ThemeSampleData/Setup/Installer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright � 2015 Magento. All rights reserved.
+ * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\ThemeSampleData\Setup;
diff --git a/app/code/Magento/WidgetSampleData/Setup/Installer.php b/app/code/Magento/WidgetSampleData/Setup/Installer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright � 2015 Magento. All rights reserved.
+ * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\WidgetSampleData\Setup;
diff --git a/app/code/Magento/WishlistSampleData/Setup/Installer.php b/app/code/Magento/WishlistSampleData/Setup/Installer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright � 2015 Magento. All rights reserved.
+ * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\WishlistSampleData\Setup;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`	`/**`
`3`		`- * Copyright � 2015 Magento. All rights reserved.`
	`3`	`+ * Copyright © 2015 Magento. All rights reserved.`
`4`	`4`	`* See COPYING.txt for license details.`
`5`	`5`	`*/`
`6`	`6`	`namespace Magento\ConfigurableSampleData\Setup;`
`@@ -67,6 +67,5 @@ public function install()`
`67`	`67`	`['Magento_ConfigurableSampleData::fixtures/Links/upsell.csv'],`
`68`	`68`	`['Magento_ConfigurableSampleData::fixtures/Links/crossell.csv']`
`69`	`69`	`);`
`70`		`- $this->order->install(['Magento_ConfigurableSampleData::fixtures/orders.csv']);`
`71`	`70`	`}`
`72`	`71`	`}`