Merge branch 'main' into feat/uc2-migrations

keelerm84 · keelerm84 · commit 7d44c8fb0d6c · 2023-10-23T12:15:41.000-04:00
diff --git a/.ldrelease/config.yml b/.ldrelease/config.yml
@@ -10,7 +10,8 @@ publications:
 
 branches:
   - name: main
-    description: 5.x
+    description: 6.x
+  - name: 5.x
   - name: 4.x
 
 jobs:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to the LaunchDarkly PHP SDK will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
 
+## [5.2.0] - 2023-10-23
+### Deprecated:
+- `LDUser` is now deprecated in favor of `LDContext`.
+
 ## [5.1.1] - 2023-07-12
 ### Changed:
 - Invalid context log message now includes the flag key as part of the Psr\Log context. (Thanks, [mrtus](https://github.com/launchdarkly/php-server-sdk/pull/179)!)
diff --git a/baseline.xml b/baseline.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="4.30.0@d0bc6e25d89f649e4f36a534f330f8bb4643dd69">
+  <file src="src/LaunchDarkly/LDClient.php">
+    <DeprecatedClass occurrences="7">
+      <code>LDContext|LDUser</code>
+      <code>LDContext|LDUser</code>
+      <code>LDContext|LDUser</code>
+      <code>LDContext|LDUser</code>
+      <code>LDContext|LDUser</code>
+      <code>LDContext|LDUser</code>
+      <code>LDContext|LDUser</code>
+    </DeprecatedClass>
+  </file>
+  <file src="src/LaunchDarkly/LDContext.php">
+    <DeprecatedClass occurrences="1">
+      <code>LDUser</code>
+    </DeprecatedClass>
+  </file>
+  <file src="src/LaunchDarkly/LDUserBuilder.php">
+    <DeprecatedClass occurrences="3">
+      <code>LDUser</code>
+      <code>LDUser</code>
+    </DeprecatedClass>
+  </file>
+</files>
diff --git a/psalm.xml b/psalm.xml
@@ -5,6 +5,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    errorBaseline="baseline.xml"
 >
     <projectFiles>
         <directory name="src" />
diff --git a/src/LaunchDarkly/LDClient.php b/src/LaunchDarkly/LDClient.php
@@ -36,7 +36,7 @@ class LDClient
      * The current SDK version.
      * @var string
      */
-    const VERSION = '5.1.1';
+    const VERSION = '5.2.0';
 
     protected string $_sdkKey;
     protected string $_baseUri;
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -0,0 +1,5 @@
+<?php
+
+error_reporting(E_ALL & ~E_USER_DEPRECATED);
+
+require 'vendor/autoload.php';

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
`6`	`6`	`xmlns="https://getpsalm.org/schema/config"`
`7`	`7`	`xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"`
	`8`	`+ errorBaseline="baseline.xml"`
`8`	`9`	`>`
`9`	`10`	`<projectFiles>`
`10`	`11`	`<directory name="src" />`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +<?php
++
 +error_reporting(E_ALL & ~E_USER_DEPRECATED);
++
 +require 'vendor/autoload.php';