Merge pull request #131 from jolicode/up

Maintenance commit

Author: pyrech

.github/actions/phar/action.yaml

@@ -7,7 +7,7 @@ runs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '8.2'
+        php-version: '8.3'
 
     - name: Install dependencies (lib)
       run: composer install --prefer-dist --no-progress --no-dev --optimize-autoloader --classmap-authoritative

.github/workflows/ci.yaml

@@ -38,11 +38,11 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php-version: ["8.3", "8.4"]
+                php-version: ["8.4", "8.5"]
                 composer-flags: [""]
                 name: [""]
                 include:
-                    - php-version: 8.2
+                    - php-version: 8.3
                       composer-flags: "--prefer-lowest"
                       name: "(prefer lowest dependencies)"
         steps:
@@ -76,7 +76,7 @@ jobs:
                 sudo apt-get install -y --no-install-recommends --no-install-suggests libnotify4
 
             - name: Run Tests
-              run: php vendor/bin/simple-phpunit
+              run: php vendor/bin/phpunit
 
     phar:
         name: Create a PHAR and ensure it is working

.php-cs-fixer.php

@@ -30,7 +30,7 @@
 return (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules([
-        '@PHP74Migration' => true,
+        '@PHP83Migration' => true,
         '@PhpCsFixer' => true,
         '@Symfony' => true,
         '@Symfony:risky' => true,

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changes between versions
 
+## 3.3.0 (not released yet)
+
+* Drop support for PHP 8.2
+* Phar are built with PHP 8.3
+* Add support for PHP 8.5
+
 ## 3.2.0 (2025-10-16)
 
 * Add support for Symfony 8.0

castor.php

@@ -12,10 +12,13 @@
 use Castor\Attribute\AsRawTokens;
 use Castor\Attribute\AsTask;
 
+use function Castor\guard_min_version;
 use function Castor\import;
 use function Castor\mount;
 use function Castor\run;
 
+guard_min_version('1.0.0');
+
 import(__DIR__ . '/tools/php-cs-fixer/castor.php');
 import(__DIR__ . '/tools/phpstan/castor.php');
 
@@ -24,13 +27,13 @@
 #[AsTask(description: 'Install dependencies')]
 function install(): void
 {
-    run(['composer', 'install'], workingDirectory: __DIR__);
+    run(['composer', 'install']);
     qa\cs\install();
     qa\phpstan\install();
 }
 
 #[AsTask(description: 'Run PHPUnit', ignoreValidationErrors: true)]
 function phpunit(#[AsRawTokens] array $rawTokens): void
 {
-    run(['vendor/bin/simple-phpunit', ...$rawTokens]);
+    run(['vendor/bin/phpunit', ...$rawTokens]);
 }

composer.json

@@ -21,7 +21,7 @@
         }
     },
     "require": {
-        "php": ">=8.2",
+        "php": ">=8.3",
         "jolicode/php-os-helper": "^0.3",
         "psr/log": "^1.0 || ^2.0 || ^3.0",
         "symfony/process": "^6.4 || ^7.3 || ^8.0",
@@ -30,7 +30,7 @@
     "require-dev": {
         "monolog/monolog": "^3.9",
         "symfony/finder": "^6.4 || ^7.3 || ^8.0",
-        "symfony/phpunit-bridge": "^7.3 || ^8.0"
+        "phpunit/phpunit": "^12.4.5"
     },
     "suggest": {
         "ext-ffi": "Needed to send notifications via libnotify on Linux"

phpunit.xml.dist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.4/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
   <php>
     <ini name="error_reporting" value="-1"/>
     <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=13"/>
@@ -9,12 +9,12 @@
       <directory>./tests/</directory>
     </testsuite>
   </testsuites>
-  <coverage>
+  <source>
     <include>
       <directory>./</directory>
     </include>
     <exclude>
       <directory>./vendor</directory>
     </exclude>
-  </coverage>
+  </source>
 </phpunit>

tests/Driver/AbstractCliBasedDriverTestTrait.php

@@ -14,6 +14,7 @@
 use Joli\JoliNotif\Driver\DriverInterface;
 use Joli\JoliNotif\Notification;
 use JoliCode\PhpOsHelper\OsHelper;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symfony\Component\Process\Process;
 
 /**
@@ -36,9 +37,7 @@ public function testIsSupported()
         $this->assertSame($supported, $this->getDriver()->isSupported());
     }
 
-    /**
-     * @dataProvider provideValidNotifications
-     */
+    #[DataProvider('provideValidNotifications')]
     public function testConfigureProcessAcceptAnyValidNotification(Notification $notification, string $expectedCommandLine)
     {
         try {
@@ -50,44 +49,44 @@ public function testConfigureProcessAcceptAnyValidNotification(Notification $not
         }
     }
 
-    public function provideValidNotifications(): iterable
+    public static function provideValidNotifications(): iterable
     {
         $iconDir = self::getIconDir();
 
         yield self::BINARY . '_getExpectedCommandLineForNotification' => [
             (new Notification())
                 ->setBody('I\'m the notification body'),
-            $this->getExpectedCommandLineForNotification(),
+            self::getExpectedCommandLineForNotification(),
         ];
         yield self::BINARY . '_getExpectedCommandLineForNotificationWithATitle' => [
             (new Notification())
                 ->setBody('I\'m the notification body')
                 ->setTitle('I\'m the notification title'),
-            $this->getExpectedCommandLineForNotificationWithATitle(),
+            self::getExpectedCommandLineForNotificationWithATitle(),
         ];
         yield self::BINARY . '_getExpectedCommandLineForNotificationWithASubtitle' => [
             (new Notification())
                 ->setBody('I\'m the notification body')
                 ->addOption('subtitle', 'I\'m the notification subtitle'),
-            $this->getExpectedCommandLineForNotificationWithASubtitle(),
+            self::getExpectedCommandLineForNotificationWithASubtitle(),
         ];
         yield self::BINARY . '_getExpectedCommandLineForNotificationWithASound' => [
             (new Notification())
                 ->setBody('I\'m the notification body')
                 ->addOption('sound', 'Frog'),
-            $this->getExpectedCommandLineForNotificationWithASound(),
+            self::getExpectedCommandLineForNotificationWithASound(),
         ];
         yield self::BINARY . '_getExpectedCommandLineForNotificationWithAnUrl' => [
             (new Notification())
                 ->setBody('I\'m the notification body')
                 ->addOption('url', 'https://google.com'),
-            $this->getExpectedCommandLineForNotificationWithAnUrl(),
+            self::getExpectedCommandLineForNotificationWithAnUrl(),
         ];
         yield self::BINARY . '_getExpectedCommandLineForNotificationWithAnIcon' => [
             (new Notification())
                 ->setBody('I\'m the notification body')
                 ->setIcon($iconDir . '/image.gif'),
-            $this->getExpectedCommandLineForNotificationWithAnIcon(),
+            self::getExpectedCommandLineForNotificationWithAnIcon(),
         ];
         yield self::BINARY . '_getExpectedCommandLineForNotificationWithAllOptions' => [
             (new Notification())
@@ -97,7 +96,7 @@ public function provideValidNotifications(): iterable
                 ->addOption('sound', 'Frog')
                 ->addOption('url', 'https://google.com')
                 ->setIcon($iconDir . '/image.gif'),
-            $this->getExpectedCommandLineForNotificationWithAllOptions(),
+            self::getExpectedCommandLineForNotificationWithAllOptions(),
         ];
     }
 
@@ -132,35 +131,35 @@ public function testSendThrowsExceptionWhenNotificationHasAnEmptyBody()
 
     abstract protected function getDriver(): DriverInterface;
 
-    abstract protected function getExpectedCommandLineForNotification(): string;
+    abstract protected static function getExpectedCommandLineForNotification(): string;
 
-    abstract protected function getExpectedCommandLineForNotificationWithATitle(): string;
+    abstract protected static function getExpectedCommandLineForNotificationWithATitle(): string;
 
     /**
      * Subtitle is supported only on few driver.
      */
-    protected function getExpectedCommandLineForNotificationWithASubtitle(): string
+    protected static function getExpectedCommandLineForNotificationWithASubtitle(): string
     {
-        return $this->getExpectedCommandLineForNotification();
+        return static::getExpectedCommandLineForNotification();
     }
 
     /**
      * Sound is supported only on few driver.
      */
-    protected function getExpectedCommandLineForNotificationWithASound(): string
+    protected static function getExpectedCommandLineForNotificationWithASound(): string
     {
-        return $this->getExpectedCommandLineForNotification();
+        return static::getExpectedCommandLineForNotification();
     }
 
     /**
      * Sound is supported only on few driver.
      */
-    protected function getExpectedCommandLineForNotificationWithAnUrl(): string
+    protected static function getExpectedCommandLineForNotificationWithAnUrl(): string
     {
-        return $this->getExpectedCommandLineForNotification();
+        return static::getExpectedCommandLineForNotification();
     }
 
-    abstract protected function getExpectedCommandLineForNotificationWithAnIcon(): string;
+    abstract protected static function getExpectedCommandLineForNotificationWithAnIcon(): string;
 
-    abstract protected function getExpectedCommandLineForNotificationWithAllOptions(): string;
+    abstract protected static function getExpectedCommandLineForNotificationWithAllOptions(): string;
 }

tests/Driver/AppleScriptDriverTest.php

@@ -52,42 +52,42 @@ protected function getDriver(): AppleScriptDriver
         return new AppleScriptDriver(new NullLogger());
     }
 
-    protected function getExpectedCommandLineForNotification(): string
+    protected static function getExpectedCommandLineForNotification(): string
     {
         return <<<'CLI'
             'osascript' '-e' 'display notification "I'\''m the notification body"'
             CLI;
     }
 
-    protected function getExpectedCommandLineForNotificationWithATitle(): string
+    protected static function getExpectedCommandLineForNotificationWithATitle(): string
     {
         return <<<'CLI'
             'osascript' '-e' 'display notification "I'\''m the notification body" with title "I'\''m the notification title"'
             CLI;
     }
 
-    protected function getExpectedCommandLineForNotificationWithASubtitle(): string
+    protected static function getExpectedCommandLineForNotificationWithASubtitle(): string
     {
         return <<<'CLI'
             'osascript' '-e' 'display notification "I'\''m the notification body" subtitle "I'\''m the notification subtitle"'
             CLI;
     }
 
-    protected function getExpectedCommandLineForNotificationWithASound(): string
+    protected static function getExpectedCommandLineForNotificationWithASound(): string
     {
         return <<<'CLI'
             'osascript' '-e' 'display notification "I'\''m the notification body" sound name "Frog"'
             CLI;
     }
 
-    protected function getExpectedCommandLineForNotificationWithAnIcon(): string
+    protected static function getExpectedCommandLineForNotificationWithAnIcon(): string
     {
         return <<<'CLI'
             'osascript' '-e' 'display notification "I'\''m the notification body"'
             CLI;
     }
 
-    protected function getExpectedCommandLineForNotificationWithAllOptions(): string
+    protected static function getExpectedCommandLineForNotificationWithAllOptions(): string
     {
         return <<<'CLI'
             'osascript' '-e' 'display notification "I'\''m the notification body" with title "I'\''m the notification title" subtitle "I'\''m the notification subtitle" sound name "Frog"'

tests/Driver/GrowlNotifyDriverTest.php

@@ -40,21 +40,21 @@ protected function getDriver(): GrowlNotifyDriver
         return new GrowlNotifyDriver(new NullLogger());
     }
 
-    protected function getExpectedCommandLineForNotification(): string
+    protected static function getExpectedCommandLineForNotification(): string
     {
         return <<<'CLI'
             'growlnotify' '--message' 'I'\''m the notification body'
             CLI;
     }
 
-    protected function getExpectedCommandLineForNotificationWithATitle(): string
+    protected static function getExpectedCommandLineForNotificationWithATitle(): string
     {
         return <<<'CLI'
             'growlnotify' '--message' 'I'\''m the notification body' '--title' 'I'\''m the notification title'
             CLI;
     }
 
-    protected function getExpectedCommandLineForNotificationWithAnIcon(): string
+    protected static function getExpectedCommandLineForNotificationWithAnIcon(): string
     {
         $iconDir = self::getIconDir();
 
@@ -63,7 +63,7 @@ protected function getExpectedCommandLineForNotificationWithAnIcon(): string
             CLI;
     }
 
-    protected function getExpectedCommandLineForNotificationWithAllOptions(): string
+    protected static function getExpectedCommandLineForNotificationWithAllOptions(): string
     {
         $iconDir = self::getIconDir();