+31 -19

README.md

··· 61 61 62 62 - Add useful methods 63 63 - Option 64 64 - - [x] `Some()` 64 64 + - [ ] `and()` 65 65 + - [ ] `andThen()` 66 66 + - [ ] `expect()` 67 67 + - [ ] `filter()` 68 68 + - [ ] `inspect()` 69 69 + - [ ] `reduce()` 70 70 + - [ ] `replace()` 71 71 + - [ ] `take()` 72 72 + - [ ] `takeIf()` 65 73 - [x] `None()` 74 74 + - [x] `Some()` 75 75 + - [x] `isNone()` 66 76 - [x] `isSome()` 67 67 - - [x] `isNone()` 77 77 + - [x] `map()` 78 78 + - [x] `mapOr()` 68 79 - [x] `unwrap()` 69 80 - [x] `unwrapOr()` 70 70 - - [x] `map()` 71 71 - - [ ] `mapOr()` 72 72 - - [ ] `filter(callback $predicate)` 73 73 - - [ ] `expect(string $message)` 74 74 - - [ ] `and(mixed $value)` 75 75 - - [ ] `andThen(callback $fn)` - Returns result of `fn(contained value)` if some, or returns none 76 81 - Result 77 77 - - [x] `Ok()` 82 82 + - [ ] `and()` 83 83 + - [ ] `andThen()` 84 84 + - [ ] `expect()` 85 85 + - [ ] `expectErr()` 86 86 + - [ ] `inspect()` 87 87 + - [ ] `inspectErr()` 88 88 + - [ ] `or()` 89 89 + - [ ] `tryCatch()` 78 90 - [x] `Err()` 91 91 + - [x] `Ok()` 92 92 + - [x] `getErr()` 93 93 + - [x] `getOk()` 94 94 + - [x] `isErr()` 79 95 - [x] `isOk()` 80 80 - - [x] `isErr()` 81 81 - - [x] `getOk()` 82 82 - - [x] `getErr()` 96 96 + - [x] `map()` 97 97 + - [x] `mapErr()` 98 98 + - [x] `mapOr()` 83 99 - [x] `unwrap()` 84 100 - [x] `unwrapErr()` 85 101 - [x] `unwrapOr(mixed $default)` 86 86 - - [x] `map()` 87 87 - - [x] `mapErr()` 88 88 - - [ ] `mapOr()` - Returns contained value or computes from closure 89 89 - - [ ] `expect(string $message)` 90 90 - - [ ] `expectErr(string $message)` 91 91 - - [ ] `andThen(callback $fn)` 92 92 - - [ ] `tryCatch(callback $tryFn, callback $onMapErr)` - Returns Ok if operation is successful or calls onMapErr with the Err if it throws 102 102 + - Refactor 103 103 + - Use match where possible 104 104 + - Use `$this` calls where possible 93 105 94 106 ## Contributing 95 107

+17

docs/classes/Ciarancoza/OptionResult/Option.md

··· 140 140 | `$fn` | **callable** | Function to transform the value | 141 141 142 142 *** 143 143 + 144 144 + ### mapOr 145 145 + 146 146 + Calls `fn` on a contained value if `some`, or returns $or if `none` 147 147 + 148 148 + ```php 149 149 + public mapOr(mixed $or, callable $fn): \Ciarancoza\OptionResult\V|\Ciarancoza\OptionResult\U 150 150 + ``` 151 151 + 152 152 + **Parameters:** 153 153 + 154 154 + | Parameter | Type | Description | 155 155 + |-----------|--------------|---------------------------------| 156 156 + | `$or` | **mixed** | | 157 157 + | `$fn` | **callable** | Function to transform the value | 158 158 + 159 159 + ***

+17

docs/classes/Ciarancoza/OptionResult/Result.md

··· 198 198 199 199 *** 200 200 201 201 + ### mapOr 202 202 + 203 203 + Calls `fn` on a contained value if `ok`, or returns $or if `err` 204 204 + 205 205 + ```php 206 206 + public mapOr(mixed $or, callable $fn): \Ciarancoza\OptionResult\V|\Ciarancoza\OptionResult\U 207 207 + ``` 208 208 + 209 209 + **Parameters:** 210 210 + 211 211 + | Parameter | Type | Description | 212 212 + |-----------|--------------|---------------------------------| 213 213 + | `$or` | **mixed** | | 214 214 + | `$fn` | **callable** | Function to transform the value | 215 215 + 216 216 + *** 217 217 + 201 218 ### mapErr 202 219 203 220 If `err`, transform the error value with `$fn`

+17

src/Option.php

··· 104 104 105 105 return Option::Some($fn($this->value)); 106 106 } 107 107 + 108 108 + /** 109 109 + * Calls `fn` on a contained value if `some`, or returns $or if `none` 110 110 + * 111 111 + * @template V $or 112 112 + * @template U 113 113 + * 114 114 + * @param callable(T): U $fn Function to transform the value 115 115 + * @return V|U 116 116 + */ 117 117 + public function mapOr(mixed $or, callable $fn): mixed 118 118 + { 119 119 + return match (true) { 120 120 + $this->isSome() => $fn($this->unwrap()), 121 121 + $this->isNone() => is_callable($or) ? $or() : $or, 122 122 + }; 123 123 + } 107 124 }

+17

src/Result.php

··· 161 161 } 162 162 163 163 /** 164 164 + * Calls `fn` on a contained value if `ok`, or returns $or if `err` 165 165 + * 166 166 + * @template V $or 167 167 + * @template U 168 168 + * 169 169 + * @param callable(T): U $fn Function to transform the value 170 170 + * @return V|U 171 171 + */ 172 172 + public function mapOr(mixed $or, callable $fn): mixed 173 173 + { 174 174 + return match (true) { 175 175 + $this->isOk() => $fn($this->unwrap()), 176 176 + $this->isErr() => is_callable($or) ? $or() : $or, 177 177 + }; 178 178 + } 179 179 + 180 180 + /** 164 181 * If `err`, transform the error value with `$fn` 165 182 * 166 183 * @template U

+3 -1

tests/OptionTest.php

··· 60 60 61 61 public function test_map_or(): void 62 62 { 63 63 - $this->markTestIncomplete('TODO'); 64 63 $this->assertSame(3, Option::Some('foo')->mapOr(42, fn ($v) => strlen($v))); 65 64 $this->assertSame(42, Option::None()->mapOr(42, fn ($v) => strlen($v))); 65 65 + 66 66 + $this->assertSame(3, Option::Some('foo')->mapOr(fn () => 42, fn ($v) => strlen($v))); 67 67 + $this->assertSame(42, Option::None()->mapOr(fn () => 42, fn ($v) => strlen($v))); 66 68 } 67 69 68 70 public function test_map_or_else(): void

+3 -1

tests/ResultTest.php

··· 91 91 92 92 public function test_map_or(): void 93 93 { 94 94 - $this->markTestIncomplete('TODO'); 95 94 $this->assertSame(3, Result::Ok('foo')->mapOr(42, fn ($v) => strlen($v))); 96 95 $this->assertSame(42, Result::Err('bar')->mapOr(42, fn ($v) => strlen($v))); 96 96 + 97 97 + $this->assertSame(3, Result::Ok('foo')->mapOr(fn () => 42, fn ($v) => strlen($v))); 98 98 + $this->assertSame(42, Result::Err('bar')->mapOr(fn () => 42, fn ($v) => strlen($v))); 97 99 } 98 100 99 101 public function test_map_or_else(): void