Merge branch 'release/1.2.0'

pontedilana · Feb 28, 2022 · 630bccf · 630bccf
2 parents d860cb9 + d534194
commit 630bccf
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 38 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -96,32 +96,62 @@ jobs:
       - name: "Run PHPUnit Tests"
         run: "composer test"
 
-#  php8:
-#    name: PHP 8 / Symfony 6.0
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: "Checkout"
-#        uses: "actions/checkout@v2"
-#        with:
-#          fetch-depth: 2
-#
-#      - name: "Install PHP 8"
-#        uses: "shivammathur/setup-php@v2"
-#        with:
-#          php-version: "8"
-#
-#      - name: "Cache composer packages"
-#        uses: "actions/cache@v2"
-#        with:
-#          path: "~/.composer/cache"
-#          key: "php-8-composer-locked-${{ hashFiles('composer.lock') }}"
-#          restore-keys: "php-8-composer-locked-"
-#
-#      - name: "Install Symfony 6.0"
-#        run: "composer require symfony/symfony:6.0.* --no-update"
-#
-#      - name: "Install dependencies with composer"
-#        run: "composer update --no-interaction"
-#
-#      - name: "Run PHPUnit Tests"
-#        run: "composer test"
+  php-80-symfony60:
+    name: PHP 8.0 / Symfony 6.0
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+        with:
+          fetch-depth: 2
+
+      - name: "Install PHP 8.0"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "8.0"
+
+      - name: "Cache composer packages"
+        uses: "actions/cache@v2"
+        with:
+          path: "~/.composer/cache"
+          key: "php-8.0-symfony-6.0-composer-locked-${{ hashFiles('composer.lock') }}"
+          restore-keys: "php-8.0-symfony-6.0-composer-locked-"
+
+      - name: "Install Symfony 6.0"
+        run: "composer require symfony/symfony:6.0.* --no-update"
+
+      - name: "Install dependencies with composer"
+        run: "composer update --no-interaction"
+
+      - name: "Run PHPUnit Tests"
+        run: "composer test"
+
+  php-81-symfony60:
+    name: PHP 8.1 / Symfony 6.0
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+        with:
+          fetch-depth: 2
+
+      - name: "Install PHP 8.1"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "8.1"
+
+      - name: "Cache composer packages"
+        uses: "actions/cache@v2"
+        with:
+          path: "~/.composer/cache"
+          key: "php-8.1-symfony-6.0-composer-locked-${{ hashFiles('composer.lock') }}"
+          restore-keys: "php-8.1-symfony-6.0-composer-locked-"
+
+      - name: "Install Symfony 6.0"
+        run: "composer require symfony/symfony:6.0.* --no-update"
+
+      - name: "Install dependencies with composer"
+        run: "composer update --no-interaction"
+
+      - name: "Run PHPUnit Tests"
+        run: "composer test"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 1.2.0 - 2022-02-28
+### Changed
+- Add Symfony 6.0 support
+
 ## 1.1.0 - 2022-01-14
 ### Changed
 - Drop Symfony 4.4 support

diff --git a/composer.json b/composer.json
@@ -17,22 +17,22 @@
     ],
     "require": {
         "php": "7.4.* || 8.0.* || 8.1.*",
-        "pontedilana/php-weasyprint": "^0.10 || ^1.0",
-        "symfony/framework-bundle": "^5.4"
+        "pontedilana/php-weasyprint": "^0.10 || ^0.11 || ^1.0",
+        "symfony/framework-bundle": "^5.4 || ^6.0"
     },
     "require-dev": {
         "doctrine/annotations": "^1.11",
         "friendsofphp/php-cs-fixer": "^3.4",
         "phpstan/phpstan": "^1.2",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-symfony": "^1.0",
-        "symfony/asset": "^5.4",
-        "symfony/finder": "^5.4",
-        "symfony/phpunit-bridge": "^5.4",
-        "symfony/security-csrf": "^5.4",
-        "symfony/templating": "^5.4",
-        "symfony/validator": "^5.4",
-        "symfony/yaml": "^5.4"
+        "symfony/asset": "^5.4 || ^6.0",
+        "symfony/finder": "^5.4 || ^6.0",
+        "symfony/phpunit-bridge": "^5.4 || ^6.0",
+        "symfony/security-csrf": "^5.4 || ^6.0",
+        "symfony/templating": "^5.4 || ^6.0",
+        "symfony/validator": "^5.4 || ^6.0",
+        "symfony/yaml": "^5.4 || ^6.0"
     },
     "autoload": {
         "psr-4": {