phpsrbija / unfinished

src/Core/Middleware/AdminAuth.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
         if (!$user) {
             return $response->withStatus(302)->withHeader(
                 'Location',
-                $this->router->generateUri('auth', ['action' => 'login'])
+                $this->router->generateUri('auth', [ 'action' => 'login' ])
             );
         }
 

src/Core/Mapper/AdminUsersMapper.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
 
     public function get($id)
     {
-        return $this->select(['admin_user_id' => $id])->current();
+        return $this->select([ 'admin_user_id' => $id ])->current();
     }
 
     /**
@@ -42,7 +42,7 @@ 
      */
     public function getByEmail(string $email)
     {
-        return $this->select(['email' => $email])->current();
+        return $this->select([ 'email' => $email ])->current();
     }
 
     /**
@@ -53,12 +53,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);
 

Doc Comments +7 added lines, -2 removed lines

@@ -29,6 +29,9 @@ 
         $this->adapter = $adapter;
     }
 
+    /**
+     * @param string $id
+     */
     public function get($id)
     {
         return $this->select(['admin_user_id' => $id])->current();
@@ -38,7 +41,7 @@ 
      * Get admin user by email.
      *
      * @param  string $email email
-     * @return array|\ArrayObject|null
+     * @return string
      */
     public function getByEmail(string $email)
     {
@@ -48,7 +51,6 @@ 
     /**
      * Updates login data.
      *
-     * @param  string $uuid admin user id
      * @return int number of affected rows
      */
     public function updateLogin(string $userId) : int
@@ -56,6 +58,9 @@ 
         return $this->update(['last_login' => date('Y-m-d H:i:s')], ['admin_user_id' => $userId]);
     }
 
+    /**
+     * @param string $userId
+     */
     public function getPaginationSelect($userId)
     {
         $select = $this->getSql()->select()->order(['created_at' => 'desc']);

src/Core/Filter/AdminUserFilter.php

Spacing +16 added lines, -16 removed lines

@@ -19,37 +19,37 @@ 
 
     public function getInputFilter()
     {
-        if(!$this->inputFilter){
+        if (!$this->inputFilter) {
             $inputFilter = new InputFilter();
 
             $inputFilter->add([
                 'name'       => 'first_name',
                 'required'   => true,
-                'filters'    => [['name' => 'StringTrim']],
+                'filters'    => [ [ 'name' => 'StringTrim' ] ],
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'StringLength', 'options' => ['min' => 2, 'max' => 255]]
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'StringLength', 'options' => [ 'min' => 2, 'max' => 255 ] ]
                 ],
             ]);
 
             $inputFilter->add([
                 'name'       => 'last_name',
                 'required'   => true,
-                'filters'    => [['name' => 'StringTrim']],
+                'filters'    => [ [ 'name' => 'StringTrim' ] ],
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'StringLength', 'options' => ['min' => 2, 'max' => 255]]
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'StringLength', 'options' => [ 'min' => 2, 'max' => 255 ] ]
                 ],
             ]);
 
             $inputFilter->add([
                 'name'       => 'email',
                 'required'   => true,
-                'filters'    => [['name' => 'StringTrim']],
+                'filters'    => [ [ 'name' => 'StringTrim' ] ],
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'EmailAddress'],
-                    ['name' => 'dbnorecordexists', 'options' => ['adapter' => $this->adapter, 'table' => 'admin_users', 'field' => 'email']],
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'EmailAddress' ],
+                    [ 'name' => 'dbnorecordexists', 'options' => [ 'adapter' => $this->adapter, 'table' => 'admin_users', 'field' => 'email' ] ],
 
                 ],
             ]);
@@ -58,8 +58,8 @@ 
                 'name'       => 'password',
                 'required'   => true,
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'StringLength', 'options' => ['min' => 7, 'max' => 255]]
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'StringLength', 'options' => [ 'min' => 7, 'max' => 255 ] ]
                 ],
             ]);
 
