phpsrbija / unfinished

data/phinx/migrations/20170523131220_newsletter.php

Spacing +2 added lines, -2 removed lines

@@ -7,9 +7,9 @@
 
     public function change()
     {
-        $this->table('newsletter', ['id' => false])
+        $this->table('newsletter', [ 'id' => false ])
             ->addColumn('email', 'text')
-            ->addColumn('created_at', 'timestamp', ['default' => 'CURRENT_TIMESTAMP'])
+            ->addColumn('created_at', 'timestamp', [ 'default' => 'CURRENT_TIMESTAMP' ])
             ->create();
     }
 }

data/phinx/seeds/ArticleEvents.php

Spacing +5 added lines, -5 removed lines

@@ -18,13 +18,13 @@ 
         $allUsers    = array_column($articleEvents->getAdapter()->fetchAll('select admin_user_uuid from admin_users'), 'admin_user_uuid');
         $allCategory = array_column($articleEvents->getAdapter()->fetchAll('select category_uuid from category'), 'category_uuid');
 
-        for($i = 0; $i < $count; $i++) {
+        for ($i = 0; $i < $count; $i++) {
             // Insert Article
             $id           = $faker->uuid;
             $mysqlUuid    = (new MysqlUuid\Uuid($id))->toFormat(new MysqlUuid\Formats\Binary());
             $title        = $faker->sentence();
-            $userUuid     = $allUsers[rand(0, (count($allUsers) - 1))];
-            $categoryUuid = $allCategory[rand(0, (count($allCategory) - 1))];
+            $userUuid     = $allUsers[ rand(0, (count($allUsers) - 1)) ];
+            $categoryUuid = $allCategory[ rand(0, (count($allCategory) - 1)) ];
             $data         = [
                 'article_uuid'      => $mysqlUuid,
                 'article_id'        => $id,
@@ -52,8 +52,8 @@ 
                 'start_at'     => $faker->dateTimeBetween('now', '+5 days')->format('Y-m-d H:i:s'),
                 'end_at'       => $faker->dateTimeBetween('+5 days', '+6 days')->format('Y-m-d H:i:s'),
                 'event_url'    => 'https://www.meetup.com/Tokyo-Hello-Kitty-Meetup/',
-                'featured_img' => $featuredImages[rand(0, (count($featuredImages) - 1))],
-                'main_img'     => $mainImages[rand(0, (count($mainImages) - 1))]
+                'featured_img' => $featuredImages[ rand(0, (count($featuredImages) - 1)) ],
+                'main_img'     => $mainImages[ rand(0, (count($mainImages) - 1)) ]
             ];
 
             $articleEvents->insert($data)->save();

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/seeds/ArticleVideos.php

Spacing +6 added lines, -6 removed lines

@@ -26,13 +26,13 @@ 
         $allUsers    = array_column($articleVideos->getAdapter()->fetchAll('select admin_user_uuid from admin_users'), 'admin_user_uuid');
         $allCategory = array_column($articleVideos->getAdapter()->fetchAll('select category_uuid from category'), 'category_uuid');
 
-        for($i = 0; $i < $count; $i++) {
+        for ($i = 0; $i < $count; $i++) {
             // Insert Article
             $id           = $faker->uuid;
             $mysqlUuid    = (new MysqlUuid\Uuid($id))->toFormat(new MysqlUuid\Formats\Binary());
             $title        = $faker->sentence();
-            $userUuid     = $allUsers[rand(0, (count($allUsers) - 1))];
-            $categoryUuid = $allCategory[rand(0, (count($allCategory) - 1))];
+            $userUuid     = $allUsers[ rand(0, (count($allUsers) - 1)) ];
+            $categoryUuid = $allCategory[ rand(0, (count($allCategory) - 1)) ];
             $data         = [
                 'article_uuid'      => $mysqlUuid,
                 'article_id'        => $id,
@@ -56,9 +56,9 @@ 
                 'sub_title'    => $faker->sentence(),
                 'body'         => $faker->paragraph(30),
                 'lead'         => $faker->paragraph(5),
-                'video_url'    => self::VIDEOS[rand(0, (count(self::VIDEOS) - 1))],
-                'featured_img' => $featuredImages[rand(0, (count($featuredImages) - 1))],
-                'main_img'     => $mainImages[rand(0, (count($mainImages) - 1))]
+                'video_url'    => self::VIDEOS[ rand(0, (count(self::VIDEOS) - 1)) ],
+                'featured_img' => $featuredImages[ rand(0, (count($featuredImages) - 1)) ],
+                'main_img'     => $mainImages[ rand(0, (count($mainImages) - 1)) ]
             ];
 
             $articleVideos->insert($data)->save();

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 +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/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,50 +122,50 @@ 
         $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' => $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)
     {
         $event = $this->articleEventsMapper->get($id);
 
-        if(!$event) {
+        if (!$event) {
             throw new \Exception('Article not found!');
         }
 
         $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);
     }
 

Braces +2 added lines, -4 removed lines

@@ -139,15 +139,13 @@
         // We don't want to force user to re-upload image on edit
         if (!$event['featured_img']) {
             unset($event['featured_img']);
-        }
-        else {
+        } else {
             $this->upload->deleteFile($oldArticle->featured_img);
         }
 
         if (!$event['main_img']) {
             unset($event['main_img']);
-        }
-        else {
+        } else {
             $this->upload->deleteFile($oldArticle->main_img);
         }
 

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 +18 added lines, -18 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,19 +104,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);
@@ -129,37 +129,37 @@ 
         $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' => $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)
@@ -172,7 +172,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);
     }
 

Braces +2 added lines, -4 removed lines

@@ -146,15 +146,13 @@
         // We don't want to force user to re-upload image on edit
         if (!$post['featured_img']) {
             unset($post['featured_img']);
-        }
-        else {
+        } else {
             $this->upload->deleteFile($oldArticle->featured_img);
         }
 
         if (!$post['main_img']) {
             unset($post['main_img']);
-        }
-        else {
+        } else {
             $this->upload->deleteFile($oldArticle->main_img);
         }
 

Indentation +7 added lines, -7 removed lines

@@ -23,49 +23,49 @@
     /**
 * 
      *
- * @var ArticleMapper 
+     * @var ArticleMapper 
 */
     private $articleMapper;
 
     /**
 * 
      *
- * @var ArticlePostsMapper 
+     * @var ArticlePostsMapper 
 */
     private $articlePostsMapper;
 
     /**
 * 
      *
- * @var ArticleFilter 
+     * @var ArticleFilter 
 */
     private $articleFilter;
 
     /**
 * 
      *
- * @var PostFilter 
+     * @var PostFilter 
 */
     private $postFilter;
 
     /**
 * 
      *
- * @var CategoryMapper 
+     * @var CategoryMapper 
 */
     private $categoryMapper;
 
     /**
 * 
      *
- * @var Upload 
+     * @var Upload 
 */
     private $upload;
 
     /**
 * 
      *
- * @var AdminUsersMapper 
+     * @var AdminUsersMapper 
 */
     private $adminUsersMapper;