Merge pull request #7313 from getkirby/release/5.0.0

5.0.0

Author: bastianallgeier

.editorconfig

@@ -21,6 +21,10 @@ insert_final_newline = true
 indent_size = 2
 insert_final_newline = false
 
+[views/**/*.php]
+indent_size = 2
+insert_final_newline = false
+
 [*.yml]
 indent_style = space
 

.gitattributes

@@ -8,7 +8,8 @@
 .php-cs-fixer.dist.php export-ignore
 phpbench.json export-ignore
 phpmd.xml.dist export-ignore
-phpunit.xml.dist export-ignore
+phpunit.ci.xml export-ignore
+phpunit.dist.xml export-ignore
 psalm.xml.dist export-ignore
 bench/ export-ignore
 tests/ export-ignore

.github/workflows/backend.yml

@@ -57,43 +57,48 @@ jobs:
     timeout-minutes: 5
     strategy:
       matrix:
-        php: ["8.1", "8.2", "8.3", "8.4"]
+        php: ["8.2", "8.3", "8.4"]
     env:
-      extensions: mbstring, ctype, curl, gd, apcu, memcached
+      extensions: mbstring, ctype, curl, gd, apcu, memcached, redis
       ini: apc.enabled=1, apc.enable_cli=1, pcov.directory=., "pcov.exclude=\"~(vendor|tests)~\""
 
     steps:
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pin@v4
         with:
           fetch-depth: 2
 
       - name: Preparations
         run: mkdir sarif
 
       - name: Install memcached
-        uses: niden/actions-memcached@3b3ecd9d0d035ea92db716dc1540a7dbe9e56349 # v7
+        uses: niden/actions-memcached@3b3ecd9d0d035ea92db716dc1540a7dbe9e56349 # pin@v7
+
+      - name: Install redis
+        uses: supercharge/redis-github-action@ea9b21c6ecece47bd99595c532e481390ea0f044 # pin@v1
+        with:
+          redis-version: 7
 
       - name: Install system locales
         run: sudo apt-get update && sudo apt-get install -y locales-all
 
       - name: Setup PHP cache environment
         id: ext-cache
-        uses: shivammathur/cache-extensions@d814e887327271b6e290b018d51bba9f62590488 # v1
+        uses: shivammathur/cache-extensions@d814e887327271b6e290b018d51bba9f62590488 # pin@v1
         with:
           php-version: ${{ matrix.php }}
           extensions: ${{ env.extensions }}
           key: php-v1
 
       - name: Cache PHP extensions
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # pin@v4
         with:
           path: ${{ steps.ext-cache.outputs.dir }}
           key: ${{ steps.ext-cache.outputs.key }}
           restore-keys: ${{ steps.ext-cache.outputs.key }}
 
       - name: Setup PHP environment
-        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # pin@v2
         with:
           php-version: ${{ matrix.php }}
           extensions: ${{ env.extensions }}
@@ -108,7 +113,7 @@ jobs:
 
       - name: Cache analysis data
         id: finishPrepare
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # pin@v4
         with:
           path: ~/.cache/psalm
           key: backend-analysis-${{ matrix.php }}
@@ -119,7 +124,7 @@ jobs:
 
       - name: Run tests
         if: always() && steps.finishPrepare.outcome == 'success'
-        run: phpunit --fail-on-skipped --coverage-clover ${{ github.workspace }}/clover.xml
+        run: phpunit -c phpunit.ci.xml --coverage-clover ${{ github.workspace }}/clover.xml
 
       - name: Statically analyze using Psalm
         if: always() && steps.finishPrepare.outcome == 'success' && matrix.php != '8.4'
@@ -130,7 +135,7 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
           PHP: ${{ matrix.php }}
         if: env.token != ''
-        uses: codecov/codecov-action@ab904c41d6ece82784817410c45d8b8c02684457 # v3
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # pin@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }} # for better reliability if the GitHub API is down
           fail_ci_if_error: true
@@ -140,7 +145,7 @@ jobs:
 
       - name: Upload code scanning results to GitHub
         if: always() && steps.finishPrepare.outcome == 'success' && github.repository == 'getkirby/kirby' && matrix.php != '8.4'
-        uses: github/codeql-action/upload-sarif@b8d3b6e8af63cde30bdc382c0bc28114f4346c88 # v2
+        uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # pin@v3
         with:
           sarif_file: sarif
 
@@ -167,34 +172,34 @@ jobs:
     runs-on: ubuntu-22.04
     timeout-minutes: 5
     env:
