Merge remote-tracking branch 'origin/4.0' into temp_3.0_to_4.0

Author: mnocon

.github/workflows/ci.yaml

@@ -42,7 +42,6 @@ jobs:
             fail-fast: false
             matrix:
                 php:
-                    - '7.3'
                     - '7.4'
                     - '8.0'
                     - '8.1'

.php-cs-fixer.php

@@ -17,10 +17,11 @@
     ->buildConfig()
     ->setFinder(
         PhpCsFixer\Finder::create()
-            ->in(__DIR__)
-            ->exclude([
-                'vendor',
-                'doc',
-            ])
+            ->in(
+                array_filter([
+                    __DIR__ . '/src',
+                    __DIR__ . '/tests',
+                ], 'is_dir')
+            )
             ->files()->name('*.php')
     );

bundle/Resources/config/default_settings.yaml

@@ -1,20 +1,24 @@
 {
-    "name": "ezsystems/ezplatform-design-engine",
-    "description": "Design fallback mechanism for eZ Platform",
+    "name": "ibexa/design-engine",
+    "description": "Design fallback mechanism for Ibexa",
     "license": "GPL-2.0-only",
-    "type": "ezplatform-bundle",
+    "type": "ibexa-bundle",
+    "replace": {
+        "ezsystems/ezplatform-design-engine": "*"
+    },
     "authors": [
         {
             "name": "Jerome Vieilledent",
             "email": "jerome@vieilledent.fr"
         },
         {
-            "name": "eZ Systems dev team",
-            "email": "dev-team@ez.no"
+            "name": "Ibexa Engineering & Community",
+            "homepage": "https://www.ibexa.co/products"
         }
     ],
     "require": {
-        "ezsystems/ezplatform-kernel": "^1.0@dev",
+        "php": "^7.4 || ^8.0",
+        "ibexa/core": "~4.0.0@dev",
         "twig/twig": "^3.0",
         "symfony/dependency-injection": "^5.0",
         "symfony/http-kernel": "^5.0",
@@ -26,32 +30,37 @@
         "symfony/templating": "^5.0"
     },
     "require-dev": {
-        "ezsystems/doctrine-dbal-schema": "^1.0@dev",
-        "ezsystems/ezplatform-code-style": "^1.0",
+        "ibexa/code-style": "^1.0",
+        "ibexa/doctrine-schema": "~4.0.0@dev",
         "phpunit/phpunit": "^8.1",
-        "friendsofphp/php-cs-fixer": "^2.16.0",
+        "friendsofphp/php-cs-fixer": "^3.0",
         "mikey179/vfsstream": "^1.6"
     },
     "autoload": {
         "psr-4": {
-            "EzSystems\\EzPlatformDesignEngine\\": "lib",
-            "EzSystems\\EzPlatformDesignEngineBundle\\": "bundle"
+            "Ibexa\\DesignEngine\\": "src/lib/",
+            "Ibexa\\Bundle\\DesignEngine\\": "src/bundle/",
+            "Ibexa\\Contracts\\DesignEngine\\": "src/contracts/",
+            "EzSystems\\EzPlatformDesignEngine\\": "src/lib/",
+            "EzSystems\\EzPlatformDesignEngineBundle\\": "src/bundle/"
         }
     },
     "autoload-dev": {
         "psr-4": {
+            "Ibexa\\Tests\\Bundle\\DesignEngine\\": "tests/bundle/",
+            "Ibexa\\Tests\\DesignEngine\\": "tests/lib/",
             "EzSystems\\EzPlatformDesignEngine\\Tests\\": "tests/lib",
             "EzSystems\\EzPlatformDesignEngineBundle\\Tests\\": "tests/bundle"
         }
     },
     "scripts": {
-        "fix-cs": "php-cs-fixer fix -v --show-progress=dots",
+        "fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php -v --show-progress=dots",
         "check-cs": "@fix-cs --dry-run",
         "test": "phpunit"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0.x-dev"
+            "dev-main": "4.0.x-dev"
         }
     },
     "conflict": {