Commit 9561244

committed

Merge remote-tracking branch 'origin/MAGETWO-65145' into develop-pr3

2 parents 8b4ee8d + ee1074d commit 9561244Copy full SHA for 9561244

27 files changed

+589

-799

lines changed

app/code/Magento
- CatalogInventoryConfigurableProduct
  - LICENSE.txt
  - LICENSE_AFL.txt
  - Plugin
    - GetInStockAttributeOptionsPlugin.php
  - README.md
  - Test/Unit/Plugin
    - GetInStockAttributeOptionsPluginTest.php
  - composer.json
  - etc
    - frontend
      - di.xml
    - module.xml
  - registration.php
- ConfigurableProduct
  - Model
    - AttributeOptionProvider.php
    - ResourceModel/Attribute
      - OptionSelectBuilder.php
      - OptionSelectBuilderInterface.php
  - Plugin/Model/ResourceModel/Attribute
    - InStockOptionSelectBuilder.php
  - Test/Unit
    - Model
      - AttributeOptionProviderTest.php
      - ResourceModel/Attribute
        OptionSelectBuilderTest.php
    - Plugin/Model/ResourceModel/Attribute
      - InStockOptionSelectBuilderTest.php
  - etc
    - di.xml
    - frontend
      - di.xml
composer.json
composer.lock
dev/tests/functional/tests/app/Magento
- CatalogInventoryConfigurableProduct/Test
  - Repository/ConfigurableProduct
    - ConfigurableAttributesData.xml
  - TestCase
    - CreateConfigurableProductEntityTest.xml
  - etc
    - di.xml
- ConfigurableProduct/Test
  - Constraint
    - AssertOutOfStockOptionIsAbsentOnProductPage.php
  - Repository/ConfigurableProduct
    - ConfigurableAttributesData.xml
  - TestCase
    - CreateConfigurableProductEntityTest.xml
  - etc
    - di.xml

27 files changed

+589

-799

lines changed

`‎app/code/Magento/CatalogInventoryConfigurableProduct/LICENSE.txt`

This file was deleted.

Comments

(0)