Skip to content

Update php-5.3 branch #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 201 commits into from
Mar 27, 2018
Merged

Update php-5.3 branch #90

merged 201 commits into from
Mar 27, 2018

Conversation

arun251
Copy link
Contributor

@arun251 arun251 commented Jan 5, 2018

Brings the php-5.3 branch up to date with the 2.4.0 release.

jkodumal and others added 30 commits February 2, 2016 16:10
Send the default value back to LD
Split events_uri into a different configuration parameter
This reverts commit 9182785.
Make Guzzle 5 a suggestion not a requirement
Conflicts:
	composer.lock

Conflicts:
	composer.lock
…erface

Check feature requester passed in options has the required interface
eplusminus and others added 27 commits October 20, 2017 14:47
# Conflicts:
#	CHANGELOG.md
#	CONTRIBUTING.md
#	README.md
#	VERSION
#	circle.yml
#	composer.json
#	composer.lock
#	integration-tests/LDDFeatureRequesterTest.php
#	src/LaunchDarkly/Clause.php
#	src/LaunchDarkly/EventProcessor.php
#	src/LaunchDarkly/FeatureFlag.php
#	src/LaunchDarkly/GuzzleFeatureRequester.php
#	src/LaunchDarkly/LDClient.php
#	src/LaunchDarkly/LDDFeatureRequester.php
#	src/LaunchDarkly/Rule.php
#	src/LaunchDarkly/VariationOrRollout.php
#	tests/FeatureFlagTest.php
#	tests/LDClientTest.php
#	tests/OperatorsTest.php
stop trying to do HTTP after we get a 401
issue 5: implement private user attributes in PHP
update PHP 5.3 branch from master
# Conflicts:
#	circle.yml
#	src/LaunchDarkly/GuzzleEventPublisher.php
#	src/LaunchDarkly/GuzzleFeatureRequester.php
update PHP 5.3 branch again
@arun251 arun251 merged commit dc9adde into php-5.3 Mar 27, 2018
@arun251 arun251 deleted the update-php-5.3 branch March 27, 2018 00:16
LaunchDarklyReleaseBot pushed a commit that referenced this pull request Apr 12, 2022
Merge test data feature into main line
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.