phpsrbija / unfinished

data/phinx/migrations/20170602123627_page.php

Spacing +8 added lines, -8 removed lines

@@ -6,19 +6,19 @@
 {
     public function change()
     {
-        $this->table('page', ['id' => false])
-            ->addColumn('page_uuid', 'binary', ['limit' => 16])
+        $this->table('page', [ 'id' => false ])
+            ->addColumn('page_uuid', 'binary', [ 'limit' => 16 ])
             ->addColumn('page_id', 'text')
             ->addColumn('title', 'text')
             ->addColumn('body', 'text')
             ->addColumn('description', 'text')
             ->addColumn('slug', 'text')
-            ->addColumn('main_img', 'text', ['null' => true])
-            ->addColumn('has_layout', 'boolean', ['default' => true])
-            ->addColumn('is_homepage', 'boolean', ['default' => false])
-            ->addColumn('is_active', 'boolean', ['default' => false])
-            ->addColumn('is_wysiwyg_editor', 'boolean', ['default' => false])
-            ->addColumn('created_at', 'timestamp', ['default' => 'CURRENT_TIMESTAMP'])
+            ->addColumn('main_img', 'text', [ 'null' => true ])
+            ->addColumn('has_layout', 'boolean', [ 'default' => true ])
+            ->addColumn('is_homepage', 'boolean', [ 'default' => false ])
+            ->addColumn('is_active', 'boolean', [ 'default' => false ])
+            ->addColumn('is_wysiwyg_editor', 'boolean', [ 'default' => false ])
+            ->addColumn('created_at', 'timestamp', [ 'default' => 'CURRENT_TIMESTAMP' ])
             ->create();
     }
 }

data/phinx/migrations/20161229132328_article_posts.php

Spacing +7 added lines, -7 removed lines

@@ -6,16 +6,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();
     }
 

packages/Admin/src/Controller/AuthController.php

