Skip to content

Commit 49ad949

Browse files
committed
Merge remote-tracking branch 'php-http/master' into remove-sf5-hack-collector
2 parents c61f954 + 9a739ad commit 49ad949

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ matrix:
2828
# Test the latest stable release
2929
- php: 7.2
3030
- php: 7.3
31-
- php: 7.4
3231
env: COVERAGE=true TEST_COMMAND="composer test-ci" DEPENDENCIES="php-http/vcr-plugin:^1.0@dev"
32+
- php: 7.4
3333

3434
# Test LTS versions
3535
- php: 7.3

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
44

5-
## Unreleased
5+
## 1.17.0 - 2019-12-27
66

77
### Added
88

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@
5555
"php-http/promise": "^1.0",
5656
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
5757
"symfony/browser-kit": "^3.4.34 || ^4.2.12 || ^5.0",
58-
"symfony/cache": "^3.4.34 || ~4.2.12 || ^4.3.8 || ^5.0",
58+
"symfony/cache": "^3.4.35 || ~4.2.12 || ^4.3.8 || ^5.0",
5959
"symfony/dom-crawler": "^3.4.34 || ^4.2.12 || ^5.0",
6060
"symfony/framework-bundle": "^3.4.34 || ^4.2.12 || ^5.0",
61-
"symfony/http-foundation": "^3.4.34 || ~4.2.12 || ^4.3.8 || ^5.0",
61+
"symfony/http-foundation": "^3.4.35 || ~4.2.12 || ^4.3.8 || ^5.0",
6262
"symfony/phpunit-bridge": "^3.4.34 || ^4.2.12 || ^5.0",
6363
"symfony/stopwatch": "^3.4.34 || ^4.2.12 || ^5.0",
6464
"symfony/twig-bundle": "^3.4.34 || ^4.2.12 || ^5.0",

src/Resources/config/data-collector.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
<service id="httplug.collector.twig.http_message" class="Http\HttplugBundle\Collector\Twig\HttpMessageMarkupExtension" public="false">
2626
<tag name="twig.extension" />
27-
<deprecated>The %service_id% service is deprecated since version 1.17 and will be removed in 2.0. Use "@Httplug/http_message.html.twig" template instead.</deprecated>
2827
</service>
2928

3029
<!-- Discovered clients -->

0 commit comments

Comments
 (0)