phpsrbija / unfinished

packages/Menu/src/Mapper/MenuMapper.php

Spacing +19 added lines, -19 removed lines

@@ -15,24 +15,24 @@ 
         $this->adapter = $adapter;
     }
 
-    public function selectAll($isActive = null, $filter = [])
+    public function selectAll($isActive = null, $filter = [ ])
     {
         $select = $this->getSql()->select()
-            ->join('category', 'menu.category_uuid = category.category_uuid', ['category_name' => 'name', 'category_slug' => 'slug'], 'left')
-            ->join('articles', 'articles.article_uuid = menu.article_uuid', ['article_id', 'article_slug' => 'slug'], 'left')
-            ->order(['order_no' => 'asc']);
+            ->join('category', 'menu.category_uuid = category.category_uuid', [ 'category_name' => 'name', 'category_slug' => 'slug' ], 'left')
+            ->join('articles', 'articles.article_uuid = menu.article_uuid', [ 'article_id', 'article_slug' => 'slug' ], 'left')
+            ->order([ 'order_no' => 'asc' ]);
 
-        if($isActive !== null) {
-            $select->where(['is_active' => $isActive]);
+        if ($isActive !== null) {
+            $select->where([ 'is_active' => $isActive ]);
         }
 
-        if($filter) {
-            if(isset($filter['is_in_header'])) {
-                $select->where(['is_in_header' => $filter['is_in_header']]);
-            } elseif(isset($filter['is_in_footer'])) {
-                $select->where(['is_in_footer' => $filter['is_in_footer']]);
-            } elseif(isset($filter['is_in_side'])) {
-                $select->where(['is_in_side' => $filter['is_in_side']]);
+        if ($filter) {
+            if (isset($filter[ 'is_in_header' ])) {
+                $select->where([ 'is_in_header' => $filter[ 'is_in_header' ] ]);
+            } elseif (isset($filter[ 'is_in_footer' ])) {
+                $select->where([ 'is_in_footer' => $filter[ 'is_in_footer' ] ]);
+            } elseif (isset($filter[ 'is_in_side' ])) {
+                $select->where([ 'is_in_side' => $filter[ 'is_in_side' ] ]);
             }
         }
 
@@ -48,7 +48,7 @@ 
 
     public function updateMenuItem($data, $id)
     {
-        $this->update($data, ['menu_id' => $id]);
+        $this->update($data, [ 'menu_id' => $id ]);
 
         return $id;
     }
@@ -56,9 +56,9 @@ 
     public function get($id)
     {
         $select = $this->getSql()->select()
-            ->join('articles', 'articles.article_uuid = menu.article_uuid', ['article_id'], 'left')
-            ->join('category', 'category.category_uuid = menu.category_uuid', ['category_id'], 'left')
-            ->where(['menu_id' => $id]);
+            ->join('articles', 'articles.article_uuid = menu.article_uuid', [ 'article_id' ], 'left')
+            ->join('category', 'category.category_uuid = menu.category_uuid', [ 'category_id' ], 'left')
+            ->where([ 'menu_id' => $id ]);
 
         return $this->selectWith($select)->current();
     }
@@ -66,8 +66,8 @@ 
     public function forSelect()
     {
         $select = $this->getSql()->select()
-            ->columns(['menu_id', 'title', 'is_active'])
-            ->order(['is_active' => 'desc']);
+            ->columns([ 'menu_id', 'title', 'is_active' ])
+            ->order([ 'is_active' => 'desc' ]);
 
         return $this->selectWith($select);
     }

packages/Menu/src/ConfigProvider.php

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
                     'partial/menu-level' => __DIR__ . '/../templates/partial/menu-level.phtml',
                 ],
                 'paths' => [
-                    'menu' => [__DIR__ . '/../templates/menu'],
+                    'menu' => [ __DIR__ . '/../templates/menu' ],
                 ],
             ],
 
@@ -33,13 +33,13 @@ 
                     'name'            => 'admin.menu',
                     'path'            => '/admin/menu',
                     'middleware'      => Controller\IndexController::class,
-                    'allowed_methods' => ['GET'],
+                    'allowed_methods' => [ 'GET' ],
                 ],
                 [
                     'name'            => 'admin.menu.action',
                     'path'            => '/admin/menu/:action/:id',
                     'middleware'      => Controller\IndexController::class,
-                    'allowed_methods' => ['GET', 'POST'],
+                    'allowed_methods' => [ 'GET', 'POST' ],
                 ],
             ],
 

