Merge pull request 'update to chill-bundles 2.13.0 - prepare for release' (#4) from release/chill-2.13.0 into main

Reviewed-on: #4
2023-11-22 15:35:12 +00:00 · 2023-11-22 15:35:12 +00:00 · ac909e8107
commit ac909e8107
parent 7e3d741ea0 414b4e11ca
6 changed files with 131 additions and 82 deletions
--- a/.changes/v1.1.0.md
+++ b/.changes/v1.1.0.md
@ -0,0 +1,3 @@
+## v1.1.0 - 2023-11-22
+### Release
+* Update dependencies. Chill-bundles upgraded from 2.12.1 to 2.13.0
--- a/.gitea/workflows/release/create-release-on-tag.yaml
+++ b/.gitea/workflows/release/create-release-on-tag.yaml
@ -1,16 +0,0 @@
-name: Create release
-run-name: Create release on tag
-
-on:
-    push:
-        tags:
-            - v*
-
-jobs:
-    create-release:
-        runs-on: ubuntu-latest
-        steps:
-            -   name: release
-                uses: https://github.com/softprops/action-gh-release@v1
-                with:
-                    body_path: ${{ github.workspace }}/.changes/v${{ github.ref }}.md
--- a/.gitea/workflows/release/update-composer-lock.yaml
+++ b/.gitea/workflows/release/update-composer-lock.yaml
@ -0,0 +1,59 @@
+name: Prepare release for chill app
+run-name: Update composer.lock and dependencies for preparing a release
+
+on:
+    push:
+        branches:
+            - 'release/**'
+
+jobs:
+    update-deps:
+        runs-on: ubuntu-latest
+        steps:
+            - name: check out repository
+              uses: https://github.com/actions/checkout@v4
+            - name: get the previous chill version
+              # parse the composer.lock file using jq to get the chill version before the upgrade
+              id: chill-before
+              uses: https://github.com/sergeysova/jq-action@v2
+              with:
+                cmd: 'cat composer.lock | jq --raw-output ''.packages[] | select ( .name | contains ("chill-project/chill-bundles")) | .version'''
+            - name: run composer update to update composer.lock
+              uses: docker://gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:latest
+              with:
+                  # this is where we set the command to execute
+                  args: composer update --no-install
+            - name: is composer.lock changed ?
+              id: composer-lock-changed
+              run: 'echo is_composer_lock_changed=$(git diff --name-only | grep "composer\.lock" | wc -l) >> $GITHUB_OUTPUT'
+            - name: get the new chill version
+              # parse the composer.lock file using jq to get the chill version after the upgrade
+              id: chill-after
+              uses: https://github.com/sergeysova/jq-action@v2
+              with:
+                cmd: 'cat composer.lock | jq --raw-output ''.packages[] | select ( .name | contains ("chill-project/chill-bundles")) | .version'''
+            - name: add a changie file for the upgrade
+              uses: https://github.com/miniscruff/changie-action@v2
+              if: ${{ steps.composer-lock-changed.outputs.is_composer_lock_changed == 1 }}
+              with:
+                version: latest
+                args: 'new --body "Update dependencies. Chill-bundles upgraded from ${{ steps.chill-before.outputs.value }} to ${{ steps.chill-after.outputs.value }}" --kind Release --custom "Issue=0"'
+            - name: changie batch
+              if: ${{ steps.composer-lock-changed.outputs.is_composer_lock_changed == 1 }}
+              uses: https://github.com/miniscruff/changie-action@v2
+              with:
+                version: latest
+                args: 'batch auto'
+            - name: changie merge
+              if: ${{ steps.composer-lock-changed.outputs.is_composer_lock_changed == 1 }}
+              uses: https://github.com/miniscruff/changie-action@v2
+              with:
+                version: latest
+                args: 'merge'
+            - name: commit changed files
+              if: ${{ steps.composer-lock-changed.outputs.is_composer_lock_changed == 1 }}
+              uses: https://github.com/stefanzweifel/git-auto-commit-action@v5
+              with:
+                  commit_message: "update composer.lock and file (automatic update)"
+                  commit_user_name: Action Bot
+                  commit_user_email: bot@chill.social
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -6,6 +6,10 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).


