Merge pull request #667 from rollbar/added/php8.5-support

danielmorell · web-flow · commit 8a0dab4599d9 · 2025-11-24T19:13:25.000-06:00
Added PHP 8.5 Support
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
       matrix:
         # All the versions, OS, and dependency levels we want to support
         os: [ubuntu]         # TODO: windows, macos
-        php: [ '8.1', '8.2', '8.3', '8.4' ]
+        php: [ '8.1', '8.2', '8.3', '8.4', '8.5' ]
         dependency: [ stable ]
         # Our code has paths for with- and without- XDebug, and we want to test
         # both of them.
@@ -73,22 +73,21 @@ jobs:
           key: ${{ matrix.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ matrix.dependency }}-
           restore-keys: ${{ matrix.os }}-composer-${{ matrix.dependency }}-
 
-      - name: Install dependencies PHP < 8.4
-        if: matrix.php != '8.4'
+      - name: Install dependencies PHP < 8.5
+        if: matrix.php != '8.5'
         run: composer update --prefer-${{ matrix.dependency }} --prefer-dist --no-interaction
 
-      - name: Execute tests PHP < 8.4
-        if: matrix.php != '8.4'
+      - name: Execute tests PHP < 8.5
+        if: matrix.php != '8.5'
         run: composer test
 
-      # This is a temporary workaround until vimeo/psalm is updated to support PHP 8.4.
-      # See https://github.com/vimeo/psalm/issues/11107
-      - name: Install dependencies PHP 8.4
-        if: matrix.php == '8.4'
+      # This is a temporary workaround until vimeo/psalm is updated to support PHP 8.5.
+      - name: Install dependencies PHP 8.5
+        if: matrix.php == '8.5'
         run: composer update --prefer-${{ matrix.dependency }} --prefer-dist --no-interaction --ignore-platform-reqs
 
-      - name: Execute tests PHP 8.4
-        if: matrix.php == '8.4'
+      - name: Execute tests PHP 8.5
+        if: matrix.php == '8.5'
         run: |
           ./vendor/bin/phpcs --standard=PSR2 ./src ./tests
           ./vendor/bin/phpunit --coverage-clover build/logs/clover.xml
diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
     "mockery/mockery": "^1.5.1",
     "squizlabs/php_codesniffer": "^3.7",
     "phpmd/phpmd" : "^2.13",
