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 a4c5edc

Browse filesBrowse files
chalasrchalasr
committed
Merge branch '5.2' into 5.x
* 5.2: [Workflow] Re-add InvalidTokenConfigurationException for BC Fix PHP 8.1 null values [Console] Fix PHP 8.1 null error for preg_match flag Fix: Article Definition::removeMethodCall should remove all matching calls [HttpFoundation] Fix typo in exception message mark the LazyIterator class as internal fix extracting mixed type-hinted property types [Worflow] Fixed GuardListener when using the new Security system keep valid submitted choices when additional choices are submitted
2 parents 1b94d88 + 4365af6 commit a4c5edc
Copy full SHA for a4c5edc

File tree

Expand file treeCollapse file tree

37 files changed

+152
-75
lines changed
Filter options
Expand file treeCollapse file tree

37 files changed

+152
-75
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1472,7 +1472,7 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode)
14721472
->info('A network interface name, IP address, a host name or a UNIX socket to bind to.')
14731473
->end()
14741474
->booleanNode('verify_peer')
1475-
->info('Indicates if the peer should be verified in a SSL/TLS context.')
1475+
->info('Indicates if the peer should be verified in an SSL/TLS context.')
14761476
->end()
14771477
->booleanNode('verify_host')
14781478
->info('Indicates if the host should exist as a certificate common name.')
@@ -1615,7 +1615,7 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode)
16151615
->info('A network interface name, IP address, a host name or a UNIX socket to bind to.')
16161616
->end()
16171617
->booleanNode('verify_peer')
1618-
->info('Indicates if the peer should be verified in a SSL/TLS context.')
1618+
->info('Indicates if the peer should be verified in an SSL/TLS context.')
16191619
->end()
16201620
->booleanNode('verify_host')
16211621
->info('Indicates if the host should exist as a certificate common name.')

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/form.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/config/form.php
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,10 @@
9797
->tag('form.type')
9898

9999
->set('form.type.choice', ChoiceType::class)
100-
->args([service('form.choice_list_factory')])
100+
->args([
101+
service('form.choice_list_factory'),
102+
service('translator')->ignoreOnInvalid(),
103+
])
101104
->tag('form.type')
102105

103106
->set('form.type.file', FileType::class)

