Merge branch '12.x'

Author: PKuhlmay

.editorconfig

@@ -14,7 +14,7 @@ trim_trailing_whitespace = true
 
 # TS/JS-Files
 [*.{ts,js}]
-indent_size = 2
+indent_size = 4
 
 # JSON-Files
 [*.json]

.eslintrc.json

@@ -0,0 +1,29 @@
+{
+    "env": {
+        "browser": true,
+        "es6": true
+    },
+    "globals": {
+        "YAHOO": "readonly",
+        "TYPO3": "readonly",
+        "extbaseModeling_wiringEditorLanguage": "readonly"
+    },
+    "extends": ["eslint:recommended"],
+    "parserOptions": {
+        "ecmaVersion": 2020
+    },
+    "rules": {
+        "indent": ["error", 4],
+        "quotes": ["error", "single"],
+        "semi": ["error", "always"],
+        "no-unused-vars": ["warn"],
+        "no-console": ["warn"],
+        "eqeqeq": ["error", "always"],
+        "curly": ["error", "all"]
+    },
+    "ignorePatterns": [
+        ".Build/",
+        "node_modules/",
+        "Resources/Public/jsDomainModeling/wireit/"
+    ]
+}

.gitattributes

@@ -6,3 +6,4 @@
 /.* export-ignore
 /crowdin.yaml export-ignore
 /docker-compose.yml export-ignore
+/rector.php export-ignore

.github/workflows/linters.yml

@@ -15,17 +15,23 @@ on:
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   rectortest:
-    # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v4
+      - name: "Checkout code"
+        uses: actions/checkout@v4
+
+      - name: "Setup PHP"
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.3
+          coverage: none
+
+      - name: "Install dependencies"
+        run: composer install --prefer-dist --no-progress --no-interaction
 
-      # Runs a single command using the runners shell
-      - name: "Run a one-line script"
-        run: echo This should run the rector test. This is not implemented yet
+      - name: "Run Rector (dry-run)"
+        run: .Build/bin/rector process --dry-run
 
   sass-linter:
     # The type of runner that the job will run on
@@ -40,10 +46,10 @@ jobs:
       - name: "Setup Node"
         uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 20.x
 
       - name: "Run npm ci"
         run: npm ci
 
       - name: "Run npm sass-linter"
-        run: npm run sass-lint
+        run: npm run lint:scss

.github/workflows/tests.yml

@@ -16,8 +16,8 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [7.4, 8.0, 8.1, 8.2, 8.3]
-        typo3: [^11.5]
+        php: [8.3]
+        typo3: [^12.4]
 
     name: P${{ matrix.php }} - T${{ matrix.typo3 }}
 
@@ -39,7 +39,7 @@ jobs:
           coverage: none
 
       - name: "Install dependencies"
-        run: composer require "typo3/minimal:${{ matrix.typo3 }}" --prefer-dist --no-progress --no-suggest --no-interaction
+        run: composer require "typo3/minimal:${{ matrix.typo3 }}" --prefer-dist --no-progress --no-interaction
 
       - name: "Check PHP syntax errors"
         run: find . -name \*.php ! -path "./.Build/*" -print0 | xargs -0 -n1 -P4 php -d display_errors=stderr -n -l > /dev/null

.gitignore

@@ -1,6 +1,8 @@
 /.idea*
 /.Build/
 *node_modules*
+/dist/
+/Resources/Public/JavaScript/
 /var/
 .DS_Store
 /composer.lock
@@ -29,3 +31,13 @@ sass-lint.html
 .devbox/.ddev/providers/
 .devbox/.ddev/xhprof/
 .devbox/.ddev/composer.lock
+.claude
+.firecrawl
+tickets
+
+.env
+
+# Playwright E2E
+Tests/E2E/.auth/
+playwright-report/
+test-results/

.prettierignore

@@ -0,0 +1,5 @@
+.Build/
+node_modules/
+package-lock.json
+Resources/Public/jsDomainModeling/wireit/
+vendor/

.prettierrc

@@ -0,0 +1,16 @@
+{
+    "tabWidth": 4,
+    "useTabs": false,
+    "singleQuote": true,
+    "semi": true,
+    "trailingComma": "es5",
+    "printWidth": 120,
+    "overrides": [
+        {
+            "files": ["*.scss", "*.css"],
+            "options": {
+                "singleQuote": false
+            }
+        }
+    ]
+}

