@@ -129,10 +129,10 @@ discard block |
||
| 129 | 129 | // ) |
| 130 | 130 | // ); |
| 131 | 131 | $qb->addAnd($qb->expr()->field('user')->equals($userId)) |
| 132 | - ->addAnd( |
|
| 133 | - $qb->expr()->addOr($qb->expr()->field('parent')->exists(false)) |
|
| 134 | - ->addOr($qb->expr()->field('parent')->equals(null)) |
|
| 135 | - ); |
|
| 132 | + ->addAnd( |
|
| 133 | + $qb->expr()->addOr($qb->expr()->field('parent')->exists(false)) |
|
| 134 | + ->addOr($qb->expr()->field('parent')->equals(null)) |
|
| 135 | + ); |
|
| 136 | 136 | |
| 137 | 137 | $q = $qb->getQuery(); |
| 138 | 138 | $entity = $q->getSingleResult(); |
@@ -192,11 +192,11 @@ discard block |
||
| 192 | 192 | return $c; |
| 193 | 193 | } |
| 194 | 194 | |
| 195 | - /** |
|
| 196 | - * @param array|null $data |
|
| 197 | - * @param bool $persist |
|
| 198 | - * @return \Organizations\Entity\Organization |
|
| 199 | - */ |
|
| 195 | + /** |
|
| 196 | + * @param array|null $data |
|
| 197 | + * @param bool $persist |
|
| 198 | + * @return \Organizations\Entity\Organization |
|
| 199 | + */ |
|
| 200 | 200 | public function create(array $data = null, $persist=false) |
| 201 | 201 | { |
| 202 | 202 | $entity = parent::create($data); |
@@ -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; |