Skip to content
This repository was archived by the owner on Mar 31, 2025. It is now read-only.

Commit ce3a30b

Browse files
committed
Added supporting of PHP 8.3.
1 parent f0d8d66 commit ce3a30b

File tree

7 files changed

+42
-13
lines changed

7 files changed

+42
-13
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ jobs:
1616
- 8.0
1717
- 8.1
1818
- 8.2
19+
- 8.3
20+
1921
steps:
20-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v4
2123

2224
- name: Install PHP
2325
uses: shivammathur/setup-php@v2
@@ -29,10 +31,10 @@ jobs:
2931

3032
- name: Get Composer Cache Directory
3133
id: composer-cache
32-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
34+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
3335

3436
- name: Cache Composer packages
35-
uses: actions/cache@v2
37+
uses: actions/cache@v3
3638
with:
3739
path: ${{ steps.composer-cache.outputs.dir }}
3840
key: php${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
php-input-filter
22
===
33

4+
2.0.2 [2023-12-30]
5+
---
6+
7+
- Added supporting of PHP 8.3.
8+
49
2.0.1 [2023-01-29]
510
---
611

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
A simple and powerful input filter for any PHP application. It's alike a form, but not the same. ;)
1010

11-
Supporting PHP from 7.4 up to 8.2.
11+
Supporting PHP from 7.4 up to 8.x.
1212

1313
## Installation
1414

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"require-dev": {
2929
"phpunit/phpunit": "^9.5.28",
30-
"friendsofphp/php-cs-fixer": "^3.13.2"
30+
"friendsofphp/php-cs-fixer": "^3.45.0"
3131
},
3232
"autoload": {
3333
"psr-4": {

workenv/50_xdebug.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
zend_extension=xdebug
22
xdebug.mode=debug,develop
3+
xdebug.log=/home/php-cli/php-xdebug.log

workenv/Dockerfile

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,28 @@
1-
FROM php:8.2-cli-alpine
1+
FROM php:8.3-cli-alpine
2+
3+
ARG GITHUB_OAUTH_TOKEN=""
4+
ARG USER_UID=""
5+
ARG USER_GID=""
26

37
RUN apk add --no-cache $PHPIZE_DEPS && apk add --update linux-headers
48

59
RUN pecl install xdebug && docker-php-ext-enable xdebug
610
RUN rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
711
COPY 50_xdebug.ini /usr/local/etc/php/conf.d/
812

9-
RUN curl -sS https://getcomposer.org/installer | php -- --2 --install-dir=/usr/bin --filename=composer
10-
ARG GITHUB_OAUTH_TOKEN=false
11-
RUN if [ ${GITHUB_OAUTH_TOKEN} != false ]; then \
12-
composer config -g github-oauth.github.com ${GITHUB_OAUTH_TOKEN} \
13-
;fi
13+
RUN addgroup -g $USER_GID php-cli \
14+
&& adduser -u $USER_UID -G php-cli -s /bin/sh -D php-cli
15+
16+
USER php-cli
1417

15-
RUN export COMPOSER_DISABLE_XDEBUG_WARN=1
18+
ENV PATH="/home/php-cli/.local/bin:/home/php-cli/.composer/vendor/bin:${PATH}"
19+
20+
RUN mkdir -p /home/php-cli/.local/bin && \
21+
curl -sS https://getcomposer.org/installer | \
22+
/usr/local/bin/php -- --2 --install-dir=/home/php-cli/.local/bin --filename=composer
23+
24+
RUN if [ -n "${GITHUB_OAUTH_TOKEN}" ]; then \
25+
composer config -g github-oauth.github.com ${GITHUB_OAUTH_TOKEN} \
26+
;fi
1627

1728
CMD ["php", "-a"]

workenv/docker-compose.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,20 @@ services:
55
build:
66
context: workenv
77
args:
8-
- GITHUB_OAUTH_TOKEN=<YOUR_TOKEN>
8+
- "GITHUB_OAUTH_TOKEN=<YOUR_TOKEN>"
9+
# For Docker Desktop under macOS doesn't matter what IDs will be specified, because Docker works
10+
# through virtualization, and you may comment "USER_UID" and "USER_GID" args.
11+
# id -u
12+
- "USER_UID=1000"
13+
# id -g
14+
- "USER_GID=1000"
915
working_dir: /app
1016
tty: true
1117
volumes:
1218
- type: bind
1319
source: ./
1420
target: /app
21+
extra_hosts:
22+
# host.docker.internal doesn't necessary if you use Docker Desktop under macOS, because its
23+
# specified automatically, and you may comment line below.
24+
- "host.docker.internal:host-gateway"

0 commit comments

Comments
 (0)