phpsrbija / unfinished

packages/Admin/src/Mapper/AdminUsersMapper.php

Doc Comments +12 added lines, -2 removed lines

@@ -31,6 +31,9 @@ 
         $this->adapter = $adapter;
     }
 
+    /**
+     * @param string $id
+     */
     public function get($id)
     {
         return $this->select(['admin_user_id' => $id])->current();
@@ -40,7 +43,7 @@ 
      * Get admin user by email.
      *
      * @param  string $email email
-     * @return array|\ArrayObject|null
+     * @return string
      */
     public function getByEmail(string $email)
     {
@@ -50,7 +53,6 @@ 
     /**
      * Updates login data.
      *
-     * @param  string $uuid admin user id
      * @return int number of affected rows
      */
     public function updateLogin(string $userId): int
@@ -58,6 +60,11 @@ 
         return $this->update(['last_login' => date('Y-m-d H:i:s')], ['admin_user_id' => $userId]);
     }
 
+    /**
+     * @param string $userId
+     *
+     * @return \Zend\Db\Sql\Select
+     */
     public function getPaginationSelect($userId)
     {
         $select = $this->getSql()->select()->order(['created_at' => 'desc']);
@@ -67,6 +74,9 @@ 
         return $select;
     }
 
+    /**
+     * @param integer $limit
+     */
     public function getRandom($limit)
     {
         $select = $this->getSql()->select()

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Admin\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);
 
@@ -79,9 +79,9 @@ 
 
     public function getUuid($adminUserId)
     {
-        $user = $this->select(['admin_user_id' => $adminUserId])->current();
+        $user = $this->select([ 'admin_user_id' => $adminUserId ])->current();
 
-        if(!$user) {
+        if (!$user) {
             throw new \Exception('Admin user does not exist!', 400);
         }
 

packages/Core/Service/MeetupApiServiceFactory.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Core\Service;
 
@@ -15,8 +15,8 @@ 
      */
     public function __invoke(ContainerInterface $container): MeetupApiService
     {
-        $config = $container->get('config')['meetupApi'];
+        $config = $container->get('config')[ 'meetupApi' ];
 
-        return new MeetupApiService($config['key']);
+        return new MeetupApiService($config[ 'key' ]);
     }
 }

packages/Web/Action/HomeAction.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Web\Action;
 
@@ -58,7 +58,7 @@ 
 
         $page = $this->pageService->getHomepage();
 
-        return new HtmlResponse($this->template->render('web::home', ['page' => $page, 'layout' => 'layout/web']));
+        return new HtmlResponse($this->template->render('web::home', [ 'page' => $page, 'layout' => 'layout/web' ]));
     }
 
 }

packages/Admin/src/Service/AdminUserService.php

Spacing +24 added lines, -24 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Admin\Service;
 
@@ -81,17 +81,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.');
         }
 
@@ -135,7 +135,7 @@ 
     {
         $filter = $this->adminUserFilter->getInputFilter()->setData($data);
 
-        if(!$filter->isValid()) {
+        if (!$filter->isValid()) {
             throw new FilterException($filter->getMessages());
         }
 
@@ -144,10 +144,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);
     }
@@ -161,17 +161,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());
         }
 
@@ -181,26 +181,26 @@ 
             ];
 
         // We don't 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' ]);
         }
