phpsrbija / unfinished

packages/Category/src/Filter/CategoryFilter.php

Spacing +15 added lines, -15 removed lines

@@ -12,17 +12,17 @@ 
 
     public function getInputFilter()
     {
-        if(!$this->inputFilter) {
+        if (!$this->inputFilter) {
             $inputFilter = new InputFilter();
 
             $inputFilter->add(
                 [
                 'name'       => 'name',
                 'required'   => true,
-                'filters'    => [['name' => 'StringTrim']],
+                'filters'    => [ [ 'name' => 'StringTrim' ] ],
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'StringLength', 'options' => ['min' => 2, 'max' => 500]],
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'StringLength', 'options' => [ 'min' => 2, 'max' => 500 ] ],
                 ],
                 ]
             );
@@ -31,10 +31,10 @@ 
                 [
                 'name'       => 'slug',
                 'required'   => true,
-                'filters'    => [['name' => 'StringTrim', 'options' => ['charlist' => '/']]],
+                'filters'    => [ [ 'name' => 'StringTrim', 'options' => [ 'charlist' => '/' ] ] ],
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'StringLength', 'options' => ['min' => 2, 'max' => 100]],
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'StringLength', 'options' => [ 'min' => 2, 'max' => 100 ] ],
                 ],
                 ]
             );
@@ -43,10 +43,10 @@ 
                 [
                 'name'       => 'title',
                 'required'   => false,
-                '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 ] ],
                 ],
                 ]
             );
@@ -55,10 +55,10 @@ 
                 [
                 'name'       => 'description',
                 'required'   => false,
-                'filters'    => [['name' => 'StringTrim']],
+                'filters'    => [ [ 'name' => 'StringTrim' ] ],
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'StringLength', 'options' => ['min' => 2, 'max' => 1000]],
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'StringLength', 'options' => [ 'min' => 2, 'max' => 1000 ] ],
                 ],
                 ]
             );
@@ -67,7 +67,7 @@ 
                 [
                 'name'     => 'is_in_homepage',
                 'required' => false,
-                'filters'  => [['name' => 'Boolean']],
+                'filters'  => [ [ 'name' => 'Boolean' ] ],
                 ]
             );
 
@@ -75,7 +75,7 @@ 
                 [
                 'name'     => 'is_in_category_list',
                 'required' => false,
-                'filters'  => [['name' => 'Boolean']],
+                'filters'  => [ [ 'name' => 'Boolean' ] ],
                 ]
             );
 

packages/Web/Action/HomeAction.php

Indentation +2 added lines, -2 removed lines

@@ -20,14 +20,14 @@
     /**
 * 
      *
- * @var Template 
+     * @var Template 
 */
     private $template;
 
     /**
 * 
      *
- * @var PageService 
+     * @var PageService 
 */
     private $pageService;
 

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Web\Action;
 
@@ -58,7 +58,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' ]));
     }
 
 }

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/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/Service/PageServiceFactory.php

Spacing +2 added lines, -2 removed lines

@@ -14,8 +14,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' ]);
 
         // Create pagination object
         $pageMapper        = $container->get(PageMapper::class);

packages/Page/src/Service/PageService.php

