Merge pull request #28 from DoctrineEncryptCommunity/symfony7

Add support for Symfony 7

.github/workflows/ci.yml

@@ -59,6 +59,8 @@ jobs:
           - php-version: '7.2.5'
             dependency-versions: 'lowest'
             composer-options: '--prefer-lowest'
+            env:
+              SYMFONY_PHPUNIT_VERSION: 7
 
     steps:
       - name: "Checkout code"
@@ -81,7 +83,9 @@ jobs:
           composer-options: "--prefer-dist --no-progress"
 
       - name: Unit Tests
-        run: vendor/bin/phpunit
+        run: vendor/bin/simple-phpunit
+        env:
+          SYMFONY_PHPUNIT_VERSION: "${{ matrix.dependency-versions == 'lowest' && '7' || '' }}"
 
       - name: Install symlinks for demo's
         uses: "ramsey/composer-install@v2"
@@ -90,15 +94,17 @@ jobs:
           composer-options: "--prefer-dist --no-progress"
           working-directory: "demo"
 
-      - name: Demo symfony4.4 - Install  dependencies
+      - name: Demo symfony5.4 - Install  dependencies
         uses: "ramsey/composer-install@v2"
         with:
           dependency-versions: "${{ matrix.dependency-versions }}"
           composer-options: "--prefer-dist --no-progress"
-          working-directory: "demo/symfony4.4"
+          working-directory: "demo/symfony5.4"
 
-      - name: Demo symfony4.4 - Unit Tests
-        run: demo/symfony4.4/vendor/bin/simple-phpunit -c demo/symfony4.4/phpunit.xml.dist
+      - name: Demo symfony5.4 - Unit Tests
+        run: demo/symfony5.4/bin/phpunit -c demo/symfony5.4/phpunit.xml.dist
+        env:
+          SYMFONY_PHPUNIT_VERSION: "${{ matrix.dependency-versions == 'lowest' && '7' || '' }}"
 
       - name: Demo symfony6.x - Install  dependencies
         uses: "ramsey/composer-install@v2"
@@ -110,4 +116,16 @@ jobs:
 
       - name: Demo symfony6.x - Unit Tests
         run: demo/symfony6.x/vendor/bin/simple-phpunit -c demo/symfony6.x/phpunit.xml.dist
-        if: ${{ startsWith(matrix.php-version , '8.') }}
+        if: ${{ startsWith(matrix.php-version , '8.') }}
+
+      - name: Demo symfony7.x - Install  dependencies
+        uses: "ramsey/composer-install@v2"
+        with:
+          dependency-versions: "${{ matrix.dependency-versions }}"
+          composer-options: "--prefer-dist --no-progress"
+          working-directory: "demo/symfony7.x"
+        if: ${{ startsWith(matrix.php-version , '8.2') }}
+
+      - name: Demo symfony7.x - Unit Tests
+        run: demo/symfony7.x/vendor/bin/simple-phpunit -c demo/symfony7.x/phpunit.xml.dist
+        if: ${{ startsWith(matrix.php-version , '8.2') }}

composer.json

@@ -8,23 +8,22 @@
 		"php": "^7.2|^8.0",
 		"paragonie/halite": "^4.6|^5.0",
 		"doctrine/orm": "^2.5",
-		"doctrine/doctrine-bundle": "^2.0",
-		"symfony/property-access": "^4.1|^5.0|^6.0",
-		"symfony/dependency-injection": "^4.1|^5.0|^6.0",
-		"symfony/yaml": "^4.1|^5.0|^6.0",
-		"symfony/http-kernel": "^4.1|^5.0|^6.0",
-		"symfony/config": "^4.1|^5.0|^6.0",
+		"doctrine/doctrine-bundle": "^2.0.8|^2.1",
+		"symfony/property-access": "^5.4|^6.0|^7.0",
+		"symfony/dependency-injection": "^5.4|^6.0|^7.0",
+		"symfony/yaml": "^5.4|^6.0|^7.0",
+		"symfony/http-kernel": "^5.4|^6.0|^7.0",
+		"symfony/config": "^5.4|^6.0|^7.0",
 		"doctrine/annotations": "^1.13|^2.0",
-		"symfony/expression-language": "^4.1|^5.0|^6.0"
+		"symfony/expression-language": "^5.4|^6.0|^7.0"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "^8.0|^9.0",
 		"defuse/php-encryption": "^2.1",
 		"doctrine/cache": "^1.11",
 		"phpstan/phpstan": "^1.4",
 		"jetbrains/phpstorm-attributes": "^1.0",
 		"phpcompatibility/php-compatibility": "^9.3",
-		"symfony/phpunit-bridge": "^6.0"
+		"symfony/phpunit-bridge": "^7.0"
 	},
 	"suggest": {
 		"defuse/php-encryption": "Alternative for halite for use with older php-versions",

demo/composer.json

@@ -14,17 +14,22 @@
         ],
         "installScripts" : [
             "Kporras07\\ComposerSymlinks\\ScriptHandler::createSymlinks",
+            "printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony5.4/.env.local",
+            "printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony5.4/.env.test.local",
             "printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony6.x/.env.local",
-            "printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony6.x/.env.test.local"
+            "printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony6.x/.env.test.local",
+            "printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony7.x/.env.local",
+            "printf 'HALITE_SECRET=\"%s\"' \"$(cat shared/.Halite.key)\" > symfony7.x/.env.test.local"
         ]
     },
     "extra": {
         "symlinks": {
-            "shared/templates":     "symfony4.4/templates",
-            "./shared/templates":   "symfony6.x/templates",
-            "shared/var/data.db":   "symfony4.4/var/data.db",
-            "./shared/var/data.db": "symfony6.x/var/data.db",
-            "shared/.Halite.key":   "symfony4.4/.Halite.key"
+            "shared/templates":       "symfony5.4/templates",
+            "./shared/templates":     "symfony6.x/templates",
+            "././shared/templates":   "symfony7.x/templates",
+            "shared/var/data.db":     "symfony5.4/var/data.db",
+            "./shared/var/data.db":   "symfony6.x/var/data.db",
+            "././shared/var/data.db": "symfony7.x/var/data.db"
         }
     }
 }