phpsrbija / unfinished

src/Category/src/ConfigProvider.php

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
         return [
             'templates' => [
                 'paths' => [
-                    'category' => [__DIR__ . '/../templates/category'],
+                    'category' => [ __DIR__ . '/../templates/category' ],
                 ],
             ],
 
@@ -30,13 +30,13 @@ 
                     'name'            => 'admin.categories',
                     'path'            => '/admin/categories',
                     'middleware'      => Controller\IndexController::class,
-                    'allowed_methods' => ['GET'],
+                    'allowed_methods' => [ 'GET' ],
                 ],
                 [
                     'name'            => 'admin.categories.action',
                     'path'            => '/admin/categories/:action/:id',
                     'middleware'      => Controller\IndexController::class,
-                    'allowed_methods' => ['GET', 'POST']
+                    'allowed_methods' => [ 'GET', 'POST' ]
                 ],
             ],
 

src/Category/src/Controller/IndexController.php

Spacing +13 added lines, -13 removed lines

@@ -47,12 +47,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' ]));
     }
 
     /**
@@ -60,13 +60,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;
         }
 
@@ -79,36 +79,36 @@ 
 
     public function save()
     {
-        try{
+        try {
             $id   = $this->request->getAttribute('id');
             $data = $this->request->getParsedBody();
 
-            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'));
         }
     }

Braces +4 added lines, -8 removed lines

@@ -85,17 +85,14 @@ 
 
             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;
         }
     }
@@ -107,8 +104,7 @@ 
             $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'));
         }
     }

data/phinx/migrations/20161003183350_category.php

Spacing +12 added lines, -12 removed lines

@@ -9,8 +9,8 @@ 
 
     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')
@@ -20,24 +20,24 @@ 
         $count = rand(5, 15);
 
         $categories = [
-            ['name' => 'Video', 'slug' => 'super-videos'],
-            ['name' => 'Blog Posts', 'slug' => 'experts-posts'],
-            ['name' => 'Discusions', 'slug' => 'discusions'],
-            ['name' => 'Events in region', 'slug' => 'all-events'],
-            ['name' => '#meetup', 'slug' => 'region-meetups'],
-            ['name' => 'conf2017', 'slug' => 'phpsrbija-conf2017'],
-            ['name' => 'Beer', 'slug' => 'after-parties'],
+            [ 'name' => 'Video', 'slug' => 'super-videos' ],
+            [ 'name' => 'Blog Posts', 'slug' => 'experts-posts' ],
+            [ 'name' => 'Discusions', 'slug' => 'discusions' ],
+            [ 'name' => 'Events in region', 'slug' => 'all-events' ],
+            [ 'name' => '#meetup', 'slug' => 'region-meetups' ],
+            [ 'name' => 'conf2017', 'slug' => 'phpsrbija-conf2017' ],
+            [ 'name' => 'Beer', 'slug' => 'after-parties' ],
         ];
 
-        foreach($categories as $cat){
+        foreach ($categories as $cat) {
             $id        = $faker->uuid;
             $mysqluuid = (new Uuid($id))->toFormat(new Binary());
 
             $data = [
                 'category_uuid' => $mysqluuid,
                 'category_id'   => $id,
-                'name'          => $cat['name'],
-                'slug'          => $cat['slug'],
+                'name'          => $cat[ 'name' ],
+                'slug'          => $cat[ 'slug' ],
             ];
 
             $this->insert('category', $data);

data/phinx/migrations/20170108190833_article_categories.php

Spacing +5 added lines, -5 removed lines

@@ -12,11 +12,11 @@
 {
     public function up()
     {
-        $this->table('article_categories', ['id' => true, 'primary_key' => 'id'])
-            ->addColumn('category_uuid', 'binary', ['limit' => 16])
-            ->addColumn('article_uuid', 'binary', ['limit' => 16])
-            ->addForeignKey('article_uuid', 'articles', 'article_uuid', ['delete' => 'NO_ACTION', 'update' => 'NO_ACTION'])
-            ->addForeignKey('category_uuid', 'category', 'category_uuid', ['delete' => 'NO_ACTION', 'update' => 'NO_ACTION'])
+        $this->table('article_categories', [ 'id' => true, 'primary_key' => 'id' ])
+            ->addColumn('category_uuid', 'binary', [ 'limit' => 16 ])
+            ->addColumn('article_uuid', 'binary', [ 'limit' => 16 ])
+            ->addForeignKey('article_uuid', 'articles', 'article_uuid', [ 'delete' => 'NO_ACTION', 'update' => 'NO_ACTION' ])
+            ->addForeignKey('category_uuid', 'category', 'category_uuid', [ 'delete' => 'NO_ACTION', 'update' => 'NO_ACTION' ])
             ->create();
 
         //$this->insertDummyData();

data/phinx/migrations/20170214131105_menu.php

Spacing +14 added lines, -14 removed lines

@@ -7,23 +7,23 @@
 
     public function up()
     {
-        $this->table('menu', ['id' => false, 'primary_key' => 'menu_uuid'])
-            ->addColumn('menu_uuid', 'binary', ['limit' => 16])
+        $this->table('menu', [ 'id' => false, 'primary_key' => 'menu_uuid' ])
+            ->addColumn('menu_uuid', 'binary', [ 'limit' => 16 ])
             ->addColumn('menu_id', 'text')
-            ->addColumn('parent_id', 'text', ['null' => true])
+            ->addColumn('parent_id', 'text', [ 'null' => true ])
             ->addColumn('title', 'text')
-            ->addColumn('href', 'text', ['null' => true])
-            ->addColumn('is_active', 'boolean', ['default' => false])
-            ->addColumn('is_in_header', 'boolean', ['default' => true])
-            ->addColumn('is_in_footer', 'boolean', ['default' => true])
-            ->addColumn('is_in_side', 'boolean', ['default' => true])
-            ->addColumn('order_no', 'integer', ['default' => 0])
-            ->addColumn('created_at', 'datetime', ['null' => true])
+            ->addColumn('href', 'text', [ 'null' => true ])
+            ->addColumn('is_active', 'boolean', [ 'default' => false ])
+            ->addColumn('is_in_header', 'boolean', [ 'default' => true ])
+            ->addColumn('is_in_footer', 'boolean', [ 'default' => true ])
+            ->addColumn('is_in_side', 'boolean', [ 'default' => true ])
+            ->addColumn('order_no', 'integer', [ 'default' => 0 ])
+            ->addColumn('created_at', 'datetime', [ 'null' => true ])
             //->addForeignKey('parent_id', 'menu', 'id', ['delete' => 'NO_ACTION', 'update' => 'NO_ACTION']) # we can not add constraints
-            ->addColumn('article_uuid', 'binary', ['limit' => 16, 'null' => true])
-            ->addColumn('category_uuid', 'binary', ['limit' => 16, 'null' => true])
-            ->addForeignKey('article_uuid', 'articles', 'article_uuid', ['delete' => 'NO_ACTION', 'update' => 'NO_ACTION'])
-            ->addForeignKey('category_uuid', 'category', 'category_uuid', ['delete' => 'NO_ACTION', 'update' => 'NO_ACTION'])
+            ->addColumn('article_uuid', 'binary', [ 'limit' => 16, 'null' => true ])
+            ->addColumn('category_uuid', 'binary', [ 'limit' => 16, 'null' => true ])
+            ->addForeignKey('article_uuid', 'articles', 'article_uuid', [ 'delete' => 'NO_ACTION', 'update' => 'NO_ACTION' ])
+            ->addForeignKey('category_uuid', 'category', 'category_uuid', [ 'delete' => 'NO_ACTION', 'update' => 'NO_ACTION' ])
             ->create();
     }
 

src/Menu/src/Controller/IndexController.php

Spacing +12 added lines, -12 removed lines

@@ -37,13 +37,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;
         }
 
@@ -58,36 +58,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;
         }
     }
@@ -95,9 +95,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 ]);
     }
 }
\ No newline at end of file

Braces +4 added lines, -8 removed lines

@@ -64,17 +64,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;
         }
     }
@@ -86,8 +83,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;
         }
     }

src/Menu/src/Filter/MenuFilter.php

Spacing +13 added lines, -13 removed lines

@@ -20,65 +20,65 @@
 
     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' ] ],
                 ],
             ]);
 
             $inputFilter->add([
                 'name'     => 'href',
                 'required' => false,
-                'filters'  => [['name' => 'StripTags'], ['name' => 'StringTrim']]
+                'filters'  => [ [ 'name' => 'StripTags' ], [ 'name' => 'StringTrim' ] ]
             ]);
 
             $inputFilter->add([
                 '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 ] ]
                 ]
             ]);
 
             $inputFilter->add([
                 '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 ] ]
                 ]
             ]);
 
             $inputFilter->add([
                 'name'     => 'is_active',
                 'required' => false,
-                'filters'  => [['name' => 'Boolean']]
+                'filters'  => [ [ 'name' => 'Boolean' ] ]
             ]);
 
             $inputFilter->add([
                 'name'     => 'is_in_header',
                 'required' => false,
-                'filters'  => [['name' => 'Boolean']]
+                'filters'  => [ [ 'name' => 'Boolean' ] ]
             ]);
 
             $inputFilter->add([
                 'name'     => 'is_in_footer',
                 'required' => false,
-                'filters'  => [['name' => 'Boolean']]
+                'filters'  => [ [ 'name' => 'Boolean' ] ]
             ]);
 
             $inputFilter->add([
                 'name'     => 'is_in_side',
                 'required' => false,
-                'filters'  => [['name' => 'Boolean']]
+                'filters'  => [ [ 'name' => 'Boolean' ] ]
             ]);
 
             $this->inputFilter = $inputFilter;

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

src/Article/src/Service/VideoService.php

Spacing +21 added lines, -21 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Article\Service;
 
@@ -88,8 +88,8 @@ 
     {
         $article = $this->articleVideosMapper->get($articleId);
 
-        if($article) {
-            $article['categories'] = $this->getCategoryIds($articleId);
+        if ($article) {
+            $article[ 'categories' ] = $this->getCategoryIds($articleId);
         }
 
         return $article;
@@ -100,7 +100,7 @@ 
         $articleFilter = $this->articleFilter->getInputFilter()->setData($data);
         $videosFilter  = $this->videosFilter->getInputFilter()->setData($data);
 
-        if(!$articleFilter->isValid() || !$videosFilter->isValid()) {
+        if (!$articleFilter->isValid() || !$videosFilter->isValid()) {
             throw new FilterException($articleFilter->getMessages() + $videosFilter->getMessages());
         }
 
@@ -123,9 +123,9 @@ 
         $this->articleMapper->insert($article);
         $this->articleVideosMapper->insert($videos);
 
-        if(isset($data['categories']) && $data['categories']) {
-            $categories = $this->categoryMapper->select(['category_id' => $data['categories']]);
-            $this->articleMapper->insertCategories($categories, $article['article_uuid']);
+        if (isset($data[ 'categories' ]) && $data[ 'categories' ]) {
+            $categories = $this->categoryMapper->select([ 'category_id' => $data[ 'categories' ] ]);
+            $this->articleMapper->insertCategories($categories, $article[ 'article_uuid' ]);
         }
     }
 
@@ -135,32 +135,32 @@ 
         $articleFilter = $this->articleFilter->getInputFilter()->setData($data);
         $videosFilter  = $this->videosFilter->getInputFilter()->setData($data);
 
-        if(!$articleFilter->isValid() || !$videosFilter->isValid()) {
+        if (!$articleFilter->isValid() || !$videosFilter->isValid()) {
             throw new FilterException($articleFilter->getMessages() + $videosFilter->getMessages());
         }
 
-        $article = $articleFilter->getValues() + ['article_uuid' => $article->article_uuid];
+        $article = $articleFilter->getValues() + [ 'article_uuid' => $article->article_uuid ];
         $videos  = $videosFilter->getValues() + [
                 'featured_img' => $this->upload->uploadImage($data, 'featured_img'),
                 'main_img'     => $this->upload->uploadImage($data, 'main_img')
             ];
 
         // We dont want to force user to re-upload image on edit
-        if(!$videos['featured_img']) {
-            unset($videos['featured_img']);
+        if (!$videos[ 'featured_img' ]) {
+            unset($videos[ 'featured_img' ]);
         }
 
-        if(!$videos['main_img']) {
-            unset($videos['main_img']);
+        if (!$videos[ 'main_img' ]) {
+            unset($videos[ 'main_img' ]);
         }
 
-        $this->articleMapper->update($article, ['article_uuid' => $article['article_uuid']]);
-        $this->articleVideosMapper->update($videos, ['article_uuid' => $article['article_uuid']]);
-        $this->articleMapper->deleteCategories($article['article_uuid']);
+        $this->articleMapper->update($article, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
+        $this->articleVideosMapper->update($videos, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
+        $this->articleMapper->deleteCategories($article[ 'article_uuid' ]);
 
-        if(isset($data['categories']) && $data['categories']) {
-            $categories = $this->categoryMapper->select(['category_id' => $data['categories']]);
-            $this->articleMapper->insertCategories($categories, $article['article_uuid']);
+        if (isset($data[ 'categories' ]) && $data[ 'categories' ]) {
+            $categories = $this->categoryMapper->select([ 'category_id' => $data[ 'categories' ] ]);
+            $this->articleMapper->insertCategories($categories, $article[ 'article_uuid' ]);
         }
     }
 
@@ -168,11 +168,11 @@ 
     {
         $video = $this->articleVideosMapper->get($id);
 
-        if(!$video) {
+        if (!$video) {
             throw new \Exception('Article not found!');
         }
 
-        $this->articleVideosMapper->delete(['article_uuid' => $video->article_uuid]);
+        $this->articleVideosMapper->delete([ 'article_uuid' => $video->article_uuid ]);
         $this->delete($video->article_uuid);
     }