phpsrbija / unfinished

packages/Menu/src/Service/MenuService.php

Spacing +41 added lines, -41 removed lines

@@ -28,26 +28,26 @@ 
     private function unflattenArray(array $flatArray)
     {
         $flatArray = array_reverse($flatArray);
-        $refs      = [];
-        $result    = [];
+        $refs      = [ ];
+        $result    = [ ];
 
-        while(count($flatArray) > 0) {
-            for($i = count($flatArray) - 1; $i >= 0; $i--) {
-                if(!isset($flatArray[$i]['children'])) {
-                    $flatArray[$i]['children'] = [];
+        while (count($flatArray) > 0) {
+            for ($i = count($flatArray) - 1; $i >= 0; $i--) {
+                if (!isset($flatArray[ $i ][ 'children' ])) {
+                    $flatArray[ $i ][ 'children' ] = [ ];
                 }
 
-                if(!$flatArray[$i]["parent_id"]) {
-                    $result[$flatArray[$i]["menu_id"]] = $flatArray[$i];
-                    $refs[$flatArray[$i]["menu_id"]]   = &$result[$flatArray[$i]["menu_id"]];
-                    unset($flatArray[$i]);
+                if (!$flatArray[ $i ][ "parent_id" ]) {
+                    $result[ $flatArray[ $i ][ "menu_id" ] ] = $flatArray[ $i ];
+                    $refs[ $flatArray[ $i ][ "menu_id" ] ]   = &$result[ $flatArray[ $i ][ "menu_id" ] ];
+                    unset($flatArray[ $i ]);
                     $flatArray = array_values($flatArray);
-                } else if($flatArray[$i]["parent_id"] != 0) {
-                    if(array_key_exists($flatArray[$i]["parent_id"], $refs)) {
-                        $o                                               = $flatArray[$i];
-                        $refs[$flatArray[$i]["menu_id"]]                 = $o;
-                        $refs[$flatArray[$i]["parent_id"]]["children"][] = &$refs[$flatArray[$i]["menu_id"]];
-                        unset($flatArray[$i]);
+                } else if ($flatArray[ $i ][ "parent_id" ] != 0) {
+                    if (array_key_exists($flatArray[ $i ][ "parent_id" ], $refs)) {
+                        $o                                               = $flatArray[ $i ];
+                        $refs[ $flatArray[ $i ][ "menu_id" ] ]                 = $o;
+                        $refs[ $flatArray[ $i ][ "parent_id" ] ][ "children" ][ ] = &$refs[ $flatArray[ $i ][ "menu_id" ] ];
+                        unset($flatArray[ $i ]);
                         $flatArray = array_values($flatArray);
                     }
                 }
@@ -65,7 +65,7 @@ 
         $this->postService     = $postService;
     }
 
-    public function getNestedAll($isActive = null, $filter = [])
+    public function getNestedAll($isActive = null, $filter = [ ])
     {
         $items = $this->menuMapper->selectAll($isActive, $filter)->toArray();
 
@@ -81,8 +81,8 @@ 
     {
         $data = $this->filterMenuItem($data);
 
-        $data['menu_id']   = Uuid::uuid1()->toString();
-        $data['menu_uuid'] = (new MysqlUuid($data['menu_id']))->toFormat(new Binary);
+        $data[ 'menu_id' ]   = Uuid::uuid1()->toString();
+        $data[ 'menu_uuid' ] = (new MysqlUuid($data[ 'menu_id' ]))->toFormat(new Binary);
 
         return $this->menuMapper->insertMenuItem($data);
     }
@@ -96,13 +96,13 @@ 
 
     public function delete($id)
     {
-        $children = $this->menuMapper->select(['parent_id' => $id]);
+        $children = $this->menuMapper->select([ 'parent_id' => $id ]);
 
-        if($children->count()) {
+        if ($children->count()) {
             throw new \Exception('This Menu Item has child items', 400);
         }
 
-        return $this->menuMapper->delete(['menu_id' => $id]);
+        return $this->menuMapper->delete([ 'menu_id' => $id ]);
     }
 
     public function getForSelect()
@@ -112,7 +112,7 @@ 
 
     public function updateMenuOrder($menuOrder)
     {
-        if(!$menuOrder) {
+        if (!$menuOrder) {
             return true;
         }
 
@@ -122,7 +122,7 @@ 
             $this->updateLevel(null, $menuOrder, $orderNo);
             $this->menuMapper->getAdapter()->getDriver()->getConnection()->commit();
         }
-        catch(\Exception $e) {
+        catch (\Exception $e) {
             $this->menuMapper->getAdapter()->getDriver()->getConnection()->rollback();
 
             throw $e;
@@ -133,12 +133,12 @@ 
 
     private function updateLevel($parentId = null, $children, &$orderNo)
     {
-        foreach($children as $v) {
-            if(isset($v->children)) {
-                $this->menuMapper->update(['order_no' => $orderNo++, 'parent_id' => $parentId], ['menu_id' => $v->id]);
+        foreach ($children as $v) {
+            if (isset($v->children)) {
+                $this->menuMapper->update([ 'order_no' => $orderNo++, 'parent_id' => $parentId ], [ 'menu_id' => $v->id ]);
                 $this->updateLevel($v->id, $v->children, $orderNo);
             } else {
-                $this->menuMapper->update(['order_no' => $orderNo++, 'parent_id' => $parentId], ['menu_id' => $v->id]);
+                $this->menuMapper->update([ 'order_no' => $orderNo++, 'parent_id' => $parentId ], [ 'menu_id' => $v->id ]);
             }
         }
     }
@@ -147,30 +147,30 @@ 
     {
         $filter = $this->menuFilter->getInputFilter()->setData($data);
 
-        if(!$filter->isValid()) {
+        if (!$filter->isValid()) {
             throw new FilterException($filter->getMessages());
         }
 
-        if(count(array_filter([$data['article_id'], $data['category_id'], $data['href']])) > 1) {
+        if (count(array_filter([ $data[ 'article_id' ], $data[ 'category_id' ], $data[ 'href' ] ])) > 1) {
             throw new \Exception('You need to set only one link. Post, Category or Href.');
         }
 
         $data = $filter->getValues();
 
-        if($data['article_id']) {
-            $article               = $this->postService->fetchSingleArticle($data['article_id']);
-            $data['article_uuid']  = $article->article_uuid;
-            $data['category_uuid'] = null;
-        } elseif($data['category_id']) {
-            $category              = $this->categoryService->getCategory($data['category_id']);
-            $data['category_uuid'] = $category->category_uuid;
-            $data['article_uuid']  = null;
+        if ($data[ 'article_id' ]) {
+            $article               = $this->postService->fetchSingleArticle($data[ 'article_id' ]);
+            $data[ 'article_uuid' ]  = $article->article_uuid;
+            $data[ 'category_uuid' ] = null;
+        } elseif ($data[ 'category_id' ]) {
+            $category              = $this->categoryService->getCategory($data[ 'category_id' ]);
+            $data[ 'category_uuid' ] = $category->category_uuid;
+            $data[ 'article_uuid' ]  = null;
         } else {
-            $data['article_uuid']  = null;
-            $data['category_uuid'] = null;
+            $data[ 'article_uuid' ]  = null;
+            $data[ 'category_uuid' ] = null;
         }
 
-        unset($data['article_id'], $data['category_id']);
+        unset($data[ 'article_id' ], $data[ 'category_id' ]);
 
         return $data;
     }

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

Spacing +6 added lines, -6 removed lines

@@ -33,16 +33,16 @@
      */
     public function __invoke($menuItem)
     {
-        if($menuItem['href']) {
-            return strpos($menuItem['href'], 'http') === 0 ? $menuItem['href'] : '/' . $menuItem['href'];
+        if ($menuItem[ 'href' ]) {
+            return strpos($menuItem[ 'href' ], 'http') === 0 ? $menuItem[ 'href' ] : '/' . $menuItem[ 'href' ];
         }
-        elseif($menuItem['article_slug']) {
-            $params = ['segment_1' => $menuItem['category_slug'], 'segment_2' => $menuItem['article_slug']];
+        elseif ($menuItem[ 'article_slug' ]) {
+            $params = [ 'segment_1' => $menuItem[ 'category_slug' ], 'segment_2' => $menuItem[ 'article_slug' ] ];
 
             return $this->url->__invoke('post', $params);
         }
-        elseif($menuItem['category_slug']) {
-            return $this->url->__invoke('category', ['category' => $menuItem['category_slug']]);
+        elseif ($menuItem[ 'category_slug' ]) {
+            return $this->url->__invoke('category', [ 'category' => $menuItem[ 'category_slug' ] ]);
         }
         else {
             return '#';

packages/Menu/src/Mapper/MenuMapper.php

Spacing +19 added lines, -19 removed lines

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

packages/Menu/src/ConfigProvider.php

Spacing +3 added lines, -3 removed lines

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

packages/Page/src/Service/PageServiceFactory.php

Spacing +2 added lines, -2 removed lines

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

packages/Page/src/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/Admin/src/Controller/AuthController.php

Spacing +7 added lines, -7 removed lines

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

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