Merge pull request #4492 from getkirby/release/3.7.1

3.7.1

.codecov.yml

@@ -7,25 +7,25 @@ coverage:
     # rules for overall project-wide coverage
     project:
       backend:
-        flags: 
+        flags:
           - backend
         target: auto
         threshold: 1%
       frontend:
-        flags: 
+        flags:
           - frontend
         target: auto
         informational: true # don't fail because of frontend tests for now
 
     # rules based on the specific changes of the PR
     patch:
       backend:
-        flags: 
+        flags:
           - backend
         target: 100%
         threshold: 2%
       frontend:
-        flags: 
+        flags:
           - frontend
         target: auto
         informational: true # don't fail because of frontend tests for now

.editorconfig

@@ -6,10 +6,19 @@
 
 root = true
 
-[*.php]
+[*]
 charset = utf-8
 end_of_line = lf
-insert_final_newline = true
+indent_style = tab
+indent_size = 2
 trim_trailing_whitespace = true
+
+[*.php]
+indent_size = 4
+insert_final_newline = true
+
+[*.yml]
 indent_style = space
-indent_size = 4
+
+[*.md]
+trim_trailing_whitespace = false

.github/ISSUE_TEMPLATE/bug_report.md

@@ -16,7 +16,7 @@ about: Create a report to help us improve
 
 
 ## To reproduce
-<!-- Please help us by otulining step by step how to reproduce the bug. -->
+<!-- Please help us by outlining step by step how to reproduce the bug. -->
 
 1. Go to '...'
 2. Click on '....'

.github/dependabot.yml

@@ -0,0 +1,23 @@
+version: 2
+updates:
+  - package-ecosystem: "composer"
+    directory: "/"
+    target-branch: "develop"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "composer"
+    labels:
+      - "type: refactoring ♻️"
+    open-pull-requests-limit: 10
+
+  - package-ecosystem: "npm"
+    directory: "/panel"
+    target-branch: "develop"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "npm"
+    labels:
+      - "type: refactoring ♻️"
+    open-pull-requests-limit: 10

.php-cs-fixer.dist.php

@@ -1,59 +1,60 @@
 <?php
 
 $finder = PhpCsFixer\Finder::create()
-    ->exclude('dependencies')
-    ->exclude('panel/node_modules')
-    ->in(__DIR__);
+	->exclude('dependencies')
+	->exclude('panel/node_modules')
+	->in(__DIR__);
 
 $config = new PhpCsFixer\Config();
 return $config
-    ->setRules([
-        '@PSR12' => true,
-        'align_multiline_comment' => ['comment_type' => 'phpdocs_like'],
-        'array_indentation' => true,
-        'array_syntax' => ['syntax' => 'short'],
-        '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,
-        'concat_space' => ['spacing' => 'one'],
-        'declare_equal_normalize' => ['space' => 'single'],
-        'dir_constant' => true,
-        '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,
-        'modernize_types_casting' => true,
-        'multiline_comment_opening_closing' => true,
-        '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_unneeded_control_parentheses' => true,
-        'no_unused_imports' => true,
-        'no_useless_return' => true,
-        'ordered_imports' => ['sort_algorithm' => 'alpha'],
-        // 'phpdoc_add_missing_param_annotation' => ['only_untyped' => false], // adds params in the wrong order
-        'phpdoc_align' => ['align' => 'left'],
-        'phpdoc_indent' => true,
-        'phpdoc_scalar' => true,
-        'phpdoc_trim' => true,
-        'short_scalar_cast' => true,
-        'single_line_comment_style' => true,
-        'single_quote' => true,
-        'ternary_to_null_coalescing' => true,
-        'whitespace_after_comma_in_array' => true
-    ])
-    ->setRiskyAllowed(true)
-    ->setFinder($finder);
+	->setRules([
+		'@PSR12' => true,
+		'align_multiline_comment' => ['comment_type' => 'phpdocs_like'],
+		'array_indentation' => true,
+		'array_syntax' => ['syntax' => 'short'],
+		'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,
+		'concat_space' => ['spacing' => 'one'],
+		'declare_equal_normalize' => ['space' => 'single'],
+		'dir_constant' => true,
+		'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,
+		'modernize_types_casting' => true,
+		'multiline_comment_opening_closing' => true,
+		'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_unneeded_control_parentheses' => true,
+		'no_unused_imports' => true,
+		'no_useless_return' => true,
+		'ordered_imports' => ['sort_algorithm' => 'alpha'],
+		// 'phpdoc_add_missing_param_annotation' => ['only_untyped' => false], // adds params in the wrong order
+		'phpdoc_align' => ['align' => 'left'],
+		'phpdoc_indent' => true,
+		'phpdoc_scalar' => true,
+		'phpdoc_trim' => true,
+		'short_scalar_cast' => true,
+		'single_line_comment_style' => true,
+		'single_quote' => true,
+		'ternary_to_null_coalescing' => true,
+		'whitespace_after_comma_in_array' => true
+	])
+	->setRiskyAllowed(true)
+	->setIndent("\t")
+	->setFinder($finder);

bootstrap.php

@@ -5,31 +5,31 @@
  * stop at older or too recent versions
  */
 if (
-    version_compare(PHP_VERSION, '7.4.0', '>=') === false ||
-    version_compare(PHP_VERSION, '8.2.0', '<')  === false
+	version_compare(PHP_VERSION, '7.4.0', '>=') === false ||
+	version_compare(PHP_VERSION, '8.2.0', '<')  === false
 ) {
-    die(include __DIR__ . '/views/php.php');
+	die(include __DIR__ . '/views/php.php');
 }
 
 if (is_file($autoloader = dirname(__DIR__) . '/vendor/autoload.php')) {
 
-    /**
-     * Always prefer a site-wide Composer autoloader
-     * if it exists, it means that the user has probably
-     * installed additional packages
-     */
-    include $autoloader;
+	/**
+	 * Always prefer a site-wide Composer autoloader
+	 * if it exists, it means that the user has probably
+	 * installed additional packages
+	 */
+	include $autoloader;
 } elseif (is_file($autoloader = __DIR__ . '/vendor/autoload.php')) {
 
-    /**
-     * Fall back to the local autoloader if that exists
-     */
-    include $autoloader;
+	/**
+	 * Fall back to the local autoloader if that exists
+	 */
+	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
+	 */
 }