[TASK] Merge branch 'release-11.5.x' into main

sjorek · May 24, 2022 · 7be0356 · 7be0356
2 parents bbc98e9 + 31ba843
commit 7be0356
Show file tree

Hide file tree

Showing 901 changed files with 45,268 additions and 38,397 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,9 +1,10 @@
 # EditorConfig is awesome: http://EditorConfig.org
-# TYPO3 Standard: https://github.com/TYPO3/typo3/blob/master/.editorconfig
+# TYPO3 Standard: https://github.com/TYPO3/coding-standards
 
 # top-most EditorConfig file
 root = true
 
+# Unix-style newlines with a newline ending every file
 [*]
 charset = utf-8
 end_of_line = lf
@@ -12,9 +13,13 @@ indent_size = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+# TS/JS-Files
+[*.{ts,js}]
+indent_size = 2
+
 # JSON-Files
 [*.json]
-indent_size = 2
+indent_style = tab
 
 # ReST-Files
 [*.{rst,rst.txt}]
@@ -25,6 +30,20 @@ max_line_length = 80
 [*.{yaml,yml}]
 indent_size = 2
 
+# NEON-Files
+[*.neon]
+indent_size = 2
+indent_style = tab
+
+# package.json
+[package.json]
+indent_size = 2
+
+# composer.json (Reason: git history in composer.json)
+[composer.json]
+indent_size = 2
+indent_style = space
+
 # TypoScript
 [*.{typoscript,tsconfig}]
 indent_size = 2
@@ -33,6 +52,20 @@ indent_size = 2
 [*.{xlf,xml}]
 indent_style = tab
 
+# HTML-Files
+[*.html]
+indent_size = 2
+indent_style = tab
+
+# SQL-Files
+[*.sql]
+indent_style = tab
+indent_size = 2
+
+# .htaccess
+[{_.htaccess,.htaccess}]
+indent_style = tab
+
 # Bash scripts
 [*.sh]
 indent_style = space

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -24,10 +24,10 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Used versions (please complete the following information):**
- - TYPO3 Version: [e.g. 10.4.13]
+ - TYPO3 Version: [e.g. 11.5.4]
  - Browser: [e.g. chrome, safari]
- - EXT:solr Version: [e.g. 11.0.2]
- - Used Apache Solr Version: [e.g. 8.8.0]
+ - EXT:solr Version: [e.g. 11.5.0]
+ - Used Apache Solr Version: [e.g. 8.11.1]
  - PHP Version: [e.g. 7.4.0]
  - MySQL Version: [e.g. 8.0.0]
 

diff --git a/.github/workflows/ci-matrix.json b/.github/workflows/ci-matrix.json
@@ -1,26 +1,16 @@
 {
   "main": {
-    "PHP": [ "7.4", "8.0" ],
+    "PHP": [ "7.4", "8.0", "8.1" ],
     "TYPO3": [ "11", "11.5.x-dev" ]
   },
 
   "release-11.5.x": {
-    "PHP": [ "7.4", "8.0" ],
+    "PHP": [ "7.4", "8.0", "8.1" ],
     "TYPO3": [ "11", "11.5.x-dev" ]
   },
 
   "release-11.2.x": {
     "PHP": [ "7.2", "7.3", "7.4" ],
     "TYPO3": [ "10", "10.4.x-dev" ]
-  },
-
-  "release-11.1.x": {
-    "PHP": [ "7.2", "7.3", "7.4" ],
-    "TYPO3": [ "10", "10.4.x-dev" ]
-  },
-
-  "release-11.0.x": {
-    "PHP": [ "7.2", "7.3", "7.4" ],
-    "TYPO3": [ "9", "10", "9.5.x-dev", "10.4.x-dev" ]
   }
 }
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,11 +2,11 @@ name: build
 
 on:
   push:
-    branches: [ main, release-11.5.x, release-11.2.x, release-11.1.x, release-11.0.x ]
+    branches: [ main, release-11.5.x, release-11.1.x, release-11.0.x ]
     tags:
       - "**"
   pull_request:
-    branches: [ main, release-11.5.x, release-11.2.x, release-11.1.x, release-11.0.x ]
+    branches: [ main, release-11.5.x, release-11.1.x, release-11.0.x ]
 
 env:
   CI_BUILD_DIRECTORY: '/home/runner/work/ext-solr/ext-solr/.Build'
@@ -50,7 +50,7 @@ jobs:
         # This step resolves the branch name of the tag to use, to be able to collect proper build matrix values.
         name: "Resolve branch name on release/tag in branch of repository."
         if: startsWith(github.ref, 'refs/tags/')
