Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 7211cab

Browse filesBrowse files
committed
Merge branch '2.3' into 2.4
* 2.3: made {@inheritdoc} annotations consistent across the board fixed types in phpdocs made phpdoc types consistent with those defined in Hack Add support Thai translations made types consistent with those defined in Hack removed extra/unsupported arguments [HttpKernel] fixed an error message [TwigBundle] removed undefined argument [Translation] Make IcuDatFileLoader/IcuResFileLoader::load invalid resource compatible with HHVM. Conflicts: src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php src/Symfony/Component/Config/Definition/ReferenceDumper.php src/Symfony/Component/Console/Helper/DescriptorHelper.php src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php src/Symfony/Component/HttpFoundation/Response.php src/Symfony/Component/HttpFoundation/StreamedResponse.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php src/Symfony/Component/Stopwatch/StopwatchPeriod.php src/Symfony/Component/Translation/TranslatorInterface.php src/Symfony/Component/Validator/ConstraintValidatorFactory.php
2 parents c0ca90a + aa04265 commit 7211cab
Copy full SHA for 7211cab

File tree

4 files changed

+5
-5
lines changed
Filter options

4 files changed

+5
-5
lines changed

‎Parser/Parser.php

Copy file name to clipboardExpand all lines: Parser/Parser.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ private function parserSelectorNode(TokenStream $stream)
169169
* Parses next simple node (hash, class, pseudo, negation).
170170
*
171171
* @param TokenStream $stream
172-
* @param boolean $insideNegation
172+
* @param bool $insideNegation
173173
*
174174
* @throws SyntaxErrorException
175175
*

‎XPath/Extension/FunctionExtension.php

Copy file name to clipboardExpand all lines: XPath/Extension/FunctionExtension.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public function getFunctionTranslators()
4646
/**
4747
* @param XPathExpr $xpath
4848
* @param FunctionNode $function
49-
* @param boolean $last
50-
* @param boolean $addNameTest
49+
* @param bool $last
50+
* @param bool $addNameTest
5151
*
5252
* @return XPathExpr
5353
*

‎XPath/Extension/NodeExtension.php

Copy file name to clipboardExpand all lines: XPath/Extension/NodeExtension.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function __construct(Translator $translator, $flags = 0)
5353

5454
/**
5555
* @param int $flag
56-
* @param boolean $on
56+
* @param bool $on
5757
*
5858
* @return NodeExtension
5959
*/

‎XPath/XPathExpr.php

Copy file name to clipboardExpand all lines: XPath/XPathExpr.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class XPathExpr
4040
* @param string $path
4141
* @param string $element
4242
* @param string $condition
43-
* @param boolean $starPrefix
43+
* @param bool $starPrefix
4444
*/
4545
public function __construct($path = '', $element = '*', $condition = '', $starPrefix = false)
4646
{

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.