Merge pull request #5 from bearsunday/php84

Enable PHP 8.4 compat
bearsunday · Nov 23, 2024 · add082c · add082c
2 parents a2c52e4 + 40021c9
commit add082c
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 39 deletions.
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -9,4 +9,4 @@ jobs:
   cs:
     uses: ray-di/.github/.github/workflows/coding-standards.yml@v1
     with:
-      php_version: 8.1
+      php_version: 8.3
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -7,4 +7,7 @@ on:
 
 jobs:
   ci:
-    uses: ray-di/.github/.github/workflows/continuous-integration.yml@v2
+    uses: ray-di/.github/.github/workflows/continuous-integration.yml@v1
+    with:
+      old_stable: '["8.1", "8.2", "8.3"]
+      current_stable: 8.4
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -9,5 +9,5 @@ jobs:
   sa:
     uses: ray-di/.github/.github/workflows/static-analysis.yml@v1
     with:
-      php_version: 8.1
+      php_version: 8.3
       has_crc_config: true
diff --git a/README.md b/README.md
@@ -1,14 +1,24 @@
 # BEAR.FastlyModule
-Fastly integration for BEAR.Sunday
 
-## Installation
+> There are only two hard things in Computer Science: cache invalidation and naming things.
+>
+> – Phil Karlton
 
-    composer install
+Fastly CDN integration module for BEAR.Sunday
 
-## Available Commands
+## Example
 
-    composer test              // Run unit test
-    composer tests             // Test and quality checks
-    composer cs-fix            // Fix the coding style
-    composer sa                // Run static analysis tools
-    composer run-script --list // List all commands
+```php
+use BEAR\FastlyModule\FastlyEnableSoftPurgeModule;
+use BEAR\FastlyModule\FastlyPurgeModule;
+
+// Set API key and service ID
+$this->install(new FastlyPurgeModule(
+    $fastlyApiKey,
+    $fastlyServiceId
+));
+
+// Enable soft purge
+$this->install(new FastlyEnableSoftPurgeModule());
+```
+See more at https://bearsunday.github.io/manuals/1.0/ja/cache.html
diff --git a/phpcs.xml b/phpcs.xml
@@ -8,8 +8,8 @@
     <arg name="parallel" value="80"/>
     <arg name="cache" value=".phpcs-cache"/>
 
-    <!-- Compatibility with PHP 8.0 -->
-    <config name="php_version" value="80000"/>
+    <!-- Compatibility with PHP 8.3 -->
+    <config name="php_version" value="80300"/>
 
     <!-- Ignore warnings, show progress of the run and show sniff names -->
     <arg value="nps"/>

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -2,7 +2,7 @@
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
-    bootstrap="tests/bootstrap.php">
+    bootstrap="vendor/autoload.php">
     <coverage processUncoveredFiles="true" cacheDirectory="./.phpunit-cache">
         <include>
             <directory suffix=".php">src</directory>

diff --git a/src/FastlyEnableSoftPurgeModule.php b/src/FastlyEnableSoftPurgeModule.php
@@ -10,7 +10,7 @@
 final class FastlyEnableSoftPurgeModule extends AbstractModule
 {
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     protected function configure(): void
     {

diff --git a/src/FastlyPurgeModule.php b/src/FastlyPurgeModule.php
@@ -31,7 +31,7 @@ public function __construct(
         parent::__construct($module);
     }
 
-    /** {@inheritdoc} */
+    /** {@inheritDoc} */
     protected function configure(): void
     {
         $this->bind(Configuration::class)->annotatedWith(Configuration::class)->toInstance(

diff --git a/tests/FastlyPurgeModuleTest.php b/tests/FastlyPurgeModuleTest.php
@@ -15,7 +15,7 @@ class FastlyPurgeModuleTest extends TestCase
     public function testModule(): void
     {
         $module = new FastlyPurgeModule('apiKey', 'serviceId');
-        $injector = new Injector($module, $_ENV['TMP_DIR']);
+        $injector = new Injector($module);
 
         $this->assertInstanceOf(PurgeApi::class, $injector->getInstance(PurgeApi::class));
         $this->assertInstanceOf(FastlyCachePurgerInterface::class, $injector->getInstance(FastlyCachePurgerInterface::class));
@@ -26,9 +26,8 @@ public function testPurge(): void
         $module = new FastlyPurgeModule('apiKey', 'serviceId');
         $module->override(new FakeFastlyPurgeModule());
 
-        $injector =  new Injector($module, $_ENV['TMP_DIR']);
+        $injector =  new Injector($module);
         $cachePurger = $injector->getInstance(FastlyCachePurgerInterface::class);
-        assert($cachePurger instanceof FastlyCachePurgerInterface);
         ($cachePurger)('fakeTag');
 
         $purgeApi = $injector->getInstance(PurgeApi::class);

diff --git a/tests/FastlySoftPurgeModuleTest.php b/tests/FastlySoftPurgeModuleTest.php
@@ -17,9 +17,8 @@ public function testSoftPurge(): void
         $module = new FastlyPurgeModule('apiKey', 'serviceId');
         $module->override(new FastlyEnableSoftPurgeModule(new FakeFastlyPurgeModule()));
 
-        $injector =  new Injector($module, $_ENV['TMP_DIR']);
+        $injector =  new Injector($module);
         $cachePurger = $injector->getInstance(FastlyCachePurgerInterface::class);
-        assert($cachePurger instanceof FastlyCachePurgerInterface);
         ($cachePurger)('fakeTag');
 
         $purgeApi = $injector->getInstance(PurgeApi::class);

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
diff --git a/vendor-bin/tools/composer.json b/vendor-bin/tools/composer.json
@@ -1,12 +1,11 @@
 {
     "require-dev": {
-        "doctrine/coding-standard": "^11.0",
+        "doctrine/coding-standard": "^12.0",
         "phpmd/phpmd": "^2.9",
         "phpmetrics/phpmetrics": "^2.7",
-        "phpstan/phpstan": "^1.1",
-        "psalm/plugin-phpunit": "^0.13",
+        "phpstan/phpstan": "^2.0",
         "squizlabs/php_codesniffer": "^3.5",
-        "vimeo/psalm": "^4.2"
+        "vimeo/psalm": "^5.26"
     },
     "config": {
         "allow-plugins": {