phpsrbija / unfinished

packages/Page/templates/partial/pagination.php

Spacing +8 added lines, -8 removed lines

@@ -7,13 +7,13 @@ 
         </div>
     </div>
     <div class="col-sm-7">
-        <?php if($this->pageCount > 1): ?>
+        <?php if ($this->pageCount > 1): ?>
             <div class="pull-right">
                 <ul class="pagination" style="margin:0px;">
                     <!-- Previous page link -->
-                    <?php if(isset($this->previous)): ?>
+                    <?php if (isset($this->previous)): ?>
                         <li>
-                            <a href="<?php echo $this->url($this->route, isset($this->data) ? $this->data : []); ?>?page=<?php echo $this->previous; ?>">
+                            <a href="<?php echo $this->url($this->route, isset($this->data) ? $this->data : [ ]); ?>?page=<?php echo $this->previous; ?>">
                                 <span class="glyphicon glyphicon-chevron-left"></span>
                             </a>
                         </li>
@@ -26,10 +26,10 @@ 
                     <?php endif; ?>
 
                     <!-- Numbered page links -->
-                    <?php foreach($this->pagesInRange as $page): ?>
-                        <?php if($page != $this->current): ?>
+                    <?php foreach ($this->pagesInRange as $page): ?>
+                        <?php if ($page != $this->current): ?>
                             <li>
-                                <a href="<?php echo $this->url($this->route, isset($this->data) ? $this->data : []); ?>?page=<?php echo $page; ?>">
+                                <a href="<?php echo $this->url($this->route, isset($this->data) ? $this->data : [ ]); ?>?page=<?php echo $page; ?>">
                                     <?php echo $page; ?>
                                 </a>
                             </li>
@@ -41,9 +41,9 @@ 
                     <?php endforeach; ?>
 
                     <!-- Next page link -->
-                    <?php if(isset($this->next)): ?>
+                    <?php if (isset($this->next)): ?>
                         <li>
-                            <a href="<?php echo $this->url($this->route, isset($this->data) ? $this->data : []); ?>?page=<?php echo $this->next; ?>">
+                            <a href="<?php echo $this->url($this->route, isset($this->data) ? $this->data : [ ]); ?>?page=<?php echo $this->next; ?>">
                                 <span class="glyphicon glyphicon-chevron-right"></span>
                             </a>
                         </li>

Braces +15 added lines, -6 removed lines

@@ -17,13 +17,16 @@ 
                                 <span class="glyphicon glyphicon-chevron-left"></span>
                             </a>
                         </li>
-                    <?php else: ?>
+                    <?php else {
+    : ?>
                         <li class="disabled">
                             <a href="#">
                                 <span class="glyphicon glyphicon-chevron-left"></span>
                             </a>
                         </li>
-                    <?php endif; ?>
+                    <?php endif;
+}
+?>
 
                     <!-- Numbered page links -->
                     <?php foreach($this->pagesInRange as $page): ?>
@@ -33,9 +36,12 @@ 
                                     <?php echo $page; ?>
                                 </a>
                             </li>
-                        <?php else: ?>
+                        <?php else {
+    : ?>
                             <li class="active">
-                                <a href="#"><?php echo $page; ?></a>
+                                <a href="#"><?php echo $page;
+}
+?></a>
                             </li>
                         <?php endif; ?>
                     <?php endforeach; ?>
@@ -47,13 +53,16 @@ 
                                 <span class="glyphicon glyphicon-chevron-right"></span>
                             </a>
                         </li>
-                    <?php else: ?>
+                    <?php else {
+    : ?>
                         <li class="disabled">
                             <a href="#">
                                 <span class="glyphicon glyphicon-chevron-right"></span>
                             </a>
                         </li>
-                    <?php endif; ?>
+                    <?php endif;
+}
+?>
                 </ul>
             </div>
         <?php endif; ?>

packages/Admin/src/Controller/UserController.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Admin\Controller;
 
