Merge branch '2.7' into 2.8
* 2.7: Write an exception message in a one heading line [Finder] Refine phpdoc about argument for NumberComparator Fix unresolved parameters from default bundle configs in debug:config [github] Tweak PR template
This commit is contained in:
commit
c9d08b61c3
14
.github/PULL_REQUEST_TEMPLATE.md
vendored
14
.github/PULL_REQUEST_TEMPLATE.md
vendored
@ -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 @@ EOF
|
||||
$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 @@ class Finder implements \IteratorAggregate, \Countable
|
||||
* $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 @@ class Finder implements \IteratorAggregate, \Countable
|
||||
* $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
|
||||
*
|
||||
|
Reference in New Issue
Block a user