MAGETWO-62680: Creation real classes from virtual

OlgaVasyltsun · OlgaVasyltsun · commit ef13c54ec707 · 2017-01-04T10:06:50.000+02:00
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Grid/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Grid/Collection.php
@@ -29,7 +29,7 @@ public function __construct(
         FetchStrategy $fetchStrategy,
         EventManager $eventManager,
         $mainTable = 'sales_creditmemo_grid',
-        $resourceModel = '\Magento\Sales\Model\ResourceModel\Order\Creditmemo'
+        $resourceModel = \Magento\Sales\Model\ResourceModel\Order\Creditmemo::class
     ) {
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
     }
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Order/Grid/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Order/Grid/Collection.php
@@ -29,7 +29,7 @@ public function __construct(
         FetchStrategy $fetchStrategy,
         EventManager $eventManager,
         $mainTable = 'sales_creditmemo_grid',
-        $resourceModel = '\Magento\Sales\Model\ResourceModel\Order\Creditmemo'
+        $resourceModel = \Magento\Sales\Model\ResourceModel\Order\Creditmemo::class
     ) {
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
     }
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/Collection.php
@@ -29,7 +29,7 @@ public function __construct(
         FetchStrategy $fetchStrategy,
         EventManager $eventManager,
         $mainTable = 'sales_invoice_grid',
-        $resourceModel = '\Magento\Sales\Model\ResourceModel\Order\Invoice'
+        $resourceModel = \Magento\Sales\Model\ResourceModel\Order\Invoice::class
     ) {
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
     }
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Orders/Grid/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Orders/Grid/Collection.php
@@ -29,7 +29,7 @@ public function __construct(
         FetchStrategy $fetchStrategy,
         EventManager $eventManager,
         $mainTable = 'sales_invoice_grid',
-        $resourceModel = '\Magento\Sales\Model\ResourceModel\Order\Invoice'
+        $resourceModel = \Magento\Sales\Model\ResourceModel\Order\Invoice::class
     ) {
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
     }
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Grid/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Grid/Collection.php
@@ -29,7 +29,7 @@ public function __construct(
         FetchStrategy $fetchStrategy,
         EventManager $eventManager,
         $mainTable = 'sales_shipment_grid',
-        $resourceModel = '\Magento\Sales\Model\ResourceModel\Order\Shipment'
+        $resourceModel = \Magento\Sales\Model\ResourceModel\Order\Shipment::class
     ) {
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
     }
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Order/Grid/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Order/Grid/Collection.php
@@ -29,7 +29,7 @@ public function __construct(
         FetchStrategy $fetchStrategy,
         EventManager $eventManager,
         $mainTable = 'sales_shipment_grid',
-        $resourceModel = '\Magento\Sales\Model\ResourceModel\Order\Shipment'
+        $resourceModel = \Magento\Sales\Model\ResourceModel\Order\Shipment::class
     ) {
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
     }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple.php
@@ -6,7 +6,7 @@
 
 /** @var $product \Magento\Catalog\Model\Product */
 $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-    ->create('Magento\Catalog\Model\Product');
+    ->create(\Magento\Catalog\Model\Product::class);
 $product->isObjectNew(true);
 $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
     ->setId(1)
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_multiwebsite.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_multiwebsite.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * simple product assignet two websites fixture
+ *
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+require __DIR__ . '/../../../Magento/Store/_files/second_website_store.php';
+/** @var \Magento\Store\Model\Store $store */
+/** @var Magento\TestFramework\ObjectManager $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1,2])
+    ->setName('Simple Product Two')
+    ->setSku('simple_two')
+    ->setPrice(10)
+    ->setWeight(2)
+    ->setStockData(
+        [
+            'use_config_manage_stock'   => 1,
+            'qty'                       => 100,
+            'is_qty_decimal'            => 0,
+            'is_in_stock'               => 1,
+        ]
+    )
+    ->setCategoryIds([2])
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
@@ -14,25 +14,25 @@
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
-$billingAddress = $objectManager->create('Magento\Sales\Model\Order\Address', ['data' => $addressData]);
+$billingAddress = $objectManager->create(\Magento\Sales\Model\Order\Address::class, ['data' => $addressData]);
 $billingAddress->setAddressType('billing');
 
 $shippingAddress = clone $billingAddress;
 $shippingAddress->setId(null)->setAddressType('shipping');
 
-$payment = $objectManager->create('Magento\Sales\Model\Order\Payment');
+$payment = $objectManager->create(\Magento\Sales\Model\Order\Payment::class);
 $payment->setMethod('checkmo');
 
 /** @var \Magento\Sales\Model\Order\Item $orderItem */
