OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2024-12-23 15:40:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1998 from acelaya-forks/feature/default-php-8.3

Browse Source 
Feature/default php 8.3
This commit is contained in:
Alejandro Celaya 2024-02-11 11:56:20 +01:00 committed by GitHub
commit cc4afa7b62
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/ci-setup/action.yml vendored
View File

@ -43,5 +43,5 @@ runs:
ini-values: pcov.directory=module ini-values: pcov.directory=module
- name: Install dependencies - name: Install dependencies
if: ${{ inputs.install-deps == 'yes' }} if: ${{ inputs.install-deps == 'yes' }}
run: composer install --no-interaction --prefer-dist ${{ inputs.php-version == '8.3' && '--ignore-platform-reqs' || '' }} run: composer install --no-interaction --prefer-dist
shell: bash shell: bash

3
.github/workflows/ci-db-tests.yml vendored
View File

@ -14,7 +14,6 @@ jobs:
strategy: strategy:
matrix: matrix:
php-version: ['8.2', '8.3'] php-version: ['8.2', '8.3']
continue-on-error: ${{ matrix.php-version == '8.3' }}
env: env:
LC_ALL: C LC_ALL: C
steps: steps:
@ -28,7 +27,7 @@ jobs:
- uses: './.github/actions/ci-setup' - uses: './.github/actions/ci-setup'
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
php-extensions: openswoole-22.1.0, pdo_sqlsrv-5.11.1 php-extensions: openswoole-22.1.2, pdo_sqlsrv-5.12.0
extensions-cache-key: db-tests-extensions-${{ matrix.php-version }}-${{ inputs.platform }} extensions-cache-key: db-tests-extensions-${{ matrix.php-version }}-${{ inputs.platform }}
- name: Create test database - name: Create test database
if: ${{ inputs.platform == 'ms' }} if: ${{ inputs.platform == 'ms' }}

3
.github/workflows/ci-mutation-tests.yml vendored
View File