-    "vimeo/psalm": "^5.9"
+    "vimeo/psalm": "^6.13"
   },
 
   "suggest": {
diff --git a/src/DataBuilder.php b/src/DataBuilder.php
@@ -303,6 +303,7 @@ protected function setServerExtras($config)
      *
      * @return void
      */
+    #[\Override]
     public function setCustom(array $config): void
     {
         $this->custom = $config['custom'] ?? \Rollbar\Defaults::get()->custom();
@@ -373,6 +374,7 @@ protected function setHost($config)
      *
      * @return Data
      */
+    #[\Override]
     public function makeData(string $level, Throwable|string|Stringable $toLog, array $context): Data
     {
         $env  = $this->getEnvironment();
@@ -1013,6 +1015,7 @@ protected function getServerExtras()
      *
      * @return array|null
      */
+    #[\Override]
     public function getCustom(): ?array
     {
         return $this->custom;
@@ -1103,6 +1106,7 @@ protected function resolveCustomContent(mixed $custom): array
      *
      * @return void
      */
+    #[\Override]
     public function addCustom(string $key, mixed $data): void
     {
         if (!is_array($this->custom)) {
@@ -1119,6 +1123,7 @@ public function addCustom(string $key, mixed $data): void
      *
      * @return void
      */
+    #[\Override]
     public function removeCustom(string $key): void
     {
         unset($this->custom[$key]);
@@ -1186,6 +1191,7 @@ private function getSourceLines($filename)
      *
      * @return ErrorWrapper
      */
+    #[\Override]
     public function generateErrorWrapper(int $errno, string $errstr, ?string $errfile, ?int $errline): ErrorWrapper
     {
         return new ErrorWrapper(
diff --git a/src/Handlers/ErrorHandler.php b/src/Handlers/ErrorHandler.php
@@ -8,13 +8,15 @@
 
 class ErrorHandler extends AbstractHandler
 {
+    #[\Override]
     public function register()
     {
         $this->previousHandler = set_error_handler(array($this, 'handle'));
 
         parent::register();
     }
 
+    #[\Override]
     public function handle(...$args)
     {
         parent::handle(...$args);
diff --git a/src/Handlers/ExceptionHandler.php b/src/Handlers/ExceptionHandler.php
@@ -8,13 +8,15 @@
 
 class ExceptionHandler extends AbstractHandler
 {
+    #[\Override]
     public function register()
     {
         $this->previousHandler = set_exception_handler(array($this, 'handle'));
         
         parent::register();
     }
-    
+
+    #[\Override]
     public function handle(...$args)
     {
         parent::handle(...$args);
diff --git a/src/Handlers/FatalHandler.php b/src/Handlers/FatalHandler.php
@@ -15,14 +15,16 @@ class FatalHandler extends AbstractHandler
 {
     
     private static $fatalErrors = array(E_ERROR, E_PARSE, E_CORE_ERROR, E_COMPILE_ERROR, E_USER_ERROR);
-    
+
+    #[\Override]
     public function register()
     {
         \register_shutdown_function(array($this, 'handle'));
         
         parent::register();
     }
-    
+
+    #[\Override]
     public function handle(...$args)
     {
         parent::handle(...$args);
diff --git a/src/Payload/Body.php b/src/Payload/Body.php
@@ -110,6 +110,7 @@ public function setTelemetry(?array $telemetry): void
      *
      * @since 4.1.0 Includes the 'telemetry' key, if it is not empty.
      */
+    #[\Override]
     public function serialize()
     {
         $result = array();
diff --git a/src/Payload/Context.php b/src/Payload/Context.php
@@ -35,6 +35,7 @@ public function setPost(array $post): self
         return $this;
     }
 
+    #[\Override]
     public function serialize()
     {
         $result = array(
diff --git a/src/Payload/Data.php b/src/Payload/Data.php
@@ -217,6 +217,7 @@ public function setNotifier(Notifier $notifier): self
         return $this;
     }
 
+    #[\Override]
     public function serialize()
     {
         $result = array(
diff --git a/src/Payload/ExceptionInfo.php b/src/Payload/ExceptionInfo.php
@@ -49,6 +49,7 @@ public function setDescription(?string $description): self
         return $this;
     }
 
+    #[\Override]
     public function serialize()
     {
         $result = array(
diff --git a/src/Payload/Frame.php b/src/Payload/Frame.php
@@ -102,6 +102,7 @@ public function setArgs(array $args): self
         return $this;
     }
 
+    #[\Override]
     public function serialize()
     {
         $result = array(
diff --git a/src/Payload/Level.php b/src/Payload/Level.php
@@ -57,6 +57,7 @@ public function toInt(): int
      *
      * @return string
      */
+    #[\Override]
     public function serialize()
     {
         return $this->level;
diff --git a/src/Payload/Message.php b/src/Payload/Message.php
@@ -14,6 +14,7 @@ public function __construct(
     ) {
     }
 
+    #[\Override]
     public function getKey(): string
     {
         return 'message';
@@ -41,6 +42,7 @@ public function setBacktrace(?array $backtrace): self
         return $this;
     }
 
+    #[\Override]
     public function serialize()
     {
         $toSerialize = array(
diff --git a/src/Payload/Notifier.php b/src/Payload/Notifier.php
@@ -43,6 +43,7 @@ public function setVersion(string $version): self
         return $this;
     }
 
+    #[\Override]
     public function serialize()
     {
         $result = array(
diff --git a/src/Payload/Payload.php b/src/Payload/Payload.php
@@ -40,6 +40,7 @@ public function setAccessToken(string $accessToken): self
         return $this;
     }
 
+    #[\Override]
     public function serialize($maxDepth = -1): array
     {
         $objectHashes = array();
diff --git a/src/Payload/Person.php b/src/Payload/Person.php
@@ -75,6 +75,7 @@ public function __set($name, $val)
         $this->extra[$name] = $val;
     }
 
+    #[\Override]
     public function serialize()
     {
         $result = array(
diff --git a/src/Payload/Request.php b/src/Payload/Request.php
@@ -140,6 +140,7 @@ public function setSession(array $session): self
         return $this;
     }
 
+    #[\Override]
     public function serialize()
     {
         $result = array(
diff --git a/src/Payload/Server.php b/src/Payload/Server.php
@@ -80,6 +80,7 @@ public function setArgv(array $argv): self
         return $this;
     }
 
+    #[\Override]
     public function serialize()
     {
         $result = array(
diff --git a/src/Payload/TelemetryBody.php b/src/Payload/TelemetryBody.php
@@ -98,6 +98,7 @@ public static function fromArray(array $data): self
      *
      * @return array
      */
+    #[\Override]
     public function serialize(): array
     {
         // This filters out any null or empty values.
diff --git a/src/Payload/TelemetryEvent.php b/src/Payload/TelemetryEvent.php
@@ -50,6 +50,7 @@ public function __construct(
         $this->body = is_array($body) ? TelemetryBody::fromArray($body): $body;
     }
 
+    #[\Override]
     public function serialize(): array
     {
         $result = array_filter([
diff --git a/src/Payload/Trace.php b/src/Payload/Trace.php
@@ -14,6 +14,7 @@ public function __construct(
     ) {
     }
 
+    #[\Override]
     public function getKey(): string
     {
         return 'trace';
@@ -41,6 +42,7 @@ public function setException(ExceptionInfo $exception): self
         return $this;
     }
 
+    #[\Override]
     public function serialize()
     {
         $result = array(
diff --git a/src/Payload/TraceChain.php b/src/Payload/TraceChain.php
@@ -10,6 +10,7 @@ public function __construct(private array $traces)
     {
     }
 
+    #[\Override]
     public function getKey(): string
     {
         return 'trace_chain';
@@ -26,6 +27,7 @@ public function setTraces(array $traces): self
         return $this;
     }
 
+    #[\Override]
     public function serialize()
     {
         $mapValue = function ($value) {
diff --git a/src/RollbarLogger.php b/src/RollbarLogger.php
@@ -196,6 +196,7 @@ public function getCustom(): mixed
      * @throws InvalidArgumentException If $level is not a valid level.
      * @throws Throwable Rethrown $message if it is {@see Throwable} and {@see Config::raiseOnError} is true.
      */
+    #[\Override]
     public function log($level, $message, array $context = array()): void
     {
         $this->report($level, $message, $context);
diff --git a/src/Scrubber.php b/src/Scrubber.php
@@ -94,6 +94,7 @@ public function getSafelist()
      *
      * @return mixed
      */
+    #[\Override]
     public function scrub(array &$data, string $replacement = '********', string $path = ''): array
     {
         $fields = $this->getScrubFields();
diff --git a/src/Senders/AgentSender.php b/src/Senders/AgentSender.php
@@ -27,6 +27,7 @@ public function __construct($opts)
     /**
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
+    #[\Override]
     public function send(EncodedPayload $payload, string $accessToken): Response
     {
         if (empty($this->agentLog)) {
@@ -42,6 +43,7 @@ public function send(EncodedPayload $payload, string $accessToken): Response
     /**
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
+    #[\Override]
     public function sendBatch(array $batch, string $accessToken): void
     {
         if (empty($this->agentLog)) {
@@ -55,6 +57,7 @@ public function sendBatch(array $batch, string $accessToken): void
     /**
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
+    #[\Override]
     public function wait(string $accessToken, int $max): void
     {
         return;
@@ -69,6 +72,7 @@ public function wait(string $accessToken, int $max): void
      *
      * @return bool
      */
+    #[\Override]
     public function requireAccessToken(): bool
     {
         return true;
diff --git a/src/Senders/CurlSender.php b/src/Senders/CurlSender.php
@@ -66,6 +66,7 @@ public function getEndpoint()
         return $this->endpoint;
     }
 
+    #[\Override]
     public function send(EncodedPayload $payload, string $accessToken): Response
     {
         $handle = curl_init();
@@ -77,15 +78,14 @@ public function send(EncodedPayload $payload, string $accessToken): Response
         $result = $result === false ?
                     curl_error($handle) :
                     json_decode($result, true);
-        
-        curl_close($handle);
 
         $data = $payload->data();
         $uuid = $data['data']['uuid'] ?? null;
         
         return new Response($statusCode, $result, $uuid);
     }
 
+    #[\Override]
     public function sendBatch(array $batch, string $accessToken): void
     {
         if ($this->multiHandle === null) {
@@ -101,6 +101,7 @@ public function sendBatch(array $batch, string $accessToken): void
         $this->checkForCompletedRequests($accessToken);
     }
 
+    #[\Override]
     public function wait(string $accessToken, int $max = 0): void
     {
         if (count($this->inflightRequests) <= $max) {
@@ -122,6 +123,7 @@ public function wait(string $accessToken, int $max = 0): void
      * @return bool
      * @since 4.0.0
      */
+    #[\Override]
     public function requireAccessToken(): bool
     {
         return false;
@@ -200,7 +202,6 @@ private function removeFinishedRequests(string $accessToken)
                 unset($this->inflightRequests[$handleArrayKey]);
                 curl_multi_remove_handle($this->multiHandle, $handle);
             }
-            curl_close($handle);
         }
         $this->maybeSendMoreBatchRequests($accessToken);
     }
diff --git a/src/Senders/FluentSender.php b/src/Senders/FluentSender.php
diff --git a/src/Truncation/AbstractStrategy.php b/src/Truncation/AbstractStrategy.php
diff --git a/src/Truncation/FramesStrategy.php b/src/Truncation/FramesStrategy.php
diff --git a/src/Truncation/MinBodyStrategy.php b/src/Truncation/MinBodyStrategy.php
diff --git a/src/Truncation/RawStrategy.php b/src/Truncation/RawStrategy.php
diff --git a/src/Truncation/StringsStrategy.php b/src/Truncation/StringsStrategy.php
diff --git a/src/Truncation/TelemetryStrategy.php b/src/Truncation/TelemetryStrategy.php
diff --git a/tests/CurlSenderTest.php b/tests/CurlSenderTest.php
diff --git a/tests/RollbarTest.php b/tests/RollbarTest.php

Original file line number	Diff line number	Diff line change
`@@ -303,6 +303,7 @@ protected function setServerExtras($config)`
`303`	`303`	`*`
`304`	`304`	`* @return void`
`305`	`305`	`*/`
	`306`	`+ #[\Override]`
`306`	`307`	`public function setCustom(array $config): void`
`307`	`308`	`{`
`308`	`309`	`$this->custom = $config['custom'] ?? \Rollbar\Defaults::get()->custom();`
`@@ -373,6 +374,7 @@ protected function setHost($config)`
`373`	`374`	`*`
`374`	`375`	`* @return Data`
`375`	`376`	`*/`
	`377`	`+ #[\Override]`
`376`	`378`	`public function makeData(string $level, Throwable\|string\|Stringable $toLog, array $context): Data`
`377`	`379`	`{`
`378`	`380`	`$env = $this->getEnvironment();`
`@@ -1013,6 +1015,7 @@ protected function getServerExtras()`
`1013`	`1015`	`*`
`1014`	`1016`	`* @return array\|null`
`1015`	`1017`	`*/`
	`1018`	`+ #[\Override]`
`1016`	`1019`	`public function getCustom(): ?array`
`1017`	`1020`	`{`
`1018`	`1021`	`return $this->custom;`
`@@ -1103,6 +1106,7 @@ protected function resolveCustomContent(mixed $custom): array`
`1103`	`1106`	`*`
`1104`	`1107`	`* @return void`
`1105`	`1108`	`*/`
	`1109`	`+ #[\Override]`
`1106`	`1110`	`public function addCustom(string $key, mixed $data): void`
`1107`	`1111`	`{`
`1108`	`1112`	`if (!is_array($this->custom)) {`
`@@ -1119,6 +1123,7 @@ public function addCustom(string $key, mixed $data): void`
`1119`	`1123`	`*`
`1120`	`1124`	`* @return void`
`1121`	`1125`	`*/`
	`1126`	`+ #[\Override]`
`1122`	`1127`	`public function removeCustom(string $key): void`
`1123`	`1128`	`{`
`1124`	`1129`	`unset($this->custom[$key]);`
`@@ -1186,6 +1191,7 @@ private function getSourceLines($filename)`
`1186`	`1191`	`*`
`1187`	`1192`	`* @return ErrorWrapper`
`1188`	`1193`	`*/`
	`1194`	`+ #[\Override]`
`1189`	`1195`	`public function generateErrorWrapper(int $errno, string $errstr, ?string $errfile, ?int $errline): ErrorWrapper`
`1190`	`1196`	`{`
`1191`	`1197`	`return new ErrorWrapper(`
Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,15 @@`
`8`	`8`
`9`	`9`	`class ErrorHandler extends AbstractHandler`
`10`	`10`	`{`
	`11`	`+ #[\Override]`
`11`	`12`	`public function register()`
`12`	`13`	`{`
`13`	`14`	`$this->previousHandler = set_error_handler(array($this, 'handle'));`
`14`	`15`
`15`	`16`	`parent::register();`
`16`	`17`	`}`
`17`	`18`
	`19`	`+ #[\Override]`
`18`	`20`	`public function handle(...$args)`
`19`	`21`	`{`
`20`	`22`	`parent::handle(...$args);`
Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,15 @@`
`8`	`8`
`9`	`9`	`class ExceptionHandler extends AbstractHandler`
`10`	`10`	`{`
	`11`	`+ #[\Override]`
`11`	`12`	`public function register()`
`12`	`13`	`{`
`13`	`14`	`$this->previousHandler = set_exception_handler(array($this, 'handle'));`
`14`	`15`
`15`	`16`	`parent::register();`
`16`	`17`	`}`
`17`		`-`
	`18`	`+`
	`19`	`+ #[\Override]`
`18`	`20`	`public function handle(...$args)`
`19`	`21`	`{`
`20`	`22`	`parent::handle(...$args);`
Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,16 @@ class FatalHandler extends AbstractHandler`
`15`	`15`	`{`
`16`	`16`
`17`	`17`	`private static $fatalErrors = array(E_ERROR, E_PARSE, E_CORE_ERROR, E_COMPILE_ERROR, E_USER_ERROR);`
`18`		`-`
	`18`	`+`
	`19`	`+ #[\Override]`
`19`	`20`	`public function register()`
`20`	`21`	`{`
`21`	`22`	`\register_shutdown_function(array($this, 'handle'));`
`22`	`23`
`23`	`24`	`parent::register();`
`24`	`25`	`}`
`25`		`-`
	`26`	`+`
	`27`	`+ #[\Override]`
`26`	`28`	`public function handle(...$args)`
`27`	`29`	`{`
`28`	`30`	`parent::handle(...$args);`
Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ public function setTelemetry(?array $telemetry): void`
`110`	`110`	`*`
`111`	`111`	`* @since 4.1.0 Includes the 'telemetry' key, if it is not empty.`
`112`	`112`	`*/`
	`113`	`+ #[\Override]`
`113`	`114`	`public function serialize()`
`114`	`115`	`{`
`115`	`116`	`$result = array();`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ public function setPost(array $post): self`
`35`	`35`	`return $this;`
`36`	`36`	`}`
`37`	`37`
	`38`	`+ #[\Override]`
`38`	`39`	`public function serialize()`
`39`	`40`	`{`
`40`	`41`	`$result = array(`
Original file line number	Diff line number	Diff line change
`@@ -217,6 +217,7 @@ public function setNotifier(Notifier $notifier): self`
`217`	`217`	`return $this;`
`218`	`218`	`}`
`219`	`219`
	`220`	`+ #[\Override]`
`220`	`221`	`public function serialize()`
`221`	`222`	`{`
`222`	`223`	`$result = array(`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ public function setDescription(?string $description): self`
`49`	`49`	`return $this;`
`50`	`50`	`}`
`51`	`51`
	`52`	`+ #[\Override]`
`52`	`53`	`public function serialize()`
`53`	`54`	`{`
`54`	`55`	`$result = array(`