From 79f5cb3518a813e1d0bac6aba063c3032166e9d0 Mon Sep 17 00:00:00 2001 From: Simon Sprankel Date: Sat, 24 Oct 2020 21:55:12 +0200 Subject: [PATCH 1/5] Fix registry key exists error, fixes #158 --- Command/SetupRunCommand.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Command/SetupRunCommand.php b/Command/SetupRunCommand.php index 8430f49..eccb196 100644 --- 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 { /* From 184995cc93a79c647b20db1d822ce1f502b77292 Mon Sep 17 00:00:00 2001 From: Simon Sprankel Date: Sat, 24 Oct 2020 22:08:22 +0200 Subject: [PATCH 2/5] Fix Travis --- Test/script/travis_before_install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Test/script/travis_before_install.sh b/Test/script/travis_before_install.sh index 6d8c328..f139816 100755 --- 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 From 8eb32a92d696b8120f9ef28417faba827f3dbb53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Sch=C3=A4fer?= Date: Wed, 4 Nov 2020 10:35:58 +0100 Subject: [PATCH 3/5] Fix attribute group --- Setup/InstallData.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Setup/InstallData.php b/Setup/InstallData.php index 0bf4432..6475a36 100644 --- 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, From 2fe721719e019927296dd90447d4a8577a0ae011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Sch=C3=A4fer?= Date: Wed, 4 Nov 2020 10:37:01 +0100 Subject: [PATCH 4/5] Fix attribute group in UpgradeData.php --- Setup/UpgradeData.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Setup/UpgradeData.php b/Setup/UpgradeData.php index d5e7d36..4eca752 100644 --- 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, From a593ba6848b9dc212563294316ccc54087fd8028 Mon Sep 17 00:00:00 2001 From: Simon Sprankel Date: Wed, 4 Nov 2020 21:34:32 +0100 Subject: [PATCH 5/5] Add v0.4.1 changes --- CHANGELOG.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a281b6..b2f976b 100644 --- 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