Skip to content

Fix PHP 8.4 deprecations #1618

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
barryvdh merged 2 commits into from
Dec 14, 2024
Merged

Fix PHP 8.4 deprecations #1618

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
13763ae
Replace implicitly nullable parameters for PHP 8.4
JeppeKnockaert Nov 27, 2024
283f731
composer fix-style
Nov 27, 2024
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
4 changes: 2 additions & 2 deletions resources/views/helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?= '<?php' ?>
<?php
/**
* @var \Barryvdh\LaravelIdeHelper\Alias[][] $namespaces_by_alias_ns
* @var \Barryvdh\LaravelIdeHelper\Alias[][] $namespaces_by_extends_ns
* @var Barryvdh\LaravelIdeHelper\Alias[][] $namespaces_by_alias_ns
* @var Barryvdh\LaravelIdeHelper\Alias[][] $namespaces_by_extends_ns
* @var bool $include_fluent
* @var string $helpers
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Console/ModelsCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1304,7 +1304,7 @@ protected function getCommentFromDocBlock(\ReflectionMethod $reflection)
*
* @return null|string
*/
protected function getReturnTypeFromDocBlock(\ReflectionMethod $reflection, \Reflector $reflectorForContext = null)
protected function getReturnTypeFromDocBlock(\ReflectionMethod $reflection, ?\Reflector $reflectorForContext = null)
{
$phpDocContext = (new ContextFactory())->createFromReflector($reflectorForContext ?? $reflection);
$context = new Context(
Expand Down
2 changes: 1 addition & 1 deletion src/Generator.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(
$config,
/* Illuminate\View\Factory */
$view,
OutputInterface $output = null,
?OutputInterface $output = null,
$helpers = ''
) {
$this->config = $config;
Expand Down
8 changes: 4 additions & 4 deletions tests/MacroTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function testInitPhpDocClosureWithoutDocBlock(): void
{
$phpdoc = (new MacroMock())->getPhpDoc(
new ReflectionFunction(
function (int $a = null): int {
function (?int $a = null): int {
return 0;
}
)
Expand All @@ -79,7 +79,7 @@ public function testInitPhpDocClosureWithArgsAndReturnType(): void
/**
* Test docblock.
*/
function (int $a = null): int {
function (?int $a = null): int {
return 0;
}
)
Expand All @@ -103,7 +103,7 @@ public function testInitPhpDocClosureWithArgs(): void
/**
* Test docblock.
*/
function (int $a = null) {
function (?int $a = null) {
return 0;
}
)
Expand Down Expand Up @@ -274,7 +274,7 @@ public function __construct()
// no need to call parent
}

public function getPhpDoc(ReflectionFunctionAbstract $method, ReflectionClass $class = null): DocBlock
public function getPhpDoc(ReflectionFunctionAbstract $method, ?ReflectionClass $class = null): DocBlock
{
return (new Macro($method, '', $class ?? $method->getClosureScopeClass()))->phpdoc;
}
Expand Down