diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c15576a..b468350 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,8 @@ on: - - pull_request - - push + pull_request: null + push: + branches: + - master name: CI @@ -12,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Validate composer.json and composer.lock run: composer validate @@ -31,7 +33,7 @@ jobs: run: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} @@ -47,17 +49,14 @@ jobs: - name: Static Analyzer (PHPStan) run: composer test:phpstan - - name: Static Analyzer (Psalm) - run: composer test:psalm - Tests: strategy: matrix: - php-versions: ['8.0', '8.1', '8.2', '8.3'] + php-versions: ['8.0', '8.1', '8.2', '8.3', '8.4'] runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Validate composer.json and composer.lock run: composer validate @@ -76,7 +75,7 @@ jobs: run: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} diff --git a/CHANGELOG.md b/CHANGELOG.md index dc3a8e3..31e9c6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,25 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.2.0] - 2024-11-27 + +### Added +- Support for PHP 8.4 + +### Removed +- Psalm + +## [2.1.0] - 2023-09-23 + +# Added + +- Support PHP 8.2 (#3, thanks @devnix) +- More specific return type for `Flowcontrol\React\Inotify\InotifyStream::addWatch` (#4, thanks @devnix) + +# Fixed + +- GitHub Action Badge in `README.md` + ## [2.0.0] - 2022-01-06 ### Added @@ -59,6 +78,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - unit tests - static code analysis using Pslam and PHPStan +[2.2.0]: https://github.com/flow-control/react-inotify/compare/v2.1.0...v2.2.0 +[2.1.0]: https://github.com/flow-control/react-inotify/compare/v2.0.0...v2.1.0 [2.0.0]: https://github.com/flow-control/react-inotify/compare/v1.1.1...v2.0.0 [1.1.1]: https://github.com/flow-control/react-inotify/compare/v1.1.0...v1.1.1 [1.1.0]: https://github.com/flow-control/react-inotify/compare/v1.0.2...v1.1.0 diff --git a/composer.json b/composer.json index 55697b6..cdb1b93 100644 --- a/composer.json +++ b/composer.json @@ -12,8 +12,7 @@ "require-dev": { "phpunit/phpunit": "^8.5|^9.5", "phpstan/phpstan": "^1.0.0", - "infection/infection": "<1.0", - "vimeo/psalm": "^5.0" + "infection/infection": "<1.0" }, "autoload": { "psr-4": { @@ -29,7 +28,6 @@ "fix": "./tools/php-cs-fixer.phar fix", "test:lint": "./tools/php-cs-fixer.phar fix --dry-run", "test:phpstan": "phpstan analyse --level max examples/ src/", - "test:psalm": "psalm src/ examples/", "test:unit": [ "@putenv XDEBUG_MODE=coverage", "phpunit" @@ -41,7 +39,6 @@ "test": [ "@test:lint", "@test:phpstan", - "@test:psalm", "@test:unit", "@test:mutation" ] diff --git a/psalm.xml b/psalm.xml deleted file mode 100644 index 74be332..0000000 --- a/psalm.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/InotifyStream.php b/src/InotifyStream.php index 934432c..e8e5b7f 100644 --- a/src/InotifyStream.php +++ b/src/InotifyStream.php @@ -38,10 +38,6 @@ final class InotifyStream extends EventEmitter */ private $watchers = []; - /** - * @psalm-suppress RedundantConditionGivenDocblockType - * @psalm-suppress DocblockTypeContradiction - */ public function __construct(?LoopInterface $loop = null) { $inotify = inotify_init();