phpsrbija / unfinished

data/phinx/migrations/20161229132343_article_discussions.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 use MysqlUuid\Formats\Binary;
 use MysqlUuid\Uuid;
 use Core\Entity\ArticleType;
-use MysqlUuid\Formats\PlainString;
 
 class ArticleDiscussions extends AbstractMigration
 {

Spacing +8 added lines, -8 removed lines

@@ -10,11 +10,11 @@ 
 {
     public function up()
     {
-        $this->table('article_discussions', ['id' => false])
-            ->addColumn('article_uuid', 'binary', ['limit' => 16])
+        $this->table('article_discussions', [ 'id' => false ])
+            ->addColumn('article_uuid', 'binary', [ 'limit' => 16 ])
             ->addColumn('title', 'text')
             ->addColumn('body', 'text')
-            ->addForeignKey('article_uuid', 'articles', 'article_uuid', ['delete' => 'NO_ACTION', 'update' => 'NO_ACTION'])
+            ->addForeignKey('article_uuid', 'articles', 'article_uuid', [ 'delete' => 'NO_ACTION', 'update' => 'NO_ACTION' ])
             ->create();
 
 //        $this->insertDummyData();
@@ -27,15 +27,15 @@ 
 
     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();
         $count = rand(250, 300);
-        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(5, 15);
@@ -45,7 +45,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::DISCUSSION
             ];
 

src/Article/src/Mapper/ArticleMapper.php

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 use Zend\Db\Adapter\AdapterAwareInterface;
 use Zend\Db\TableGateway\AbstractTableGateway;
 use Zend\Db\Sql\Delete;
-use Zend\Db\Sql\Insert;
 
 /**
  * Class ArticleMapper.

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Article\Mapper;
 
@@ -45,9 +45,9 @@ 
     public function getCategories($articleId)
     {
         $select = $this->getSql()->select()
-            ->columns([])
-            ->join('category', 'category.category_uuid = articles.category_uuid', ['name', 'slug', 'category_id'])
-            ->where(['articles.article_id' => $articleId]);
+            ->columns([ ])
+            ->join('category', 'category.category_uuid = articles.category_uuid', [ 'name', 'slug', 'category_id' ])
+            ->where([ 'articles.article_id' => $articleId ]);
 
         return $this->selectWith($select);
     }

src/Category/src/Mapper/CategoryMapper.php

Doc Comments +3 added lines

@@ -44,6 +44,9 @@
         return $select;
     }
 
+    /**
+     * @param integer $limit
+     */
     public function getCategoryPostsSelect($categoryId = null, $limit = null)
     {
         $select = $this->getSql()->select()

Spacing +15 added lines, -15 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);
         }
 
@@ -74,11 +74,11 @@ 
         $select->where->notEqualTo('slug', 'videos');
         $select->where->notEqualTo('slug', 'events');
 
-        if($limit) {
+        if ($limit) {
             $select->limit($limit);
         }
 
-        if($order) {
+        if ($order) {
             $select->order($order);
         } else {
             $select->order(new Expression('rand()'));

src/Article/src/Filter/ArticleFilter.php

Spacing +8 added lines, -8 removed lines

@@ -12,24 +12,24 @@ 
 
     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([
@@ -40,13 +40,13 @@ 
             $inputFilter->add([
                 'name'     => 'status',
                 'required' => false,
-                'filters'  => [['name' => 'Boolean']],
+                'filters'  => [ [ 'name' => 'Boolean' ] ],
             ]);
 
             $inputFilter->add([
                 'name'     => 'is_wysiwyg_editor',
                 'required' => false,
-                'filters'  => [['name' => 'Boolean']],
+                'filters'  => [ [ 'name' => 'Boolean' ] ],
             ]);
 
             $this->inputFilter = $inputFilter;

src/Article/src/Service/ArticleService.php

Spacing +4 added lines, -4 removed lines

@@ -31,9 +31,9 @@ 
 
     public function getCategoryIds($articleId)
     {
-        $categories = [];
-        foreach($this->articleMapper->getCategories($articleId) as $category) {
-            $categories[] = $category->category_id;
+        $categories = [ ];
+        foreach ($this->articleMapper->getCategories($articleId) as $category) {
+            $categories[ ] = $category->category_id;
         }
 
         return $categories;
@@ -41,6 +41,6 @@ 
 
     public function delete($articleId)
     {
-        $this->articleMapper->delete(['article_uuid' => $articleId]);
+        $this->articleMapper->delete([ 'article_uuid' => $articleId ]);
     }
 }
\ No newline at end of file

src/Article/src/Service/DiscussionService.php

Spacing +12 added lines, -12 removed lines

@@ -50,7 +50,7 @@ 
         $articleFilter    = $this->articleFilter->getInputFilter()->setData($data);
         $discussionFilter = $this->discussionFilter->getInputFilter()->setData($data);
 
-        if(!$articleFilter->isValid() || !$discussionFilter->isValid()) {
+        if (!$articleFilter->isValid() || !$discussionFilter->isValid()) {
             throw new FilterException($articleFilter->getMessages() + $discussionFilter->getMessages());
         }
 
@@ -64,10 +64,10 @@ 
                 'article_uuid'    => $uuId
             ];
 
-        $article['category_uuid'] = $this->categoryMapper->get($article['category_id'])->category_uuid;
-        unset($article['category_id']);
+        $article[ 'category_uuid' ] = $this->categoryMapper->get($article[ 'category_id' ])->category_uuid;
+        unset($article[ 'category_id' ]);
 
-        $discussion = $discussionFilter->getValues() + ['article_uuid' => $uuId];
+        $discussion = $discussionFilter->getValues() + [ 'article_uuid' => $uuId ];
 
         $this->articleMapper->insert($article);
         $this->articleDiscussionsMapper->insert($discussion);
@@ -79,29 +79,29 @@ 
         $articleFilter    = $this->articleFilter->getInputFilter()->setData($data);
         $discussionFilter = $this->discussionFilter->getInputFilter()->setData($data);
 
-        if(!$articleFilter->isValid() || !$discussionFilter->isValid()) {
+        if (!$articleFilter->isValid() || !$discussionFilter->isValid()) {
             throw new FilterException($articleFilter->getMessages() + $discussionFilter->getMessages());
         }
 
-        $article    = $articleFilter->getValues() + ['article_uuid' => $article->article_uuid];
+        $article    = $articleFilter->getValues() + [ 'article_uuid' => $article->article_uuid ];
         $discussion = $discussionFilter->getValues();
 
-        $article['category_uuid'] = $this->categoryMapper->get($article['category_id'])->category_uuid;
-        unset($article['category_id']);
+        $article[ 'category_uuid' ] = $this->categoryMapper->get($article[ 'category_id' ])->category_uuid;
+        unset($article[ 'category_id' ]);
 
-        $this->articleMapper->update($article, ['article_uuid' => $article['article_uuid']]);
-        $this->articleDiscussionsMapper->update($discussion, ['article_uuid' => $article['article_uuid']]);
+        $this->articleMapper->update($article, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
+        $this->articleDiscussionsMapper->update($discussion, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
     }
 
     public function deleteArticle($id)
     {
         $discussion = $this->articleDiscussionsMapper->get($id);
 
-        if(!$discussion) {
+        if (!$discussion) {
             throw new \Exception('Article not found!');
         }
 
-        $this->articleDiscussionsMapper->delete(['article_uuid' => $discussion->article_uuid]);
+        $this->articleDiscussionsMapper->delete([ 'article_uuid' => $discussion->article_uuid ]);
         $this->delete($discussion->article_uuid);
     }
 }

src/Article/src/Mapper/ArticleDiscussionsMapper.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Article\Mapper;
 
@@ -21,20 +21,20 @@ 
     public function getPaginationSelect()
     {
         return $this->getSql()->select()
-            ->columns(['title', 'body'])
+            ->columns([ 'title', 'body' ])
             ->join('articles', 'article_discussions.article_uuid = articles.article_uuid')
-            ->where(['articles.type' => ArticleType::DISCUSSION])
-            ->order(['created_at' => 'desc']);
+            ->where([ 'articles.type' => ArticleType::DISCUSSION ])
+            ->order([ 'created_at' => 'desc' ]);
     }
 
     public function get($id)
     {
         $select = $this->getSql()->select()
-            ->columns(['title', 'body'])
+            ->columns([ 'title', 'body' ])
             ->join('articles', 'article_discussions.article_uuid = articles.article_uuid')
             ->join('category', 'category.category_uuid = articles.category_uuid',
-                ['category_slug' => 'slug', 'category_name' => 'name', 'category_id'], 'left')
-            ->where(['articles.article_id' => $id]);
+                [ 'category_slug' => 'slug', 'category_name' => 'name', 'category_id' ], 'left')
+            ->where([ 'articles.article_id' => $id ]);
 
         return $this->selectWith($select)->current();
     }

src/Article/src/Mapper/ArticleEventsMapper.php

Spacing +19 added lines, -19 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;
@@ -54,8 +54,8 @@ 
         $select = $this->getSql()->select()
             ->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')
-            ->where(['articles.article_id' => $id]);
+                [ 'category_slug' => 'slug', 'category_name' => 'name', 'category_id' ], 'left')
+            ->where([ 'articles.article_id' => $id ]);
 
         return $this->selectWith($select)->current();
     }
@@ -64,8 +64,8 @@ 
     {
         $select = $this->getSql()->select()
             ->join('articles', 'article_events.article_uuid = articles.article_uuid')
-            ->join('category', 'category.category_uuid = articles.category_uuid', ['*'], 'left')
-            ->where(['articles.slug' => $slug]);
+            ->join('category', 'category.category_uuid = articles.category_uuid', [ '*' ], 'left')
+            ->where([ 'articles.slug' => $slug ]);
 
         return $this->selectWith($select)->current();
     }
@@ -73,9 +73,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);
@@ -84,8 +84,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'));
@@ -96,9 +96,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'));
 

src/Article/src/Mapper/ArticleVideosMapper.php

Spacing +14 added lines, -14 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Article\Mapper;
 
@@ -34,13 +34,13 @@ 
     public function getPaginationSelect($isActive = null)
     {
         $select = $this->getSql()->select()
-            ->join('articles', 'article_videos.article_uuid = articles.article_uuid', ['slug', 'published_at', 'status', 'article_id'])
-            ->join('admin_users', 'admin_users.admin_user_uuid = articles.admin_user_uuid', ['admin_user_id', 'first_name', 'last_name'])
-            ->where(['articles.type' => ArticleType::POST])
-            ->order(['articles.created_at' => 'desc']);
+            ->join('articles', 'article_videos.article_uuid = articles.article_uuid', [ 'slug', 'published_at', 'status', 'article_id' ])
+            ->join('admin_users', 'admin_users.admin_user_uuid = articles.admin_user_uuid', [ 'admin_user_id', 'first_name', 'last_name' ])
+            ->where([ 'articles.type' => ArticleType::POST ])
+            ->order([ 'articles.created_at' => 'desc' ]);
 
-        if($isActive !== null) {
-            $select->where(['articles.status' => (int)$isActive]);
+        if ($isActive !== null) {
+            $select->where([ 'articles.status' => (int) $isActive ]);
         }
 
         return $select;
@@ -49,11 +49,11 @@ 
     public function get($id)
     {
         $select = $this->getSql()->select()
-            ->columns(['title', 'body', 'lead', 'featured_img', 'main_img', 'video_url', 'sub_title'])
+            ->columns([ 'title', 'body', 'lead', 'featured_img', 'main_img', 'video_url', 'sub_title' ])
             ->join('articles', 'article_videos.article_uuid = articles.article_uuid')
             ->join('category', 'category.category_uuid = articles.category_uuid',
-                ['category_slug' => 'slug', 'category_name' => 'name', 'category_id'], 'left')
-            ->where(['articles.article_id' => $id]);
+                [ 'category_slug' => 'slug', 'category_name' => 'name', 'category_id' ], 'left')
+            ->where([ 'articles.article_id' => $id ]);
 
         return $this->selectWith($select)->current();
     }
@@ -61,9 +61,9 @@ 
     public function getLatest($limit = 50)
     {
         $select = $this->getSql()->select()
-            ->join('articles', 'article_videos.article_uuid = articles.article_uuid', ['article_id', 'slug', 'published_at'])
-            ->where(['articles.status' => 1])
-            ->order(['published_at' => 'desc'])
+            ->join('articles', 'article_videos.article_uuid = articles.article_uuid', [ 'article_id', 'slug', 'published_at' ])
+            ->where([ 'articles.status' => 1 ])
+            ->order([ 'published_at' => 'desc' ])
             ->limit($limit);
 
         return $this->selectWith($select);
@@ -73,7 +73,7 @@ 
     {
         $select = $this->getSql()->select()
             ->join('articles', 'article_videos.article_uuid = articles.article_uuid')
-            ->where(['articles.slug' => $slug]);
+            ->where([ 'articles.slug' => $slug ]);
 
         return $this->selectWith($select)->current();
     }