drop support for EOL php versions and update deps (#60)

Author: apache-hb

.circleci/config.yml

@@ -3,44 +3,24 @@ version: 2.1
 workflows:
   workflow:
     jobs:
-      - test_5_5:
-          name: PHP 5.5
-      - test-with-preinstalled-php:
-          name: PHP 5.6
-          docker-image: circleci/php:5.6
-          use-phpredis: false
-      - test-with-preinstalled-php:
-          name: PHP 7.0
-          docker-image: circleci/php:7.0
-      - test-with-preinstalled-php:
-          name: PHP 7.1
-          docker-image: circleci/php:7.1
-      - test-with-preinstalled-php:
-          name: PHP 7.2
-          docker-image: circleci/php:7.2
-          include-lowest-compatible-versions-test: false 
-          # lowest "compatible" version of phpunit in 7.2 has a bug - https://github.com/sebastianbergmann/comparator/pull/30
       - test-with-preinstalled-php:
           name: PHP 7.3
-          docker-image: circleci/php:7.3
-          include-lowest-compatible-versions-test: false 
+          docker-image: cimg/php:7.3
       - test-with-preinstalled-php:
           name: PHP 7.4
-          docker-image: circleci/php:7.4
-          include-lowest-compatible-versions-test: false 
+          docker-image: cimg/php:7.4
+      # we currently dont support php 8.0.x due to a bug in php 8 with guzzle, 
+      # this bug is reolved in 8.1-alpha and later
+      #- test-with-preinstalled-php:
+      #    name: PHP 8.0
+      #    docker-image: cimg/php:8.1
       - integration-test
 
 jobs:
   test-with-preinstalled-php:
     parameters:
       docker-image:
         type: string
-      use-phpredis:
-        type: boolean
-        default: true
-      include-lowest-compatible-versions-test:
-        type: boolean
-        default: true
 
     docker:
       - image: <<parameters.docker-image>>
@@ -56,91 +36,20 @@ jobs:
       - run:
           name: install dependencies
           command: composer install --no-progress
-      - when:
-          condition: <<parameters.use-phpredis>>
-          steps:
-            - run:
-                name: setup phpredis
-                command: |
-                  pecl config-set php_ini /usr/local/etc/php/php.ini
-                  yes '' | sudo pecl install -f redis || true;
-                  echo "extension=redis.so" | sudo tee -a /usr/local/etc/php/conf.d/redis.ini;
+      - run: mkdir -p ~/phpunit
       - run:
           name: run tests with highest compatible dependency versions
-          command: vendor/bin/phpunit --log-junit ~/phpunit/junit.xml --coverage-text tests
-      - store_test_results:
-          path: ~/phpunit
-      - store_artifacts:
-          path: ~/phpunit
-      - when:
-          condition: <<parameters.include-lowest-compatible-versions-test>>
-          steps:
-            - run:
-                name: run tests with lowest compatible dependency versions
-                command: composer update --prefer-lowest --no-progress && vendor/bin/phpunit tests
-
-  test_5_5: # CircleCI doesn't provide a Docker image for 5.5
-    machine:
-      image: circleci/classic:latest # Ubuntu 14.04
-    steps:
-      - run:
-          name: install PHP and Composer
-          command: |
-            sudo apt-get update &&
-            sudo apt-get install circleci-php-5.5.36 &&
-            php -r "copy('https://getcomposer.org/installer', '/tmp/composer-setup.php');" &&
-            sudo php /tmp/composer-setup.php --install-dir=/usr/local/bin --version 1.10.16 --filename=composer
-            # Composer 2.0 doesn't work with the older versions of php-cs-fixer that support PHP 5.5
-      - run:
-          name: install Docker
-          command: |
-            sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" &&
-            sudo apt-get -q update &&
-            sudo apt-cache policy docker-ce &&
-            sudo apt-get -qy install docker-ce
-      - run: sudo apt-get -qy install redis-server curl
-      - checkout
-      - run:
-          name: validate composer.json
-          command: composer validate
-      - run:
-          name: install current dependencies
-          command: composer install --no-progress
-      - run:
-          name: run php-cs-fixer
-          command: vendor/bin/php-cs-fixer fix --diff --dry-run --verbose
-      - run:
-          name: start DynamoDB
-          command: docker run -p 8000:8000 amazon/dynamodb-local
-          background: true
-      - run:
-          name: download Consul
-          command: wget https://releases.hashicorp.com/consul/0.8.0/consul_0.8.0_linux_amd64.zip
-      - run:
-          name: extract Consul
-          command: unzip consul_0.8.0_linux_amd64.zip
-      - run:
-          name: start Consul
-          command: ./consul agent -dev
-          background: true
-      - run:
-          name: wait on Consul
-          command: |
-            until $(curl --output /dev/null --silent --fail --request PUT --data 'test' http://localhost:8500/v1/kv/initchecker); do
-                echo 'still waiting on Consul...'; sleep 2;
-            done
-          timeout: 50
-      - run:
-          name: run tests
-          command: vendor/bin/phpunit --log-junit ~/phpunit/junit.xml --coverage-text tests
+          command: php -d xdebug.mode=coverage vendor/bin/phpunit
+          enviroment:
+            XDEBUG_MODE: coverage
       - store_test_results:
           path: ~/phpunit
       - store_artifacts:
           path: ~/phpunit
 
   integration-test:
     docker:
-      - image: circleci/php:5.6.34-cli-jessie
+      - image: circleci/php:7.3-cli-stretch
       - image: redis
     steps:
       - checkout
@@ -152,7 +61,8 @@ jobs:
             echo "extension=apcu.so" | sudo tee -a /usr/local/etc/php/conf.d/apcu.ini;
             echo "apc.enable_cli = 1" | sudo tee -a /usr/local/etc/php/conf.d/apcu.ini
       - run: composer update --no-progress
-      - run: vendor/bin/phpunit --log-junit ~/phpunit/junit.xml integration-tests/CachedRedisFeatureRequesterTest.php
+      - run: mkdir -p ~/phpunit
+      - run: vendor/bin/phpunit integration-tests/CachedRedisFeatureRequesterTest.php
       - store_test_results:
           path: ~/phpunit
       - store_artifacts:

composer.json

@@ -14,23 +14,23 @@
         }
     ],
     "require": {
-        "php": ">=5.5",
+        "php": ">=7.3",
         "monolog/monolog": "^1.6|^2.0",
         "psr/log": "^1.0"
     },
     "require-dev": {
         "aws/aws-sdk-php": "^3.86",
         "friendsofphp/php-cs-fixer": ">=2.2.19 <3.0",
-        "guzzlehttp/guzzle": "^6.2.1",
-        "kevinrob/guzzle-cache-middleware": "^1.4.1",
-        "phpunit/phpunit": ">=4.8.26 <5.4",
+        "guzzlehttp/guzzle": "^7",
+        "kevinrob/guzzle-cache-middleware": "^3",
+        "phpunit/phpunit": "^9",
         "predis/predis": "^1.0",
-        "sensiolabs/consul-php-sdk": ">=2.1 <3.0",
-        "zendframework/zend-serializer": "^2.7"
+        "sensiolabs/consul-php-sdk": "^4",
+        "phpunit/php-code-coverage": "^9"
     },
     "suggest": {
-        "guzzlehttp/guzzle": "(^6.2.1) Required when using GuzzleEventPublisher or the default FeatureRequester",
-        "kevinrob/guzzle-cache-middleware": "(^1.4.1) Recommended for performance when using the default FeatureRequester",
+        "guzzlehttp/guzzle": "(^7) Required when using GuzzleEventPublisher or the default FeatureRequester",
+        "kevinrob/guzzle-cache-middleware": "(^3) Recommended for performance when using the default FeatureRequester",
         "predis/predis": "(^1.0) Required when using LDDFeatureRequester",
         "aws/aws-sdk-php": "(^3.86) Required when using DynamoDbFeatureRequester",
         "sensiolabs/consul-php-sdk": "(>=2.1 <3.0) Required when using ConsulFeatureRequester"

integration-tests/CachedRedisFeatureRequesterTest.php

@@ -9,13 +9,14 @@
 use LaunchDarkly\ApcLDDFeatureRequester;
 use Predis\Client;
 use LaunchDarkly\ApcuLDDFeatureRequester;
+use PHPUnit\Framework\TestCase;
 
 /**
  * These tests use the LaunchDarkly Redis integration along with the optional caching behavior.
  * They are meant to be run in a PHP environment that has APCu installed. They will also test the
  * deprecated APC caching mode.
  */
-class CachedRedisFeatureRequesterTest extends \PHPUnit_Framework_TestCase
+class CachedRedisFeatureRequesterTest extends \PHPUnit\Framework\TestCase
 {
     const CACHE_SECONDS = 60;
 
@@ -122,7 +123,7 @@ public function testGetAllUncached()
 
         $allFlags = $client->allFlags($user);
 
-        $this->assertInternalType('array', $allFlags);
+        $this->assertIsArray($allFlags);
         $this->assertArrayHasKey($featureKey, $allFlags);
         $this->assertEquals($featureValue, $allFlags[$featureKey]);
     }
@@ -173,7 +174,7 @@ private function doCachedGetAllTest($options, $clearFn)
         $clearFn('launchdarkly:features:$all');
 
         $allFlags = $client->allFlags($user);
-        $this->assertInternalType('array', $allFlags);
+        $this->assertIsArray($allFlags);
         $this->assertArrayHasKey($featureKey, $allFlags);
         $this->assertEquals($firstValue, $allFlags[$featureKey]);
 

phpunit.xml

@@ -1,23 +1,23 @@
-<phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-    bootstrap="vendor/autoload.php"
-    colors="true"
-    beStrictAboutChangesToGlobalState="true"
-    beStrictAboutOutputDuringTests="true"
-    beStrictAboutResourceUsageDuringSmallTests="true"
-    beStrictAboutTestsThatDoNotTestAnything="true"
-    beStrictAboutTodoAnnotatedTests="true"
-    verbose="true"
->
-    <testsuites>
-        <testsuite name="Unit Tests">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true" beStrictAboutChangesToGlobalState="true" beStrictAboutOutputDuringTests="true" beStrictAboutResourceUsageDuringSmallTests="true" beStrictAboutTestsThatDoNotTestAnything="true" beStrictAboutTodoAnnotatedTests="true" verbose="true">
+  
+  <logging>
+    <junit outputFile="~/phpunit/junit.xml"/>
+  </logging>
+
+  <coverage>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+    <report>
+      <html outputDirectory="~/phpunit/html-coverage"/>
+      <xml outputDirectory="~/phpunit/xml-coverage"/>
+    </report>
+  </coverage>
+
+  <testsuites>
+    <testsuite name="Unit Tests">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

src/LaunchDarkly/Impl/Integrations/GuzzleFeatureRequester.php

@@ -20,37 +20,41 @@ class GuzzleFeatureRequester implements FeatureRequester
     const SDK_SEGMENTS = "/sdk/segments";
     /** @var Client  */
     private $_client;
-    /** @var string */
-    private $_baseUri;
-    /** @var array  */
-    private $_defaults;
     /** @var LoggerInterface */
     private $_logger;
     /** @var boolean */
     private $_loggedCacheNotice = false;
 
     public function __construct($baseUri, $sdkKey, $options)
     {
-        $this->_baseUri = $baseUri;
         $this->_logger = $options['logger'];
         $stack = HandlerStack::create();
-        if (class_exists('Kevinrob\GuzzleCache\CacheMiddleware')) {
-            $stack->push(new CacheMiddleware(new PublicCacheStrategy(isset($options['cache']) ? $options['cache'] : null)), 'cache');
+        if (class_exists('\Kevinrob\GuzzleCache\CacheMiddleware')) {
+            $stack->push(
+                new CacheMiddleware(
+                    new PublicCacheStrategy($options['cache'] ?? null)
+                ), 
+                'cache'
+            );
         } elseif (!$this->_loggedCacheNotice) {
             $this->_logger->info("GuzzleFeatureRequester is not using an HTTP cache because Kevinrob\GuzzleCache\CacheMiddleware was not installed");
             $this->_loggedCacheNotice = true;
         }
 
-        $this->_defaults = array(
-            'headers' => array(
+        $defaults = [
+            'headers' => [
                 'Authorization' => $sdkKey,
                 'Content-Type' => 'application/json',
                 'User-Agent' => 'PHPClient/' . LDClient::VERSION
-            ),
+            ],
             'timeout' => $options['timeout'],
-            'connect_timeout' => $options['connect_timeout']
-        );
-        $this->_client = new Client(['handler' => $stack, 'debug' => false]);
+            'connect_timeout' => $options['connect_timeout'],
+            'handler' => $stack,
+            'debug' => $options['debug'] ?? false,
+            'base_uri' => $baseUri
+        ];
+
+        $this->_client = new Client($defaults);
     }
 
     /**
@@ -62,8 +66,7 @@ public function __construct($baseUri, $sdkKey, $options)
     public function getFeature($key)
     {
         try {
-            $uri = $this->_baseUri . self::SDK_FLAGS . "/" . $key;
-            $response = $this->_client->get($uri, $this->_defaults);
+            $response = $this->_client->get(self::SDK_FLAGS . "/" . $key);
             $body = $response->getBody();
             return FeatureFlag::decode(json_decode($body, true));
         } catch (BadResponseException $e) {
@@ -86,8 +89,7 @@ public function getFeature($key)
     public function getSegment($key)
     {
         try {
-            $uri = $this->_baseUri . self::SDK_SEGMENTS . "/" . $key;
-            $response = $this->_client->get($uri, $this->_defaults);
+            $response = $this->_client->get(self::SDK_SEGMENTS . "/" . $key);
             $body = $response->getBody();
             return Segment::decode(json_decode($body, true));
         } catch (BadResponseException $e) {
@@ -109,8 +111,7 @@ public function getSegment($key)
     public function getAllFeatures()
     {
         try {
-            $uri = $this->_baseUri . self::SDK_FLAGS;
-            $response = $this->_client->get($uri, $this->_defaults);
+            $response = $this->_client->get(self::SDK_FLAGS);
             $body = $response->getBody();
             return array_map(FeatureFlag::getDecoder(), json_decode($body, true));
         } catch (BadResponseException $e) {

tests/ConsulFeatureRequesterTest.php

@@ -13,7 +13,7 @@ class ConsulFeatureRequesterTest extends FeatureRequesterTestBase
 
     private static $kvClient;
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         if (!static::isSkipDatabaseTests()) {
             $sf = new ServiceFactory();

tests/DynamoDbFeatureRequesterTest.php

@@ -13,7 +13,7 @@ class DynamoDbFeatureRequesterTest extends FeatureRequesterTestBase
 
     private static $dynamoDbClient;
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         if (!static::isSkipDatabaseTests()) {
             self::$dynamoDbClient = new DynamoDbClient(self::makeDynamoDbOptions());

tests/EvaluationReasonTest.php

@@ -2,8 +2,9 @@
 namespace LaunchDarkly\Tests;
 
 use LaunchDarkly\EvaluationReason;
+use PHPUnit\Framework\TestCase;
 
-class EvaluationReasonTest extends \PHPUnit_Framework_TestCase
+class EvaluationReasonTest extends \PHPUnit\Framework\TestCase
 {
     public function testOffReasonSerialization()
     {

tests/EventSerializerTest.php

@@ -3,8 +3,9 @@
 
 use LaunchDarkly\EventSerializer;
 use LaunchDarkly\LDUserBuilder;
+use PHPUnit\Framework\TestCase;
 
-class EventSerializerTest extends \PHPUnit_Framework_TestCase
+class EventSerializerTest extends \PHPUnit\Framework\TestCase
 {
     private function getUser()
     {