superdesk / web-publisher

src/SWP/Bundle/CoreBundle/AppleNews/Api/AppleNewsApi.php

Doc Comments +3 added lines

@@ -119,6 +119,9 @@
         return 'multipart/form-data; boundary='.$this->boundary;
     }
 
+    /**
+     * @param string $json
+     */
     public function post(string $path, $json, array $metadata = []): ResponseInterface
     {
         $multipartStream = new MultipartStream($this->generateData($json, $metadata), $this->boundary);

src/SWP/Bundle/MultiTenancyBundle/Command/CreateTenantCommand.php

Spacing +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
         $default = $input->getOption('default');
         if (!$input->getArgument($name) && !$default) {
             $question = new Question(sprintf('<question>Please enter %s:</question>', $name));
-            $question->setValidator(function ($argument) use ($name) {
+            $question->setValidator(function($argument) use ($name) {
                 if (empty($argument) && $name !== $this->arguments[1]) {
                     throw new \RuntimeException(sprintf('The %s can not be empty', $name));
                 }

src/SWP/Bundle/CoreBundle/Controller/AuthController.php

Doc Comments -85 removed lines

@@ -180,88 +180,3 @@
                 return new SingleResourceResponse([
                     'status' => 401,
                     'message' => <<<'MESSAGE'
-Unauthorized (user not found in Superdesk). 
-Make sure that Publisher can talk to Superdesk instance. Set it's address in "SUPERDESK_SERVERS" environment variable.
-MESSAGE,
-                ], new ResponseContext(401));
-            }
-
-            $publisherUser = $userProvider->findOneByEmail($superdeskUser['email']);
-            if (null === $publisherUser) {
-                try {
-                    $publisherUser = $userProvider->loadUserByUsername($superdeskUser['username']);
-                } catch (UsernameNotFoundException $e) {
-                    $publisherUser = null;
-                }
-            }
-
-            if (null === $publisherUser) {
-                /** @var UserInterface $publisherUser */
-                $publisherUser = $userManager->createUser();
-                $publisherUser->setUsername($superdeskUser['username']);
-                $publisherUser->setEmail($superdeskUser['email']);
-                $publisherUser->setRoles(['ROLE_INTERNAL_API']);
-                $publisherUser->setFirstName(\array_key_exists('first_name', $superdeskUser) ? $superdeskUser['first_name'] : 'Anon.');
-                $publisherUser->setLastName(\array_key_exists('last_name', $superdeskUser) ? $superdeskUser['last_name'] : '');
-                $publisherUser->setPlainPassword(password_hash(random_bytes(36), PASSWORD_BCRYPT));
-                $publisherUser->setEnabled(true);
-                $userManager->updateUser($publisherUser);
-            }
-
-            if (null !== $publisherUser) {
-                return $this->returnApiTokenResponse($publisherUser, str_replace('Basic ', '', $formData['token']));
-            }
-        }
-
-        return new SingleResourceResponse([
-            'status' => 401,
-            'message' => 'Unauthorized',
-        ], new ResponseContext(401));
-    }
-
-    private function returnApiTokenResponse(UserInterface $user, string $token = null): SingleResourceResponseInterface
-    {
-        /** @var ApiKeyInterface $apiKey */
-        $apiKey = $this->generateOrGetApiKey($user, $token);
-
-        return new SingleResourceResponse([
-            'token' => [
-                'api_key' => $apiKey->getApiKey(),
-                'valid_to' => $apiKey->getValidTo(),
-            ],
-            'user' => $user,
-        ]);
-    }
-
-    private function generateOrGetApiKey(UserInterface $user, $token): ?ApiKeyInterface
-    {
-        $apiKey = null;
-        if (null !== $token) {
-            $apiKey = $this->apiKeyRepository->getValidToken($token)->getQuery()->getOneOrNullResult();
-        } else {
-            $validKeys = $this->apiKeyRepository->getValidTokenForUser($user)->getQuery()->getResult();
-            if (count($validKeys) > 0) {
-                $apiKey = reset($validKeys);
-            }
-        }
-
-        if (null === $apiKey) {
-            $apiKey = $this->apiKeyFactory->create($user, $token);
-
-            try {
-                $lock = $this->lockFactory->createLock(md5(json_encode(['type' => 'user_api_key', 'user' => $user->getId()])), 2);
-                if (!$lock->acquire()) {
-                    throw new RuntimeException('Other api key is created right now for this user');
-                }
-                $this->apiKeyRepository->add($apiKey);
-                $lock->release();
-            } catch (RuntimeException $e) {
-                sleep(2);
-
-                return $this->generateOrGetApiKey($user, $token);
-            }
-        }
-
-        return $apiKey;
-    }
-}

Unused Use Statements -85 removed lines

@@ -180,88 +180,3 @@
                 return new SingleResourceResponse([
                     'status' => 401,
                     'message' => <<<'MESSAGE'
-Unauthorized (user not found in Superdesk). 
-Make sure that Publisher can talk to Superdesk instance. Set it's address in "SUPERDESK_SERVERS" environment variable.
-MESSAGE,
-                ], new ResponseContext(401));
-            }
-
-            $publisherUser = $userProvider->findOneByEmail($superdeskUser['email']);
-            if (null === $publisherUser) {
-                try {
-                    $publisherUser = $userProvider->loadUserByUsername($superdeskUser['username']);
-                } catch (UsernameNotFoundException $e) {
-                    $publisherUser = null;
-                }
-            }
-
-            if (null === $publisherUser) {
-                /** @var UserInterface $publisherUser */
-                $publisherUser = $userManager->createUser();
-                $publisherUser->setUsername($superdeskUser['username']);
-                $publisherUser->setEmail($superdeskUser['email']);
-                $publisherUser->setRoles(['ROLE_INTERNAL_API']);
-                $publisherUser->setFirstName(\array_key_exists('first_name', $superdeskUser) ? $superdeskUser['first_name'] : 'Anon.');
-                $publisherUser->setLastName(\array_key_exists('last_name', $superdeskUser) ? $superdeskUser['last_name'] : '');
-                $publisherUser->setPlainPassword(password_hash(random_bytes(36), PASSWORD_BCRYPT));
-                $publisherUser->setEnabled(true);
-                $userManager->updateUser($publisherUser);
-            }
-
-            if (null !== $publisherUser) {
-                return $this->returnApiTokenResponse($publisherUser, str_replace('Basic ', '', $formData['token']));
-            }
-        }
-
-        return new SingleResourceResponse([
-            'status' => 401,
-            'message' => 'Unauthorized',
-        ], new ResponseContext(401));
-    }
-
-    private function returnApiTokenResponse(UserInterface $user, string $token = null): SingleResourceResponseInterface
-    {
-        /** @var ApiKeyInterface $apiKey */
-        $apiKey = $this->generateOrGetApiKey($user, $token);
-
-        return new SingleResourceResponse([
-            'token' => [
-                'api_key' => $apiKey->getApiKey(),
-                'valid_to' => $apiKey->getValidTo(),
-            ],
-            'user' => $user,
-        ]);
-    }
-
-    private function generateOrGetApiKey(UserInterface $user, $token): ?ApiKeyInterface
-    {
-        $apiKey = null;
-        if (null !== $token) {
-            $apiKey = $this->apiKeyRepository->getValidToken($token)->getQuery()->getOneOrNullResult();
-        } else {
-            $validKeys = $this->apiKeyRepository->getValidTokenForUser($user)->getQuery()->getResult();
-            if (count($validKeys) > 0) {
-                $apiKey = reset($validKeys);
-            }
-        }
-
-        if (null === $apiKey) {
-            $apiKey = $this->apiKeyFactory->create($user, $token);
-
-            try {
-                $lock = $this->lockFactory->createLock(md5(json_encode(['type' => 'user_api_key', 'user' => $user->getId()])), 2);
-                if (!$lock->acquire()) {
-                    throw new RuntimeException('Other api key is created right now for this user');
-                }
-                $this->apiKeyRepository->add($apiKey);
-                $lock->release();
-            } catch (RuntimeException $e) {
-                sleep(2);
-
-                return $this->generateOrGetApiKey($user, $token);
-            }
-        }
-
-        return $apiKey;
-    }
-}

