optimized

symfony · ro0NL · Mar 3, 2018 · Mar 3, 2018 · Mar 21, 2018 · Mar 21, 2018
commit d33b1c8de2a49dc50e831a4c19d8c9b9697c4d99
diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php
@@ -40,7 +40,7 @@ abstract class BaseNode implements NodeInterface
    protected $attributes = array();
    protected $pathSeparator;

-    private $handlingPlaceholder = false;
+    private $handlingPlaceholder;

    /**
     * @throws \InvalidArgumentException if the name contains a period
@@ -289,47 +289,33 @@ final public function merge($leftSide, $rightSide)
        }

        if ($leftSide !== $leftPlaceholders = self::resolvePlaceholderValue($leftSide)) {
-            if (!$leftPlaceholders) {
-                return $rightSide;
-            }
-
            foreach ($leftPlaceholders as $leftPlaceholder) {
-                $this->handlingPlaceholder = true;
+                $this->handlingPlaceholder = $leftSide;
                try {
                    $this->merge($leftPlaceholder, $rightSide);
-
-                    return $rightSide;
-                } catch (InvalidConfigurationException $e) {
                } finally {
-                    $this->handlingPlaceholder = false;
+                    $this->handlingPlaceholder = null;
                }
            }

-            throw $e;
+            return $rightSide;
        }

        if ($rightSide !== $rightPlaceholders = self::resolvePlaceholderValue($rightSide)) {
-            if (!$rightPlaceholders) {
-                return $rightSide;
-            }
-
            foreach ($rightPlaceholders as $rightPlaceholder) {
-                $this->handlingPlaceholder = true;
+                $this->handlingPlaceholder = $rightSide;
                try {
                    $this->merge($leftSide, $rightPlaceholder);
-
-                    return $rightSide;
-                } catch (InvalidConfigurationException $e) {
                } finally {
-                    $this->handlingPlaceholder = false;
+                    $this->handlingPlaceholder = null;
                }
            }

-            throw $e;
+            return $rightSide;
        }

-        $this->validateType($leftSide);
-        $this->validateType($rightSide);
+        $this->doValidateType($leftSide);
+        $this->doValidateType($rightSide);

        return $this->mergeValues($leftSide, $rightSide);
    }
@@ -348,23 +334,16 @@ final public function normalize($value)

        // resolve placeholder value
        if ($value !== $placeholders = self::resolvePlaceholderValue($value)) {
-            if (!$placeholders) {
-                return $value;
-            }
-
            foreach ($placeholders as $placeholder) {
-                $this->handlingPlaceholder = true;
+                $this->handlingPlaceholder = $value;
                try {
                    $this->normalize($placeholder);
-
-                    return $value;
-                } catch (InvalidConfigurationException $e) {
                } finally {
-                    $this->handlingPlaceholder = false;
+                    $this->handlingPlaceholder = null;
                }
            }

-            throw $e;
+            return $value;
        }

        // replace value with their equivalent
@@ -375,7 +354,7 @@ final public function normalize($value)
        }

        // validate type
-        $this->validateType($value);
+        $this->doValidateType($value);

        // normalize value
        return $this->normalizeValue($value);
@@ -409,33 +388,19 @@ public function getParent()
    final public function finalize($value)
    {
        if ($value !== $placeholders = self::resolvePlaceholderValue($value)) {
-            if (!$placeholders) {
-                return $value;
-            }
-
            foreach ($placeholders as $placeholder) {
-                $this->handlingPlaceholder = true;
+                $this->handlingPlaceholder = $value;
                try {
                    $this->finalize($placeholder);
-
-                    return $value;
-                } catch (InvalidConfigurationException $e) {
                } finally {
-                    $this->handlingPlaceholder = false;
+                    $this->handlingPlaceholder = null;
                }
            }

-            throw $e;
+            return $value;
        }

-        $this->validateType($value);
-
-        if ($this->handlingPlaceholder && !$this->allowPlaceholders()) {
-            $e = new InvalidConfigurationException(sprintf('A dynamic value is not compatible with a "%s" node type at path "%s".', get_class($this), $this->getPath()));
-            $e->setPath($this->getPath());
-
-            throw $e;
-        }
+        $this->doValidateType($value);

        $value = $this->finalizeValue($value);

@@ -445,7 +410,7 @@ final public function finalize($value)
            try {
                $value = $closure($value);
            } catch (Exception $e) {
-                if ($e instanceof UnsetKeyException && $this->handlingPlaceholder) {
+                if ($e instanceof UnsetKeyException && null !== $this->handlingPlaceholder) {
                    continue;
                }

@@ -503,6 +468,14 @@ protected function allowPlaceholders(): bool
        return true;
    }

+    /**
+     * Get allowed dynamic types for this node.
+     */
+    protected function getValidPlaceholderTypes(): array
+    {
+        return array();
+    }
+
    private static function resolvePlaceholderValue($value)
    {
        if (\is_string($value)) {
@@ -517,4 +490,54 @@ private static function resolvePlaceholderValue($value)

        return $value;
    }
+
+    private static function getType($value): string
+    {
+        switch ($type = gettype($value)) {
+            case 'boolean':
+                return 'bool';
+            case 'double':
+                return 'float';
+            case 'integer':
+                return 'int';
+        }
+
+        return $type;
+    }
+
+    private function doValidateType($value): void
+    {
+        if (null === $this->handlingPlaceholder || null === $value) {
+            $this->validateType($value);
+
+            return;
+        }
+
+        if (!$this->allowPlaceholders()) {
+            $e = new InvalidTypeException(sprintf('A dynamic value is not compatible with a "%s" node type at path "%s".', get_class($this), $this->getPath()));
+            $e->setPath($this->getPath());
+
+            throw $e;
+        }
+
+        $knownTypes = array_keys(self::$placeholders[$this->handlingPlaceholder]);
+        $validTypes = $this->getValidPlaceholderTypes();
+
+        if (array_diff($knownTypes, $validTypes)) {
+            $e = new InvalidTypeException(sprintf(
+                'Invalid type for path "%s". Expected %s, but got %s.',
+                $this->getPath(),
+                1 === count($validTypes) ? '"'.reset($validTypes).'"' : 'one of "'.implode('", "', $validTypes).'"',
+                1 === count($knownTypes) ? '"'.reset($knownTypes).'"' : 'one of "'.implode('", "', $knownTypes).'"'
+            ));
+            if ($hint = $this->getInfo()) {
+                $e->addHint($hint);
+            }
+            $e->setPath($this->getPath());
+
+            throw $e;
+        }
+
+        $this->validateType($value);
+    }
 }
