Merge pull request #10 from dfridrich/symfony-7

Add Symfony 7 and PHP 8.2 support
mhujer · Dec 9, 2023 · 77b279c · 77b279c
2 parents 60312c1 + 7ea5b7d
commit 77b279c
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 43 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ jobs:
             fail-fast: false
             matrix:
                 operating-system: [ ubuntu-latest ]
-                php-versions: [ '8.1' ]
+                php-versions: [ '8.1', '8.2', '8.3' ]
                 composer-dependencies: [ '', '--prefer-lowest' ]
                 symfony-version: [ '' ]
                 extra-label: [ '' ]
@@ -23,6 +23,16 @@ jobs:
                         operating-system: windows-latest
                         coverage: xdebug
 
+                    -   php-versions: '8.2'
+                        operating-system: ubuntu-latest
+                        symfony-version: '7.0.*'
+                        extra-label: 'SF 7.0'
+
+                    -   php-versions: '8.3'
+                        operating-system: ubuntu-latest
+                        symfony-version: '7.0.*'
+                        extra-label: 'SF 7.0'
+
         steps:
             # see https://github.com/actions/checkout/issues/226#issue-606867805
             -   name: Prepare git

diff --git a/README.md b/README.md
@@ -159,6 +159,9 @@ Bugs and feature request are tracked on [GitHub](https://github.com/mhujer/consi
 
 # Changelog
 
+## 2.0.1 (2023-12-09)
+- add Symfony 7 and PHP 8.2 support (dfridrich)
+
 ## 2.0.0 (2022-09-20)
 - require PHP 8.1
 - add support for native enums to make migration easier

diff --git a/composer.json b/composer.json
@@ -20,21 +20,21 @@
 	"require": {
 		"php": "~8.1",
 		"consistence-community/consistence": "~2.1",
-		"symfony/config": "^5.4||^6.0",
-		"symfony/dependency-injection": "^5.4||^6.0",
-		"symfony/form": "^5.4||^6.0",
-		"symfony/http-kernel": "^5.4||^6.0",
-		"symfony/translation": "^5.4||^6.0",
-		"symfony/yaml": "^5.4||^6.0",
+		"symfony/config": "^5.4||^6.0||^7.0",
+		"symfony/dependency-injection": "^5.4||^6.0||^7.0",
+		"symfony/form": "^5.4||^6.0||^7.0",
+		"symfony/http-kernel": "^5.4||^6.0||^7.0",
+		"symfony/translation": "^5.4||^6.0||^7.0",
+		"symfony/yaml": "^5.4||^6.0||^7.0",
 		"twig/twig": "^1.41.0 || ^2.12.1 || ^3.0"
 	},
 	"require-dev": {
 		"consistence-community/coding-standard": "3.11.2",
-		"matthiasnoback/symfony-dependency-injection-test": "4.3.0",
+		"matthiasnoback/symfony-dependency-injection-test": "^5.0",
 		"phpstan/extension-installer": "1.1.0",
 		"phpstan/phpstan-phpunit": "1.1.1",
 		"phpstan/phpstan": "1.8.5",
-		"phpunit/phpunit": "9.5.24"
+		"phpunit/phpunit": "^10.5"
 	},
 	"autoload": {
 		"psr-4": {

diff --git a/phpstan.neon b/phpstan.neon
@@ -1,3 +1,4 @@
 parameters:
     checkMissingIterableValueType: false
     ignoreErrors:
+    checkGenericClassInNonGenericObjectType: false
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,36 +1,21 @@
+<?xml version="1.0"?>
 <!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
-<phpunit
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-	bootstrap="vendor/autoload.php"
-	colors="true"
-	beStrictAboutChangesToGlobalState="true"
-	beStrictAboutOutputDuringTests="true"
-	beStrictAboutTodoAnnotatedTests="true"
-	failOnRisky="true"
-	failOnWarning="true"
->
-
-	<testsuites>
-		<testsuite name="Project Test Suite">
-			<directory>tests</directory>
-		</testsuite>
-	</testsuites>
-
-	<coverage processUncoveredFiles="true">
-		<include>
-			<directory suffix=".php">src</directory>
-		</include>
-		<report>
-			<clover outputFile="build/logs/clover.xml"/>
-			<html
-				outputDirectory="build/logs/coverage-report"
-			/>
-			<text
-				outputFile="php://stdout"
-				showUncoveredFiles="true"
-				showOnlySummary="true"
-			/>
-		</report>
-	</coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true" beStrictAboutChangesToGlobalState="true" beStrictAboutOutputDuringTests="true" failOnRisky="true" failOnWarning="true" cacheDirectory=".phpunit.cache">
+  <testsuites>
+    <testsuite name="Project Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <coverage>
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+      <html outputDirectory="build/logs/coverage-report"/>
+      <text outputFile="php://stdout" showUncoveredFiles="true" showOnlySummary="true"/>
+    </report>
+  </coverage>
+  <source>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </source>
 </phpunit>