@ -14,13 +14,12 @@ jobs:
strategy: strategy:
matrix: matrix:
php-version: ['8.2', '8.3'] php-version: ['8.2', '8.3']
continue-on-error: ${{ matrix.php-version == '8.3' }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: './.github/actions/ci-setup' - uses: './.github/actions/ci-setup'
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
php-extensions: openswoole-22.1.0 php-extensions: openswoole-22.1.2
extensions-cache-key: mutation-tests-extensions-${{ matrix.php-version }}-${{ inputs.test-group }} extensions-cache-key: mutation-tests-extensions-${{ matrix.php-version }}-${{ inputs.test-group }}
- uses: actions/download-artifact@v4 - uses: actions/download-artifact@v4
with: with:

3
.github/workflows/ci-tests.yml vendored
View File

@ -14,7 +14,6 @@ jobs:
strategy: strategy:
matrix: matrix:
php-version: ['8.2', '8.3'] php-version: ['8.2', '8.3']
continue-on-error: ${{ matrix.php-version == '8.3' }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Start postgres database server - name: Start postgres database server
@ -26,7 +25,7 @@ jobs:
- uses: './.github/actions/ci-setup' - uses: './.github/actions/ci-setup'
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
php-extensions: openswoole-22.1.0 php-extensions: openswoole-22.1.2
extensions-cache-key: tests-extensions-${{ matrix.php-version }}-${{ inputs.test-group }} extensions-cache-key: tests-extensions-${{ matrix.php-version }}-${{ inputs.test-group }}
- run: composer test:${{ inputs.test-group }}:ci - run: composer test:${{ inputs.test-group }}:ci
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v4

5
.github/workflows/ci.yml vendored
View File

@ -36,7 +36,7 @@ jobs:
- uses: './.github/actions/ci-setup' - uses: './.github/actions/ci-setup'
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
php-extensions: openswoole-22.1.0 php-extensions: openswoole-22.1.2
extensions-cache-key: tests-extensions-${{ matrix.php-version }}-${{ matrix.command }} extensions-cache-key: tests-extensions-${{ matrix.php-version }}-${{ matrix.command }}
- run: composer ${{ matrix.command }} - run: composer ${{ matrix.command }}
@ -60,7 +60,6 @@ jobs:
strategy: strategy:
matrix: matrix:
php-version: ['8.2', '8.3'] php-version: ['8.2', '8.3']
continue-on-error: ${{ matrix.php-version == '8.3' }}
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # rr get-binary picks this env automatically GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # rr get-binary picks this env automatically
steps: steps:
@ -70,7 +69,7 @@ jobs:
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
tools: composer tools: composer
- run: composer install --no-interaction --prefer-dist --ignore-platform-req=ext-openswoole ${{ matrix.php-version == '8.3' && '--ignore-platform-reqs' || '' }} - run: composer install --no-interaction --prefer-dist --ignore-platform-req=ext-openswoole
- run: ./vendor/bin/rr get --no-interaction --no-config --location bin/ && chmod +x bin/rr - run: ./vendor/bin/rr get --no-interaction --no-config --location bin/ && chmod +x bin/rr
- run: composer test:api:rr - run: composer test:api:rr

2
.github/workflows/publish-release.yml vendored
View File

@ -17,7 +17,7 @@ jobs:
- uses: './.github/actions/ci-setup' - uses: './.github/actions/ci-setup'
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
php-extensions: openswoole-22.1.0 php-extensions: openswoole-22.1.2
extensions-cache-key: publish-swagger-spec-extensions-${{ matrix.php-version }} extensions-cache-key: publish-swagger-spec-extensions-${{ matrix.php-version }}
install-deps: 'no' install-deps: 'no'
- if: ${{ matrix.swoole == 'yes' }} - if: ${{ matrix.swoole == 'yes' }}

2
.github/workflows/publish-swagger-spec.yml vendored
View File

@ -20,7 +20,7 @@ jobs:
- uses: './.github/actions/ci-setup' - uses: './.github/actions/ci-setup'
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
php-extensions: openswoole-22.1.0 php-extensions: openswoole-22.1.2
extensions-cache-key: publish-swagger-spec-extensions-${{ matrix.php-version }} extensions-cache-key: publish-swagger-spec-extensions-${{ matrix.php-version }}
- run: composer swagger:inline - run: composer swagger:inline
- run: mkdir ${{ steps.determine_version.outputs.version }} - run: mkdir ${{ steps.determine_version.outputs.version }}

1
CHANGELOG.md
View File

@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
### Changed ### Changed
* [#1935](https://github.com/shlinkio/shlink/issues/1935) Replace dependency on abandoned `php-middleware/request-id` with userland simple middleware. * [#1935](https://github.com/shlinkio/shlink/issues/1935) Replace dependency on abandoned `php-middleware/request-id` with userland simple middleware.
* [#1988](https://github.com/shlinkio/shlink/issues/1988) Remove dependency on `league\uri` package. * [#1988](https://github.com/shlinkio/shlink/issues/1988) Remove dependency on `league\uri` package.
* [#1909](https://github.com/shlinkio/shlink/issues/1909) Update docker image to PHP 8.3.
### Deprecated ### Deprecated
* *Nothing* * *Nothing*

6
Dockerfile
View File

@ -1,4 +1,4 @@
FROM php:8.2-alpine3.17 as base FROM php:8.3-alpine3.19 as base
ARG SHLINK_VERSION=latest ARG SHLINK_VERSION=latest
ENV SHLINK_VERSION ${SHLINK_VERSION} ENV SHLINK_VERSION ${SHLINK_VERSION}
@ -7,8 +7,8 @@ ENV SHLINK_RUNTIME ${SHLINK_RUNTIME}
ARG SHLINK_USER_ID='root' ARG SHLINK_USER_ID='root'
ENV SHLINK_USER_ID ${SHLINK_USER_ID} ENV SHLINK_USER_ID ${SHLINK_USER_ID}
ENV OPENSWOOLE_VERSION 22.1.0 ENV OPENSWOOLE_VERSION 22.1.2
ENV PDO_SQLSRV_VERSION 5.11.1 ENV PDO_SQLSRV_VERSION 5.12.0
ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486' ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486'
ENV MS_ODBC_SQL_VERSION 18_18.1.1.1 ENV MS_ODBC_SQL_VERSION 18_18.1.1.1
ENV LC_ALL 'C' ENV LC_ALL 'C'

3
build.sh
View File

@ -31,8 +31,7 @@ cd "${builtContent}"
# Install dependencies # Install dependencies
echo "Installing dependencies with $composerBin..." echo "Installing dependencies with $composerBin..."
# Deprecated. Do not ignore PHP platform req for Shlink v4.0.0 composerFlags="--optimize-autoloader --no-progress --no-interaction"
composerFlags="--optimize-autoloader --no-progress --no-interaction --ignore-platform-req=php+"
${composerBin} self-update ${composerBin} self-update
${composerBin} install --no-dev --prefer-dist $composerFlags ${composerBin} install --no-dev --prefer-dist $composerFlags

2
data/infra/examples/nginx-vhost.conf
View File

@ -11,7 +11,7 @@ server {
location ~ \.php$ { location ~ \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:/var/run/php/php8.2-fpm.sock; fastcgi_pass unix:/var/run/php/php8.3-fpm.sock;
fastcgi_index index.php; fastcgi_index index.php;
include fastcgi.conf; include fastcgi.conf;
} }

6
data/infra/php.Dockerfile
View File

@ -1,8 +1,8 @@
FROM php:8.2-fpm-alpine3.17 FROM php:8.3-fpm-alpine3.19
MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com> MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
ENV APCU_VERSION 5.1.21 ENV APCU_VERSION 5.1.23
ENV PDO_SQLSRV_VERSION 5.11.1 ENV PDO_SQLSRV_VERSION 5.12.0
ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486' ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486'
ENV MS_ODBC_SQL_VERSION 18_18.1.1.1 ENV MS_ODBC_SQL_VERSION 18_18.1.1.1

6
data/infra/roadrunner.Dockerfile
View File

@ -1,8 +1,8 @@
FROM php:8.2-alpine3.17 FROM php:8.3-alpine3.19
MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com> MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
ENV APCU_VERSION 5.1.21 ENV APCU_VERSION 5.1.23
ENV PDO_SQLSRV_VERSION 5.11.1 ENV PDO_SQLSRV_VERSION 5.12.0
ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486' ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486'
ENV MS_ODBC_SQL_VERSION 18_18.1.1.1 ENV MS_ODBC_SQL_VERSION 18_18.1.1.1

8
data/infra/swoole.Dockerfile
View File

@ -1,10 +1,10 @@
FROM php:8.2-alpine3.17 FROM php:8.3-alpine3.19
MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com> MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
ENV APCU_VERSION 5.1.21 ENV APCU_VERSION 5.1.23
ENV INOTIFY_VERSION 3.0.0 ENV INOTIFY_VERSION 3.0.0
ENV OPENSWOOLE_VERSION 22.1.0 ENV OPENSWOOLE_VERSION 22.1.2
ENV PDO_SQLSRV_VERSION 5.11.1 ENV PDO_SQLSRV_VERSION 5.12.0
ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486' ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486'
ENV MS_ODBC_SQL_VERSION 18_18.1.1.1 ENV MS_ODBC_SQL_VERSION 18_18.1.1.1