phpsrbija / unfinished

src/Web/Action/HomeAction.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Web\Action;
 
@@ -47,7 +47,7 @@ 
     {
         $article = $this->postService->getHomepage();
 
-        if(!$article) {
+        if (!$article) {
             throw new \Exception('You need to set homepage!', 404);
         }
 

src/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 ]);
     }
 }
\ No newline at end of file

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

src/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;
     }

data/phinx/migrations/20161229132328_posts.php

Spacing +17 added lines, -17 removed lines

@@ -10,16 +10,16 @@ 
 {
     public function up()
     {
-        $this->table('article_posts', ['id' => false])
-            ->addColumn('article_uuid', 'binary', ['limit' => 16])
+        $this->table('article_posts', [ 'id' => false ])
+            ->addColumn('article_uuid', 'binary', [ 'limit' => 16 ])
             ->addColumn('title', 'text')
             ->addColumn('body', 'text')
             ->addColumn('lead', 'text')
-            ->addColumn('featured_img', 'text', ['null' => true])
-            ->addColumn('main_img', 'text', ['null' => true])
-            ->addColumn('has_layout', 'boolean', ['default' => true])
-            ->addColumn('is_homepage', 'boolean', ['default' => false])
-            ->addForeignKey('article_uuid', 'articles', 'article_uuid', ['delete' => 'NO_ACTION', 'update' => 'NO_ACTION'])
+            ->addColumn('featured_img', 'text', [ 'null' => true ])
+            ->addColumn('main_img', 'text', [ 'null' => true ])
+            ->addColumn('has_layout', 'boolean', [ 'default' => true ])
+            ->addColumn('is_homepage', 'boolean', [ 'default' => false ])
+            ->addForeignKey('article_uuid', 'articles', 'article_uuid', [ 'delete' => 'NO_ACTION', 'update' => 'NO_ACTION' ])
             ->create();
 
 //        $this->insertDummyData();
@@ -32,10 +32,10 @@ 
 
     private function insertDummyData()
     {
-        $ids  = [];
+        $ids  = [ ];
         $rows = $this->fetchAll('select admin_user_uuid from admin_users;');
-        foreach($rows as $r) {
-            $ids[] = $r['admin_user_uuid'];
+        foreach ($rows as $r) {
+            $ids[ ] = $r[ 'admin_user_uuid' ];
         }
 
         $faker  = Faker\Factory::create();
@@ -43,19 +43,19 @@ 
         $count  = rand(25, 300);
 
         // Download N images and set it randomly to posts
-        for($i = 0; $i < 5; $i++) {
+        for ($i = 0; $i < 5; $i++) {
             $image       = $faker->image();
             $destination = $upload->getPath(basename($image));
             rename($image, $destination);
-            $mainImg[] = substr($destination, strlen('/var/www/unfinished/public'));
+            $mainImg[ ] = substr($destination, strlen('/var/www/unfinished/public'));
 
             $image       = $faker->image();
             $destination = $upload->getPath(basename($image));
             rename($image, $destination);
-            $featuredImg[] = substr($destination, strlen('/var/www/unfinished/public'));
+            $featuredImg[ ] = substr($destination, strlen('/var/www/unfinished/public'));
         }
 
-        for($i = 0; $i < $count; $i++) {
+        for ($i = 0; $i < $count; $i++) {
             $id        = $faker->uuid;
             $mysqluuid = (new Uuid($id))->toFormat(new Binary());
             $title     = $faker->sentence(7, 20);
@@ -65,7 +65,7 @@ 
                 'article_id'      => $id,
                 'slug'            => strtolower(trim(preg_replace('~[^\pL\d]+~u', '-', $title), '-')),
                 'status'          => 1,
-                'admin_user_uuid' => $ids[array_rand($ids)],
+                'admin_user_uuid' => $ids[ array_rand($ids) ],
                 'type'            => ArticleType::POST
             ];
 
@@ -74,8 +74,8 @@ 
                 'title'        => $title,
                 'body'         => $faker->paragraph(15),
                 'lead'         => $faker->paragraph(5),
-                'main_img'     => $mainImg[array_rand($mainImg)],
-                'featured_img' => $featuredImg[array_rand($featuredImg)]
+                'main_img'     => $mainImg[ array_rand($mainImg) ],
+                'featured_img' => $featuredImg[ array_rand($featuredImg) ]
             ];
 
             $this->insert('articles', $article);

src/Article/src/Filter/ArticleFilter.php

Spacing +7 added lines, -7 removed lines

@@ -12,30 +12,30 @@
 
     public function getInputFilter()
     {
-        if(!$this->inputFilter) {
+        if (!$this->inputFilter) {
             $inputFilter = new InputFilter();
 
             $inputFilter->add([
                 '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 ] ],
                 ],
             ]);
 
             $inputFilter->add([
                 'name'       => 'published_at',
                 'required'   => true,
-                'filters'    => [['name' => 'StringTrim']],
-                'validators' => [['name' => 'NotEmpty'], ['name' => 'Date', 'options' => ['format' => 'Y-m-d H:i:s']]]
+                'filters'    => [ [ 'name' => 'StringTrim' ] ],
+                'validators' => [ [ 'name' => 'NotEmpty' ], [ 'name' => 'Date', 'options' => [ 'format' => 'Y-m-d H:i:s' ] ] ]
             ]);
 
             $inputFilter->add([
                 'name'     => 'status',
                 'required' => false,
-                'filters'  => [['name' => 'Boolean']],
+                'filters'  => [ [ 'name' => 'Boolean' ] ],
             ]);
 
             $this->inputFilter = $inputFilter;

src/Article/src/Mapper/ArticlePostsMapper.php

Spacing +10 added lines, -10 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Article\Mapper;
 
@@ -34,18 +34,18 @@ 
     public function getPaginationSelect()
     {
         return $this->getSql()->select()
-            ->columns(['title', 'body', 'lead', 'featured_img', 'main_img', 'is_homepage'])
+            ->columns([ 'title', 'body', 'lead', 'featured_img', 'main_img', 'is_homepage' ])
             ->join('articles', 'article_posts.article_uuid = articles.article_uuid')
-            ->where(['articles.type' => ArticleType::POST])
-            ->order(['created_at' => 'desc']);
+            ->where([ 'articles.type' => ArticleType::POST ])
+            ->order([ 'created_at' => 'desc' ]);
     }
 
     public function get($id)
     {
         $select = $this->getSql()->select()
-            ->columns(['title', 'body', 'lead', 'featured_img', 'main_img', 'has_layout', 'is_homepage'])
+            ->columns([ 'title', 'body', 'lead', 'featured_img', 'main_img', 'has_layout', 'is_homepage' ])
             ->join('articles', 'article_posts.article_uuid = articles.article_uuid')
-            ->where(['articles.article_id' => $id]);
+            ->where([ 'articles.article_id' => $id ]);
 
         return $this->selectWith($select)->current();
     }
@@ -54,7 +54,7 @@ 
     {
         $select = $this->getSql()->select()
             ->join('articles', 'article_posts.article_uuid = articles.article_uuid')
-            ->where(['article_posts.is_homepage' => true, 'articles.status' => 1]);
+            ->where([ 'article_posts.is_homepage' => true, 'articles.status' => 1 ]);
 
         return $this->selectWith($select)->current();
     }
@@ -62,9 +62,9 @@ 
     public function getBySlug($slug)
     {
         $select = $this->getSql()->select()
-            ->columns(['title', 'body', 'lead', 'featured_img', 'main_img'])
+            ->columns([ 'title', 'body', 'lead', 'featured_img', 'main_img' ])
             ->join('articles', 'article_posts.article_uuid = articles.article_uuid')
-            ->where(['articles.slug' => $slug, 'articles.status' => 1]);
+            ->where([ 'articles.slug' => $slug, 'articles.status' => 1 ]);
 
         return $this->selectWith($select)->current();
     }
@@ -72,7 +72,7 @@ 
     public function getAll()
     {
         $select = $this->getSql()->select()
-            ->join('articles', 'article_posts.article_uuid = articles.article_uuid', ['article_id', 'slug']);
+            ->join('articles', 'article_posts.article_uuid = articles.article_uuid', [ 'article_id', 'slug' ]);
 
         return $this->selectWith($select);
     }

src/Category/src/Filter/CategoryFilter.php

Spacing +7 added lines, -7 removed lines

@@ -12,26 +12,26 @@
 
     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' => 100]],
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'StringLength', 'options' => [ 'min' => 2, 'max' => 100 ] ],
                 ],
             ]);
 
             $inputFilter->add([
                 '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 ] ],
                 ],
             ]);
 

src/Category/src/Service/CategoryService.php

Spacing +9 added lines, -9 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Category\Service;
 
@@ -69,7 +69,7 @@ 
      */
     public function getCategoryBySlug($urlSlug)
     {
-        return $this->categoryMapper->select(['slug' => $urlSlug])->current();
+        return $this->categoryMapper->select([ 'slug' => $urlSlug ])->current();
     }
 
     /**
@@ -82,13 +82,13 @@ 
     {
         $filter = $this->categoryFilter->getInputFilter()->setData($data);
 
-        if(!$filter->isValid()) {
+        if (!$filter->isValid()) {
             throw new FilterException($filter->getMessages());
         }
 
         $data                  = $filter->getValues();
-        $data['category_id']   = Uuid::uuid1()->toString();
-        $data['category_uuid'] = (new MysqlUuid($data['category_id']))->toFormat(new Binary);
+        $data[ 'category_id' ]   = Uuid::uuid1()->toString();
+        $data[ 'category_uuid' ] = (new MysqlUuid($data[ 'category_id' ]))->toFormat(new Binary);
 
         $this->categoryMapper->insert($data);
     }
@@ -103,18 +103,18 @@ 
      */
     public function updateCategory($data, $categoryId)
     {
-        if(!$this->getCategory($categoryId)) {
+        if (!$this->getCategory($categoryId)) {
             throw new \Exception('CategoryId dos not exist.');
         }
 
         $filter = $this->categoryFilter->getInputFilter()->setData($data);
 
-        if(!$filter->isValid()) {
+        if (!$filter->isValid()) {
             throw new FilterException($filter->getMessages());
         }
 
         $data = $filter->getValues();
-        $this->categoryMapper->update($data, ['category_id' => $categoryId]);
+        $this->categoryMapper->update($data, [ 'category_id' => $categoryId ]);
     }
 
     /**
@@ -125,7 +125,7 @@ 
      */
     public function delete($categoryId)
     {
-        return (bool)$this->categoryMapper->delete(['category_id' => $categoryId]);
+        return (bool) $this->categoryMapper->delete([ 'category_id' => $categoryId ]);
     }
 
     /**