Skip to content

Commit b58a531

Browse files
Merge branch '4.3' into 4.4
* 4.3: [OptionsResolve] Revert change in tests for a not-merged change in code [HttpClient] fix handling of 3xx with no Location header - ignore Content-Length when no body is expected [Workflow] Made the configuration more robust for the 'property' key [Security/Core] make NativePasswordEncoder use sodium to validate passwords when possible #30432 fix an error message fix paths to detect code owners [HttpClient] ignore the body of responses to HEAD requests [Validator] Ensure numeric subpaths do not cause errors on PHP 7.4 [SecurityBundle] Fix wrong assertion Remove unused local variables in tests [Yaml][Parser] Remove the getLastLineNumberBeforeDeprecation() internal unused method Make sure to collect child forms created on *_SET_DATA events [WebProfilerBundle] Improve display in Email panel for dark theme do not render errors for checkboxes twice
2 parents 13bfb7f + 7fbd58a commit b58a531

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed

Parser.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,6 @@ public function parse(string $value, int $flags = 0)
108108
return $data;
109109
}
110110

111-
/**
112-
* @internal
113-
*/
114-
public function getLastLineNumberBeforeDeprecation(): int
115-
{
116-
return $this->getRealCurrentLineNb();
117-
}
118-
119111
private function doParse(string $value, int $flags)
120112
{
121113
$this->currentLineNb = -1;

Tests/Command/LintCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public function testLintFileNotReadable()
9797
$filename = $this->createFile('');
9898
unlink($filename);
9999

100-
$ret = $tester->execute(['filename' => $filename], ['decorated' => false]);
100+
$tester->execute(['filename' => $filename], ['decorated' => false]);
101101
}
102102

103103
private function createFile($content): string

Tests/ParserTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function testTabsInYaml()
6464

6565
foreach ($yamls as $yaml) {
6666
try {
67-
$content = $this->parser->parse($yaml);
67+
$this->parser->parse($yaml);
6868

6969
$this->fail('YAML files must not contain tabs');
7070
} catch (\Exception $e) {

0 commit comments

Comments
 (0)