Merge branch 'main' into hotfix/5566_maintenance_contract-merge-from-main

Author: martinyde

.php-cs-fixer.dist.php

@@ -15,6 +15,10 @@
 
 $config = new PhpCsFixer\Config();
 $config->setFinder($finder);
+// Allow running on PHP versions php-cs-fixer doesn't officially support yet
+// (we run on the latest stable PHP). Replaces the deprecated
+// PHP_CS_FIXER_IGNORE_ENV env var.
+$config->setUnsupportedPhpVersionAllowed(true);
 
 $config->setRules([
   '@Symfony' => true,

CHANGELOG.md

@@ -13,6 +13,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Update ITK docker template
   - Update github actions workflows
 
+## [1.11.0] - 2026-05-19
+
+- [#78](https://github.com/itk-dev/devops_itksites/pull/78)
+  Update composer dependencies, fix php-cs-fixer deprecation
+- [#77](https://github.com/itk-dev/devops_itksites/pull/77)
+  Fix SemverFilter: respect value2 with directional operators
+- [#76](https://github.com/itk-dev/devops_itksites/pull/76)
+  Add server type filter and sort on Installation, Site, Domain
+- [#75](https://github.com/itk-dev/devops_itksites/pull/75)
+  Add semver-aware filter on every admin version column, make version
+  column semver sortable
+
 ## [1.10.1] - 2026-05-11
 
 - [#71](https://github.com/itk-dev/devops_itksites/pull/71)
@@ -170,7 +182,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.0.0] - 2022-09-15
 
-[Unreleased]: https://github.com/itk-dev/devops_itksites/compare/1.10.0...HEAD
+[Unreleased]: https://github.com/itk-dev/devops_itksites/compare/1.11.0...HEAD
+[1.11.0]: https://github.com/itk-dev/devops_itksites/compare/1.10.1...1.11.0
+[1.10.1]: https://github.com/itk-dev/devops_itksites/compare/1.10.0...1.10.1
 [1.10.0]: https://github.com/itk-dev/devops_itksites/compare/1.9.2...1.10.0
 [1.9.2]: https://github.com/itk-dev/devops_itksites/compare/1.9.1...1.9.2
 [1.9.1]: https://github.com/itk-dev/devops_itksites/compare/1.9.0...1.9.1

composer.json

@@ -114,6 +114,28 @@
             "cache:clear": "symfony-cmd",
             "assets:install %PUBLIC_DIR%": "symfony-cmd",
             "importmap:install": "symfony-cmd"
-        }
+        },
+        "coding-standards-apply": [
+            "vendor/bin/php-cs-fixer fix"
+        ],
+        "coding-standards-check": [
+            "vendor/bin/php-cs-fixer fix --dry-run"
+        ],
+        "fixtures-load": [
+            "bin/console hautelook:fixtures:load --no-interaction"
+        ],
+        "queues": [
+            "bin/console messenger:consume async --failure-limit=1 -vvv"
+        ],
+        "tests": [
+            "bin/console --env=test doctrine:database:drop --if-exists --force --quiet",
+            "bin/console --env=test doctrine:database:create --no-interaction --if-not-exists --quiet",
+            "bin/console --env=test doctrine:migrations:migrate --no-interaction --quiet",
+            "vendor/bin/phpunit --stop-on-failure"
+        ],
+        "update-api-spec": [
+            "bin/console api:openapi:export --output=public/api-spec-v1.yaml --yaml --no-interaction",
+            "bin/console api:openapi:export --output=public/api-spec-v1.json --no-interaction"
+        ]
     }
 }

composer.lock

@@ -21,6 +21,9 @@ doctrine:
                 dir: '%kernel.project_dir%/src/Entity'
                 prefix: 'App\Entity'
                 alias: App
+        dql:
+            numeric_functions:
+                SEMVER_NUMERIC: App\Doctrine\Functions\SemverNumeric
         controller_resolver:
             auto_mapping: false
 

config/packages/doctrine.yaml

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Admin;
+
+use Doctrine\ORM\QueryBuilder;
+
+final class SemverSort
+{
+    /**
+     * Rewrite the QueryBuilder's ORDER BY so that the listed root-alias
+     * properties sort in semver order (via the SEMVER_NUMERIC DQL function)
+     * instead of lexicographic string order. Other ORDER BY parts are
+     * left untouched. Intended for use from a CRUD controller's
+     * createIndexQueryBuilder() after the parent has built the QB.
+     */
+    public static function apply(QueryBuilder $qb, string ...$properties): void
+    {
+        $orderByParts = $qb->getDQLPart('orderBy');
+        if ([] === $orderByParts) {
+            return;
+        }
+
+        $alias = (string) current($qb->getRootAliases());
+        $needles = [];
+        foreach ($properties as $property) {
+            $needles[$alias.'.'.$property] = 'SEMVER_NUMERIC('.$alias.'.'.$property.')';
+        }
+
+        $qb->resetDQLPart('orderBy');
+        foreach ($orderByParts as $orderBy) {
+            foreach ($orderBy->getParts() as $part) {
+                if (preg_match('/^(.+?)\s+(ASC|DESC)$/i', $part, $m)) {
+                    [$expr, $dir] = [$m[1], strtoupper($m[2])];
+                } else {
+                    [$expr, $dir] = [$part, 'ASC'];
+                }
+
+                $expr = $needles[$expr] ?? $expr;
+                $qb->addOrderBy($expr, $dir);
+            }
+        }
+    }
+}

src/Admin/SemverSort.php

@@ -6,6 +6,8 @@
 
 use App\Admin\Field\VersionField;
 use App\Entity\DockerImageTag;
+use App\Form\Type\Admin\SemverFilter;
+use App\Trait\SemverSortableCrudControllerTrait;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
@@ -16,6 +18,8 @@
 
 class DockerImageTagCrudController extends AbstractCrudController
 {
+    use SemverSortableCrudControllerTrait;
+
     public static function getEntityFqcn(): string
     {
         return DockerImageTag::class;
@@ -49,7 +53,13 @@ public function configureFilters(Filters $filters): Filters
     {
         return $filters
             ->add('dockerImage')
-            ->add('tag')
+            ->add(SemverFilter::new('tag'))
         ;
     }
+
+    #[\Override]
+    protected function semverSortedProperties(): array
+    {
+        return ['tag'];
+    }
 }

src/Controller/Admin/DockerImageTagCrudController.php

@@ -8,6 +8,7 @@
 use App\Admin\Field\ServerTypeField;
 use App\Admin\Field\SiteTypeField;
 use App\Entity\Domain;
+use App\Form\Type\Admin\ServerTypeFilter;
 use App\Trait\ExportCrudControllerTrait;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
@@ -47,7 +48,7 @@ public function configureFields(string $pageName): iterable
         yield DomainField::new('address')->setColumns(12);
         yield SiteTypeField::new('site.type')->hideOnIndex();
         yield AssociationField::new('site')->hideOnIndex();
-        yield ServerTypeField::new('server.type')->setLabel('Type');
+        yield ServerTypeField::new('server.type')->setLabel('Type')->setSortable(true);
         yield AssociationField::new('server');
         yield AssociationField::new('detectionResult')->hideOnIndex();
         yield DateTimeField::new('createdAt')->hideOnIndex();
@@ -61,6 +62,7 @@ public function configureFilters(Filters $filters): Filters
             ->add('address')
             ->add('site')
             ->add('server')
+            ->add(ServerTypeFilter::new('server.type', 'Server type'))
         ;
     }
 }

src/Controller/Admin/DomainCrudController.php

@@ -6,6 +6,8 @@
 
 use App\Admin\Field\VersionField;
 use App\Entity\GitTag;
+use App\Form\Type\Admin\SemverFilter;
+use App\Trait\SemverSortableCrudControllerTrait;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
@@ -15,6 +17,8 @@
 
 class GitTagCrudController extends AbstractCrudController
 {
+    use SemverSortableCrudControllerTrait;
+
     public static function getEntityFqcn(): string
     {
         return GitTag::class;
@@ -50,7 +54,13 @@ public function configureFilters(Filters $filters): Filters
     {
         return $filters
             ->add('repo')
-            ->add('tag')
+            ->add(SemverFilter::new('tag'))
         ;
     }
+
+    #[\Override]
+    protected function semverSortedProperties(): array
+    {
+        return ['tag'];
+    }
 }

src/Controller/Admin/GitTagCrudController.php

@@ -11,7 +11,10 @@
 use App\Admin\Field\VersionField;
 use App\Entity\Installation;
 use App\Form\Type\Admin\FrameworkFilter;
+use App\Form\Type\Admin\SemverFilter;
+use App\Form\Type\Admin\ServerTypeFilter;
 use App\Trait\ExportCrudControllerTrait;
+use App\Trait\SemverSortableCrudControllerTrait;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
@@ -25,6 +28,7 @@
 class InstallationCrudController extends AbstractCrudController
 {
     use ExportCrudControllerTrait;
+    use SemverSortableCrudControllerTrait;
 
     public static function getEntityFqcn(): string
     {
@@ -61,7 +65,7 @@ public function configureFields(string $pageName): iterable
         yield CodeEditorField::new('gitChanges')->hideOnIndex();
         yield AssociationField::new('sites')->hideOnIndex();
         yield RootDirField::new('rootDir')->setColumns(12);
-        yield ServerTypeField::new('server.type')->setLabel('Type');
+        yield ServerTypeField::new('server.type')->setLabel('Type')->setSortable(true);
         yield AssociationField::new('server');
         yield AssociationField::new('detectionResult')->hideOnIndex();
         yield DateTimeField::new('createdAt')->hideOnIndex();
@@ -73,13 +77,20 @@ public function configureFilters(Filters $filters): Filters
     {
         return $filters
             ->add(FrameworkFilter::new('type'))
-            ->add('frameworkVersion')
+            ->add(SemverFilter::new('frameworkVersion', 'ver.'))
             ->add('lts')
             ->add('eol')
-            ->add('composerVersion')
+            ->add(SemverFilter::new('composerVersion', 'Comp.'))
             ->add('rootDir')
             ->add('server')
+            ->add(ServerTypeFilter::new('server.type', 'Server type'))
 //            ->add(SystemFilter::new('system')->mapped(false))
         ;
     }
+
+    #[\Override]
+    protected function semverSortedProperties(): array
+    {
+        return ['frameworkVersion', 'composerVersion'];
+    }
 }