-        else{
+        else {
             $this->upload->deleteFile($user->face_img);
         }
 
-        if(!$data['profile_img']) {
-            unset($data['profile_img']);
+        if (!$data[ 'profile_img' ]) {
+            unset($data[ 'profile_img' ]);
         }
-        else{
+        else {
             $this->upload->deleteFile($user->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 ]);
     }
 
     /**
@@ -212,14 +212,14 @@ 
      */
     public function delete($userId)
     {
-        if(!($adminUser = $this->getUser($userId))) {
+        if (!($adminUser = $this->getUser($userId))) {
             throw new \Exception('Admin user not found.');
         }
 
         $this->upload->deleteFile($adminUser->face_img);
         $this->upload->deleteFile($adminUser->profile_img);
 
-        return (bool)$this->adminUsersMapper->delete(['admin_user_id' => $userId]);
+        return (bool) $this->adminUsersMapper->delete([ 'admin_user_id' => $userId ]);
     }
 
     /**

packages/Admin/src/ConfigProvider.php

Spacing +6 added lines, -6 removed lines

@@ -13,7 +13,7 @@ 
                     'admin/pagination' => __DIR__ . '/../templates/admin/partial/pagination.phtml',
                 ],
                 'paths' => [
-                    'admin' => [__DIR__ . '/../templates/admin'],
+                    'admin' => [ __DIR__ . '/../templates/admin' ],
                 ],
             ],
 
@@ -37,25 +37,25 @@ 
                     'name'            => 'auth',
                     'path'            => '/auth/:action',
                     'middleware'      => Controller\AuthController::class,
-                    'allowed_methods' => ['GET', 'POST'],
+                    'allowed_methods' => [ 'GET', 'POST' ],
                 ],
                 [
                     'name'            => 'admin',
                     'path'            => '/admin',
                     'middleware'      => Action\IndexAction::class,
-                    'allowed_methods' => ['GET'],
+                    'allowed_methods' => [ 'GET' ],
                 ],
                 [
                     'name'            => 'admin.users',
                     'path'            => '/admin/users',
                     'middleware'      => Controller\UserController::class,
-                    'allowed_methods' => ['GET']
+                    'allowed_methods' => [ 'GET' ]
                 ],
                 [
                     'name'            => 'admin.users.action',
                     'path'            => '/admin/users/:action/:id',
                     'middleware'      => Controller\UserController::class,
-                    'allowed_methods' => ['GET', 'POST']
+                    'allowed_methods' => [ 'GET', 'POST' ]
                 ],
             ],
 
@@ -69,7 +69,7 @@ 
             'middleware_pipeline' => [
                 // execute this middleware on every /admin[*] path
                 'permission' => [
-                    'middleware' => [Middleware\AdminAuth::class],
+                    'middleware' => [ Middleware\AdminAuth::class ],
                     'priority'   => 100,
                     'path'       => '/admin'
                 ],

packages/Admin/src/Factory/Service/AdminUserServiceFactory.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Admin\Factory\Service;
 
@@ -21,8 +21,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(),

packages/Admin/tests/Controller/AuthControllerTest.php

Spacing +17 added lines, -17 removed lines

@@ -15,13 +15,13 @@ 
         $request = $request->withAttribute('action', 'login');
         $response = new \Zend\Diactoros\Response\EmptyResponse();
         $router = $this->getMockBuilder('Zend\Expressive\Router\RouterInterface')
-            ->setMethods(['generateUri'])
+            ->setMethods([ 'generateUri' ])
             ->getMockForAbstractClass();
         $router->expects(static::at(0))
             ->method('generateUri')
             ->will(static::returnValue('http://unfinished.dev/admin'));
         $sessionManager = $this->getMockBuilder('Zend\Session\SessionManager')
-            ->setMethods(['getStorage', 'writeClose'])
+            ->setMethods([ 'getStorage', 'writeClose' ])
             ->getMock();
         $sessionManager->expects(static::at(0))
             ->method('getStorage')
@@ -34,7 +34,7 @@ 
         /** @var \Zend\Diactoros\Response\EmptyResponse $response */
         $response = $auth($request, $response);
         static::assertSame(302, $response->getStatusCode());
-        static::assertSame(['http://unfinished.dev/admin'], $response->getHeader('Location'));
+        static::assertSame([ 'http://unfinished.dev/admin' ], $response->getHeader('Location'));
     }
 
     public function testIfUserNotLoggedInLoginActionShouldTakeHimToLoginHtmlPage()
@@ -43,7 +43,7 @@ 
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $template = $this->getMockBuilder('Zend\Expressive\Template\TemplateRendererInterface')
-            ->setMethods(['render'])
+            ->setMethods([ 'render' ])
             ->getMockForAbstractClass();
         $template->expects(static::at(0))
             ->method('render')
@@ -54,7 +54,7 @@ 
         $router = $this->getMockBuilder('Zend\Expressive\Router\RouterInterface')
             ->getMockForAbstractClass();
         $sessionManager = $this->getMockBuilder('Zend\Session\SessionManager')
-            ->setMethods(['getStorage', 'writeClose'])
+            ->setMethods([ 'getStorage', 'writeClose' ])
             ->getMock();
         $sessionManager->expects(static::at(0))
             ->method('getStorage')
@@ -81,7 +81,7 @@ 
         $request = $request->withAttribute('action', 'logout');
         $response = new \Zend\Diactoros\Response\EmptyResponse();
         $router = $this->getMockBuilder('Zend\Expressive\Router\RouterInterface')
-            ->setMethods(['generateUri'])
+            ->setMethods([ 'generateUri' ])
             ->getMockForAbstractClass();
         $router->expects(static::at(0))
             ->method('generateUri')
@@ -96,14 +96,14 @@ 
         $response = $auth($request, $response);
         static::assertNull($sessionManager->getStorage()->user);
         static::assertSame(302, $response->getStatusCode());
-        static::assertSame(['http://unfinished.dev/admin'], $response->getHeader('Location'));
+        static::assertSame([ 'http://unfinished.dev/admin' ], $response->getHeader('Location'));
     }
 
     public function testUserLoginHandleWithCorrectCredentialsShouldSetUserInSessionStorage()
     {
         $adminUserService = $this->getMockBuilder('Core\Service\AdminUserService.old')
             ->disableOriginalConstructor()
-            ->setMethods(['loginUser'])
+            ->setMethods([ 'loginUser' ])
             ->getMockForAbstractClass();
         $adminUserService->expects(static::once())
             ->method('loginUser')
@@ -122,7 +122,7 @@ 
         $request = $request->withAttribute('action', 'loginHandle');
         $response = new \Zend\Diactoros\Response\EmptyResponse();
         $router = $this->getMockBuilder('Zend\Expressive\Router\RouterInterface')
-            ->setMethods(['generateUri'])
+            ->setMethods([ 'generateUri' ])
             ->getMockForAbstractClass();
         $router->expects(static::at(0))
             ->method('generateUri')
@@ -135,14 +135,14 @@ 
         $response = $auth($request, $response);
         static::assertTrue($sessionManager->getStorage()->user->isLoggedIn);
         static::assertSame(302, $response->getStatusCode());
-        static::assertSame(['http://unfinished.dev/admin'], $response->getHeader('Location'));
+        static::assertSame([ 'http://unfinished.dev/admin' ], $response->getHeader('Location'));
     }
 
     public function testUserLoginHandleWithWrongCredentialsShouldNotSetUserInSessionStorage()
     {
         $adminUserService = $this->getMockBuilder('Core\Service\AdminUserService.old')
             ->disableOriginalConstructor()
-            ->setMethods(['loginUser'])
+            ->setMethods([ 'loginUser' ])
             ->getMockForAbstractClass();
         $template = $this->getMockBuilder('Zend\Expressive\Template\TemplateRendererInterface')
             ->getMockForAbstractClass();
@@ -154,7 +154,7 @@ 
         $request = $request->withAttribute('action', 'loginHandle');
         $response = new \Zend\Diactoros\Response\EmptyResponse();
         $router = $this->getMockBuilder('Zend\Expressive\Router\RouterInterface')
-            ->setMethods(['generateUri'])
+            ->setMethods([ 'generateUri' ])
             ->getMockForAbstractClass();
         $router->expects(static::at(0))
             ->method('generateUri')
@@ -168,7 +168,7 @@ 
         $response = $auth($request, $response);
         static::assertNull($sessionManager->getStorage()->user);
         static::assertSame(302, $response->getStatusCode());
-        static::assertSame(['http://unfinished.dev/admin'], $response->getHeader('Location'));
+        static::assertSame([ 'http://unfinished.dev/admin' ], $response->getHeader('Location'));
     }
 
     public function testUserLoginHandleWitAlreadyLoggedInUserShouldRedirectToAdminPage()
@@ -182,7 +182,7 @@ 
         $request = $request->withAttribute('action', 'loginHandle');
         $response = new \Zend\Diactoros\Response\EmptyResponse();
         $router = $this->getMockBuilder('Zend\Expressive\Router\RouterInterface')
-            ->setMethods(['generateUri'])
+            ->setMethods([ 'generateUri' ])
             ->getMockForAbstractClass();
         $router->expects(static::at(0))
             ->method('generateUri')
@@ -196,14 +196,14 @@ 
         /** @var \Zend\Diactoros\Response\HtmlResponse $response */
         $response = $auth($request, $response);
         static::assertSame(302, $response->getStatusCode());
-        static::assertSame(['http://unfinished.dev/admin'], $response->getHeader('Location'));
+        static::assertSame([ 'http://unfinished.dev/admin' ], $response->getHeader('Location'));
     }
 
     public function testUserLoginHandleShouldThrowExceptionAndDisplayMessage()
     {
         $adminUserService = $this->getMockBuilder('Core\Service\AdminUserService.old')
             ->disableOriginalConstructor()
-            ->setMethods(['loginUser'])
+            ->setMethods([ 'loginUser' ])
             ->getMockForAbstractClass();
         $adminUserService->expects(static::once())
             ->method('loginUser')
@@ -214,7 +214,7 @@ 
             ->method('render')
             ->will(static::returnCallback(
                 function($tpl, $error) {
-                    return $error['error'];
+                    return $error[ 'error' ];
                 }
             ));
         $request = new \Zend\Diactoros\ServerRequest();

packages/Admin/tests/Controller/UserControllerTest.php

Spacing +13 added lines, -13 removed lines

@@ -13,7 +13,7 @@ 
         $sessionStorage = new \Zend\Session\Storage\ArrayStorage();
         $sessionStorage->user = $user;
         $template = $this->getMockBuilder(\Zend\Expressive\Template\TemplateRendererInterface::class)
-            ->setMethods(['render'])
+            ->setMethods([ 'render' ])
             ->getMockForAbstractClass();
         $template->expects(static::once())
             ->method('render')
@@ -23,7 +23,7 @@ 
             ->getMock();
         $sessionManager = $this->getMockBuilder(\Zend\Session\SessionManager::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getStorage'])
+            ->setMethods([ 'getStorage' ])
             ->getMock();
         $sessionManager->expects(static::any())
             ->method('getStorage')
@@ -49,14 +49,14 @@ 
         $sessionStorage = new \Zend\Session\Storage\ArrayStorage();
         $sessionStorage->user = $user;
         $template = $this->getMockBuilder(\Zend\Expressive\Template\TemplateRendererInterface::class)
-            ->setMethods(['render'])
+            ->setMethods([ 'render' ])
             ->getMockForAbstractClass();
         $template->expects(static::once())
             ->method('render')
             ->will(static::returnValue('test'));
         $adminUserService = $this->getMockBuilder(\Admin\Service\AdminUserService::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getUser'])
+            ->setMethods([ 'getUser' ])
             ->getMock();
         $adminUserService->expects(static::once())
             ->method('getUser')
@@ -86,14 +86,14 @@ 
         $sessionStorage = new \Zend\Session\Storage\ArrayStorage();
         $sessionStorage->user = $user;
         $template = $this->getMockBuilder(\Zend\Expressive\Template\TemplateRendererInterface::class)
-            ->setMethods(['render'])
+            ->setMethods([ 'render' ])
             ->getMockForAbstractClass();
         $template->expects(static::once())
             ->method('render')
             ->will(static::returnValue('test'));
         $adminUserService = $this->getMockBuilder(\Admin\Service\AdminUserService::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getUser'])
+            ->setMethods([ 'getUser' ])
             ->getMock();
         $adminUserService->expects(static::once())
             ->method('getUser')
@@ -106,7 +106,7 @@ 
         $request = new \Zend\Diactoros\ServerRequest();
         $request = $request->withAttribute('action', 'edit');
         $request = $request->withAttribute('id', 1);
-        $request = $request->withParsedBody(['user' => 'test']);
+        $request = $request->withParsedBody([ 'user' => 'test' ]);
         $response = new \Zend\Diactoros\Response();
         $userController = new \Admin\Controller\UserController(
             $template,
@@ -138,7 +138,7 @@ 
             ->will(static::returnValue('http://unfinished.dev/admin/users'));
         $request = new \Zend\Diactoros\ServerRequest();
         $request = $request->withAttribute('action', 'save');
-        $request = $request->withParsedBody(['user' => 'test']);
+        $request = $request->withParsedBody([ 'user' => 'test' ]);
         $response = new \Zend\Diactoros\Response();
         $userController = new \Admin\Controller\UserController(
             $template,
@@ -177,7 +177,7 @@ 
         $request = new \Zend\Diactoros\ServerRequest();
         $request = $request->withAttribute('action', 'save');
         $request = $request->withAttribute('id', 2);
-        $request = $request->withParsedBody(['user' => 'test']);
+        $request = $request->withParsedBody([ 'user' => 'test' ]);
         $response = new \Zend\Diactoros\Response();
         $userController = new \Admin\Controller\UserController(
             $template,
@@ -215,11 +215,11 @@ 
             ->getMockForAbstractClass();
         $router->expects(static::at(0))
             ->method('generateUri')
-            ->willThrowException(new \Core\Exception\FilterException(['test error']));
+            ->willThrowException(new \Core\Exception\FilterException([ 'test error' ]));
         $request = new \Zend\Diactoros\ServerRequest();
         $request = $request->withAttribute('action', 'save');
         $request = $request->withAttribute('id', 2);
-        $request = $request->withParsedBody(['user' => 'test']);
+        $request = $request->withParsedBody([ 'user' => 'test' ]);
         $response = new \Zend\Diactoros\Response();
         $userController = new \Admin\Controller\UserController(
             $template,
@@ -262,7 +262,7 @@ 
             ->willThrowException(new \Exception('test error'));
         $request = new \Zend\Diactoros\ServerRequest();
         $request = $request->withAttribute('action', 'save');
-        $request = $request->withParsedBody(['user' => 'test']);
+        $request = $request->withParsedBody([ 'user' => 'test' ]);
         $response = new \Zend\Diactoros\Response();
         $userController = new \Admin\Controller\UserController(
             $template,
@@ -320,7 +320,7 @@ 
         $template = $this->getMockBuilder(\Zend\Expressive\Template\TemplateRendererInterface::class)
             ->getMockForAbstractClass();
         $adminUserService = $this->getMockBuilder(\Admin\Service\AdminUserService::class)
-            ->setMethods(['delete'])
+            ->setMethods([ 'delete' ])
             ->disableOriginalConstructor()
             ->getMock();
         $adminUserService->expects(static::once())

packages/Admin/tests/View/Helper/WebAdminUserHelperTest.php

Spacing +3 added lines, -3 removed lines

@@ -16,13 +16,13 @@
     public function testGetRandomShouldReturnArray()
     {
         $adminUserService = $this->getMockBuilder('Core\Service\AdminUserService.old')
-            ->setMethods(['getForWeb'])
+            ->setMethods([ 'getForWeb' ])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $adminUserService->expects(static::once())
             ->method('getForWeb')
-            ->willReturn([]);
+            ->willReturn([ ]);
         $adminUserHelper = new \Admin\View\Helper\WebAdminUserHelper($adminUserService);
-        static::assertSame([], $adminUserHelper->getRandom());
+        static::assertSame([ ], $adminUserHelper->getRandom());
     }
 }