@@ -64,12 +64,12 @@ 
     {
         $user   = $this->session->getStorage()->user;
         $params = $this->request->getQueryParams();
-        $page   = isset($params['page']) ? $params['page'] : 1;
-        $limit  = isset($params['limit']) ? $params['limit'] : 15;
+        $page   = isset($params[ 'page' ]) ? $params[ 'page' ] : 1;
+        $limit  = isset($params[ 'limit' ]) ? $params[ 'limit' ] : 15;
 
         $adminUsers = $this->adminUserService->getPagination($page, $limit, $user->admin_user_id);
 
-        return new HtmlResponse($this->template->render('admin::user/index', ['list' => $adminUsers, 'layout' => 'layout/admin']));
+        return new HtmlResponse($this->template->render('admin::user/index', [ 'list' => $adminUsers, 'layout' => 'layout/admin' ]));
     }
 
     /**
@@ -77,13 +77,13 @@ 
      *
      * @return \Psr\Http\Message\ResponseInterface
      */
-    public function edit($errors = []): \Psr\Http\Message\ResponseInterface
+    public function edit($errors = [ ]): \Psr\Http\Message\ResponseInterface
     {
         $id   = $this->request->getAttribute('id');
         $user = $this->adminUserService->getUser($id);
 
-        if($this->request->getParsedBody()) {
-            $user                = (object)($this->request->getParsedBody() + (array)$user);
+        if ($this->request->getParsedBody()) {
+            $user                = (object) ($this->request->getParsedBody() + (array) $user);
             $user->admin_user_id = $id;
         }
 
@@ -99,9 +99,9 @@ 
         try {
             $userId = $this->request->getAttribute('id');
             $data   = $this->request->getParsedBody();
-            $data   += (new Request())->getFiles()->toArray();
+            $data += (new Request())->getFiles()->toArray();
 
-            if($userId) {
+            if ($userId) {
                 $this->adminUserService->updateUser($data, $userId);
             }
             else {
@@ -110,10 +110,10 @@ 
 
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.users'));
         }
-        catch(FilterException $fe) {
+        catch (FilterException $fe) {
             return $this->edit($fe->getArrayMessages());
         }
-        catch(\Exception $e) {
+        catch (\Exception $e) {
             throw $e;
         }
     }
@@ -126,7 +126,7 @@ 
 
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.users'));
         }
-        catch(\Exception $e) {
+        catch (\Exception $e) {
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.users'));
         }
     }

Braces +4 added lines, -8 removed lines

@@ -103,17 +103,14 @@ 
 
             if($userId) {
                 $this->adminUserService->updateUser($data, $userId);
-            }
-            else {
+            } else {
                 $this->adminUserService->registerNewUser($data);
             }
 
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.users'));
-        }
-        catch(FilterException $fe) {
+        } catch(FilterException $fe) {
             return $this->edit($fe->getArrayMessages());
-        }
-        catch(\Exception $e) {
+        } catch(\Exception $e) {
             throw $e;
         }
     }
@@ -125,8 +122,7 @@ 
             $this->adminUserService->delete($userId);
 
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.users'));
-        }
-        catch(\Exception $e) {
+        } catch(\Exception $e) {
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.users'));
         }
     }

packages/Admin/src/ConfigProvider.php

Spacing +5 added lines, -5 removed lines

@@ -13,7 +13,7 @@ 
                     'admin/pagination' => __DIR__ . '/../templates/admin/partial/pagination.phtml',
                 ],
                 'paths' => [
-                    'admin' => [__DIR__ . '/../templates/admin'],
+                    'admin' => [ __DIR__ . '/../templates/admin' ],
                 ],
             ],
 
@@ -30,25 +30,25 @@ 
                     'name'            => 'auth',
                     'path'            => '/auth/:action',
                     'middleware'      => Controller\AuthController::class,