@@ -67,15 +67,15 @@ 
                 'name'       => 'confirm_password',
                 'required'   => true,
                 'validators' => [
-                    ['name' => 'NotEmpty'],
-                    ['name' => 'Identical', 'options' => ['token' => 'password']],
+                    [ 'name' => 'NotEmpty' ],
+                    [ 'name' => 'Identical', 'options' => [ 'token' => 'password' ] ],
                 ],
             ]);
 
             $inputFilter->add([
                 'name'       => 'status',
                 'required'   => true,
-                'validators' => [['name' => 'NotEmpty'], ['name' => 'Digits']]
+                'validators' => [ [ 'name' => 'NotEmpty' ], [ 'name' => 'Digits' ] ]
             ]);
 
             $this->inputFilter = $inputFilter;

data/phinx/migrations/20161003183353_create_articles_table.php

Spacing +9 added lines, -9 removed lines

@@ -6,18 +6,18 @@
 {
     public function up()
     {
-        $this->table('articles', ['id' => false, 'primary_key' => 'article_uuid'])
-            ->addColumn('article_uuid', 'binary', ['limit' => 16])
+        $this->table('articles', [ 'id' => false, 'primary_key' => 'article_uuid' ])
+            ->addColumn('article_uuid', 'binary', [ 'limit' => 16 ])
             ->addColumn('article_id', 'text')
-            ->addColumn('slug', 'text', ['null' => true])
-            ->addColumn('created_at', 'datetime', ['default' => 'CURRENT_TIMESTAMP'])
-            ->addColumn('published_at', 'datetime', ['default' => 'CURRENT_TIMESTAMP'])
+            ->addColumn('slug', 'text', [ 'null' => true ])
+            ->addColumn('created_at', 'datetime', [ 'default' => 'CURRENT_TIMESTAMP' ])
+            ->addColumn('published_at', 'datetime', [ 'default' => 'CURRENT_TIMESTAMP' ])
             ->addColumn('type', 'integer')// see Core\Entity\ArticleType
             ->addColumn('status', 'integer')// active, not active, ...
-            ->addColumn('admin_user_uuid', 'binary', ['limit' => 16])
-            ->addForeignKey('admin_user_uuid', 'admin_users', 'admin_user_uuid', ['delete' => 'NO_ACTION', 'update' => 'NO_ACTION'])
-            ->addIndex('type', ['name' => 'type_INDEX'])
-            ->addIndex('published_at', ['name' => 'published_at_INDEX'])
+            ->addColumn('admin_user_uuid', 'binary', [ 'limit' => 16 ])
+            ->addForeignKey('admin_user_uuid', 'admin_users', 'admin_user_uuid', [ 'delete' => 'NO_ACTION', 'update' => 'NO_ACTION' ])
+            ->addIndex('type', [ 'name' => 'type_INDEX' ])
+            ->addIndex('published_at', [ 'name' => 'published_at_INDEX' ])
             ->create();
     }
 

data/phinx/migrations/20160908142829_admin_users.php

Spacing +9 added lines, -9 removed lines

@@ -8,22 +8,22 @@
 {
     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('email', 'string', ['limit' => 128])
-            ->addColumn('password', 'char', ['limit' => 60])
-            ->addColumn('status', 'integer', ['default' => 0])// 0 => not active, 1 = active
-            ->addColumn('created_at', 'datetime', ['default' => 'CURRENT_TIMESTAMP'])
-            ->addColumn('last_login', 'datetime', ['null' => true])
-            ->addIndex(['email'], ['name' => 'email_INDEX'])
+            ->addColumn('email', 'string', [ 'limit' => 128 ])
+            ->addColumn('password', 'char', [ 'limit' => 60 ])
+            ->addColumn('status', 'integer', [ 'default' => 0 ])// 0 => not active, 1 = active
+            ->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      = [

src/Core/Service/AdminUserService.php

Unused Use Statements -2 removed lines

@@ -9,8 +9,6 @@
 use Core\Mapper\AdminUsersMapper;
 use Core\Filter\AdminUserFilter;
 use Core\Exception\FilterException;
-use Zend\Db\TableGateway\TableGateway;
-use Zend\Db\Sql\Predicate\Expression;
 use Zend\Paginator\Adapter\DbSelect;
 use Zend\Paginator\Paginator;
 use Zend\Crypt\Password\Bcrypt;

Spacing +16 added lines, -16 removed lines

@@ -57,17 +57,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.');
         }
 
@@ -113,15 +113,15 @@ 
     {
         $filter = $this->adminUserFilter->getInputFilter()->setData($data);
 
-        if(!$filter->isValid()){
+        if (!$filter->isValid()) {
             throw new FilterException($filter->getMessages());
         }
 
         $data = $filter->getValues();
-        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);
     }
@@ -135,28 +135,28 @@ 
         $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());
         }
 
         $data = $filter->getValues();
 
