Merge pull request #22 from spryker-sdk/feature/sc-455/master-define-…

…the-current-environment-in-config SC-455: Define the current environment in config
spryker-sdk · Jul 2, 2019 · 723220e · 723220e
2 parents 12606d5 + bf89221
commit 723220e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -6,7 +6,6 @@
   "require": {
     "php": ">=7.1",
     "spryker-sdk/spryk": "^0.1.0 || ^0.2.0",
-    "spryker/config": "^3.1.3",
     "spryker/development": "^3.12.0",
     "spryker/graph": "^3.0.0",
     "spryker/kernel": "^3.0.0",

diff --git a/src/SprykerSdk/Zed/SprykGui/Communication/Controller/AbstractController.php b/src/SprykerSdk/Zed/SprykGui/Communication/Controller/AbstractController.php
@@ -7,7 +7,6 @@
 
 namespace SprykerSdk\Zed\SprykGui\Communication\Controller;
 
-use Spryker\Shared\Config\Environment;
 use Spryker\Zed\Kernel\Communication\Controller\AbstractController as SprykerAbstractController;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
@@ -34,10 +33,9 @@ public function initialize(): void
      */
     protected function assertNonProductionEnvironment(): void
     {
-        $isProductionEnvironment = Environment::isProduction();
         $isCli = PHP_SAPI === 'cli';
 
-        if (!$isProductionEnvironment || $isCli) {
+        if ($isCli || $this->getFactory()->getConfig()->isSprykWebInterfaceEnabled()) {
             return;
         }
 

diff --git a/src/SprykerSdk/Zed/SprykGui/Communication/Controller/GraphController.php b/src/SprykerSdk/Zed/SprykGui/Communication/Controller/GraphController.php
@@ -14,7 +14,6 @@
 /**
  * @method \SprykerSdk\Zed\SprykGui\Communication\SprykGuiCommunicationFactory getFactory()
  * @method \SprykerSdk\Zed\SprykGui\Business\SprykGuiFacadeInterface getFacade()
- * @method \SprykerSdk\Zed\SprykGui\Persistence\SprykGuiQueryContainerInterface getQueryContainer()
  */
 class GraphController extends AbstractController
 {

diff --git a/src/SprykerSdk/Zed/SprykGui/Communication/Controller/ListController.php b/src/SprykerSdk/Zed/SprykGui/Communication/Controller/ListController.php
@@ -10,7 +10,6 @@
 /**
  * @method \SprykerSdk\Zed\SprykGui\Communication\SprykGuiCommunicationFactory getFactory()
  * @method \SprykerSdk\Zed\SprykGui\Business\SprykGuiFacadeInterface getFacade()
- * @method \SprykerSdk\Zed\SprykGui\Persistence\SprykGuiQueryContainerInterface getQueryContainer()
  */
 class ListController extends AbstractController
 {

diff --git a/src/SprykerSdk/Zed/SprykGui/SprykGuiConfig.php b/src/SprykerSdk/Zed/SprykGui/SprykGuiConfig.php
@@ -7,7 +7,6 @@
 
 namespace SprykerSdk\Zed\SprykGui;
 
-use Spryker\Shared\Config\Config;
 use Spryker\Shared\Kernel\KernelConstants;
 use Spryker\Zed\Kernel\AbstractBundleConfig;
 
@@ -18,14 +17,24 @@ class SprykGuiConfig extends AbstractBundleConfig
      */
     public function getCoreNamespaces(): array
     {
-        return Config::get(KernelConstants::CORE_NAMESPACES, []);
+        return $this->get(KernelConstants::CORE_NAMESPACES, []);
     }
 
     /**
      * @return array
      */
     public function getProjectNamespaces(): array
     {
-        return Config::get(KernelConstants::PROJECT_NAMESPACES, []);
+        return $this->get(KernelConstants::PROJECT_NAMESPACES, []);
+    }
+
+    /**
+     * @deprecated Method will be removed without replacement.
+     *
+     * @return bool
+     */
+    public function isSprykWebInterfaceEnabled(): bool
+    {
+        return APPLICATION_ENV !== 'production';
     }
 }