Indentation +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
             + ['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);
+                            = (new MysqlUuid($data['page_id']))->toFormat(new Binary);
 
         if($data['is_homepage']){
             $this->pageMapper->update(['is_homepage' => false]);

Braces +1 added lines, -2 removed lines

@@ -104,8 +104,7 @@
         // We don't want to force user to re-upload image on edit
         if(!$data['main_img']){
             unset($data['main_img']);
-        }
-        else{
+        } else{
             $this->upload->deleteFile($page->getMainImg());
         }
 

Spacing +20 added lines, -20 removed lines

@@ -40,7 +40,7 @@ 
      */
     public function getPage($pageId)
     {
-        return $this->pageMapper->select(['page_id' => $pageId])->current();
+        return $this->pageMapper->select([ 'page_id' => $pageId ])->current();
     }
 
     /**
@@ -57,7 +57,7 @@ 
      */
     public function getHomepage()
     {
-        return $this->pageMapper->select(['is_homepage' => true])->current();
+        return $this->pageMapper->select([ 'is_homepage' => true ])->current();
     }
 
     /**
@@ -69,18 +69,18 @@ 
     {
         $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);
+            + [ '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);
@@ -88,43 +88,43 @@ 
 
     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')];
+            + [ '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{
+        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)
     {
-        if(!($page = $this->getPage($pageId))){
+        if (!($page = $this->getPage($pageId))) {
             throw new \Exception('Page not found');
         }
 
         $this->upload->deleteFile($page->getMainImg());
 
-        return (bool)$this->pageMapper->delete(['page_id' => $pageId]);
+        return (bool) $this->pageMapper->delete([ 'page_id' => $pageId ]);
     }
 
     public function getForSelect()

packages/Admin/src/Mapper/AdminUsersMapper.php

Doc Comments +12 added lines, -2 removed lines

@@ -31,6 +31,9 @@ 
         $this->adapter = $adapter;
     }
 
+    /**
+     * @param string $id
+     */
     public function get($id)
     {
         return $this->select(['admin_user_id' => $id])->current();
@@ -40,7 +43,7 @@ 
      * Get admin user by email.
      *
      * @param  string $email email
-     * @return array|\ArrayObject|null
+     * @return string
      */
     public function getByEmail(string $email)
     {
@@ -50,7 +53,6 @@ 
     /**
      * Updates login data.
      *
-     * @param  string $uuid admin user id
      * @return int number of affected rows
      */
     public function updateLogin(string $userId): int
@@ -58,6 +60,11 @@ 
         return $this->update(['last_login' => date('Y-m-d H:i:s')], ['admin_user_id' => $userId]);
     }
 
+    /**
+     * @param string $userId
+     *
+     * @return \Zend\Db\Sql\Select
+     */
     public function getPaginationSelect($userId)
     {
         $select = $this->getSql()->select()->order(['created_at' => 'desc']);
@@ -67,6 +74,9 @@ 
         return $select;
     }
 
+    /**
+     * @param integer $limit
+     */
     public function getRandom($limit)
     {
         $select = $this->getSql()->select()

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Admin\Mapper;
 
@@ -33,7 +33,7 @@ 
 
     public function get($id)
     {
-        return $this->select(['admin_user_id' => $id])->current();
+        return $this->select([ 'admin_user_id' => $id ])->current();
     }
 
     /**
@@ -44,7 +44,7 @@ 
      */
     public function getByEmail(string $email)
     {
-        return $this->select(['email' => $email])->current();
+        return $this->select([ 'email' => $email ])->current();
     }
 
     /**
@@ -55,12 +55,12 @@ 
      */
     public function updateLogin(string $userId): int
     {
-        return $this->update(['last_login' => date('Y-m-d H:i:s')], ['admin_user_id' => $userId]);
+        return $this->update([ 'last_login' => date('Y-m-d H:i:s') ], [ 'admin_user_id' => $userId ]);
     }
 
     public function getPaginationSelect($userId)
     {
-        $select = $this->getSql()->select()->order(['created_at' => 'desc']);
+        $select = $this->getSql()->select()->order([ 'created_at' => 'desc' ]);
 
         $select->where->notEqualTo('admin_user_id', $userId);
 
@@ -70,7 +70,7 @@ 
     public function getRandom($limit)
     {
         $select = $this->getSql()->select()
-            ->where(['status' => 1])
+            ->where([ 'status' => 1 ])
             ->order(new Expression('rand()'))
             ->limit($limit);
 
@@ -79,9 +79,9 @@ 
 
     public function getUuid($adminUserId)
     {
-        $user = $this->select(['admin_user_id' => $adminUserId])->current();
+        $user = $this->select([ 'admin_user_id' => $adminUserId ])->current();
 
-        if(!$user) {
+        if (!$user) {
             throw new \Exception('Admin user does not exist!', 400);
         }
 

packages/Admin/src/Middleware/AdminAuth.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
         if (!$user) {
             return $response->withStatus(302)->withHeader(
                 'Location',
-                $this->router->generateUri('auth', ['action' => 'login'])
+                $this->router->generateUri('auth', [ 'action' => 'login' ])
             );
         }
 

packages/Admin/src/Service/AdminUserService.php

Spacing +24 added lines, -24 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Admin\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 ]);
     }
 
     /**

Braces +2 added lines, -4 removed lines

@@ -167,15 +167,13 @@
         // We don't want to force user to re-upload image on edit
         if(!$data['face_img']) {
             unset($data['face_img']);
-        }
-        else{
+        } else{
             $this->upload->deleteFile($user->face_img);
         }
 
         if(!$data['profile_img']) {
             unset($data['profile_img']);
-        }
-        else{
+        } else{
             $this->upload->deleteFile($user->profile_img);
         }