Indentation -85 removed lines

@@ -180,88 +180,3 @@
                 return new SingleResourceResponse([
                     'status' => 401,
                     'message' => <<<'MESSAGE'
-Unauthorized (user not found in Superdesk). 
-Make sure that Publisher can talk to Superdesk instance. Set it's address in "SUPERDESK_SERVERS" environment variable.
-MESSAGE,
-                ], new ResponseContext(401));
-            }
-
-            $publisherUser = $userProvider->findOneByEmail($superdeskUser['email']);
-            if (null === $publisherUser) {
-                try {
-                    $publisherUser = $userProvider->loadUserByUsername($superdeskUser['username']);
-                } catch (UsernameNotFoundException $e) {
-                    $publisherUser = null;
-                }
-            }
-
-            if (null === $publisherUser) {
-                /** @var UserInterface $publisherUser */
-                $publisherUser = $userManager->createUser();
-                $publisherUser->setUsername($superdeskUser['username']);
-                $publisherUser->setEmail($superdeskUser['email']);
-                $publisherUser->setRoles(['ROLE_INTERNAL_API']);
-                $publisherUser->setFirstName(\array_key_exists('first_name', $superdeskUser) ? $superdeskUser['first_name'] : 'Anon.');
-                $publisherUser->setLastName(\array_key_exists('last_name', $superdeskUser) ? $superdeskUser['last_name'] : '');
-                $publisherUser->setPlainPassword(password_hash(random_bytes(36), PASSWORD_BCRYPT));
-                $publisherUser->setEnabled(true);
-                $userManager->updateUser($publisherUser);
-            }
-
-            if (null !== $publisherUser) {
-                return $this->returnApiTokenResponse($publisherUser, str_replace('Basic ', '', $formData['token']));
-            }
-        }
-
-        return new SingleResourceResponse([
-            'status' => 401,
-            'message' => 'Unauthorized',
-        ], new ResponseContext(401));
-    }
-
-    private function returnApiTokenResponse(UserInterface $user, string $token = null): SingleResourceResponseInterface
-    {
-        /** @var ApiKeyInterface $apiKey */
-        $apiKey = $this->generateOrGetApiKey($user, $token);
-
-        return new SingleResourceResponse([
-            'token' => [
-                'api_key' => $apiKey->getApiKey(),
-                'valid_to' => $apiKey->getValidTo(),
-            ],
-            'user' => $user,
-        ]);
-    }
-
-    private function generateOrGetApiKey(UserInterface $user, $token): ?ApiKeyInterface
-    {
-        $apiKey = null;
-        if (null !== $token) {
-            $apiKey = $this->apiKeyRepository->getValidToken($token)->getQuery()->getOneOrNullResult();
-        } else {
-            $validKeys = $this->apiKeyRepository->getValidTokenForUser($user)->getQuery()->getResult();
-            if (count($validKeys) > 0) {
-                $apiKey = reset($validKeys);
-            }
-        }
-
-        if (null === $apiKey) {
-            $apiKey = $this->apiKeyFactory->create($user, $token);
-
-            try {
-                $lock = $this->lockFactory->createLock(md5(json_encode(['type' => 'user_api_key', 'user' => $user->getId()])), 2);
-                if (!$lock->acquire()) {
-                    throw new RuntimeException('Other api key is created right now for this user');
-                }
-                $this->apiKeyRepository->add($apiKey);
-                $lock->release();
-            } catch (RuntimeException $e) {
-                sleep(2);
-
-                return $this->generateOrGetApiKey($user, $token);
-            }
-        }
-
-        return $apiKey;
-    }
-}

