Merge pull request #674 from bugsnag/next

PHP 3.29.2 release
bugsnag · Jan 13, 2025 · 437ac55 · 437ac55
2 parents 5b53e4a + 76a0d58
commit 437ac55
Show file tree

Hide file tree

Showing 17 changed files with 346 additions and 172 deletions.
diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml
@@ -12,7 +12,7 @@ jobs:
         guzzle-version: ['^5.3', '^6.0']
         include:
         - php-version: '7.2'
-          guzzle-version: '^7.0'
+          guzzle-version: '<7.3'
         - php-version: '7.3'
           guzzle-version: '^7.0'
         - php-version: '7.4'
@@ -23,6 +23,10 @@ jobs:
           guzzle-version: '^7.0'
         - php-version: '8.2'
           guzzle-version: '^7.0'
+        - php-version: '8.3'
+          guzzle-version: '^7.0'
+        - php-version: '8.4'
+          guzzle-version: '^7.9'
 
     steps:
     - uses: actions/checkout@v2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,19 @@
 Changelog
 =========
 
+## 3.29.2 (2025-01-13)
+
+This release should ensure compatibility with PHP 8.4 by removing the usage of certain
+deprecated features by:
+- Removing `E_STRICT` from the error list in PHP 8.4+
+- Removing type annotations from parameters defaulting to `null`. Comment type annotations will continue to be present and accurate
+
+### Fixes
+
+* Ensure PHP 8.4 compatibility
+  [#672](https://github.com/bugsnag/bugsnag-php/pull/672)
+
+
 ## 3.29.1 (2023-05-10)
 
 ### Fixes

diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "guzzlehttp/guzzle": "^5.0|^6.0|^7.0"
     },
     "require-dev": {
-        "guzzlehttp/psr7": "^1.3",
+        "guzzlehttp/psr7": "^1.3|^2.0",
         "mtdowling/burgomaster": "dev-master#72151eddf5f0cf101502b94bf5031f9c53501a04",
         "phpunit/phpunit": "^4.8.36|^7.5.15|^9.3.10",
         "php-mock/php-mock-phpunit": "^1.1|^2.1",

diff --git a/src/Client.php b/src/Client.php
@@ -123,9 +123,9 @@ public static function make(
      */
     public function __construct(
         Configuration $config,
-        ResolverInterface $resolver = null,
-        GuzzleHttp\ClientInterface $guzzle = null,
-        ShutdownStrategyInterface $shutdownStrategy = null
+        $resolver = null,
+        $guzzle = null,
+        $shutdownStrategy = null
     ) {
         $guzzle = $guzzle ?: self::makeGuzzle();
 
@@ -271,10 +271,10 @@ public function registerCallback(callable $callback)
     public function registerDefaultCallbacks()
     {
         $this->registerCallback(new GlobalMetaData($this->config))
-             ->registerCallback(new RequestMetaData($this->resolver))
-             ->registerCallback(new RequestSession($this->resolver))
-             ->registerCallback(new RequestUser($this->resolver))
-             ->registerCallback(new RequestContext($this->resolver));
+            ->registerCallback(new RequestMetaData($this->resolver))
+            ->registerCallback(new RequestSession($this->resolver))
+            ->registerCallback(new RequestUser($this->resolver))
+            ->registerCallback(new RequestContext($this->resolver));
 
         return $this;
     }
@@ -327,7 +327,7 @@ public function clearBreadcrumbs()
      *
      * @return void
      */
-    public function notifyException($throwable, callable $callback = null)
+    public function notifyException($throwable, $callback = null)
     {
         $report = Report::fromPHPThrowable($this->config, $throwable);
 
@@ -343,7 +343,7 @@ public function notifyException($throwable, callable $callback = null)
      *
      * @return void
      */
-    public function notifyError($name, $message, callable $callback = null)
+    public function notifyError($name, $message, $callback = null)
     {
         $report = Report::fromNamedError($this->config, $name, $message);
 
@@ -360,7 +360,7 @@ public function notifyError($name, $message, callable $callback = null)
      *
      * @return void
      */
-    public function notify(Report $report, callable $callback = null)
+    public function notify(Report $report, $callback = null)
     {
         $this->pipeline->execute($report, function ($report) use ($callback) {
             if ($callback) {
@@ -511,7 +511,7 @@ public function isBatchSending()
      *
      * @return $this
      */
-    public function setNotifyReleaseStages(array $notifyReleaseStages = null)
+    public function setNotifyReleaseStages($notifyReleaseStages = null)
     {
         $this->config->setNotifyReleaseStages($notifyReleaseStages);
 

diff --git a/src/Configuration.php b/src/Configuration.php
@@ -85,7 +85,7 @@ class Configuration implements FeatureDataStore
      */
     protected $notifier = [
         'name' => 'Bugsnag PHP (Official)',
-        'version' => '3.29.1',
+        'version' => '3.29.2',
         'url' => 'https://bugsnag.com',
     ];
 
@@ -253,7 +253,7 @@ public function isBatchSending()
      *
      * @return $this
      */
-    public function setNotifyReleaseStages(array $notifyReleaseStages = null)
+    public function setNotifyReleaseStages($notifyReleaseStages = null)
     {
         $this->notifyReleaseStages = $notifyReleaseStages;
 
@@ -313,7 +313,7 @@ public function getFilters()
      */
     public function setProjectRoot($projectRoot)
     {
-        $projectRootRegex = $projectRoot ? '/^'.preg_quote($projectRoot, '/').'[\\/]?/i' : null;
+        $projectRootRegex = $projectRoot ? '/^' . preg_quote($projectRoot, '/') . '[\\/]?/i' : null;
         $this->setProjectRootRegex($projectRootRegex);
     }
 
@@ -327,7 +327,7 @@ public function setProjectRoot($projectRoot)
     public function setProjectRootRegex($projectRootRegex)
     {
         if ($projectRootRegex && @preg_match($projectRootRegex, '') === false) {
-            throw new InvalidArgumentException('Invalid project root regex: '.$projectRootRegex);
+            throw new InvalidArgumentException('Invalid project root regex: ' . $projectRootRegex);
         }
 
         $this->projectRootRegex = $projectRootRegex;
@@ -355,7 +355,7 @@ public function isInProject($file)
      */
     public function setStripPath($stripPath)
     {
-        $stripPathRegex = $stripPath ? '/^'.preg_quote($stripPath, '/').'[\\/]?/i' : null;
+        $stripPathRegex = $stripPath ? '/^' . preg_quote($stripPath, '/') . '[\\/]?/i' : null;
         $this->setStripPathRegex($stripPathRegex);
     }
 
@@ -369,7 +369,7 @@ public function setStripPath($stripPath)
     public function setStripPathRegex($stripPathRegex)
     {
         if ($stripPathRegex && @preg_match($stripPathRegex, '') === false) {
-            throw new InvalidArgumentException('Invalid strip path regex: '.$stripPathRegex);
+            throw new InvalidArgumentException('Invalid strip path regex: ' . $stripPathRegex);
         }
 
         $this->stripPathRegex = $stripPathRegex;
@@ -670,7 +670,7 @@ public function setErrorReportingLevel($errorReportingLevel)
         if (!$this->isSubsetOfErrorReporting($errorReportingLevel)) {
             $missingLevels = implode(', ', $this->getMissingErrorLevelNames($errorReportingLevel));
             $message =
-                'Bugsnag Warning: errorReportingLevel cannot contain values that are not in error_reporting. '.
+                'Bugsnag Warning: errorReportingLevel cannot contain values that are not in error_reporting. ' .
                 "Any errors of these levels will be ignored: {$missingLevels}.";
 
             error_log($message);

diff --git a/src/DateTime/Date.php b/src/DateTime/Date.php
@@ -7,9 +7,11 @@
 final class Date
 {
     /**
+     * @param ClockInterface|null $clock
+     *
      * @return string
      */
-    public static function now(ClockInterface $clock = null)
+    public static function now($clock = null)
     {
         if ($clock === null) {
             $clock = new Clock();