Skip to content

Commit c0687b0

Browse files
Merge branch '4.4'
* 4.4: cs fix Fix inconsistent return points. [Config] Add handling for ignored keys in ArrayNode::mergeValues. Fix inconsistent return points. [Security/Core] UserInterface::getPassword() can return null cs fix cs fix Fix missing exporter in PHPUnit constraint poylfill added `Process::getLastOutputTime()` method [Router] Fix TraceableUrlMatcher behaviour with trailing slash [HttpKernel] Remove outdated docblock comment Fix handling for session parameters Revert "bug #33092 [DependencyInjection] Improve an exception message (fabpot)"
2 parents 1389cb4 + b2fbf6e commit c0687b0

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

Parser/Tokenizer/TokenizerEscaping.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ private function replaceUnicodeSequences(string $value): string
5858
if (0x10000 > $c) {
5959
return \chr(0xE0 | $c >> 12).\chr(0x80 | $c >> 6 & 0x3F).\chr(0x80 | $c & 0x3F);
6060
}
61+
62+
return '';
6163
}, $value);
6264
}
6365
}

XPath/Translator.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@ public function selectorToXPath(SelectorNode $selector, string $prefix = 'descen
114114
return ($prefix ?: '').$this->nodeToXPath($selector);
115115
}
116116

117+
/**
118+
* @return $this
119+
*/
117120
public function registerExtension(Extension\ExtensionInterface $extension): self
118121
{
119122
$this->extensions[$extension->getName()] = $extension;
@@ -139,6 +142,9 @@ public function getExtension(string $name): Extension\ExtensionInterface
139142
return $this->extensions[$name];
140143
}
141144

145+
/**
146+
* @return $this
147+
*/
142148
public function registerParserShortcut(ParserInterface $shortcut): self
143149
{
144150
$this->shortcutParsers[] = $shortcut;

0 commit comments

Comments
 (0)