Merge pull request #120 from ctidigital/develop

Sam Butler Thompson · web-flow · commit 9afcd8c26f6a · 2020-10-21T11:36:32.000+01:00
3.1.2
diff --git a/.travis.yml b/.travis.yml
@@ -28,8 +28,8 @@ matrix:
 
 before_install:
   - echo "{\"http-basic\":{\"repo.magento.com\":{\"username\":\"${MAGENTO_USERNAME}\",\"password\":\"${MAGENTO_PASSWORD}\"}}}" > auth.json
-  - sh -c "if [ '$TEST_SUITE' = 'phpcs' ]; then composer require magento/framework:^102.0.3; fi"
-  - sh -c "if [ '$TEST_SUITE' = 'unit' ]; then composer require magento/framework:^102.0.3; fi"
+  - sh -c "if [ '$TEST_SUITE' = 'phpcs' ]; then composer require magento/framework:^103.0.1; fi"
+  - sh -c "if [ '$TEST_SUITE' = 'unit' ]; then composer require magento/framework:^103.0.1; fi"
   - sh -c "if [ '$TEST_SUITE' = 'unit' ]; then composer require magento/module-catalog; fi"
   - sh -c "if [ '$TEST_SUITE' = 'unit' ]; then composer require magento/zendframework1; fi"
 install:
diff --git a/Component/AdminRoles.php b/Component/AdminRoles.php
@@ -9,6 +9,9 @@
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Authorization\Model\Acl\Role\Group as RoleGroup;
 
