kot13 / bootstrapi

public/index.php

Spacing +5 added lines, -5 removed lines

@@ -13,22 +13,22 @@
     };
 }
 
-require __DIR__ . '/../vendor/autoload.php';
+require __DIR__.'/../vendor/autoload.php';
 
 session_start();
 
-$settings = require __DIR__ . '/../app/settings.php';
+$settings = require __DIR__.'/../app/settings.php';
 
 $app = new \Slim\App($settings);
 
 // Set up dependencies
-require __DIR__ . '/../app/dependencies.php';
+require __DIR__.'/../app/dependencies.php';
 
 // Register middleware
-require __DIR__ . '/../app/middleware.php';
+require __DIR__.'/../app/middleware.php';
 
 // Register routes
-require __DIR__ . '/../app/routes.php';
+require __DIR__.'/../app/routes.php';
 
 // Run!
 $app->run();
\ No newline at end of file

Braces +2 added lines, -1 removed lines

@@ -5,7 +5,8 @@
 }
 
 // Super debug func
-function prr($value) {
+function prr($value)
+{
     if (defined('DEBUG_MODE') && DEBUG_MODE == 1) {
         echo '<pre>';
         print_r($value);

app/routes.php

Spacing +5 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 // Routes
-$app->group('/api', function () {
-    $this->options('[/{params:.*}]', function ($request, $response, $args) {
+$app->group('/api', function() {
+    $this->options('[/{params:.*}]', function($request, $response, $args) {
         return $response->withHeader('Access-Control-Allow-Origin', '*')
             ->withHeader('Access-Control-Allow-Methods', 'GET, PUT, PATCH, POST, DELETE, OPTIONS')
             ->withHeader('Access-Control-Allow-Credentials', 'true')
@@ -11,7 +11,7 @@ 
 
     $this->post('/token', 'App\Controller\TokenController:auth');
 
-    $this->group('/{entity:user}', function () {
+    $this->group('/{entity:user}', function() {
         $this->get('', 'App\Controller\UserController:actionIndex');
         $this->post('', 'App\Controller\UserController:actionCreate');
         $this->get('/{id:[0-9]+}', 'App\Controller\UserController:actionGet');
@@ -22,7 +22,7 @@ 
         $this->post('/reset-password', 'App\Controller\UserController:actionResetPassword');
     });
 
-    $this->group('/{entity:role|right}', function () {
+    $this->group('/{entity:role|right}', function() {
         $this->get('', 'App\Controller\CrudController:actionIndex');
         $this->get('/{id:[0-9]+}', 'App\Controller\CrudController:actionGet');
         $this->post('', 'App\Controller\CrudController:actionCreate');
@@ -30,7 +30,7 @@ 
         $this->delete('/{id:[0-9]+}', 'App\Controller\CrudController:actionDelete');
     });
 
-    $this->group('/{entity:log}', function () {
+    $this->group('/{entity:log}', function() {
         $this->get('', 'App\Controller\CrudController:actionIndex');
         $this->get('/{id:[0-9]+}', 'App\Controller\CrudController:actionGet');
     });

app/database/migrations/20160706232752_create_roles_table.php

Braces +1 added lines, -2 removed lines

@@ -8,8 +8,7 @@
      */
     public function up()
     {
-        Capsule::schema()->create('roles', function($table)
-        {
+        Capsule::schema()->create('roles', function($table) {
             $table->increments('id');
             $table->string('name')->unique();
             $table->string('description');

app/database/seeds/20160706233231_create_roles_rights_users.php

Braces +2 added lines, -1 removed lines

@@ -2,7 +2,8 @@
 use App\Model\Role;
 use App\Model\User;
 
-class CreateRolesRightsUsers {
+class CreateRolesRightsUsers
+{
     public function run()
     {
         Role::create([

app/dependencies.php

Spacing +15 added lines, -15 removed lines

@@ -22,20 +22,20 @@ 
 $container = $app->getContainer();
 
 // render
-$container['renderer'] = function($c){
+$container['renderer'] = function($c) {
     $renderer = new Renderer();
 
     return $renderer;
 };
 
-$container['mailRenderer'] = function($c){
+$container['mailRenderer'] = function($c) {
     $settings = $c->get('settings');
     $renderer = new MailRenderer($settings['mailTemplate']);
     return $renderer;
 };
 
 // monolog
-$container['logger'] = function ($c) {
+$container['logger'] = function($c) {
     $settings = $c->get('settings');
     $logger   = new Logger($settings['logger']['name']);
     $logger->pushProcessor(new UidProcessor());
@@ -45,8 +45,8 @@ 
 };
 
 // error handlers
-$container['errorHandler'] = function ($c) {
-    return function ($request, $response, $exception) use ($c) {
+$container['errorHandler'] = function($c) {
+    return function($request, $response, $exception) use ($c) {
         $details = (defined('DEBUG_MODE') && DEBUG_MODE == 1) ? $exception->getMessage() : 'Internal server error';
         $e = new JsonException(null, 500, 'Internal server error', $details);
 
@@ -54,14 +54,14 @@ 
     };
 };
 
-$container['notAllowedHandler'] = function ($c) {
-    return function ($request, $response, $methods) use ($c) {
-        throw new JsonException(null, 405, 'Method Not Allowed', 'Method must be one of: ' . implode(', ', $methods));
+$container['notAllowedHandler'] = function($c) {
+    return function($request, $response, $methods) use ($c) {
+        throw new JsonException(null, 405, 'Method Not Allowed', 'Method must be one of: '.implode(', ', $methods));
     };
 };
 
-$container['notFoundHandler'] = function ($c) {
-    return function ($request, $response) use ($c) {
+$container['notFoundHandler'] = function($c) {
+    return function($request, $response) use ($c) {
         throw new JsonException(null, 404, 'Not found', 'Entity not found');
     };
 };
@@ -69,7 +69,7 @@ 
 // database
 $setting = $container->get('settings');
 $capsule = new Capsule;
-foreach ($setting['database']['connections'] as $name => $connection){
+foreach ($setting['database']['connections'] as $name => $connection) {
     $capsule->addConnection($connection, $name);
 }
 $capsule->setEventDispatcher(new Dispatcher(new Container));
@@ -79,7 +79,7 @@ 
 $container['databaseManager'] = $capsule->getDatabaseManager();
 
 // ACL
-$container['acl'] = function ($c) {
+$container['acl'] = function($c) {
     $settings = $c->get('settings');
     $acl      = new Acl($settings['acl']);
 
@@ -87,7 +87,7 @@ 
 };
 
 // translation
-$container['translator'] = function($c){
+$container['translator'] = function($c) {
     $settings                = $c->get('settings');
     $translation_file_loader = new FileLoader(new Filesystem, $settings['translate']['path']);
     $translator              = new Translator($translation_file_loader, $settings['translate']['locale']);
@@ -96,7 +96,7 @@ 
 };
 
 // validation
-$container['validation'] = function($c){
+$container['validation'] = function($c) {
     $translator = $c->get('translator');
     $validation = new Factory($translator);
     $presence   = new DatabasePresenceVerifier($c->get('databaseManager'));
@@ -106,7 +106,7 @@ 
 };
 
 // mailer
-$container['mailer'] = function($c){
+$container['mailer'] = function($c) {
     $transport = \Swift_MailTransport::newInstance();
     $mailer    = \Swift_Mailer::newInstance($transport);
 

Braces +6 added lines, -6 removed lines

@@ -22,13 +22,13 @@ 
 $container = $app->getContainer();
 
 // render
-$container['renderer'] = function($c){
+$container['renderer'] = function($c) {
     $renderer = new Renderer();
 
     return $renderer;
 };
 
-$container['mailRenderer'] = function($c){
+$container['mailRenderer'] = function($c) {
     $settings = $c->get('settings');
     $renderer = new MailRenderer($settings['mailTemplate']);
     return $renderer;
@@ -69,7 +69,7 @@ 
 // database
 $setting = $container->get('settings');
 $capsule = new Capsule;
-foreach ($setting['database']['connections'] as $name => $connection){
+foreach ($setting['database']['connections'] as $name => $connection) {
     $capsule->addConnection($connection, $name);
 }
 $capsule->setEventDispatcher(new Dispatcher(new Container));
@@ -87,7 +87,7 @@ 
 };
 
 // translation
-$container['translator'] = function($c){
+$container['translator'] = function($c) {
     $settings                = $c->get('settings');
     $translation_file_loader = new FileLoader(new Filesystem, $settings['translate']['path']);
     $translator              = new Translator($translation_file_loader, $settings['translate']['locale']);
@@ -96,7 +96,7 @@ 
 };
 
 // validation
-$container['validation'] = function($c){
+$container['validation'] = function($c) {
     $translator = $c->get('translator');
     $validation = new Factory($translator);
     $presence   = new DatabasePresenceVerifier($c->get('databaseManager'));
@@ -106,7 +106,7 @@ 
 };
 
 // mailer
-$container['mailer'] = function($c){
+$container['mailer'] = function($c) {
     $transport = \Swift_MailTransport::newInstance();
     $mailer    = \Swift_Mailer::newInstance($transport);
 

app/middleware.php

Spacing +9 added lines, -9 removed lines

@@ -11,7 +11,7 @@ 
 /*
  * Auth && ACL Middleware
  */
-$app->add(function (Request $request, Response $response, $next) {
+$app->add(function(Request $request, Response $response, $next) {
     // If path is "/api/token" or "/api/user/request-password-reset" or "/api/user/reset-password" no need authorization process
     $path = $request->getUri()->getPath();
     if (in_array($path, ['/api/token', '/api/user/request-password-reset', '/api/user/reset-password'])) {
@@ -36,14 +36,14 @@ 
                 $route     = $request->getAttribute('route');
 
                 if ($route) {
-                    if ($this->acl->hasResource('route' . $route->getPattern())) {
-                        $isAllowed = $isAllowed || $this->acl->isAllowed($user->role->name, 'route' . $route->getPattern(), strtolower($request->getMethod()));
+                    if ($this->acl->hasResource('route'.$route->getPattern())) {
+                        $isAllowed = $isAllowed || $this->acl->isAllowed($user->role->name, 'route'.$route->getPattern(), strtolower($request->getMethod()));
                     }
-                    if ($this->acl->hasResource('callable/' . $route->getCallable())) {
-                        $isAllowed = $isAllowed || $this->acl->isAllowed($user->role->name, 'callable/' . $route->getCallable());
+                    if ($this->acl->hasResource('callable/'.$route->getCallable())) {
+                        $isAllowed = $isAllowed || $this->acl->isAllowed($user->role->name, 'callable/'.$route->getCallable());
                     }
                     if (!$isAllowed) {
-                        throw new JsonException(null, 403, 'Not allowed', $user->role->name . ' is not allowed access to this location.');
+                        throw new JsonException(null, 403, 'Not allowed', $user->role->name.' is not allowed access to this location.');
                     }
                 }
 
@@ -58,7 +58,7 @@ 
 /*
  * Logger
  */
-$app->add(function (Request $request, Response $response, $next) {
+$app->add(function(Request $request, Response $response, $next) {
     $logger     = $this->logger;
     $response   = $next($request, $response);
     $uri        = $request->getUri()->getPath();
@@ -99,10 +99,10 @@ 
 /**
  * Custom exception
  */
-$app->add(function (Request $request, Response $response, $next) {
+$app->add(function(Request $request, Response $response, $next) {
     try {
         return $next($request, $response);
-    } catch (JsonException $e){
+    } catch (JsonException $e) {
         return $this->renderer->jsonApiRender($response, $e->statusCode, $e->encodeError());
     }
 });
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
 $app->add(function (Request $request, Response $response, $next) {
     try {
         return $next($request, $response);
-    } catch (JsonException $e){
+    } catch (JsonException $e) {
         return $this->renderer->jsonApiRender($response, $e->statusCode, $e->encodeError());
     }
 });
\ No newline at end of file

app/settings.php

Spacing +16 added lines, -16 removed lines

@@ -8,13 +8,13 @@ 
         // monolog settings
         'logger' => [
             'name' => 'app',
-            'path' => __DIR__ . '/../log/app.log',
+            'path' => __DIR__.'/../log/app.log',
         ],
 
-        'mailTemplate' => __DIR__ . '/../mail',
+        'mailTemplate' => __DIR__.'/../mail',
 
             // DB
-        'database' => require(__DIR__ . '/../config/db.php'),
+        'database' => require(__DIR__.'/../config/db.php'),
 
         // ACL
         'acl' =>
@@ -50,8 +50,8 @@ 
                      * ['route', ['roles'], ['methods',' methods1']]
                      */
                     'routes' => [
-                        ['/api/token',  ['guest'],  ['post']],
-                        ['/api/user',   ['user'],   ['get']],
+                        ['/api/token', ['guest'], ['post']],
+                        ['/api/user', ['user'], ['get']],
                     ],
                     /*
                      * list of callables to resolve against
@@ -61,27 +61,27 @@ 
                      * ['callable', ['roles']]
                      */
                     'callables' => [
-                        ['App\Controller\CrudController',               ['user']], // $app->map(['GET'], '/user',      'App\Controller\UserController'); class with __invoke
-                        ['App\Controller\CrudController:actionIndex',   ['user']], // $app->map(['GET'], '/user/{id}', 'App\Controller\UserController:getAction'); class and method
-                        ['App\Controller\CrudController:actionGet',     ['user']],
-                        ['App\Controller\CrudController:actionCreate',  ['user']],
-                        ['App\Controller\CrudController:actionUpdate',  ['user']],
-                        ['App\Controller\CrudController:actionDelete',  ['user']],
+                        ['App\Controller\CrudController', ['user']], // $app->map(['GET'], '/user',      'App\Controller\UserController'); class with __invoke
+                        ['App\Controller\CrudController:actionIndex', ['user']], // $app->map(['GET'], '/user/{id}', 'App\Controller\UserController:getAction'); class and method
+                        ['App\Controller\CrudController:actionGet', ['user']],
+                        ['App\Controller\CrudController:actionCreate', ['user']],
+                        ['App\Controller\CrudController:actionUpdate', ['user']],
+                        ['App\Controller\CrudController:actionDelete', ['user']],
 
-                        ['App\Controller\UserController:actionIndex',  ['admin']],
-                        ['App\Controller\UserController:actionGet',    ['admin']],
+                        ['App\Controller\UserController:actionIndex', ['admin']],
+                        ['App\Controller\UserController:actionGet', ['admin']],
                         ['App\Controller\UserController:actionCreate', ['admin']],
                         ['App\Controller\UserController:actionUpdate', ['admin']],
-                        ['App\Controller\UserController:actionDelete',  ['user']],
+                        ['App\Controller\UserController:actionDelete', ['user']],
                     ]
                 ]
             ],
 
         'translate' => [
-            'path' => __DIR__ . '/../lang',
+            'path' => __DIR__.'/../lang',
             'locale' => 'ru',
         ],
 
-        'params' => require(__DIR__ . '/../config/params.php'),
+        'params' => require(__DIR__.'/../config/params.php'),
     ],
 ];

app/src/Controller/UserController.php

Spacing +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
             $user->setPassword($params['data']['attributes']['password']);
             $user->removePasswordResetToken();
 
-            if($user->save()){
+            if ($user->save()) {
                 return $this->renderer->jsonApiRender($response, 204);
             };
         }

Braces +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
             $user->setPassword($params['data']['attributes']['password']);
             $user->removePasswordResetToken();
 
-            if($user->save()){
+            if($user->save()) {
                 return $this->renderer->jsonApiRender($response, 204);
             };
         }

app/src/Controller/BaseController.php

Spacing +4 added lines, -4 removed lines

@@ -163,7 +163,7 @@ 
     /**
      * Register model observers
      */
-    private function registerModelObservers(){
+    private function registerModelObservers() {
         $observers = [
             Observers\CreatedByAndUpdatedByObserver::class => [
                 Model\Right::class,
@@ -178,9 +178,9 @@ 
             ]
         ];
 
-        foreach($observers as $observer => $models){
-            foreach($models as $model){
-                call_user_func($model. '::observe', $observer);
+        foreach ($observers as $observer => $models) {
+            foreach ($models as $model) {
+                call_user_func($model.'::observe', $observer);
             }
         }
     }

Braces +4 added lines, -3 removed lines

@@ -163,7 +163,8 @@ 
     /**
      * Register model observers
      */
-    private function registerModelObservers(){
+    private function registerModelObservers()
+    {
         $observers = [
             Observers\CreatedByAndUpdatedByObserver::class => [
                 Model\Right::class,
@@ -178,8 +179,8 @@ 
             ]
         ];
 
-        foreach($observers as $observer => $models){
-            foreach($models as $model){
+        foreach($observers as $observer => $models) {
+            foreach($models as $model) {
                 call_user_func($model. '::observe', $observer);
             }
         }