symfony
diff --git a/‎.github/PULL_REQUEST_TEMPLATE.md
Copy file name to clipboard
+11-3Lines changed: 11 additions & 3 deletions b/‎.github/PULL_REQUEST_TEMPLATE.md
Copy file name to clipboard
+11-3Lines changed: 11 additions & 3 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig
+1-3Lines changed: 1 addition & 3 deletions b/‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig
+1-3Lines changed: 1 addition & 3 deletions
diff --git a/‎src/Symfony/Component/Finder/Comparator/NumberComparator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Finder/Comparator/NumberComparator.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Finder/Comparator/NumberComparator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Finder/Comparator/NumberComparator.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Finder/Finder.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Finder/Finder.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Finder/Finder.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Finder/Finder.php
+2-2Lines changed: 2 additions & 2 deletions
@@ -1,11 +1,19 @@
 | Q             | A
 | ------------- | ---
-| Branch?       | "master" for new features / 2.7, 2.8 or 3.1 for fixes
+| Branch?       | master / 2.7, 2.8, 3.1 or 3.2 <!--see comment below-->
 | Bug fix?      | yes/no
 | New feature?  | yes/no
 | BC breaks?    | yes/no
 | Deprecations? | yes/no
 | Tests pass?   | yes/no
-| Fixed tickets | comma-separated list of tickets fixed by the PR, if any
+| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
 | License       | MIT
-| Doc PR        | reference to the documentation PR, if any
+| Doc PR        | symfony/symfony-docs#... <!--highly recommended for new features-->
+
+<!--
+- Bug fixes must be submitted against the lowest branch where they apply
+  (lowest branches are regularly merged to upper ones so they get the fixes too).
+- Features and deprecations must be submitted against the master branch.
+- Please fill in this template according to the PR you're about to submit.
+- Replace this comment by a description of what your PR is solving.
+-->
@@ -92,7 +92,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $io->title(sprintf('Current configuration for "%s"', $name));
         }
 
-        $io->writeln(Yaml::dump(array($extension->getAlias() => $config), 10));
+        $io->writeln(Yaml::dump(array($extension->getAlias() => $container->getParameterBag()->resolveValue($config)), 10));
     }
 
     private function compileContainer()
 
@@ -8,9 +8,7 @@
                 <img alt="" src="data:image/gif;base64,R0lGODlhHAAWAMQQANra2+bl5s3Mzevr6/Pz8+jo6O3t7fHx8c/Oz+Pj49PS093d3djX2NXV1eDf4MrJyvb29gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAcABYAQAWWICSOEDE4AamqRuAsT5yu6hA/wNrcfNysjl5PBOAJAAUDDRLoNRKDndAHnN6k058qaH2QuNelqCAYIm45MfGmIJCkAvUIPNB1td/uAyvEz/UqB0VUagQOZTEjgzx+Kk1CEAU8DAdqB4gPCHVjNwhucphKbzefamAFdlaNEGBZd1V3r1t6fE6wqrJ5XS4Ovb69MyQnv8QhADs=" />
             </div>
 
-            <h1>
-                {{ exception.message|nl2br|format_file_from_text }}
-            </h1>
+            <h1>{{ exception.message|nl2br|format_file_from_text }}</h1>
 
             <div>
                 <strong>{{ status_code }}</strong> {{ status_text }} - {{ exception.class|abbr_class }}
 
@@ -37,7 +37,7 @@ class NumberComparator extends Comparator
     /**
      * Constructor.
      *
-     * @param string $test A comparison string
+     * @param string|int $test A comparison string or an integer
      *
      * @throws \InvalidArgumentException If the test is not understood
      */
 
@@ -221,7 +221,7 @@ public function files()
      *   $finder->depth('> 1') // the Finder will start matching at level 1.
      *   $finder->depth('< 3') // the Finder will descend at most 3 levels of directories below the starting point.
      *
-     * @param int $level The depth level expression
+     * @param string|int $level The depth level expression
      *
      * @return Finder|SplFileInfo[] The current Finder instance
      *
@@ -393,7 +393,7 @@ public function notPath($pattern)
      * $finder->size('<= 1Ki');
      * $finder->size(4);
      *
-     * @param string $size A size range string
+     * @param string|int $size A size range string or an integer
      *
      * @return Finder|SplFileInfo[] The current Finder instance
      *
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`92`	`92`	`$io->title(sprintf('Current configuration for "%s"', $name));`
`93`	`93`	`}`
`94`	`94`
`95`		`- $io->writeln(Yaml::dump(array($extension->getAlias() => $config), 10));`
	`95`	`+ $io->writeln(Yaml::dump(array($extension->getAlias() => $container->getParameterBag()->resolveValue($config)), 10));`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`private function compileContainer()`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class NumberComparator extends Comparator`
`37`	`37`	`/**`
`38`	`38`	`* Constructor.`
`39`	`39`	`*`
`40`		`- * @param string $test A comparison string`
	`40`	`+ * @param string\|int $test A comparison string or an integer`
`41`	`41`	`*`
`42`	`42`	`* @throws \InvalidArgumentException If the test is not understood`
`43`	`43`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ public function files()`
`221`	`221`	`* $finder->depth('> 1') // the Finder will start matching at level 1.`
`222`	`222`	`* $finder->depth('< 3') // the Finder will descend at most 3 levels of directories below the starting point.`
`223`	`223`	`*`
`224`		`- * @param int $level The depth level expression`
	`224`	`+ * @param string\|int $level The depth level expression`
`225`	`225`	`*`
`226`	`226`	`* @return Finder\|SplFileInfo[] The current Finder instance`
`227`	`227`	`*`
`@@ -393,7 +393,7 @@ public function notPath($pattern)`
`393`	`393`	`* $finder->size('<= 1Ki');`
`394`	`394`	`* $finder->size(4);`
`395`	`395`	`*`
`396`		`- * @param string $size A size range string`
	`396`	`+ * @param string\|int $size A size range string or an integer`
`397`	`397`	`*`
`398`	`398`	`* @return Finder\|SplFileInfo[] The current Finder instance`
`399`	`399`	`*`