‎src/Symfony/Component/BrowserKit/AbstractBrowser.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/BrowserKit/AbstractBrowser.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ public function submit(Form $form, array $values = [], array $serverParameters =
329329
* @param string $button The text content, id, value or name of the form <button> or <input type="submit">
330330
* @param array $fieldValues Use this syntax: ['my_form[name]' => '...', 'my_form[email]' => '...']
331331
* @param string $method The HTTP method used to submit the form
332-
* @param array $serverParameters These values override the ones stored in $_SERVER (HTTP headers must include a HTTP_ prefix as PHP does)
332+
* @param array $serverParameters These values override the ones stored in $_SERVER (HTTP headers must include an HTTP_ prefix as PHP does)
333333
*/
334334
public function submitForm(string $button, array $fieldValues = [], string $method = 'POST', array $serverParameters = []): Crawler
335335
{
@@ -350,7 +350,7 @@ public function submitForm(string $button, array $fieldValues = [], string $meth
350350
* @param string $uri The URI to fetch
351351
* @param array $parameters The Request parameters
352352
* @param array $files The files
353-
* @param array $server The server parameters (HTTP headers are referenced with a HTTP_ prefix as PHP does)
353+
* @param array $server The server parameters (HTTP headers are referenced with an HTTP_ prefix as PHP does)
354354
* @param string $content The raw body data
355355
* @param bool $changeHistory Whether to update the history or not (only used internally for back(), forward(), and reload())
356356
*

‎src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use Symfony\Component\Config\Definition\PrototypedArrayNode;
1919

2020
/**
21-
* Dumps a XML reference configuration for the given configuration/node instance.
21+
* Dumps an XML reference configuration for the given configuration/node instance.
2222
*
2323
* @author Wouter J <waldio.webdesign@gmail.com>
2424
*/

‎src/Symfony/Component/Console/Input/StringInput.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Input/StringInput.php
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ private function tokenize(string $input): array
4848
$length = \strlen($input);
4949
$cursor = 0;
5050
while ($cursor < $length) {
51-
if (preg_match('/\s+/A', $input, $match, null, $cursor)) {
52-
} elseif (preg_match('/([^="\'\s]+?)(=?)('.self::REGEX_QUOTED_STRING.'+)/A', $input, $match, null, $cursor)) {
51+
if (preg_match('/\s+/A', $input, $match, 0, $cursor)) {
52+
} elseif (preg_match('/([^="\'\s]+?)(=?)('.self::REGEX_QUOTED_STRING.'+)/A', $input, $match, 0, $cursor)) {
5353
$tokens[] = $match[1].$match[2].stripcslashes(str_replace(['"\'', '\'"', '\'\'', '""'], '', substr($match[3], 1, \strlen($match[3]) - 2)));
54-
} elseif (preg_match('/'.self::REGEX_QUOTED_STRING.'/A', $input, $match, null, $cursor)) {
54+
} elseif (preg_match('/'.self::REGEX_QUOTED_STRING.'/A', $input, $match, 0, $cursor)) {
5555
$tokens[] = stripcslashes(substr($match[0], 1, \strlen($match[0]) - 2));
56-
} elseif (preg_match('/'.self::REGEX_STRING.'/A', $input, $match, null, $cursor)) {
56+
} elseif (preg_match('/'.self::REGEX_STRING.'/A', $input, $match, 0, $cursor)) {
5757
$tokens[] = stripcslashes($match[1]);
5858
} else {
5959
// should never happen

‎src/Symfony/Component/DependencyInjection/Compiler/ResolveClassPass.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/ResolveClassPass.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function process(ContainerBuilder $container)
3131
}
3232
if (preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\\\\[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+)++$/', $id)) {
3333
if ($definition instanceof ChildDefinition && !class_exists($id)) {
34-
throw new InvalidArgumentException(sprintf('Service definition "%s" has a parent but no class, and its name looks like a FQCN. Either the class is missing or you want to inherit it from the parent service. To resolve this ambiguity, please rename this service to a non-FQCN (e.g. using dots), or create the missing class.', $id));
34+
throw new InvalidArgumentException(sprintf('Service definition "%s" has a parent but no class, and its name looks like an FQCN. Either the class is missing or you want to inherit it from the parent service. To resolve this ambiguity, please rename this service to a non-FQCN (e.g. using dots), or create the missing class.', $id));
3535
}
3636
$definition->setClass($id);
3737
}

‎src/Symfony/Component/DependencyInjection/Definition.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Definition.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,6 @@ public function removeMethodCall(string $method)
370370
foreach ($this->calls as $i => $call) {
371371
if ($call[0] === $method) {
372372
unset($this->calls[$i]);
373-
break;
374373
}
375374
}
376375

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/BindTrait.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/BindTrait.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ trait BindTrait
2626
* injected in the matching parameters (of the constructor, of methods
2727
* called and of controller actions).
2828
*
29-
* @param string $nameOrFqcn A parameter name with its "$" prefix, or a FQCN
29+
* @param string $nameOrFqcn A parameter name with its "$" prefix, or an FQCN
3030
* @param mixed $valueOrRef The value or reference to bind
3131
*
3232
* @return $this

‎src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ private function parseDefinition(\DOMElement $service, string $file, Definition
373373
}
374374

375375
/**
376-
* Parses a XML file to a \DOMDocument.
376+
* Parses an XML file to a \DOMDocument.
377377
*
378378
* @throws InvalidArgumentException When loading of XML file returns error
379379
*/

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveClassPassTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveClassPassTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function testClassFoundChildDefinition()
8686
public function testAmbiguousChildDefinition()
8787
{
8888
$this->expectException(InvalidArgumentException::class);
89-
$this->expectExceptionMessage('Service definition "App\Foo\Child" has a parent but no class, and its name looks like a FQCN. Either the class is missing or you want to inherit it from the parent service. To resolve this ambiguity, please rename this service to a non-FQCN (e.g. using dots), or create the missing class.');
89+
$this->expectExceptionMessage('Service definition "App\Foo\Child" has a parent but no class, and its name looks like an FQCN. Either the class is missing or you want to inherit it from the parent service. To resolve this ambiguity, please rename this service to a non-FQCN (e.g. using dots), or create the missing class.');
9090
$container = new ContainerBuilder();
9191
$container->register('App\Foo', null);
9292
$container->setDefinition('App\Foo\Child', new ChildDefinition('App\Foo'));

0 commit comments

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