phpsrbija / unfinished

packages/Core/Service/AdminUserService.php

Indentation +4 added lines, -4 removed lines

@@ -25,28 +25,28 @@
     /**
 * 
      *
- * @var Bcrypt $crypt 
+     * @var Bcrypt $crypt 
 */
     private $crypt;
 
     /**
 * 
      *
- * @var AdminUsersMapper $adminUsersMapper 
+     * @var AdminUsersMapper $adminUsersMapper 
 */
     private $adminUsersMapper;
 
     /**
 * 
      *
- * @var AdminUserFilter $adminUserFilter 
+     * @var AdminUserFilter $adminUserFilter 
 */
     private $adminUserFilter;
 
     /**
 * 
      *
- * @var Upload $upload 
+     * @var Upload $upload 
 */
     private $upload;
 

Spacing +24 added lines, -24 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Core\Service;
 
@@ -81,17 +81,17 @@ 
      */
     public function loginUser($email, $password)
     {
-        if(!$email || !$password) {
+        if (!$email || !$password) {
             throw new \Exception('Both email and password are required.', 400);
         }
 
         $user = $this->adminUsersMapper->getByEmail($email);
 
-        if(!$user) {
+        if (!$user) {
             throw new \Exception('User does not exist.');
         }
 
-        if(!$this->crypt->verify($password, $user->password)) {
+        if (!$this->crypt->verify($password, $user->password)) {
             throw new \Exception('Password does not match.');
         }
 
@@ -135,7 +135,7 @@ 
     {
         $filter = $this->adminUserFilter->getInputFilter()->setData($data);
 
-        if(!$filter->isValid()) {
+        if (!$filter->isValid()) {
             throw new FilterException($filter->getMessages());
         }
 
@@ -144,10 +144,10 @@ 
                 'profile_img' => $this->upload->uploadImage($data, 'profile_img')
             ];
 
-        unset($data['confirm_password']);
-        $data['password']        = $this->crypt->create($data['password']);
-        $data['admin_user_id']   = Uuid::uuid1()->toString();
-        $data['admin_user_uuid'] = (new MysqlUuid($data['admin_user_id']))->toFormat(new Binary);
+        unset($data[ 'confirm_password' ]);
+        $data[ 'password' ]        = $this->crypt->create($data[ 'password' ]);
+        $data[ 'admin_user_id' ]   = Uuid::uuid1()->toString();
+        $data[ 'admin_user_uuid' ] = (new MysqlUuid($data[ 'admin_user_id' ]))->toFormat(new Binary);
 
         return $this->adminUsersMapper->insert($data);
     }
@@ -161,17 +161,17 @@ 
         $filter = $this->adminUserFilter->getInputFilter()->setData($data);
 
         // we dont want to force user to enter the password again
-        if($data['password'] == '') {
+        if ($data[ 'password' ] == '') {
             $filter->remove('password');
             $filter->remove('confirm_password');
         }
 
         // if we want to keep same email
-        if($user->email == $data['email']) {
+        if ($user->email == $data[ 'email' ]) {
             $filter->remove('email');
         }
 
-        if(!$filter->isValid()) {
+        if (!$filter->isValid()) {
             throw new FilterException($filter->getMessages());
         }
 
@@ -181,26 +181,26 @@ 
             ];
 
         // We don't want to force user to re-upload image on edit
-        if(!$data['face_img']) {
-            unset($data['face_img']);
+        if (!$data[ 'face_img' ]) {
+            unset($data[ 'face_img' ]);
         }
-        else{
+        else {
             $this->upload->deleteFile($user->face_img);
         }
 
-        if(!$data['profile_img']) {
-            unset($data['profile_img']);
+        if (!$data[ 'profile_img' ]) {
+            unset($data[ 'profile_img' ]);
         }
-        else{
+        else {
             $this->upload->deleteFile($user->profile_img);
         }
 
-        if(isset($data['password'])) {
-            unset($data['confirm_password']);
-            $data['password'] = $this->crypt->create($data['password']);
+        if (isset($data[ 'password' ])) {
+            unset($data[ 'confirm_password' ]);
+            $data[ 'password' ] = $this->crypt->create($data[ 'password' ]);
         }
 
-        return $this->adminUsersMapper->update($data, ['admin_user_id' => $userId]);
+        return $this->adminUsersMapper->update($data, [ 'admin_user_id' => $userId ]);
     }
 
     /**
@@ -212,14 +212,14 @@ 
      */
     public function delete($userId)
     {
-        if(!($adminUser = $this->getUser($userId))) {
+        if (!($adminUser = $this->getUser($userId))) {
             throw new \Exception('Admin user not found.');
         }
 
         $this->upload->deleteFile($adminUser->face_img);
         $this->upload->deleteFile($adminUser->profile_img);
 
-        return (bool)$this->adminUsersMapper->delete(['admin_user_id' => $userId]);
+        return (bool) $this->adminUsersMapper->delete([ 'admin_user_id' => $userId ]);
     }
 
     /**

packages/Core/Filter/AbstractFilter.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     {
         $allMsgs = '';
         array_walk_recursive(
-            $msgs, function ($value) use (&$allMsgs) {
+            $msgs, function($value) use (&$allMsgs) {
                 $allMsgs .= "- " . $value . "<br/>";
             }
         );

packages/Core/Filter/AdminUserFilter.php

Spacing +18 added lines, -18 removed lines

@@ -19,17 +19,17 @@ 
 
     public function getInputFilter()
     {
-        if(!$this->inputFilter) {
+        if (!$this->inputFilter) {
             $inputFilter = new InputFilter();
 
             $inputFilter->add(
                 [
                 'name'       => 'first_name',
                 'required'   => true,
-                'filters'    => [['name' => 'StringTrim']],
+                'filters'    => [ [ 'name' => 'StringTrim' ] ],
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'StringLength', 'options' => ['min' => 2, 'max' => 255]]
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'StringLength', 'options' => [ 'min' => 2, 'max' => 255 ] ]
                 ],
                 ]
             );
@@ -38,10 +38,10 @@ 
                 [
                 'name'       => 'last_name',
                 'required'   => true,
-                'filters'    => [['name' => 'StringTrim']],
+                'filters'    => [ [ 'name' => 'StringTrim' ] ],
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'StringLength', 'options' => ['min' => 2, 'max' => 255]]
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'StringLength', 'options' => [ 'min' => 2, 'max' => 255 ] ]
                 ],
                 ]
             );
@@ -50,11 +50,11 @@ 
                 [
                 'name'       => 'email',
                 'required'   => true,
-                'filters'    => [['name' => 'StringTrim']],
+                'filters'    => [ [ 'name' => 'StringTrim' ] ],
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'EmailAddress'],
-                    ['name' => 'dbnorecordexists', 'options' => ['adapter' => $this->adapter, 'table' => 'admin_users', 'field' => 'email']],
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'EmailAddress' ],
+                    [ 'name' => 'dbnorecordexists', 'options' => [ 'adapter' => $this->adapter, 'table' => 'admin_users', 'field' => 'email' ] ],
 
                 ],
                 ]
@@ -64,7 +64,7 @@ 
                 [
                 'name'     => 'introduction',
                 'required' => false,
-                'filters'  => [['name' => 'StringTrim']]
+                'filters'  => [ [ 'name' => 'StringTrim' ] ]
                 ]
             );
 
@@ -72,7 +72,7 @@ 
                 [
                 'name'     => 'biography',
                 'required' => false,
-                'filters'  => [['name' => 'StringTrim']]
+                'filters'  => [ [ 'name' => 'StringTrim' ] ]
                 ]
             );
 
@@ -81,8 +81,8 @@ 
                 'name'       => 'password',
                 'required'   => true,
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'StringLength', 'options' => ['min' => 7, 'max' => 255]]
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'StringLength', 'options' => [ 'min' => 7, 'max' => 255 ] ]
                 ],
                 ]
             );
@@ -92,8 +92,8 @@ 
                 'name'       => 'confirm_password',
                 'required'   => true,
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'Identical', 'options' => ['token' => 'password']],
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'Identical', 'options' => [ 'token' => 'password' ] ],
                 ],
                 ]
             );
@@ -102,7 +102,7 @@ 
                 [
                 'name'       => 'status',
                 'required'   => true,
-                'validators' => [['name' => 'NotEmpty'], ['name' => 'Digits']]
+                'validators' => [ [ 'name' => 'NotEmpty' ], [ 'name' => 'Digits' ] ]
                 ]
             );
 

packages/Page/src/Mapper/PageMapper.php

Spacing +1 added lines, -1 removed lines

@@ -35,6 +35,6 @@
 
     public function getActivePage($urlSlug)
     {
-        return $this->select(['slug' => $urlSlug, 'is_active' => true]);
+        return $this->select([ 'slug' => $urlSlug, 'is_active' => true ]);
     }
 }

packages/Page/src/Controller/PageController.php

Indentation +4 added lines, -4 removed lines

@@ -15,21 +15,21 @@ 
     /**
 * 
      *
- * @var Template 
+     * @var Template 
 */
     private $template;
 
     /**
 * 
      *
- * @var Router 
+     * @var Router 
 */
     private $router;
 
     /**
 * 
      *
- * @var PageService 
+     * @var PageService 
 */
     private $pageService;
 
@@ -50,7 +50,7 @@ 
     /**
 * 
      *
- * @return HtmlResponse 
+     * @return HtmlResponse 
 */
     public function index(): HtmlResponse
     {

Spacing +10 added lines, -10 removed lines

@@ -55,8 +55,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(
@@ -69,14 +69,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(
@@ -95,9 +95,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 {
@@ -106,10 +106,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;
         }
     }
@@ -122,7 +122,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/Service/PageService.php

Spacing +16 added lines, -16 removed lines

@@ -36,7 +36,7 @@ 
             $this->pageMapper->getAdapter(),
             $this->pageMapper->getResultSetPrototype()
         );
-        $pagination        = new Paginator($paginationAdapter);
+        $pagination = new Paginator($paginationAdapter);
 
         $pagination->setCurrentPageNumber($page);
         $pagination->setItemCountPerPage($limit);
@@ -51,7 +51,7 @@ 
      */
     public function getPage($pageId)
     {
-        return $this->pageMapper->select(['page_id' => $pageId])->current();
+        return $this->pageMapper->select([ 'page_id' => $pageId ])->current();
     }
 
     /**
@@ -69,7 +69,7 @@ 
      */
     public function getHomepage()
     {
-        return $this->pageMapper->select(['is_homepage' => true])->current();
+        return $this->pageMapper->select([ 'is_homepage' => true ])->current();
     }
 
     /**
@@ -87,13 +87,13 @@ 
         }
 
         $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);
+            + [ '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);
@@ -112,21 +112,21 @@ 
         }
 
         $data = $filter->getValues()
-            + ['main_img' => $this->upload->uploadImage($data, 'main_img')];
+            + [ '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' ]);
         }
         else {
             $this->upload->deleteFile($page->getMainImg());
         }
 
-        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)
@@ -137,6 +137,6 @@ 
 
         $this->upload->deleteFile($page->getMainImg());
 
-        return (bool)$this->pageMapper->delete(['page_id' => $pageId]);
+        return (bool) $this->pageMapper->delete([ 'page_id' => $pageId ]);
     }
 }

packages/Page/src/Filter/PageFilter.php

Spacing +16 added lines, -16 removed lines

@@ -18,10 +18,10 @@ 
             [
             '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 ] ],
             ],
             ]
         );
@@ -30,10 +30,10 @@ 
             [
             '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 ] ],
             ],
             ]
         );
@@ -42,10 +42,10 @@ 
             [
             '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 ] ],
             ],
             ]
         );
@@ -54,10 +54,10 @@ 
             [
             '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 ] ],
             ],
             ]
         );
@@ -66,7 +66,7 @@ 
             [
             'name'     => 'has_layout',
             'required' => false,
-            'filters'  => [['name' => 'Boolean']],
+            'filters'  => [ [ 'name' => 'Boolean' ] ],
             ]
         );
 
@@ -74,7 +74,7 @@ 
             [
             'name'     => 'is_homepage',
             'required' => false,
-            'filters'  => [['name' => 'Boolean']],
+            'filters'  => [ [ 'name' => 'Boolean' ] ],
             ]
         );
 
@@ -82,7 +82,7 @@ 
             [
             'name'     => 'is_active',
             'required' => false,
-            'filters'  => [['name' => 'Boolean']],
+            'filters'  => [ [ 'name' => 'Boolean' ] ],
             ]
         );
 
@@ -90,7 +90,7 @@ 
             [
             'name'     => 'is_wysiwyg_editor',
             'required' => false,
-            'filters'  => [['name' => 'Boolean']],
+            'filters'  => [ [ 'name' => 'Boolean' ] ],
             ]
         );
 

packages/Page/src/Entity/Page.php

Indentation +20 added lines, -20 removed lines

@@ -36,7 +36,7 @@ 
     /**
 * 
      *
- * @return mixed 
+     * @return mixed 
 */
     public function getSlug()
     {
@@ -46,7 +46,7 @@ 
     /**
 * 
      *
- * @param mixed $slug 
+     * @param mixed $slug 
 */
     public function setSlug($slug)
     {
@@ -60,7 +60,7 @@ 
     /**
 * 
      *
- * @return mixed 
+     * @return mixed 
 */
     public function getIsActive()
     {
@@ -70,7 +70,7 @@ 
     /**
 * 
      *
- * @param mixed $is_active 
+     * @param mixed $is_active 
 */
     public function setIsActive($is_active)
     {
@@ -80,7 +80,7 @@ 
     /**
 * 
      *
- * @return binary 
+     * @return binary 
 */
     public function getPageUuid()
     {
@@ -90,7 +90,7 @@ 
     /**
 * 
      *
- * @param binary $page_uuid 
+     * @param binary $page_uuid 
 */
     public function setPageUuid($page_uuid) 
     {
@@ -100,7 +100,7 @@ 
     /**
 * 
      *
- * @return mixed 
+     * @return mixed 
 */
     public function getPageId()
     {
@@ -110,7 +110,7 @@ 
     /**
 * 
      *
- * @param mixed $page_id 
+     * @param mixed $page_id 
 */
     public function setPageId($page_id)
     {
@@ -120,7 +120,7 @@ 
     /**
 * 
      *
- * @return mixed 
+     * @return mixed 
 */
     public function getTitle()
     {
@@ -130,7 +130,7 @@ 
     /**
 * 
      *
- * @param mixed $title 
+     * @param mixed $title 
 */
     public function setTitle($title)
     {
@@ -140,7 +140,7 @@ 
     /**
 * 
      *
- * @return mixed 
+     * @return mixed 
 */
     public function getBody()
     {
@@ -150,7 +150,7 @@ 
     /**
 * 
      *
- * @param mixed $body 
+     * @param mixed $body 
 */
     public function setBody($body)
     {
@@ -173,7 +173,7 @@ 
     /**
 * 
      *
- * @param mixed $description 
+     * @param mixed $description 
 */
     public function setDescription($description)
     {
@@ -183,7 +183,7 @@ 
     /**
 * 
      *
- * @return mixed 
+     * @return mixed 
 */
     public function getMainImg()
     {
@@ -193,7 +193,7 @@ 
     /**
 * 
      *
- * @param mixed $main_img 
+     * @param mixed $main_img 
 */
     public function setMainImg($main_img)
     {
@@ -203,7 +203,7 @@ 
     /**
 * 
      *
- * @return mixed 
+     * @return mixed 
 */
     public function getHasLayout()
     {
@@ -219,7 +219,7 @@ 
     /**
 * 
      *
- * @return mixed 
+     * @return mixed 
 */
     public function getIsHomepage()
     {
@@ -229,7 +229,7 @@ 
     /**
 * 
      *
- * @param mixed $is_homepage 
+     * @param mixed $is_homepage 
 */
     public function setIsHomepage($is_homepage)
     {
@@ -252,7 +252,7 @@ 
     /**
 * 
      *
- * @param string $created_at 
+     * @param string $created_at 
 */
     public function setCreatedAt(string $created_at)
     {
@@ -274,7 +274,7 @@ 
     /**
 * 
      *
- * @return Array 
+     * @return Array 
 */
     public function getArrayCopy()
     {

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>