Skip to content

Commit 2009ea8

Browse files
authored
Merge pull request #144 from llaville/composer_patches
2 parents 8399d6a + 8153748 commit 2009ea8

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM composer:2.1
44
FROM php:${VERSION}-cli-alpine as build
55

66
COPY --from=composer /usr/bin/composer /usr/bin/composer
7-
RUN composer global require overtrue/phplint:^3.1.0
7+
RUN composer global require overtrue/phplint
88
COPY entrypoint.sh /entrypoint.sh
99
RUN chmod +x /entrypoint.sh
1010
RUN cp /usr/local/etc/php/php.ini-development /usr/local/etc/php/php.ini

composer.json

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=5.5.9",
19+
"php": "^5.5.9 || ^7.0",
2020
"ext-json": "*",
21-
"symfony/console": "^3.2|^4.0|^5.0",
22-
"symfony/finder": "^3.0|^4.0|^5.0",
23-
"symfony/process": "^3.3|^4.0|^5.0",
24-
"symfony/yaml": "^3.0|^4.0|^5.0",
21+
"symfony/console": "^3.2 || ^4.0 || ^5.0",
22+
"symfony/finder": "^3.0 || ^4.0 || ^5.0",
23+
"symfony/process": "^3.3 || ^4.0 || ^5.0",
24+
"symfony/yaml": "^3.0 || ^4.0 || ^5.0",
2525
"n98/junit-xml": "1.1.0"
2626
},
2727
"require-dev": {
@@ -64,5 +64,10 @@
6464
},
6565
"bin": [
6666
"bin/phplint"
67-
]
67+
],
68+
"config": {
69+
"allow-plugins": {
70+
"bamarni/composer-bin-plugin": true
71+
}
72+
}
6873
}

0 commit comments

Comments
 (0)