Переход на php8.3 + обновление зависимостей

This commit is contained in:
2025-02-26 01:35:06 +08:00
parent d337925713
commit 2ab7cd7378
7 changed files with 37 additions and 112 deletions

View File

@@ -13,6 +13,8 @@ services:
build: build:
dockerfile: docker/php/${IPTV_ENV}.dockerfile dockerfile: docker/php/${IPTV_ENV}.dockerfile
restart: unless-stopped restart: unless-stopped
extra_hosts:
- "host.docker.internal:host-gateway"
networks: networks:
- iptv - iptv
volumes: volumes:
@@ -27,6 +29,8 @@ services:
container_name: iptv-nginx container_name: iptv-nginx
image: nginx:latest image: nginx:latest
restart: unless-stopped restart: unless-stopped
extra_hosts:
- "host.docker.internal:host-gateway"
networks: networks:
- iptv - iptv
volumes: volumes:

View File

@@ -1,4 +1,4 @@
FROM php:8.2-fpm FROM php:8.3-fpm
RUN apt update && \ RUN apt update && \
apt upgrade -y && \ apt upgrade -y && \

View File

@@ -2,10 +2,7 @@
error_reporting = E_ALL error_reporting = E_ALL
expose_php = Off expose_php = Off
file_uploads = Off file_uploads = Off
memory_limit=-1
max_execution_time=-1 max_execution_time=-1
; upload_max_filesize=10M
; post_max_size=10M
[opcache] [opcache]
opcache.enable = 1 opcache.enable = 1
@@ -22,7 +19,7 @@ zend_extension = xdebug.so
xdebug.mode = debug xdebug.mode = debug
xdebug.start_with_request = yes xdebug.start_with_request = yes
xdebug.trigger_value = go xdebug.trigger_value = go
xdebug.client_host = 172.17.0.1 xdebug.client_host = host.docker.internal
xdebug.REQUEST = * xdebug.REQUEST = *
xdebug.SESSION = * xdebug.SESSION = *
xdebug.SERVER = * xdebug.SERVER = *

View File

@@ -1,4 +1,4 @@
FROM php:8.2-fpm FROM php:8.3-fpm
RUN apt update && \ RUN apt update && \
apt upgrade -y && \ apt upgrade -y && \

View File

@@ -3,7 +3,7 @@ user = www-data
group = www-data group = www-data
listen = 127.0.0.1:9000 listen = 127.0.0.1:9000
pm = dynamic pm = dynamic
pm.max_children = 5 pm.max_children = 20
pm.start_servers = 2 pm.start_servers = 2
pm.min_spare_servers = 1 pm.min_spare_servers = 1
pm.max_spare_servers = 3 pm.max_spare_servers = 3
@@ -18,4 +18,4 @@ access.log = /var/log/php/$pool.access.log
php_flag[display_errors] = on php_flag[display_errors] = on
php_admin_value[error_log] = /var/log/php/www.error.log php_admin_value[error_log] = /var/log/php/www.error.log
php_admin_flag[log_errors] = on php_admin_flag[log_errors] = on
php_admin_value[memory_limit] = 32M php_admin_value[memory_limit] = 512M

View File

