Skip to content

Commit 3fe5f97

Browse files
Merge branch '4.3' into 4.4
* 4.3: [Routing] Add a param annotation for $annot. [DI] fix docblock [Console] fix docblock Add missing translations for Armenian locale [Process] Added missing return type. [Process] Doc block backport. Added doc block for Registry::supports(). [Cache] Fix predis test Don't duplicate addresses in Sendgrid Transport Remove unnecessary statement Fix some docblocks. [Messenger] make delay exchange and queues durable like the normal ones by default Cancel delayed message if handler fails Added tests for #32370
2 parents ed7d37f + 1ece806 commit 3fe5f97

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

ChildDefinition.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public function getArgument($index)
8989
* @param int|string $index
9090
* @param mixed $value
9191
*
92-
* @return self the current instance
92+
* @return $this
9393
*
9494
* @throws InvalidArgumentException when $index isn't an integer
9595
*/

Dumper/PhpDumper.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1208,7 +1208,6 @@ private function addMethodMap(): string
12081208
if (!$id->isDeprecated()) {
12091209
continue;
12101210
}
1211-
$id = (string) $id;
12121211
$code .= ' '.$this->doExport($alias).' => '.$this->doExport($this->generateMethodName($alias)).",\n";
12131212
}
12141213

0 commit comments

Comments
 (0)