[chain] Update placeholders. (#268)

hechoendrupal · Jan 8, 2018 · 83cc1a4 · 83cc1a4
1 parent b31f346
commit 83cc1a4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/Command/Chain/ChainCommand.php b/src/Command/Chain/ChainCommand.php
@@ -269,7 +269,7 @@ function($value) {
         }
 
         $inlinePlaceHolderData = new ArrayDataSource($placeholder);
-        $placeholderResolver = new RegexPlaceholderResolver($inlinePlaceHolderData, '%{{', '}}');
+        $placeholderResolver = new RegexPlaceholderResolver($inlinePlaceHolderData, '{{', '}}');
         $chainContent = $placeholderResolver->resolvePlaceholder($chainContent);
 
         // Resolve environmentPlaceHolders
@@ -304,7 +304,7 @@ function($value) {
         }
 
         $envPlaceHolderData = new ArrayDataSource($envPlaceHolderMap);
-        $placeholderResolver = new RegexPlaceholderResolver($envPlaceHolderData, '${{', '}}');
+        $placeholderResolver = new RegexPlaceholderResolver($envPlaceHolderData, '%env(', ')%');
         $chainContent = $placeholderResolver->resolvePlaceholder($chainContent);
 
         $parser = new Parser();

diff --git a/src/Utils/ChainDiscovery.php b/src/Utils/ChainDiscovery.php
@@ -31,6 +31,9 @@ class ChainDiscovery
      */
     private $directories = [];
 
+    const INLINE_REGEX = '/{{(.*?)}}/';
+    const ENV_REGEX =  '/%env\((.*?)\)%/';
+
     /**
      * ChainDiscovery constructor.
      *
@@ -151,10 +154,11 @@ public function getFileContents($file)
         return $contents;
     }
 
-    private function extractPlaceHolders($chainContent, $identifier)
-    {
+    private function extractPlaceHolders(
+        $chainContent,
+        $regex
+    ) {
         $placeHoldersExtracted = [];
-        $regex = '/\\'.$identifier.'{{(.*?)}}/';
         preg_match_all(
             $regex,
             $chainContent,
@@ -170,7 +174,10 @@ private function extractPlaceHolders($chainContent, $identifier)
 
     public function extractInlinePlaceHolders($chainContent)
     {
-        $extractedInlinePlaceHolders = $this->extractPlaceHolders($chainContent, '%');
+        $extractedInlinePlaceHolders = $this->extractPlaceHolders(
+            $chainContent,
+            $this::INLINE_REGEX
+        );
         $extractedVars = $this->extractVars($chainContent);
 
         $inlinePlaceHolders = [];
@@ -187,7 +194,7 @@ public function extractInlinePlaceHolders($chainContent)
 
     public function extractEnvironmentPlaceHolders($chainContent)
     {
-        return $this->extractPlaceHolders($chainContent, '$');
+        return $this->extractPlaceHolders($chainContent, $this::ENV_REGEX);
     }
 
     public function extractVars($chainContent)