Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/java-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ jobs:
lts: 11
- se: 10
lts: 11
- se: 11
lts: 11
- se: 16
lts: 17
name: Java SE ${{ matrix.se }}
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ The **entire feature set is explicitly described and checked** by:
- [`JavaSe8/OptionalTest.java`](./tests/JavaSe8/OptionalTest.java)
- [`JavaSe9/OptionalTest.java`](./tests/JavaSe9/OptionalTest.java)
- [`JavaSe10/OptionalTest.java`](./tests/JavaSe10/OptionalTest.java)
- [`JavaSe11/OptionalTest.java`](./tests/JavaSe11/OptionalTest.java)
- [`JavaSe16/OptionalTest.java`](./tests/JavaSe16/OptionalTest.java)

This ensures absolute reliability and alignment with the Java specification.
Expand Down
24 changes: 24 additions & 0 deletions src/JavaSe11/Optional.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php

declare(strict_types=1);

namespace PetrKnap\Optional\JavaSe11;

use PetrKnap\Optional\JavaSe10;

/**
* A container object which may or may not contain a non-null value.
*
* @template-covariant T of mixed type of non-null value
*
* @see https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/Optional.html
*
* @extends JavaSe10\Optional<T>
*/
interface Optional extends JavaSe10\Optional
{
/**
* If a value is not present, returns `true`, otherwise `false`.
*/
public function isEmpty(): bool;
}
15 changes: 13 additions & 2 deletions src/Optional.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
/**
* @template-covariant T of mixed type of non-null value
*
* @implements JavaSe10\Optional<T>
* @implements JavaSe11\Optional<T>
*/
abstract class Optional implements JavaSe10\Optional
abstract class Optional implements JavaSe11\Optional
{
/**
* @param T|null $value
Expand Down Expand Up @@ -194,6 +194,17 @@ public function ifPresentOrElse(callable $action, callable $emptyAction): void
$this->ifPresent($action, else: $emptyAction);
}

/**
* @note do not use it internally, compare {@see self::$value} to `null` directly
*/
public function isEmpty(): bool
{
return $this->value === null;
}

/**
* @note do not use it internally, compare {@see self::$value} to `null` directly
*/
public function isPresent(): bool
{
return $this->value !== null;
Expand Down
16 changes: 16 additions & 0 deletions tests/JavaSe11/OptionalTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import java.util.Optional;

/**
* @note `assert`s are written as `assert (...)` to simplify translate to PHP
* @note variable names are prefixed by `$` to simplify translate to PHP
*/
public class OptionalTest {
public static void main(String[] args) {
testIsEmpty();
}

private static void testIsEmpty() {
assert (Optional.of(1).isEmpty() == false);
assert (Optional.empty().isEmpty() == true);
}
}
19 changes: 19 additions & 0 deletions tests/JavaSe11/OptionalTestCase.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?php

declare(strict_types=1);

namespace PetrKnap\Optional\JavaSe11;

use PetrKnap\Optional\JavaSe10;

abstract class OptionalTestCase extends JavaSe10\OptionalTestCase
{
#[\Override]
protected static function getJavaLines(): array
{
return array_merge(
parent::getJavaLines(),
self::loadJavaLines(__DIR__ . '/OptionalTest.java'),
);
}
}
5 changes: 2 additions & 3 deletions tests/JavaSe16/OptionalTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@

namespace PetrKnap\Optional\JavaSe16;

use PetrKnap\Optional\JavaSe10;
use stdClass;
use PetrKnap\Optional\JavaSe11;

abstract class OptionalTestCase extends JavaSe10\OptionalTestCase
abstract class OptionalTestCase extends JavaSe11\OptionalTestCase
{
#[\Override]
protected static function getJavaLines(): array
Expand Down
Loading