-        # //[!0-9]/ removes possible "v" prefix from major part,
+        # //[!0-9]/ in script below removes possible "v" prefix from major part,
         #   to prevent errors or make it possible to create tags with "v" or other prefixes.
         run: |
           export RELEASE_VERSION=${GITHUB_REF/refs\/tags\//}
@@ -67,6 +67,8 @@ jobs:
           echo -e "matrix : "
           echo $matrix
           echo ::set-output name=matrix::$(echo $matrix)
+          >&2 echo -e "Example Annotation on error. Is visible in Actions wokflow view."
+          >&2 echo -e "Non-stable releases can not be published to TER. The tag 11.5.0-beta-1 is invalid for TER."
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
@@ -96,15 +98,15 @@ jobs:
   tests:
     runs-on: ubuntu-latest
     needs: ci_bootstrapping
-    continue-on-error: ${{ contains(matrix.TYPO3, '-dev') }}
+    continue-on-error: ${{ contains(matrix.TYPO3, '-dev') || matrix.PHP == '8.0' || matrix.PHP == '8.1' }}
     strategy:
       matrix: ${{fromJson(needs.ci_bootstrapping.outputs.matrix)}}
     env:
       TYPO3_DATABASE_NAME: 'typo3_ci'
       TYPO3_DATABASE_HOST: '127.0.0.1'
       TYPO3_DATABASE_USERNAME: 'root'
       TYPO3_DATABASE_PASSWORD: 'root'
-      PHP_CS_FIXER_VERSION: '^2.16.1'
+      PHP_CS_FIXER_VERSION: '^3.2.1'
       TYPO3_VERSION: ${{ matrix.TYPO3 }}
 
     name: TYPO3 ${{ matrix.TYPO3 }} on PHP ${{ matrix.PHP }}
@@ -115,17 +117,20 @@ jobs:
         if: github.event_name == 'pull_request'
         uses: actions/checkout@v2
         with:
+          fetch-depth: 2
           ref: ${{ github.event.pull_request.head.sha }}
       -
         name: Checkout current state of Branch
         if: github.event_name == 'push'
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 2
       # End: Workaround for issue with actions/checkout@v2 wrong PR commit checkout
       -
         name: Mount RAMFS
         run: |
           sudo mkdir -p ${{ env.CI_BUILD_DIRECTORY }}
-          sudo mount -t tmpfs -o size=2048m none ${{ env.CI_BUILD_DIRECTORY }}
+          sudo mount -t tmpfs -o size=2560m none ${{ env.CI_BUILD_DIRECTORY }}
           sudo mkdir -p ${{ env.CI_BUILD_DIRECTORY }}/data-{solr,mysql} \
             && sudo chown $USER ${{ env.CI_BUILD_DIRECTORY }}/data-mysql \
             && sudo chown 8983:8983 ${{ env.CI_BUILD_DIRECTORY }}/data-solr
@@ -157,13 +162,18 @@ jobs:
         with:
           php-version: ${{ matrix.PHP }}
           coverage: xdebug
-          tools: composer:v2
+          tools: composer:2.1.14
       -
         name: Resolve CI build cache key
+        # CI_CACHE_VERSION is used and can be increased to be able to invalidate caches.
+        #    For example if some composer dependencies added or removed in composer.json or
+        #    in Build/Test/bootstrap.sh
         run: |
           export CURRENT_TYPO3_VERSION_REFERNCE=$(./Build/Helpers/TYPO3_SOURCE_REFERENCE.sh "$TYPO3_VERSION" --short)
           export CURRENT_SOLARIUM_VERSION=$(cat composer.json | jq --raw-output '.require."solarium/solarium"')
-          export CI_BUILD_CACHE_KEY=${{ runner.os }}-2021.10.22_12:40_TYPO3:$TYPO3_VERSION@$CURRENT_TYPO3_VERSION_REFERNCE-SOLARIUM:$CURRENT_SOLARIUM_VERSION-PHP:${{ matrix.PHP }}
+          export CI_CACHE_VERSION="2022.01.24@14:45"
+          export CI_BUILD_CACHE_KEY=${{ runner.os }}-PHP:${{ matrix.PHP }}-TYPO3:$TYPO3_VERSION@$CURRENT_TYPO3_VERSION_REFERNCE-SOLARIUM:$CURRENT_SOLARIUM_VERSION-"CI_CACHE_VERSION:"$CI_CACHE_VERSION
+          echo "COMPOSER_GLOBAL_REQUEREMENTS=$(composer config home)" >> $GITHUB_ENV
           echo "CI_BUILD_CACHE_KEY=$CI_BUILD_CACHE_KEY" >> $GITHUB_ENV
           echo "The key for actions/cache@v2 is \"$CI_BUILD_CACHE_KEY\""
       -
@@ -175,6 +185,7 @@ jobs:
             ${{ env.CI_BUILD_DIRECTORY }}/Web
             ${{ env.CI_BUILD_DIRECTORY }}/bin
             ${{ env.CI_BUILD_DIRECTORY }}/vendor
+            ${{ env.COMPOSER_GLOBAL_REQUEREMENTS }}
             composer.json
             composer.lock
           key: ${{ env.CI_BUILD_CACHE_KEY }}
@@ -195,10 +206,8 @@ jobs:
       -
         name: Upload code coverage to Scrutinizer
         run: |
-          mkdir -p bin
-          wget https://scrutinizer-ci.com/ocular.phar -O $GITHUB_WORKSPACE/bin/ocular && chmod +x bin/ocular
-          php bin/ocular code-coverage:upload --format=php-clover coverage.unit.clover
-          php bin/ocular code-coverage:upload --format=php-clover coverage.integration.clover
+          .Build/bin/ocular code-coverage:upload --format=php-clover coverage.unit.clover
+          .Build/bin/ocular code-coverage:upload --format=php-clover coverage.integration.clover
       -
         name: Clean up
         run: |
@@ -224,8 +233,10 @@ jobs:
       -
         name: Check tag
         run: |
-          if ! [[ ${{ github.ref }} =~ ^refs/tags/[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}$ ]]; then
-            exit 1
+          TAGGED_VERSION=$(echo "${{ github.ref }}" | awk '{print tolower($0)}')
+          if ! [[ "${TAGGED_VERSION}" =~ ^refs/tags/[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}((-pre)?-(alpha|beta|rc)(-?[0-9]{1,3})?)?$ ]]; then
+            >&2 echo -e "Non-stable releases can not be published to TER. The tag ${TAGGED_VERSION} is invalid for TER."
+            exit 0
           fi
       -
         name: Resolve PHP version to use
@@ -253,4 +264,8 @@ jobs:
           fi
           echo "Following message will be printed in TER as release description:"
           echo -e "$TER_COMMENT"
+          if ! composer extension-build; then
+            >&2 echo -e "Something went wrong on bulding EXT:solr for NON-Composer mode. Please look in the job."
+            exit 13
+          fi
           php ~/.composer/vendor/bin/tailor ter:publish --comment "$TER_COMMENT" "$RELEASE_VERSION"
diff --git a/.gitignore b/.gitignore
@@ -1,19 +1,22 @@
+.Build
 .buildpath
+.DS_Store
+.idea/
+.php_cs.cache
 .project/
 .settings/
-.idea/
 atlassian-ide-plugin.xml
-.DS_Store
+composer.lock
+Documentation/_make
 index.php
 typo3
-typo3_src
 typo3conf
 typo3temp
+typo3_src
 uploads
+var
 vendor
 /composer.lock
 .Build
 Documentation/_make
 /Documentation-GENERATED-temp/
-
-.php_cs.cache
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+$config = \TYPO3\CodingStandards\CsFixerConfig::create();
+$config->getFinder()
+    ->exclude([
+        '.Build'
+    ])
+    ->in(__DIR__);
+return $config;
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -11,12 +11,10 @@ tools:
   php_cpd:
     enabled: true
 
+  # we do this on GitHub-Actions via typo3/coding-standards
   php_code_sniffer:
-    enabled: true
-    config:
-      standard: TYPO3CMS
-
-  # we do this on travis
+    enabled: false
+  # we do this on GitHub-Actions via typo3/coding-standards
   php_cs_fixer:
     enabled: false
 
@@ -39,33 +37,27 @@ tools:
     timeout: 2400
 
 checks:
-    php:
-        excluded_dependencies:
-            - typo3/cms-install
-        avoid_superglobals: false
+  php:
+    excluded_dependencies:
+      - typo3/cms-install
+    avoid_superglobals: false
 
 build_failure_conditions:
   - 'patches.label("Doc Comments").count > 10'
   - 'patches.label("Spacing").count > 15'
   - 'issues.label("coding-style").count > 10'
-  - 'issues.severity(>= MAJOR).count > 60'
+  - 'issues.severity(>= MAJOR).count > 260'
   - 'project.metric("scrutinizer.quality", < 8)'
   - 'project.metric_change("scrutinizer.test_coverage", < -0.10)'
 
 
 build:
   environment:
     php:
-      version: 7.2.8
+      # We want to test with the smallest supported TYPO3 PHP version
+      version: 7.4
   nodes:
     analysis:
-      dependencies:
-        after:
-          - composer require --dev squizlabs/php_codesniffer:3.1.1
       tests:
         override:
           - php-scrutinizer-run
-        override:
-          -
-            command: phpcs-run
-            use_website_config: false