@@ -1,6 +1,6 @@
{ {
"require": { "require": {
"php": "^8.2", "php": "^8.3",
"ext-json": "*", "ext-json": "*",
"ext-curl": "*", "ext-curl": "*",
"ext-fileinfo": "*", "ext-fileinfo": "*",

130
src/composer.lock generated
View File

@@ -4,20 +4,20 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "1aaea4609092e8a88074f050dab42323", "content-hash": "1877a9475b0d490e07a01363c0508ba5",
"packages": [ "packages": [
{ {
"name": "mikecao/flight", "name": "mikecao/flight",
"version": "v3.12.0", "version": "v3.14.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/flightphp/core.git", "url": "https://github.com/flightphp/core.git",
"reference": "63fbf9b0316969e8aa6c318f8479d1ed0578f9b4" "reference": "2762daf4f4725eae784291ac4ef21b04a6863be6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/flightphp/core/zipball/63fbf9b0316969e8aa6c318f8479d1ed0578f9b4", "url": "https://api.github.com/repos/flightphp/core/zipball/2762daf4f4725eae784291ac4ef21b04a6863be6",
"reference": "63fbf9b0316969e8aa6c318f8479d1ed0578f9b4", "reference": "2762daf4f4725eae784291ac4ef21b04a6863be6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -26,7 +26,7 @@
}, },
"require-dev": { "require-dev": {
"ext-pdo_sqlite": "*", "ext-pdo_sqlite": "*",
"flightphp/runway": "^0.2.0", "flightphp/runway": "^0.2.3 || ^1.0",
"league/container": "^4.2", "league/container": "^4.2",
"level-2/dice": "^4.0", "level-2/dice": "^4.0",
"phpstan/extension-installer": "^1.3", "phpstan/extension-installer": "^1.3",
@@ -73,9 +73,9 @@
"homepage": "http://flightphp.com", "homepage": "http://flightphp.com",
"support": { "support": {
"issues": "https://github.com/flightphp/core/issues", "issues": "https://github.com/flightphp/core/issues",
"source": "https://github.com/flightphp/core/tree/v3.12.0" "source": "https://github.com/flightphp/core/tree/v3.14.0"
}, },
"time": "2024-08-22T17:05:34+00:00" "time": "2025-02-21T17:42:57+00:00"
}, },
{ {
"name": "symfony/deprecation-contracts", "name": "symfony/deprecation-contracts",
@@ -146,16 +146,16 @@
}, },
{ {
"name": "symfony/dotenv", "name": "symfony/dotenv",
"version": "v7.1.5", "version": "v7.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/dotenv.git", "url": "https://github.com/symfony/dotenv.git",
"reference": "6d966200b399fa59759286f3fc7c919f0677c449" "reference": "28347a897771d0c28e99b75166dd2689099f3045"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/dotenv/zipball/6d966200b399fa59759286f3fc7c919f0677c449", "url": "https://api.github.com/repos/symfony/dotenv/zipball/28347a897771d0c28e99b75166dd2689099f3045",
"reference": "6d966200b399fa59759286f3fc7c919f0677c449", "reference": "28347a897771d0c28e99b75166dd2689099f3045",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -200,7 +200,7 @@
"environment" "environment"
], ],
"support": { "support": {
"source": "https://github.com/symfony/dotenv/tree/v7.1.5" "source": "https://github.com/symfony/dotenv/tree/v7.2.0"
}, },
"funding": [ "funding": [
{ {
@@ -216,7 +216,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-09-17T09:16:35+00:00" "time": "2024-11-27T11:18:42+00:00"
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
@@ -377,104 +377,28 @@
], ],
"time": "2024-09-09T11:45:10+00:00" "time": "2024-09-09T11:45:10+00:00"
}, },
{
"name": "symfony/polyfill-php81",
"version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php81.git",
"reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
"reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
"shasum": ""
},
"require": {
"php": ">=7.2"
},
"type": "library",
"extra": {
"thanks": {
"url": "https://github.com/symfony/polyfill",
"name": "symfony/polyfill"
}
},
"autoload": {
"files": [
"bootstrap.php"
],
"psr-4": {
"Symfony\\Polyfill\\Php81\\": ""
},
"classmap": [
"Resources/stubs"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"polyfill",
"portable",
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2024-09-09T11:45:10+00:00"
},
{ {
"name": "twig/twig", "name": "twig/twig",
"version": "v3.14.1", "version": "v3.20.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/twigphp/Twig.git", "url": "https://github.com/twigphp/Twig.git",
"reference": "f405356d20fb43603bcadc8b09bfb676cb04a379" "reference": "3468920399451a384bef53cf7996965f7cd40183"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/f405356d20fb43603bcadc8b09bfb676cb04a379", "url": "https://api.github.com/repos/twigphp/Twig/zipball/3468920399451a384bef53cf7996965f7cd40183",
"reference": "f405356d20fb43603bcadc8b09bfb676cb04a379", "reference": "3468920399451a384bef53cf7996965f7cd40183",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=8.0.2", "php": ">=8.1.0",
"symfony/deprecation-contracts": "^2.5|^3", "symfony/deprecation-contracts": "^2.5|^3",
"symfony/polyfill-ctype": "^1.8", "symfony/polyfill-ctype": "^1.8",
"symfony/polyfill-mbstring": "^1.3", "symfony/polyfill-mbstring": "^1.3"
"symfony/polyfill-php81": "^1.29"
}, },
"require-dev": { "require-dev": {
"phpstan/phpstan": "^2.0",
"psr/container": "^1.0|^2.0", "psr/container": "^1.0|^2.0",
"symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0" "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0"
}, },
@@ -518,7 +442,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/twigphp/Twig/issues", "issues": "https://github.com/twigphp/Twig/issues",
"source": "https://github.com/twigphp/Twig/tree/v3.14.1" "source": "https://github.com/twigphp/Twig/tree/v3.20.0"
}, },
"funding": [ "funding": [
{ {
@@ -530,21 +454,21 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-11-06T18:17:38+00:00" "time": "2025-02-13T08:34:43+00:00"
} }
], ],
"packages-dev": [], "packages-dev": [],
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": [], "stability-flags": {},
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {
"php": "^8.2", "php": "^8.3",
"ext-json": "*", "ext-json": "*",
"ext-curl": "*", "ext-curl": "*",
"ext-fileinfo": "*" "ext-fileinfo": "*"
}, },
"platform-dev": [], "platform-dev": {},
"plugin-api-version": "2.3.0" "plugin-api-version": "2.6.0"
} }