kot13 / bootstrapi

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/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);
             }
         }

app/src/Common/Helper.php

Spacing +2 added lines, -2 removed lines

@@ -42,12 +42,12 @@
      *
      * @return string
      */
-    public static function generateRandomString($length=32)
+    public static function generateRandomString($length = 32)
     {
         $chars = "abcdefghijkmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ023456789";
         $charsCount = strlen($chars);
 
-        srand((double)microtime()*1000000);
+        srand((double)microtime() * 1000000);
         $i = 1;
         $token = '';
 

Braces +1 added lines, -2 removed lines

@@ -51,8 +51,7 @@
         $i = 1;
         $token = '';
 
-        while ($i <= $length)
-        {
+        while ($i <= $length) {
             $num = rand() % $charsCount;
             $tmp = substr($chars, $num, 1);
             $token .= $tmp;

app/src/Common/Auth.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
      */
     public static function getUserId()
     {
-        if(self::checkUser()){
+        if (self::checkUser()) {
             return self::$user->id;
         } else {
             return null;

Braces +7 added lines, -3 removed lines

@@ -8,12 +8,16 @@ 
     /**
      * Forbidden to create new instances
      */
-    private function __construct() {}
+    private function __construct()
+    {
+}
 
     /**
      * Forbidden to cloned instances
      */
-    private function __clone() {}
+    private function __clone()
+    {
+}
 
     /**
      * @var User
@@ -49,7 +53,7 @@ 
      */
     public static function getUserId()
     {
-        if(self::checkUser()){
+        if(self::checkUser()) {
             return self::$user->id;
         } else {
             return null;

app/src/Common/MailRenderer.php

Spacing +6 added lines, -6 removed lines

@@ -21,7 +21,7 @@ 
      */
     public function __construct($templatePath = "", $attributes = [])
     {
-        $this->templatePath = rtrim($templatePath, '/\\') . '/';
+        $this->templatePath = rtrim($templatePath, '/\\').'/';
         $this->attributes = $attributes;
     }
 
@@ -40,7 +40,7 @@ 
             throw new \InvalidArgumentException("Duplicate template key found");
         }
 
-        if (!is_file($this->templatePath . $template)) {
+        if (!is_file($this->templatePath.$template)) {
             throw new \RuntimeException("View cannot render `$template` because the template does not exist");
         }
 
@@ -48,12 +48,12 @@ 
 
         try {
             ob_start();
-            $this->protectedIncludeScope($this->templatePath . $template, $data);
+            $this->protectedIncludeScope($this->templatePath.$template, $data);
             $output = ob_get_clean();
-        } catch(\Throwable $e) { // PHP 7+
+        } catch (\Throwable $e) { // PHP 7+
             ob_end_clean();
             throw $e;
-        } catch(\Exception $e) { // PHP < 7
+        } catch (\Exception $e) { // PHP < 7
             ob_end_clean();
             throw $e;
         }
@@ -65,7 +65,7 @@ 
      * @param string $template
      * @param array $data
      */
-    protected function protectedIncludeScope ($template, array $data)
+    protected function protectedIncludeScope($template, array $data)
     {
         extract($data);
         include $template;

Braces +4 added lines, -2 removed lines

@@ -50,10 +50,12 @@
             ob_start();
             $this->protectedIncludeScope($this->templatePath . $template, $data);
             $output = ob_get_clean();
-        } catch(\Throwable $e) { // PHP 7+
+        } catch(\Throwable $e) {
+// PHP 7+
             ob_end_clean();
             throw $e;
-        } catch(\Exception $e) { // PHP < 7
+        } catch(\Exception $e) {
+// PHP < 7
             ob_end_clean();
             throw $e;
         }

app/src/Model/User.php

Spacing +2 added lines, -2 removed lines

@@ -120,7 +120,7 @@ 
             return false;
         }
 
-        $timestamp = (int) substr($token, strrpos($token, '_') + 1);
+        $timestamp = (int)substr($token, strrpos($token, '_') + 1);
         // TODO Вынести expire в конфиг
         $expire = 3600;
         return $timestamp + $expire >= time();
@@ -131,7 +131,7 @@ 
      */
     public function generatePasswordResetToken()
     {
-        $this->password_reset_token = Helper::generateRandomString() . '_' . time();
+        $this->password_reset_token = Helper::generateRandomString().'_'.time();
     }
 
     /**

app/src/Schema/RoleSchema.php

Indentation +19 added lines, -19 removed lines

@@ -196,25 +196,25 @@
  */
 
 /**
-     * @api {delete} /role/:id Удаление роли
-     * @apiName DeleteRole
-     * @apiGroup Role
-     *
-     * @apiDescription Метод для удаления роли.
-     *
-     * @apiPermission admin
-     *
-     * @apiParam {Number} id Id роли
-     *
-     * @apiHeader {String} Authorization Токен.
-     *
-     * @apiSuccessExample {json} Успешно (204)
-     *     HTTP/1.1 204 OK
-     *
-     * @apiUse UnauthorizedError
-     * @apiUse StandardErrors
-     * @apiUse NotFoundError
-     */
+ * @api {delete} /role/:id Удаление роли
+ * @apiName DeleteRole
+ * @apiGroup Role
+ *
+ * @apiDescription Метод для удаления роли.
+ *
+ * @apiPermission admin
+ *
+ * @apiParam {Number} id Id роли
+ *
+ * @apiHeader {String} Authorization Токен.
+ *
+ * @apiSuccessExample {json} Успешно (204)
+ *     HTTP/1.1 204 OK
+ *
+ * @apiUse UnauthorizedError
+ * @apiUse StandardErrors
+ * @apiUse NotFoundError
+ */
 final class RoleSchema extends BaseSchema
 {
     protected $resourceType = 'role';

app/src/Schema/UserSchema.php

Spacing +1 added lines, -1 removed lines

@@ -312,7 +312,7 @@
         return [
             'full_name'  => $user->full_name,
             'email'      => $user->email,
-            'role_id'    => (int) $user->role_id,
+            'role_id'    => (int)$user->role_id,
             'created_at' => Carbon::parse($user->created_at)->setTimezone('UTC')->format(Carbon::ISO8601),
             'updated_at' => Carbon::parse($user->updated_at)->setTimezone('UTC')->format(Carbon::ISO8601),
             'created_by' => $user->created_by,

app/src/Schema/LogSchema.php

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
     {
         return [
             'action'      => $log->action,
-            'entity_id'   => (int) $log->entity_id,
+            'entity_id'   => (int)$log->entity_id,
             'entity_type' => $log->entity_type,
             'state'       => $log->state,
             'created_at'  => Carbon::parse($log->created_at)->setTimezone('UTC')->format(Carbon::ISO8601),