Add support for Guzzle 6.3 (#93)

Author: keelerm84

.circleci/config.yml

@@ -6,15 +6,11 @@ orbs:
 workflows:
   workflow:
     jobs:
-      - test-with-preinstalled-php:
-          name: PHP 7.3
-          docker-image: cimg/php:7.3
-      - test-with-preinstalled-php:
-          name: PHP 7.4
-          docker-image: cimg/php:7.4
-      - test-with-preinstalled-php:
-         name: PHP 8.0
-         docker-image: cimg/php:8.0
+      - test-on-linux:
+          matrix:
+              parameters:
+                  php-version: ["7.3", "7.4", "8.0"]
+                  composer-dependencies: ["lowest", "highest"]
       - test-on-windows
 
 jobs:
@@ -48,38 +44,50 @@ jobs:
           name: run tests
           command: .\vendor\bin\phpunit
 
-  test-with-preinstalled-php:
+  test-on-linux:
     parameters:
-      docker-image:
+      php-version:
+        type: string
+      composer-dependencies:
         type: string
 
     environment:
       LD_INCLUDE_INTEGRATION_TESTS: 1
 
     docker:
-      - image: <<parameters.docker-image>>
+      - image: cimg/php:<<parameters.php-version>>
       - image: wiremock/wiremock
 
     steps:
       - setup_remote_docker
       - checkout
+
       - run:
           name: validate composer.json
           command: composer validate
       - run:
           name: install dependencies
           command: composer install --no-progress
+      - when:
+          condition:
+            equal: [ <<parameters.composer-dependencies>>, "lowest" ]
+          steps:
+            - run:
+                name: downgrade to lowest versions
+                command: composer update --prefer-lowest --prefer-stable
+
       - run:
           name: psalm linting
           command: ./vendor/bin/psalm --no-cache
       - run:
           name: php-cs-fixer check
           command: composer cs-check
       - run:
-          name: run tests with highest compatible dependency versions
+          name: run tests
           command: php -d xdebug.mode=coverage vendor/bin/phpunit
           enviroment:
             XDEBUG_MODE: coverage
+
       - store_test_results:
           path: build/phpunit
       - store_artifacts:

composer.json

@@ -19,15 +19,15 @@
         "psr/log": "^1.0|^2.0|^3.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": ">=2.2.19 <3.0",
-        "guzzlehttp/guzzle": "^7",
+        "friendsofphp/php-cs-fixer": ">=2.18.0 <3.0",
+        "guzzlehttp/guzzle": "^6.3 | ^7",
         "kevinrob/guzzle-cache-middleware": "^3",
         "phpunit/php-code-coverage": "^9",
         "phpunit/phpunit": "^9",
-        "vimeo/psalm": "^4.0"
+        "vimeo/psalm": "^4.4"
     },
     "suggest": {
-        "guzzlehttp/guzzle": "(^7) Required when using GuzzleEventPublisher or the default FeatureRequester",
+        "guzzlehttp/guzzle": "(^6.3 | ^7) Required when using GuzzleEventPublisher or the default FeatureRequester",
         "kevinrob/guzzle-cache-middleware": "(^3) Recommended for performance when using the default FeatureRequester"
     },
     "autoload": {
@@ -44,7 +44,7 @@
         "sort-packages": true
     },
     "scripts": {
-        "cs-check": "vendor/bin/php-cs-fixer fix --diff --dry-run --verbose",
-        "cs-fix": "vendor/bin/php-cs-fixer fix --diff --verbose"
+        "cs-check": "vendor/bin/php-cs-fixer fix --diff --dry-run --verbose --config=.php-cs-fixer.php",
+        "cs-fix": "vendor/bin/php-cs-fixer fix --diff --verbose --config=.php-cs-fixer.php"
     }
 }

src/LaunchDarkly/Impl/Integrations/GuzzleFeatureRequester.php

@@ -75,6 +75,7 @@ public function getFeature(string $key): ?FeatureFlag
             $body = $response->getBody();
             return FeatureFlag::decode(json_decode($body->getContents(), true));
         } catch (BadResponseException $e) {
+            /** @psalm-suppress PossiblyNullReference (resolved in guzzle 7) */
             $code = $e->getResponse()->getStatusCode();
             if ($code == 404) {
                 $this->_logger->warning("GuzzleFeatureRequester::get returned 404. Feature flag does not exist for key: " . $key);
@@ -98,6 +99,7 @@ public function getSegment(string $key): ?Segment
             $body = $response->getBody();
             return Segment::decode(json_decode($body->getContents(), true));
         } catch (BadResponseException $e) {
+            /** @psalm-suppress PossiblyNullReference (resolved in guzzle 7) */
             $code = $e->getResponse()->getStatusCode();
             if ($code == 404) {
                 $this->_logger->warning("GuzzleFeatureRequester::get returned 404. Segment does not exist for key: " . $key);
@@ -120,6 +122,7 @@ public function getAllFeatures(): ?array
             $body = $response->getBody();
             return array_map(FeatureFlag::getDecoder(), json_decode($body->getContents(), true));
         } catch (BadResponseException $e) {
+            /** @psalm-suppress PossiblyNullReference (resolved in guzzle 7) */
             $this->handleUnexpectedStatus($e->getResponse()->getStatusCode(), "GuzzleFeatureRequester::getAll");
             return null;
         }