phpsrbija / unfinished

data/phinx/seeds/AdminUsers.php

Spacing +8 added lines, -8 removed lines

@@ -11,19 +11,19 @@ 
      */
     public function getImages($faker, $type = 'people', $width = 400, $height = 400)
     {
-        $images = [];
+        $images = [ ];
         $conf   = include __DIR__ . "/../../../config/autoload/local.php";
-        $p      = $conf['upload']['public_path'];
+        $p      = $conf[ 'upload' ][ 'public_path' ];
         $upload = new Upload($p, '');
 
-        for($i = 0; $i < 5; $i++) {
+        for ($i = 0; $i < 5; $i++) {
             $filename = md5(rand()) . '.jpg';
-            $path     = $p . $filename[0] . '/' . $filename[1] . '/' . $filename[2] . '/' . $filename;
+            $path     = $p . $filename[ 0 ] . '/' . $filename[ 1 ] . '/' . $filename[ 2 ] . '/' . $filename;
             $upload->getPath($filename); // create sub folders
             $img = file_get_contents($faker->imageUrl(400, 400, $type));
             file_put_contents($path, $img);
 
-            $images[] = $upload->getWebPath($filename);
+            $images[ ] = $upload->getWebPath($filename);
         }
 
         return $images;
@@ -37,7 +37,7 @@ 
         $faceImages    = $this->getImages($faker, 'people');
         $profileImages = $this->getImages($faker, 'fashion');
 
-        for($i = 0; $i < $count; $i++) {
+        for ($i = 0; $i < $count; $i++) {
             $id        = $faker->uuid;
             $mysqluuid = (new MysqlUuid\Uuid($id))->toFormat(new MysqlUuid\Formats\Binary());
 
@@ -51,8 +51,8 @@ 
                 'status'          => rand(0, 1),
                 'last_login'      => rand(0, 10) === 7 ? null : $faker->dateTimeBetween('-10 days', 'now')->format('Y-m-d H:i:s'),
                 'created_at'      => $faker->dateTimeBetween('-20 days', '-10 days')->format('Y-m-d H:i:s'),
-                'face_img'        => $faceImages[rand(0, (count($faceImages) - 1))],
-                'profile_img'     => $profileImages[rand(0, (count($profileImages) - 1))]
+                'face_img'        => $faceImages[ rand(0, (count($faceImages) - 1)) ],
+                'profile_img'     => $profileImages[ rand(0, (count($profileImages) - 1)) ]
             ];
 
             $users->insert($data)->save();

data/phinx/seeds/ACategory.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
         $category = $this->table('category');
         $count    = rand(5, 10);
 
-        for($i = 0; $i < $count; $i++) {
+        for ($i = 0; $i < $count; $i++) {
             $id           = $faker->uuid;
             $mysqlUuid    = (new MysqlUuid\Uuid($id))->toFormat(new MysqlUuid\Formats\Binary());
             $categoryName = $faker->name;

data/phinx/migrations/20160908142829_admin_users.php

Spacing +14 added lines, -14 removed lines

@@ -8,21 +8,21 @@ 
 {
     public function up()
     {
-        $this->table('admin_users', ['id' => false, 'primary_key' => 'admin_user_uuid'])
-            ->addColumn('admin_user_uuid', 'binary', ['limit' => 16])
+        $this->table('admin_users', [ 'id' => false, 'primary_key' => 'admin_user_uuid' ])
+            ->addColumn('admin_user_uuid', 'binary', [ 'limit' => 16 ])
             ->addColumn('admin_user_id', 'text')
             ->addColumn('first_name', 'text')
             ->addColumn('last_name', 'text')
-            ->addColumn('introduction', 'text', ['null' => true])
-            ->addColumn('biography', 'text', ['null' => true])
-            ->addColumn('email', 'string', ['limit' => 128])
-            ->addColumn('password', 'char', ['limit' => 60])
-            ->addColumn('status', 'integer', ['default' => 0])// 0 => not active, 1 = active
-            ->addColumn('face_img', 'text', ['null' => true])
-            ->addColumn('profile_img', 'text', ['null' => true])
-            ->addColumn('created_at', 'datetime', ['default' => 'CURRENT_TIMESTAMP'])
-            ->addColumn('last_login', 'datetime', ['null' => true])
-            ->addIndex(['email'], ['name' => 'email_INDEX'])
+            ->addColumn('introduction', 'text', [ 'null' => true ])
+            ->addColumn('biography', 'text', [ 'null' => true ])
+            ->addColumn('email', 'string', [ 'limit' => 128 ])
+            ->addColumn('password', 'char', [ 'limit' => 60 ])
+            ->addColumn('status', 'integer', [ 'default' => 0 ])// 0 => not active, 1 = active
+            ->addColumn('face_img', 'text', [ 'null' => true ])
+            ->addColumn('profile_img', 'text', [ 'null' => true ])
+            ->addColumn('created_at', 'datetime', [ 'default' => 'CURRENT_TIMESTAMP' ])
+            ->addColumn('last_login', 'datetime', [ 'null' => true ])
+            ->addIndex([ 'email' ], [ 'name' => 'email_INDEX' ])
             ->create();
 
         // Insert one default admin user with password testtest
@@ -51,10 +51,10 @@ 
     private function getImage($faker, $type = 'people', $width = 400, $height = 400)
     {
         $conf     = include __DIR__ . "/../../../config/autoload/local.php";
-        $p        = $conf['upload']['public_path'];
+        $p        = $conf[ 'upload' ][ 'public_path' ];
         $upload   = new \UploadHelper\Upload($p, '');
         $filename = md5(rand()) . '.jpg';
-        $path     = $p . $filename[0] . '/' . $filename[1] . '/' . $filename[2] . '/' . $filename;
+        $path     = $p . $filename[ 0 ] . '/' . $filename[ 1 ] . '/' . $filename[ 2 ] . '/' . $filename;
         $upload->getPath($filename); // create sub folders
         $img = file_get_contents($faker->imageUrl(400, 400, $type));
         file_put_contents($path, $img);

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

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

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

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

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

packages/Article/src/ConfigProvider.php

Spacing +9 added lines, -9 removed lines

@@ -11,7 +11,7 @@ 
         return [
             'templates' => [
                 'paths' => [
-                    'article' => [__DIR__ . '/../templates/article'],
+                    'article' => [ __DIR__ . '/../templates/article' ],
                 ],
             ],
 
@@ -51,49 +51,49 @@ 
                     'name'            => 'admin.posts',
                     'path'            => '/admin/posts',
                     'middleware'      => Controller\PostController::class,
-                    'allowed_methods' => ['GET'],
+                    'allowed_methods' => [ 'GET' ],
                 ],
                 [
                     'name'            => 'admin.posts.action',
                     'path'            => '/admin/posts/:action/:id',
                     'middleware'      => Controller\PostController::class,
-                    'allowed_methods' => ['GET', 'POST'],
+                    'allowed_methods' => [ 'GET', 'POST' ],
                 ],
                 [
                     'name'            => 'admin.discussions',
                     'path'            => '/admin/discussions',
                     'middleware'      => Controller\DiscussionController::class,
-                    'allowed_methods' => ['GET', 'POST']
+                    'allowed_methods' => [ 'GET', 'POST' ]
                 ],
                 [
                     'name'            => 'admin.discussions.action',
                     'path'            => '/admin/discussions/:action/:id',
                     'middleware'      => Controller\DiscussionController::class,
-                    'allowed_methods' => ['GET', 'POST']
+                    'allowed_methods' => [ 'GET', 'POST' ]
                 ],
                 [
                     'name'            => 'admin.events',
                     'path'            => '/admin/events',
                     'middleware'      => Controller\EventController::class,
-                    'allowed_methods' => ['GET', 'POST']
+                    'allowed_methods' => [ 'GET', 'POST' ]
                 ],
                 [
                     'name'            => 'admin.events.action',
                     'path'            => '/admin/events/:action/:id',
                     'middleware'      => Controller\EventController::class,
-                    'allowed_methods' => ['GET', 'POST']
+                    'allowed_methods' => [ 'GET', 'POST' ]
                 ],
                 [
                     'name'            => 'admin.videos',
                     'path'            => '/admin/videos',
                     'middleware'      => Controller\VideoController::class,
-                    'allowed_methods' => ['GET', 'POST']
+                    'allowed_methods' => [ 'GET', 'POST' ]
                 ],
                 [
                     'name'            => 'admin.videos.action',
                     'path'            => '/admin/videos/:action/:id',
                     'middleware'      => Controller\VideoController::class,
-                    'allowed_methods' => ['GET', 'POST']
+                    'allowed_methods' => [ 'GET', 'POST' ]
                 ]
             ],