-        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 ]);
     }
 
     /**
@@ -167,6 +167,6 @@ 
      */
     public function delete($userId)
     {
-        return (bool)$this->adminUsersMapper->delete(['admin_user_id' => $userId]);
+        return (bool) $this->adminUsersMapper->delete([ 'admin_user_id' => $userId ]);
     }
 }

data/phinx/migrations/20161229132343_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 Discussions 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
             ];
 

data/phinx/migrations/20161229132336_videos.php

Spacing +16 added lines, -16 removed lines

@@ -10,15 +10,15 @@ 
 {
     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('body', 'text')
             ->addColumn('lead', 'text')
             ->addColumn('embed_code', '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();
@@ -31,10 +31,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();
@@ -47,19 +47,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);
@@ -69,7 +69,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
             ];
 
@@ -78,9 +78,9 @@ 
                 'title'        => $title,
                 'body'         => $faker->paragraph(15),
                 'lead'         => $faker->paragraph(5),
-                'main_img'     => $mainImg[array_rand($mainImg)],
-                'featured_img' => $featuredImg[array_rand($featuredImg)],
-                'embed_code'   => $embedCodes[rand(0, 2)]
+                'main_img'     => $mainImg[ array_rand($mainImg) ],
+                'featured_img' => $featuredImg[ array_rand($featuredImg) ],
+                'embed_code'   => $embedCodes[ rand(0, 2) ]
             ];
 
             $this->insert('articles', $article);

data/phinx/migrations/20161229132350_events.php

Spacing +16 added lines, -16 removed lines

@@ -10,19 +10,19 @@ 
 {
     public function up()
     {
-        $this->table('article_events', ['id' => false])
-            ->addColumn('article_uuid', 'binary', ['limit' => 16])
+        $this->table('article_events', [ 'id' => false ])
+            ->addColumn('article_uuid', 'binary', [ 'limit' => 16 ])
             ->addColumn('title', 'text')
-            ->addColumn('sub_title', 'text', ['null' => true])
+            ->addColumn('sub_title', 'text', [ 'null' => true ])
             ->addColumn('place_name', 'text')
             ->addColumn('body', 'text')
             ->addColumn('longitude', 'text')
             ->addColumn('latitude', 'text')
-            ->addColumn('featured_img', 'text', ['null' => true])
-            ->addColumn('main_img', 'text', ['null' => true])
+            ->addColumn('featured_img', 'text', [ 'null' => true ])
+            ->addColumn('main_img', 'text', [ 'null' => true ])
             ->addColumn('start_at', 'datetime')
             ->addColumn('end_at', 'datetime')
-            ->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();
@@ -35,10 +35,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();
@@ -46,19 +46,19 @@ 
         $count  = rand(25, 300);
 
         // Download N images and set it randomly to the events
-        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++) {
             $start     = rand(1, 20);
             $id        = $faker->uuid;
             $mysqluuid = (new Uuid($id))->toFormat(new Binary());
@@ -69,7 +69,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::EVENT
             ];
 
@@ -80,8 +80,8 @@ 
                 'longitude'    => $faker->longitude,
                 'latitude'     => $faker->latitude,
                 'place_name'   => $faker->sentence(1),
-                'main_img'     => $mainImg[array_rand($mainImg)],
-                'featured_img' => $featuredImg[array_rand($featuredImg)],
+                'main_img'     => $mainImg[ array_rand($mainImg) ],
+                'featured_img' => $featuredImg[ array_rand($featuredImg) ],
                 'start_at'     => date("Y-m-d H:i:s", strtotime("+$start  day +$start hours")),
                 'end_at'       => date("Y-m-d H:i:s", strtotime("+$start  day +" . ($start + rand(1, 5)) . " hours"))
             ];