Merge pull request #8 from 21TORR/update-deps

Update deps
21TORR · Dec 21, 2023 · 54cb9cd · 54cb9cd
2 parents 2255b0a + 91aa970
commit 54cb9cd
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,19 +8,19 @@ jobs:
 
         strategy:
             matrix:
-                php: ['8.0', '8.1']
+                php: ['8.2', '8.3']
 
         steps:
             -   name: Checkout Code
-                uses: actions/checkout@v2
+                uses: actions/checkout@v4
 
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
                     coverage: "none"
                     ini-values: "memory_limit=-1"
                     php-version: "${{ matrix.php }}"
-                    tools: "composer, composer-normalize, cs2pr"
+                    tools: "composer"
 
             -   name: Display versions
                 run: |
@@ -31,17 +31,10 @@ jobs:
             -   name: Install Composer
                 run: composer install --optimize-autoloader --classmap-authoritative --no-interaction
 
-            -   name: Composer Normalize
-                run: composer-normalize --indent-style tab --indent-size 1 --dry-run --ansi
+            -   name: Lint
+                run: composer run-script lint
 
-            -   name: PHP CS Fixer
-                run: "./vendor/bin/php-cs-fixer fix --diff --config vendor-bin/test/vendor/21torr/php-cs/.php-cs-fixer.dist.php --dry-run --no-interaction --ansi --format=checkstyle | cs2pr"
+            -   name: Test Suite
+                run: composer run-script test
                 env:
                     PHP_CS_FIXER_IGNORE_ENV: 1
-
-            -   name: PHPStan
-                run: "./vendor/bin/phpstan analyze -c vendor-bin/test/vendor/21torr/php-cs/phpstan/lib.neon . --ansi --error-format=checkstyle | cs2pr"
-
-            -   name: PHPUnit
-                # --teamcity output used by `mheap/phpunit-matcher-action`
-                run: "./vendor/bin/simple-phpunit --teamcity"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+2.2.0
+=====
+
+* (feature) Allow Symfony 7+ and `21torr/rad` 3+.
+* (improvement) Require PHP 8.2+
+* (internal) Update CI.
+
+
 2.1.2
 =====
 

diff --git a/composer.json b/composer.json
@@ -11,15 +11,15 @@
 	],
 	"homepage": "https://github.com/21TORR/bundle-helpers",
 	"require": {
-		"php": "^8.0",
-		"symfony/config": "^5.1 || ^6.0",
-		"symfony/dependency-injection": "^5.1 || ^6.0",
-		"symfony/http-kernel": "^5.1 || ^6.0"
+		"php": ">= 8.2",
+		"symfony/config": "^6.4 || ^7.0",
+		"symfony/dependency-injection": "^6.4 || ^7.0",
+		"symfony/http-kernel": "^6.4 || ^7.0"
 	},
 	"require-dev": {
-		"bamarni/composer-bin-plugin": "^1.4",
+		"bamarni/composer-bin-plugin": "^1.8.2",
 		"roave/security-advisories": "dev-latest",
-		"symfony/phpunit-bridge": "^5.1 || ^6.0"
+		"symfony/phpunit-bridge": "^7.0"
 	},
 	"autoload": {
 		"psr-4": {
@@ -38,16 +38,25 @@
 		"sort-packages": true
 	},
 	"extra": {
+		"bamarni-bin": {
+			"bin-links": false,
+			"forward-command": true
+		},
 		"branch-alias": {
-			"dev-next": "2.x-dev"
+			"dev-next": "3.x-dev"
 		}
 	},
 	"scripts": {
-		"post-install-cmd": [
-			"@composer bin all install --ansi"
+		"fix-lint": [
+			"@composer bin c-norm normalize \"$(pwd)/composer.json\" --indent-style tab --indent-size 1 --ansi",
+			"vendor-bin/cs-fixer/vendor/bin/php-cs-fixer fix --diff --config vendor-bin/cs-fixer/vendor/21torr/php-cs-fixer/.php-cs-fixer.dist.php --no-interaction --ansi"
+		],
+		"lint": [
+			"@composer bin c-norm normalize \"$(pwd)/composer.json\" --indent-style tab --indent-size 1 --dry-run --ansi",
+			"vendor-bin/cs-fixer/vendor/bin/php-cs-fixer fix --diff --config vendor-bin/cs-fixer/vendor/21torr/php-cs-fixer/.php-cs-fixer.dist.php --dry-run --no-interaction --ansi --using-cache no"
 		],
-		"post-update-cmd": [
-			"@composer bin all update --ansi"
+		"test": [
+			"vendor-bin/test/vendor/bin/phpstan analyze -c phpstan.neon . --ansi"
 		]
 	}
 }
diff --git a/phpstan.neon b/phpstan.neon
@@ -0,0 +1,5 @@
+includes:
+    - vendor-bin/test/vendor/21torr/php-cs/phpstan/lib.neon
+
+parameters:
+    level: 9
diff --git a/vendor-bin/c-norm/composer.json b/vendor-bin/c-norm/composer.json
@@ -0,0 +1,10 @@
+{
+    "require": {
+        "ergebnis/composer-normalize": "^2.41"
+    },
+    "config": {
+        "allow-plugins": {
+            "ergebnis/composer-normalize": true
+        }
+    }
+}
diff --git a/vendor-bin/cs-fixer/composer.json b/vendor-bin/cs-fixer/composer.json
@@ -1,5 +1,5 @@
 {
     "require": {
-        "friendsofphp/php-cs-fixer": "^3.6"
+        "21torr/php-cs-fixer": "^1.0.2"
     }
 }