packages/Page/src/Service/PageServiceFactory.php

Spacing +2 added lines, -2 removed lines

@@ -11,8 +11,8 @@
 {
     public function __invoke(ContainerInterface $container)
     {
-        $config = $container->get('config')['upload'];
-        $upload = new Upload($config['public_path'], $config['non_public_path']);
+        $config = $container->get('config')[ 'upload' ];
+        $upload = new Upload($config[ 'public_path' ], $config[ 'non_public_path' ]);
 
         return new PageService(
             $container->get(PageMapper::class),

packages/Page/src/Controller/PageController.php

Spacing +10 added lines, -10 removed lines

@@ -39,8 +39,8 @@ 
     public function index(): HtmlResponse
     {
         $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;
         $pagination = $this->pageService->getPagination($page, $limit);
 
         return new HtmlResponse($this->template->render('page::index', [
@@ -49,14 +49,14 @@ 
         ]));
     }
 
-    public function edit($errors = []): HtmlResponse
+    public function edit($errors = [ ]): HtmlResponse
     {
         $id   = $this->request->getAttribute('id');
         $page = $this->pageService->getPage($id);
 
-        if($this->request->getParsedBody()) {
+        if ($this->request->getParsedBody()) {
             $page = new \Page\Entity\Page();
-            $page->exchangeArray($this->request->getParsedBody() + (array)$page);
+            $page->exchangeArray($this->request->getParsedBody() + (array) $page);
         }
 
         return new HtmlResponse($this->template->render('page::edit', [
@@ -71,9 +71,9 @@ 
         try {
             $pageId = $this->request->getAttribute('id');
             $data   = $this->request->getParsedBody();
-            $data   += (new Request())->getFiles()->toArray();
+            $data += (new Request())->getFiles()->toArray();
 
-            if($pageId) {
+            if ($pageId) {
                 $this->pageService->updatePage($data, $pageId);
             }
             else {
@@ -82,10 +82,10 @@ 
 
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.pages'));
         }
-        catch(FilterException $fe) {
+        catch (FilterException $fe) {
             return $this->edit($fe->getArrayMessages());
         }
-        catch(\Exception $e) {
+        catch (\Exception $e) {
             throw $e;
         }
     }
@@ -98,7 +98,7 @@ 
 
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.pages'));
         }
-        catch(\Exception $e) {
+        catch (\Exception $e) {
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.pages'));
         }
     }

packages/Page/src/Filter/PageFilter.php

Spacing +16 added lines, -16 removed lines

@@ -17,65 +17,65 @@
         $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'       => 'slug',
             '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'       => 'description',
             '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' ] ],
         ]);
 
         $inputFilter->add([
             'name'     => 'is_homepage',
             'required' => false,
-            'filters'  => [['name' => 'Boolean']],
+            'filters'  => [ [ 'name' => 'Boolean' ] ],
         ]);
 
         $inputFilter->add([
             'name'     => 'is_active',
             'required' => false,
-            'filters'  => [['name' => 'Boolean']],
+            'filters'  => [ [ 'name' => 'Boolean' ] ],
         ]);
 
         $inputFilter->add([
             'name'     => 'is_wysiwyg_editor',
             'required' => false,
-            'filters'  => [['name' => 'Boolean']],
+            'filters'  => [ [ 'name' => 'Boolean' ] ],
         ]);
 
         return $inputFilter;

packages/Page/src/ConfigProvider.php

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
                     'page/pagination' => __DIR__ . '/../templates/partial/pagination.php',
                 ],
                 'paths' => [
-                    'page' => [__DIR__ . '/../templates/page'],
+                    'page' => [ __DIR__ . '/../templates/page' ],
                 ],
             ],
 
@@ -32,13 +32,13 @@ 
                     'name'            => 'admin.pages',
                     'path'            => '/admin/pages',
                     'middleware'      => Controller\PageController::class,
-                    'allowed_methods' => ['GET'],
+                    'allowed_methods' => [ 'GET' ],
                 ],
                 [
                     'name'            => 'admin.pages.action',
                     'path'            => '/admin/pages/:action/:id',
                     'middleware'      => Controller\PageController::class,
-                    'allowed_methods' => ['GET', 'POST']
+                    'allowed_methods' => [ 'GET', 'POST' ]
                 ]
             ],
         ];

packages/Page/src/Entity/Page.php

Spacing +17 added lines, -17 removed lines

@@ -110,7 +110,7 @@ 
      */
     public function getDescription($limit = null)
     {
-        if(!$limit) {
+        if (!$limit) {
             return $this->description;
         }
 
@@ -165,7 +165,7 @@ 
      */
     public function getCreatedAt($format = null)
     {
-        if(!$format) {
+        if (!$format) {
             return $this->created_at;
         }
 
@@ -183,10 +183,10 @@ 
      *
      * @param array $data
      */
-    public function exchangeArray($data = [])
+    public function exchangeArray($data = [ ])
     {
-        foreach(array_keys(get_object_vars($this)) as $property) {
-            $this->{$property} = isset($data[$property]) ? $data[$property] : null;
+        foreach (array_keys(get_object_vars($this)) as $property) {
+            $this->{$property} = isset($data[ $property ]) ? $data[ $property ] : null;
         }
     }
 
@@ -194,18 +194,18 @@ 
     public function getArrayCopy()
     {
         return [
-            'page_uuid'         => (binary)$this->page_uuid,
-            'page_id'           => (string)$this->page_id,
-            'title'             => (string)$this->title,
-            'body'              => (string)$this->body,
-            'description'       => (string)$this->description,
-            'main_img'          => (string)$this->main_img,
-            'has_layout'        => (boolean)$this->has_layout,
-            'is_homepage'       => (boolean)$this->is_homepage,
-            'is_active'         => (boolean)$this->is_active,
-            'is_wysiwyg_editor' => (boolean)$this->is_wysiwyg_editor,
-            'created_at'        => (string)$this->created_at,
-            'slug'              => (string)$this->slug
+            'page_uuid'         => (binary) $this->page_uuid,
+            'page_id'           => (string) $this->page_id,
+            'title'             => (string) $this->title,
+            'body'              => (string) $this->body,
+            'description'       => (string) $this->description,
+            'main_img'          => (string) $this->main_img,
+            'has_layout'        => (boolean) $this->has_layout,
+            'is_homepage'       => (boolean) $this->is_homepage,
+            'is_active'         => (boolean) $this->is_active,
+            'is_wysiwyg_editor' => (boolean) $this->is_wysiwyg_editor,
+            'created_at'        => (string) $this->created_at,
+            'slug'              => (string) $this->slug
         ];
     }
 

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>

packages/Admin/src/Controller/AuthController.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Admin\Controller;
 
@@ -60,11 +60,11 @@ 
      */
     public function login($error = false): \Psr\Http\Message\ResponseInterface
     {
-        if($this->session->getStorage()->user) {
+        if ($this->session->getStorage()->user) {
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin'));
         }
 
-        return new HtmlResponse($this->template->render('admin::login', ['layout' => false, 'error' => $error]));
+        return new HtmlResponse($this->template->render('admin::login', [ 'layout' => false, 'error' => $error ]));
     }
 
     /**
@@ -74,20 +74,20 @@ 
      */
     public function loginHandle(): \Psr\Http\Message\ResponseInterface
     {
-        if($this->session->getStorage()->user) {
+        if ($this->session->getStorage()->user) {
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin'));
         }
 
         $data     = $this->request->getParsedBody();
-        $email    = isset($data['email']) ? $data['email'] : null;
-        $password = isset($data['password']) ? $data['password'] : null;
+        $email    = isset($data[ 'email' ]) ? $data[ 'email' ] : null;
+        $password = isset($data[ 'password' ]) ? $data[ 'password' ] : null;
 
         try {
             $this->session->getStorage()->user = $this->adminUserService->loginUser($email, $password);
 
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin'));
         }
-        catch(\Exception $e) {
+        catch (\Exception $e) {
             return $this->login($e->getMessage());
 
             //@todo set $e->getMessage() to flash messanger and print messages in next page