Merge pull request #4608 from getkirby/fix/update-dependencies

Upgrade dependencies

.github/workflows/backend.yml

@@ -84,7 +84,7 @@ jobs:
           extensions: ${{ env.extensions }}
           ini-values: ${{ env.ini }}
           coverage: pcov
-          tools: phpunit:9.5.13, psalm:4.20.0
+          tools: phpunit:9.5.22, psalm:4.26.0
 
       - name: Setup problem matchers
         run: |
@@ -174,7 +174,7 @@ jobs:
           extensions: ${{ env.extensions }}
           coverage: none
           tools: |
-            composer:2.3.7, composer-normalize:2.28.0, composer-require-checker:4.0.0,
+            composer:2.3.8, composer-normalize:2.28.3, composer-require-checker:4.1.0,
             composer-unused:0.7.12, phpcpd:6.0.3, phpmd:2.12.0
 
       - name: Validate composer.json/composer.lock
@@ -220,7 +220,7 @@ jobs:
         with:
           php-version: ${{ env.php }}
           coverage: none
-          tools: php-cs-fixer:3.8.0
+          tools: php-cs-fixer:3.10.0
 
       - name: Cache analysis data
         id: finishPrepare

bootstrap.php

@@ -12,21 +12,18 @@
 }
 
 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;
 } elseif (is_file($autoloader = __DIR__ . '/vendor/autoload.php')) {
-
 	/**
 	 * 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

composer.json

@@ -36,12 +36,12 @@
 		"ext-libxml": "*",
 		"ext-mbstring": "*",
 		"ext-openssl": "*",
-		"claviska/simpleimage": "3.6.5",
+		"claviska/simpleimage": "3.7.0",
 		"filp/whoops": "2.14.5",
 		"getkirby/composer-installer": "^1.2.1",
 		"laminas/laminas-escaper": "2.10.0",
 		"michelf/php-smartypants": "1.8.1",
-		"phpmailer/phpmailer": "6.6.3",
+		"phpmailer/phpmailer": "6.6.4",
 		"symfony/polyfill-intl-idn": "1.26.0",
 		"symfony/polyfill-mbstring": "1.26.0"
 	},

config/components.php

@@ -101,7 +101,6 @@
 
 		// check if the thumb already exists
 		if (file_exists($thumbRoot) === false) {
-
 			// if not, create job file
 			$job = $mediaRoot . '/.jobs/' . $thumbName . '.json';
 

config/fields/structure.php

@@ -110,7 +110,6 @@
 
 			if (empty($this->columns)) {
 				foreach ($this->fields as $field) {
-
 					// Skip hidden and unsaveable fields
 					// They should never be included as column
 					if ($field['type'] === 'hidden' || $field['saveable'] === false) {

config/fields/tags.php

@@ -71,7 +71,6 @@
 
 			// transform into value-text objects
 			return array_map(function ($option) use ($options) {
-
 				// already a valid object
 				if (is_array($option) === true && isset($option['value'], $option['text']) === true) {
 					return $option;

config/presets/pages.php

@@ -3,7 +3,6 @@
 use Kirby\Toolkit\I18n;
 
 return function (array $props) {
-
 	// load the general templates setting for all sections
 	$templates = $props['templates'] ?? null;
 

config/routes.php

@@ -107,7 +107,6 @@
 	if ($kirby->multilang() === true) {
 		$after = LanguageRoutes::create($kirby);
 	} else {
-
 		// Single-language home
 		$after[] = [
 			'pattern' => '',

config/tags.php

@@ -214,7 +214,6 @@
 			'title'
 		],
 		'html' => function ($tag) {
-
 			// get and sanitize the username
 			$username = str_replace('@', '', $tag->value);