From 11173b171a762fbb0ddc8eb23bde6e15bc97ae1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20Desv=C3=A9?= Date: Tue, 4 Jun 2024 15:10:13 +0200 Subject: [PATCH] Regenerate composer.lock --- .github/workflows/ci.yml | 2 +- Dockerfile | 4 ++-- Taskfile.yml | 7 +++++++ composer.lock | 22 ++++++++++++---------- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e650bc94..b5fda9f9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,7 +57,7 @@ jobs: run: composer validate - name: Install dependencies - run: composer install --prefer-dist --no-progress --no-suggest + run: composer install --prefer-dist --no-progress - name: Prepare unittests configuration run: sed -i 's/{MYVERSION}/${{ matrix.php.unittest-version }}/g' phpunit.ci.xml diff --git a/Dockerfile b/Dockerfile index ba38e390..061f74d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN apt update && \ RUN usermod -u 1000 www-data RUN groupmod -g 1000 www-data -RUN mkdir -p /app && chown -R www-data:www-data /app +RUN mkdir -p /app/vendor && chown -R www-data:www-data /app USER www-data WORKDIR /app @@ -27,4 +27,4 @@ COPY --link .docker/php.ini /usr/local/etc/php/php.ini COPY --from=composer /usr/bin/composer /usr/bin/composer COPY --link composer.json composer.lock ./ -RUN composer install --prefer-dist --no-progress --no-suggest +RUN composer install --prefer-dist --no-progress diff --git a/Taskfile.yml b/Taskfile.yml index 69f23d2a..599b7f6c 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -65,3 +65,10 @@ tasks: - docker:build cmds: - docker compose run php ./build.sh + + lock: + desc: Regenerate composer lockfile + deps: + - docker:build + cmds: + - docker compose run php composer update diff --git a/composer.lock b/composer.lock index a51d70ba..c13f213b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "82567fbe28dd94a578b918939f0cbf8d", + "content-hash": "08c7306874252a3e4ebe8d5aa392f16f", "packages": [ { "name": "psr/log", @@ -996,12 +996,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "70a844b0ba76ca3dafc6ca03ceae8ef7d3b60a13" + "reference": "8583ee6fe6fdd08d3dbf9c273fa41704c3a919c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/70a844b0ba76ca3dafc6ca03ceae8ef7d3b60a13", - "reference": "70a844b0ba76ca3dafc6ca03ceae8ef7d3b60a13", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/8583ee6fe6fdd08d3dbf9c273fa41704c3a919c1", + "reference": "8583ee6fe6fdd08d3dbf9c273fa41704c3a919c1", "shasum": "" }, "conflict": { @@ -1009,6 +1009,7 @@ "admidio/admidio": "<4.2.13", "adodb/adodb-php": "<=5.20.20|>=5.21,<=5.21.3", "aheinze/cockpit": "<2.2", + "aimeos/aimeos-core": ">=2022.04.1,<2022.10.17|>=2023.04.1,<2023.10.17|>=2024.04.1,<2024.04.7", "aimeos/aimeos-typo3": "<19.10.12|>=20,<20.10.5", "airesvsg/acf-to-rest-api": "<=3.1", "akaunting/akaunting": "<2.1.13", @@ -1210,6 +1211,7 @@ "funadmin/funadmin": "<=3.2|>=3.3.2,<=3.3.3", "gaoming13/wechat-php-sdk": "<=1.10.2", "genix/cms": "<=1.1.11", + "getformwork/formwork": "<1.13", "getgrav/grav": "<1.7.46", "getkirby/cms": "<4.1.1", "getkirby/kirby": "<=2.5.12", @@ -1542,7 +1544,7 @@ "slim/psr7": "<1.4.1|>=1.5,<1.5.1|>=1.6,<1.6.1", "slim/slim": "<2.6", "slub/slub-events": "<3.0.3", - "smarty/smarty": "<3.1.48|>=4,<4.3.1", + "smarty/smarty": "<4.5.3|>=5,<5.1.1", "snipe/snipe-it": "<=6.2.2", "socalnick/scn-social-auth": "<1.15.2", "socialiteproviders/steam": "<1.1", @@ -1553,7 +1555,7 @@ "spoonity/tcpdf": "<6.2.22", "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1", "ssddanbrown/bookstack": "<22.02.3", - "statamic/cms": "<4.46", + "statamic/cms": "<4.46|>=5.3,<5.6.2", "stormpath/sdk": "<9.9.99", "studio-42/elfinder": "<2.1.62", "subhh/libconnect": "<7.0.8|>=8,<8.1", @@ -1570,7 +1572,7 @@ "sylius/paypal-plugin": ">=1,<1.2.4|>=1.3,<1.3.1", "sylius/resource-bundle": ">=1,<1.3.14|>=1.4,<1.4.7|>=1.5,<1.5.2|>=1.6,<1.6.4", "sylius/sylius": "<1.9.10|>=1.10,<1.10.11|>=1.11,<1.11.2|>=1.12.0.0-alpha1,<1.12.16|>=1.13.0.0-alpha1,<1.13.1", - "symbiote/silverstripe-multivaluefield": ">=3,<3.0.99", + "symbiote/silverstripe-multivaluefield": ">=3,<3.1", "symbiote/silverstripe-queuedjobs": ">=3,<3.0.2|>=3.1,<3.1.4|>=4,<4.0.7|>=4.1,<4.1.2|>=4.2,<4.2.4|>=4.3,<4.3.3|>=4.4,<4.4.3|>=4.5,<4.5.1|>=4.6,<4.6.4", "symbiote/silverstripe-seed": "<6.0.3", "symbiote/silverstripe-versionedfiles": "<=2.0.3", @@ -1700,7 +1702,7 @@ "yidashi/yii2cmf": "<=2", "yii2mod/yii2-cms": "<1.9.2", "yiisoft/yii": "<1.1.29", - "yiisoft/yii2": "<2.0.38", + "yiisoft/yii2": "<2.0.50", "yiisoft/yii2-authclient": "<2.2.15", "yiisoft/yii2-bootstrap": "<2.0.4", "yiisoft/yii2-dev": "<2.0.43", @@ -1786,7 +1788,7 @@ "type": "tidelift" } ], - "time": "2024-05-27T19:04:58+00:00" + "time": "2024-06-03T21:04:39+00:00" }, { "name": "sebastian/cli-parser", @@ -2850,7 +2852,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^5.6 || ~7.0 || ~7.1 || ~7.2 || ~7.3 || ~7.4 || ~8.0 || ~8.1 || ~8.2", + "php": "^5.6 || ~7.0 || ~7.1 || ~7.2 || ~7.3 || ~7.4 || ~8.0 || ~8.1 || ~8.2 || ~8.3", "ext-curl": "*", "ext-json": "*", "ext-simplexml": "*",