Compatibility with 5.2 (#51)

* update libraries
* use nullable typehint
* add override attribute
* use setEntity for form
* update action scripts

.github/release-drafter.yml

@@ -6,7 +6,4 @@ categories:
     labels:
       - "BC-break"
   - title: "Other changes"
-template: |
-  ## What’s Changed
-
-  $CHANGES
+template: $CHANGES

.github/workflows/build-release.yml

@@ -1,4 +1,4 @@
-name: Build Release
+name: Build release
 
 on:
   push:

.github/workflows/test-unit.yml

@@ -37,7 +37,7 @@ jobs:
           echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Setup cache 2/2
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-smoke-${{ matrix.php }}-${{ matrix.type }}-${{ hashFiles('composer.json') }}
@@ -46,16 +46,16 @@ jobs:
 
       - name: Install PHP dependencies
         run: |
-          if [ "${{ matrix.type }}" != "Phpunit" ] && [ "${{ matrix.type }}" != "StaticAnalysis" ]; then composer remove --no-interaction --no-update phpunit/phpunit johnkary/phpunit-speedtrap --dev; fi
-          if [ "${{ matrix.type }}" != "CodingStyle" ]; then composer remove --no-interaction --no-update friendsofphp/php-cs-fixer --dev; fi
+          if [ "${{ matrix.type }}" != "Phpunit" ] && [ "${{ matrix.type }}" != "StaticAnalysis" ]; then composer remove --no-interaction --no-update phpunit/phpunit ergebnis/phpunit-slow-test-detector --dev; fi
+          if [ "${{ matrix.type }}" != "CodingStyle" ]; then composer remove --no-interaction --no-update friendsofphp/php-cs-fixer ergebnis/composer-normalize --dev; fi
           if [ "${{ matrix.type }}" != "StaticAnalysis" ]; then composer remove --no-interaction --no-update phpstan/\* behat/\* --dev; fi
           composer update --ansi --prefer-dist --no-interaction --no-progress --optimize-autoloader
 
       - name: "Run tests: SQLite (only for Phpunit)"
         if: startsWith(matrix.type, 'Phpunit')
         run: |
           php demos/_demo-data/create-db.php
-          echo "not implemented" || vendor/bin/phpunit --exclude-group none --no-coverage -v
+          echo "not implemented" || vendor/bin/phpunit --exclude-group none --no-coverage --fail-on-warning --fail-on-risky $(if vendor/bin/phpunit --version | grep -q '^PHPUnit 9\.'; then echo -v; else echo --fail-on-notice --fail-on-deprecation --display-notices --display-deprecations --display-warnings --display-errors --display-incomplete --display-skipped; fi)
 
       - name: Check Coding Style (only for CodingStyle)
         if: matrix.type == 'CodingStyle'
@@ -69,4 +69,4 @@ jobs:
         if: matrix.type == 'StaticAnalysis'
         run: |
           echo "memory_limit = 2G" > /usr/local/etc/php/conf.d/custom-memory-limit.ini
-          vendor/bin/phpstan analyse
+          vendor/bin/phpstan analyse -v

.php-cs-fixer.dist.php

@@ -9,15 +9,20 @@
     ->setRules([
         '@PhpCsFixer' => true,
         '@PhpCsFixer:risky' => true,
-        '@PHP74Migration' => true,
         '@PHP74Migration:risky' => true,
+        '@PHP74Migration' => true,
 
         // required by PSR-12
         'concat_space' => [
             'spacing' => 'one',
         ],
 
         // 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',
@@ -46,9 +51,6 @@
         'general_phpdoc_annotation_remove' => [
             'annotations' => ['author', 'copyright', 'throws'],
         ],
-        'nullable_type_declaration_for_default_null_value' => [
-            'use_nullable_type_declaration' => false,
-        ],
 
         // fn => without curly brackets is less readable,
         // also prevent bounding of unwanted variables for GC

composer.json

@@ -38,18 +38,18 @@
     },
     "require-release": {
         "php": ">=7.4 <8.4",
-        "atk4/ui": "~5.0.0",
+        "atk4/ui": "~5.2.0",
         "league/flysystem": "^2.0"
     },
     "require-dev": {
         "ergebnis/composer-normalize": "^2.13",
+        "ergebnis/phpunit-slow-test-detector": "^2.9",
         "friendsofphp/php-cs-fixer": "^3.0",
-        "johnkary/phpunit-speedtrap": "^3.3",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan": "^1.0",
         "phpstan/phpstan-deprecation-rules": "^1.0",
         "phpstan/phpstan-strict-rules": "^1.3",
-        "phpunit/phpunit": "^9.5.5"
+        "phpunit/phpunit": "^9.5.5 || ^10.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

demos/_includes/Friend.php

@@ -18,6 +18,7 @@ class Friend extends Model
     /** @var Filesystem */
     public $filesystem;
 
+    #[\Override]
     protected function init(): void
     {
         parent::init();

demos/index.php

@@ -50,7 +50,7 @@
 // new friend form
 Header::addTo($t1, ['Add New Friend']);
 $form = Form::addTo($t1);
-$form->setModel(
+$form->setEntity(
     (new Friend($app->db, [
         'filesystem' => $filesystem,
     ]))->createEntity()

phpstan.neon.dist

@@ -4,9 +4,9 @@ includes:
 parameters:
     level: 6
     paths:
-        - .
+        - ./
     excludePaths:
-        - vendor
+        - vendor/
 
     ignoreErrors:
         # relax strict rules

src/Form/Control/Upload.php

@@ -14,6 +14,7 @@
  */
 class Upload extends \Atk4\Ui\Form\Control\Upload
 {
+    #[\Override]
     protected function init(): void
     {
         parent::init();
@@ -48,6 +49,7 @@ protected function deleted(string $token): ?JsExpressionable
         return null;
     }
 
+    #[\Override]
     protected function renderView(): void
     {
         if ($this->entityField->getField()->fieldFilename) { // @phpstan-ignore-line

src/Model/File.php

@@ -47,6 +47,7 @@ class File extends Model
     /** Draft files deleting delay in seconds, to prevent cleaning up unsaved forms */
     protected int $draftsCleanupDelay = 2 * 24 * 3600;
 
+    #[\Override]
     protected function init(): void
     {
         parent::init();
@@ -142,7 +143,7 @@ public function newFile(): Model
      *
      * @return static
      */
-    public function createFromPath(string $path, string $fileName = null): Model
+    public function createFromPath(string $path, ?string $fileName = null): Model
     {
         $this->assertIsModel();
 
@@ -201,9 +202,9 @@ public function createFromPath(string $path, string $fileName = null): Model
      */
     public function createThumbnail(
         string $path,
-        int $maxWidth = null,
-        int $maxHeight = null,
-        string $format = null
+        ?int $maxWidth = null,
+        ?int $maxHeight = null,
+        ?string $format = null
     ): bool {
         $this->assertIsEntity();
 
@@ -293,7 +294,7 @@ public function getStream(): StreamInterface
      *
      * @param int $draftsCleanupDelay Custom drafts cleanup delay in seconds
      */
-    public function cleanupDrafts(int $draftsCleanupDelay = null): void
+    public function cleanupDrafts(?int $draftsCleanupDelay = null): void
     {
         $draftsCleanupDelay ??= $this->draftsCleanupDelay;