[WIP][TASK] Fix failing tests in v2

.editorconfig

@@ -0,0 +1,52 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# TS/JS-Files
+[*.{ts,js}]
+indent_size = 2
+
+# JSON-Files
+[*.json]
+indent_style = tab
+
+# ReST-Files
+[*.rst]
+indent_size = 3
+max_line_length = 80
+
+# YAML-Files
+[*.{yaml,yml}]
+indent_size = 2
+
+# package.json
+# .travis.yml
+[{package.json,.travis.yml}]
+indent_size = 2
+
+# TypoScript
+[*.{typoscript,tsconfig}]
+indent_size = 2
+
+# XLF-Files
+[*.xlf]
+indent_style = tab
+
+# SQL-Files
+[*.sql]
+indent_style = tab
+indent_size = 2
+
+# .htaccess
+[{_.htaccess,.htaccess}]
+indent_style = tab

.github/workflows/ci.yml

@@ -0,0 +1,178 @@
+on:
+  push:
+    branches:
+      - '*'
+      - '!master'
+
+name: CI
+
+jobs:
+  php-lint:
+    name: PHP linter
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        php-version:
+          - 7.2
+          - 7.3
+          - 7.4
+
+    steps:
+      - name: Configure PHP ${{ matrix.php-version }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+
+      - name: Checkout
+        uses: actions/checkout@v1
+
+      - name: Run PHP lint
+        run: |
+          echo "${{ matrix.exclude-pattern }}"
+          find *.php Classes/ Configuration/ Tests/ -name '*.php' ${{ matrix.exclude-pattern }}
+          find *.php Classes/ Configuration/ Tests/ -name '*.php' ${{ matrix.exclude-pattern }} -print0 | xargs -0 -n 1 -P 4 php -l
+
+  typoscript-lint:
+    name: TypoScript linter
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Configure PHP 7.4
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+
+      - name: Checkout
+        uses: actions/checkout@v1
+
+      - name: "Cache dependencies installed with composer"
+        uses: actions/cache@v1
+        with:
+          path: ~/.composer/cache
+          key: php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: |
+            php${{ matrix.php-version }}-composer-
+      - name: Install Composer dependencies
+        run: composer install --no-progress
+
+      - name: Run TypoScript lint
+        run: composer ci:ts:lint
+
+  php-code-sniffer:
+    name: PHP Code Sniffer
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Configure PHP 7.4
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+
+      - name: Checkout
+        uses: actions/checkout@v1
+
+      - name: "Cache dependencies installed with composer"
+        uses: actions/cache@v1
+        with:
+          path: ~/.composer/cache
+          key: php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: |
+            php${{ matrix.php-version }}-composer-
+      - name: Install Composer dependencies
+        run: composer install --no-progress
+
+      - name: Run PHP Code Sniffer
+        run: composer ci:php:sniff
+
+  unit-tests:
+    name: Unit tests
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        composer-version:
+          - v1
+          - v2
+        typo3-version:
+          - "^9.5"
+          - "^10.4"
+        composer-dependencies:
+          - highest
+          - lowest
+        php-version:
+          - 7.2
+          - 7.3
+          - 7.4
+        include:
+          - typo3-version: "^9.5"
+            database-image: mariadb:latest
+          - typo3-version: "^10.4"
+            database-image: mariadb:latest
+
+    services:
+      mysql:
+        image: ${{ matrix.database-image }}
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: false
+          MYSQL_DATABASE: typo3
+          MYSQL_ROOT_PASSWORD: password
+          MYSQL_USER: user
+        ports:
+          - 3306
+
+    steps:
+      - name: Configure PHP ${{ matrix.php-version }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: fileinfo, filter, gd, hash, intl, json, mbstring, mysqli, openssl, pcre, session, SPL, xml, zip, zlib
+          coverage: none
+          tools: composer:${{ matrix.composer-version }}
+
+      - name: Checkout
+        uses: actions/checkout@v1
+
+      - name: "Cache dependencies installed with composer"
+        uses: actions/cache@v1
+        with:
+          path: ~/.composer/cache
+          key: php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: |
+            php${{ matrix.php-version }}-composer-
+
+      - name: Install TYPO3 Core
+        env:
+          TYPO3: ${{ matrix.typo3-version }}
+        run: |
+          composer --version
+          composer require typo3/minimal:"${{ matrix.typo3-version }}"
+          composer show
+
+      - name: Install lowest dependencies with composer
+        if: matrix.composer-dependencies == 'lowest'
+        run: |
+          composer update --no-ansi --no-interaction --no-progress --no-suggest --prefer-lowest
+          composer show
+
+      - name: Install highest dependencies with composer
+        if: matrix.composer-dependencies == 'highest'
+        run: |
+          composer update --no-ansi --no-interaction --no-progress --no-suggest
+          composer show
+
+      - name: Run unit tests
+        run: composer ci:tests:unit
+
+      - name: Run functional tests
+        env:
+          typo3DatabaseHost: 127.0.0.1
+          typo3DatabasePort: ${{ job.services.mysql.ports['3306'] }}
+          typo3DatabaseName: typo3
+          typo3DatabaseUsername: root
+          typo3DatabasePassword: password
+        run: composer ci:tests:functional

.gitignore

@@ -18,3 +18,5 @@ package-lock.json
 
 # PHP CS fix caches
 .php_cs.cache
+
+/var

Build/.php_cs → .php_cs

@@ -20,7 +20,7 @@
  *
  * And then simply run
  *
- *  $ php-cs-fixer fix --config ../Build/.php_cs
+ *  $ ./bin/php-cs-fixer fix --config ./Build/.php_cs
  *
  * inside the TYPO3 directory. Warning: This may take up to 10 minutes.
  *
@@ -31,10 +31,7 @@
 if (PHP_SAPI !== 'cli') {
     die('This script supports command line usage only. Please check your command.');
 }
-// Define in which folders to search and which folders to exclude
-// Exclude some directories that are excluded by Git anyways to speed up the sniffing
-$finder = PhpCsFixer\Finder::create()
-    ->in(__DIR__ . '/../');
+
 // Return a Code Sniffing configuration using
 // all sniffers needed for PSR-2
 // and additionally:
@@ -47,41 +44,53 @@ $finder = PhpCsFixer\Finder::create()
 return PhpCsFixer\Config::create()
     ->setRiskyAllowed(true)
     ->setRules([
-        '@PSR2' => true,
         '@DoctrineAnnotation' => true,
-        'no_leading_import_slash' => true,
-        'no_trailing_comma_in_singleline_array' => true,
-        'no_singleline_whitespace_before_semicolons' => true,
-        'no_unused_imports' => true,
-        'concat_space' => ['spacing' => 'one'],
-        'no_whitespace_in_blank_line' => true,
-        'ordered_imports' => true,
-        'single_quote' => true,
-        'no_empty_statement' => true,
-        'no_extra_consecutive_blank_lines' => true,
-        'phpdoc_no_package' => true,
-        'phpdoc_scalar' => true,
-        'no_blank_lines_after_phpdoc' => true,
+        '@PSR2' => true,
         'array_syntax' => ['syntax' => 'short'],
-        'whitespace_after_comma_in_array' => true,
+        'blank_line_after_opening_tag' => true,
+        'braces' => ['allow_single_line_closure' => true],
+        'cast_spaces' => ['space' => 'none'],
+        'compact_nullable_typehint' => true,
+        'concat_space' => ['spacing' => 'one'],
+        'declare_equal_normalize' => ['space' => 'none'],
+        'dir_constant' => true,
         'function_typehint_space' => true,
         'hash_to_slash_comment' => true,
-        'no_alias_functions' => true,
         'lowercase_cast' => true,
-        'no_leading_namespace_whitespace' => true,
+        'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
+        'modernize_types_casting' => true,
         'native_function_casing' => true,
+        'new_with_braces' => true,
+        'no_alias_functions' => true,
+        'no_blank_lines_after_phpdoc' => true,
+        'no_empty_phpdoc' => true,
+        'no_empty_statement' => true,
+        'no_extra_consecutive_blank_lines' => true,
+        'no_leading_import_slash' => true,
+        'no_leading_namespace_whitespace' => true,
+        'no_null_property_initialization' => true,
         'no_short_bool_cast' => true,
+        'no_singleline_whitespace_before_semicolons' => true,
+        'no_superfluous_elseif' => true,
+        'no_trailing_comma_in_singleline_array' => true,
         'no_unneeded_control_parentheses' => true,
+        'no_unused_imports' => true,
+        'no_useless_else' => true,
+        'no_whitespace_in_blank_line' => true,
+        'ordered_imports' => true,
+        'php_unit_construct' => ['assertEquals', 'assertSame', 'assertNotEquals', 'assertNotSame'],
+        'php_unit_mock_short_will_return' => true,
+        'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
+        'phpdoc_no_access' => true,
         'phpdoc_no_empty_return' => true,
+        'phpdoc_no_package' => true,
+        'phpdoc_scalar' => true,
         'phpdoc_trim' => true,
-        'no_superfluous_elseif' => true,
-        'no_useless_else' => true,
         'phpdoc_types' => true,
         'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
         'return_type_declaration' => ['space_before' => 'none'],
-        'cast_spaces' => ['space' => 'none'],
-        'declare_equal_normalize' => ['space' => 'single'],
-        'dir_constant' => true,
-        'phpdoc_no_access' => true
+        'single_quote' => true,
+        'single_trait_insert_per_statement' => true,
+        'whitespace_after_comma_in_array' => true,
     ])
-    ->setFinder($finder);
+    ->setFinder(PhpCsFixer\Finder::create()->in(__DIR__));

Classes/Backend/Controller/ContentElement/NewContentElementController.php

@@ -1,5 +1,6 @@
 <?php
-declare(strict_types = 1);
+
+declare(strict_types=1);
 namespace TYPO3\CMS\FrontendEditing\Backend\Controller\ContentElement;
 
 /*