Merge branch 'release/0.7.23'

.gitattributes

@@ -12,7 +12,7 @@
 /packaging_exclude.php    export-ignore
 /phpstan.neon             export-ignore
 /phpstan-baseline.neon    export-ignore
-/phpunit.ci.xml           export-ignore
 /phpunit.xml              export-ignore
 /rector.php               export-ignore
+/renovate.json            export-ignore
 /typoscript-lint.yml      export-ignore

.github/release.yml

@@ -9,9 +9,6 @@ changelog:
       - question
       - wontfix
   categories:
-    - title: 📖 Documentation
-      labels:
-        - documentation
     - title: ⚡ Breaking
       labels:
         - breaking
@@ -21,12 +18,15 @@ changelog:
     - title: 🚑 Fixed
       labels:
         - bug
-    - title: ⚙️ Dependencies
-      labels:
-        - dependencies
     - title: 👷 Changed
       labels:
         - maintenance
+    - title: 📖 Documentation
+      labels:
+        - documentation
+    - title: ⚙️ Dependencies
+      labels:
+        - dependencies
     - title: Other changes
       labels:
         - "*"

.github/workflows/cgl.yaml

@@ -12,7 +12,7 @@ jobs:
   cgl:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -21,8 +21,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: 8.1
-          # @todo switch back to composer-unused 0.8 once https://github.com/composer-unused/composer-unused/issues/444 is resolved
-          tools: composer:v2, composer-require-checker, composer-unused:0.7
+          tools: composer:v2, composer-require-checker, composer-unused
           coverage: none
 
       # Validation

.github/workflows/release.yaml

@@ -12,7 +12,7 @@ jobs:
     outputs:
       release-notes-url: ${{ steps.create-release.outputs.html_url }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -41,7 +41,7 @@ jobs:
       TYPO3_API_TOKEN: ${{ secrets.TYPO3_API_TOKEN }}
       TYPO3_EXCLUDE_FROM_PACKAGING: packaging_exclude.php
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

.github/workflows/tests.yaml

@@ -26,7 +26,7 @@ jobs:
           - typo3-version: "10.4"
             php-version: "8.2"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -53,7 +53,7 @@ jobs:
     name: Test coverage
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -71,14 +71,14 @@ jobs:
 
       # Run tests
       - name: Run tests
-        run: composer test:ci
+        run: composer test:coverage
 
       # Report coverage
       - name: Fix coverage path
         working-directory: .Build/log/coverage
         run: sed -i 's#/home/runner/work/handlebars/handlebars#${{ github.workspace }}#g' clover.xml
       - name: CodeClimate report
-        uses: paambaati/codeclimate-action@v3.2.0
+        uses: paambaati/codeclimate-action@v5.0.0
         env:
           CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
         with:

CONTRIBUTING.md

@@ -69,7 +69,7 @@ composer sca
 composer test
 
 # Run tests with code coverage
-composer test:ci
+composer test:coverage
 ```
 
 The code coverage reports will be stored in `.Build/log/coverage`.

Classes/Renderer/Template/TemplatePaths.php

@@ -88,6 +88,10 @@ protected function resolveTemplatePaths(): void
      */
     protected function getTemplatePathsFromContainer(string $type): array
     {
+        if ($this->container === null) {
+            return [];
+        }
+
         $parameterName = 'handlebars.' . $type;
         $templatePathsParameter = $this->container->getParameter($parameterName);
 

Documentation/Compatibility/ExtbaseControllers.rst

@@ -33,6 +33,7 @@ about the target extbase controller and actions supported by it.
         tags:
           - name: handlebars.processor
           - name: handlebars.compatibility_layer
+            type: 'extbase_controller'
             controller: 'Vendor\Extension\Controller\MyController'
             actions: 'dummy'
 

Documentation/Contributing/Index.rst

@@ -100,7 +100,7 @@ Run tests
     composer test
 
     # Run tests with code coverage
-    composer test:ci
+    composer test:coverage
 
 The code coverage reports will be stored in :file:`.Build/log/coverage`.
 

Documentation/Settings.cfg

@@ -1,6 +1,6 @@
 [general]
 project = Handlebars
-release = 0.7.22
+release = 0.7.23
 copyright = since 2020 by coding. powerful. systems. CPS GmbH
 author = Elias Häußler
 

composer.json

@@ -34,7 +34,7 @@
 		"ergebnis/composer-normalize": "^2.15",
 		"helmich/typo3-typoscript-lint": "^2.5 || ^3.0",
 		"jangregor/phpstan-prophecy": "^1.0",
-		"mikey179/vfsstream": "^1.6",
+		"mikey179/vfsstream": "^1.6.7",
 		"phpspec/prophecy-phpunit": "^2.0",
 		"phpstan/phpstan": "^1.9",
 		"phpstan/phpstan-phpunit": "^1.1",
@@ -43,7 +43,7 @@
 		"ssch/typo3-rector": "^1.0",
 		"symfony/event-dispatcher": "^4.4 || ^5.0",
 		"typo3/coding-standards": "^0.6.0 || ^0.7.0",
-		"typo3/testing-framework": "^6.15"
+		"typo3/testing-framework": "^6.15 || ^7.0.2"
 	},
 	"autoload": {
 		"psr-4": {
@@ -106,7 +106,7 @@
 			"@sca:php"
 		],
 		"sca:php": "phpstan analyse -c phpstan.neon",
-		"test": "phpunit -c phpunit.xml",
-		"test:ci": "phpunit -c phpunit.ci.xml"
+		"test": "@test:coverage --no-coverage",
+		"test:coverage": "phpunit -c phpunit.xml"
 	}
 }