-                    'allowed_methods' => ['GET', 'POST'],
+                    'allowed_methods' => [ 'GET', 'POST' ],
                 ],
                 [
                     'name'            => 'admin',
                     'path'            => '/admin',
                     'middleware'      => Action\IndexAction::class,
-                    'allowed_methods' => ['GET'],
+                    'allowed_methods' => [ 'GET' ],
                 ],
                 [
                     'name'            => 'admin.users',
                     'path'            => '/admin/users',
                     'middleware'      => Controller\UserController::class,
-                    'allowed_methods' => ['GET']
+                    'allowed_methods' => [ 'GET' ]
                 ],
                 [
                     'name'            => 'admin.users.action',
                     'path'            => '/admin/users/:action/:id',
                     'middleware'      => Controller\UserController::class,
-                    'allowed_methods' => ['GET', 'POST']
+                    'allowed_methods' => [ 'GET', 'POST' ]
                 ],
             ],
 

packages/Admin/src/Action/IndexAction.php

Spacing +1 added lines, -1 removed lines

@@ -39,6 +39,6 @@
      */
     public function __invoke(Request $request, Response $response, callable $next = null)
     {
-        return new HtmlResponse($this->template->render('admin::index', ['layout' => 'layout/admin']));
+        return new HtmlResponse($this->template->render('admin::index', [ 'layout' => 'layout/admin' ]));
     }
 }

data/phinx/seeds/ArticlePosts.php

Spacing +5 added lines, -5 removed lines

@@ -18,13 +18,13 @@ 
         $allUsers    = array_column($articlePosts->getAdapter()->fetchAll('select admin_user_uuid from admin_users'), 'admin_user_uuid');
         $allCategory = array_column($articlePosts->getAdapter()->fetchAll('select category_uuid from category'), 'category_uuid');
 
