Remove deprecated usage of functions calling $it->next()

src/main/php/util/address/ByAddresses.class.php

@@ -1,6 +1,6 @@
 <?php namespace util\address;
 
-use ReflectionFunction;
+use Generator;
 
 /** Base class for ValueOf, ObjectOf and RecordOf */
 abstract class ByAddresses implements Definition {
@@ -9,30 +9,19 @@ abstract class ByAddresses implements Definition {
   /** @param [:function(var, ?string): Generator] */
   public function __construct($addresses) {
     foreach ($addresses as $path => $address) {
-      $this->add($path, new ReflectionFunction($address), $address);
+      $this->add($path, $address);
     }
   }
 
   /**
    * Add a given address function for a given path or a list of paths.
    *
    * @param  string $path
-   * @param  ReflectionFunction $reflect
    * @param  function(var, ?string): Generator $address
    */
-  protected function add($path, $reflect, $address) {
-    if ($reflect->isGenerator()) {
-      $handler= $address;
-    } else {
-      '/' === $path || trigger_error('Use function(var, string) instead!', E_USER_DEPRECATED);
-      $handler= function(&$result, $path, $iteration) use($address) {
-        $address($result, $iteration, $path);
-        return [];
-      };
-    }
-
+  protected function add($path, $address) {
     foreach (explode('|', $path) as $match) {
-      $this->addresses[$match]= $handler;
+      $this->addresses[$match]= $address;
     }
   }
 
@@ -47,6 +36,8 @@ protected function add($path, $reflect, $address) {
    */
   protected function invoke($address, &$result, $iteration, $path) {
     $r= $address($result, $path, $iteration);
+    if (!($r instanceof Generator)) return;
+
     foreach ($r as $definition) {
       $r->send($iteration->next($definition));
     }

src/main/php/util/address/ObjectOf.class.php

@@ -27,7 +27,7 @@ public function __construct($type, array $addresses) {
     $class= $this->type->literal();
     foreach ($addresses as $path => $address) {
       $reflect= new ReflectionFunction($address);
-      $this->add($path, $reflect, $address->bindTo($reflect->getClosureThis(), $class));
+      $this->add($path, $address->bindTo($reflect->getClosureThis(), $class));
     }
   }