PHP 8.4 checks in CI

.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') }}

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

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"
         ]

src/InotifyStream.php

@@ -38,16 +38,12 @@
      */
     private $watchers = [];
 
-    /**
-     * @psalm-suppress RedundantConditionGivenDocblockType
-     * @psalm-suppress DocblockTypeContradiction
-     */
     public function __construct(?LoopInterface $loop = null)
     {
         $inotify = inotify_init();
 
         if (
             !is_resource($inotify) ||
             get_resource_type($inotify) !== 'stream'
         ) {
             throw new InvalidArgumentException(
@@ -58,7 +54,7 @@
         // this class relies on non-blocking I/O in order to not interrupt
         // the event loop e.g. pipes on Windows do not support this:
         // https://bugs.php.net/bug.php?id=47918
         if (stream_set_blocking($inotify, false) !== true) {
             throw new RuntimeException(
                 'Unable to set stream resource to non-blocking mode'
             );
@@ -70,25 +66,25 @@
         // trigger events on (edge triggered).
         // This does not affect the default event loop implementation (level
         // triggered), so we can ignore platforms not supporting this (HHVM).
         if (function_exists('stream_set_read_buffer')) {
             stream_set_read_buffer($inotify, 0);
         }
 
         $this->inotify = $inotify;
         $this->loop    = $loop ?? \React\EventLoop\Loop::get();
 
         $this->loop->addReadStream($this->inotify, [$this, 'handleData']);
     }
 
     public function __destruct()
     {
         $this->loop->removeReadStream($this->inotify);
 
         if (is_resource($this->inotify)) {
             fclose($this->inotify);
         }
         $this->emit('close');
         $this->removeAllListeners();
     }
 
     /**