[FND-X] Fix functional-php bugs

Author: Moufle

src/Functional/FirstIndexOf.php

@@ -25,17 +25,9 @@ function first_index_of($collection, $value)
 {
     InvalidArgumentException::assertCollection($collection, __FUNCTION__, 1);
 
-    if (\is_callable($value)) {
-        foreach ($collection as $index => $element) {
-            if ($element === $value($element, $index, $collection)) {
-                return $index;
-            }
-        }
-    } else {
-        foreach ($collection as $index => $element) {
-            if ($element === $value) {
-                return $index;
-            }
+    foreach ($collection as $index => $element) {
+        if ($element === $value) {
+            return $index;
         }
     }
 

src/Functional/IndexesOf.php

@@ -18,7 +18,7 @@
  * empty array if no values were found.
  *
  * @param Traversable|array $collection
- * @param mixed|callable $value
+ * @param mixed $value
  * @return array
  * @no-named-arguments
  */
@@ -28,17 +28,9 @@ function indexes_of($collection, $value)
 
     $result = [];
 
-    if (\is_callable($value)) {
-        foreach ($collection as $index => $element) {
-            if ($element === $value($element, $index, $collection)) {
-                $result[] = $index;
-            }
-        }
-    } else {
-        foreach ($collection as $index => $element) {
-            if ($element === $value) {
-                $result[] = $index;
-            }
+    foreach ($collection as $index => $element) {
+        if ($element === $value) {
+            $result[] = $index;
         }
     }
 

src/Functional/LastIndexOf.php

@@ -27,17 +27,9 @@ function last_index_of($collection, $value)
 
     $matchingIndex = false;
 
-    if (\is_callable($value)) {
-        foreach ($collection as $index => $element) {
-            if ($element === $value($element, $index, $collection)) {
-                $matchingIndex = $index;
-            }
-        }
-    } else {
-        foreach ($collection as $index => $element) {
-            if ($element === $value) {
-                $matchingIndex = $index;
-            }
+    foreach ($collection as $index => $element) {
+        if ($element === $value) {
+            $matchingIndex = $index;
         }
     }
 

src/Functional/With.php

@@ -17,24 +17,17 @@
  *
  * @param mixed $value
  * @param callable $callback
- * @param bool $invokeValue Set to false to not invoke $value if it is a callable. Will be removed in 2.0
  * @param mixed $default The default value to return if $value is null
  * @return mixed
  * @no-named-arguments
  */
-function with($value, callable $callback, $invokeValue = true, $default = null)
+function with($value, callable $callback, $default = null)
 {
     InvalidArgumentException::assertCallback($callback, __FUNCTION__, 2);
 
     if ($value === null) {
         return $default;
     }
 
-    if ($invokeValue && \is_callable($value)) {
-        \trigger_error('Invoking the value is deprecated and will be removed in 2.0', E_USER_DEPRECATED);
-
-        $value = $value();
-    }
-
     return $callback($value);
 }

tests/Functional/FirstIndexOfTest.php

@@ -40,16 +40,6 @@ public function testIfValueCouldNotBeFoundFalseIsReturned(): void
         self::assertFalse(first_index_of($this->hashIterator, 'invalidValue'));
     }
 
-    public function testPassCallback(): void
-    {
-        self::assertSame(
-            0,
-            first_index_of($this->list, function ($element) {
-                return $element;
-            })
-        );
-    }
-
     public function testPassNoCollection(): void
     {
         $this->expectArgumentError('Functional\first_index_of() expects parameter 1 to be array or instance of Traversable');

tests/Functional/LastIndexOfTest.php

@@ -40,16 +40,6 @@ public function testIfValueCouldNotBeFoundFalseIsReturned(): void
         self::assertFalse(last_index_of($this->hashIterator, 'invalidValue'));
     }
 
-    public function testPassCallback(): void
-    {
-        self::assertSame(
-            3,
-            last_index_of($this->list, function ($element) {
-                return $element;
-            })
-        );
-    }
-
     public function testPassNoCollection(): void
     {
         $this->expectArgumentError('Functional\last_index_of() expects parameter 1 to be array or instance of Traversable');

tests/Functional/WithTest.php

@@ -50,7 +50,6 @@ public function testDefaultValue(): void
                 null,
                 static function () {
                 },
-                false,
                 'foo'
             )
         );