Merge branch 'main' into event-publisher-resiliency

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.4.0" # x-release-please-version
+          --title "LaunchDarkly PHP SDK 6.5.1" # x-release-please-version

.github/workflows/ci.yml

@@ -44,7 +44,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: [8.1.26, 8.2.13]
+        php-version: ['8.1', '8.2']
 
     env:
       LD_INCLUDE_INTEGRATION_TESTS: 1
@@ -54,15 +54,14 @@ jobs:
         with:
           fetch-depth: 0 # If you only need the current version keep this.
 
+      - name: Setup PHP
+        uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35
+        with:
+          php-version: ${{ matrix.php-version }}
+
       - name: Install java support
         run: choco install -y javaruntime
 
-      - name: Install php support
-        run: choco install -y php --version=${{ matrix.php-version }} --force
-
-      - name: Install composer
-        run: choco install -y composer
-
       - name: Download wiremock
         run: Invoke-WebRequest -Uri https://repo1.maven.org/maven2/com/github/tomakehurst/wiremock-jre8-standalone/2.31.0/wiremock-jre8-standalone-2.31.0.jar -UseBasicParsing -OutFile wiremock.jar
 

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "6.4.0"
+  ".": "6.5.1"
 }

CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to the LaunchDarkly PHP SDK will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
 
+## [6.5.1](https://github.com/launchdarkly/php-server-sdk/compare/6.5.0...6.5.1) (2025-03-17)
+
+
+### Bug Fixes
+
+* php 8.4 deprecation for implicitly nullable parameters ([#219](https://github.com/launchdarkly/php-server-sdk/issues/219)) ([1143a16](https://github.com/launchdarkly/php-server-sdk/commit/1143a16bbc537c7cc076e8e7022be1cb81b4087c))
+
+## [6.5.0](https://github.com/launchdarkly/php-server-sdk/compare/6.4.0...6.5.0) (2025-03-13)
+
+
+### Features
+
+* Inline context for migration events ([#215](https://github.com/launchdarkly/php-server-sdk/issues/215)) ([99e9593](https://github.com/launchdarkly/php-server-sdk/commit/99e9593f48662ccca56fed046ff7603ef99dacc9))
+
 ## [6.4.0](https://github.com/launchdarkly/php-server-sdk/compare/6.3.0...6.4.0) (2025-01-17)
 
 

src/LaunchDarkly/EvaluationReason.php

@@ -166,7 +166,7 @@ private function __construct(
         ?string $ruleId = null,
         ?string $prerequisiteKey = null,
         bool $inExperiment = false,
-        BigSegmentsEvaluationStatus $bigSegmentsEvaluationStatus = null
+        ?BigSegmentsEvaluationStatus $bigSegmentsEvaluationStatus = null
     ) {
         $this->_kind = $kind;
         $this->_errorKind = $errorKind;

src/LaunchDarkly/Impl/Evaluation/EvalResult.php

@@ -22,7 +22,7 @@ class EvalResult
      * @param EvaluationDetail $detail
      * @param bool $forceReasonTracking
      */
-    public function __construct(EvaluationDetail $detail, bool $forceReasonTracking = false, EvaluatorState $state = null)
+    public function __construct(EvaluationDetail $detail, bool $forceReasonTracking = false, ?EvaluatorState $state = null)
     {
         $this->_detail = $detail;
         $this->_state = $state;

src/LaunchDarkly/LDClient.php

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

src/LaunchDarkly/Migrations/OpTracker.php

@@ -140,7 +140,7 @@ public function build(): array|string
         $event = [
             'kind' => 'migration_op',
             'creationDate' => Util::currentTimeUnixMillis(),
-            'contextKeys' => $this->context->getKeys(),
+            'context' => $this->context,
             'operation' => $this->operation->value,
             'evaluation' => [
                 'key' => $this->key,

test-service/TestService.php

@@ -76,7 +76,7 @@ public function getStatus(): array
                 'secure-mode-hash',
                 'migrations',
                 'event-sampling',
-                'inline-context',
+                'inline-context-all',
                 'anonymous-redaction',
                 'client-prereq-events',
                 'big-segments'

tests/Migrations/OpTrackerTest.php

@@ -47,7 +47,7 @@ public function testCanBuildSuccessfully(): void
         $this->assertIsArray($result, 'tracker failed to build event');
         $this->assertEquals('migration_op', $result['kind']);
         $this->assertEquals('read', $result['operation']);
-        $this->assertSame(['user' => 'user-key'], $result['contextKeys']);
+        $this->assertEquals(LDContext::create('user-key'), $result['context']);
 
         $evaluation = $result['evaluation'];
         $this->assertEquals('flag', $evaluation['key']);