Clean up helpers

cli/includes/helpers.php

@@ -33,7 +33,7 @@
  * Set or get a global console writer.
  *
  * @param  null|Symfony\Component\Console\Output\ConsoleOutputInterface  $writer
- * @return void|Symfony\Component\Console\Output\ConsoleOutputInterface
+ * @return Symfony\Component\Console\Output\ConsoleOutputInterface
  */
 function writer($writer = null)
 {
@@ -47,7 +47,7 @@ function writer($writer = null)
         return $container->make('writer');
     }
 
-    Container::getInstance()->instance('writer', $writer);
+    return Container::getInstance()->instance('writer', $writer);
 }
 
 /**
@@ -109,17 +109,15 @@ function output($output)
     writer()->writeln($output);
 }
 
-if (! function_exists('resolve')) {
+/**
-    /**
+ * Resolve the given class from the container.
-     * Resolve the given class from the container.
+ *
-     *
+ * @param  string  $class
-     * @param  string  $class
+ * @return mixed
-     * @return mixed
+ */
-     */
+function resolve($class)
-    function resolve($class)
+{
-    {
+    return Container::getInstance()->make($class);
-        return Container::getInstance()->make($class);
-    }
 }
 
 /**
@@ -134,33 +132,31 @@ function swap($class, $instance)
     Container::getInstance()->instance($class, $instance);
 }
 
-if (! function_exists('retry')) {
+/**
-    /**
+ * Retry the given function N times.
-     * Retry the given function N times.
+ *
-     *
+ * @param  int  $retries
-     * @param  int  $retries
+ * @param  callable  $retries
-     * @param  callable  $retries
+ * @param  int  $sleep
-     * @param  int  $sleep
+ * @return mixed
-     * @return mixed
+ */
-     */
+function retry($retries, $fn, $sleep = 0)
-    function retry($retries, $fn, $sleep = 0)
+{
-    {
+    beginning:
-        beginning:
+    try {
-        try {
+        return $fn();
-            return $fn();
+    } catch (Exception $e) {
-        } catch (Exception $e) {
+        if (! $retries) {
-            if (! $retries) {
+            throw $e;
-                throw $e;
-            }
-
-            $retries--;
-
-            if ($sleep > 0) {
-                usleep($sleep * 1000);
-            }
-
-            goto beginning;
         }
+
+        $retries--;
+
+        if ($sleep > 0) {
+            usleep($sleep * 1000);
+        }
+
+        goto beginning;
     }
 }
 
@@ -176,60 +172,54 @@ function should_be_sudo()
     }
 }
 
-if (! function_exists('tap')) {
+/**
-    /**
+ * Tap the given value.
-     * Tap the given value.
+ *
-     *
+ * @param  mixed  $value
-     * @param  mixed  $value
+ * @param  callable  $callback
-     * @param  callable  $callback
+ * @return mixed
-     * @return mixed
+ */
-     */
+function tap($value, callable $callback)
-    function tap($value, callable $callback)
+{
-    {
+    $callback($value);
-        $callback($value);
 
-        return $value;
+    return $value;
-    }
 }
 
-if (! function_exists('ends_with')) {
+/**
-    /**
+ * Determine if a given string ends with a given substring.
-     * Determine if a given string ends with a given substring.
+ *
-     *
+ * @param  string  $haystack
-     * @param  string  $haystack
+ * @param  string|array  $needles
-     * @param  string|array  $needles
+ * @return bool
-     * @return bool
+ */
-     */
+function ends_with($haystack, $needles)
-    function ends_with($haystack, $needles)
+{
-    {
+    foreach ((array) $needles as $needle) {
-        foreach ((array) $needles as $needle) {
+        if (substr($haystack, -strlen($needle)) === (string) $needle) {
-            if (substr($haystack, -strlen($needle)) === (string) $needle) {
+            return true;
-                return true;
-            }
         }
-
-        return false;
     }
+
+    return false;
 }
 
-if (! function_exists('starts_with')) {
+/**
-    /**
+ * Determine if a given string starts with a given substring.
-     * Determine if a given string starts with a given substring.
+ *
-     *
+ * @param  string  $haystack
-     * @param  string  $haystack
+ * @param  string|string[]  $needles
-     * @param  string|string[]  $needles
+ * @return bool
-     * @return bool
+ */
-     */
+function starts_with($haystack, $needles)
-    function starts_with($haystack, $needles)
+{
-    {
+    foreach ((array) $needles as $needle) {
-        foreach ((array) $needles as $needle) {
+        if ((string) $needle !== '' && strncmp($haystack, $needle, strlen($needle)) === 0) {
-            if ((string) $needle !== '' && strncmp($haystack, $needle, strlen($needle)) === 0) {
+            return true;
-                return true;
-            }
         }
-
-        return false;
     }
+
+    return false;
 }
 
 /**