Switch Indentation -85 removed lines

@@ -180,88 +180,3 @@
                 return new SingleResourceResponse([
                     'status' => 401,
                     'message' => <<<'MESSAGE'
-Unauthorized (user not found in Superdesk). 
-Make sure that Publisher can talk to Superdesk instance. Set it's address in "SUPERDESK_SERVERS" environment variable.
-MESSAGE,
-                ], new ResponseContext(401));
-            }
-
-            $publisherUser = $userProvider->findOneByEmail($superdeskUser['email']);
-            if (null === $publisherUser) {
-                try {
-                    $publisherUser = $userProvider->loadUserByUsername($superdeskUser['username']);
-                } catch (UsernameNotFoundException $e) {
-                    $publisherUser = null;
-                }
-            }
-
-            if (null === $publisherUser) {
-                /** @var UserInterface $publisherUser */
-                $publisherUser = $userManager->createUser();
-                $publisherUser->setUsername($superdeskUser['username']);
-                $publisherUser->setEmail($superdeskUser['email']);
-                $publisherUser->setRoles(['ROLE_INTERNAL_API']);
-                $publisherUser->setFirstName(\array_key_exists('first_name', $superdeskUser) ? $superdeskUser['first_name'] : 'Anon.');
-                $publisherUser->setLastName(\array_key_exists('last_name', $superdeskUser) ? $superdeskUser['last_name'] : '');
-                $publisherUser->setPlainPassword(password_hash(random_bytes(36), PASSWORD_BCRYPT));
-                $publisherUser->setEnabled(true);
-                $userManager->updateUser($publisherUser);
-            }
-
-            if (null !== $publisherUser) {
-                return $this->returnApiTokenResponse($publisherUser, str_replace('Basic ', '', $formData['token']));
-            }
-        }
-
-        return new SingleResourceResponse([
-            'status' => 401,
-            'message' => 'Unauthorized',
-        ], new ResponseContext(401));
-    }
-
-    private function returnApiTokenResponse(UserInterface $user, string $token = null): SingleResourceResponseInterface
-    {
-        /** @var ApiKeyInterface $apiKey */
-        $apiKey = $this->generateOrGetApiKey($user, $token);
-
-        return new SingleResourceResponse([
-            'token' => [
-                'api_key' => $apiKey->getApiKey(),
-                'valid_to' => $apiKey->getValidTo(),
-            ],
-            'user' => $user,
-        ]);
-    }
-
-    private function generateOrGetApiKey(UserInterface $user, $token): ?ApiKeyInterface
-    {
-        $apiKey = null;
-        if (null !== $token) {
-            $apiKey = $this->apiKeyRepository->getValidToken($token)->getQuery()->getOneOrNullResult();
-        } else {
-            $validKeys = $this->apiKeyRepository->getValidTokenForUser($user)->getQuery()->getResult();
-            if (count($validKeys) > 0) {
-                $apiKey = reset($validKeys);
-            }
-        }
-
-        if (null === $apiKey) {
-            $apiKey = $this->apiKeyFactory->create($user, $token);
-
-            try {
-                $lock = $this->lockFactory->createLock(md5(json_encode(['type' => 'user_api_key', 'user' => $user->getId()])), 2);
-                if (!$lock->acquire()) {
-                    throw new RuntimeException('Other api key is created right now for this user');
-                }
-                $this->apiKeyRepository->add($apiKey);
-                $lock->release();
-            } catch (RuntimeException $e) {
-                sleep(2);
-
-                return $this->generateOrGetApiKey($user, $token);
-            }
-        }
-
-        return $apiKey;
-    }
-}