+## v1.1.0 - 2023-11-22
+### Release
+* Update dependencies. Chill-bundles upgraded from 2.12.1 to 2.13.0
+
 ## v1.0.0 - 2023-11-19
 ### Feature
 * Integrate changie and automate release management
--- a/composer.json
+++ b/composer.json
@ -15,7 +15,7 @@
    },
    "require": {
        "ext-redis": "*",
-        "chill-project/chill-bundles": "2.12.1",
+        "chill-project/chill-bundles": "2.13.0",
        "symfony/flex": "^1.9",
        "symfony/http-client": "^4.4 || ^5",
        "nelmio/alice": "^3.8",
--- 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": "475e1100742e41538de610f4657eca6e",
+    "content-hash": "075c44f9fdb038b5c3eaea8b148dca46",
    "packages": [
        {
            "name": "brick/math",
@ -223,16 +223,16 @@
        },
        {
            "name": "chill-project/chill-bundles",
-            "version": "2.12.1",
+            "version": "2.13.0",
            "source": {
                "type": "git",
                "url": "git@gitlab.com:Chill-Projet/chill-bundles.git",
-                "reference": "ff344dbb0c3fbbe37fbf13ed7ec2c74150d38943"
+                "reference": "35170e1f7caa5533041152b8ebb153bc6ec5d538"
            },
            "dist": {
                "type": "zip",
-                "url": "https://gitlab.com/api/v4/projects/Chill-Projet%2Fchill-bundles/repository/archive.zip?sha=ff344dbb0c3fbbe37fbf13ed7ec2c74150d38943",
-                "reference": "ff344dbb0c3fbbe37fbf13ed7ec2c74150d38943",
+                "url": "https://gitlab.com/api/v4/projects/Chill-Projet%2Fchill-bundles/repository/archive.zip?sha=35170e1f7caa5533041152b8ebb153bc6ec5d538",
+                "reference": "35170e1f7caa5533041152b8ebb153bc6ec5d538",
                "shasum": ""
            },
            "require": {
@ -344,7 +344,7 @@
                "chill",
                "social worker"
            ],
-            "time": "2023-11-16T10:07:34+00:00"
+            "time": "2023-11-21T13:14:11+00:00"
        },
        {
            "name": "composer/package-versions-deprecated",
@ -3110,34 +3110,34 @@
        },
        {
            "name": "lcobucci/clock",
-            "version": "3.1.0",
+            "version": "3.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/lcobucci/clock.git",
-                "reference": "30a854ceb22bd87d83a7a4563b3f6312453945fc"
+                "reference": "6f28b826ea01306b07980cb8320ab30b966cd715"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/lcobucci/clock/zipball/30a854ceb22bd87d83a7a4563b3f6312453945fc",
-                "reference": "30a854ceb22bd87d83a7a4563b3f6312453945fc",
+                "url": "https://api.github.com/repos/lcobucci/clock/zipball/6f28b826ea01306b07980cb8320ab30b966cd715",
+                "reference": "6f28b826ea01306b07980cb8320ab30b966cd715",
                "shasum": ""
            },
            "require": {
-                "php": "~8.2.0",
+                "php": "~8.2.0 || ~8.3.0",
                "psr/clock": "^1.0"
            },
            "provide": {
                "psr/clock-implementation": "1.0"
            },
            "require-dev": {
-                "infection/infection": "^0.26",
-                "lcobucci/coding-standard": "^10.0.0",
-                "phpstan/extension-installer": "^1.2",
-                "phpstan/phpstan": "^1.10.7",
+                "infection/infection": "^0.27",
+                "lcobucci/coding-standard": "^11.0.0",
+                "phpstan/extension-installer": "^1.3.1",
+                "phpstan/phpstan": "^1.10.25",
                "phpstan/phpstan-deprecation-rules": "^1.1.3",
-                "phpstan/phpstan-phpunit": "^1.3.10",
-                "phpstan/phpstan-strict-rules": "^1.5.0",
-                "phpunit/phpunit": "^10.0.17"
+                "phpstan/phpstan-phpunit": "^1.3.13",
+                "phpstan/phpstan-strict-rules": "^1.5.1",
+                "phpunit/phpunit": "^10.2.3"
            },
            "type": "library",
            "autoload": {
@ -3158,7 +3158,7 @@
            "description": "Yet another clock abstraction",
            "support": {
                "issues": "https://github.com/lcobucci/clock/issues",
-                "source": "https://github.com/lcobucci/clock/tree/3.1.0"
+                "source": "https://github.com/lcobucci/clock/tree/3.2.0"
            },
            "funding": [
                {
@ -3170,25 +3170,23 @@
                    "type": "patreon"
                }
            ],
-            "time": "2023-03-20T19:12:25+00:00"
+            "time": "2023-11-17T17:00:27+00:00"
        },
        {
            "name": "lcobucci/jwt",
-            "version": "5.1.0",
+            "version": "5.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/lcobucci/jwt.git",
-                "reference": "f0031c07b96db6a0ca649206e7eacddb7e9d5908"
+                "reference": "0ba88aed12c04bd2ed9924f500673f32b67a6211"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/lcobucci/jwt/zipball/f0031c07b96db6a0ca649206e7eacddb7e9d5908",
-                "reference": "f0031c07b96db6a0ca649206e7eacddb7e9d5908",
+                "url": "https://api.github.com/repos/lcobucci/jwt/zipball/0ba88aed12c04bd2ed9924f500673f32b67a6211",
+                "reference": "0ba88aed12c04bd2ed9924f500673f32b67a6211",
                "shasum": ""
            },
            "require": {
-                "ext-hash": "*",
-                "ext-json": "*",
                "ext-openssl": "*",
                "ext-sodium": "*",
                "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
@ -3233,7 +3231,7 @@
            ],
            "support": {
                "issues": "https://github.com/lcobucci/jwt/issues",
-                "source": "https://github.com/lcobucci/jwt/tree/5.1.0"
+                "source": "https://github.com/lcobucci/jwt/tree/5.2.0"
            },
            "funding": [
                {
@ -3245,7 +3243,7 @@
                    "type": "patreon"
                }
            ],
-            "time": "2023-10-31T06:41:47+00:00"
+            "time": "2023-11-20T21:17:42+00:00"
        },
        {
            "name": "league/csv",
@ -4888,16 +4886,16 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "1.10.43",
+            "version": "1.10.44",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "2c4129f6ca8c7cfa870098884b8869b410a5a361"
+                "reference": "bf84367c53a23f759513985c54ffe0d0c249825b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/2c4129f6ca8c7cfa870098884b8869b410a5a361",
-                "reference": "2c4129f6ca8c7cfa870098884b8869b410a5a361",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/bf84367c53a23f759513985c54ffe0d0c249825b",
+                "reference": "bf84367c53a23f759513985c54ffe0d0c249825b",
                "shasum": ""
            },
            "require": {
@ -4946,7 +4944,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-11-19T19:55:25+00:00"
+            "time": "2023-11-21T16:30:46+00:00"
        },
        {
            "name": "psr/cache",
@ -12039,28 +12037,28 @@
        },
        {
            "name": "twig/markdown-extra",
-            "version": "v3.7.1",
+            "version": "v3.8.0",
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/markdown-extra.git",
-                "reference": "83dfa86a0379f784ea30bdb9c15a356b8aabf780"
+                "reference": "b6e4954ab60030233df5d293886b5404558daac8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/markdown-extra/zipball/83dfa86a0379f784ea30bdb9c15a356b8aabf780",
-                "reference": "83dfa86a0379f784ea30bdb9c15a356b8aabf780",
+                "url": "https://api.github.com/repos/twigphp/markdown-extra/zipball/b6e4954ab60030233df5d293886b5404558daac8",
+                "reference": "b6e4954ab60030233df5d293886b5404558daac8",
                "shasum": ""
            },
            "require": {
-                "php": ">=7.1.3",
-                "twig/twig": "^2.7|^3.0"
+                "php": ">=7.2.5",
+                "twig/twig": "^3.0"
            },
            "require-dev": {
                "erusev/parsedown": "^1.7",
                "league/commonmark": "^1.0|^2.0",
                "league/html-to-markdown": "^4.8|^5.0",
                "michelf/php-markdown": "^1.8|^2.0",
-                "symfony/phpunit-bridge": "^5.4|^6.3"
+                "symfony/phpunit-bridge": "^6.4|^7.0"
            },
            "type": "library",
            "autoload": {
@ -12091,7 +12089,7 @@
                "twig"
            ],
            "support": {
-                "source": "https://github.com/twigphp/markdown-extra/tree/v3.7.1"
+                "source": "https://github.com/twigphp/markdown-extra/tree/v3.8.0"
            },
            "funding": [
                {
@ -12103,30 +12101,30 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-07-29T15:34:56+00:00"
+            "time": "2023-11-21T14:02:01+00:00"
        },
        {
            "name": "twig/string-extra",
-            "version": "v3.7.1",
+            "version": "v3.8.0",
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/string-extra.git",
-                "reference": "7230d630a25e91cd91a2bd8e2f0e872962507eab"
+                "reference": "b0c9037d96baff79abe368dc092a59b726517548"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/string-extra/zipball/7230d630a25e91cd91a2bd8e2f0e872962507eab",
-                "reference": "7230d630a25e91cd91a2bd8e2f0e872962507eab",
+                "url": "https://api.github.com/repos/twigphp/string-extra/zipball/b0c9037d96baff79abe368dc092a59b726517548",
+                "reference": "b0c9037d96baff79abe368dc092a59b726517548",
                "shasum": ""
            },
            "require": {
                "php": ">=7.2.5",
-                "symfony/string": "^5.4|^6.0",
+                "symfony/string": "^5.4|^6.0|^7.0",
                "symfony/translation-contracts": "^1.1|^2|^3",
-                "twig/twig": "^2.7|^3.0"
+                "twig/twig": "^3.0"
            },
            "require-dev": {
-                "symfony/phpunit-bridge": "^5.4|^6.3"
+                "symfony/phpunit-bridge": "^6.4|^7.0"
            },
            "type": "library",
            "autoload": {
@ -12158,7 +12156,7 @@
                "unicode"
            ],
            "support": {
-                "source": "https://github.com/twigphp/string-extra/tree/v3.7.1"
+                "source": "https://github.com/twigphp/string-extra/tree/v3.8.0"
            },
            "funding": [
                {
@ -12170,30 +12168,31 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-07-29T15:34:56+00:00"
+            "time": "2023-11-21T14:02:01+00:00"
        },
        {
            "name": "twig/twig",
-            "version": "v3.7.1",
+            "version": "v3.8.0",
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "a0ce373a0ca3bf6c64b9e3e2124aca502ba39554"
+                "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/a0ce373a0ca3bf6c64b9e3e2124aca502ba39554",
-                "reference": "a0ce373a0ca3bf6c64b9e3e2124aca502ba39554",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/9d15f0ac07f44dc4217883ec6ae02fd555c6f71d",
+                "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d",
                "shasum": ""
            },
            "require": {
                "php": ">=7.2.5",
                "symfony/polyfill-ctype": "^1.8",
-                "symfony/polyfill-mbstring": "^1.3"
+                "symfony/polyfill-mbstring": "^1.3",
+                "symfony/polyfill-php80": "^1.22"
            },
            "require-dev": {
                "psr/container": "^1.0|^2.0",
-                "symfony/phpunit-bridge": "^5.4.9|^6.3"
+                "symfony/phpunit-bridge": "^5.4.9|^6.3|^7.0"
            },
            "type": "library",
            "autoload": {
@ -12229,7 +12228,7 @@
            ],
            "support": {
                "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.7.1"
+                "source": "https://github.com/twigphp/Twig/tree/v3.8.0"
            },
            "funding": [
                {
@ -12241,7 +12240,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-08-28T11:09:02+00:00"
+            "time": "2023-11-21T18:54:41+00:00"
        }
    ],
    "packages-dev": [
@ -14089,16 +14088,16 @@
        },
        {
            "name": "theseer/tokenizer",
-            "version": "1.2.1",
+            "version": "1.2.2",
            "source": {
                "type": "git",
                "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
+                "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
+                "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
                "shasum": ""
            },
            "require": {
@ -14127,7 +14126,7 @@
            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
            "support": {
                "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.2"
            },
            "funding": [
                {
@ -14135,7 +14134,7 @@
                    "type": "github"
                }
            ],
-            "time": "2021-07-28T10:34:58+00:00"
+            "time": "2023-11-20T00:12:19+00:00"
        }
    ],
    "aliases": [],