Merge branch 'main' into jb/test-newer-php-versions

Author: keelerm84

.github/actions/build-docs/action.yml

@@ -17,4 +17,4 @@ runs:
           --ignore-tags psalm-return \
           --visibility public \
           --defaultpackagename "LaunchDarkly" \
-          --title "LaunchDarkly PHP SDK 6.6.0" # x-release-please-version
+          --title "LaunchDarkly PHP SDK 6.6.1" # x-release-please-version

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "6.6.0"
+  ".": "6.6.1"
 }

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to the LaunchDarkly PHP SDK will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
 
+## [6.6.1](https://github.com/launchdarkly/php-server-sdk/compare/6.6.0...6.6.1) (2025-10-20)
+
+
+### Bug Fixes
+
+* Handle all exceptions within Guzzle feature requester ([#226](https://github.com/launchdarkly/php-server-sdk/issues/226)) ([361f1fe](https://github.com/launchdarkly/php-server-sdk/commit/361f1fef47182203e3ead1e19aa13b067cc90955)), closes [#225](https://github.com/launchdarkly/php-server-sdk/issues/225)
+
 ## [6.6.0](https://github.com/launchdarkly/php-server-sdk/compare/6.5.2...6.6.0) (2025-04-08)
 
 

src/LaunchDarkly/Impl/Integrations/GuzzleFeatureRequester.php

@@ -4,6 +4,7 @@
 
 namespace LaunchDarkly\Impl\Integrations;
 
+use Exception;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\BadResponseException;
 use GuzzleHttp\HandlerStack;
@@ -75,6 +76,9 @@ public function getFeature(string $key): ?FeatureFlag
                 $this->handleUnexpectedStatus($code, "GuzzleFeatureRequester::get");
             }
             return null;
+        } catch (Exception $e) {
+            $this->_logger->error("GuzzleFeatureRequester::get encountered an exception retrieving flag key {$key}: " . $e->getMessage());
+            return null;
         }
     }
 
@@ -99,6 +103,9 @@ public function getSegment(string $key): ?Segment
                 $this->handleUnexpectedStatus($code, "GuzzleFeatureRequester::get");
             }
             return null;
+        } catch (Exception $e) {
+            $this->_logger->error("GuzzleFeatureRequester::get encountered an exception retrieving segment key {$key}: " . $e->getMessage());
+            return null;
         }
     }
 
@@ -117,6 +124,9 @@ public function getAllFeatures(): ?array
             /** @psalm-suppress PossiblyNullReference (resolved in guzzle 7) */
             $this->handleUnexpectedStatus($e->getResponse()->getStatusCode(), "GuzzleFeatureRequester::getAll");
             return null;
+        } catch (Exception $e) {
+            $this->_logger->error("GuzzleFeatureRequester::getAll encountered an exception retrieving all flags: " . $e->getMessage());
+            return null;
         }
     }
 

src/LaunchDarkly/LDClient.php

@@ -40,7 +40,7 @@ class LDClient
      * The current SDK version.
      * @var string
      */
-    const VERSION = '6.6.0'; // x-release-please-version
+    const VERSION = '6.6.1'; // x-release-please-version
 
     protected string $_sdkKey;
     protected string $_baseUri;

tests/Impl/Integrations/GuzzleFeatureRequesterTest.php

@@ -144,4 +144,37 @@ public function testSendsCorrectWrapperNameHeaders(?string $wrapper_name, ?strin
             $this->assertNotContains('X-LaunchDarkly-Wrapper', $headers);
         }
     }
+
+    public function testTimeoutReturnsDefaultValue(): void
+    {
+        /** @var LoggerInterface **/
+        $logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
+
+        $config = [
+            'logger' => $logger,
+            'timeout' => 1, // Set a very short timeout
+            'connect_timeout' => 1,
+        ];
+
+        $client = new Client();
+        // Configure the mock server to delay the response by 2 seconds
+        $delayRule = [
+            'request' => [
+                'url' => '/sdk/flags/delayed-flag',
+            ],
+            'response' => [
+                'fixedDelayMilliseconds' => 2000,
+                'status' => 200,
+                'body' => '{"key": "delayed-flag", "version": 1}'
+            ]
+        ];
+
+        $client->request('POST', 'http://localhost:8080/__admin/mappings', ['json' => $delayRule]);
+
+        $requester = new GuzzleFeatureRequester('http://localhost:8080', 'sdk-key', $config);
+        $result = $requester->getFeature("delayed-flag");
+
+        // The request should timeout and return null (default value) instead of throwing an exception
+        $this->assertNull($result);
+    }
 }