Spacing -85 removed lines

@@ -180,88 +180,3 @@
                 return new SingleResourceResponse([
                     'status' => 401,
                     'message' => <<<'MESSAGE'
-Unauthorized (user not found in Superdesk). 
-Make sure that Publisher can talk to Superdesk instance. Set it's address in "SUPERDESK_SERVERS" environment variable.
-MESSAGE,
-                ], new ResponseContext(401));
-            }
-
-            $publisherUser = $userProvider->findOneByEmail($superdeskUser['email']);
-            if (null === $publisherUser) {
-                try {
-                    $publisherUser = $userProvider->loadUserByUsername($superdeskUser['username']);
-                } catch (UsernameNotFoundException $e) {
-                    $publisherUser = null;
-                }
-            }
-
-            if (null === $publisherUser) {
-                /** @var UserInterface $publisherUser */
-                $publisherUser = $userManager->createUser();
-                $publisherUser->setUsername($superdeskUser['username']);
-                $publisherUser->setEmail($superdeskUser['email']);
-                $publisherUser->setRoles(['ROLE_INTERNAL_API']);
-                $publisherUser->setFirstName(\array_key_exists('first_name', $superdeskUser) ? $superdeskUser['first_name'] : 'Anon.');
-                $publisherUser->setLastName(\array_key_exists('last_name', $superdeskUser) ? $superdeskUser['last_name'] : '');
-                $publisherUser->setPlainPassword(password_hash(random_bytes(36), PASSWORD_BCRYPT));
-                $publisherUser->setEnabled(true);
-                $userManager->updateUser($publisherUser);
-            }
-
-            if (null !== $publisherUser) {
-                return $this->returnApiTokenResponse($publisherUser, str_replace('Basic ', '', $formData['token']));
-            }
-        }
-
-        return new SingleResourceResponse([
-            'status' => 401,
-            'message' => 'Unauthorized',
-        ], new ResponseContext(401));
-    }
-
-    private function returnApiTokenResponse(UserInterface $user, string $token = null): SingleResourceResponseInterface
-    {
-        /** @var ApiKeyInterface $apiKey */
-        $apiKey = $this->generateOrGetApiKey($user, $token);
-
-        return new SingleResourceResponse([
-            'token' => [
-                'api_key' => $apiKey->getApiKey(),
-                'valid_to' => $apiKey->getValidTo(),
-            ],
-            'user' => $user,
-        ]);
-    }
-
-    private function generateOrGetApiKey(UserInterface $user, $token): ?ApiKeyInterface
-    {
-        $apiKey = null;
-        if (null !== $token) {
-            $apiKey = $this->apiKeyRepository->getValidToken($token)->getQuery()->getOneOrNullResult();
-        } else {
-            $validKeys = $this->apiKeyRepository->getValidTokenForUser($user)->getQuery()->getResult();
-            if (count($validKeys) > 0) {
-                $apiKey = reset($validKeys);
-            }
-        }
-
-        if (null === $apiKey) {
-            $apiKey = $this->apiKeyFactory->create($user, $token);
-
-            try {
-                $lock = $this->lockFactory->createLock(md5(json_encode(['type' => 'user_api_key', 'user' => $user->getId()])), 2);
-                if (!$lock->acquire()) {
-                    throw new RuntimeException('Other api key is created right now for this user');
-                }
-                $this->apiKeyRepository->add($apiKey);
-                $lock->release();
-            } catch (RuntimeException $e) {
-                sleep(2);
-
-                return $this->generateOrGetApiKey($user, $token);
-            }
-        }
-
-        return $apiKey;
-    }
-}

