From f87af02c112e4afdc42ee002e3ce86531df70ab5 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Thu, 28 Nov 2024 08:28:44 +0000
Subject: [PATCH] Bring lib/ up to php8.4 standards

(Breaking the diff against shish/safe into smaller parts for easier reviewing)
---
 lib/Exceptions/CurlException.php          |  1 -
 lib/Exceptions/JsonException.php          |  1 -
 lib/Exceptions/OpensslException.php       |  1 -
 lib/Exceptions/PcreException.php          |  3 +--
 lib/Exceptions/SafeExceptionInterface.php |  2 --
 lib/Exceptions/SimplexmlException.php     |  1 +
 lib/special_cases.php                     | 12 ++++++------
 7 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/lib/Exceptions/CurlException.php b/lib/Exceptions/CurlException.php
index 3401b57b..802c37df 100644
--- a/lib/Exceptions/CurlException.php
+++ b/lib/Exceptions/CurlException.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Safe\Exceptions;
 
 class CurlException extends \Exception implements SafeExceptionInterface
diff --git a/lib/Exceptions/JsonException.php b/lib/Exceptions/JsonException.php
index d7d5a010..210d53b7 100644
--- a/lib/Exceptions/JsonException.php
+++ b/lib/Exceptions/JsonException.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Safe\Exceptions;
 
 class JsonException extends \JsonException implements SafeExceptionInterface
diff --git a/lib/Exceptions/OpensslException.php b/lib/Exceptions/OpensslException.php
index 5f424af2..cd0dd9b5 100644
--- a/lib/Exceptions/OpensslException.php
+++ b/lib/Exceptions/OpensslException.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Safe\Exceptions;
 
 class OpensslException extends \Exception implements SafeExceptionInterface
diff --git a/lib/Exceptions/PcreException.php b/lib/Exceptions/PcreException.php
index ee6367ef..7925c8e4 100644
--- a/lib/Exceptions/PcreException.php
+++ b/lib/Exceptions/PcreException.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Safe\Exceptions;
 
 class PcreException extends \Exception implements SafeExceptionInterface
@@ -15,7 +14,7 @@ public static function createFromPhpError(): self
             PREG_BAD_UTF8_OFFSET_ERROR => 'PREG_BAD_UTF8_OFFSET_ERROR',
             PREG_JIT_STACKLIMIT_ERROR => 'PREG_JIT_STACKLIMIT_ERROR',
         ];
-        $errMsg = $errorMap[preg_last_error()] ?? 'Unknown PCRE error: '.preg_last_error();
+        $errMsg = $errorMap[preg_last_error()] ?? 'Unknown PCRE error: ' . preg_last_error();
         return new self($errMsg, \preg_last_error());
     }
 }
diff --git a/lib/Exceptions/SafeExceptionInterface.php b/lib/Exceptions/SafeExceptionInterface.php
index fbea6ad2..cc7f71fc 100644
--- a/lib/Exceptions/SafeExceptionInterface.php
+++ b/lib/Exceptions/SafeExceptionInterface.php
@@ -1,9 +1,7 @@
 <?php
 
-
 namespace Safe\Exceptions;
 
 interface SafeExceptionInterface extends \Throwable
 {
-
 }
diff --git a/lib/Exceptions/SimplexmlException.php b/lib/Exceptions/SimplexmlException.php
index 6b6cd5c2..f304f883 100644
--- a/lib/Exceptions/SimplexmlException.php
+++ b/lib/Exceptions/SimplexmlException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Safe\Exceptions;
 
 class SimplexmlException extends \ErrorException implements SafeExceptionInterface
diff --git a/lib/special_cases.php b/lib/special_cases.php
index a4e85a93..25c5e476 100644
--- a/lib/special_cases.php
+++ b/lib/special_cases.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file contains all the functions that could not be dealt with automatically using the code generator.
  * If you add a function in this list, do not forget to add it in the generator/config/specialCasesFunctions.php
@@ -7,9 +8,6 @@
 
 namespace Safe;
 
-use Safe\Exceptions\FilesystemException;
-use const PREG_NO_ERROR;
-
 use Safe\Exceptions\MiscException;
 use Safe\Exceptions\PosixException;
 use Safe\Exceptions\SocketsException;
@@ -19,6 +17,9 @@
 use Safe\Exceptions\OpensslException;
 use Safe\Exceptions\PcreException;
 use Safe\Exceptions\SimplexmlException;
+use Safe\Exceptions\FilesystemException;
+
+use const PREG_NO_ERROR;
 
 /**
  * Wrapper for json_decode that throws when an error occurs.
@@ -157,7 +158,7 @@ function apcu_fetch($key)
  * @throws PcreException
  *
  */
-function preg_replace($pattern, $replacement, $subject, int $limit = -1, int &$count = null)
+function preg_replace($pattern, $replacement, $subject, int $limit = -1, ?int &$count = null)
 {
     error_clear_last();
     $result = \preg_replace($pattern, $replacement, $subject, $limit, $count);
@@ -394,7 +395,6 @@ function fputcsv($stream, array $fields, string $separator = ",", string $enclos
 {
     error_clear_last();
     if (PHP_VERSION_ID >= 80100) {
-        /** @phpstan-ignore-next-line */
         $result = \fputcsv($stream, $fields, $separator, $enclosure, $escape, $eol);
     } else {
         $result = \fputcsv($stream, $fields, $separator, $enclosure, $escape);
@@ -431,7 +431,7 @@ function fputcsv($stream, array $fields, string $separator = ",", string $enclos
  * @throws FilesystemException
  *
  */
-function fgetcsv($stream, int $length = null, string $separator = ",", string $enclosure = "\"", string $escape = "\\"): array|false
+function fgetcsv($stream, ?int $length = null, string $separator = ",", string $enclosure = "\"", string $escape = "\\"): array|false
 {
     error_clear_last();
     $safeResult = \fgetcsv($stream, $length, $separator, $enclosure, $escape);