merged branch bamarni/patch-10 (PR symfony#5783)

fabpot · fabpot · commit 94f5f49894cd · 2012-10-24T17:35:37.000+02:00
This PR was merged into the 2.1 branch. Commits ------- 3553276 [ConfigDumpReference] avoid notice for variable nodes Discussion ---------- [ConfigDumpReference] avoid notice for variable nodes When a variable node has an array as default value, a notice occurs later on because of an "array to string conversion", which is turned to an exception in debug mode (mandatory in order to run this command).
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
@@ -213,6 +213,12 @@ private function outputNode(NodeInterface $node, $depth = 0)
                     $default = 'false';
                 } elseif (null === $default) {
                     $default = '~';
+                } elseif (is_array($default)) {
+                    if ($node->hasDefaultValue() && count($defaultArray = $node->getDefaultValue())) {
+                        $default = '';
+                    } elseif (!is_array($example)) {
+                        $default = '[]';
+                    }
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -213,6 +213,12 @@ private function outputNode(NodeInterface $node, $depth = 0)`
`213`	`213`	`$default = 'false';`
`214`	`214`	`} elseif (null === $default) {`
`215`	`215`	`$default = '~';`
	`216`	`+ } elseif (is_array($default)) {`
	`217`	`+ if ($node->hasDefaultValue() && count($defaultArray = $node->getDefaultValue())) {`
	`218`	`+ $default = '';`
	`219`	`+ } elseif (!is_array($example)) {`
	`220`	`+ $default = '[]';`
	`221`	`+ }`
`216`	`222`	`}`
`217`	`223`	`}`
`218`	`224`	`}`