Skip to content

Commit ca0a682

Browse files
bump to php 7.3 and run composer update
1 parent 180dd3c commit ca0a682

File tree

7 files changed

+1864
-1235
lines changed

7 files changed

+1864
-1235
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
operating-system: [ 'ubuntu-latest' ]
13-
php-versions: [ '7.1', '7.2', '7.3', '7.4' ]
13+
php-versions: [ '7.3', '7.4', '8.0', '8.1' ]
1414

1515
steps:
1616
- name: Checkout
@@ -29,7 +29,7 @@ jobs:
2929
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
3030

3131
- name: Cache composer dependencies
32-
uses: actions/cache@v2
32+
uses: actions/cache@v4
3333
with:
3434
path: ${{ steps.composer-cache.outputs.dir }}
3535
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
FROM php:7.1-cli
1+
FROM php:7.3-cli
22

33
RUN apt-get update
44
RUN apt-get install -y zip unzip curl git
55
RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
66
RUN php composer-setup.php --install-dir=/usr/bin --filename=composer
77
RUN php -r "unlink('composer-setup.php');"
88

9+
WORKDIR /app

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ help:
55
@grep -E '(^[0-9a-zA-Z_-]+:.*?##.*$$)|(^##)' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[32m%-25s\033[0m %s\n", $$1, $$2}' | sed -e 's/\[32m##/[33m/'
66

77
format: ## format the code
8+
vendor/bin/rector process src
89
vendor/bin/php-cs-fixer fix
910

1011
test: ## test the code

composer.json

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,24 @@
2121
}
2222
],
2323
"require": {
24-
"php": ">=7.1.0",
25-
"league/oauth2-client": "^2.3"
24+
"php": ">=7.3.0",
25+
"league/oauth2-client": "^2.3",
26+
"nyholm/psr7": "^1.8",
27+
"php-parallel-lint/php-console-color": "^1.0",
28+
"php-parallel-lint/php-console-highlighter": "^1.0",
29+
"php-parallel-lint/php-parallel-lint": "^1.4"
2630
},
2731
"require-dev": {
2832
"ext-json": "*",
2933
"friendsofphp/php-cs-fixer": "^3.0",
30-
"jakub-onderka/php-console-highlighter": "^0.4.0",
31-
"jakub-onderka/php-parallel-lint": "^1.0",
32-
"phpmd/phpmd": "^2.10",
33-
"phpstan/phpstan": "^1.4",
34-
"phpunit/phpunit": "^7.4",
34+
"phpmd/phpmd": "^2.15",
35+
"phpstan/extension-installer": "^1.4",
36+
"phpstan/phpstan": "^1.12",
37+
"phpstan/phpstan-deprecation-rules": "^1.2",
38+
"phpunit/phpunit": "^9.6",
39+
"rector/rector": "^1.2",
3540
"squizlabs/php_codesniffer": "^3.5",
36-
"symfony/var-dumper": "^4.3"
41+
"symfony/var-dumper": "^5.4"
3742
},
3843
"autoload": {
3944
"psr-4": {
@@ -51,6 +56,9 @@
5156
},
5257
"config": {
5358
"optimize-autoloader": true,
54-
"sort-packages": true
59+
"sort-packages": true,
60+
"allow-plugins": {
61+
"phpstan/extension-installer": true
62+
}
5563
}
5664
}

0 commit comments

Comments
 (0)