diff --git a/ChangeLog.md b/ChangeLog.md index 23d828c..71e62a9 100755 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -3,6 +3,12 @@ XML streams to objects ## ?.?.? / ????-??-?? +## 6.1.1 / 2024-03-29 + +* Fixed "Implicitly marking parameter ... as nullable is deprecated" + warnings + (@thekid) + ## 6.1.0 / 2024-03-24 * Made compatible with XP 12 - @thekid diff --git a/src/main/php/util/address/Iteration.class.php b/src/main/php/util/address/Iteration.class.php index 2967e9b..f5bdf0b 100755 --- a/src/main/php/util/address/Iteration.class.php +++ b/src/main/php/util/address/Iteration.class.php @@ -26,10 +26,10 @@ public function path() { return $this->it->valid() ? $this->it->key() : null; } /** * Returns the next value according to the given definition. * - * @param util.address.Definition $definition + * @param ?util.address.Definition $definition * @return var */ - public function next(Definition $definition= null) { + public function next($definition= null) { $this->tokens[]= $this->it->token; $value= null === $definition ? $this->it->current() : $this->it->value($definition, false); diff --git a/src/main/php/util/address/Pointer.class.php b/src/main/php/util/address/Pointer.class.php index 0f89ae0..3eec216 100755 --- a/src/main/php/util/address/Pointer.class.php +++ b/src/main/php/util/address/Pointer.class.php @@ -14,11 +14,11 @@ public function streaming() { return $this->streaming; } /** * Returns the current value according to the given definition * - * @param util.address.Definition $definition + * @param ?util.address.Definition $definition * @return var * @throws util.NoSuchElementException if there are no more elements */ - public function value(Definition $definition= null) { + public function value($definition= null) { $it= $this->streaming->getIterator(true); return null === $definition ? $it->current() : $it->value($definition, $this->streaming, true); } diff --git a/src/main/php/util/address/Streaming.class.php b/src/main/php/util/address/Streaming.class.php index dc59b89..ae647ea 100755 --- a/src/main/php/util/address/Streaming.class.php +++ b/src/main/php/util/address/Streaming.class.php @@ -95,11 +95,11 @@ public function path() { /** * Returns the current value according to the given definition * - * @param util.address.Definition $definition + * @param ?util.address.Definition $definition * @return var * @throws util.NoSuchElementException if there are no more elements */ - public function value(Definition $definition= null) { + public function value($definition= null) { $it= $this->getIterator(true); if ($it->valid()) { return null === $definition ? $it->current() : $it->value($definition, true); @@ -111,11 +111,11 @@ public function value(Definition $definition= null) { /** * Returns the next value according to the given definition * - * @param util.address.Definition $definition + * @param ?util.address.Definition $definition * @return var * @throws util.NoSuchElementException if there are no more elements */ - public function next(Definition $definition= null) { + public function next($definition= null) { $it= $this->getIterator(true); if ($it->valid()) { $value= null === $definition ? $it->current() : $it->value($definition, false);