Skip to content

Fix deprecated nullable parameter declarations in PHP 8.2+ #511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lisachenko merged 2 commits into from
Jul 28, 2025
Merged

Fix deprecated nullable parameter declarations in PHP 8.2+ #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e51a8c
Initial plan
Copilot Jul 28, 2025
bb0eb01
Fix deprecated nullable parameter declarations across all files
Copilot Jul 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Aop/Pointcut.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public function getKind(): int;
*/
public function matches(
ReflectionClass|ReflectionFileNamespace $context,
ReflectionMethod|ReflectionProperty|ReflectionFunction $reflector = null,
ReflectionMethod|ReflectionProperty|ReflectionFunction|null $reflector = null,
object|string $instanceOrScope = null,
array $arguments = null
): bool;
Expand Down
2 changes: 1 addition & 1 deletion src/Aop/Pointcut/AndPointcut.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function __construct(int $pointcutKind = null, Pointcut ...$pointcuts)

public function matches(
ReflectionClass|ReflectionFileNamespace $context,
ReflectionMethod|ReflectionProperty|ReflectionFunction $reflector = null,
ReflectionMethod|ReflectionProperty|ReflectionFunction|null $reflector = null,
object|string $instanceOrScope = null,
array $arguments = null
): bool {
Expand Down
2 changes: 1 addition & 1 deletion src/Aop/Pointcut/AttributePointcut.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public function __construct(

final public function matches(
ReflectionClass|ReflectionFileNamespace $context,
ReflectionMethod|ReflectionProperty|ReflectionFunction $reflector = null,
ReflectionMethod|ReflectionProperty|ReflectionFunction|null $reflector = null,
object|string $instanceOrScope = null,
array $arguments = null
): bool {
Expand Down
2 changes: 1 addition & 1 deletion src/Aop/Pointcut/ClassInheritancePointcut.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function __construct(private string $parentClassOrInterfaceName) {}

public function matches(
ReflectionClass|ReflectionFileNamespace $context,
ReflectionMethod|ReflectionProperty|ReflectionFunction $reflector = null,
ReflectionMethod|ReflectionProperty|ReflectionFunction|null $reflector = null,
object|string $instanceOrScope = null,
array $arguments = null
): bool {
Expand Down
2 changes: 1 addition & 1 deletion src/Aop/Pointcut/MagicMethodDynamicPointcut.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function __construct(private string $methodName) {

public function matches(
ReflectionClass|ReflectionFileNamespace $context,
ReflectionMethod|ReflectionProperty|ReflectionFunction $reflector = null,
ReflectionMethod|ReflectionProperty|ReflectionFunction|null $reflector = null,
object|string $instanceOrScope = null,
array $arguments = null
): bool {
Expand Down
2 changes: 1 addition & 1 deletion src/Aop/Pointcut/MatchInheritedPointcut.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ final class MatchInheritedPointcut implements Pointcut
{
public function matches(
ReflectionClass|ReflectionFileNamespace $context,
ReflectionMethod|ReflectionProperty|ReflectionFunction $reflector = null,
ReflectionMethod|ReflectionProperty|ReflectionFunction|null $reflector = null,
object|string $instanceOrScope = null,
array $arguments = null
): bool {
Expand Down
2 changes: 1 addition & 1 deletion src/Aop/Pointcut/ModifierPointcut.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function __construct(int $initialMask = 0)
*/
public function matches(
ReflectionClass|ReflectionFileNamespace $context,
ReflectionMethod|ReflectionProperty|ReflectionFunction $reflector = null,
ReflectionMethod|ReflectionProperty|ReflectionFunction|null $reflector = null,
object|string $instanceOrScope = null,
array $arguments = null
): bool {
Expand Down
2 changes: 1 addition & 1 deletion src/Aop/Pointcut/NamePointcut.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function __construct(

public function matches(
ReflectionClass|ReflectionFileNamespace $context,
ReflectionMethod|ReflectionProperty|ReflectionFunction $reflector = null,
ReflectionMethod|ReflectionProperty|ReflectionFunction|null $reflector = null,
object|string $instanceOrScope = null,
array $arguments = null
): bool {
Expand Down
2 changes: 1 addition & 1 deletion src/Aop/Pointcut/NotPointcut.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function __construct(private Pointcut $pointcut) {}
*/
public function matches(
ReflectionClass|ReflectionFileNamespace $context,
ReflectionMethod|ReflectionProperty|ReflectionFunction $reflector = null,
ReflectionMethod|ReflectionProperty|ReflectionFunction|null $reflector = null,
object|string $instanceOrScope = null,
array $arguments = null
): bool {
Expand Down
2 changes: 1 addition & 1 deletion src/Aop/Pointcut/OrPointcut.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public function __construct(Pointcut ...$pointcuts)

public function matches(
ReflectionClass|ReflectionFileNamespace $context,
ReflectionMethod|ReflectionProperty|ReflectionFunction $reflector = null,
ReflectionMethod|ReflectionProperty|ReflectionFunction|null $reflector = null,
object|string $instanceOrScope = null,
array $arguments = null
): bool {
Expand Down
2 changes: 1 addition & 1 deletion src/Aop/Pointcut/PointcutReference.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public function __construct(

public function matches(
ReflectionClass|ReflectionFileNamespace $context,
ReflectionMethod|ReflectionProperty|ReflectionFunction $reflector = null,
ReflectionMethod|ReflectionProperty|ReflectionFunction|null $reflector = null,
object|string $instanceOrScope = null,
array $arguments = null
): bool {
Expand Down
2 changes: 1 addition & 1 deletion src/Aop/Pointcut/ReturnTypePointcut.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function __construct(string $returnTypeName)

public function matches(
ReflectionClass|ReflectionFileNamespace $context,
ReflectionMethod|ReflectionProperty|ReflectionFunction $reflector = null,
ReflectionMethod|ReflectionProperty|ReflectionFunction|null $reflector = null,
object|string $instanceOrScope = null,
array $arguments = null
): bool {
Expand Down
2 changes: 1 addition & 1 deletion src/Aop/Pointcut/TruePointcut.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function __construct(private int $pointcutKind = self::KIND_ALL) {}
*/
public function matches(
ReflectionClass|ReflectionFileNamespace $context,
ReflectionMethod|ReflectionProperty|ReflectionFunction $reflector = null,
ReflectionMethod|ReflectionProperty|ReflectionFunction|null $reflector = null,
object|string $instanceOrScope = null,
array $arguments = null
): true {
Expand Down
2 changes: 1 addition & 1 deletion src/Instrument/ClassLoading/CacheWarmer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?php

declare(strict_types = 1);
Expand Down Expand Up @@ -40,7 +40,7 @@
/**
* CacheWarmer constructor.
*/
public function __construct(AspectKernel $aspectKernel, OutputInterface $output = null)
public function __construct(AspectKernel $aspectKernel, ?OutputInterface $output = null)
{
$this->aspectKernel = $aspectKernel;
$this->output = $output ?? new NullOutput();
Expand Down
4 changes: 2 additions & 2 deletions src/Proxy/Part/InterceptedConstructorGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ final class InterceptedConstructorGenerator extends MethodGenerator
*/
public function __construct(
array $interceptedProperties,
ReflectionMethod $constructor = null,
MethodGenerator $constructorGenerator = null,
?ReflectionMethod $constructor = null,
?MethodGenerator $constructorGenerator = null,
bool $useTypeWidening = false
) {
$constructorBody = count($interceptedProperties) > 0 ? $this->getConstructorBody($interceptedProperties) : '';
Expand Down
Loading