Merge pull request #186 from firegento/fix-issecurearea-exists-error

Fix Registry Key Exists Error
firegento · Oct 30, 2020 · c08da3f · c08da3f
2 parents 1c6b38a + 184995c
commit c08da3f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
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/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