-      php: "8.1"
-      extensions: mbstring, ctype, curl, gd, apcu, memcached
+      php: "8.2"
+      extensions: mbstring, ctype, curl, gd, apcu, memcached, redis
 
     steps:
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pin@v4
 
       - name: Preparations
         run: mkdir sarif
 
       - name: Setup PHP cache environment
         id: ext-cache
-        uses: shivammathur/cache-extensions@d814e887327271b6e290b018d51bba9f62590488 # v1
+        uses: shivammathur/cache-extensions@d814e887327271b6e290b018d51bba9f62590488 # pin@v1
         with:
           php-version: ${{ env.php }}
           extensions: ${{ env.extensions }}
           key: php-analysis-v1
 
       - name: Cache PHP extensions
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # pin@v4
         with:
           path: ${{ steps.ext-cache.outputs.dir }}
           key: ${{ steps.ext-cache.outputs.key }}
           restore-keys: ${{ steps.ext-cache.outputs.key }}
 
       - name: Setup PHP environment
         id: finishPrepare
-        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # pin@v2
         with:
           php-version: ${{ env.php }}
           extensions: ${{ env.extensions }}
@@ -221,7 +226,7 @@ jobs:
 
       - name: Upload code scanning results to GitHub
         if: always() && steps.finishPrepare.outcome == 'success' && github.repository == 'getkirby/kirby'
-        uses: github/codeql-action/upload-sarif@b8d3b6e8af63cde30bdc382c0bc28114f4346c88 # v2
+        uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # pin@v3
         with:
           sarif_file: sarif
 
@@ -248,22 +253,22 @@ jobs:
     runs-on: ubuntu-22.04
     timeout-minutes: 5
     env:
-      php: "8.1"
+      php: "8.2"
 
     steps:
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pin@v4
 
       - name: Setup PHP environment
-        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # pin@v2
         with:
           php-version: ${{ env.php }}
           coverage: none
-          tools: php-cs-fixer:3.52.1
+          tools: php-cs-fixer:3.65.0
 
       - name: Cache analysis data
         id: finishPrepare
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # pin@v4
         with:
           path: ~/.php-cs-fixer
           key: coding-style

.github/workflows/frontend.yml

@@ -89,7 +89,7 @@ jobs:
     runs-on: ubuntu-22.04
     timeout-minutes: 5
     env:
-      php: "8.1"
+      php: "8.2"
 
     steps:
       - name: Checkout

.gitignore

@@ -17,6 +17,7 @@
 # tests
 .phpbench
 .phpunit.cache
+phpunit.xml
 /tests/coverage
 /tests/tmp
 

.php-cs-fixer.dist.php

@@ -9,11 +9,11 @@
 return $config
 	->setRules([
 		'@PSR12' => true,
-		'align_multiline_comment' => ['comment_type' => 'phpdocs_like'],
+		'align_multiline_comment' => ['comment_type' => 'all_multiline'],
 		'array_indentation' => true,
 		'array_syntax' => ['syntax' => 'short'],
+		'assign_null_coalescing_to_coalesce_equal' => true,
 		'cast_spaces' => ['space' => 'none'],
-		// 'class_keyword_remove' => true, // replaces static::class with 'static' (won't work)
 		'combine_consecutive_issets' => true,
 		'combine_consecutive_unsets' => true,
 		'combine_nested_dirname' => true,
@@ -23,8 +23,6 @@
 		'function_typehint_space' => true,
 		'include' => true,
 		'logical_operators' => true,
-		'lowercase_cast' => true,
-		'lowercase_static_reference' => true,
 		'magic_constant_casing' => true,
 		'magic_method_casing' => true,
 		'method_chaining_indentation' => true,
@@ -33,29 +31,40 @@
 		'native_function_casing' => true,
 		'native_function_type_declaration_casing' => true,
 		'new_with_braces' => true,
-		'no_blank_lines_after_class_opening' => true,
 		'no_blank_lines_after_phpdoc' => true,
 		'no_empty_comment' => true,
 		'no_empty_phpdoc' => true,
 		'no_empty_statement' => true,
 		'no_leading_namespace_whitespace' => true,
 		'no_mixed_echo_print' => ['use' => 'echo'],
+		'no_short_bool_cast' => true,
+		'no_superfluous_elseif' => true,
+		'no_superfluous_phpdoc_tags' => ['allow_unused_params' => true],
+		'no_unneeded_braces' => true,
 		'no_unneeded_control_parentheses' => true,
+		'no_unneeded_import_alias' => true,
 		'no_unused_imports' => true,
+		'no_useless_else' => true,
+		'no_useless_nullsafe_operator' => true,
 		'no_useless_return' => true,
+		'no_whitespace_before_comma_in_array' => true,
 		'nullable_type_declaration' => ['syntax' => 'union'],
 		'nullable_type_declaration_for_default_null_value' => true,
+		'object_operator_without_whitespace' => true,
+		'operator_linebreak' => ['position' => 'end', 'only_booleans' => true],
 		'ordered_imports' => ['sort_algorithm' => 'alpha'],
 		'ordered_types' => ['sort_algorithm' => 'none', 'null_adjustment' => 'always_last'],
-		// 'phpdoc_add_missing_param_annotation' => ['only_untyped' => false], // adds params in the wrong order
 		'phpdoc_align' => ['align' => 'left'],
 		'phpdoc_indent' => true,
+		'phpdoc_param_order' => true,
 		'phpdoc_scalar' => true,
 		'phpdoc_trim' => true,
-		'short_scalar_cast' => true,
+		'php_unit_fqcn_annotation' => true,
 		'single_line_comment_style' => true,
 		'single_quote' => true,
+		'statement_indentation' => ['stick_comment_to_next_continuous_control_statement' => true],
 		'ternary_to_null_coalescing' => true,
+		'trim_array_spaces' => true,
 		'whitespace_after_comma_in_array' => true
 	])
 	->setRiskyAllowed(true)

