@@ -5,12 +5,12 @@ |
||
5 | 5 | use Phpmig\Adapter; |
6 | 6 | use Illuminate\Database\Capsule\Manager as Capsule; |
7 | 7 | include 'settings.php'; |
8 | -$capsule = new Capsule; |
|
8 | +$capsule = new Capsule; |
|
9 | 9 | $capsule->addConnection($config['settings']['db']); |
10 | 10 | $capsule->setAsGlobal(); |
11 | 11 | $capsule->bootEloquent(); |
12 | 12 | $container = new ArrayObject(); |
13 | 13 | $container['phpmig.adapter'] = new Adapter\Illuminate\Database($capsule, 'migrations'); |
14 | -$container['phpmig.migrations_path'] = 'database/migrations'; |
|
14 | +$container['phpmig.migrations_path'] = 'database/migrations'; |
|
15 | 15 | $container['phpmig.migrations_template_path'] = 'core/resources/templates/create_migration.txt'; |
16 | 16 | return $container; |
17 | 17 | \ No newline at end of file |
@@ -34,21 +34,21 @@ discard block |
||
34 | 34 | |
35 | 35 | public function resource($url, $controller, $args = []) |
36 | 36 | { |
37 | - $url = rtrim($url,'/'); |
|
38 | - $routeNames = implode('.',explode('/',trim($url,'/'))); |
|
39 | - |
|
40 | - $this->app->group($url, function () use ($controller,$routeNames, $args) { |
|
41 | - $this->get('', $controller . ':index')->add(self::middleware('index', $args))->setName($routeNames.'.index'); |
|
42 | - $this->get('/', $controller . ':index')->add(self::middleware('index', $args))->setName($routeNames.'.index'); |
|
43 | - $this->get('/index', $controller . ':index')->add(self::middleware('index', $args))->setName($routeNames.'.index'); |
|
44 | - |
|
45 | - $this->get('/create', $controller . ':create')->add(self::middleware('create', $args))->setName($routeNames.'.create'); |
|
46 | - $this->get('/{id:[0-9]+}', $controller . ':show')->add(self::middleware('show', $args))->setName($routeNames.'.show'); |
|
47 | - $this->get('/{id:[0-9]+}/edit', $controller . ':edit')->add(self::middleware('edit', $args))->setName($routeNames.'.edit'); |
|
48 | - $this->post('', $controller . ':store')->add(self::middleware('store', $args))->setName($routeNames.'.store'); |
|
49 | - $this->put('/{id:[0-9]+}', $controller . ':update')->add(self::middleware('update', $args))->setName($routeNames.'.update'); |
|
50 | - $this->patch('/{id:[0-9]+}', $controller . ':update')->add(self::middleware('index', $args))->setName($routeNames.'.update'); |
|
51 | - $this->delete('/{id:[0-9]+}', $controller . ':destroy')->add(self::middleware('destroy', $args))->setName($routeNames.'.destroy'); |
|
37 | + $url = rtrim($url, '/'); |
|
38 | + $routeNames = implode('.', explode('/', trim($url, '/'))); |
|
39 | + |
|
40 | + $this->app->group($url, function() use ($controller, $routeNames, $args) { |
|
41 | + $this->get('', $controller . ':index')->add(self::middleware('index', $args))->setName($routeNames . '.index'); |
|
42 | + $this->get('/', $controller . ':index')->add(self::middleware('index', $args))->setName($routeNames . '.index'); |
|
43 | + $this->get('/index', $controller . ':index')->add(self::middleware('index', $args))->setName($routeNames . '.index'); |
|
44 | + |
|
45 | + $this->get('/create', $controller . ':create')->add(self::middleware('create', $args))->setName($routeNames . '.create'); |
|
46 | + $this->get('/{id:[0-9]+}', $controller . ':show')->add(self::middleware('show', $args))->setName($routeNames . '.show'); |
|
47 | + $this->get('/{id:[0-9]+}/edit', $controller . ':edit')->add(self::middleware('edit', $args))->setName($routeNames . '.edit'); |
|
48 | + $this->post('', $controller . ':store')->add(self::middleware('store', $args))->setName($routeNames . '.store'); |
|
49 | + $this->put('/{id:[0-9]+}', $controller . ':update')->add(self::middleware('update', $args))->setName($routeNames . '.update'); |
|
50 | + $this->patch('/{id:[0-9]+}', $controller . ':update')->add(self::middleware('index', $args))->setName($routeNames . '.update'); |
|
51 | + $this->delete('/{id:[0-9]+}', $controller . ':destroy')->add(self::middleware('destroy', $args))->setName($routeNames . '.destroy'); |
|
52 | 52 | |
53 | 53 | })->add(self::middleware('group', $args)); |
54 | 54 | } |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | */ |
61 | 61 | public static function middleware($middleWare = "group", $args) |
62 | 62 | { |
63 | - $routeResourceMiddleWare_default = function ($request, $response, $next) { |
|
63 | + $routeResourceMiddleWare_default = function($request, $response, $next) { |
|
64 | 64 | return $next($request, $response); |
65 | 65 | }; |
66 | 66 |
@@ -2,18 +2,18 @@ |
||
2 | 2 | use App\Controller\HomeController; |
3 | 3 | $route = new \Core\Route($app); |
4 | 4 | |
5 | -$files = getDirFiles(__APP_ROOT__.'app/Routes/'); |
|
5 | +$files = getDirFiles(__APP_ROOT__ . 'app/Routes/'); |
|
6 | 6 | /** Route Partial Loadup =================================================== */ |
7 | 7 | foreach ($files as $partial) { |
8 | - $file = __APP_ROOT__.'app/Routes/'.$partial; |
|
8 | + $file = __APP_ROOT__ . 'app/Routes/' . $partial; |
|
9 | 9 | |
10 | - if ( ! file_exists($file)) |
|
10 | + if (!file_exists($file)) |
|
11 | 11 | { |
12 | 12 | $msg = "Route partial [{$partial}] not found."; |
13 | 13 | } |
14 | 14 | include $file; |
15 | 15 | } |
16 | -$route->get('/', HomeController::class.':index')->setName('home'); |
|
16 | +$route->get('/', HomeController::class . ':index')->setName('home'); |
|
17 | 17 | |
18 | 18 | $route->resource('/user/auth', '\App\Controller\User\AuthController', $args = []); |
19 | 19 |
@@ -11,11 +11,11 @@ |
||
11 | 11 | |
12 | 12 | class Env |
13 | 13 | { |
14 | - public function __invoke($filePath ,$key, $default = null) |
|
14 | + public function __invoke($filePath, $key, $default = null) |
|
15 | 15 | { |
16 | 16 | |
17 | 17 | if (file_exists($filePath . '/.env')) { |
18 | - $_dotenv = new Dotenv($filePath ); |
|
18 | + $_dotenv = new Dotenv($filePath); |
|
19 | 19 | $_dotenv->load(); |
20 | 20 | unset($_dotenv); |
21 | 21 | }else { |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | |
14 | 14 | abstract class _TranslateHandler |
15 | 15 | { |
16 | - protected $container ; |
|
16 | + protected $container; |
|
17 | 17 | protected $local; |
18 | 18 | |
19 | 19 | function __construct(ContainerInterface $container) |
@@ -39,5 +39,5 @@ discard block |
||
39 | 39 | return $this->container; |
40 | 40 | } |
41 | 41 | |
42 | - abstract public function trans(string $key , array $replace); |
|
42 | + abstract public function trans(string $key, array $replace); |
|
43 | 43 | } |
44 | 44 | \ No newline at end of file |
@@ -8,14 +8,14 @@ discard block |
||
8 | 8 | |
9 | 9 | namespace Core\Helpers; |
10 | 10 | |
11 | -class Hash{ |
|
11 | +class Hash { |
|
12 | 12 | /** |
13 | 13 | * Receives a string password and hashes it. |
14 | 14 | * |
15 | 15 | * @param string $password |
16 | 16 | * @return string $hash |
17 | 17 | */ |
18 | - public static function hash($password){ |
|
18 | + public static function hash($password) { |
|
19 | 19 | // return (string)password_hash($password, PASSWORD_DEFAULT); |
20 | 20 | return sha1(md5($password)); |
21 | 21 | } |
@@ -27,8 +27,8 @@ discard block |
||
27 | 27 | * @param string $hash |
28 | 28 | * @return boolean If the hash was generated from the password |
29 | 29 | */ |
30 | - public static function checkHash($string, $hash){ |
|
31 | - if( password_verify( $string, $hash ) ){ |
|
30 | + public static function checkHash($string, $hash) { |
|
31 | + if (password_verify($string, $hash)) { |
|
32 | 32 | return true; |
33 | 33 | } |
34 | 34 | return false; |
@@ -12,7 +12,7 @@ |
||
12 | 12 | { |
13 | 13 | Capsule::schema()->table('users', function($table) |
14 | 14 | { |
15 | - $table->string('password',128); |
|
15 | + $table->string('password', 128); |
|
16 | 16 | }); |
17 | 17 | } |
18 | 18 |
@@ -19,9 +19,9 @@ discard block |
||
19 | 19 | { |
20 | 20 | $this->container = $container; |
21 | 21 | } |
22 | - public function get( $name, $params = array() ) |
|
22 | + public function get($name, $params = array()) |
|
23 | 23 | { |
24 | - $route = $this->container->get('router')->pathFor($name,$params); |
|
24 | + $route = $this->container->get('router')->pathFor($name, $params); |
|
25 | 25 | |
26 | 26 | |
27 | 27 | return $route; |
@@ -47,9 +47,9 @@ discard block |
||
47 | 47 | $protocol = $request->getUri()->getScheme(); |
48 | 48 | $baseHost = $request->getUri()->getHost(); |
49 | 49 | $path = $request->getUri()->getPath(); |
50 | - $pathArr = explode('/',$path); |
|
51 | - unset($pathArr[count($pathArr)-1]); |
|
52 | - $path = implode('/',$pathArr); |
|
50 | + $pathArr = explode('/', $path); |
|
51 | + unset($pathArr[count($pathArr) - 1]); |
|
52 | + $path = implode('/', $pathArr); |
|
53 | 53 | $port = $request->getUri()->getPort() ? ':' . $request->getUri()->getPort() : ''; |
54 | 54 | $baseUrl = $protocol . '://' . $baseHost . $port . $path; |
55 | 55 | return $baseUrl; |
@@ -1,5 +1,5 @@ |
||
1 | 1 | <?php |
2 | -if($config['settings']['debug'] && $config['settings']['tracy']['active']) { |
|
2 | +if ($config['settings']['debug'] && $config['settings']['tracy']['active']) { |
|
3 | 3 | $app->add(new RunTracy\Middlewares\TracyMiddleware($app)); |
4 | 4 | } |
5 | 5 |