6 files changed, 19 insertions, 22 deletions

diff --git a/core/application.php b/core/application.php
index f44bb27..e32779a 100644
--- a/core/application.php
+++ b/core/application.php
@@ -169,10 +169,10 @@ if(Application::get('CORE.SEND_304') AND !defined('ADMINISTRATION')) {
 	$query = '(SELECT time_update FROM %s ORDER BY time_update DESC LIMIT 1) AS %s';
 
 	foreach([
-		ORM\Repositories\Category::getTableName(),
-		ORM\Repositories\Page::getTableName(),
-		ORM\Repositories\Post::getTableName(),
-		ORM\Repositories\User::getTableName()
+		ORM\Repositories\CategoryRepository::getTableName(),
+		ORM\Repositories\PageRepository::getTableName(),
+		ORM\Repositories\PostRepository::getTableName(),
+		ORM\Repositories\UserRepository::getTableName()
     ] as $table) {
 		$parts[] = sprintf($query, $table, $table);
 	}
diff --git a/core/namespace/Application.php b/core/namespace/Application.php
index 140baac..93361dd 100644
--- a/core/namespace/Application.php
+++ b/core/namespace/Application.php
@@ -102,10 +102,10 @@ class Application {
 	#===============================================================================
 	public static function getRepository(string $entity): ORM\Repository {
 		$identifier = strtolower($entity);
-		$repository = "ORM\Repositories\\$entity";
 
 		if(!isset(self::$repositories[$identifier])) {
-			$Repository = new $repository(self::getDatabase());
+			$className = sprintf('ORM\Repositories\%sRepository', $entity);
+			$Repository = new $className(self::getDatabase());
 			self::$repositories[$identifier] = $Repository;
 		}
 
diff --git a/core/namespace/ORM/Repositories/Category.php b/core/namespace/ORM/Repositories/CategoryRepository.php
index df32f69..b62485a 100644
--- a/core/namespace/ORM/Repositories/Category.php
+++ b/core/namespace/ORM/Repositories/CategoryRepository.php
@@ -2,18 +2,18 @@
 namespace ORM\Repositories;
 use ORM\Repository;
 use ORM\EntityInterface;
-use ORM\Entities\Category as CategoryEntity;
+use ORM\Entities\Category;
 
-class Category extends Repository {
+class CategoryRepository extends Repository {
 	public static function getTableName(): string { return 'category'; }
 	public static function getClassName(): string { return 'ORM\Entities\Category'; }
 
 	#===============================================================================
 	# Get number of *posts* assigned to $Category
 	#===============================================================================
-	public function getNumberOfPosts(CategoryEntity $Category): int {
+	public function getNumberOfPosts(Category $Category): int {
 		$query = 'SELECT COUNT(id) FROM %s WHERE category = ?';
-		$query = sprintf($query, Post::getTableName());
+		$query = sprintf($query, PostRepository::getTableName());
 
 		$Statement = $this->Database->prepare($query);
 		$Statement->execute([$Category->getID()]);
@@ -75,7 +75,7 @@ class Category extends Repository {
 	#===============================================================================
 	# Get number of children categories assigned to $Category
 	#===============================================================================
-	public function getNumberOfChildren(CategoryEntity $Category): int {
+	public function getNumberOfChildren(Category $Category): int {
 		$query = 'WITH RECURSIVE tree AS (
 			SELECT * FROM %s WHERE id = ? UNION
 			SELECT c.* FROM %s c, tree WHERE tree.id = c.parent
diff --git a/core/namespace/ORM/Repositories/Page.php b/core/namespace/ORM/Repositories/PageRepository.php
index 714605e..8c7c94b 100644
--- a/core/namespace/ORM/Repositories/Page.php
+++ b/core/namespace/ORM/Repositories/PageRepository.php
@@ -1,9 +1,8 @@
 <?php
 namespace ORM\Repositories;
 use ORM\Repository;
-use ORM\Entities\User;
 
-class Page extends Repository {
+class PageRepository extends Repository {
 	public static function getTableName(): string { return 'page'; }
 	public static function getClassName(): string { return 'ORM\Entities\Page'; }
 }
diff --git a/core/namespace/ORM/Repositories/Post.php b/core/namespace/ORM/Repositories/PostRepository.php
index 7f672e5..400d596 100644
--- a/core/namespace/ORM/Repositories/Post.php
+++ b/core/namespace/ORM/Repositories/PostRepository.php
@@ -1,10 +1,8 @@
 <?php
 namespace ORM\Repositories;
 use ORM\Repository;
-use ORM\Entities\User;
-use ORM\Entities\Category;
 
-class Post extends Repository {
+class PostRepository extends Repository {
 	public static function getTableName(): string { return 'post'; }
 	public static function getClassName(): string { return 'ORM\Entities\Post'; }
 }
diff --git a/core/namespace/ORM/Repositories/User.php b/core/namespace/ORM/Repositories/UserRepository.php
index ce3ff2c..a0e58c6 100644
--- a/core/namespace/ORM/Repositories/User.php
+++ b/core/namespace/ORM/Repositories/UserRepository.php
@@ -1,18 +1,18 @@
 <?php
 namespace ORM\Repositories;
 use ORM\Repository;
-use ORM\Entities\User as UserEntity;
+use ORM\Entities\User;
 
-class User extends Repository {
+class UserRepository extends Repository {
 	public static function getTableName(): string { return 'user'; }
 	public static function getClassName(): string { return 'ORM\Entities\User'; }
 
 	#===============================================================================
 	# Get number of *pages* assigned to $User
 	#===============================================================================
-	public function getNumberOfPages(UserEntity $User): int {
+	public function getNumberOfPages(User $User): int {
 		$query = 'SELECT COUNT(id) FROM %s WHERE user = ?';
-		$query = sprintf($query, Page::getTableName());
+		$query = sprintf($query, PageRepository::getTableName());
 
 		$Statement = $this->Database->prepare($query);
 		$Statement->execute([$User->getID()]);
@@ -23,9 +23,9 @@ class User extends Repository {
 	#===============================================================================
 	# Get number of *posts* assigned to $User
 	#===============================================================================
-	public function getNumberOfPosts(UserEntity $User): int {
+	public function getNumberOfPosts(User $User): int {
 		$query = 'SELECT COUNT(id) FROM %s WHERE user = ?';
-		$query = sprintf($query, Post::getTableName());
+		$query = sprintf($query, PostRepository::getTableName());
 
 		$Statement = $this->Database->prepare($query);
 		$Statement->execute([$User->getID()]);