bootstrap.php

@@ -5,7 +5,7 @@
  * stop at older or too recent versions
  */
 if (
-	version_compare(PHP_VERSION, '8.1.0', '>=') === false ||
+	version_compare(PHP_VERSION, '8.2.0', '>=') === false ||
 	version_compare(PHP_VERSION, '8.5.0', '<')  === false
 ) {
 	die(include __DIR__ . '/views/php.php');
@@ -27,10 +27,9 @@
 	 * @psalm-suppress MissingFile
 	 */
 	include $autoloader;
-} else {
-	/**
-	 * If neither one exists, don't bother searching;
-	 * it's a custom directory setup and the users need to
-	 * load the autoloader themselves
-	 */
 }
+/**
+ * If neither one exists, don't bother searching;
+ * it's a custom directory setup and the users need to
+ * load the autoloader themselves
+ */

composer.json

@@ -3,7 +3,7 @@
 	"description": "The Kirby core",
 	"license": "proprietary",
 	"type": "kirby-cms",
-	"version": "4.8.0",
+	"version": "5.0.0",
 	"keywords": [
 		"kirby",
 		"cms",
@@ -24,7 +24,7 @@
 		"source": "https://github.com/getkirby/kirby"
 	},
 	"require": {
-		"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
+		"php": "~8.2.0 || ~8.3.0 || ~8.4.0",
 		"ext-SimpleXML": "*",
 		"ext-ctype": "*",
 		"ext-curl": "*",
@@ -39,14 +39,14 @@
 		"christian-riesen/base32": "1.6.0",
 		"claviska/simpleimage": "4.2.1",
 		"composer/semver": "3.4.3",
-		"filp/whoops": "2.18.0",
+		"filp/whoops": "2.18.3",
 		"getkirby/composer-installer": "^1.2.1",
 		"laminas/laminas-escaper": "2.17.0",
 		"michelf/php-smartypants": "1.8.1",
 		"phpmailer/phpmailer": "6.10.0",
 		"symfony/polyfill-intl-idn": "1.32.0",
 		"symfony/polyfill-mbstring": "1.32.0",
-		"symfony/yaml": "6.4.21"
+		"symfony/yaml": "7.3.0"
 	},
 	"replace": {
 		"symfony/polyfill-php72": "*"
@@ -58,6 +58,7 @@
 		"ext-fileinfo": "Improved mime type detection for files",
 		"ext-intl": "Improved i18n number formatting",
 		"ext-memcached": "Support for the Memcached cache driver",
+		"ext-redis": "Support for the Redis cache driver",
 		"ext-sodium": "Support for the crypto class and more robust session handling",
 		"ext-zip": "Support for ZIP archive file functions",
 		"ext-zlib": "Sanitization and validation for svgz files"
@@ -80,7 +81,7 @@
 		},
 		"optimize-autoloader": true,
 		"platform": {
-			"php": "8.1.0"
+			"php": "8.2.0"
 		},
 		"platform-check": false
 	},