Skip to content

Commit 2993e07

Browse files
prepare 3.7.2 release (#136)
1 parent 36ccf3e commit 2993e07

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+538
-132
lines changed

.circleci/config.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,27 @@ workflows:
77
name: PHP 5.5
88
- test-with-preinstalled-php:
99
name: PHP 5.6
10-
docker-image: circleci/php:5.6.34-cli-jessie
10+
docker-image: circleci/php:5.6
1111
use-phpredis: false
1212
- test-with-preinstalled-php:
1313
name: PHP 7.0
14-
docker-image: circleci/php:7.0.28-cli-jessie
14+
docker-image: circleci/php:7.0
1515
- test-with-preinstalled-php:
1616
name: PHP 7.1
17-
docker-image: circleci/php:7.1.15-cli-jessie
17+
docker-image: circleci/php:7.1
1818
- test-with-preinstalled-php:
1919
name: PHP 7.2
20-
docker-image: circleci/php:7.2.3-cli-stretch
20+
docker-image: circleci/php:7.2
2121
include-lowest-compatible-versions-test: false
2222
# lowest "compatible" version of phpunit in 7.2 has a bug - https://github.com/sebastianbergmann/comparator/pull/30
23+
- test-with-preinstalled-php:
24+
name: PHP 7.3
25+
docker-image: circleci/php:7.3
26+
include-lowest-compatible-versions-test: false
27+
- test-with-preinstalled-php:
28+
name: PHP 7.4
29+
docker-image: circleci/php:7.4
30+
include-lowest-compatible-versions-test: false
2331
- integration-test
2432

2533
jobs:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ composer.phar
66
.vagrant
77
integration-tests/vendor
88
composer.lock
9+
docs/build

.ldrelease/build-docs.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
3+
set -e
4+
5+
cd docs
6+
make PHPDOC_ARCHIVE=/home/circleci/ldtools/phpDocumentor.phar # provided in ldcircleci/ld-php-sdk-release image

.ldrelease/config.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,12 @@ publications:
66
- url: https://packagist.org/packages/launchdarkly/server-sdk
77
description: Packagist
88

9+
circleCI:
10+
linux:
11+
image: ldcircleci/ld-php-sdk-release:1 # built in sdks-ci-docker project, contains PHP 7.2 + phpDocumentor
12+
13+
documentation:
14+
githubPages: true
15+
916
sdk:
1017
displayName: "PHP"

.ldrelease/publish-docs.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
3+
set -e
4+
5+
# Releaser will publish the docs to GitHub pages for us if we put a "docs.zip" artifact in ./artifacts
6+
7+
mkdir -p artifacts
8+
pushd docs/build/html
9+
rm -f docs.zip
10+
zip -r docs.zip *
11+
popd
12+
mv docs/build/html/docs.zip artifacts

.ldrelease/update-version.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/bash
22

3+
set -e
4+
35
# Update version in LDClient class
46
LDCLIENT_PHP=src/LaunchDarkly/LDClient.php
57
LDCLIENT_PHP_TEMP=${LDCLIENT_PHP}.tmp

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ All notable changes to the LaunchDarkly PHP SDK will be documented in this file.
99

1010
## [3.7.0] - 2019-12-13
1111
### Added:
12-
- Added integration with the [`phpredis`](https://github.com/phpredis/phpredis) extension, which supports persistent Redis connections unlike the existing `predis` integration. See `LaunchDarkly::Integrations::PHPRedis`. (Thanks, [nicofff](https://github.com/launchdarkly/php-server-sdk/pull/128)!)
12+
- Added integration with the [`phpredis`](https://github.com/phpredis/phpredis) extension, which has similar functionality to the already-supported `predis` but may have better performance (since `predis` is written in pure PHP, whereas `phpredis` uses a C extension). See `LaunchDarkly::Integrations::PHPRedis`. (Thanks, [nicofff](https://github.com/launchdarkly/php-server-sdk/pull/128)!)
1313

1414
## [3.6.0] - 2019-10-01
1515
### Added:

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@
2020
},
2121
"require-dev": {
2222
"aws/aws-sdk-php": "^3.86",
23-
"friendsofphp/php-cs-fixer": "~2.2.19",
23+
"friendsofphp/php-cs-fixer": ">=2.2.19 <3.0",
2424
"guzzlehttp/guzzle": "^6.2.1",
2525
"kevinrob/guzzle-cache-middleware": "^1.4.1",
26-
"phpdocumentor/phpdocumentor": "^2.0",
2726
"phpunit/phpunit": ">=4.8.26 <5.4",
2827
"predis/predis": "^1.0",
2928
"sensiolabs/consul-php-sdk": ">=2.1 <3.0",

docs/Makefile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
2+
# PHPDOC_ARCHIVE is overridden in the CircleCI release
3+
PHPDOC_ARCHIVE := $(shell pwd)/build/phpDocumentor.phar
4+
OUTPUT_DIR := $(shell pwd)/build
5+
PHPDOC_URL=https://www.phpdoc.org/phpDocumentor.phar
6+
7+
.PHONY: install html
8+
9+
html: install
10+
rm -rf build/temp build/html
11+
cd .. && php $(PHPDOC_ARCHIVE) --visibility public --title "LaunchDarkly PHP SDK ${LD_RELEASE_VERSION}"
12+
13+
install: $(PHPDOC_ARCHIVE)
14+
15+
$(PHPDOC_ARCHIVE):
16+
mkdir -p build
17+
cd build && unzip ../lib/phpDocumentor.phar.zip

phpdoc.dist.xml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<phpdoc>
3+
<parser>
4+
<target>docs/build/temp</target>
5+
</parser>
6+
<transformer>
7+
<target>docs/build/html</target>
8+
</transformer>
9+
<files>
10+
<directory>src</directory>
11+
<ignore>src/LaunchDarkly/Impl/*</ignore>
12+
<ignore>src/LaunchDarkly/Impl/Integrations/*</ignore>
13+
<!-- the @ignore and @internal tags currently not working correctly in phpDocumentor, so we will manually ignore these internal files: -->
14+
<ignore>src/LaunchDarkly/Clause.php</ignore>
15+
<ignore>src/LaunchDarkly/EvalResult.php</ignore>
16+
<ignore>src/LaunchDarkly/EvaluationException.php</ignore>
17+
<ignore>src/LaunchDarkly/EventProcessor.php</ignore>
18+
<ignore>src/LaunchDarkly/EventSerializer.php</ignore>
19+
<ignore>src/LaunchDarkly/FeatureFlag.php</ignore>
20+
<ignore>src/LaunchDarkly/Operators.php</ignore>
21+
<ignore>src/LaunchDarkly/PreloadedFeatureRequester.php</ignore>
22+
<ignore>src/LaunchDarkly/Prerequisite.php</ignore>
23+
<ignore>src/LaunchDarkly/Rollout.php</ignore>
24+
<ignore>src/LaunchDarkly/Rule.php</ignore>
25+
<ignore>src/LaunchDarkly/Segment.php</ignore>
26+
<ignore>src/LaunchDarkly/SegmentRule.php</ignore>
27+
<ignore>src/LaunchDarkly/SemanticVersion.php</ignore>
28+
<ignore>src/LaunchDarkly/Target.php</ignore>
29+
<ignore>src/LaunchDarkly/UnrecoverableHTTPStatusException.php</ignore>
30+
<ignore>src/LaunchDarkly/Util.php</ignore>
31+
<ignore>src/LaunchDarkly/VariationOrRollout.php</ignore>
32+
<ignore>src/LaunchDarkly/WeightedVariation.php</ignore>
33+
</files>
34+
<transformations>
35+
<template name="clean"/>
36+
</transformations>
37+
<title>
38+
LaunchDarkly PHP SDK
39+
</title>
40+
</phpdoc>

0 commit comments

Comments
 (0)