Skip to content

Commit b1fdb05

Browse files
Nyholmnorkunas
authored andcommitted
Update dev dependencies (#245)
* Update dev dependencies * Fixed tests * Removed dead php versions * Make sure packages are sorted * cs fix
1 parent 8a480c0 commit b1fdb05

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@ matrix:
1717
# Minimum supported dependencies with the latest and oldest PHP version
1818
- php: 7.2
1919
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
20-
- php: 7.0
20+
- php: 7.1
2121
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
2222

2323
# Test the latest stable release
24-
- php: 7.0
2524
- php: 7.1
2625
- php: 7.2
2726
- php: 7.3

Tests/bootstrap.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
require_once __DIR__.'/../vendor/geoip/geoip/src/geoip.inc';
2121
require_once __DIR__.'/../vendor/geoip/geoip/src/geoipcity.inc';
2222

23-
Http\Discovery\ClassDiscovery::prependStrategy(\Nyholm\Psr7\Httplug\DiscoveryStrategy::class);
24-
2523
if (!is_bool($loader)) {
2624
$loader->add('Doctrine\Tests', __DIR__.'/../vendor/doctrine/orm/tests');
2725
} else {

composer.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111
}
1212
],
1313
"require": {
14-
"php": "^7.0",
14+
"php": "^7.1",
1515
"geocoder-php/plugin": "^1.0",
16+
"php-http/discovery": "^1.7",
1617
"symfony/console": "^3.4 || ^4.2",
1718
"symfony/framework-bundle": "^3.4 || ^4.2",
1819
"symfony/options-resolver": "^3.4 || ^4.2",
@@ -47,7 +48,7 @@
4748
"geocoder-php/yandex-provider": "^4.0",
4849
"geoip/geoip": "~1.17",
4950
"nyholm/nsa": "^1.1",
50-
"nyholm/psr7": "^0.2.2",
51+
"nyholm/psr7": "^1.0",
5152
"nyholm/symfony-bundle-test": "^1.3",
5253
"php-http/curl-client": "^1.7",
5354
"php-http/message": "^1.5",
@@ -67,6 +68,9 @@
6768
"scripts": {
6869
"test": "vendor/bin/simple-phpunit --testsuite main"
6970
},
71+
"config": {
72+
"sort-packages": true
73+
},
7074
"minimum-stability": "dev",
7175
"prefer-stable": true,
7276
"extra": {

0 commit comments

Comments
 (0)