Braces -85 removed lines

@@ -180,88 +180,3 @@
                 return new SingleResourceResponse([
                     'status' => 401,
                     'message' => <<<'MESSAGE'
-Unauthorized (user not found in Superdesk). 
-Make sure that Publisher can talk to Superdesk instance. Set it's address in "SUPERDESK_SERVERS" environment variable.
-MESSAGE,
-                ], new ResponseContext(401));
-            }
-
-            $publisherUser = $userProvider->findOneByEmail($superdeskUser['email']);
-            if (null === $publisherUser) {
-                try {
-                    $publisherUser = $userProvider->loadUserByUsername($superdeskUser['username']);
-                } catch (UsernameNotFoundException $e) {
-                    $publisherUser = null;
-                }
-            }
-
-            if (null === $publisherUser) {
-                /** @var UserInterface $publisherUser */
-                $publisherUser = $userManager->createUser();
-                $publisherUser->setUsername($superdeskUser['username']);
-                $publisherUser->setEmail($superdeskUser['email']);
-                $publisherUser->setRoles(['ROLE_INTERNAL_API']);
-                $publisherUser->setFirstName(\array_key_exists('first_name', $superdeskUser) ? $superdeskUser['first_name'] : 'Anon.');
-                $publisherUser->setLastName(\array_key_exists('last_name', $superdeskUser) ? $superdeskUser['last_name'] : '');
-                $publisherUser->setPlainPassword(password_hash(random_bytes(36), PASSWORD_BCRYPT));
-                $publisherUser->setEnabled(true);
-                $userManager->updateUser($publisherUser);
-            }
-
-            if (null !== $publisherUser) {
-                return $this->returnApiTokenResponse($publisherUser, str_replace('Basic ', '', $formData['token']));
-            }
-        }
-
-        return new SingleResourceResponse([
-            'status' => 401,
-            'message' => 'Unauthorized',
-        ], new ResponseContext(401));
-    }
-
-    private function returnApiTokenResponse(UserInterface $user, string $token = null): SingleResourceResponseInterface
-    {
-        /** @var ApiKeyInterface $apiKey */
-        $apiKey = $this->generateOrGetApiKey($user, $token);
-
-        return new SingleResourceResponse([
-            'token' => [
-                'api_key' => $apiKey->getApiKey(),
-                'valid_to' => $apiKey->getValidTo(),
-            ],
-            'user' => $user,
-        ]);
-    }
-
-    private function generateOrGetApiKey(UserInterface $user, $token): ?ApiKeyInterface
-    {
-        $apiKey = null;
-        if (null !== $token) {
-            $apiKey = $this->apiKeyRepository->getValidToken($token)->getQuery()->getOneOrNullResult();
-        } else {
-            $validKeys = $this->apiKeyRepository->getValidTokenForUser($user)->getQuery()->getResult();
-            if (count($validKeys) > 0) {
-                $apiKey = reset($validKeys);
-            }
-        }
-
-        if (null === $apiKey) {
-            $apiKey = $this->apiKeyFactory->create($user, $token);
-
-            try {
-                $lock = $this->lockFactory->createLock(md5(json_encode(['type' => 'user_api_key', 'user' => $user->getId()])), 2);
-                if (!$lock->acquire()) {
-                    throw new RuntimeException('Other api key is created right now for this user');
-                }
-                $this->apiKeyRepository->add($apiKey);
-                $lock->release();
-            } catch (RuntimeException $e) {
-                sleep(2);
-
-                return $this->generateOrGetApiKey($user, $token);
-            }
-        }
-
-        return $apiKey;
-    }
-}

