@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | * @throws Mapping\MappingException |
| 53 | 53 | * @throws LockException |
| 54 | 54 | * @throws UserDeactivatedException |
| 55 | - * @return null | UserInterface |
|
| 55 | + * @return null|UserInterface | UserInterface |
|
| 56 | 56 | */ |
| 57 | 57 | public function find($id, $lockMode = \Doctrine\ODM\MongoDB\LockMode::NONE, $lockVersion = null, array $options = []) |
| 58 | 58 | { |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | * @param array $criteria |
| 64 | 64 | * @param array $options |
| 65 | 65 | * @throws UserDeactivatedException |
| 66 | - * @return null | UserInterface |
|
| 66 | + * @return null|UserInterface | UserInterface |
|
| 67 | 67 | */ |
| 68 | 68 | public function findOneBy(array $criteria, array $options = []) |
| 69 | 69 | { |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | * Creates a User |
| 93 | 93 | * |
| 94 | 94 | * @see \Core\Repository\AbstractRepository::create() |
| 95 | - * @return UserInterface |
|
| 95 | + * @return \Core\Entity\EntityInterface |
|
| 96 | 96 | */ |
| 97 | 97 | public function create(array $data = null, $persist=false) |
| 98 | 98 | { |
@@ -267,7 +267,7 @@ discard block |
||
| 267 | 267 | * @param UserInterface $user |
| 268 | 268 | * @param array $options |
| 269 | 269 | * @throws UserDeactivatedException |
| 270 | - * @return null | UserInterface |
|
| 270 | + * @return null|UserInterface | UserInterface |
|
| 271 | 271 | */ |
| 272 | 272 | protected function assertEntity(UserInterface $user = null, array $options) |
| 273 | 273 | { |
@@ -82,7 +82,7 @@ |
||
| 82 | 82 | $result = true; |
| 83 | 83 | try{ |
| 84 | 84 | $repo->store($user); |
| 85 | - }catch (\Exception $e){ |
|
| 85 | + } catch (\Exception $e){ |
|
| 86 | 86 | throw $e; |
| 87 | 87 | } |
| 88 | 88 | return $result; |
@@ -120,7 +120,7 @@ |
||
| 120 | 120 | ]; |
| 121 | 121 | $userOk = $this->plugin('Install/UserCreator',$options)->process($data['username'], $data['password'], $data['email']); |
| 122 | 122 | $ok = $this->plugin('Install/ConfigCreator')->process($data['db_conn'], $data['email']); |
| 123 | - }catch (\Exception $exception){ |
|
| 123 | + } catch (\Exception $exception){ |
|
| 124 | 124 | /* @TODO: provide a way to handle global error message */ |
| 125 | 125 | return $this->createJsonResponse([ |
| 126 | 126 | 'ok' => false, |
@@ -81,7 +81,7 @@ |
||
| 81 | 81 | $this->error(self::NO_CONNECTION); |
| 82 | 82 | |
| 83 | 83 | return false; |
| 84 | - }catch (\Exception $e){ |
|
| 84 | + } catch (\Exception $e){ |
|
| 85 | 85 | $this->databaseError = $e->getMessage(); |
| 86 | 86 | $this->error(self::NO_CONNECTION); |
| 87 | 87 | return false; |