MAGETWO-39372: Build stabilization

Ievgen Shakhsuvarov · Ievgen Shakhsuvarov · commit ca5027242067 · 2015-06-28T16:47:47.000+03:00
- Static
diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
@@ -6,7 +6,6 @@
         "magento/module-store": "0.74.0-beta14",
         "magento/module-customer": "0.74.0-beta14",
         "magento/module-checkout": "0.74.0-beta14",
-        "magento/module-quote": "0.74.0-beta14",
         "magento/module-backend": "0.74.0-beta14",
         "magento/framework": "0.74.0-beta14",
         "magento/magento-composer-installer": "*"
diff --git a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
@@ -65,8 +65,9 @@ public function process($jsLayout)
         )) {
             $jsLayout['components']['checkout']['children']['steps']['children']['billing-step']['children']
             ['payment']['children']['payments-list']['children'] =
-                array_merge_recursive($jsLayout['components']['checkout']['children']['steps']['children']
-                ['billing-step']['children']['payment']['children']['payments-list']['children'],
+                array_merge_recursive(
+                    $jsLayout['components']['checkout']['children']['steps']['children']['billing-step']['children']
+                    ['payment']['children']['payments-list']['children'],
                     $this->processPaymentConfiguration(
                         $jsLayout['components']['checkout']['children']['steps']['children']['billing-step']['children']
                         ['payment']['children']['renders']['children'],
diff --git a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
@@ -33,7 +33,6 @@ public function __construct(
         \Magento\Quote\Api\GuestBillingAddressManagementInterface $billingAddressManagement,
         \Magento\Quote\Api\GuestPaymentMethodManagementInterface $paymentMethodManagement,
         \Magento\Quote\Api\GuestCartManagementInterface $cartManagement
-
     ) {
         $this->billingAddressManagement = $billingAddressManagement;
         $this->paymentMethodManagement = $paymentMethodManagement;
@@ -63,7 +62,7 @@ public function savePaymentInformation(
         \Magento\Quote\Api\Data\AddressInterface $billingAddress
     ) {
         $billingAddress->setEmail($email);
-        $this->billingAddressManagement->assign($cartId,  $billingAddress);
+        $this->billingAddressManagement->assign($cartId, $billingAddress);
         $this->paymentMethodManagement->set($cartId, $paymentMethod);
         return true;
     }
diff --git a/app/code/Magento/Checkout/Model/PaymentInformationManagement.php b/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
@@ -33,7 +33,6 @@ public function __construct(
         \Magento\Quote\Api\BillingAddressManagementInterface $billingAddressManagement,
         \Magento\Quote\Api\PaymentMethodManagementInterface $paymentMethodManagement,
         \Magento\Quote\Api\CartManagementInterface $cartManagement
-
     ) {
         $this->billingAddressManagement = $billingAddressManagement;
         $this->paymentMethodManagement = $paymentMethodManagement;
diff --git a/app/code/Magento/Checkout/Model/ShippingInformationManagement.php b/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
@@ -12,16 +12,7 @@
 use \Magento\Quote\Model\QuoteAddressValidator;
 
 class ShippingInformationManagement implements \Magento\Checkout\Api\ShippingInformationManagementInterface
-{/**
- * @var \Magento\Quote\Api\GuestShippingAddressManagementInterface
- */
-    protected $shippingAddressManagement;
-
-    /**
-     * @var \Magento\Quote\Api\GuestShippingMethodManagementInterface
-     */
-    protected $shippingMethodManagement;
-
+{
     /**
      * @var \Magento\Quote\Api\PaymentMethodManagementInterface
      */
@@ -69,15 +60,16 @@ class ShippingInformationManagement implements \Magento\Checkout\Api\ShippingInf
     protected $scopeConfig;
 
     /**
-     * @param \Magento\Quote\Api\ShippingAddressManagementInterface $shippingAddressManagement
-     * @param \Magento\Quote\Api\ShippingMethodManagementInterface $shippingMethodManagement
      * @param \Magento\Quote\Api\PaymentMethodManagementInterface $paymentMethodManagement
-     * @param PaymentDetailsFactory $paymentDetailsFactory
+     * @param \Magento\Checkout\Model\PaymentDetailsFactory $paymentDetailsFactory
      * @param \Magento\Quote\Api\CartTotalRepositoryInterface $cartTotalsRepository
+     * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+     * @param \Magento\Quote\Model\QuoteAddressValidator $addressValidator
+     * @param Logger $logger
+     * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      */
     public function __construct(
-        \Magento\Quote\Api\ShippingAddressManagementInterface $shippingAddressManagement,
-        \Magento\Quote\Api\ShippingMethodManagementInterface $shippingMethodManagement,
         \Magento\Quote\Api\PaymentMethodManagementInterface $paymentMethodManagement,
         \Magento\Checkout\Model\PaymentDetailsFactory $paymentDetailsFactory,
         \Magento\Quote\Api\CartTotalRepositoryInterface $cartTotalsRepository,
@@ -87,8 +79,6 @@ public function __construct(
         \Magento\Customer\Api\AddressRepositoryInterface $addressRepository,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
     ) {
-        $this->shippingAddressManagement = $shippingAddressManagement;
-        $this->shippingMethodManagement = $shippingMethodManagement;
         $this->paymentMethodManagement = $paymentMethodManagement;
         $this->paymentDetailsFactory = $paymentDetailsFactory;
         $this->cartTotalsRepository = $cartTotalsRepository;
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/Cart/ImageProviderTest.php b/app/code/Magento/Checkout/Test/Unit/Model/Cart/ImageProviderTest.php
@@ -27,7 +27,7 @@ protected function setUp()
     {
         $this->itemRepositoryMock = $this->getMock('Magento\Quote\Api\CartItemRepositoryInterface', [], [], '', false);
         $this->itemPoolMock = $this->getMock('Magento\Checkout\CustomerData\ItemPoolInterface', [], [], '', false);
-        $this->model = new \Magento\Checkout\Model\Cart\ImageProvider (
+        $this->model = new \Magento\Checkout\Model\Cart\ImageProvider(
             $this->itemRepositoryMock,
             $this->itemPoolMock
         );
diff --git a/app/code/Magento/CheckoutAgreements/composer.json b/app/code/Magento/CheckoutAgreements/composer.json
@@ -6,7 +6,6 @@
         "magento/module-checkout": "0.74.0-beta14",
         "magento/module-store": "0.74.0-beta14",
         "magento/module-backend": "0.74.0-beta14",
-        "magento/module-ui": "0.74.0-beta14",
         "magento/framework": "0.74.0-beta14",
         "magento/magento-composer-installer": "*"
     },
diff --git a/app/code/Magento/Tax/Model/Quote/GrandTotalDetailsPlugin.php b/app/code/Magento/Tax/Model/Quote/GrandTotalDetailsPlugin.php
@@ -8,7 +8,6 @@
 use Magento\Quote\Model\Cart\CartTotalRepository;
 use Magento\Quote\Api\Data\TotalsExtensionFactory;
 
-
 class GrandTotalDetailsPlugin
 {
     /**

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ protected function setUp()`
`27`	`27`	`{`
`28`	`28`	`$this->itemRepositoryMock = $this->getMock('Magento\Quote\Api\CartItemRepositoryInterface', [], [], '', false);`
`29`	`29`	`$this->itemPoolMock = $this->getMock('Magento\Checkout\CustomerData\ItemPoolInterface', [], [], '', false);`
`30`		`- $this->model = new \Magento\Checkout\Model\Cart\ImageProvider (`
	`30`	`+ $this->model = new \Magento\Checkout\Model\Cart\ImageProvider(`
`31`	`31`	`$this->itemRepositoryMock,`
`32`	`32`	`$this->itemPoolMock`
`33`	`33`	`);`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`use Magento\Quote\Model\Cart\CartTotalRepository;`
`9`	`9`	`use Magento\Quote\Api\Data\TotalsExtensionFactory;`
`10`	`10`
`11`		`-`
`12`	`11`	`class GrandTotalDetailsPlugin`
`13`	`12`	`{`
`14`	`13`	`/**`