Upper-Lower-Casing -85 removed lines

@@ -180,88 +180,3 @@
                 return new SingleResourceResponse([
                     'status' => 401,
                     'message' => <<<'MESSAGE'
-Unauthorized (user not found in Superdesk). 
-Make sure that Publisher can talk to Superdesk instance. Set it's address in "SUPERDESK_SERVERS" environment variable.
-MESSAGE,
-                ], new ResponseContext(401));
-            }
-
-            $publisherUser = $userProvider->findOneByEmail($superdeskUser['email']);
-            if (null === $publisherUser) {
-                try {
-                    $publisherUser = $userProvider->loadUserByUsername($superdeskUser['username']);
-                } catch (UsernameNotFoundException $e) {
-                    $publisherUser = null;
-                }
-            }
-
-            if (null === $publisherUser) {
-                /** @var UserInterface $publisherUser */
-                $publisherUser = $userManager->createUser();
-                $publisherUser->setUsername($superdeskUser['username']);
-                $publisherUser->setEmail($superdeskUser['email']);
-                $publisherUser->setRoles(['ROLE_INTERNAL_API']);
-                $publisherUser->setFirstName(\array_key_exists('first_name', $superdeskUser) ? $superdeskUser['first_name'] : 'Anon.');
-                $publisherUser->setLastName(\array_key_exists('last_name', $superdeskUser) ? $superdeskUser['last_name'] : '');
-                $publisherUser->setPlainPassword(password_hash(random_bytes(36), PASSWORD_BCRYPT));
-                $publisherUser->setEnabled(true);
-                $userManager->updateUser($publisherUser);
-            }
-
-            if (null !== $publisherUser) {
-                return $this->returnApiTokenResponse($publisherUser, str_replace('Basic ', '', $formData['token']));
-            }
-        }
-
-        return new SingleResourceResponse([
-            'status' => 401,
-            'message' => 'Unauthorized',
-        ], new ResponseContext(401));
-    }
-
-    private function returnApiTokenResponse(UserInterface $user, string $token = null): SingleResourceResponseInterface
-    {
-        /** @var ApiKeyInterface $apiKey */
-        $apiKey = $this->generateOrGetApiKey($user, $token);
-
-        return new SingleResourceResponse([
-            'token' => [
-                'api_key' => $apiKey->getApiKey(),
-                'valid_to' => $apiKey->getValidTo(),
-            ],
-            'user' => $user,
-        ]);
-    }
-
-    private function generateOrGetApiKey(UserInterface $user, $token): ?ApiKeyInterface
-    {
-        $apiKey = null;
-        if (null !== $token) {
-            $apiKey = $this->apiKeyRepository->getValidToken($token)->getQuery()->getOneOrNullResult();
-        } else {
-            $validKeys = $this->apiKeyRepository->getValidTokenForUser($user)->getQuery()->getResult();
-            if (count($validKeys) > 0) {
-                $apiKey = reset($validKeys);
-            }
-        }
-
-        if (null === $apiKey) {
-            $apiKey = $this->apiKeyFactory->create($user, $token);
-
-            try {
-                $lock = $this->lockFactory->createLock(md5(json_encode(['type' => 'user_api_key', 'user' => $user->getId()])), 2);
-                if (!$lock->acquire()) {
-                    throw new RuntimeException('Other api key is created right now for this user');
-                }
-                $this->apiKeyRepository->add($apiKey);
-                $lock->release();
-            } catch (RuntimeException $e) {
-                sleep(2);
-
-                return $this->generateOrGetApiKey($user, $token);
-            }
-        }
-
-        return $apiKey;
-    }
-}

