Skip to content

Commit

Permalink
Merge branch '6.3' into 6.4
Browse files Browse the repository at this point in the history
* 6.3:
  minor #53524 [Messenger] [AmazonSqs] Allow `async-aws/sqs` version 2 (smoench)
  Fix bad merge
  List CS fix in .git-blame-ignore-revs
  Fix implicitly-required parameters
  List CS fix in .git-blame-ignore-revs
  Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value
  • Loading branch information
nicolas-grekas committed Jan 23, 2024
2 parents 823eef8 + 96a0f63 commit c3f1b7d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions LazyProxy/PhpDumper/ProxyDumper.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public function __construct(string $salt = '')
$this->classGenerator = new BaseGeneratorStrategy();
}

public function isProxyCandidate(Definition $definition, bool &$asGhostObject = null, string $id = null): bool
public function isProxyCandidate(Definition $definition, ?bool &$asGhostObject = null, ?string $id = null): bool
{
$asGhostObject = false;

Expand Down Expand Up @@ -76,7 +76,7 @@ static function (&\$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface \$
EOF;
}

public function getProxyCode(Definition $definition, string $id = null): string
public function getProxyCode(Definition $definition, ?string $id = null): string
{
$code = $this->classGenerator->generate($this->generateProxyClass($definition));
$code = preg_replace('/^(class [^ ]++ extends )([^\\\\])/', '$1\\\\$2', $code);
Expand Down

0 comments on commit c3f1b7d

Please sign in to comment.