-$orderItem = $objectManager->create('Magento\Sales\Model\Order\Item');
+$orderItem = $objectManager->create(\Magento\Sales\Model\Order\Item::class);
 $orderItem->setProductId($product->getId())->setQtyOrdered(2);
 $orderItem->setBasePrice($product->getPrice());
 $orderItem->setPrice($product->getPrice());
 $orderItem->setRowTotal($product->getPrice());
 $orderItem->setProductType('simple');
 
 /** @var \Magento\Sales\Model\Order $order */
-$order = $objectManager->create('Magento\Sales\Model\Order');
+$order = $objectManager->create(\Magento\Sales\Model\Order::class);
 $order->setIncrementId(
     '100000001'
 )->setState(
@@ -56,7 +56,7 @@
 )->setShippingAddress(
     $shippingAddress
 )->setStoreId(
-    $objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getId()
+    $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->getStore()->getId()
 )->addItem(
     $orderItem
 )->setPayment(
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_fixture_second_store.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_fixture_second_store.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Order for second store fixture.
+ *
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_multiwebsite.php';
+/** @var \Magento\Catalog\Model\Product $product */
+/** @var \Magento\Store\Model\Store $store */
+
+$addressData = include __DIR__ . '/address_data.php';
+/** @var Magento\TestFramework\ObjectManager $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Sales\Model\Order\Address $billingAddress */
+$billingAddress = $objectManager->create(\Magento\Sales\Model\Order\Address::class, ['data' => $addressData]);
+$billingAddress->setAddressType('billing');
+
+/** @var \Magento\Sales\Model\Order\Address $shippingAddress */
+$shippingAddress = clone $billingAddress;
+$shippingAddress->setId(null)->setAddressType('shipping');
+
+/** @var \Magento\Sales\Model\Order\Payment $payment */
+$payment = $objectManager->create(\Magento\Sales\Model\Order\Payment::class);
+$payment->setMethod('checkmo');
+
+/** @var \Magento\Sales\Model\Order\Item $orderItem */
+$orderItem = $objectManager->create(\Magento\Sales\Model\Order\Item::class);
+$orderItem->setProductId($product->getId())->setQtyOrdered(2);
+$orderItem->setBasePrice($product->getPrice());
+$orderItem->setPrice($product->getPrice());
+$orderItem->setRowTotal($product->getPrice());
+$orderItem->setProductType('simple');
+
+$storeId = $store->getStoreId();
+$incrementId = $storeId . '00000001';
+/** @var \Magento\Sales\Model\Order $order */
+$order = $objectManager->create(\Magento\Sales\Model\Order::class);
+$order->setIncrementId(
+    $incrementId
+)->setState(
+    \Magento\Sales\Model\Order::STATE_PROCESSING
+)->setStatus(
+    $order->getConfig()->getStateDefaultStatus(\Magento\Sales\Model\Order::STATE_PROCESSING)
+)->setSubtotal(
+    100
+)->setBaseSubtotal(
+    100
+)->setCustomerIsGuest(
+    true
+)->setCustomerEmail(
+    'customer@null.com'
+)->setBillingAddress(
+    $billingAddress
+)->setShippingAddress(
+    $shippingAddress
+)->setStoreId(
+    $storeId
+)->addItem(
+    $orderItem
+)->setPayment(
+    $payment
+);
+$order->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_invoice_shipment_creditmemo_for_two_stores.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_invoice_shipment_creditmemo_for_two_stores.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Invoice, shipment, creditmemo for two stores fixture
+ *
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$filesArray = ['order.php','order_fixture_second_store.php'];
+
+foreach ($filesArray as $file) {
+    require $file;
+    /** @var \Magento\Sales\Model\Order $order */
+    /** @var \Magento\Sales\Model\Order\Item $orderItem */
+
+    /** @var \Magento\Sales\Api\InvoiceManagementInterface $orderService */
+    $orderService = $objectManager->create(
+        \Magento\Sales\Api\InvoiceManagementInterface::class
+    );
+    $orderIncrementId = $order->getIncrementId();
+    /** @var \Magento\Sales\Model\Order\Invoice $invoice */
+    $invoice = $orderService->prepareInvoice($order);
+    $invoice->register();
+    $order->setIsInProcess(true);
+    /** @var \Magento\Framework\DB\Transaction $transactionSave */
+    $transactionSave = $objectManager
+        ->create(\Magento\Framework\DB\Transaction::class);
+    $transactionSave->addObject($invoice)->addObject($order)->save();
+
+    /** @var Magento\Sales\Model\Order\Payment $payment */
+    $payment = $order->getPayment();
+    $paymentInfoBlock = $objectManager
+        ->get(\Magento\Payment\Helper\Data::class)
+        ->getInfoBlock($payment);
+    $payment->setBlockMock($paymentInfoBlock);
+
+    /** @var \Magento\Sales\Model\Order\Shipment $shipment */
+    $shipment = $objectManager->create(\Magento\Sales\Model\Order\Shipment::class);
+    $shipment->setOrder($order);
+
+    /** @var \Magento\Sales\Model\Order\Shipment\Item $shipmentItem */
+    $shipmentItem = $objectManager->create(\Magento\Sales\Model\Order\Shipment\Item::class);
+    $shipmentItem->setOrderItem($orderItem);
+    $shipment->addItem($shipmentItem);
+    $shipment->setPackages([['1'], ['2']]);
+    $shipment->setShipmentStatus(\Magento\Sales\Model\Order\Shipment::STATUS_NEW);
+
+    $shipment->save();
+
+    /** @var \Magento\Sales\Model\Order\CreditmemoFactory $creditmemoFactory */
+    $creditmemoFactory = $objectManager->get(\Magento\Sales\Model\Order\CreditmemoFactory::class);
+    /** @var Magento\Sales\Model\Order\Creditmemo $creditmemo */
+    $creditmemo = $creditmemoFactory->createByOrder($order, $order->getData());
+    $creditmemo->setOrder($order);
+    $creditmemo->setState(Magento\Sales\Model\Order\Creditmemo::STATE_OPEN);
+    $creditmemo->setIncrementId($orderIncrementId);
+    $creditmemo->save();
+}
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_website_store.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_website_store.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Second website and store fixture
+ *
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var Magento\TestFramework\ObjectManager $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var $website \Magento\Store\Model\Website */
+$website = $objectManager->create(\Magento\Store\Model\Website::class);
+
+if (!$website->load('second_website', 'code')->getId()) {
+    $website->setData(['code' => 'second_website', 'name' => 'Second Website', 'is_default' => '0']);
+    $website->save();
+}
+
+$websiteId = $website->getId();
+
+$group = $objectManager->create(\Magento\Store\Model\Group::class);
+
+if (!$group->load('Second Group', 'name')->getId()) {
+    $group->setData(['website_id' => $websiteId, 'name' => 'Second Group', 'root_category_id' => '2']);
+    $group->save();
+}
+
+$groupId = $group->getId();
+
+$store = $objectManager->create(\Magento\Store\Model\Store::class);
+$storeId = $store->load('fixture_second_store', 'code')->getId();
+
+if (!$storeId) {
+    $store->setCode(
+        'fixture_second_store'
+    )->setWebsiteId(
+        $websiteId
+    )->setGroupId(
+        $groupId
+    )->setName(
+        'Fixture Store'
+    )->setSortOrder(
+        10
+    )->setIsActive(
+        1
+    );
+    $store->save();
+
+    $eventManager = $objectManager->create(\Magento\Framework\Event\ManagerInterface::class);
+    $eventName = 'store_add';
+    $eventManager->dispatch($eventName, ['store' => $store]);
+
+    /* Refresh stores memory cache */
+    $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->reinitStores();
+}

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function __construct(`
`29`	`29`	`FetchStrategy $fetchStrategy,`
`30`	`30`	`EventManager $eventManager,`
`31`	`31`	`$mainTable = 'sales_creditmemo_grid',`
`32`		`- $resourceModel = '\Magento\Sales\Model\ResourceModel\Order\Creditmemo'`
	`32`	`+ $resourceModel = \Magento\Sales\Model\ResourceModel\Order\Creditmemo::class`
`33`	`33`	`) {`
`34`	`34`	`parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);`
`35`	`35`	`}`