up: update strem util logic

Author: inhere

src/Util/BasePhpTestCase.php

@@ -0,0 +1,62 @@
+<?php declare(strict_types=1);
+
+namespace Toolkit\Stdlib\Util;
+
+use PHPUnit\Framework\TestCase;
+use ReflectionException;
+use ReflectionMethod;
+use RuntimeException;
+use Throwable;
+
+/**
+ * class BasePhpTestCase
+ *
+ * @author inhere
+ */
+abstract class BasePhpTestCase extends TestCase
+{
+    /**
+     * get method for test protected and private method
+     *
+     * usage:
+     *
+     * ```php
+     * $rftMth = $this->method(SomeClass::class, $protectedOrPrivateMethod)
+     *
+     * $obj = new SomeClass();
+     * $ret = $rftMth->invokeArgs($obj, $invokeArgs);
+     * ```
+     *
+     * @param class-string|object $class
+     * @param string $method
+     *
+     * @return ReflectionMethod
+     * @throws ReflectionException
+     */
+    protected static function getMethod(string|object $class, string $method): ReflectionMethod
+    {
+        // $class  = new \ReflectionClass($class);
+        // $method = $class->getMethod($method);
+
+        $rftMth = new ReflectionMethod($class, $method);
+        $rftMth->setAccessible(true);
+
+        return $rftMth;
+    }
+
+    /**
+     * @param callable $cb
+     *
+     * @return Throwable
+     */
+    protected function runAndGetException(callable $cb): Throwable
+    {
+        try {
+            $cb();
+        } catch (Throwable $e) {
+            return $e;
+        }
+
+        return new RuntimeException('NO ERROR', -1);
+    }
+}

src/Util/Optional.php

@@ -6,11 +6,12 @@
 use RuntimeException;
 use Throwable;
 use Toolkit\Stdlib\Obj;
+use Toolkit\Stdlib\Util\Stream\DataStream;
 use UnexpectedValueException;
 use function gettype;
 
 /**
- * class Optional
+ * class Optional - like java: java.util.Optional
  *
  * @template T
  *
@@ -22,7 +23,7 @@ final class Optional
     /**
      * @var self|null
      */
-    private static ?Optional $empty;
+    private static ?Optional $empty = null;
 
     /**
      * Returns an Optional with the specified present non-null value.
@@ -136,7 +137,15 @@ public function get()
      */
     public function isNull(): bool
     {
-        return $this->value !== null;
+        return $this->value === null;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isEmpty(): bool
+    {
+        return $this->value === null;
     }
 
     /**
@@ -179,7 +188,7 @@ public function filter(callable $checker): self
     /**
      * If a value is present, apply the provided mapping function to it,
      * and if the result is non-null, return an Optional describing the result.
-     * Otherwise return an empty Optional
+     * Otherwise, return an empty Optional
      *
      * ```php
      *  Optional::of("foo")->map('strtoupper')->get(); // "FOO"
@@ -227,12 +236,46 @@ public function flatMap(callable $flatMapper): self
         return $new;
     }
 
+    /**
+     * @param callable():Optional<T> $supplier
+     *
+     * @return $this
+     */
+    public function or(callable $supplier): self
+    {
+        if ($this->isPresent()) {
+            return $this;
+        }
+
+        $new = $supplier();
+        if (!$new instanceof self) {
+            throw new UnexpectedValueException('must return an object and instance of ' . self::class);
+        }
+
+        return $new;
+    }
+
+    /**
+     * If a value is present, returns a sequential Stream containing only that value,
+     * otherwise returns an empty Stream.
+     *
+     * @return DataStream<T>
+     */
+    public function stream(): DataStream
+    {
+        if (!$this->isPresent()) {
+            return DataStream::empty();
+        }
+
+        return DataStream::of($this->value);
+    }
+
     /**
      * @param T $other
      *
      * @return T
      */
-    public function orElse($other)
+    public function orElse(mixed $other)
     {
         return $this->value ?? $other;
     }
@@ -248,17 +291,21 @@ public function orElseGet(callable $valCreator)
     }
 
     /**
-     * @param callable(): Throwable $errCreator
+     * @param null|callable():Throwable $errCreator
      *
      * @return T
      */
-    public function orElseThrow(callable $errCreator)
+    public function orElseThrow(callable $errCreator = null)
     {
         if ($this->value !== null) {
             return $this->value;
         }
 
-        throw $errCreator();
+        if ($errCreator) {
+            throw $errCreator();
+        }
+
+        throw new UnexpectedValueException('No value present');
     }
 
     /**