From 79f5cb3518a813e1d0bac6aba063c3032166e9d0 Mon Sep 17 00:00:00 2001 From: Simon Sprankel Date: Sat, 24 Oct 2020 21:55:12 +0200 Subject: [PATCH 1/2] 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/2] 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