valbeat · valbeat · Aug 9, 2025 · Aug 8, 2025 · Aug 8, 2025 · Aug 8, 2025
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,63 @@
+name: Tests
+
+on:
+  push:
+    branches: [ main, develop ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    name: PHP 8.4 Tests
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup PHP 8.4
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.4'
+          coverage: xdebug
+          tools: composer:v2
+
+      - name: Validate composer.json
+        run: composer validate --strict
+
+      - name: Cache Composer packages
+        uses: actions/cache@v3
+        with:
+          path: vendor
+          key: ${{ runner.os }}-php-8.4-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-php-8.4-
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress
+
+      - name: Run tests
+        run: composer test
+
+      - name: Generate coverage report
+        run: ./vendor/bin/phpunit --coverage-clover coverage.xml
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          file: ./coverage.xml
+          flags: unittests
+          name: codecov-umbrella
+          fail_ci_if_error: false
+
+  docker-test:
+    runs-on: ubuntu-latest
+    name: Docker Test
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build Docker image
+        run: docker build -t php-result-test .
+
+      - name: Run tests in Docker
+        run: docker run --rm -v "$(pwd)":/app php-result-test ./vendor/bin/phpunit --testdox
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 /composer.lock
 /.phpstan/
 /.phpunit.cache/
+/.phpunit.result.cache
 /coverage/
 .DS_Store
 /.php-cs-fixer.cache

diff --git a/phpstan.neon b/phpstan.neon
@@ -2,6 +2,7 @@ parameters:
     level: max
     paths:
         - src
+        - tests
     tmpDir: .phpstan
     treatPhpDocTypesAsCertain: false
     reportUnmatchedIgnoredErrors: true
@@ -13,4 +14,13 @@ parameters:
     checkUninitializedProperties: true
 
     # PHP 8.4 features
-    phpVersion: 80400
+    phpVersion: 80400
+
+    # テストコードで必要なパターンのみ許可（最小限）
+    ignoreErrors:
+        # テストでの型の不一致（意図的なテストケース）
+        - 
+            message: '#Parameter .* expects .*, .* given#'
+            paths:
+                - tests/Unit/OkTest.php
+                - tests/Unit/ErrTest.php
diff --git a/phpunit.xml b/phpunit.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         stopOnFailure="false"
+         stopOnWarning="false"
+         stopOnIncomplete="false"
+         stopOnSkipped="false"
+         stopOnRisky="false"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutChangesToGlobalState="true"
+         beStrictAboutTestsThatDoNotTestAnything="true"
+         beStrictAboutCoverageMetadata="true"
+         failOnEmptyTestSuite="true"
+         failOnIncomplete="false"
+         failOnRisky="false"
+         failOnSkipped="false"
+         failOnWarning="false"
+         displayDetailsOnIncompleteTests="true"
+         displayDetailsOnSkippedTests="true"
+         displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnTestsThatTriggerNotices="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true">
+    <testsuites>
+        <testsuite name="Unit Tests">
+            <directory suffix="Test.php">tests</directory>
+        </testsuite>
+    </testsuites>
+    <source>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </source>
+    <coverage>
+        <report>
+            <html outputDirectory="build/coverage"/>
+            <text outputFile="php://stdout"/>
+        </report>
+    </coverage>
+</phpunit>
diff --git a/src/Result.php b/src/Result.php
@@ -16,6 +16,7 @@ interface Result
      * 結果が成功（Ok）の場合に true を返します.
      *
      * @phpstan-assert-if-true Ok<T> $this
+     * @phpstan-assert-if-false Err<E> $this
      *
      * @return bool
      */
@@ -34,6 +35,7 @@ public function isOkAnd(callable $fn): bool;
      * 結果が失敗（Err）の場合に true を返します.
      *
      * @phpstan-assert-if-true Err<E> $this
+     * @phpstan-assert-if-false Ok<T> $this
      *
      * @return bool
      */
@@ -51,14 +53,14 @@ public function isErrAnd(callable $fn): bool;
     /**
      * 成功値を返します。失敗の場合は例外を投げます.
      *
-     * @return T
+     * @return ($this is Ok<T> ? T : never)
      */
     public function unwrap(): mixed;
 
     /**
      * エラー値を返します。成功の場合は例外を投げます.
      *
-     * @return E
+     * @return ($this is Err<E> ? E : never)
      */
     public function unwrapErr(): mixed;
 
@@ -67,7 +69,7 @@ public function unwrapErr(): mixed;
      *
      * @template U
      * @param U $default
-     * @return T|U
+     * @return ($this is Ok<T> ? T : U)
      */
     public function unwrapOr(mixed $default): mixed;
 
@@ -191,7 +193,6 @@ public function orElse(callable $fn): self;
 
     /**
      * 成功の場合はok_fnを、失敗の場合はerr_fnを適用します.
-     * RustのResult型のmatch式に相当する機能です.
      *
      * @template U
      * @template V