From 2ab7cd7378fdbe995f67e54b4b77ca4dab31e1d9 Mon Sep 17 00:00:00 2001 From: AnthonyAxenov Date: Wed, 26 Feb 2025 01:35:06 +0800 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=20?= =?UTF-8?q?=D0=BD=D0=B0=20php8.3=20+=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=B2=D0=B8=D1=81?= =?UTF-8?q?=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 4 ++ docker/php/dev.dockerfile | 2 +- docker/php/dev.php.ini | 5 +- docker/php/prod.dockerfile | 2 +- docker/php/www.conf | 4 +- src/composer.json | 2 +- src/composer.lock | 130 ++++++++----------------------------- 7 files changed, 37 insertions(+), 112 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index da2e151..836784a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,6 +13,8 @@ services: build: dockerfile: docker/php/${IPTV_ENV}.dockerfile restart: unless-stopped + extra_hosts: + - "host.docker.internal:host-gateway" networks: - iptv volumes: @@ -27,6 +29,8 @@ services: container_name: iptv-nginx image: nginx:latest restart: unless-stopped + extra_hosts: + - "host.docker.internal:host-gateway" networks: - iptv volumes: diff --git a/docker/php/dev.dockerfile b/docker/php/dev.dockerfile index 66e8bad..cb2c00f 100644 --- a/docker/php/dev.dockerfile +++ b/docker/php/dev.dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2-fpm +FROM php:8.3-fpm RUN apt update && \ apt upgrade -y && \ diff --git a/docker/php/dev.php.ini b/docker/php/dev.php.ini index e3e4643..a972e69 100644 --- a/docker/php/dev.php.ini +++ b/docker/php/dev.php.ini @@ -2,10 +2,7 @@ error_reporting = E_ALL expose_php = Off file_uploads = Off -memory_limit=-1 max_execution_time=-1 -; upload_max_filesize=10M -; post_max_size=10M [opcache] opcache.enable = 1 @@ -22,7 +19,7 @@ zend_extension = xdebug.so xdebug.mode = debug xdebug.start_with_request = yes xdebug.trigger_value = go -xdebug.client_host = 172.17.0.1 +xdebug.client_host = host.docker.internal xdebug.REQUEST = * xdebug.SESSION = * xdebug.SERVER = * diff --git a/docker/php/prod.dockerfile b/docker/php/prod.dockerfile index d6e3b2a..1f75126 100644 --- a/docker/php/prod.dockerfile +++ b/docker/php/prod.dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2-fpm +FROM php:8.3-fpm RUN apt update && \ apt upgrade -y && \ diff --git a/docker/php/www.conf b/docker/php/www.conf index 27a90ee..30134fd 100644 --- a/docker/php/www.conf +++ b/docker/php/www.conf @@ -3,7 +3,7 @@ user = www-data group = www-data listen = 127.0.0.1:9000 pm = dynamic -pm.max_children = 5 +pm.max_children = 20 pm.start_servers = 2 pm.min_spare_servers = 1 pm.max_spare_servers = 3 @@ -18,4 +18,4 @@ access.log = /var/log/php/$pool.access.log php_flag[display_errors] = on php_admin_value[error_log] = /var/log/php/www.error.log php_admin_flag[log_errors] = on -php_admin_value[memory_limit] = 32M +php_admin_value[memory_limit] = 512M diff --git a/src/composer.json b/src/composer.json index 1f09724..70f41d8 100644 --- a/src/composer.json +++ b/src/composer.json @@ -1,6 +1,6 @@ { "require": { - "php": "^8.2", + "php": "^8.3", "ext-json": "*", "ext-curl": "*", "ext-fileinfo": "*", diff --git a/src/composer.lock b/src/composer.lock index 519f0f7..f5fd5ab 100644 --- a/src/composer.lock +++ b/src/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1aaea4609092e8a88074f050dab42323", + "content-hash": "1877a9475b0d490e07a01363c0508ba5", "packages": [ { "name": "mikecao/flight", - "version": "v3.12.0", + "version": "v3.14.0", "source": { "type": "git", "url": "https://github.com/flightphp/core.git", - "reference": "63fbf9b0316969e8aa6c318f8479d1ed0578f9b4" + "reference": "2762daf4f4725eae784291ac4ef21b04a6863be6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/flightphp/core/zipball/63fbf9b0316969e8aa6c318f8479d1ed0578f9b4", - "reference": "63fbf9b0316969e8aa6c318f8479d1ed0578f9b4", + "url": "https://api.github.com/repos/flightphp/core/zipball/2762daf4f4725eae784291ac4ef21b04a6863be6", + "reference": "2762daf4f4725eae784291ac4ef21b04a6863be6", "shasum": "" }, "require": { @@ -26,7 +26,7 @@ }, "require-dev": { "ext-pdo_sqlite": "*", - "flightphp/runway": "^0.2.0", + "flightphp/runway": "^0.2.3 || ^1.0", "league/container": "^4.2", "level-2/dice": "^4.0", "phpstan/extension-installer": "^1.3", @@ -73,9 +73,9 @@ "homepage": "http://flightphp.com", "support": { "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", @@ -146,16 +146,16 @@ }, { "name": "symfony/dotenv", - "version": "v7.1.5", + "version": "v7.2.0", "source": { "type": "git", "url": "https://github.com/symfony/dotenv.git", - "reference": "6d966200b399fa59759286f3fc7c919f0677c449" + "reference": "28347a897771d0c28e99b75166dd2689099f3045" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dotenv/zipball/6d966200b399fa59759286f3fc7c919f0677c449", - "reference": "6d966200b399fa59759286f3fc7c919f0677c449", + "url": "https://api.github.com/repos/symfony/dotenv/zipball/28347a897771d0c28e99b75166dd2689099f3045", + "reference": "28347a897771d0c28e99b75166dd2689099f3045", "shasum": "" }, "require": { @@ -200,7 +200,7 @@ "environment" ], "support": { - "source": "https://github.com/symfony/dotenv/tree/v7.1.5" + "source": "https://github.com/symfony/dotenv/tree/v7.2.0" }, "funding": [ { @@ -216,7 +216,7 @@ "type": "tidelift" } ], - "time": "2024-09-17T09:16:35+00:00" + "time": "2024-11-27T11:18:42+00:00" }, { "name": "symfony/polyfill-ctype", @@ -377,104 +377,28 @@ ], "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", - "version": "v3.14.1", + "version": "v3.20.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "f405356d20fb43603bcadc8b09bfb676cb04a379" + "reference": "3468920399451a384bef53cf7996965f7cd40183" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/f405356d20fb43603bcadc8b09bfb676cb04a379", - "reference": "f405356d20fb43603bcadc8b09bfb676cb04a379", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/3468920399451a384bef53cf7996965f7cd40183", + "reference": "3468920399451a384bef53cf7996965f7cd40183", "shasum": "" }, "require": { - "php": ">=8.0.2", + "php": ">=8.1.0", "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-ctype": "^1.8", - "symfony/polyfill-mbstring": "^1.3", - "symfony/polyfill-php81": "^1.29" + "symfony/polyfill-mbstring": "^1.3" }, "require-dev": { + "phpstan/phpstan": "^2.0", "psr/container": "^1.0|^2.0", "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0" }, @@ -518,7 +442,7 @@ ], "support": { "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": [ { @@ -530,21 +454,21 @@ "type": "tidelift" } ], - "time": "2024-11-06T18:17:38+00:00" + "time": "2025-02-13T08:34:43+00:00" } ], "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^8.2", + "php": "^8.3", "ext-json": "*", "ext-curl": "*", "ext-fileinfo": "*" }, - "platform-dev": [], - "plugin-api-version": "2.3.0" + "platform-dev": {}, + "plugin-api-version": "2.6.0" }