Merge branch 'markuspoerschke:2.x' into 2.x

.github/workflows/ci.yml

@@ -16,6 +16,8 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
+          - "8.4"
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v4"
@@ -30,21 +32,31 @@ jobs:
         run: 'echo "::set-output name=directory::$(composer config cache-dir)"'
 
       - name: "Cache dependencies installed with composer"
-        uses: "actions/cache@v3.3.2"
+        uses: "actions/cache@v4.0.2"
         with:
           path: "${{ steps.determine-composer-cache-directory.outputs.directory }}"
           key: "php-${{ matrix.php-version }}-composer-cache"
 
-      - name: "Update Packages for PHP 8.0"
-        if: ${{ matrix.php-version == '8.0' }}
-        run: "composer up --prefer-lowest ocramius/package-versions symfony/*"
-
-      - name: "Update Packages for PHP 7.4"
-        if: ${{ matrix.php-version == '7.4' }}
+      - name: "Install lowest available packages for PHP 7.4, 8.0 and 8.1"
+        if: ${{ matrix.php-version == '7.4' || matrix.php-version == '8.0' || matrix.php-version == '8.1' }}
         run: "composer up --prefer-lowest"
 
+      - name: "Install packages for PHP 8.4"
+        if: ${{ matrix.php-version == '8.4' }}
+        run: "composer install --ignore-platform-reqs"
+
+      - name: "Run tests (old PHP versions)"
+        if: ${{ matrix.php-version == '7.4' || matrix.php-version == '8.0' || matrix.php-version == '8.1' }}
+        run: "PHPUNIT_FLAGS=--no-coverage make test-phpunit test-psalm test-examples"
+
       - name: "Run tests"
+        if: ${{ matrix.php-version == '8.2' || matrix.php-version == '8.3' }}
         run: "make -j -O test"
 
+      - name: "Run tests (PHP 8.4)"
+        if: ${{ matrix.php-version == '8.4' }}
+        run: "make -j -O test-phpunit test-examples"
+
       - name: "Send code coverage"
-        uses: codecov/[email protected]
+        if: ${{ matrix.php-version == '8.3' }}
+        uses: codecov/[email protected]

.github/workflows/code-style.yml

@@ -13,14 +13,14 @@ jobs:
           token: ${{ secrets.PAT }}
 
       - name: Run php-cs-fixer
-        uses: docker://oskarstark/php-cs-fixer-ga:3.0.0
+        uses: docker://oskarstark/php-cs-fixer-ga:3.26.0
 
       - name: Run prettier
         uses: actionsx/prettier@v3
         with:
           args: --write .
 
-      - uses: stefanzweifel/git-auto-commit-action@v4.16.0
+      - uses: stefanzweifel/git-auto-commit-action@v5.0.1
         with:
           commit_user_name: Markus Poerschke (Bot)
           commit_user_email: [email protected]

.github/workflows/draft-new-release.yml

@@ -33,7 +33,7 @@ jobs:
 
       - run: git checkout -b release/${{ github.event.inputs.version }}
 
-      - uses: stefanzweifel/git-auto-commit-action@v4.16.0
+      - uses: stefanzweifel/git-auto-commit-action@v5.0.1
         with:
           branch: release/${{ github.event.inputs.version }}
           commit_user_name: Markus Poerschke (Bot)
@@ -42,7 +42,7 @@ jobs:
           file_pattern: CHANGELOG.md
 
       - name: Create pull request
-        uses: thomaseizinger/create-pull-request@1.3.1
+        uses: thomaseizinger/create-pull-request@1.4.0
         env:
           GITHUB_TOKEN: ${{ secrets.PAT }}
         with:

.github/workflows/website.yml

@@ -25,9 +25,9 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup Pages
-        uses: actions/configure-pages@v3
+        uses: actions/configure-pages@v5
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
 

.php-cs-fixer.php

@@ -24,5 +24,10 @@
         'array_syntax' => ['syntax' => 'short'],
         'header_comment' => ['header' => $headerComment],
         'yoda_style' => false,
+        'global_namespace_import' => [
+            'import_classes' => true,
+            'import_constants' => true,
+            'import_functions' => true,
+        ],
     ])
     ->setFinder($finder);

CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.14.0] - 2024-07-11
+
+### Fixed
+
+-   Fix \\n being escaped to \\n, leading to no newlines in actual text [#617](https://github.com/markuspoerschke/iCal/pull/617)
+
+## [2.13.0] - 2023-12-19
+
+### Added
+
+-   Support PHP 8.3 [#576](https://github.com/markuspoerschke/iCal/pull/576)
+
 ## [2.12.1] - 2023-06-22
 
 ### Fixed
@@ -276,7 +288,9 @@ Please check the [upgrade guide](UPGRADE.md) on how to upgrade from version `0.*
 -   **Breaking Change:** Changed signature of the `Event::setOrganizer` method. Now there is is only one parameter that must be an instance of `Property\Organizer`.
 -   Updated install section in README.md [#54](https://github.com/markuspoerschke/iCal/pull/53)
 
-[unreleased]: https://github.com/markuspoerschke/iCal/compare/2.12.1...HEAD
+[Unreleased]: https://github.com/markuspoerschke/iCal/compare/2.14.0...HEAD
+[2.14.0]: https://github.com/markuspoerschke/iCal/compare/2.13.0...2.14.0
+[2.13.0]: https://github.com/markuspoerschke/iCal/compare/2.12.1...2.13.0
 [2.12.1]: https://github.com/markuspoerschke/iCal/compare/2.12.0...2.12.1
 [2.12.0]: https://github.com/markuspoerschke/iCal/compare/2.11.0...2.12.0
 [2.11.0]: https://github.com/markuspoerschke/iCal/compare/2.10.0...2.11.0

Makefile

@@ -33,7 +33,7 @@ test-psalm: vendor
 
 .PHONY: test-phpunit
 test-phpunit: vendor
-	phpunit --coverage-xml=build/coverage/coverage-xml --log-junit=build/coverage/junit.xml ${PHPUNIT_FLAGS}
+	phpunit ${PHPUNIT_FLAGS}
 
 .PHONY: test-examples
 EXAMPLE_FILES := $(wildcard examples/*.php)

README.md

@@ -36,7 +36,7 @@ If you just start using this package, you should install version 2.
 
 | Version | PHP Version |
 | ------- | ----------- |
-| 2.\*    | 7.4 - 8.2   |
+| 2.\*    | 7.4 - 8.3   |
 | 0.16.\* | 7.0 - 8.2   |
 | 0.11.\* | 5.3.0 - 7.4 |
 

composer.json

@@ -24,14 +24,14 @@
         "docs": "https://ical.poerschke.nrw"
     },
     "require": {
-        "php": ">=7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0",
+        "php": ">=7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
         "ext-mbstring": "*",
         "symfony/deprecation-contracts": "^2.1 || ^3.0"
     },
     "require-dev": {
         "ergebnis/composer-normalize": "^2.23.1",
         "friendsofphp/php-cs-fixer": "^3.4",
-        "infection/infection": "^0.23 || ^0.26",
+        "infection/infection": "^0.23 || ^0.26 || ^0.27",
         "phpmd/phpmd": "^2.13",
         "phpunit/phpunit": "^9.5",
         "vimeo/psalm": "^4.8 || ^5.0"