phpsrbija / unfinished

packages/Category/src/Service/CategoryService.php

Doc Comments +2 added lines, -2 removed lines

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

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);
     }
@@ -111,13 +111,13 @@ 
      */
     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());
         }
 
@@ -126,11 +126,11 @@ 
             ];
 
         // 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' ]);
         }
 
-        $this->categoryMapper->update($values, ['category_id' => $categoryId]);
+        $this->categoryMapper->update($values, [ 'category_id' => $categoryId ]);
     }
 
     /**
@@ -141,7 +141,7 @@ 
      */
     public function delete($categoryId)
     {
-        return (bool)$this->categoryMapper->delete(['category_id' => $categoryId]);
+        return (bool) $this->categoryMapper->delete([ 'category_id' => $categoryId ]);
     }
 
     /**
@@ -165,10 +165,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;
@@ -182,7 +182,7 @@ 
      */
     public function getCategories($inCategoryList = null)
     {
-        return $this->categoryMapper->getWeb(null, ['name' => 'asc'], null, $inCategoryList);
+        return $this->categoryMapper->getWeb(null, [ 'name' => 'asc' ], null, $inCategoryList);
     }
 
     /**

data/phinx/migrations/20161003183350_category.php

Spacing +7 added lines, -7 removed lines

@@ -9,16 +9,16 @@
 
     public function up()
     {
-        $this->table('category', ['id' => false, 'primary_key' => 'category_uuid'])
-            ->addColumn('category_uuid', 'binary', ['limit' => 16])
+        $this->table('category', [ 'id' => false, 'primary_key' => 'category_uuid' ])
+            ->addColumn('category_uuid', 'binary', [ 'limit' => 16 ])
             ->addColumn('category_id', 'text')
             ->addColumn('name', 'text')
             ->addColumn('slug', 'text')
-            ->addColumn('title', 'text', ['null' => true])
-            ->addColumn('description', 'text', ['null' => true])
-            ->addColumn('main_img', 'text', ['null' => true])
-            ->addColumn('is_in_homepage', 'boolean', ['default' => false])
-            ->addColumn('is_in_category_list', 'boolean', ['default' => true])
+            ->addColumn('title', 'text', [ 'null' => true ])
+            ->addColumn('description', 'text', [ 'null' => true ])
+            ->addColumn('main_img', 'text', [ 'null' => true ])
+            ->addColumn('is_in_homepage', 'boolean', [ 'default' => false ])
+            ->addColumn('is_in_category_list', 'boolean', [ 'default' => true ])
             ->create();
     }
 

packages/Web/Action/CategoryAction.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Web\Action;
 
@@ -51,17 +51,17 @@ 
     public function __invoke(Request $request, Response $response, callable $next = null)
     {
         $params     = $request->getQueryParams();
-        $page       = isset($params['page']) ? $params['page'] : 1;
+        $page       = isset($params[ 'page' ]) ? $params[ 'page' ] : 1;
         $urlSlug    = $request->getAttribute('category');
         $categories = $this->categoryService->getCategories(true);
         $category   = $this->categoryService->getCategoryBySlug($urlSlug);
 
-        if(!$category) {
-            if($urlSlug !== 'all') {
+        if (!$category) {
+            if ($urlSlug !== 'all') {
                 return $next($request, $response);
             }
 
-            $category = (object)[
+            $category = (object) [
                 'name'        => 'Svi članci',
                 'slug'        => 'all',
                 'title'       => 'Svi članci',

packages/Web/Action/EventsAction.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Web\Action;
 
@@ -53,7 +53,7 @@ 
     public function __invoke(Request $request, Response $response, callable $next = null)
     {
         $params       = $request->getQueryParams();
-        $page         = isset($params['page']) ? $params['page'] : 1;
+        $page         = isset($params[ 'page' ]) ? $params[ 'page' ] : 1;
         $futureEvents = $this->eventService->fetchFutureEvents();
         $pastEvents   = $this->eventService->fetchPastEventsPagination($page, 10);
         $category     = $this->categoryService->getCategoryBySlug('events');

packages/Web/Action/VideosAction.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Web\Action;
 
@@ -51,7 +51,7 @@ 
     public function __invoke(Request $request, Response $response, callable $next = null)
     {
         $params   = $request->getQueryParams();
-        $page     = isset($params['page']) ? $params['page'] : 1;
+        $page     = isset($params[ 'page' ]) ? $params[ 'page' ] : 1;
         $videos   = $this->videoService->fetchWebArticles($page, 5);
         $category = $this->categoryService->getCategoryBySlug('videos');
 

packages/Category/src/Mapper/CategoryMapper.php

Spacing +19 added lines, -19 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Category\Mapper;
 
@@ -34,12 +34,12 @@ 
 
     public function get($id)
     {
-        return $this->select(['category_id' => $id])->current();
+        return $this->select([ 'category_id' => $id ])->current();
     }
 
     public function getPaginationSelect()
     {
-        $select = $this->getSql()->select()->order(['name' => 'asc']);
+        $select = $this->getSql()->select()->order([ 'name' => 'asc' ]);
 
         return $select;
     }
@@ -47,18 +47,18 @@ 
     public function getCategoryPostsSelect($categoryId = null, $limit = null)
     {
         $select = $this->getSql()->select()
-            ->columns(['category_name' => 'name', 'category_slug' => 'slug'])
-            ->join('articles', 'articles.category_uuid = category.category_uuid', ['article_id', 'slug', 'admin_user_uuid', 'published_at'])
-            ->join('article_posts', 'article_posts.article_uuid = articles.article_uuid', ['*'], 'right')
-            ->join('admin_users', 'admin_users.admin_user_uuid = articles.admin_user_uuid', ['admin_user_id', 'first_name', 'last_name', 'face_img'])
-            ->where(['articles.status' => 1])
-            ->order(['published_at' => 'desc']);
-
-        if($categoryId) {
-            $select->where(['category_id' => $categoryId]);
+            ->columns([ 'category_name' => 'name', 'category_slug' => 'slug' ])
+            ->join('articles', 'articles.category_uuid = category.category_uuid', [ 'article_id', 'slug', 'admin_user_uuid', 'published_at' ])
+            ->join('article_posts', 'article_posts.article_uuid = articles.article_uuid', [ '*' ], 'right')
+            ->join('admin_users', 'admin_users.admin_user_uuid = articles.admin_user_uuid', [ 'admin_user_id', 'first_name', 'last_name', 'face_img' ])
+            ->where([ 'articles.status' => 1 ])
+            ->order([ 'published_at' => 'desc' ]);
+
+        if ($categoryId) {
+            $select->where([ 'category_id' => $categoryId ]);
         }
 
-        if($limit) {
+        if ($limit) {
             $select->limit($limit);
         }
 
@@ -86,19 +86,19 @@ 
         $select->where->notEqualTo('slug', 'videos');
         $select->where->notEqualTo('slug', 'events');
 
-        if($inHomepage !== null){
-            $select->where(['is_in_homepage' => $inHomepage]);
+        if ($inHomepage !== null) {
+            $select->where([ 'is_in_homepage' => $inHomepage ]);
         }
 
-        if($inCategoryList !== null){
-            $select->where(['is_in_category_list' => $inCategoryList]);
+        if ($inCategoryList !== null) {
+            $select->where([ 'is_in_category_list' => $inCategoryList ]);
         }
 
-        if($limit) {
+        if ($limit) {
             $select->limit($limit);
         }
 
-        if($order) {
+        if ($order) {
             $select->order($order);
         } else {
             $select->order(new Expression('rand()'));

packages/Category/src/Controller/IndexController.php

Spacing +13 added lines, -13 removed lines

@@ -48,12 +48,12 @@ 
     public function index() : \Psr\Http\Message\ResponseInterface
     {
         $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;
 
         $categories = $this->categoryService->getPagination($page, $limit);
 
-        return new HtmlResponse($this->template->render('category::index/index', ['list' => $categories, 'layout' => 'layout/admin']));
+        return new HtmlResponse($this->template->render('category::index/index', [ 'list' => $categories, 'layout' => 'layout/admin' ]));
     }
 
     /**
@@ -61,13 +61,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');
         $category = $this->categoryService->getCategory($id);
 
-        if($this->request->getParsedBody()){
-            $category              = (object)($this->request->getParsedBody() + (array)$category);
+        if ($this->request->getParsedBody()) {
+            $category              = (object) ($this->request->getParsedBody() + (array) $category);
             $category->category_id = $id;
         }
 
@@ -80,37 +80,37 @@ 
 
     public function save()
     {
-        try{
+        try {
             $id   = $this->request->getAttribute('id');
             $data = $this->request->getParsedBody();
             $data += (new Request())->getFiles()->toArray();
 
-            if($id){
+            if ($id) {
                 $this->categoryService->updateCategory($data, $id);
             }
-            else{
+            else {
                 $this->categoryService->createCategory($data);
             }
 
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.categories'));
         }
-        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->categoryService->delete($id);
 
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.categories'));
         }
-        catch(\Exception $e){
+        catch (\Exception $e) {
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.categories'));
         }
     }

packages/Category/src/Filter/CategoryFilter.php

Spacing +15 added lines, -15 removed lines

@@ -12,59 +12,59 @@
 
     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 ] ],
                 ],
             ]);
 
             $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'       => '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 ] ],
                 ],
             ]);
 
             $inputFilter->add([
                 '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 ] ],
                 ],
             ]);
 
             $inputFilter->add([
                 'name'     => 'is_in_homepage',
                 'required' => false,
-                'filters'  => [['name' => 'Boolean']],
+                'filters'  => [ [ 'name' => 'Boolean' ] ],
             ]);
 
             $inputFilter->add([
                 'name'     => 'is_in_category_list',
                 'required' => false,
-                'filters'  => [['name' => 'Boolean']],
+                'filters'  => [ [ 'name' => 'Boolean' ] ],
             ]);
 
             $this->inputFilter = $inputFilter;

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