Merge pull request #11 from Becklyn/fix-track-js-embed-to-use-deploym…

…ent-tier fix TrackJSEmbed to use deployment tier
Becklyn · Nov 4, 2019 · 4c287f4 · 4c287f4
2 parents 6c16814 + ba30b8e
commit 4c287f4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/Config/HostingConfig.php b/src/Config/HostingConfig.php
@@ -3,7 +3,6 @@
 namespace Becklyn\Hosting\Config;
 
 
-use Becklyn\Hosting\Git\GitIntegration;
 use Becklyn\Hosting\Project\ProjectVersion;
 
 
@@ -23,7 +22,7 @@ class HostingConfig
 
     /**
      * @param array          $config
-     * @param GitIntegration $gitIntegration
+     * @param ProjectVersion $projectVersion
      */
     public function __construct (array $config, ProjectVersion $projectVersion)
     {
@@ -41,6 +40,15 @@ public function getDeploymentTier () : string
     }
 
 
+    /**
+     * @return bool
+     */
+    public function isInDevelopmentTier () : bool
+    {
+        return "development" === $this->config["tier"];
+    }
+
+
     /**
      * @return string|null
      */

diff --git a/src/DependencyInjection/BecklynHostingConfiguration.php b/src/DependencyInjection/BecklynHostingConfiguration.php
@@ -19,7 +19,11 @@ public function getConfigTreeBuilder ()
             ->children()
                 ->scalarNode("tier")
                     ->isRequired()
-                    ->info("The deployment environment (or tier) where this app is installed. E.g. 'staging' or 'production'.")
+                    ->info("The deployment environment (or tier) where this app is installed. E.g. 'development', 'staging' or 'production'.")
+                    ->validate()
+                        ->ifNotInArray(["development", "staging", "production"])
+                        ->thenInvalid("Invalid hosting tier %s")
+                    ->end()
                 ->end()
                 ->scalarNode("project_name")
                     ->isRequired()

diff --git a/src/TrackJS/TrackJSEmbed.php b/src/TrackJS/TrackJSEmbed.php
@@ -74,7 +74,7 @@ public function getEmbedHtml () : string
         $trackJsToken = $this->hostingConfig->getTrackJsToken();
 
         // only embed if token is set, in production and not in debug
-        if (null === $trackJsToken || $this->isDebug || "prod" !== $this->environment)
+        if (null === $trackJsToken || $this->isDebug || $this->hostingConfig->isInDevelopmentTier())
         {
             return "";
         }