Merge pull request #3 from aurmil/master

placeholder resolver preserves types
dflydev · Dec 3, 2021 · d0161b4 · d0161b4
2 parents 500cf7a + d07fb5d
commit d0161b4
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 0 deletions.
diff --git a/src/Dflydev/PlaceholderResolver/RegexPlaceholderResolver.php b/src/Dflydev/PlaceholderResolver/RegexPlaceholderResolver.php
@@ -45,6 +45,10 @@ public function __construct(DataSourceInterface $dataSource, $placeholderPrefix
      */
     public function resolvePlaceholder($placeholder)
     {
+        if (!is_string($placeholder)) {
+            return $placeholder;
+        }
+
         if ($this->getCache()->exists($placeholder)) {
             return $this->getCache()->get($placeholder);
         }

diff --git a/tests/Dflydev/PlaceholderResolver/RegexPlaceholderResolverTest.php b/tests/Dflydev/PlaceholderResolver/RegexPlaceholderResolverTest.php
@@ -98,4 +98,38 @@ public function resolvePlaceholderPrefixAndSuffixProvider()
             array('(<)', '(>)'),
         );
     }
+
+    public function testResolvePlaceholderReturnType()
+    {
+        $dataSource = $this->getMock('Dflydev\PlaceholderResolver\DataSource\DataSourceInterface');
+        $dataSource
+            ->expects($this->any())
+            ->method('exists')
+            ->will($this->returnValueMap(array(
+                array('true', false, true),
+                array('int', false, true),
+                array('composite', false, true),
+            )))
+        ;
+        $dataSource
+            ->expects($this->any())
+            ->method('get')
+            ->will($this->returnValueMap(array(
+                array('true', false, true),
+                array('int', false, 2015),
+                array('composite', false, '${int}'),
+            )))
+        ;
+
+        $placeholderResolver = new RegexPlaceholderResolver($dataSource);
+
+        $this->assertSame(true, $placeholderResolver->resolvePlaceholder(true));
+        $this->assertSame(false, $placeholderResolver->resolvePlaceholder(false));
+        $this->assertSame(2015, $placeholderResolver->resolvePlaceholder(2015));
+        $this->assertSame(2015.0914, $placeholderResolver->resolvePlaceholder(2015.0914));
+        $this->assertSame('2015', $placeholderResolver->resolvePlaceholder('2015'));
+        $this->assertSame('2015', $placeholderResolver->resolvePlaceholder('${int}'));
+        $this->assertSame('1', $placeholderResolver->resolvePlaceholder('${true}'));
+        $this->assertSame('2015', $placeholderResolver->resolvePlaceholder('${composite}'));
+    }
 }