phpsrbija / unfinished

packages/Category/src/View/Helper/CategoryHelper.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
      */
     public function forHomepage()
     {
-        if(!$this->homepageCategories) {
+        if (!$this->homepageCategories) {
             $this->homepageCategories = $this->categoryService->getCategoriesWithPosts(true);
         }
 

packages/Category/src/Factory/Service/CategoryServiceFactory.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Category\Factory\Service;
 
@@ -20,8 +20,8 @@ 
      */
     public function __invoke(ContainerInterface $container): CategoryService
     {
-        $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 CategoryService(
             $container->get(CategoryMapper::class),

packages/Core/Service/AdminUserService.php

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

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/Category/src/Service/CategoryService.php

Spacing +16 added lines, -16 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Category\Service;
 
@@ -76,7 +76,7 @@ 
      */
     public function getCategoryBySlug($urlSlug)
     {
-        return $this->categoryMapper->select(['slug' => $urlSlug])->current();
+        return $this->categoryMapper->select([ 'slug' => $urlSlug ])->current();
     }
 
     /**
@@ -89,14 +89,14 @@ 
     {
         $filter = $this->categoryFilter->getInputFilter()->setData($data);
 
-        if(!$filter->isValid()) {
+        if (!$filter->isValid()) {
             throw new FilterException($filter->getMessages());
         }
 
         $values                   = $filter->getValues();
-        $values['category_id']    = Uuid::uuid1()->toString();
-        $values['category_uuid']  = (new MysqlUuid($values['category_id']))->toFormat(new Binary);
-        $values['main_img']       = $this->upload->uploadImage($data, 'main_img');
+        $values[ 'category_id' ]    = Uuid::uuid1()->toString();
+        $values[ 'category_uuid' ]  = (new MysqlUuid($values[ 'category_id' ]))->toFormat(new Binary);
+        $values[ 'main_img' ]       = $this->upload->uploadImage($data, 'main_img');
 
         $this->categoryMapper->insert($values);
     }
@@ -117,7 +117,7 @@ 
 
         $filter = $this->categoryFilter->getInputFilter()->setData($data);
 
-        if(!$filter->isValid()) {
+        if (!$filter->isValid()) {
             throw new FilterException($filter->getMessages());
         }
 
@@ -126,14 +126,14 @@ 
             ];
 
         // We don't want to force user to re-upload image on edit
-        if(!$values['main_img']) {
-            unset($values['main_img']);
+        if (!$values[ 'main_img' ]) {
+            unset($values[ 'main_img' ]);
         }
-        else{
+        else {
             $this->upload->deleteFile($oldCategory->main_img);
         }
 
-        $this->categoryMapper->update($values, ['category_id' => $categoryId]);
+        $this->categoryMapper->update($values, [ 'category_id' => $categoryId ]);
     }
 
     /**
@@ -148,7 +148,7 @@ 
 
         $this->upload->deleteFile($category->main_img);
 
-        return (bool)$this->categoryMapper->delete(['category_id' => $categoryId]);
+        return (bool) $this->categoryMapper->delete([ 'category_id' => $categoryId ]);
     }
 
     /**
@@ -172,10 +172,10 @@ 
     {
         $categories = $this->categoryMapper->getWeb(7, null, $inHomepage, $inCategoryList)->toArray();
 
-        foreach($categories as $ctn => $category) {
-            $select                    = $this->categoryMapper->getCategoryPostsSelect($category['category_id'], 4);
+        foreach ($categories as $ctn => $category) {
+            $select                    = $this->categoryMapper->getCategoryPostsSelect($category[ 'category_id' ], 4);
             $posts                     = $this->categoryMapper->selectWith($select)->toArray();
-            $categories[$ctn]['posts'] = $posts;
+            $categories[ $ctn ][ 'posts' ] = $posts;
         }
 
         return $categories;
@@ -189,7 +189,7 @@ 
      */
     public function getCategories($inCategoryList = null)
     {
-        return $this->categoryMapper->getWeb(null, ['name' => 'asc'], null, $inCategoryList);
+        return $this->categoryMapper->getWeb(null, [ 'name' => 'asc' ], null, $inCategoryList);
     }
 
     /**

Braces +1 added lines, -2 removed lines

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

Doc Comments +2 added lines, -2 removed lines

@@ -164,7 +164,7 @@ 
     /**
      * Return categories with posts/articles
      *
-     * @param  null $inHomepage
+     * @param  boolean $inHomepage
      * @param  null $inCategoryList
      * @return mixed
      */
@@ -184,7 +184,7 @@ 
     /**
      * Return categories posts/articles
      *
-     * @param  null $inCategoryList
+     * @param  boolean $inCategoryList
      * @return null|\Zend\Db\ResultSet\ResultSetInterface
      */
     public function getCategories($inCategoryList = null)

packages/Article/src/Service/ArticleServiceInterface.php

Doc Comments -1 removed lines

@@ -12,7 +12,6 @@
     /**
      * Fetches a list of ArticleEntity models.
      *
-     * @param  array $params
      * @return ArrayObject
      */
     public function fetchAllArticles($page, $limit);

packages/Menu/src/Controller/IndexController.php

Indentation +3 added lines, -3 removed lines

@@ -16,21 +16,21 @@
     /**
 * 
      *
- * @var Template 
+     * @var Template 
 */
     private $template;
 
     /**
 * 
      *
- * @var Router 
+     * @var Router 
 */
     private $router;
 
     /**
 * 
      *
- * @var MenuService 
+     * @var MenuService 
 */
     private $menuService;
 

Spacing +12 added lines, -12 removed lines

@@ -53,13 +53,13 @@ 
         );
     }
 
-    public function edit($errors = [])
+    public function edit($errors = [ ])
     {
         $id   = $this->request->getAttribute('id');
         $item = $this->menuService->get($id);
 
-        if($this->request->getParsedBody()) {
-            $item          = (object)($this->request->getParsedBody() + (array)$item);
+        if ($this->request->getParsedBody()) {
+            $item          = (object) ($this->request->getParsedBody() + (array) $item);
             $item->menu_id = $id;
         }
 
@@ -78,36 +78,36 @@ 
 
     public function save()
     {
-        try{
+        try {
             $id   = $this->request->getAttribute('id');
             $data = $this->request->getParsedBody();
 
-            if($id) {
+            if ($id) {
                 $this->menuService->updateMenuItem($data, $id);
             }
-            else{
+            else {
                 $this->menuService->addMenuItem($data);
             }
 
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.menu'));
         }
-        catch(FilterException $fe){
+        catch (FilterException $fe) {
             return $this->edit($fe->getArrayMessages());
         }
-        catch(\Exception $e){
+        catch (\Exception $e) {
             throw $e;
         }
     }
 
     public function delete()
     {
-        try{
+        try {
             $id = $this->request->getAttribute('id');
             $this->menuService->delete($id);
 
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.menu'));
         }
-        catch(\Exception $e){
+        catch (\Exception $e) {
             throw $e;
         }
     }
@@ -115,9 +115,9 @@ 
     public function updateOrder()
     {
         $data      = $this->request->getParsedBody();
-        $menuOrder = isset($data['order']) ? json_decode($data['order']) : [];
+        $menuOrder = isset($data[ 'order' ]) ? json_decode($data[ 'order' ]) : [ ];
         $status    = $this->menuService->updateMenuOrder($menuOrder);
 
-        return new JsonResponse(['status' => $status]);
+        return new JsonResponse([ 'status' => $status ]);
     }
 }

Braces +4 added lines, -8 removed lines

@@ -84,17 +84,14 @@ 
 
             if($id) {
                 $this->menuService->updateMenuItem($data, $id);
-            }
-            else{
+            } else{
                 $this->menuService->addMenuItem($data);
             }
 
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.menu'));
-        }
-        catch(FilterException $fe){
+        } catch(FilterException $fe){
             return $this->edit($fe->getArrayMessages());
-        }
-        catch(\Exception $e){
+        } catch(\Exception $e){
             throw $e;
         }
     }
@@ -106,8 +103,7 @@ 
             $this->menuService->delete($id);
 
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.menu'));
-        }
-        catch(\Exception $e){
+        } catch(\Exception $e){
             throw $e;
         }
     }

packages/Menu/src/View/Helper/MenuItems.php

Spacing +3 added lines, -3 removed lines

@@ -29,16 +29,16 @@
 
     public function getHeaderMenu()
     {
-        return $this->menuService->getNestedAll(true, ['is_in_header' => true]);
+        return $this->menuService->getNestedAll(true, [ 'is_in_header' => true ]);
     }
 
     public function getFooterMenu()
     {
-        return $this->menuService->getNestedAll(true, ['is_in_footer' => true]);
+        return $this->menuService->getNestedAll(true, [ 'is_in_footer' => true ]);
     }
 
     public function getSideMenu()
     {
-        return $this->menuService->getNestedAll(true, ['is_in_side' => true]);
+        return $this->menuService->getNestedAll(true, [ 'is_in_side' => true ]);
     }
 }

packages/Menu/src/Filter/MenuFilter.php

Spacing +13 added lines, -13 removed lines

@@ -20,17 +20,17 @@ 
 
     public function getInputFilter()
     {
-        if(!$this->inputFilter) {
+        if (!$this->inputFilter) {
             $inputFilter = new InputFilter();
 
             $inputFilter->add(
                 [
                 'name'       => 'title',
                 'required'   => true,
-                'filters'    => [['name' => 'StripTags'], ['name' => 'StringTrim']],
+                'filters'    => [ [ 'name' => 'StripTags' ], [ 'name' => 'StringTrim' ] ],
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'StringLength', 'options' => ['max' => '255']],
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'StringLength', 'options' => [ 'max' => '255' ] ],
                 ],
                 ]
             );
@@ -39,7 +39,7 @@ 
                 [
                 'name'     => 'href',
                 'required' => false,
-                'filters'  => [['name' => 'StripTags'], ['name' => 'StringTrim']]
+                'filters'  => [ [ 'name' => 'StripTags' ], [ 'name' => 'StringTrim' ] ]
                 ]
             );
 
@@ -47,9 +47,9 @@ 
                 [
                 'name'       => 'article_id',
                 'required'   => false,
-                'filters'    => [['name' => 'Null']],
+                'filters'    => [ [ 'name' => 'Null' ] ],
                 'validators' => [
-                    ['name' => RecordExists::class, 'options' => ['table' => 'articles', 'field' => 'article_id', 'adapter' => $this->db]]
+                    [ 'name' => RecordExists::class, 'options' => [ 'table' => 'articles', 'field' => 'article_id', 'adapter' => $this->db ] ]
                 ]
                 ]
             );
@@ -58,9 +58,9 @@ 
                 [
                 'name'       => 'category_id',
                 'required'   => false,
-                'filters'    => [['name' => 'Null']],
+                'filters'    => [ [ 'name' => 'Null' ] ],
                 'validators' => [
-                    ['name' => RecordExists::class, 'options' => ['table' => 'category', 'field' => 'category_id', 'adapter' => $this->db]]
+                    [ 'name' => RecordExists::class, 'options' => [ 'table' => 'category', 'field' => 'category_id', 'adapter' => $this->db ] ]
                 ]
                 ]
             );
@@ -69,7 +69,7 @@ 
                 [
                 'name'     => 'is_active',
                 'required' => false,
-                'filters'  => [['name' => 'Boolean']]
+                'filters'  => [ [ 'name' => 'Boolean' ] ]
                 ]
             );
 
@@ -77,7 +77,7 @@ 
                 [
                 'name'     => 'is_in_header',
                 'required' => false,
-                'filters'  => [['name' => 'Boolean']]
+                'filters'  => [ [ 'name' => 'Boolean' ] ]
                 ]
             );
 