.stylelintrc.json

@@ -0,0 +1,14 @@
+{
+    "extends": ["stylelint-config-standard"],
+    "rules": {
+        "color-hex-length": "short",
+        "selector-class-pattern": null,
+        "selector-id-pattern": null,
+        "no-descending-specificity": null,
+        "declaration-empty-line-before": null
+    },
+    "ignoreFiles": [
+        ".Build/**",
+        "node_modules/**"
+    ]
+}

Classes/Configuration/ExtensionBuilderConfigurationManager.php

@@ -19,15 +19,10 @@
 
 use EBT\ExtensionBuilder\Domain\Model\Extension;
 use EBT\ExtensionBuilder\Utility\SpycYAMLParser;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use TYPO3\CMS\Backend\Routing\Exception\RouteNotFoundException;
-use TYPO3\CMS\Backend\Routing\UriBuilder;
 use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationExtensionNotConfiguredException;
 use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationPathDoesNotExistException;
 use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 use TYPO3\CMS\Core\Core\Environment;
-use TYPO3\CMS\Core\Http\JsonResponse;
 use TYPO3\CMS\Core\SingletonInterface;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -54,12 +49,11 @@ class ExtensionBuilderConfigurationManager implements SingletonInterface
     const DEFAULT_TEMPLATE_ROOTPATH = 'EXT:extension_builder/Resources/Private/CodeTemplates/Extbase/';
     private array $inputData = [];
 
-    protected ConfigurationManagerInterface $configurationManager;
-
-    public function injectConfigurationManager(ConfigurationManagerInterface $configurationManager): void
-    {
-        $this->configurationManager = $configurationManager;
-    }
+    public function __construct(
+        private readonly ConfigurationManagerInterface $configurationManager,
+        private readonly ExtensionConfiguration $extensionConfiguration,
+        private readonly DataMapper $dataMapper,
+    ) {}
 
     /**
      * Wrapper for file_get_contents('php://input')
@@ -133,7 +127,7 @@ public function getSettings(?array $typoscript = null): array
      */
     public function getExtensionBuilderSettings(): array
     {
-        return GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('extension_builder');
+        return $this->extensionConfiguration->get('extension_builder');
     }
 
     public function getExtensionSettings(string $extensionKey, string $extensionStoragePath): array
@@ -182,7 +176,7 @@ public static function getExtensionBuilderJson(string $extensionKey, ?string $st
      */
     public function getPersistenceTable(string $className): string
     {
-        return GeneralUtility::makeInstance(DataMapper::class)->getDataMap($className)->getTableName();
+        return $this->dataMapper->getDataMap($className)->getTableName();
     }
 
     /**
@@ -466,34 +460,4 @@ public function getParentClassForEntityObject(Extension $extension): string
             '\\TYPO3\\CMS\\Extbase\\DomainObject\\AbstractEntity';
     }
 
-    /**
-     * Ajax callback that reads the smd file and modiefies the target URL to include
-     * the module token.
-     *
-     * @param ServerRequestInterface $request
-     * @return JsonResponse
-     * @throws RouteNotFoundException
-     */
-    public function getWiringEditorSmd(ServerRequestInterface $request): JsonResponse
-    {
-        $smdJsonString = file_get_contents(
-            ExtensionManagementUtility::extPath('extension_builder') . 'Resources/Public/jsDomainModeling/phpBackend/WiringEditor.smd'
-        );
-        $smdJson = json_decode($smdJsonString);
-        $parameters = [
-            'tx_extensionbuilder_tools_extensionbuilderextensionbuilder' => [
-                'controller' => 'BuilderModule',
-                'action' => 'dispatchRpc',
-            ]
-        ];
-        $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
-        try {
-            $uri = $uriBuilder->buildUriFromRoute('tools_ExtensionBuilderExtensionbuilder', $parameters);
-        } catch (RouteNotFoundException $e) {
-            $uri = $uriBuilder->buildUriFromRoutePath('tools_ExtensionBuilderExtensionbuilder', $parameters);
-        }
-        $smdJson->target = (string)$uri;
-
-        return (new JsonResponse())->setPayload((array)$smdJson);
-    }
 }