-        for($i = 0; $i < $count; $i++) {
+        for ($i = 0; $i < $count; $i++) {
             // Insert Article
             $id           = $faker->uuid;
             $mysqlUuid    = (new MysqlUuid\Uuid($id))->toFormat(new MysqlUuid\Formats\Binary());
             $title        = $faker->sentence();
-            $userUuid     = $allUsers[rand(0, (count($allUsers) - 1))];
-            $categoryUuid = $allCategory[rand(0, (count($allCategory) - 1))];
+            $userUuid     = $allUsers[ rand(0, (count($allUsers) - 1)) ];
+            $categoryUuid = $allCategory[ rand(0, (count($allCategory) - 1)) ];
             $data         = [
                 'article_uuid'      => $mysqlUuid,
                 'article_id'        => $id,
@@ -46,8 +46,8 @@ 
                 'title'        => $title,
                 'body'         => $faker->paragraph(15),
                 'lead'         => $faker->paragraph(5),
-                'featured_img' => $featuredImages[rand(0, (count($featuredImages) - 1))],
-                'main_img'     => $mainImages[rand(0, (count($mainImages) - 1))],
+                'featured_img' => $featuredImages[ rand(0, (count($featuredImages) - 1)) ],
+                'main_img'     => $mainImages[ rand(0, (count($mainImages) - 1)) ],
                 'has_layout'   => true,
             ];
 

data/phinx/migrations/20161229132328_article_posts.php

Spacing +6 added lines, -6 removed lines

@@ -6,15 +6,15 @@
 {
     public function up()
     {
-        $this->table('article_posts', ['id' => false])
-            ->addColumn('article_uuid', 'binary', ['limit' => 16])
+        $this->table('article_posts', [ 'id' => false ])
+            ->addColumn('article_uuid', 'binary', [ 'limit' => 16 ])
             ->addColumn('title', 'text')
             ->addColumn('body', 'text')
             ->addColumn('lead', 'text')
-            ->addColumn('featured_img', 'text', ['null' => true])
-            ->addColumn('main_img', 'text', ['null' => true])
-            ->addColumn('has_layout', 'boolean', ['default' => true])
-            ->addForeignKey('article_uuid', 'articles', 'article_uuid', ['delete' => 'NO_ACTION', 'update' => 'NO_ACTION'])
+            ->addColumn('featured_img', 'text', [ 'null' => true ])
+            ->addColumn('main_img', 'text', [ 'null' => true ])
+            ->addColumn('has_layout', 'boolean', [ 'default' => true ])
+            ->addForeignKey('article_uuid', 'articles', 'article_uuid', [ 'delete' => 'NO_ACTION', 'update' => 'NO_ACTION' ])
             ->create();
     }
 

packages/Article/src/Mapper/ArticlePostsMapper.php

Spacing +24 added lines, -24 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Article\Mapper;
 
@@ -34,22 +34,22 @@ 
     public function getPaginationSelect()
     {
         return $this->getSql()->select()
-            ->columns(['title', 'body', 'lead', 'featured_img', 'main_img'])
+            ->columns([ 'title', 'body', 'lead', 'featured_img', 'main_img' ])
             ->join('articles', 'article_posts.article_uuid = articles.article_uuid')
-            ->join('category', 'articles.category_uuid = category.category_uuid', ['category_name' => 'name'], 'left')
-            ->where(['articles.type' => ArticleType::POST])
-            ->order(['created_at' => 'desc']);
+            ->join('category', 'articles.category_uuid = category.category_uuid', [ 'category_name' => 'name' ], 'left')
+            ->where([ 'articles.type' => ArticleType::POST ])
+            ->order([ 'created_at' => 'desc' ]);
     }
 
     public function get($id)
     {
         $select = $this->getSql()->select()
-            ->columns(['title', 'body', 'lead', 'featured_img', 'main_img', 'has_layout'])
+            ->columns([ 'title', 'body', 'lead', 'featured_img', 'main_img', 'has_layout' ])
             ->join('articles', 'article_posts.article_uuid = articles.article_uuid')
             ->join('category', 'category.category_uuid = articles.category_uuid',
-                ['category_slug' => 'slug', 'category_name' => 'name', 'category_id'], 'left')
-            ->join('admin_users', 'admin_users.admin_user_uuid = articles.admin_user_uuid', ['admin_user_id'], 'left')
-            ->where(['articles.article_id' => $id]);
+                [ 'category_slug' => 'slug', 'category_name' => 'name', 'category_id' ], 'left')
+            ->join('admin_users', 'admin_users.admin_user_uuid = articles.admin_user_uuid', [ 'admin_user_id' ], 'left')
+            ->where([ 'articles.article_id' => $id ]);
 
         return $this->selectWith($select)->current();
     }
@@ -58,16 +58,16 @@ 
     {
         $select = $this->getSql()->select()
             ->join('articles', 'article_posts.article_uuid = articles.article_uuid')
-            ->join('category', 'category.category_uuid = articles.category_uuid', ['category_slug' => 'slug'])
-            ->where(['articles.status' => 1])
+            ->join('category', 'category.category_uuid = articles.category_uuid', [ 'category_slug' => 'slug' ])
+            ->where([ 'articles.status' => 1 ])
             ->limit(1);
 
-        if($direction > 0) {
+        if ($direction > 0) {
             $select->where->greaterThan('published_at', $publishedAt);
-            $select->order(['published_at' => 'asc']);
-        } elseif($direction < 0) {
+            $select->order([ 'published_at' => 'asc' ]);
+        } elseif ($direction < 0) {
             $select->where->lessThan('published_at', $publishedAt);
-            $select->order(['published_at' => 'desc']);
+            $select->order([ 'published_at' => 'desc' ]);
         }
 
         return $this->selectWith($select)->current();
@@ -76,11 +76,11 @@ 
     public function getBySlug($slug)
     {
         $select = $this->getSql()->select()
-            ->columns(['title', 'body', 'lead', 'featured_img', 'main_img'])
+            ->columns([ 'title', 'body', 'lead', 'featured_img', 'main_img' ])
             ->join('articles', 'article_posts.article_uuid = articles.article_uuid')
-            ->join('category', 'category.category_uuid = articles.category_uuid', ['category_name' => 'name', 'category_slug' => 'slug'])
-            ->join('admin_users', 'admin_users.admin_user_uuid = articles.admin_user_uuid', ['first_name', 'last_name'])
-            ->where(['articles.slug' => $slug, 'articles.status' => 1]);
+            ->join('category', 'category.category_uuid = articles.category_uuid', [ 'category_name' => 'name', 'category_slug' => 'slug' ])
+            ->join('admin_users', 'admin_users.admin_user_uuid = articles.admin_user_uuid', [ 'first_name', 'last_name' ])
+            ->where([ 'articles.slug' => $slug, 'articles.status' => 1 ]);
 
         return $this->selectWith($select)->current();
     }
@@ -88,7 +88,7 @@ 
     public function getAll()
     {
         $select = $this->getSql()->select()
-            ->join('articles', 'article_posts.article_uuid = articles.article_uuid', ['article_id', 'slug']);
+            ->join('articles', 'article_posts.article_uuid = articles.article_uuid', [ 'article_id', 'slug' ]);
 
         return $this->selectWith($select);
     }
@@ -97,11 +97,11 @@ 
     {
         $select = $this->getSql()->select()
             ->join('articles', 'article_posts.article_uuid = articles.article_uuid')
-            ->join('admin_users', 'admin_users.admin_user_uuid = articles.admin_user_uuid', ['first_name', 'last_name'])
+            ->join('admin_users', 'admin_users.admin_user_uuid = articles.admin_user_uuid', [ 'first_name', 'last_name' ])
             ->join('category', 'category.category_uuid = articles.category_uuid',
-                ['category_name' => 'name', 'category_id', 'category_slug' => 'slug'])
-            ->where(['articles.status' => 1])
-            ->order(['articles.published_at' => 'desc'])
+                [ 'category_name' => 'name', 'category_id', 'category_slug' => 'slug' ])
+            ->where([ 'articles.status' => 1 ])
+            ->order([ 'articles.published_at' => 'desc' ])
             ->limit($limit);
 
         return $this->selectWith($select);

packages/Article/src/Filter/PostFilter.php

Spacing +11 added lines, -11 removed lines

@@ -12,43 +12,43 @@
 
     public function getInputFilter()
     {
-        if(!$this->inputFilter) {
+        if (!$this->inputFilter) {
             $inputFilter = new InputFilter();
 
             $inputFilter->add([
                 'name'       => 'title',
                 'required'   => true,
-                'filters'    => [['name' => 'StringTrim']],
+                'filters'    => [ [ 'name' => 'StringTrim' ] ],
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'StringLength', 'options' => ['min' => 2, 'max' => 100]],
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'StringLength', 'options' => [ 'min' => 2, 'max' => 100 ] ],
                 ],
             ]);
 
             $inputFilter->add([
                 'name'       => 'body',
                 'required'   => true,
-                'filters'    => [['name' => 'StringTrim']],
+                'filters'    => [ [ 'name' => 'StringTrim' ] ],
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'StringLength', 'options' => ['min' => 2, 'max' => 100000]],
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'StringLength', 'options' => [ 'min' => 2, 'max' => 100000 ] ],
                 ],
             ]);
 
             $inputFilter->add([
                 'name'       => 'lead',
                 'required'   => true,
-                'filters'    => [['name' => 'StringTrim']],
+                'filters'    => [ [ 'name' => 'StringTrim' ] ],
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'StringLength', 'options' => ['min' => 2, 'max' => 50000]],
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'StringLength', 'options' => [ 'min' => 2, 'max' => 50000 ] ],
                 ],
             ]);
 
             $inputFilter->add([
                 'name'     => 'has_layout',
                 'required' => false,
-                'filters'  => [['name' => 'Boolean']],
+                'filters'  => [ [ 'name' => 'Boolean' ] ],
             ]);
 
             $this->inputFilter = $inputFilter;

packages/Web/Action/HomeAction.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Web\Action;
 
@@ -48,7 +48,7 @@ 
     {
         $page = $this->pageService->getHomepage();
         
-        return new HtmlResponse($this->template->render('web::home', ['page' => $page, 'layout' => 'layout/web']));
+        return new HtmlResponse($this->template->render('web::home', [ 'page' => $page, 'layout' => 'layout/web' ]));
     }
 
 }