src/SWP/Bundle/UserBundle/Mailer/BaseMailer.php

Doc Comments +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
     /**
      * @param string       $renderedTemplate
      * @param array|string $fromEmail
-     * @param array|string $toEmail
+     * @param string $toEmail
      */
     protected function sendEmailMessage($renderedTemplate, $fromEmail, $toEmail)
     {

src/SWP/Bundle/UserBundle/Command/CreateUserCommand.php

Spacing +3 added lines, -3 removed lines

@@ -102,7 +102,7 @@ 
 
         if (!$input->getArgument('username')) {
             $question = new Question('Please choose a username:');
-            $question->setValidator(function ($username) {
+            $question->setValidator(function($username) {
                 if (empty($username)) {
                     throw new \Exception('Username can not be empty');
                 }
@@ -114,7 +114,7 @@ 
 
         if (!$input->getArgument('email')) {
             $question = new Question('Please choose an email:');
-            $question->setValidator(function ($email) {
+            $question->setValidator(function($email) {
                 if (empty($email)) {
                     throw new \Exception('Email can not be empty');
                 }
@@ -126,7 +126,7 @@ 
 
         if (!$input->getArgument('password')) {
             $question = new Question('Please choose a password:');
-            $question->setValidator(function ($password) {
+            $question->setValidator(function($password) {
                 if (empty($password)) {
                     throw new \Exception('Password can not be empty');
                 }