Merge pull request #17 from BenRutlandWeb/feature/support

Feature/support
radiate-framework · Feb 13, 2021 · c7badf6 · c7badf6
2 parents 0ada45e + ea03195
commit c7badf6
Show file tree

Hide file tree

Showing 18 changed files with 2,444 additions and 43 deletions.
diff --git a/Radiate/Console/Parser.php b/Radiate/Console/Parser.php
@@ -3,6 +3,7 @@
 namespace Radiate\Console;
 
 use Exception;
+use Radiate\Support\Facades\Str;
 
 class Parser
 {
@@ -76,7 +77,7 @@ protected static function parseArgument(string $token): array
         [$token, $description] = static::extractDescription($token);
 
         switch (true) {
-            case static::endsWith($token, '?'):
+            case Str::endsWith($token, '?'):
                 return [
                     'type'        => 'positional',
                     'name'        => trim($token, '?'),
@@ -110,7 +111,7 @@ protected static function parseOption(string $token): array
         [$token, $description] = static::extractDescription($token);
 
         switch (true) {
-            case static::endsWith($token, '='):
+            case Str::endsWith($token, '='):
                 return [
                     'type'        => 'assoc',
                     'name'        => trim($token, '='),
@@ -145,22 +146,4 @@ protected static function extractDescription(string $token): array
 
         return count($parts) === 2 ? $parts : [$token, ''];
     }
-
-    /**
-     * Determine if a string ends with a substring
-     *
-     * @param string $haystack
-     * @param string $needle
-     * @return void
-     */
-    protected static function endsWith(string $haystack, string $needle)
-    {
-        $length = strlen($needle);
-        if (
-            !$length
-        ) {
-            return true;
-        }
-        return substr($haystack, -$length) === $needle;
-    }
 }
diff --git a/Radiate/Foundation/Application.php b/Radiate/Foundation/Application.php
@@ -9,9 +9,9 @@
 use Radiate\Foundation\Providers\ConsoleServiceProvider;
 use Radiate\Filesystem\FilesystemServiceProvider;
 use Radiate\Http\Request;
-use Radiate\Routing\Pipeline;
 use Radiate\Routing\RoutingServiceProvider;
 use Radiate\Support\Facades\Facade;
+use Radiate\Support\Pipeline;
 use Radiate\View\ViewServiceProvider;
 use RuntimeException;
 use Throwable;

diff --git a/Radiate/Mail/MailServiceProvider.php b/Radiate/Mail/MailServiceProvider.php
@@ -2,7 +2,6 @@
 
 namespace Radiate\Mail;
 
-use Parsedown;
 use Radiate\Support\ServiceProvider;
 
 class MailServiceProvider extends ServiceProvider
@@ -17,10 +16,6 @@ public function register(): void
         $this->app->singleton('mailer', function ($app) {
             return new Mailer($app['events']);
         });
-
-        $this->app->singleton('markdown', function () {
-            return new Parsedown();
-        });
     }
 
     /**

diff --git a/Radiate/Mail/Mailable.php b/Radiate/Mail/Mailable.php
@@ -2,7 +2,7 @@
 
 namespace Radiate\Mail;
 
-use Radiate\Support\Facades\App;
+use Radiate\Support\Facades\Str;
 use Radiate\Support\Facades\View;
 use ReflectionClass;
 use ReflectionProperty;
@@ -195,7 +195,7 @@ public function text(string $path, array $data = []): self
      */
     public function view(string $path, array $data = []): self
     {
-        $this->html = View::view($path, $this->buildViewData($data));
+        $this->html = View::make($path, $this->buildViewData($data));
 
         return $this;
     }
@@ -211,7 +211,7 @@ public function markdown(string $path, array $data = []): self
     {
         $this->text($path, $data);
 
-        $this->html = App::get('markdown')->text($this->text);
+        $this->html = Str::markdown($this->text);
 
         return $this;
     }

diff --git a/Radiate/Routing/Route.php b/Radiate/Routing/Route.php
@@ -4,6 +4,7 @@
 
 use Radiate\Foundation\Application;
 use Radiate\Http\Request;
+use Radiate\Support\Pipeline;
 use Throwable;
 
 abstract class Route

diff --git a/Radiate/Routing/Router.php b/Radiate/Routing/Router.php
@@ -62,19 +62,19 @@ public function __construct(Dispatcher $events, Application $app)
      *
      * @param string $uri
      * @param mixed $action
-     * @return void
+     * @return \Radiate\Routing\Route
      */
     public function ajax(string $uri, $action)
     {
         return $this->addRoute(new AjaxRoute('AJAX', $uri, $action));
     }
 
     /**
-     * Create an GET route
+     * Create a GET route
      *
      * @param string $uri
      * @param mixed $action
-     * @return void
+     * @return \Radiate\Routing\Route
      */
     public function get(string $uri, $action)
     {
@@ -86,7 +86,7 @@ public function get(string $uri, $action)
      *
      * @param string $uri
      * @param mixed $action
-     * @return void
+     * @return \Radiate\Routing\Route
      */
     public function post(string $uri, $action)
     {
@@ -98,7 +98,7 @@ public function post(string $uri, $action)
      *
      * @param string $uri
      * @param mixed $action
-     * @return void
+     * @return \Radiate\Routing\Route
      */
     public function put(string $uri, $action)
     {
@@ -110,7 +110,7 @@ public function put(string $uri, $action)
      *
      * @param string $uri
      * @param mixed $action
-     * @return void
+     * @return \Radiate\Routing\Route
      */
     public function patch(string $uri, $action)
     {
@@ -122,32 +122,32 @@ public function patch(string $uri, $action)
      *
      * @param string $uri
      * @param mixed $action
-     * @return void
+     * @return \Radiate\Routing\Route
      */
     public function delete(string $uri, $action)
     {
         return $this->addRoute(new RestRoute('DELETE', $uri, $action));
     }
 
     /**
-     * Create an route with any method
+     * Create a route with any method
      *
      * @param string $uri
      * @param mixed $action
-     * @return void
+     * @return \Radiate\Routing\Route
      */
     public function any(string $uri, $action)
     {
         return $this->addRoute(new RestRoute(['GET', 'HEAD', 'POST', 'PUT', 'PATCH', 'DELETE'], $uri, $action));
     }
 
     /**
-     * Create an route matching the given methods
+     * Create a route matching the given methods
      *
      * @param array $methods
      * @param string $uri
      * @param mixed $action
-     * @return void
+     * @return \Radiate\Routing\Route
      */
     public function matches(array $methods, string $uri, $action)
     {
@@ -190,8 +190,8 @@ public function resource(string $uri, string $action, array $methods = ['index',
     /**
      * Regsiter the route in the router
      *
-     * @param Radiate\Routing\Route $route
-     * @return void
+     * @param \Radiate\Routing\Route $route
+     * @return \Radiate\Routing\Route
      */
     public function addRoute(Route $route)
     {