Merge remote-tracking branch 'mainline/2.3-develop'

Author: Volodymyr Kublytskyi

app/code/Magento/Catalog/Model/Category.php

@@ -97,6 +97,11 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      */
     protected $_url;
 
+    /**
+     * @var ResourceModel\Category
+     */
+    protected $_resource;
+
     /**
      * URL rewrite model
      *
@@ -313,6 +318,16 @@ protected function getCustomAttributesCodes()
         return $this->getCustomAttributeCodes->execute($this->metadataService);
     }
 
+    /**
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @return \Magento\Catalog\Model\ResourceModel\Category
+     * @deprecated because resource models should be used directly
+     */
+    protected function _getResource()
+    {
+        return parent::_getResource();
+    }
+
     /**
      * Get flat resource model flag
      *

app/code/Magento/Catalog/Model/Product.php

@@ -120,6 +120,11 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      */
     protected $_urlModel = null;
 
+    /**
+     * @var ResourceModel\Product
+     */
+    protected $_resource;
+
     /**
      * @var string
      */
@@ -475,6 +480,18 @@ protected function _construct()
         $this->_init(\Magento\Catalog\Model\ResourceModel\Product::class);
     }
 
+    /**
+     * Get resource instance
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @return \Magento\Catalog\Model\ResourceModel\Product
+     * @deprecated because resource models should be used directly
+     */
+    protected function _getResource()
+    {
+        return parent::_getResource();
+    }
+
     /**
      * {@inheritdoc}
      */

app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php

