Skip to content

Commit

Permalink
feat(Composer) fix conflicts and then commit the result.
Browse files Browse the repository at this point in the history
  • Loading branch information
Yozhef committed Feb 16, 2021
2 parents c8d88cf + 7f1a8b5 commit dc0932f
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 7 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ jobs:
max-parallel: 4
matrix:
include:
- php: '5.6'
phpseclib: '^2.0'
- php: '7.0'
phpseclib: '^2.0'
- php: '7.1'
Expand Down
2 changes: 0 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ image: Visual Studio 2017
## Build matrix for lowest and highest possible targets
environment:
matrix:
- dependencies: lowest
PHP_VERSION: 5.6
- dependencies: lowest
PHP_VERSION: 7.0
- dependencies: current
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
}
],
"require": {
"php": ">=5.6.3,<8.0",
"php": ">=7.0",
"ext-sockets": "*",
"ext-mbstring": "*",
"phpseclib/phpseclib": "^2.0|^3.0"
},
"require-dev": {
"ext-curl": "*",
"phpunit/phpunit": "^5.7|^6.5|^7.0",
"phpunit/phpunit": "^6.5|^7.5",
"squizlabs/php_codesniffer": "^3.5",
"nategood/httpful": "^0.2.20"
},
Expand Down
2 changes: 1 addition & 1 deletion docker/php/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:5.6-cli
FROM php:7.0-cli

RUN apt update && \
apt -qy install git unzip zlib1g-dev && \
Expand Down

0 comments on commit dc0932f

Please sign in to comment.