+/**
+ * @SuppressWarnings(PHPMD.ShortVariable)
+ */
 class AdminRoles implements ComponentInterface
 {
     protected $alias = 'adminroles';
diff --git a/Component/AdminUsers.php b/Component/AdminUsers.php
@@ -7,6 +7,9 @@
 use CtiDigital\Configurator\Api\LoggerInterface;
 use CtiDigital\Configurator\Exception\ComponentException;
 
+/**
+ * @SuppressWarnings(PHPMD.ShortVariable)
+ */
 class AdminUsers implements ComponentInterface
 {
     protected $alias = 'adminusers';
diff --git a/Component/ApiIntegrations.php b/Component/ApiIntegrations.php
@@ -9,6 +9,9 @@
 use Magento\Integration\Api\IntegrationServiceInterface;
 use CtiDigital\Configurator\Exception\ComponentException;
 
+/**
+ * @SuppressWarnings(PHPMD.ShortVariable)
+ */
 class ApiIntegrations implements ComponentInterface
 {
     protected $alias = 'apiintegrations';
diff --git a/Component/CatalogPriceRules/CatalogPriceRulesProcessor.php b/Component/CatalogPriceRules/CatalogPriceRulesProcessor.php
@@ -14,6 +14,9 @@
 use Magento\CatalogRule\Model\Rule;
 use Magento\CatalogRule\Model\Rule\Job;
 
+/**
+ * @SuppressWarnings(PHPMD.ShortVariable)
+ */
 class CatalogPriceRulesProcessor implements ComponentProcessorInterface
 {
     /**
diff --git a/Component/Categories.php b/Component/Categories.php
@@ -9,6 +9,9 @@
 use Magento\Store\Model\GroupFactory;
 use Magento\Framework\App\Filesystem\DirectoryList;
 
+/**
+ * @SuppressWarnings(PHPMD.ShortVariable)
+ */
 class Categories implements ComponentInterface
 {
     protected $alias = 'categories';
diff --git a/Component/Config.php b/Component/Config.php
@@ -17,6 +17,7 @@
 class Config implements ComponentInterface
 {
     const PATH_THEME_ID = 'design/theme/theme_id';
+    const ENCRYPTED_MODEL = \Magento\Config\Model\Config\Backend\Encrypted::class;
 
     protected $alias = 'config';
     protected $name = 'Configuration';
@@ -57,16 +58,26 @@ class Config implements ComponentInterface
      */
     private $log;
 
+    /**
+     * @var ScopeConfig\Initial
+     */
+    private $initialConfig;
+
     /**
      * Config constructor.
      * @param ConfigResource $configResource
      * @param ScopeConfig $scopeConfig
+     * @param ScopeConfig\Initial $initialConfig
      * @param CollectionFactory $collectionFactory
      * @param EncryptorInterface $encryptor
+     * @param WebsiteFactory $websiteFactory
+     * @param StoreFactory $storeFactory
+     * @param LoggerInterface $log
      */
     public function __construct(
         ConfigResource $configResource,
         ScopeConfig $scopeConfig,
+        ScopeConfig\Initial $initialConfig,
         CollectionFactory $collectionFactory,
         EncryptorInterface $encryptor,
         WebsiteFactory $websiteFactory,
@@ -75,6 +86,7 @@ public function __construct(
     ) {
         $this->configResource = $configResource;
         $this->scopeConfig = $scopeConfig;
+        $this->initialConfig = $initialConfig;
         $this->collectionFactory = $collectionFactory;
         $this->encryptor = $encryptor;
         $this->websiteFactory = $websiteFactory;
@@ -98,12 +110,15 @@ public function execute($data = null) //phpcs:ignore Generic.Metrics.NestingLeve
                 if ($scope == "global") {
                     foreach ($configurations as $configuration) {
                         // Handle encryption parameter
+
                         $encryption = 0;
                         if (isset($configuration['encryption']) && $configuration['encryption'] == 1) {
                             $encryption = 1;
                         }
 
                         $convertedConfiguration = $this->convert($configuration);
+                        // Check if the path uses an encryption model. If yes, set encryption to true
+                        $encryption = $this->determineEncryption($convertedConfiguration, $encryption);
                         $this->setGlobalConfig(
                             $convertedConfiguration['path'],
                             $convertedConfiguration['value'],
@@ -121,6 +136,8 @@ public function execute($data = null) //phpcs:ignore Generic.Metrics.NestingLeve
                                 $encryption = 1;
                             }
                             $convertedConfiguration = $this->convert($configuration);
+                            // Check if the path uses an encryption model. If yes, set encryption to true
+                            $encryption = $this->determineEncryption($convertedConfiguration, $encryption);
                             $this->setWebsiteConfig(
                                 $convertedConfiguration['path'],
                                 $convertedConfiguration['value'],
@@ -141,6 +158,8 @@ public function execute($data = null) //phpcs:ignore Generic.Metrics.NestingLeve
                             }
 
                             $convertedConfiguration = $this->convert($configuration);
+                            // Check if the path uses an encryption model. If yes, set encryption to true
+                            $encryption = $this->determineEncryption($convertedConfiguration, $encryption);
                             $this->setStoreConfig(
                                 $convertedConfiguration['path'],
                                 $convertedConfiguration['value'],
@@ -156,6 +175,21 @@ public function execute($data = null) //phpcs:ignore Generic.Metrics.NestingLeve
         }
     }
 
+    private function determineEncryption(array $configuration, $encryption)
+    {
+        $metaData = $this->initialConfig->getMetadata();
+
+        foreach ($metaData as $path => $processor) {
+            if ($path == $configuration['path']) {
+                if (isset($processor['backendModel']) && $processor['backendModel'] === self::ENCRYPTED_MODEL) {
+                    $encryption = 1;
+                }
+            }
+        }
+
+        return $encryption;
+    }
+
     private function setGlobalConfig($path, $value, $encrypted = 0)
     {
         try {
diff --git a/Component/CustomerGroups.php b/Component/CustomerGroups.php
@@ -7,6 +7,9 @@
 use CtiDigital\Configurator\Exception\ComponentException;
 use CtiDigital\Configurator\Api\LoggerInterface;
 
+/**
+ * @SuppressWarnings(PHPMD.ShortVariable)
+ */
 class CustomerGroups implements ComponentInterface
 {
     protected $alias = 'customergroups';
diff --git a/Component/Product/AttributeOption.php b/Component/Product/AttributeOption.php
@@ -10,6 +10,9 @@
 use Magento\Catalog\Model\Product;
 use CtiDigital\Configurator\Api\LoggerInterface;
 
+/**
+ * @SuppressWarnings(PHPMD.ShortVariable)
+ */
 class AttributeOption
 {
     /**
diff --git a/Component/Products.php b/Component/Products.php
@@ -12,6 +12,7 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.ShortVariable)
  */
 class Products implements ComponentInterface
 {
diff --git a/Component/ReviewRating.php b/Component/ReviewRating.php
@@ -13,6 +13,7 @@
 
 /**
  * @SuppressWarnings("CouplingBetweenObjects")
+ * @SuppressWarnings(PHPMD.ShortVariable)
  */
 class ReviewRating implements ComponentInterface
 {
diff --git a/Component/Rewrites.php b/Component/Rewrites.php
@@ -8,6 +8,9 @@
 use Magento\UrlRewrite\Model\UrlRewriteFactory;
 use Magento\UrlRewrite\Model\UrlPersistInterface;
 
+/**
+ * @SuppressWarnings(PHPMD.ShortVariable)
+ */
 class Rewrites implements ComponentInterface
 {
     protected $alias = "rewrites";
diff --git a/Component/TaxRules.php b/Component/TaxRules.php
@@ -9,6 +9,9 @@
 use Magento\Tax\Model\Calculation\RateFactory;
 use Magento\Tax\Model\ClassModelFactory;
 
+/**
+ * @SuppressWarnings(PHPMD.ShortVariable)
+ */
 class TaxRules implements ComponentInterface
 {
     protected $alias = 'taxrules';
diff --git a/Model/Processor.php b/Model/Processor.php
@@ -16,6 +16,7 @@
  * Class Processor - The overarching class that reads and processes the configurator files.
  *
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.ShortVariable)
  */
 class Processor
 {
diff --git a/Test/Unit/Component/ConfigTest.php b/Test/Unit/Component/ConfigTest.php
@@ -29,6 +29,11 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
      */
     private $scopeConfig;
 
+    /**
+     * @var ScopeConfig\Initial|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $initialConfig;
+
     /**
      * @var Collection|\PHPUnit\Framework\MockObject\MockObject
      */
@@ -67,6 +72,9 @@ protected function setUp()
         $this->scopeConfig = $this->getMockBuilder(ScopeConfig::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->initialConfig = $this->getMockBuilder(ScopeConfig\Initial::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->collection = $this->getMockBuilder(Collection::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -90,6 +98,7 @@ protected function setUp()
         $this->config = new Config(
             $this->configResource,
             $this->scopeConfig,
+            $this->initialConfig,
             $this->collectionFactory,
             $this->encryptorInterface,
             $this->websiteFactory,
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
     "phpunit/phpunit": "^6.2",
     "magento/magento-coding-standard": "5"
   },
-  "version": "3.1.1",
+  "version": "3.1.2",
   "autoload": {
     "files": [ "registration.php" ],
     "psr-4": {

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,9 @@`
`9`	`9`	`use Magento\Authorization\Model\UserContextInterface;`
`10`	`10`	`use Magento\Authorization\Model\Acl\Role\Group as RoleGroup;`
`11`	`11`
	`12`	`+/**`
	`13`	`+ * @SuppressWarnings(PHPMD.ShortVariable)`
	`14`	`+ */`
`12`	`15`	`class AdminRoles implements ComponentInterface`
`13`	`16`	`{`
`14`	`17`	`protected $alias = 'adminroles';`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,9 @@`
`7`	`7`	`use CtiDigital\Configurator\Api\LoggerInterface;`
`8`	`8`	`use CtiDigital\Configurator\Exception\ComponentException;`
`9`	`9`
	`10`	`+/**`
	`11`	`+ * @SuppressWarnings(PHPMD.ShortVariable)`
	`12`	`+ */`
`10`	`13`	`class AdminUsers implements ComponentInterface`
`11`	`14`	`{`
`12`	`15`	`protected $alias = 'adminusers';`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,9 @@`
`9`	`9`	`use Magento\Integration\Api\IntegrationServiceInterface;`
`10`	`10`	`use CtiDigital\Configurator\Exception\ComponentException;`
`11`	`11`
	`12`	`+/**`
	`13`	`+ * @SuppressWarnings(PHPMD.ShortVariable)`
	`14`	`+ */`
`12`	`15`	`class ApiIntegrations implements ComponentInterface`
`13`	`16`	`{`
`14`	`17`	`protected $alias = 'apiintegrations';`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@`
`14`	`14`	`use Magento\CatalogRule\Model\Rule;`
`15`	`15`	`use Magento\CatalogRule\Model\Rule\Job;`
`16`	`16`
	`17`	`+/**`
	`18`	`+ * @SuppressWarnings(PHPMD.ShortVariable)`
	`19`	`+ */`
`17`	`20`	`class CatalogPriceRulesProcessor implements ComponentProcessorInterface`
`18`	`21`	`{`
`19`	`22`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,9 @@`
`9`	`9`	`use Magento\Store\Model\GroupFactory;`
`10`	`10`	`use Magento\Framework\App\Filesystem\DirectoryList;`
`11`	`11`
	`12`	`+/**`
	`13`	`+ * @SuppressWarnings(PHPMD.ShortVariable)`
	`14`	`+ */`
`12`	`15`	`class Categories implements ComponentInterface`
`13`	`16`	`{`
`14`	`17`	`protected $alias = 'categories';`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,9 @@`
`10`	`10`	`use Magento\Catalog\Model\Product;`
`11`	`11`	`use CtiDigital\Configurator\Api\LoggerInterface;`
`12`	`12`
	`13`	`+/**`
	`14`	`+ * @SuppressWarnings(PHPMD.ShortVariable)`
	`15`	`+ */`
`13`	`16`	`class AttributeOption`
`14`	`17`	`{`
`15`	`18`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`/**`
`13`	`13`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
`14`	`14`	`* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)`
	`15`	`+ * @SuppressWarnings(PHPMD.ShortVariable)`
`15`	`16`	`*/`
`16`	`17`	`class Products implements ComponentInterface`
`17`	`18`	`{`