diff --git a/src/Symfony/Component/Config/Definition/BooleanNode.php b/src/Symfony/Component/Config/Definition/BooleanNode.php
@@ -48,4 +48,12 @@ protected function isValueEmpty($value)
        // a boolean value cannot be empty
        return false;
    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getValidPlaceholderTypes(): array
+    {
+        return array('bool');
+    }
 }
diff --git a/src/Symfony/Component/Config/Definition/FloatNode.php b/src/Symfony/Component/Config/Definition/FloatNode.php
@@ -40,4 +40,12 @@ protected function validateType($value)
            throw $ex;
        }
    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getValidPlaceholderTypes(): array
+    {
+        return array('float');
+    }
 }
diff --git a/src/Symfony/Component/Config/Definition/IntegerNode.php b/src/Symfony/Component/Config/Definition/IntegerNode.php
@@ -35,4 +35,12 @@ protected function validateType($value)
            throw $ex;
        }
    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getValidPlaceholderTypes(): array
+    {
+        return array('int');
+    }
 }
diff --git a/src/Symfony/Component/Config/Definition/ScalarNode.php b/src/Symfony/Component/Config/Definition/ScalarNode.php
@@ -54,4 +54,12 @@ protected function isValueEmpty($value)
    {
        return null === $value || '' === $value;
    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getValidPlaceholderTypes(): array
+    {
+        return array('bool', 'int', 'float', 'string');
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php
@@ -47,6 +47,22 @@ public function testEnvsAreValidatedInConfig()
            'scalar_node' => '%env(NULLED)%',
            'int_node' => '%env(int:FOO)%',
            'float_node' => '%env(float:BAR)%',
+        ));
+
+        $this->doProcess($container);
+
+        $this->assertSame($expected, $container->resolveEnvPlaceholders($ext->getConfig()));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidTypeException
+     * @expectedExceptionMessage Invalid type for path "env_extension.bool_node". Expected "bool", but got one of "bool", "int", "float", "string", "array".
+     */
+    public function testEnvsAreValidatedInConfigWithInvalidPlaceholder()
+    {
+        $container = new ContainerBuilder();
+        $container->registerExtension($ext = new EnvExtension());
+        $container->prependExtensionConfig('env_extension', $expected = array(
            'bool_node' => '%env(const:BAZ)%',
        ));

@@ -57,7 +73,7 @@ public function testEnvsAreValidatedInConfig()

    /**
     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidTypeException
-     * @expectedExceptionMessage Invalid type for path "env_extension.int_node". Expected int, but got array.
+     * @expectedExceptionMessage Invalid type for path "env_extension.int_node". Expected "int", but got "array".
     */
    public function testInvalidEnvInConfig()
    {
@@ -91,7 +107,7 @@ public function testValidateEnvOnMerge()
        $container = new ContainerBuilder();
        $container->registerExtension($ext = new EnvExtension());
        $container->prependExtensionConfig('env_extension', array(
-            'int_node' => '%env(const:FOO)%',
+            'int_node' => '%env(int:const:FOO)%',
            'bool_node' => true,
        ));
        $container->prependExtensionConfig('env_extension', array(
@@ -103,7 +119,7 @@ public function testValidateEnvOnMerge()
        $this->doProcess($container);

        $expected = array(
-            'int_node' => '%env(const:FOO)%',
+            'int_node' => '%env(int:const:FOO)%',
            'bool_node' => true,
            'scalar_node' => '%env(BAZ)%',
        );