Skip to content

Commit 8866839

Browse files
authored
Merge pull request #19 from 0x46616c6b/composer-upgrade
upgrade dependencies
2 parents 6ec6bb5 + 44db2d3 commit 8866839

File tree

4 files changed

+474
-317
lines changed

4 files changed

+474
-317
lines changed

.circleci/config.yml

-25
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,5 @@
11
version: 2
22
jobs:
3-
test_php71:
4-
docker:
5-
- image: circleci/php:7.1
6-
- image: systemli/etherpad-lite:1.7.5
7-
steps:
8-
- checkout
9-
- run: sudo composer self-update
10-
- restore_cache:
11-
keys:
12-
- composer-php71-{{ checksum "composer.lock" }}
13-
- run: composer install
14-
- save_cache:
15-
key: composer-php71-{{ checksum "composer.lock" }}
16-
paths:
17-
- vendor
18-
- run:
19-
name: Running PHPUnit
20-
command: vendor/bin/phpunit
21-
- run:
22-
name: Wait for Etherpad
23-
command: dockerize -wait http://localhost:9001 -timeout 1m
24-
- run:
25-
name: Running Behat
26-
command: vendor/bin/behat -f progress
273
test_php72:
284
docker:
295
- image: circleci/php:7.2
@@ -76,6 +52,5 @@ workflows:
7652
version: 2
7753
build_and_test:
7854
jobs:
79-
- test_php71
8055
- test_php72
8156
- test_php73

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"psr-4": { "": "src/" }
1313
},
1414
"require": {
15-
"php": "^7.1|^7.2|^7.3",
16-
"guzzlehttp/guzzle": "~6.3"
15+
"php": "^7.2.5|^7.3",
16+
"guzzlehttp/guzzle": "~6.4"
1717
},
1818
"require-dev": {
1919
"phpunit/phpunit": "~7.5",

0 commit comments

Comments
 (0)