phpsrbija / unfinished

src/Core/Service/AdminUserService.php

Spacing +21 added lines, -21 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Core\Service;
 
@@ -61,17 +61,17 @@ 
      */
     public function loginUser($email, $password)
     {
-        if(!$email || !$password) {
+        if (!$email || !$password) {
             throw new \Exception('Both email and password are required.', 400);
         }
 
         $user = $this->adminUsersMapper->getByEmail($email);
 
-        if(!$user) {
+        if (!$user) {
             throw new \Exception('User does not exist.');
         }
 
-        if(!$this->crypt->verify($password, $user->password)) {
+        if (!$this->crypt->verify($password, $user->password)) {
             throw new \Exception('Password does not match.');
         }
 
@@ -117,7 +117,7 @@ 
     {
         $filter = $this->adminUserFilter->getInputFilter()->setData($data);
 
-        if(!$filter->isValid()) {
+        if (!$filter->isValid()) {
             throw new FilterException($filter->getMessages());
         }
 
@@ -126,10 +126,10 @@ 
                 'profile_img' => $this->upload->uploadImage($data, 'profile_img')
             ];
 
-        unset($data['confirm_password']);
-        $data['password']        = $this->crypt->create($data['password']);
-        $data['admin_user_id']   = Uuid::uuid1()->toString();
-        $data['admin_user_uuid'] = (new MysqlUuid($data['admin_user_id']))->toFormat(new Binary);
+        unset($data[ 'confirm_password' ]);
+        $data[ 'password' ]        = $this->crypt->create($data[ 'password' ]);
+        $data[ 'admin_user_id' ]   = Uuid::uuid1()->toString();
+        $data[ 'admin_user_uuid' ] = (new MysqlUuid($data[ 'admin_user_id' ]))->toFormat(new Binary);
 
         return $this->adminUsersMapper->insert($data);
     }
@@ -143,17 +143,17 @@ 
         $filter = $this->adminUserFilter->getInputFilter()->setData($data);
 
         // we dont want to force user to enter the password again
-        if($data['password'] == '') {
+        if ($data[ 'password' ] == '') {
             $filter->remove('password');
             $filter->remove('confirm_password');
         }
 
         // if we want to keep same email
-        if($user->email == $data['email']) {
+        if ($user->email == $data[ 'email' ]) {
             $filter->remove('email');
         }
 
-        if(!$filter->isValid()) {
+        if (!$filter->isValid()) {
             throw new FilterException($filter->getMessages());
         }
 
@@ -163,20 +163,20 @@ 
             ];
 
         // We dont want to force user to re-upload image on edit
-        if(!$data['face_img']) {
-            unset($data['face_img']);
+        if (!$data[ 'face_img' ]) {
+            unset($data[ 'face_img' ]);
         }
 
-        if(!$data['profile_img']) {
-            unset($data['profile_img']);
+        if (!$data[ 'profile_img' ]) {
+            unset($data[ 'profile_img' ]);
         }
 
-        if(isset($data['password'])) {
-            unset($data['confirm_password']);
-            $data['password'] = $this->crypt->create($data['password']);
+        if (isset($data[ 'password' ])) {
+            unset($data[ 'confirm_password' ]);
+            $data[ 'password' ] = $this->crypt->create($data[ 'password' ]);
         }
 
-        return $this->adminUsersMapper->update($data, ['admin_user_id' => $userId]);
+        return $this->adminUsersMapper->update($data, [ 'admin_user_id' => $userId ]);
     }
 
     /**
@@ -187,7 +187,7 @@ 
      */
     public function delete($userId)
     {
-        return (bool)$this->adminUsersMapper->delete(['admin_user_id' => $userId]);
+        return (bool) $this->adminUsersMapper->delete([ 'admin_user_id' => $userId ]);
     }
 
     /**

src/Core/Mapper/AdminUsersMapper.php

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Core\Mapper;
 
@@ -33,7 +33,7 @@ 
 
     public function get($id)
     {
-        return $this->select(['admin_user_id' => $id])->current();
+        return $this->select([ 'admin_user_id' => $id ])->current();
     }
 
     /**
@@ -44,7 +44,7 @@ 
      */
     public function getByEmail(string $email)
     {
-        return $this->select(['email' => $email])->current();
+        return $this->select([ 'email' => $email ])->current();
     }
 
     /**
@@ -55,12 +55,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);
 
@@ -70,7 +70,7 @@ 
     public function getRandom($limit)
     {
         $select = $this->getSql()->select()
-            ->where(['status' => 1])
+            ->where([ 'status' => 1 ])
             ->order(new Expression('rand()'))
             ->limit($limit);
 

src/Core/Factory/Service/AdminUserServiceFactory.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Core\Factory\Service;
 
@@ -20,8 +20,8 @@ 
      */
     public function __invoke(ContainerInterface $container): AdminUserService
     {
-        $config = $container->get('config')['upload'];
-        $upload = new Upload($config['public_path'], $config['non_public_path']);
+        $config = $container->get('config')[ 'upload' ];
+        $upload = new Upload($config[ 'public_path' ], $config[ 'non_public_path' ]);
 
         return new AdminUserService(
             new Bcrypt(),

data/phinx/migrations/20160908142829_admin_users.php

Spacing +12 added lines, -12 removed lines

@@ -8,25 +8,25 @@
 {
     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('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('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();
 
         $faker = Faker\Factory::create();
         $count = rand(100, 150);
-        for($i = 0; $i < $count; $i++) {
+        for ($i = 0; $i < $count; $i++) {
             $id        = $faker->uuid;
             $mysqluuid = (new Uuid($id))->toFormat(new Binary());
             $data      = [

data/phinx/migrations/20161003183350_category.php

Spacing +2 added lines, -2 removed lines

@@ -9,8 +9,8 @@
 
     public function up()
     {
-        $this->table('category', ['id' => false, 'primary_key' => 'category_uuid'])
-            ->addColumn('category_uuid', 'binary', ['limit' => 16])
+        $this->table('category', [ 'id' => false, 'primary_key' => 'category_uuid' ])
+            ->addColumn('category_uuid', 'binary', [ 'limit' => 16 ])
             ->addColumn('category_id', 'text')
             ->addColumn('name', 'text')
             ->addColumn('slug', 'text')

src/Article/src/Filter/VideoFilter.php

Spacing +16 added lines, -16 removed lines

@@ -12,56 +12,56 @@
 
     public function getInputFilter()
     {
-        if(!$this->inputFilter) {
+        if (!$this->inputFilter) {
             $inputFilter = new InputFilter();
 
             $inputFilter->add([
                 'name'       => 'title',
                 'required'   => true,
-                'filters'    => [['name' => 'StringTrim']],
+                'filters'    => [ [ 'name' => 'StringTrim' ] ],
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'StringLength', 'options' => ['min' => 2, 'max' => 100]],
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'StringLength', 'options' => [ 'min' => 2, 'max' => 100 ] ],
                 ],
             ]);
 
             $inputFilter->add([
                 'name'       => 'sub_title',
                 'required'   => false,
-                'filters'    => [['name' => 'StringTrim']],
+                'filters'    => [ [ 'name' => 'StringTrim' ] ],
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'StringLength', 'options' => ['min' => 2, 'max' => 500]],
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'StringLength', 'options' => [ 'min' => 2, 'max' => 500 ] ],
                 ],
             ]);
 
             $inputFilter->add([
                 'name'       => 'body',
                 'required'   => true,
-                'filters'    => [['name' => 'StringTrim']],
+                'filters'    => [ [ 'name' => 'StringTrim' ] ],
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'StringLength', 'options' => ['min' => 2]],
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'StringLength', 'options' => [ 'min' => 2 ] ],
                 ],
             ]);
 
             $inputFilter->add([
                 'name'       => 'lead',
                 'required'   => true,
-                'filters'    => [['name' => 'StringTrim']],
+                'filters'    => [ [ 'name' => 'StringTrim' ] ],
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'StringLength', 'options' => ['min' => 2]],
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'StringLength', 'options' => [ 'min' => 2 ] ],
                 ],
             ]);
 
             $inputFilter->add([
                 'name'       => 'video_url',
                 'required'   => true,
-                'filters'    => [['name' => 'StringTrim']],
+                'filters'    => [ [ 'name' => 'StringTrim' ] ],
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'StringLength'],
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'StringLength' ],
                 ],
             ]);
 

src/Article/src/Mapper/ArticleVideosMapper.php

Spacing +13 added lines, -13 removed lines

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

data/phinx/migrations/20161229132336_videos.php

Spacing +17 added lines, -17 removed lines

@@ -10,16 +10,16 @@ 
 {
     public function up()
     {
-        $this->table('article_videos', ['id' => false])
-            ->addColumn('article_uuid', 'binary', ['limit' => 16])
+        $this->table('article_videos', [ 'id' => false ])
+            ->addColumn('article_uuid', 'binary', [ 'limit' => 16 ])
             ->addColumn('title', 'text')
-            ->addColumn('sub_title', 'text', ['null' => true])
+            ->addColumn('sub_title', 'text', [ 'null' => true ])
             ->addColumn('body', 'text')
             ->addColumn('lead', 'text')
             ->addColumn('video_url', 'text')
-            ->addColumn('featured_img', 'text', ['null' => true])
-            ->addColumn('main_img', 'text', ['null' => true])
-            ->addForeignKey('article_uuid', 'articles', 'article_uuid', ['delete' => 'NO_ACTION', 'update' => 'NO_ACTION'])
+            ->addColumn('featured_img', 'text', [ 'null' => true ])
+            ->addColumn('main_img', 'text', [ 'null' => true ])
+            ->addForeignKey('article_uuid', 'articles', 'article_uuid', [ 'delete' => 'NO_ACTION', 'update' => 'NO_ACTION' ])
             ->create();
 
 //        $this->insertDummyData();
@@ -32,10 +32,10 @@ 
 
     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();
@@ -48,19 +48,19 @@ 
         ];
 
         // Download N images and set it randomly to posts
-        for($i = 0; $i < 5; $i++) {
+        for ($i = 0; $i < 5; $i++) {
             $image       = $faker->image();
             $destination = $upload->getPath(basename($image));
             rename($image, $destination);
-            $mainImg[] = substr($destination, strlen('/var/www/unfinished/public'));
+            $mainImg[ ] = substr($destination, strlen('/var/www/unfinished/public'));
 
             $image       = $faker->image();
             $destination = $upload->getPath(basename($image));
             rename($image, $destination);
-            $featuredImg[] = substr($destination, strlen('/var/www/unfinished/public'));
+            $featuredImg[ ] = substr($destination, strlen('/var/www/unfinished/public'));
         }
 
-        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(7, 20);
@@ -70,7 +70,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::POST
             ];
 
@@ -79,9 +79,9 @@ 
                 'title'        => $title,
                 'body'         => $faker->paragraph(15),
                 'lead'         => $faker->paragraph(5),
-                'main_img'     => $mainImg[array_rand($mainImg)],
-                'featured_img' => $featuredImg[array_rand($featuredImg)],
-                'video_url'    => $embedCodes[rand(0, 2)]
+                'main_img'     => $mainImg[ array_rand($mainImg) ],
+                'featured_img' => $featuredImg[ array_rand($featuredImg) ],
+                'video_url'    => $embedCodes[ rand(0, 2) ]
             ];
 
             $this->insert('articles', $article);