Merged release/0.1.2 into master

Author: wilcorrea

bootstrap/function.php

@@ -355,3 +355,55 @@ function test($output, $optional = null)
     }
     return $optional;
 }
+
+/**
+ * @param array $argv
+ * @return array
+ */
+function argv(array $argv): array
+{
+    array_shift($argv);
+
+    $parameters = [];
+    foreach ($argv as $arg) {
+        $parameter = explode('=', $arg);
+        $value = $parameter[0];
+        if (count($parameter) === 2) {
+            $parameters[$value] = $parameter[1];
+            continue;
+        }
+        $parameters[] = $value;
+    }
+    return $parameters;
+}
+
+/**
+ * @param string $camelCase
+ * @return string
+ */
+function dasherize(string $camelCase): string
+{
+    $dashes = preg_replace_callback('/([A-Z])/',
+        create_function('$matches', 'return \'-\' . strtolower($matches[1]);'), $camelCase
+    );
+    return substr($dashes, 1);
+}
+
+/**
+ * @param string $dashes
+ * @param bool $first
+ * @return mixed
+ * @SuppressWarnings("BooleanArgumentFlag")
+ */
+function camelize(string $dashes, $first = true): string
+{
+    $camelCase = preg_replace_callback('/-(.)/',
+        create_function('$matches', 'return strtoupper($matches[1]);'), $dashes
+    );
+    $case = 'strtoupper';
+    if (!$first) {
+        $case = 'strtolower';
+    }
+    $camelCase[0] = $case($camelCase[0]);
+    return (string)$camelCase;
+}

composer.json

@@ -10,7 +10,7 @@
   ],
   "homepage": "https://github.com/phpzm/core",
   "license": "MIT",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "type": "package",
   "authors": [
     {"name": "William", "email": "wilcorrea@gmail.com"},
@@ -19,7 +19,6 @@
   "require": {
     "php": ">=7.0",
     "psr/http-message": "^1.0",
-    "danielstjules/stringy": "^2.3",
     "phpmailer/phpmailer": "^5.2",
     "neitanod/forceutf8": "^2.0"
   },

src/Console/GeneratorService.php

@@ -22,8 +22,10 @@ abstract class GeneratorService extends Service
 
     /**
      * @param App $app
+     * @param array $parameters
+     * @SuppressWarnings("unused")
      */
-    public static function execute(App $app)
+    public static function execute(App $app, array $parameters = [])
     {
         $option = '';
         do {

src/Console/HelpService.php

@@ -12,9 +12,10 @@ abstract class HelpService extends Service
 {
     /**
      * @param App $app
+     * @param array $parameters
      * @SuppressWarnings("unused")
      */
-    public static function execute(App $app)
+    public static function execute(App $app, array $parameters = [])
     {
         echo " # HELP\n";
         echo " Choose one option:\n";

src/Console/MigratoryService.php

@@ -14,9 +14,10 @@ class MigratoryService extends Service
 {
     /**
      * @param App $app
+     * @param array $parameters
      * @SuppressWarnings("unused")
      */
-    public static function execute(App $app)
+    public static function execute(App $app, array $parameters = [])
     {
         // TODO: Implement execute() method.
     }

src/Console/RouteService.php

@@ -14,8 +14,10 @@ abstract class RouteService extends Service
 {
     /**
      * @param App $app
+     * @param array $parameters
+     * @SuppressWarnings("unused")
      */
-    public static function execute(App $app)
+    public static function execute(App $app, array $parameters = [])
     {
         $router = new Router($app::options('labels'), $app::options('type'));
 

src/Console/Service.php

@@ -17,6 +17,7 @@ abstract class Service
 
     /**
      * @param App $app
+     * @param array $parameters
      */
-    abstract public static function execute(App $app);
+    abstract public static function execute(App $app, array $parameters = []);
 }

src/Data/Validator.php

@@ -9,7 +9,6 @@
 use Simples\Core\Data\Validators\NumberValidator;
 use Simples\Core\Data\Validators\StringValidator;
 use Simples\Core\Helper\JSON;
-use Stringy\Stringy;
 
 /**
  * Class Validator
@@ -75,7 +74,7 @@ public static function rule($criteria, $value): array
      */
     public function apply(string $rule, $value, $options): bool
     {
-        $method = (string)Stringy::create("is-{$rule}")->camelize();
+        $method = camelize("is-{$rule}");
         if (method_exists($this, $method)) {
             return $this->$method($value, $options);
         }

src/Http/Controller.php

@@ -93,7 +93,7 @@ abstract class Controller
      * @param Match $match
      * @return $this
      */
-    public function __invoke(Request $request, Response $response, Match $match)
+    public final function boot(Request $request, Response $response, Match $match)
     {
         $this->request = $request;
         $this->response = $response;

src/Kernel/App.php

@@ -3,12 +3,6 @@
 namespace Simples\Core\Kernel;
 
 use ErrorException;
-use Simples\Core\Console\ControllerService;
-use Simples\Core\Console\HelpService;
-use Simples\Core\Console\ModelService;
-use Simples\Core\Console\RepositoryService;
-use Simples\Core\Console\RouteService;
-use Simples\Core\Console\Service;
 use Simples\Core\Http\Request;
 use Simples\Core\Http\Response;
 use Simples\Core\Persistence\Transaction;
@@ -137,40 +131,11 @@ public function http($output = true)
     /**
      * Handler to cli services, provide a interface to access services
      *
-     * @param string $service The requested service
+     * @param array $service The requested service
      */
-    public function cli($service)
+    public function cli(array $service)
     {
-        echo "@start/\n";
-        echo "Press ^C or type 'exit' at any time to quit.\n";
-
-        do {
-            switch ($service) {
-                case 'route': {
-                    RouteService::execute($this);
-                    $service = '';
-                    break;
-                }
-                case 'model': {
-                    ModelService::execute($this);
-                    $service = '';
-                    break;
-                }
-                case 'controller':
-                    ControllerService::execute($this);
-                    $service = '';
-                    break;
-                case 'repository':
-                    RepositoryService::execute($this);
-                    $service = '';
-                    break;
-            };
-            if (!$service || $service === 'help') {
-                HelpService::execute($this);
-            }
-
-            $service = read();
-        } while (!in_array($service, Service::KILLERS));
+        Console::handler($this, $service);
     }
 
     /**