From c4df329f8e717cbe28fe8635ea7ff18557f00275 Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Thu, 5 May 2022 09:33:37 -0400 Subject: [PATCH 1/3] master -> main --- composer.json | 2 +- php-server-sdk-shared-tests/README.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index e4b544e..61367fd 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "launchdarkly/server-sdk": "^4" }, "require-dev": { - "launchdarkly/server-sdk-shared-tests": "dev-master", + "launchdarkly/server-sdk-shared-tests": "dev-main", "phpunit/phpunit": "^9" }, "autoload": { diff --git a/php-server-sdk-shared-tests/README.md b/php-server-sdk-shared-tests/README.md index bdc7071..d0c2202 100644 --- a/php-server-sdk-shared-tests/README.md +++ b/php-server-sdk-shared-tests/README.md @@ -7,7 +7,7 @@ This project provides support code for testing LaunchDarkly PHP SDK integrations The code is not published to Packagist, since it isn't of any use in any non-test context. Instead, it's meant to be used as a Git subtree. Add the subtree to your project like this: git remote add php-server-sdk-shared-tests git@github.com:launchdarkly/php-server-sdk-shared-tests.git - git subtree add --squash --prefix=php-server-sdk-shared-tests/ php-server-sdk-shared-tests master + git subtree add --squash --prefix=php-server-sdk-shared-tests/ php-server-sdk-shared-tests main Then, in your project that uses the shared tests, add this to `composer.json`: @@ -23,9 +23,9 @@ Then, in your project that uses the shared tests, add this to `composer.json`: And add this dependency: ```json - "launchdarkly/server-sdk-shared-tests": "dev-master" + "launchdarkly/server-sdk-shared-tests": "dev-main" ``` To update the copy of `php-server-sdk-shared-tests` in your repository to reflect changes in this one: - git subtree pull --squash --prefix=php-server-sdk-shared-tests/ php-server-sdk-shared-tests master + git subtree pull --squash --prefix=php-server-sdk-shared-tests/ php-server-sdk-shared-tests main From 134550ce8932f7ea72d6ff64308512989f706726 Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Thu, 5 May 2022 09:59:01 -0400 Subject: [PATCH 2/3] Squashed 'php-server-sdk-shared-tests/' changes from e76a9ca..382c8d0 382c8d0 master -> main git-subtree-dir: php-server-sdk-shared-tests git-subtree-split: 382c8d01f3e294f2daba28e6b6461c393d35a8f0 --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bdc7071..c888b6a 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ This project provides support code for testing LaunchDarkly PHP SDK integrations The code is not published to Packagist, since it isn't of any use in any non-test context. Instead, it's meant to be used as a Git subtree. Add the subtree to your project like this: git remote add php-server-sdk-shared-tests git@github.com:launchdarkly/php-server-sdk-shared-tests.git - git subtree add --squash --prefix=php-server-sdk-shared-tests/ php-server-sdk-shared-tests master + git subtree add --squash --prefix=php-server-sdk-shared-tests/ php-server-sdk-shared-tests main Then, in your project that uses the shared tests, add this to `composer.json`: @@ -23,9 +23,9 @@ Then, in your project that uses the shared tests, add this to `composer.json`: And add this dependency: ```json - "launchdarkly/server-sdk-shared-tests": "dev-master" + "launchdarkly/server-sdk-shared-tests": "@dev" ``` To update the copy of `php-server-sdk-shared-tests` in your repository to reflect changes in this one: - git subtree pull --squash --prefix=php-server-sdk-shared-tests/ php-server-sdk-shared-tests master + git subtree pull --squash --prefix=php-server-sdk-shared-tests/ php-server-sdk-shared-tests main From 3aca88c9d7bb871e90ff539092f8c581201dc10c Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Thu, 5 May 2022 09:59:32 -0400 Subject: [PATCH 3/3] Update composer --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 61367fd..eaf557c 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "launchdarkly/server-sdk": "^4" }, "require-dev": { - "launchdarkly/server-sdk-shared-tests": "dev-main", + "launchdarkly/server-sdk-shared-tests": "@dev", "phpunit/phpunit": "^9" }, "autoload": {