Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into master #188

Merged
merged 7 commits into from
Nov 4, 2020
Merged

Merge develop into master #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
79f5cb3
Fix registry key exists error, fixes #158
sprankhub Oct 24, 2020
184995c
Fix Travis
sprankhub Oct 24, 2020
c08da3f
Merge pull request #186 from firegento/fix-issecurearea-exists-error
sprankhub Oct 30, 2020
8eb32a9
Fix attribute group
norgeindian Nov 4, 2020
2fe7217
Fix attribute group in UpgradeData.php
norgeindian Nov 4, 2020
36e7050
Merge pull request #187 from norgeindian/patch-1
sprankhub Nov 4, 2020
a593ba6
Add v0.4.1 changes
sprankhub Nov 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion Command/SetupRunCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
/*
Expand Down
2 changes: 1 addition & 1 deletion Setup/InstallData.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion Setup/UpgradeData.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 3 additions & 0 deletions Test/script/travis_before_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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