From ffe1d820fc5fe5ca82eeaf1027ae8ad874dda529 Mon Sep 17 00:00:00 2001
From: Imants Horsts <imants.horsts@inbox.lv>
Date: Wed, 27 Mar 2024 22:37:52 +0200
Subject: [PATCH] UI 5.0.0 compatibility (#31)

* Tweak settings
* Update action scripts
* Update test-unit.yml
---
 .github/release-drafter.yml                            | 10 ++++------
 .../workflows/{build-docs.yml => build-changelog.yml}  |  7 ++++---
 .github/workflows/build-release.yml                    |  2 +-
 .github/workflows/test-unit.yml                        |  6 +++---
 .gitignore                                             |  1 +
 .php-cs-fixer.dist.php                                 |  7 +------
 composer.json                                          |  9 ++++++---
 phpstan.neon.dist                                      |  4 ++--
 8 files changed, 22 insertions(+), 24 deletions(-)
 rename .github/workflows/{build-docs.yml => build-changelog.yml} (72%)

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index e37c078..2ce6dc1 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -1,13 +1,11 @@
 categories:
-  - title: "Breaking Changes"
-    labels:
-      - "BC-break"
-  - title: "Major Features"
+  - title: "Major features"
     labels:
       - "MAJOR"
-  - title: "Documentation enhancements"
+  - title: "Breaking changes"
     labels:
-      - "Documentation :books:"
+      - "BC-break"
+  - title: "Other changes"
 template: |
   ## What’s Changed
 
diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-changelog.yml
similarity index 72%
rename from .github/workflows/build-docs.yml
rename to .github/workflows/build-changelog.yml
index ab60038..65b9151 100644
--- a/.github/workflows/build-docs.yml
+++ b/.github/workflows/build-changelog.yml
@@ -1,4 +1,4 @@
-name: Build Docs
+name: Build changelog
 
 on:
   push:
@@ -6,10 +6,11 @@ on:
       - develop
 
 jobs:
-  update_release_draft:
+  update:
+    name: Update
     runs-on: ubuntu-latest
     steps:
-      - name: Run Release Drafter
+      - name: Run
         uses: release-drafter/release-drafter@v5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index 88865f7..73d79f5 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -12,7 +12,7 @@ jobs:
     container:
       image: ghcr.io/mvorisek/image-php:latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.ref }}
 
diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
index e3f20b9..eaf81e8 100644
--- a/.github/workflows/test-unit.yml
+++ b/.github/workflows/test-unit.yml
@@ -24,7 +24,7 @@ jobs:
             type: 'StaticAnalysis'
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Configure PHP
         run: |
@@ -34,10 +34,10 @@ jobs:
       - name: Setup cache 1/2
         id: composer-cache
         run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
+          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Setup cache 2/2
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-smoke-${{ matrix.php }}-${{ matrix.type }}-${{ hashFiles('composer.json') }}
diff --git a/.gitignore b/.gitignore
index ce729ac..0ef188a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,5 +13,6 @@ local
 cache
 *.cache
 *.cache.*
+*.cmd
 
 /phpunit.xml
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index f86b629..53f76ef 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -9,8 +9,8 @@
     ->setRules([
         '@PhpCsFixer' => true,
         '@PhpCsFixer:risky' => true,
-        '@PHP74Migration:risky' => true,
         '@PHP74Migration' => true,
+        '@PHP74Migration:risky' => true,
 
         // required by PSR-12
         'concat_space' => [
@@ -18,11 +18,6 @@
         ],
 
         // disable some too strict rules
-        'phpdoc_types' => [
-            // keep enabled, but without "alias" group to not fix
-            // "Callback" to "callback" in phpdoc
-            'groups' => ['simple', 'meta'],
-        ],
         'phpdoc_types_order' => [
             'null_adjustment' => 'always_last',
             'sort_algorithm' => 'none',
diff --git a/composer.json b/composer.json
index d425e9c..10e6db7 100644
--- a/composer.json
+++ b/composer.json
@@ -7,6 +7,9 @@
         "agile",
         "data",
         "framework",
+        "ui",
+        "component",
+        "widget",
         "chart",
         "chart.js"
     ],
@@ -20,12 +23,12 @@
     ],
     "homepage": "https://github.com/atk4/chart",
     "require": {
-        "php": ">=7.4 <8.3",
+        "php": ">=7.4 <8.4",
         "atk4/ui": "dev-develop"
     },
     "require-release": {
-        "php": ">=7.4 <8.3",
-        "atk4/ui": "~4.0.0"
+        "php": ">=7.4 <8.4",
+        "atk4/ui": "~5.0.0"
     },
     "require-dev": {
         "ergebnis/composer-normalize": "^2.13",
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index e9a9172..30cd1c3 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -4,9 +4,9 @@ includes:
 parameters:
     level: 6
     paths:
-        - ./
+        - .
     excludePaths:
-        - vendor/
+        - vendor
 
     ignoreErrors:
         # relax strict rules