Fix last PHP 8.4 deprecations.

lucatume · Dec 1, 2024 · 782e95b · 782e95b
1 parent 9389663
commit 782e95b
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 20 deletions.
diff --git a/src/Module/WPCLI.php b/src/Module/WPCLI.php
@@ -283,7 +283,7 @@ public function grabLastShellErrorOutput(): string
      */
     public function cliToArray(
         array $command,
-        callable $splitCallback = null,
+        ?callable $splitCallback = null,
         ?array $env = null,
         mixed $input = null
     ): array {

diff --git a/src/Module/WPDb.php b/src/Module/WPDb.php
@@ -602,8 +602,8 @@ public function dontSeePostMetaInDatabase(array $criteria): void
     public function seePostWithTermInDatabase(
         int $post_id,
         int $term_taxonomy_id,
-        int $term_order = null,
-        string $taxonomy = null
+        ?int $term_order = null,
+        ?string $taxonomy = null
     ): void {
         if ($taxonomy !== null) {
             $match = $this->grabTermTaxonomyIdFromDatabase([
@@ -3651,7 +3651,7 @@ public function haveMenuInDatabase(string $slug, string $location, array $overri
     public function haveMenuItemInDatabase(
         string $menuSlug,
         string $title,
-        int $menuOrder = null,
+        ?int $menuOrder = null,
         array $meta = []
     ): int {
         if (empty($this->stylesheet)) {
@@ -3748,7 +3748,7 @@ public function haveAttachmentInDatabase(
         string $file,
         string|int $date = 'now',
         array $overrides = [],
-        array $imageSizes = null
+        ?array $imageSizes = null
     ): int {
         if (!class_exists(ImageResize::class)) {
             $message = 'The "haveAttachmentInDatabase" method requires the "gumlet/php-image-resize:^1.6" package.' .
@@ -4525,8 +4525,8 @@ public function _loadDump(?string $databaseKey = null, ?array $databaseConfig =
     public function dontSeePostWithTermInDatabase(
         int $post_id,
         int $term_taxonomy_id,
-        int $term_order = null,
-        string $taxonomy = null
+        ?int $term_order = null,
+        ?string $taxonomy = null
     ): void {
         if ($taxonomy !== null) {
             $match = $this->grabTermTaxonomyIdFromDatabase([

diff --git a/src/Module/WPFilesystem.php b/src/Module/WPFilesystem.php
@@ -1300,7 +1300,7 @@ public function getWpRootFolder(): string
     public function getBlogUploadsPath(
         int $blogId,
         string $file = '',
-        DateTimeImmutable|DateTime|string $date = null
+        DateTimeImmutable|DateTime|string|null $date = null
     ): string {
         $dateFrag = $date !== null ?
             $this->buildDateFrag($date)

diff --git a/src/Module/WPLoader/FiltersGroup.php b/src/Module/WPLoader/FiltersGroup.php
@@ -40,8 +40,8 @@ public function __construct(/**
          * An array detailing each filter callback, priority and arguments.
          */
         protected array $filters = [],
-        callable $removeWith = null,
-        callable $addWith = null
+        ?callable $removeWith = null,
+        ?callable $addWith = null
     ) {
         $this->removeCallback = $removeWith ?? 'remove_filter';
         $this->addCallback    = $addWith ?? 'add_filter';

diff --git a/src/MonkeyPatch/FileStreamWrapper.php b/src/MonkeyPatch/FileStreamWrapper.php
@@ -30,7 +30,7 @@ public static function setPatcherForFile(
         string $file,
         PatcherInterface $patcher,
         bool $redirectOpenedPath = true,
-        string $context = null
+        ?string $context = null
     ): void {
         $fromFilePath = FS::realpath($file) ?: $file;
         self::$fileToPatcherMap[$fromFilePath] = [$patcher, $redirectOpenedPath, $context ?? ''];
@@ -71,7 +71,7 @@ public function __destruct()
     /**
      * @throws MonkeyPatchingException
      */
-    public function stream_open(string $path, string $mode, int $options, string &$openedPath = null): bool
+    public function stream_open(string $path, string $mode, int $options, ?string &$openedPath = null): bool
     {
         self::unregister();
 

diff --git a/src/Utils/MonkeyPatch.php b/src/Utils/MonkeyPatch.php
@@ -14,7 +14,7 @@ public static function redirectFileToFile(
         string $fromFile,
         string $toFile,
         bool $redirectOpenedPath = true,
-        string $context = null
+        ?string $context = null
     ): void {
         FileStreamWrapper::setPatcherForFile(
             $fromFile,
@@ -33,7 +33,7 @@ public static function redirectFileContents(
         string $fromFile,
         string $fileContents,
         bool $redirectOpenedPath = true,
-        string $context = null
+        ?string $context = null
     ): void {
         FileStreamWrapper::setPatcherForFile(
             $fromFile,

diff --git a/src/WordPress/CliProcess.php b/src/WordPress/CliProcess.php
@@ -57,8 +57,8 @@ public function __construct(
      */
     public static function fromShellCommandline(
         string $command,
-        string $cwd = null,
-        array $env = null,
+        ?string $cwd = null,
+        ?array $env = null,
         mixed $input = null,
         ?float $timeout = 60
     ): static {

diff --git a/tests/_support/Traits/LoopIsolation.php b/tests/_support/Traits/LoopIsolation.php
@@ -20,8 +20,8 @@ trait LoopIsolation
      */
     protected function assertInIsolation(
         Closure $runAssertions,
-        string $cwd = null,
-        array $requireFiles = [],
+        ?string $cwd = null,
+        ?array $requireFiles = [],
     ): mixed {
         $options = ['cwd' => $cwd, 'rethrow' => false];
 

diff --git a/tests/unit/lucatume/WPBrowser/ManagedProcess/PhpBuiltInServerTest.php b/tests/unit/lucatume/WPBrowser/ManagedProcess/PhpBuiltInServerTest.php
@@ -16,8 +16,8 @@ class PhpBuiltinServerProcessMock extends Process
 
     public function __construct(
         array $command,
-        string $cwd = null,
-        array $env = null,
+        ?string $cwd = null,
+        ?array $env = null,
         mixed $input = null,
         ?float $timeout = 60
     ) {