update helper function names to avoid collisons with Laravel helpers

Author: patinthehat

src/Results/Nodes/ParameterNode.php

@@ -26,7 +26,7 @@ public function __construct(Node\Param $node)
         if ($node->type instanceof Node\NullableType) {
             $this->type = $node->getType();
         } else {
-            $this->type = optional($node->type)->toString();
+            $this->type = opt($node->type)->toString();
         }
 
         $this->default = $node->default ? ExpressionTransformer::parserNodeToResultNode($node->default) : null;

src/Results/Nodes/Traits/BootsTraits.php

@@ -10,7 +10,7 @@ protected function bootTraits($node): void
     {
         $reflectionObject = new \ReflectionObject($this);
 
-        collect($reflectionObject->getTraitNames())
+        collection($reflectionObject->getTraitNames())
             ->map(function (string $name) {
                 if (strpos($name, __NAMESPACE__) === false) {
                     return null;

src/Searcher.php

@@ -180,7 +180,7 @@ protected function findReferences(array $ast, string $class, array $names): arra
     {
         $nodes = (new NodeFinder())->findInstanceOf($ast, $class);
 
-        return collect($nodes)->filter(function (Node $node) use ($names) {
+        return collection($nodes)->filter(function (Node $node) use ($names) {
             $name = NameResolver::resolve($node) ?? false;
 
             return $name && Arr::matchesAny($name, $names, true);

src/Support/Arr.php

@@ -46,7 +46,7 @@ public static function matchesAny($strings, array $values, bool $allowRegex = tr
             $strings = [$strings];
         }
 
-        return collect($strings)->map(function ($str) use ($values, $allowRegex) {
+        return collection($strings)->map(function ($str) use ($values, $allowRegex) {
             if (is_array($str)) {
                 return self::matchesAny($str, $values, $allowRegex);
             }
@@ -123,7 +123,7 @@ public static function first($array, callable $callback = null, $default = null)
     {
         if (is_null($callback)) {
             if (empty($array)) {
-                return value($default);
+                return val($default);
             }
 
             foreach ($array as $item) {
@@ -137,7 +137,7 @@ public static function first($array, callable $callback = null, $default = null)
             }
         }
 
-        return value($default);
+        return val($default);
     }
 
     /**
@@ -151,7 +151,7 @@ public static function first($array, callable $callback = null, $default = null)
     public static function last(array $array, callable $callback = null, $default = null)
     {
         if (is_null($callback)) {
-            return empty($array) ? value($default) : end($array);
+            return empty($array) ? val($default) : end($array);
         }
 
         return static::first(array_reverse($array, true), $callback, $default);
@@ -172,15 +172,15 @@ public static function pluck($array, $value, $key = null): array
         [$value, $key] = static::explodePluckParameters($value, $key);
 
         foreach ($array as $item) {
-            $itemValue = data_get($item, $value);
+            $itemValue = get_data($item, $value);
 
             // If the key is "null", we will just append the value to the array and keep
             // looping. Otherwise we will key the array using the value of the key we
             // received from the developer. Then we'll return the final array form.
             if (is_null($key)) {
                 $results[] = $itemValue;
             } else {
-                $itemKey = data_get($item, $key);
+                $itemKey = get_data($item, $key);
 
                 if (is_object($itemKey) && method_exists($itemKey, '__toString')) {
                     $itemKey = (string) $itemKey;

src/Support/Collections/Collection.php

@@ -178,7 +178,7 @@ public function whereIn(string $key, $values, bool $strict = false): self
         $values = $this->getArrayableItems($values);
 
         return $this->filter(function ($item) use ($key, $values, $strict) {
-            return in_array(data_get($item, $key), $values, $strict);
+            return in_array(get_data($item, $key), $values, $strict);
         });
     }
 
@@ -210,7 +210,7 @@ protected function operatorForWhere(string $key, ?string $operator = null, $valu
         }
 
         return function ($item) use ($key, $operator, $value) {
-            $retrieved = data_get($item, $key);
+            $retrieved = get_data($item, $key);
 
             $strings = array_filter([$retrieved, $value], function ($value) {
                 return is_string($value) || (is_object($value) && method_exists($value, '__toString'));

src/Support/ExpressionTransformer.php

@@ -35,7 +35,7 @@ class ExpressionTransformer
 {
     public static function parserNodesToResultNodes(array $nodes): array
     {
-        return collect($nodes)->map(function ($node) {
+        return collection($nodes)->map(function ($node) {
             return static::parserNodeToResultNode($node);
         })->all();
     }

src/Support/NameResolver.php

@@ -68,7 +68,7 @@ public static function resolve($node)
 
     public static function resolveAll(array $nodes): array
     {
-        return collect($nodes)->each(function ($node) {
+        return collection($nodes)->each(function ($node) {
             return self::resolve($node);
         })->filter()->all();
     }

src/Support/StatementTransformer.php

@@ -30,7 +30,7 @@ public static function parserNodeToResultNode(Node $node)
 
     public static function parserNodesToResultNode(array $nodes): array
     {
-        return collect($nodes)->map(function ($node) {
+        return collection($nodes)->map(function ($node) {
             return self::parserNodeToResultNode($node);
         })->toArray();
     }

src/Support/helpers.php

@@ -3,8 +3,13 @@
 use Permafrost\PhpCodeSearch\Support\Arr;
 use Permafrost\PhpCodeSearch\Support\Collections\Collection;
 
-if (! function_exists('optional')) {
-    function optional($value)
+if (! function_exists('opt')) {
+    /**
+     * "optional" helper function
+     * @param $value
+     * @return mixed|__anonymous@237
+     */
+    function opt($value)
     {
         if (! $value) {
             return new class {
@@ -20,12 +25,12 @@ public function __call($name, $arguments)
             };
         }
 
-        return value($value);
+        return val($value);
     }
 }
 
 /** @codeCoverageIgnore */
-if (! function_exists('data_get')) {
+if (! function_exists('get_data')) {
     /**
      * Get an item from an array or object using "dot" notation.
      *
@@ -34,7 +39,7 @@ public function __call($name, $arguments)
      * @param  mixed  $default
      * @return mixed
      */
-    function data_get($target, $key, $default = null)
+    function get_data($target, $key, $default = null)
     {
         if (is_null($key)) {
             return $target;
@@ -53,13 +58,13 @@ function data_get($target, $key, $default = null)
                 if ($target instanceof Collection) {
                     $target = $target->all();
                 } elseif (! is_iterable($target)) {
-                    return value($default);
+                    return val($default);
                 }
 
                 $result = [];
 
                 foreach ($target as $item) {
-                    $result[] = data_get($item, $key);
+                    $result[] = get_data($item, $key);
                 }
 
                 return in_array('*', $key) ? Arr::collapse($result) : $result;
@@ -70,7 +75,7 @@ function data_get($target, $key, $default = null)
             } elseif (is_object($target) && isset($target->{$segment})) {
                 $target = $target->{$segment};
             } else {
-                return value($default);
+                return val($default);
             }
         }
 
@@ -79,21 +84,21 @@ function data_get($target, $key, $default = null)
 }
 
 /** @codeCoverageIgnore */
-if (! function_exists('value')) {
+if (! function_exists('val')) {
     /**
      * Return the default value of the given value.
      *
      * @param  mixed  $value
      * @return mixed
      */
-    function value($value, ...$args)
+    function val($value, ...$args)
     {
         return $value instanceof Closure ? $value(...$args) : $value;
     }
 }
 
-if (! function_exists('collect')) {
-    function collect($items)
+if (! function_exists('collection')) {
+    function collection($items)
     {
         return new Collection($items);
     }

tests/Support/HelpersTest.php

@@ -9,7 +9,7 @@ class HelpersTest extends TestCase
     /** @test */
     public function it_optionally_allows_chaining_method_calls_when_passed_a_null_argument()
     {
-        $this->assertNull(optional(null)->test());
+        $this->assertNull(opt(null)->test());
     }
 
     /** @test */
@@ -22,6 +22,6 @@ public function test()
             }
         };
 
-        $this->assertEquals(123, optional($class)->test());
+        $this->assertEquals(123, opt($class)->test());
     }
 }