From dfb4ca90abd3a6a552ca59aeabcbc26429271a85 Mon Sep 17 00:00:00 2001
From: smiley <codemasher@users.noreply.github.com>
Date: Fri, 19 Apr 2024 10:01:03 +0200
Subject: [PATCH] :octocat: CI & dependency updates

---
 .gitattributes               | 1 +
 .github/workflows/ci.yml     | 5 ++---
 .idea/codeStyles/Project.xml | 6 ++++++
 composer.json                | 6 +++---
 phpunit.xml.dist             | 2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 8add556f5..e2090ce38 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,6 @@
 /.build            export-ignore
 /.github           export-ignore
+/.idea             export-ignore
 /.phan             export-ignore
 /.phpdoc           export-ignore
 /docs              export-ignore
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 75eb08712..67ba4e0bd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ on:
 name: "Continuous Integration"
 
 env:
-  PHP_EXTENSIONS: ast, fileinfo, gd, imagick, json, mbstring
+  PHP_EXTENSIONS: fileinfo, gd, imagick, json, mbstring
   PHP_INI_VALUES: memory_limit=-1, error_reporting=-1, display_errors=On
 
 jobs:
@@ -40,10 +40,9 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-version }}
-          extensions: ${{ env.PHP_EXTENSIONS }}
+          extensions: ast, ${{ env.PHP_EXTENSIONS }}
           ini-values: ${{ env.PHP_INI_VALUES }}
           coverage: none
-          tools: pecl
 
       - name: "Install dependencies with composer"
         uses: ramsey/composer-install@v3
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index e618763df..0a882fcb2 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -295,8 +295,14 @@
       <option name="ALIGN_PHPDOC_PARAM_NAMES" value="true" />
       <option name="ALIGN_PHPDOC_COMMENTS" value="true" />
       <option name="ALIGN_ASSIGNMENTS" value="true" />
+      <option name="ALIGN_NAMED_ARGUMENTS" value="true" />
+      <option name="ALIGN_MATCH_ARM_BODIES" value="true" />
       <option name="CONCAT_SPACES" value="false" />
       <option name="COMMA_AFTER_LAST_ARRAY_ELEMENT" value="true" />
+      <option name="COMMA_AFTER_LAST_PARAMETER" value="true" />
+      <option name="COMMA_AFTER_LAST_CLOSURE_USE_VAR" value="true" />
+      <option name="COMMA_AFTER_LAST_ARGUMENT" value="true" />
+      <option name="COMMA_AFTER_LAST_MATCH_ARM" value="true" />
       <option name="PHPDOC_BLANK_LINE_BEFORE_TAGS" value="true" />
       <option name="PHPDOC_BLANK_LINES_AROUND_PARAMETERS" value="true" />
       <option name="PHPDOC_WRAP_LONG_LINES" value="true" />
diff --git a/composer.json b/composer.json
index 6320270a3..b7c56499a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "chillerlan/php-qrcode",
-	"description": "A QR code generator and reader with a user friendly API. PHP 8.2+",
+	"description": "A QR Code generator and reader with a user-friendly API. PHP 8.2+",
 	"homepage": "https://github.com/chillerlan/php-qrcode",
 	"license": [
 		"MIT", "Apache-2.0"
@@ -42,12 +42,12 @@
 	"require": {
 		"php": "^8.2",
 		"ext-mbstring": "*",
-		"chillerlan/php-settings-container": "^3.1"
+		"chillerlan/php-settings-container": "^3.2"
 	},
 	"require-dev": {
 		"chillerlan/php-authenticator": "^5.1",
 		"phan/phan": "^5.4",
-		"phpunit/phpunit": "^10.5",
+		"phpunit/phpunit": "^11.0",
 		"phpmd/phpmd": "^2.15",
 		"setasign/fpdf": "^1.8.2",
 		"squizlabs/php_codesniffer": "^3.9"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index a2d91d5a1..d7187f13d 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          cacheDirectory=".build/phpunit-cache"
          colors="true"