X-Git-Url: https://git.rapsys.eu/blogbundle/blobdiff_plain/2aca0f531ee6833b663648cc5205da37743ed2d0..1e2368f59f27fdbd106908fee95c9cba4b281299:/Repository/UserRepository.php

diff --git a/Repository/UserRepository.php b/Repository/UserRepository.php
index befe695..71b6cd1 100644
--- a/Repository/UserRepository.php
+++ b/Repository/UserRepository.php
@@ -197,8 +197,8 @@ SQL;
 				'modified' => $data['modified'],
 				'civility' => $data['civility'],
 				#'slug' => $data['slug'],
-				'link' => $this->router->generate('rapsys_blog_user_view', ['id' => $data['id'], 'slug' => $data['slug']]),
-				'edit' => $this->router->generate('rapsys_user_edit', ['mail' => $short = $this->slugger->short($data['mail']), 'hash' => $this->slugger->hash($short)]),
+				'link' => $this->router->generate('rapsysblog_user_view', ['id' => $data['id'], 'slug' => $data['slug']]),
+				'edit' => $this->router->generate('rapsysuser_edit', ['mail' => $short = $this->slugger->short($data['mail']), 'hash' => $this->slugger->hash($short)]),
 				'articles' => [],
 				'groups' => []
 			];
@@ -214,7 +214,7 @@ SQL;
 					$ret[$data['id']]['groups'][$id] = [
 						'title' => /*$group = */$this->translator->trans($titles[$k]),
 						#'slug' => $this->slugger->slug($group)
-						#'link' => $this->router->generate('rapsys_user_group_view', ['id' => $id, 'slug' => $this->slugger->short($group)])
+						#'link' => $this->router->generate('rapsysuser_group_view', ['id' => $id, 'slug' => $this->slugger->short($group)])
 					];
 				}
 			}
@@ -246,7 +246,7 @@ SQL;
 							'description' => $descriptions[$k],
 							#'slug' => $slugs[$k],
 							'title' => $titles[$k],
-							'link' => $this->router->generate('rapsys_blog_article_view', ['id' => $id, 'slug' => $slugs[$k]]),
+							'link' => $this->router->generate('rapsysblog_article_view', ['id' => $id, 'slug' => $slugs[$k]]),
 							//TODO: replace with keywords !!!
 							'keywords' => []
 						];
@@ -265,7 +265,7 @@ SQL;
 								$ret[$data['id']]['articles'][$id]['keywords'][$kid] = [
 									#'slug' => $slugs[$k],
 									'title' => $titles[$k],
-									'link' => $this->router->generate('rapsys_blog_keyword_view', ['id' => $kid, 'slug' => $slugs[$k]]),
+									'link' => $this->router->generate('rapsysblog_keyword_view', ['id' => $kid, 'slug' => $slugs[$k]]),
 								];
 							}
 						}
@@ -282,9 +282,9 @@ SQL;
 	 * Find user by id as array
 	 *
 	 * @param integer $id The user id
-	 * @return array The article array
+	 * @return ?array The article array
 	 */
-	public function findByIdAsArray(int $id): array {
+	public function findByIdAsArray(int $id): ?array {
 		//Set the request
 		$req = <<<SQL
 SELECT
@@ -401,10 +401,13 @@ SQL;
 			->addScalarResult('kt_titles', 'kt_titles', 'string');
 
 		//Get data
-		$data = $this->_em
+		if (($data = $this->_em
 			->createNativeQuery($req, $rsm)
 			->setParameter('id', $id)
-			->getOneOrNullResult();
+			->getOneOrNullResult()) === null) {
+			//Return null
+			return $data;
+		}
 
 		//Set return
 		$return = [
@@ -418,8 +421,8 @@ SQL;
 			'modified' => $data['modified'],
 			'civility' => $data['civility'],
 			'slug' => $data['slug'],
-			'link' => $this->router->generate('rapsys_blog_user_view', ['id' => $data['id'], 'slug' => $data['slug']]),
-			'edit' => $this->router->generate('rapsys_user_edit', ['mail' => $short = $this->slugger->short($data['mail']), 'hash' => $this->slugger->hash($short)]),
+			'link' => $this->router->generate('rapsysblog_user_view', ['id' => $data['id'], 'slug' => $data['slug']]),
+			'edit' => $this->router->generate('rapsysuser_edit', ['mail' => $short = $this->slugger->short($data['mail']), 'hash' => $this->slugger->hash($short)]),
 			'articles' => [],
 			'groups' => []
 		];
@@ -435,7 +438,7 @@ SQL;
 				$return['groups'][$id] = [
 					'title' => /*$group = */$this->translator->trans($titles[$k]),
 					#'slug' => $this->slugger->slug($group)
-					#'link' => $this->router->generate('rapsys_user_group_view', ['id' => $id, 'slug' => $this->slugger->short($group)])
+					#'link' => $this->router->generate('rapsysuser_group_view', ['id' => $id, 'slug' => $this->slugger->short($group)])
 				];
 			}
 		}
@@ -467,7 +470,7 @@ SQL;
 						'description' => $descriptions[$k],
 						#'slug' => $slugs[$k],
 						'title' => $titles[$k],
-						'link' => $this->router->generate('rapsys_blog_article_view', ['id' => $id, 'slug' => $slugs[$k]]),
+						'link' => $this->router->generate('rapsysblog_article_view', ['id' => $id, 'slug' => $slugs[$k]]),
 						//TODO: replace with keywords !!!
 						'keywords' => []
 					];
@@ -486,7 +489,7 @@ SQL;
 							$return['articles'][$id]['keywords'][$kid] = [
 								#'slug' => $slugs[$k],
 								'title' => $titles[$k],
-								'link' => $this->router->generate('rapsys_blog_keyword_view', ['id' => $kid, 'slug' => $slugs[$k]]),
+								'link' => $this->router->generate('rapsysblog_keyword_view', ['id' => $kid, 'slug' => $slugs[$k]]),
 							];
 						}
 					}