phpsrbija / unfinished

application/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
             ];
 

application/packages/Admin/src/Mapper/AdminUsersMapper.php

Doc Comments +12 added lines, -2 removed lines

@@ -31,6 +31,9 @@ 
         $this->adapter = $adapter;
     }
 
+    /**
+     * @param string $id
+     */
     public function get($id)
     {
         return $this->select(['admin_user_id' => $id])->current();
@@ -40,7 +43,7 @@ 
      * Get admin user by email.
      *
      * @param  string $email email
-     * @return array|\ArrayObject|null
+     * @return string
      */
     public function getByEmail(string $email)
     {
@@ -50,7 +53,6 @@ 
     /**
      * Updates login data.
      *
-     * @param  string $uuid admin user id
      * @return int number of affected rows
      */
     public function updateLogin(string $userId): int
@@ -58,6 +60,11 @@ 
         return $this->update(['last_login' => date('Y-m-d H:i:s')], ['admin_user_id' => $userId]);
     }
 
+    /**
+     * @param string $userId
+     *
+     * @return \Zend\Db\Sql\Select
+     */
     public function getPaginationSelect($userId)
     {
         $select = $this->getSql()->select()->order(['created_at' => 'desc']);
@@ -67,6 +74,9 @@ 
         return $select;
     }
 
+    /**
+     * @param integer $limit
+     */
     public function getRandom($limit)
     {
         $select = $this->getSql()->select()

Spacing +6 added lines, -6 removed lines

@@ -32,7 +32,7 @@ 
 
     public function get($id)
     {
-        return $this->select(['admin_user_id' => $id])->current();
+        return $this->select([ 'admin_user_id' => $id ])->current();
     }
 
     /**
@@ -43,7 +43,7 @@ 
      */
     public function getByEmail(string $email)
     {
-        return $this->select(['email' => $email])->current();
+        return $this->select([ 'email' => $email ])->current();
     }
 
     /**
@@ -54,12 +54,12 @@ 
      */
     public function updateLogin(string $userId): int
     {
-        return $this->update(['last_login' => date('Y-m-d H:i:s')], ['admin_user_id' => $userId]);
+        return $this->update([ 'last_login' => date('Y-m-d H:i:s') ], [ 'admin_user_id' => $userId ]);
     }
 
     public function getPaginationSelect($userId)
     {
-        $select = $this->getSql()->select()->order(['created_at' => 'desc']);
+        $select = $this->getSql()->select()->order([ 'created_at' => 'desc' ]);
 
         $select->where->notEqualTo('admin_user_id', $userId);
 
@@ -69,7 +69,7 @@ 
     public function getRandom($limit)
     {
         $select = $this->getSql()->select()
-            ->where(['status' => 1])
+            ->where([ 'status' => 1 ])
             ->order(new Expression('rand()'))
             ->limit($limit);
 
@@ -78,7 +78,7 @@ 
 
     public function getUuid($adminUserId)
     {
-        $user = $this->select(['admin_user_id' => $adminUserId])->current();
+        $user = $this->select([ 'admin_user_id' => $adminUserId ])->current();
 
         if (!$user) {
             throw new \Exception('Admin user does not exist!', 400);

application/packages/Admin/src/View/Helper/AdminUserHelper.php

Doc Comments +3 added lines

@@ -22,6 +22,9 @@
         return $this;
     }
 
+    /**
+     * @return boolean
+     */
     public function current()
     {
         return $this->session->getStorage()->user;

application/packages/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 +3 added lines, -3 removed lines

@@ -44,9 +44,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);
     }

application/packages/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);

application/packages/Article/src/Service/EventService.php

Doc Comments +3 added lines

@@ -63,6 +63,9 @@
         return $this->getPagination($select, $page, $limit);
     }
 
+    /**
+     * @param integer $limit
+     */
     public function fetchLatest($limit)
     {
         return $this->articleEventsMapper->getLatest($limit);

Spacing +15 added lines, -15 removed lines

@@ -101,15 +101,15 @@ 
 
         $article = $articleFilter->getValues();
         $article += [
-            'admin_user_uuid' => $this->adminUsersMapper->getUuid($article['admin_user_id']),
+            'admin_user_uuid' => $this->adminUsersMapper->getUuid($article[ 'admin_user_id' ]),
             'type' => ArticleType::EVENT,
             'article_id' => $id,
             'article_uuid' => $uuId
         ];
-        unset($article['admin_user_id']);
+        unset($article[ 'admin_user_id' ]);
 
-        $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' ]);
 
         $event = $eventFilter->getValues() + [
                 'featured_img' => $this->upload->uploadImage($data, 'featured_img'),
@@ -131,31 +131,31 @@ 
             throw new FilterException($articleFilter->getMessages() + $eventFilter->getMessages());
         }
 
-        $article = $articleFilter->getValues() + ['article_uuid' => $oldArticle->article_uuid];
+        $article = $articleFilter->getValues() + [ 'article_uuid' => $oldArticle->article_uuid ];
         $event = $eventFilter->getValues() + [
                 'featured_img' => $this->upload->uploadImage($data, 'featured_img'),
                 'main_img' => $this->upload->uploadImage($data, 'main_img')
             ];
 
-        $article['admin_user_uuid'] = $this->adminUsersMapper->getUuid($article['admin_user_id']);
-        $article['category_uuid'] = $this->categoryMapper->get($article['category_id'])->category_uuid;
-        unset($article['category_id'], $article['admin_user_id']);
+        $article[ 'admin_user_uuid' ] = $this->adminUsersMapper->getUuid($article[ 'admin_user_id' ]);
+        $article[ 'category_uuid' ] = $this->categoryMapper->get($article[ 'category_id' ])->category_uuid;
+        unset($article[ 'category_id' ], $article[ 'admin_user_id' ]);
 
         // We don't want to force user to re-upload image on edit
-        if (!$event['featured_img']) {
-            unset($event['featured_img']);
+        if (!$event[ 'featured_img' ]) {
+            unset($event[ 'featured_img' ]);
         } else {
             $this->upload->deleteFile($oldArticle->featured_img);
         }
 
-        if (!$event['main_img']) {
-            unset($event['main_img']);
+        if (!$event[ 'main_img' ]) {
+            unset($event[ 'main_img' ]);
         } else {
             $this->upload->deleteFile($oldArticle->main_img);
         }
 
-        $this->articleMapper->update($article, ['article_uuid' => $article['article_uuid']]);
-        $this->articleEventsMapper->update($event, ['article_uuid' => $article['article_uuid']]);
+        $this->articleMapper->update($article, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
+        $this->articleEventsMapper->update($event, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
     }
 
     public function deleteArticle($id)
@@ -168,7 +168,7 @@ 
 
         $this->upload->deleteFile($event->main_img);
         $this->upload->deleteFile($event->featured_img);
-        $this->articleEventsMapper->delete(['article_uuid' => $event->article_uuid]);
+        $this->articleEventsMapper->delete([ 'article_uuid' => $event->article_uuid ]);
         $this->delete($event->article_uuid);
     }
 }

application/packages/Article/src/Service/PostService.php

Doc Comments +3 added lines

@@ -203,6 +203,9 @@
         return $this->articleMapper->getCategories($articleId);
     }
 
+    /**
+     * @param integer $limit
+     */
     public function getLatestWeb($limit)
     {
         return $this->articlePostsMapper->getLatest($limit);

Spacing +15 added lines, -15 removed lines

@@ -137,19 +137,19 @@ 
 
         $article = $articleFilter->getValues();
         $article += [
-            'admin_user_uuid' => $this->adminUsersMapper->getUuid($article['admin_user_id']),
+            'admin_user_uuid' => $this->adminUsersMapper->getUuid($article[ 'admin_user_id' ]),
             'type' => ArticleType::POST,
             'article_id' => $id,
             'article_uuid' => $uuId
         ];
 
-        $article['category_uuid'] = $this->categoryMapper->get($article['category_id'])->category_uuid;
-        unset($article['category_id'], $article['admin_user_id']);
+        $article[ 'category_uuid' ] = $this->categoryMapper->get($article[ 'category_id' ])->category_uuid;
+        unset($article[ 'category_id' ], $article[ 'admin_user_id' ]);
 
         $post = $postFilter->getValues() + [
                 'featured_img' => $this->upload->uploadImage($data, 'featured_img'),
                 'main_img' => $this->upload->uploadImage($data, 'main_img'),
-                'article_uuid' => $article['article_uuid']
+                'article_uuid' => $article[ 'article_uuid' ]
             ];
 
         $this->articleMapper->insert($article);
@@ -166,31 +166,31 @@ 
             throw new FilterException($articleFilter->getMessages() + $postFilter->getMessages());
         }
 
-        $article = $articleFilter->getValues() + ['article_uuid' => $oldArticle->article_uuid];
+        $article = $articleFilter->getValues() + [ 'article_uuid' => $oldArticle->article_uuid ];
         $post = $postFilter->getValues() + [
                 'featured_img' => $this->upload->uploadImage($data, 'featured_img'),
                 'main_img' => $this->upload->uploadImage($data, 'main_img')
             ];
 
-        $article['admin_user_uuid'] = $this->adminUsersMapper->getUuid($article['admin_user_id']);
-        $article['category_uuid'] = $this->categoryMapper->get($article['category_id'])->category_uuid;
-        unset($article['category_id'], $article['admin_user_id']);
+        $article[ 'admin_user_uuid' ] = $this->adminUsersMapper->getUuid($article[ 'admin_user_id' ]);
+        $article[ 'category_uuid' ] = $this->categoryMapper->get($article[ 'category_id' ])->category_uuid;
+        unset($article[ 'category_id' ], $article[ 'admin_user_id' ]);
 
         // We don't want to force user to re-upload image on edit
-        if (!$post['featured_img']) {
-            unset($post['featured_img']);
+        if (!$post[ 'featured_img' ]) {
+            unset($post[ 'featured_img' ]);
         } else {
             $this->upload->deleteFile($oldArticle->featured_img);
         }
 
-        if (!$post['main_img']) {
-            unset($post['main_img']);
+        if (!$post[ 'main_img' ]) {
+            unset($post[ 'main_img' ]);
         } else {
             $this->upload->deleteFile($oldArticle->main_img);
         }
 
-        $this->articleMapper->update($article, ['article_uuid' => $article['article_uuid']]);
-        $this->articlePostsMapper->update($post, ['article_uuid' => $article['article_uuid']]);
+        $this->articleMapper->update($article, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
+        $this->articlePostsMapper->update($post, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
     }
 
     public function deleteArticle($id)
@@ -203,7 +203,7 @@ 
 
         $this->upload->deleteFile($post->main_img);
         $this->upload->deleteFile($post->featured_img);
-        $this->articlePostsMapper->delete(['article_uuid' => $post->article_uuid]);
+        $this->articlePostsMapper->delete([ 'article_uuid' => $post->article_uuid ]);
         $this->delete($post->article_uuid);
     }
 

application/packages/Article/src/Service/VideoService.php

Doc Comments +3 added lines

@@ -91,6 +91,9 @@
         return $this->getPagination($select, $page, $limit);
     }
 
+    /**
+     * @param integer $limit
+     */
     public function fetchLatest($limit)
     {
         return $this->articleVideosMapper->getLatest($limit);

Spacing +15 added lines, -15 removed lines

@@ -127,14 +127,14 @@ 
 
         $article = $articleFilter->getValues();
         $article += [
-            'admin_user_uuid' => $this->adminUsersMapper->getUuid($article['admin_user_id']),
+            'admin_user_uuid' => $this->adminUsersMapper->getUuid($article[ 'admin_user_id' ]),
             'type' => ArticleType::VIDEO,
             'article_id' => $id,
             'article_uuid' => $uuId
         ];
 
-        $article['category_uuid'] = $this->categoryMapper->get($article['category_id'])->category_uuid;
-        unset($article['category_id'], $article['admin_user_id']);
+        $article[ 'category_uuid' ] = $this->categoryMapper->get($article[ 'category_id' ])->category_uuid;
+        unset($article[ 'category_id' ], $article[ 'admin_user_id' ]);
 
         $videos = $videosFilter->getValues() + [
                 'featured_img' => $this->upload->uploadImage($data, 'featured_img'),
@@ -156,11 +156,11 @@ 
             throw new FilterException($articleFilter->getMessages() + $videosFilter->getMessages());
         }
 
-        $article = $articleFilter->getValues() + ['article_uuid' => $oldArticle->article_uuid];
-        $article['category_uuid'] = $this->categoryMapper->get($article['category_id'])->category_uuid;
-        $article['admin_user_uuid'] = $this->adminUsersMapper->getUuid($article['admin_user_id']);
-        unset($article['category_id']);
-        unset($article['admin_user_id']);
+        $article = $articleFilter->getValues() + [ 'article_uuid' => $oldArticle->article_uuid ];
+        $article[ 'category_uuid' ] = $this->categoryMapper->get($article[ 'category_id' ])->category_uuid;
+        $article[ 'admin_user_uuid' ] = $this->adminUsersMapper->getUuid($article[ 'admin_user_id' ]);
+        unset($article[ 'category_id' ]);
+        unset($article[ 'admin_user_id' ]);
 
         $videos = $videosFilter->getValues() + [
                 'featured_img' => $this->upload->uploadImage($data, 'featured_img'),
@@ -168,20 +168,20 @@ 
             ];
 
         // We don't 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' ]);
         } else {
             $this->upload->deleteFile($oldArticle->featured_img);
         }
 
-        if (!$videos['main_img']) {
-            unset($videos['main_img']);
+        if (!$videos[ 'main_img' ]) {
+            unset($videos[ 'main_img' ]);
         } else {
             $this->upload->deleteFile($oldArticle->main_img);
         }
 
-        $this->articleMapper->update($article, ['article_uuid' => $article['article_uuid']]);
-        $this->articleVideosMapper->update($videos, ['article_uuid' => $article['article_uuid']]);
+        $this->articleMapper->update($article, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
+        $this->articleVideosMapper->update($videos, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
     }
 
     public function deleteArticle($id)
@@ -194,7 +194,7 @@ 
 
         $this->upload->deleteFile($video->main_img);
         $this->upload->deleteFile($video->featured_img);
-        $this->articleVideosMapper->delete(['article_uuid' => $video->article_uuid]);
+        $this->articleVideosMapper->delete([ 'article_uuid' => $video->article_uuid ]);
         $this->delete($video->article_uuid);
     }
 }

application/packages/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 +12 added lines, -12 removed lines

@@ -33,12 +33,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;
     }
@@ -46,17 +46,17 @@ 
     public function getCategoryPostsSelect($categoryId = null, $limit = null)
     {
         $select = $this->getSql()->select()
-            ->columns(['category_name' => 'name', 'category_slug' => 'slug'])
+            ->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')
+                [ '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']);
+                [ 'admin_user_id', 'first_name', 'last_name', 'face_img' ]
+            )->where([ 'articles.status' => 1 ])
+            ->order([ 'published_at' => 'desc' ]);
 
         if ($categoryId) {
-            $select->where(['category_id' => $categoryId]);
+            $select->where([ 'category_id' => $categoryId ]);
         }
 
         if ($limit) {
@@ -83,14 +83,14 @@ 
         $inHomepage = null,
         $inCategoryList = null
     ) {
-        $select = $this->getSql()->select()->where(['type' => ArticleType::POST]);
+        $select = $this->getSql()->select()->where([ 'type' => ArticleType::POST ]);
 
         if ($inHomepage !== null) {
-            $select->where(['is_in_homepage' => $inHomepage]);
+            $select->where([ 'is_in_homepage' => $inHomepage ]);
         }
 
         if ($inCategoryList !== null) {
-            $select->where(['is_in_category_list' => $inCategoryList]);
+            $select->where([ 'is_in_category_list' => $inCategoryList ]);
         }
 
         if ($limit) {