phpsrbija / unfinished

packages/Page/src/Service/PageService.php

Spacing +16 added lines, -16 removed lines

@@ -39,23 +39,23 @@ 
 
     public function getPage($pageId)
     {
-        return $this->pageMapper->select(['page_id' => $pageId])->current();
+        return $this->pageMapper->select([ 'page_id' => $pageId ])->current();
     }
 
     public function createPage($data)
     {
         $filter = $this->pageFilter->getInputFilter()->setData($data);
 
-        if(!$filter->isValid()) {
+        if (!$filter->isValid()) {
             throw new FilterException($filter->getMessages());
         }
 
-        $data              = $filter->getValues() + ['main_img' => $this->upload->uploadImage($data, 'main_img')];
-        $data['page_id']   = Uuid::uuid1()->toString();
-        $data['page_uuid'] = (new MysqlUuid($data['page_id']))->toFormat(new Binary);
+        $data              = $filter->getValues() + [ 'main_img' => $this->upload->uploadImage($data, 'main_img') ];
+        $data[ 'page_id' ]   = Uuid::uuid1()->toString();
+        $data[ 'page_uuid' ] = (new MysqlUuid($data[ 'page_id' ]))->toFormat(new Binary);
 
-        if($data['is_homepage']) {
-            $this->pageMapper->update(['is_homepage' => false]);
+        if ($data[ 'is_homepage' ]) {
+            $this->pageMapper->update([ 'is_homepage' => false ]);
         }
 
         return $this->pageMapper->insert($data);
@@ -63,32 +63,32 @@ 
 
     public function updatePage($data, $pageId)
     {
-        if(!($page = $this->getPage($pageId))) {
+        if (!($page = $this->getPage($pageId))) {
             throw new \Exception('Page object not found. Page ID:' . $pageId);
         }
 
         $filter = $this->pageFilter->getInputFilter()->setData($data);
 
-        if(!$filter->isValid()) {
+        if (!$filter->isValid()) {
             throw new FilterException($filter->getMessages());
         }
 
-        $data = $filter->getValues() + ['main_img' => $this->upload->uploadImage($data, 'main_img'),];
+        $data = $filter->getValues() + [ 'main_img' => $this->upload->uploadImage($data, 'main_img'), ];
 
         // We don't want to force user to re-upload image on edit
-        if(!$data['main_img']) {
-            unset($data['main_img']);
+        if (!$data[ 'main_img' ]) {
+            unset($data[ 'main_img' ]);
         }
 
-        if($data['is_homepage']) {
-            $this->pageMapper->update(['is_homepage' => false]);
+        if ($data[ 'is_homepage' ]) {
+            $this->pageMapper->update([ 'is_homepage' => false ]);
         }
 
-        return $this->pageMapper->update($data, ['page_id' => $pageId]);
+        return $this->pageMapper->update($data, [ 'page_id' => $pageId ]);
     }
 
     public function delete($pageId)
     {
-        return (bool)$this->pageMapper->delete(['page_id' => $pageId]);
+        return (bool) $this->pageMapper->delete([ 'page_id' => $pageId ]);
     }
 }
\ No newline at end of file

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

Braces +4 added lines, -8 removed lines

@@ -75,17 +75,14 @@ 
 
             if($pageId) {
                 $this->pageService->updatePage($data, $pageId);
-            }
-            else {
+            } else {
                 $this->pageService->createPage($data);
             }
 
             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;
         }
     }
@@ -97,8 +94,7 @@ 
             $this->pageService->delete($pageId);
 
             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/Mapper/PageMapper.php

Spacing +1 added lines, -1 removed lines

@@ -25,6 +25,6 @@
 
     public function getPaginationSelect()
     {
-        return $this->getSql()->select()->order(['is_homepage' => 'desc', 'created_at' => 'desc']);
+        return $this->getSql()->select()->order([ 'is_homepage' => 'desc', 'created_at' => 'desc' ]);
     }
 }
\ No newline at end of file

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>

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