Merge pull request #4007 from getkirby/develop

3.6.1

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,37 +4,43 @@ about: Create a report to help us improve
 
 ---
 
-**Describe the bug**  
-<!-- A clear and concise description of what the bug is. -->
+## Description
+<!-- Describe what the bug is in a clear and concise way. -->
 
-**To Reproduce**  
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
 
 **Expected behavior**  
 <!-- A clear and concise description of what you expected to happen. -->
 
 **Screenshots**  
 <!-- If applicable, add screenshots to help explain your problem. -->
 
+
+## To reproduce
+<!-- Please help us by otulining step by step how to reproduce the bug. -->
+
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+<!-- 
+For more complicated bugs, sample code makes it a lot easier for us to reproduce and fix a bug.
+
+Please clone our https://github.com/getkirby/starterkit or https://github.com/getkirby/plainkit as base to create a minimal verifable setup that repoduces the bug.
+-->
+
+
+## Your setup
 **Kirby Version**  
 <!-- Add the Kirby version you are using. You can find the version number in `kirby/composer.json` or in the settings view of the Panel. -->
 
 **Console output**  
 <!-- If you are working with the Panel, please check the browser console for errors and send the output. -->
 
-**Desktop (please complete the following information):**  
- - OS: <!-- e.g. macOS -->
- - Browser: <!-- e.g. Chrome, Safari -->
- - Version: <!-- e.g. 22 -->
-
-**Smartphone (please complete the following information):**  
+**Your system (please complete the following information)**
  - Device: <!-- e.g. iPhone 11 -->
- - OS: <!-- e.g. iOS 13.3 -->
- - Browser: <!-- e.g. stock browser, Safari -->
+ - OS: <!-- e.g. macOS, iOS 15.1 -->
+ - Browser: <!-- e.g. Chrome, Safari -->
  - Version: <!-- e.g. 22 -->
 
 **Additional context**  

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     timeout-minutes: 5
     strategy:
       matrix:
-        php: [ "7.4", "8.0" ]
+        php: [ "7.4", "8.0", "8.1" ]
     env:
       extensions: mbstring, ctype, curl, gd, apcu, memcached
       ini: apc.enabled=1, apc.enable_cli=1, pcov.directory=., "pcov.exclude=\"~(vendor|tests)~\""

.gitignore

@@ -11,7 +11,6 @@
 # editors
 *.sublime-project
 *.sublime-workspace
-/.vscode
 /.idea
 
 # tests

.vscode/extensions.json

@@ -0,0 +1,6 @@
+{
+  "recommendations": [
+    "dbaeumer.vscode-eslint",
+    "esbenp.prettier-vscode"
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.formatOnSave": true
+}

bootstrap.php

@@ -6,7 +6,7 @@
  */
 if (
     version_compare(PHP_VERSION, '7.4.0', '>=') === false ||
-    version_compare(PHP_VERSION, '8.1.0', '<')  === false
+    version_compare(PHP_VERSION, '8.2.0', '<')  === false
 ) {
     die(include __DIR__ . '/views/php.php');
 }

composer.json

@@ -8,7 +8,7 @@
     "core"
   ],
   "homepage": "https://getkirby.com",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "license": "proprietary",
   "authors": [
     {
@@ -21,20 +21,29 @@
     "php": ">=7.4.0 <8.1.0",
     "ext-ctype": "*",
     "ext-mbstring": "*",
-    "claviska/simpleimage": "3.6.3",
+    "claviska/simpleimage": "3.6.4",
     "filp/whoops": "2.14.4",
     "getkirby/composer-installer": "^1.2.1",
     "laminas/laminas-escaper": "2.9.0",
     "michelf/php-smartypants": "1.8.1",
     "mustangostang/spyc": "0.6.3",
     "phpmailer/phpmailer": "6.5.1",
     "psr/log": "1.1.4",
-    "true/punycode": "2.1.1"
+    "symfony/polyfill-intl-idn": "1.23.0",
+    "symfony/polyfill-mbstring": "1.23.1"
+  },
+  "replace": {
+    "symfony/polyfill-php72": "*"
   },
   "config": {
     "optimize-autoloader": true,
     "platform-check": false
   },
+  "extra": {
+    "unused": [
+      "symfony/polyfill-intl-idn"
+    ]
+  },
   "autoload": {
     "psr-4": {
       "Kirby\\": "src/"