Merge pull request #188 from firegento/develop

Merge develop into master
firegento · Nov 4, 2020 · 2a8ca28 · 2a8ca28
2 parents 559ca8d + a593ba6
commit 2a8ca28
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,10 +13,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### Removed
 - ...
 
+## [v0.4.1] - 2020-11-04
+### Fixed
+- Registry key already exists error for HTTPS sites [#186](https://github.com/firegento/firegento-magesetup2/pull/186) (thanks @sprankhub)
+- Wrong attribute group name in setup scripts [#187](https://github.com/firegento/firegento-magesetup2/pull/187) (thanks @norgeindian)
+
 ## [v0.4.0] - 2020-10-08
 ### Added
-- Support for Magento 2.4 (thanks @sprankhub)
-- Support for PHP 7.4 (thanks @sprankhub)
+- Support for Magento 2.4 [#183](https://github.com/firegento/firegento-magesetup2/pull/183) (thanks @sprankhub)
+- Support for PHP 7.4 [#183](https://github.com/firegento/firegento-magesetup2/pull/183) (thanks @sprankhub)
 
 ## [v0.3.0] - 2020-06-30
 ### Fixed

diff --git a/Command/SetupRunCommand.php b/Command/SetupRunCommand.php
@@ -122,7 +122,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
         // phpcs:ignore
         $configLoader = $this->objectManager->get('Magento\Framework\ObjectManager\ConfigLoaderInterface');
         $this->objectManager->configure($configLoader->load($area));
-        $this->registry->register('isSecureArea', true);
+        if (!$this->registry->registry('isSecureArea')) {
+            $this->registry->register('isSecureArea', true);
+        }
 
         try {
             /*

diff --git a/Setup/InstallData.php b/Setup/InstallData.php
@@ -72,7 +72,7 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
                 'required'                => false,
                 'used_in_product_listing' => true,
                 'apply_to'                => $productTypes,
-                'group'                   => 'General',
+                'group'                   => 'Product Details',
                 'unique'                  => false,
                 'is_html_allowed_on_front'=> true,
                 'visible_on_front'        => true,

diff --git a/Setup/UpgradeData.php b/Setup/UpgradeData.php
@@ -75,7 +75,7 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
                 'required'                => false,
                 'used_in_product_listing' => true,
                 'apply_to'                => $productTypes,
-                'group'                   => 'General',
+                'group'                   => 'Product Details',
                 'unique'                  => false,
                 'is_html_allowed_on_front'=> true,
                 'visible_on_front'        => true,

diff --git a/Test/script/travis_before_install.sh b/Test/script/travis_before_install.sh
@@ -17,3 +17,6 @@ mysql -uroot -e '
   CREATE DATABASE `magento`;
   CREATE DATABASE `magento-integration-tests`;
 '
+
+# make sure to use Composer 1, because Magento does not support Composer 2 yet
+composer self-update --1