@@ -441,33 +441,39 @@ public function testReindexFlatDisabled(
 
     public function testGetCustomAttributes()
     {
-        $nameAttributeCode = 'name';
-        $descriptionAttributeCode = 'description';
+        $interfaceAttributeCode = 'name';
+        $customAttributeCode = 'description';
+        $initialCustomAttributeValue = 'initial description';
+        $newCustomAttributeValue = 'new description';
+
         $this->getCustomAttributeCodes->expects($this->exactly(3))
             ->method('execute')
-            ->willReturn([$descriptionAttributeCode]);
-        $this->category->setData($nameAttributeCode, "sub");
+            ->willReturn([$customAttributeCode]);
+        $this->category->setData($interfaceAttributeCode, "sub");
 
         //The description attribute is not set, expect empty custom attribute array
         $this->assertEquals([], $this->category->getCustomAttributes());
 
         //Set the description attribute;
-        $this->category->setData($descriptionAttributeCode, "description");
+        $this->category->setData($customAttributeCode, $initialCustomAttributeValue);
         $attributeValue = new \Magento\Framework\Api\AttributeValue();
         $attributeValue2 = new \Magento\Framework\Api\AttributeValue();
         $this->attributeValueFactory->expects($this->exactly(2))->method('create')
             ->willReturnOnConsecutiveCalls($attributeValue, $attributeValue2);
         $this->assertEquals(1, count($this->category->getCustomAttributes()));
-        $this->assertNotNull($this->category->getCustomAttribute($descriptionAttributeCode));
-        $this->assertEquals("description", $this->category->getCustomAttribute($descriptionAttributeCode)->getValue());
+        $this->assertNotNull($this->category->getCustomAttribute($customAttributeCode));
+        $this->assertEquals(
+            $initialCustomAttributeValue,
+            $this->category->getCustomAttribute($customAttributeCode)->getValue()
+        );
 
         //Change the attribute value, should reflect in getCustomAttribute
-        $this->category->setData($descriptionAttributeCode, "new description");
+        $this->category->setData($customAttributeCode, $newCustomAttributeValue);
         $this->assertEquals(1, count($this->category->getCustomAttributes()));
-        $this->assertNotNull($this->category->getCustomAttribute($descriptionAttributeCode));
+        $this->assertNotNull($this->category->getCustomAttribute($customAttributeCode));
         $this->assertEquals(
-            "new description",
-            $this->category->getCustomAttribute($descriptionAttributeCode)->getValue()
+            $newCustomAttributeValue,
+            $this->category->getCustomAttribute($customAttributeCode)->getValue()
         );
     }
 

app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php

@@ -1278,31 +1278,40 @@ public function testGetMediaGalleryImagesMerging()
 
     public function testGetCustomAttributes()
     {
-        $priceCode = 'price';
-        $colorAttributeCode = 'color';
+        $interfaceAttributeCode = 'price';
+        $customAttributeCode = 'color';
+        $initialCustomAttributeValue = 'red';
+        $newCustomAttributeValue = 'blue';
+
         $this->getCustomAttributeCodes->expects($this->exactly(3))
             ->method('execute')
-            ->willReturn([$colorAttributeCode]);
-        $this->model->setData($priceCode, 10);
+            ->willReturn([$customAttributeCode]);
+        $this->model->setData($interfaceAttributeCode, 10);
 
         //The color attribute is not set, expect empty custom attribute array
         $this->assertEquals([], $this->model->getCustomAttributes());
 
         //Set the color attribute;
-        $this->model->setData($colorAttributeCode, "red");
+        $this->model->setData($customAttributeCode, $initialCustomAttributeValue);
         $attributeValue = new \Magento\Framework\Api\AttributeValue();
         $attributeValue2 = new \Magento\Framework\Api\AttributeValue();
         $this->attributeValueFactory->expects($this->exactly(2))->method('create')
             ->willReturnOnConsecutiveCalls($attributeValue, $attributeValue2);
         $this->assertEquals(1, count($this->model->getCustomAttributes()));
-        $this->assertNotNull($this->model->getCustomAttribute($colorAttributeCode));
-        $this->assertEquals("red", $this->model->getCustomAttribute($colorAttributeCode)->getValue());
+        $this->assertNotNull($this->model->getCustomAttribute($customAttributeCode));
+        $this->assertEquals(
+            $initialCustomAttributeValue,
+            $this->model->getCustomAttribute($customAttributeCode)->getValue()
+        );
 
         //Change the attribute value, should reflect in getCustomAttribute
-        $this->model->setData($colorAttributeCode, "blue");
+        $this->model->setData($customAttributeCode, $newCustomAttributeValue);
         $this->assertEquals(1, count($this->model->getCustomAttributes()));
-        $this->assertNotNull($this->model->getCustomAttribute($colorAttributeCode));
-        $this->assertEquals("blue", $this->model->getCustomAttribute($colorAttributeCode)->getValue());
+        $this->assertNotNull($this->model->getCustomAttribute($customAttributeCode));
+        $this->assertEquals(
+            $newCustomAttributeValue,
+            $this->model->getCustomAttribute($customAttributeCode)->getValue()
+        );
     }
 
     /**

lib/internal/Magento/Framework/Setup/Lists.php

@@ -21,12 +21,20 @@ class Lists
      */
     protected $allowedLocales;
 
+    /**
+     * List of allowed currencies
+     *
+     * @var array
+     */
+    private $allowedCurrencies;
+
     /**
      * @param ConfigInterface $localeConfig
      */
     public function __construct(ConfigInterface $localeConfig)
     {
         $this->allowedLocales = $localeConfig->getAllowedLocales();
+        $this->allowedCurrencies = $localeConfig->getAllowedCurrencies();
     }
 
     /**
@@ -64,6 +72,10 @@ public function getCurrencyList()
         $currencies = (new CurrencyBundle())->get(Resolver::DEFAULT_LOCALE)['Currencies'];
         $list = [];
         foreach ($currencies as $code => $data) {
+            $isAllowedCurrency = array_search($code, $this->allowedCurrencies) !== false;
+            if (!$isAllowedCurrency) {
+                continue;
+            }
             $list[$code] = $data[1] . ' (' . $code . ')';
         }
         asort($list);

lib/internal/Magento/Framework/Setup/Test/Unit/ListsTest.php

@@ -58,6 +58,9 @@ protected function setUp()
         $this->mockConfig->expects($this->any())
             ->method('getAllowedLocales')
             ->willReturn($this->expectedLocales);
+        $this->mockConfig->expects($this->any())
+            ->method('getAllowedCurrencies')
+            ->willReturn($this->expectedCurrencies);
 
         $this->lists = new Lists($this->mockConfig);
     }
@@ -73,4 +76,13 @@ public function testGetLocaleList()
         $locales = array_intersect($this->expectedLocales, array_keys($this->lists->getLocaleList()));
         $this->assertEquals($this->expectedLocales, $locales);
     }
+
+    /**
+     * Test Lists:getCurrencyList() considering allowed currencies config values.
+     */
+    public function testGetCurrencyList()
+    {
+        $currencies = array_intersect($this->expectedCurrencies, array_keys($this->lists->getCurrencyList()));
+        $this->assertEquals($this->expectedCurrencies, $currencies);
+    }
 }