magento/magento2#12768: Merge branch '2.2-develop' of... (28693ef8) · Commits · KIII-12 / Magento

Unverified Commit 28693ef8 authored 7 years ago by

Ievgen Shakhsuvarov

magento/magento2#12768: Merge branch '2.2-develop' of...

magento/magento2#12768: Merge branch '2.2-develop' of github.com:magento/magento2 into fix-missing-bcmath-dependency-3

parents 9d3c10f8 3c59bd54

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Block/Product/ImageBuilder.php 8 additions, 3 deletions

app/code/Magento/Catalog/Block/Product/ImageBuilder.php
app/code/Magento/Catalog/Model/Product/Image.php 16 additions, 6 deletions

app/code/Magento/Catalog/Model/Product/Image.php
app/code/Magento/Catalog/Model/Product/Image/NotLoadInfoImageException.php 10 additions, 0 deletions

...Catalog/Model/Product/Image/NotLoadInfoImageException.php
app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php 7 additions, 1 deletion

...talog/Ui/DataProvider/Product/Listing/Collector/Image.php
app/code/Magento/Checkout/Model/Cart.php 2 additions, 1 deletion

app/code/Magento/Checkout/Model/Cart.php
app/code/Magento/Checkout/Model/Cart/CartInterface.php 1 addition, 1 deletion

app/code/Magento/Checkout/Model/Cart/CartInterface.php
app/code/Magento/Webapi/Controller/Rest/InputParamsResolver.php 12 additions, 5 deletions

...de/Magento/Webapi/Controller/Rest/InputParamsResolver.php
app/code/Magento/Webapi/Controller/Soap/Request/Handler.php 11 additions, 3 deletions

app/code/Magento/Webapi/Controller/Soap/Request/Handler.php
app/code/Magento/Webapi/Model/UrlDecoder.php 35 additions, 0 deletions

app/code/Magento/Webapi/Model/UrlDecoder.php
app/code/Magento/Wishlist/CustomerData/Wishlist.php 8 additions, 3 deletions

app/code/Magento/Wishlist/CustomerData/Wishlist.php
dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php 23 additions, 0 deletions

...te/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
dev/tests/api-functional/testsuite/Magento/CatalogInventory/Api/StockItemTest.php 144 additions, 10 deletions

.../testsuite/Magento/CatalogInventory/Api/StockItemTest.php
dev/tests/api-functional/testsuite/Magento/CatalogInventory/Api/StockStatusTest.php 28 additions, 0 deletions

...estsuite/Magento/CatalogInventory/Api/StockStatusTest.php
dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_sku_with_slash.php 41 additions, 0 deletions

.../Magento/Catalog/_files/product_simple_sku_with_slash.php
dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_sku_with_slash_rollback.php 24 additions, 0 deletions

...Catalog/_files/product_simple_sku_with_slash_rollback.php
dev/tests/integration/testsuite/Magento/Setup/Fixtures/FixtureModelTest.php 1 addition, 1 deletion

...ion/testsuite/Magento/Setup/Fixtures/FixtureModelTest.php
dev/tests/integration/testsuite/Magento/Setup/Fixtures/FixturesAsserts/BundleProductsAssert.php 3 additions, 1 deletion

...o/Setup/Fixtures/FixturesAsserts/BundleProductsAssert.php
dev/tests/integration/testsuite/Magento/Setup/Fixtures/FixturesAsserts/ConfigurableProductsAssert.php 3 additions, 1 deletion

...p/Fixtures/FixturesAsserts/ConfigurableProductsAssert.php
dev/tests/integration/testsuite/Magento/Setup/Fixtures/FixturesAsserts/ImagesAssert.php 3 additions, 0 deletions

...e/Magento/Setup/Fixtures/FixturesAsserts/ImagesAssert.php
dev/tests/integration/testsuite/Magento/Setup/Fixtures/FixturesAsserts/SimpleProductsAssert.php 3 additions, 1 deletion

...o/Setup/Fixtures/FixturesAsserts/SimpleProductsAssert.php

with 383 additions and 37 deletions

Please register or to comment

Admin message

magento/magento2#12768: Merge branch '2.2-develop' of...