@@ -85,7 +85,7 @@ 
                 [
                 'name'     => 'is_in_footer',
                 'required' => false,
-                'filters'  => [['name' => 'Boolean']]
+                'filters'  => [ [ 'name' => 'Boolean' ] ]
                 ]
             );
 
@@ -93,7 +93,7 @@ 
                 [
                 'name'     => 'is_in_side',
                 'required' => false,
-                'filters'  => [['name' => 'Boolean']]
+                'filters'  => [ [ 'name' => 'Boolean' ] ]
                 ]
             );
 

packages/Article/src/Mapper/ArticleEventsMapper.php

Spacing +20 added lines, -20 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Article\Mapper;
 
@@ -36,14 +36,14 @@ 
     public function getPaginationSelect($status = null)
     {
         $select = $this->getSql()->select()
-            ->columns(['title', 'body', 'longitude', 'latitude'])
+            ->columns([ 'title', 'body', 'longitude', 'latitude' ])
             ->join('articles', 'article_events.article_uuid = articles.article_uuid')
-            ->join('admin_users', 'admin_users.admin_user_uuid = articles.admin_user_uuid', ['admin_user_id', 'first_name', 'last_name'])
-            ->where(['articles.type' => ArticleType::EVENT])
-            ->order(['created_at' => 'desc']);
+            ->join('admin_users', 'admin_users.admin_user_uuid = articles.admin_user_uuid', [ 'admin_user_id', 'first_name', 'last_name' ])
+            ->where([ 'articles.type' => ArticleType::EVENT ])
+            ->order([ 'created_at' => 'desc' ]);
 
-        if($status) {
-            $select->where(['articles.status' => (int)$status]);
+        if ($status) {
+            $select->where([ 'articles.status' => (int) $status ]);
         }
 
         return $select;
@@ -55,10 +55,10 @@ 
             ->join('articles', 'article_events.article_uuid = articles.article_uuid')
             ->join(
                 'category', 'category.category_uuid = articles.category_uuid',
-                ['category_slug' => 'slug', 'category_name' => 'name', 'category_id'], 'left'
+                [ '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]);
+            ->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();
     }
@@ -69,9 +69,9 @@ 
             ->join('articles', 'article_events.article_uuid = articles.article_uuid')
             ->join(
                 'category', 'category.category_uuid = articles.category_uuid',
-                ['category_slug' => 'slug', 'category_name' => 'name', 'category_id'], 'left'
+                [ 'category_slug' => 'slug', 'category_name' => 'name', 'category_id' ], 'left'
             )
-            ->where(['articles.slug' => $slug]);
+            ->where([ 'articles.slug' => $slug ]);
 
         return $this->selectWith($select)->current();
     }
@@ -79,9 +79,9 @@ 
     public function getLatest($limit = 50)
     {
         $select = $this->getSql()->select()
-            ->join('articles', 'article_events.article_uuid = articles.article_uuid', ['article_id', 'slug', 'published_at'])
-            ->where(['articles.status' => 1])
-            ->order(['published_at' => 'desc'])
+            ->join('articles', 'article_events.article_uuid = articles.article_uuid', [ 'article_id', 'slug', 'published_at' ])
+            ->where([ 'articles.status' => 1 ])
+            ->order([ 'published_at' => 'desc' ])
             ->limit($limit);
 
         return $this->selectWith($select);
@@ -90,8 +90,8 @@ 
     public function getFuture()
     {
         $select = $this->getSql()->select()
-            ->where(['articles.status' => 1])
-            ->join('articles', 'articles.article_uuid = article_events.article_uuid', ['article_id', 'slug', 'published_at'])
+            ->where([ 'articles.status' => 1 ])
+            ->join('articles', 'articles.article_uuid = article_events.article_uuid', [ 'article_id', 'slug', 'published_at' ])
             ->order(new Expression('rand()'));
 
         $select->where->greaterThanOrEqualTo('end_at', date('Y-m-d H:i:s'));
@@ -102,9 +102,9 @@ 
     public function getPastSelect()
     {
         $select = $this->getSql()->select()
-            ->where(['articles.status' => 1])
-            ->join('articles', 'articles.article_uuid = article_events.article_uuid', ['article_id', 'slug', 'published_at'])
-            ->order(['start_at' => 'desc']);
+            ->where([ 'articles.status' => 1 ])
+            ->join('articles', 'articles.article_uuid = article_events.article_uuid', [ 'article_id', 'slug', 'published_at' ])
+            ->order([ 'start_at' => 'desc' ]);
 
         $select->where->lessThan('end_at', date('Y-m-d H:i:s'));