toddy/friendica-docker-ci
1
0
Fork 0
forked from friendica/friendica-docker-ci
Code Pull requests Activity

Compare commits

merge into: toddy:stable
Branches Tags
toddy:stable
friendica:stable
...
pull from: friendica:stable
Branches Tags
friendica:stable
toddy:stable

6 commits
stable ... stable

Author SHA1 Message Date
heluecht 5b9b6689ab Merge pull request 'Fix PHP-CS' (#17) from nupplaPhil/friendica-docker-ci:fixups into stable 
Reviewed-on: friendica/friendica-docker-ci#17
 2024-03-16 08:41:27 +01:00
Philipp Holzer 5e6d56ea8d
Fix PHP-CS 2024-03-16 00:17:29 +01:00
Philipp Holzer 88a02fa2cf Merge pull request 'Add PHP 8.3' (#15) from toddy/friendica-docker-ci:stable into stable 
Reviewed-on: friendica/friendica-docker-ci#15
 2024-03-15 22:45:02 +01:00
Hypolite Petovan b018eaa33f Merge pull request 'Use updated PHP-CS-Fixer in standard location' (#16) from toddy/friendica-docker-ci:php-cs-fixer into stable 
Reviewed-on: friendica/friendica-docker-ci#16
 2024-01-15 15:38:36 +01:00
Tobias Quathamer aa8725eb58 Update script according to recommendations from 
https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/doc/usage.rst#using-php-cs-fixer-on-ci
 2024-01-15 15:07:49 +01:00
Tobias Quathamer 733743acca Use updated PHP-CS-Fixer in standard location 2024-01-15 14:13:44 +01:00
2 changed files with 3 additions and 3 deletions
Show stats Expand all files Collapse all files

2
php-cs/Dockerfile
View file

@ -1,4 +1,4 @@
FROM php:7.4
FROM php:8.0
RUN apt-get update -q && \
DEBIAN_FRONTEND=noninteractive apt-get install -q -y \

4
php-cs/check-php-cs.sh
View file

@ -2,10 +2,10 @@
#
# Checks the PHP CS syntax
#
if ! echo "${CHANGED_FILES}" | grep -qE "^(\\.php_cs(\\.dist)?|composer\\.lock)$"; then
if ! echo "${CHANGED_FILES}" | grep -qE "^(\\.php-cs-fixer(\\.dist)?\\.php|composer\\.lock)$"; then
EXTRA_ARGS=$(printf -- '--path-mode=intersection\n--\n%s' "${CHANGED_FILES}");
else
EXTRA_ARGS='';
fi
./bin/dev/php-cs-fixer/vendor/bin/php-cs-fixer fix --config=.php_cs.dist -v --diff --diff-format=udiff --dry-run --using-cache=no ${EXTRA_ARGS}
./bin/dev/php-cs-fixer/vendor/bin/php-cs-fixer fix -v --diff --dry-run --stop-on-violation --using-cache=no ${EXTRA_ARGS}