Doc Comments +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
     /**
      * Clears user session.
      *
-     * @return static
+     * @return \Psr\Http\Message\ResponseInterface
      */
     public function logout(): \Psr\Http\Message\ResponseInterface
     {

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Admin\Controller;
 
@@ -60,11 +60,11 @@ 
      */
     public function login($error = false): \Psr\Http\Message\ResponseInterface
     {
-        if($this->session->getStorage()->user) {
+        if ($this->session->getStorage()->user) {
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin'));
         }
 
-        return new HtmlResponse($this->template->render('admin::login', ['layout' => false, 'error' => $error]));
+        return new HtmlResponse($this->template->render('admin::login', [ 'layout' => false, 'error' => $error ]));
     }
 
     /**
@@ -74,20 +74,20 @@ 
      */
     public function loginHandle(): \Psr\Http\Message\ResponseInterface
     {
-        if($this->session->getStorage()->user) {
+        if ($this->session->getStorage()->user) {
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin'));
         }
 
         $data     = $this->request->getParsedBody();
-        $email    = isset($data['email']) ? $data['email'] : null;
-        $password = isset($data['password']) ? $data['password'] : null;
+        $email    = isset($data[ 'email' ]) ? $data[ 'email' ] : null;
+        $password = isset($data[ 'password' ]) ? $data[ 'password' ] : null;
 
         try {
             $this->session->getStorage()->user = $this->adminUserService->loginUser($email, $password);
 
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin'));
         }
-        catch(\Exception $e) {
+        catch (\Exception $e) {
             return $this->login($e->getMessage());
 
             //@todo set $e->getMessage() to flash messanger and print messages in next page

Braces +1 added lines, -2 removed lines

@@ -86,8 +86,7 @@
             $this->session->getStorage()->user = $this->adminUserService->loginUser($email, $password);
 
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin'));
-        }
-        catch(\Exception $e) {
+        } catch(\Exception $e) {
             return $this->login($e->getMessage());
 
             //@todo set $e->getMessage() to flash messanger and print messages in next page

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

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

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 +18 added lines, -18 removed lines

@@ -87,7 +87,7 @@ 
         $articleFilter = $this->articleFilter->getInputFilter()->setData($data);
         $eventFilter   = $this->eventFilter->getInputFilter()->setData($data);
 
-        if(!$articleFilter->isValid() || !$eventFilter->isValid()) {
+        if (!$articleFilter->isValid() || !$eventFilter->isValid()) {
             throw new FilterException($articleFilter->getMessages() + $eventFilter->getMessages());
         }
 
@@ -96,15 +96,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'),
@@ -122,42 +122,42 @@ 
         $articleFilter = $this->articleFilter->getInputFilter()->setData($data);
         $eventFilter   = $this->eventFilter->getInputFilter()->setData($data);
 
-        if(!$articleFilter->isValid() || !$eventFilter->isValid()) {
+        if (!$articleFilter->isValid() || !$eventFilter->isValid()) {
             throw new FilterException($articleFilter->getMessages() + $eventFilter->getMessages());
         }
 
-        $article = $articleFilter->getValues() + ['article_uuid' => $article->article_uuid];
+        $article = $articleFilter->getValues() + [ 'article_uuid' => $article->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 dont 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' ]);
         }
 
-        if(!$event['main_img']) {
-            unset($event['main_img']);
+        if (!$event[ 'main_img' ]) {
+            unset($event[ '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)
     {
         $event = $this->articleEventsMapper->get($id);
 
-        if(!$event) {
+        if (!$event) {
             throw new \Exception('Article not found!');
         }
 
-        $this->articleEventsMapper->delete(['article_uuid' => $event->article_uuid]);
+        $this->articleEventsMapper->delete([ 'article_uuid' => $event->article_uuid ]);
         $this->delete($event->article_uuid);
     }
 

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 +23 added lines, -23 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Article\Service;
 
@@ -95,7 +95,7 @@ 
         $articleFilter = $this->articleFilter->getInputFilter()->setData($data);
         $postFilter    = $this->postFilter->getInputFilter()->setData($data);
 
-        if(!$articleFilter->isValid() || !$postFilter->isValid()) {
+        if (!$articleFilter->isValid() || !$postFilter->isValid()) {
             throw new FilterException($articleFilter->getMessages() + $postFilter->getMessages());
         }
 
@@ -104,23 +104,23 @@ 
 
         $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' ]
             ];
 
-        if($post['is_homepage']) {
-            $this->articlePostsMapper->update(['is_homepage' => false]);
+        if ($post[ 'is_homepage' ]) {
+            $this->articlePostsMapper->update([ 'is_homepage' => false ]);
         }
 
         $this->articleMapper->insert($article);
@@ -133,46 +133,46 @@ 
         $articleFilter = $this->articleFilter->getInputFilter()->setData($data);
         $postFilter    = $this->postFilter->getInputFilter()->setData($data);
 
-        if(!$articleFilter->isValid() || !$postFilter->isValid()) {
+        if (!$articleFilter->isValid() || !$postFilter->isValid()) {
             throw new FilterException($articleFilter->getMessages() + $postFilter->getMessages());
         }
 
-        $article = $articleFilter->getValues() + ['article_uuid' => $article->article_uuid];
+        $article = $articleFilter->getValues() + [ 'article_uuid' => $article->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 dont 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' ]);
         }
 
-        if(!$post['main_img']) {
-            unset($post['main_img']);
+        if (!$post[ 'main_img' ]) {
+            unset($post[ 'main_img' ]);
         }
 
-        if($post['is_homepage']) {
-            $this->articlePostsMapper->update(['is_homepage' => false]);
+        if ($post[ 'is_homepage' ]) {
+            $this->articlePostsMapper->update([ 'is_homepage' => false ]);
         }
 
-        $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)
     {
         $post = $this->articlePostsMapper->get($id);
 
-        if(!$post) {
+        if (!$post) {
             throw new \Exception('Article not found!');
         }
 
-        $this->articlePostsMapper->delete(['article_uuid' => $post->article_uuid]);
+        $this->articlePostsMapper->delete([ 'article_uuid' => $post->article_uuid ]);
         $this->delete($post->article_uuid);
     }
 

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 +19 added lines, -19 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Article\Service;
 
@@ -106,7 +106,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());
         }
 
@@ -115,14 +115,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'),
@@ -140,15 +140,15 @@ 
         $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['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' => $article->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'),
@@ -156,27 +156,27 @@ 
             ];
 
         // 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->update($article, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
+        $this->articleVideosMapper->update($videos, [ 'article_uuid' => $article[ 'article_uuid' ] ]);
     }
 
     public function deleteArticle($id)
     {
         $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);
     }
 

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 +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()'));