From f3ad65ab9c6a5b2cc9d1fece9a6596aac685b4c3 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Sun, 9 Nov 2025 14:24:35 -0600 Subject: [PATCH 01/21] fixes duplicate method issue. --- src/Cms/Controllers/Auth/LoginController.php | 30 -------------------- 1 file changed, 30 deletions(-) diff --git a/src/Cms/Controllers/Auth/LoginController.php b/src/Cms/Controllers/Auth/LoginController.php index 4845bbd..d45d060 100644 --- a/src/Cms/Controllers/Auth/LoginController.php +++ b/src/Cms/Controllers/Auth/LoginController.php @@ -43,36 +43,6 @@ public function __construct( ?Application $app = null ) $this->_CsrfManager = new CsrfTokenManager( $this->_SessionManager ); } - /** - * Validate redirect URL to prevent open redirect vulnerabilities - * - * @param string $url The URL to validate - * @return bool True if the URL is safe to use - */ - private function isValidRedirectUrl( string $url ): bool - { - // Only allow relative URLs or same-origin absolute URLs - if( empty( $url ) ) - { - return false; - } - - // Reject URLs with schemes (http://, https://, javascript:, etc.) - if( preg_match( '#^[a-z][a-z0-9+.-]*:#i', $url ) ) - { - return false; - } - - // Reject protocol-relative URLs (//example.com) - if( str_starts_with( $url, '//' ) ) - { - return false; - } - - // Must start with / for internal path - return str_starts_with( $url, '/' ); - } - /** * Show login form */ From 379e30a4ebb6104db208810ba326d50b4b69e49d Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Mon, 10 Nov 2025 18:06:36 -0600 Subject: [PATCH 02/21] refactors for a more service like architecture. --- .../app/Initializers/AuthInitializer.php | 51 +-- .../Initializers/MaintenanceInitializer.php | 21 +- .../Initializers/PasswordResetInitializer.php | 59 +-- resources/public/index.php | 4 +- resources/views/admin/posts/edit.php | 2 +- resources/views/admin/posts/index.php | 4 +- resources/views/blog/category.php | 2 +- resources/views/blog/tag.php | 2 +- src/Bootstrap.php | 8 +- src/Cms/Auth/AuthManager.php | 152 +++---- src/Cms/Auth/CsrfTokenManager.php | 26 +- src/Cms/Auth/Filters/AuthenticationFilter.php | 42 +- src/Cms/Auth/Filters/CsrfFilter.php | 26 +- src/Cms/Auth/PasswordHasher.php | 102 ++--- src/Cms/Auth/PasswordResetManager.php | 146 +++--- src/Cms/Auth/SessionManager.php | 82 ++-- src/Cms/Auth/helpers.php | 22 +- .../Cli/Commands/Generate/EmailCommand.php | 16 +- .../Cli/Commands/Install/InstallCommand.php | 367 +++++++-------- .../Commands/Maintenance/EnableCommand.php | 16 +- src/Cms/Cli/Commands/Queue/InstallCommand.php | 22 +- src/Cms/Cli/Commands/User/CreateCommand.php | 129 ++---- src/Cms/Cli/Commands/User/DeleteCommand.php | 115 ++--- src/Cms/Cli/Commands/User/ListCommand.php | 116 ++--- .../Controllers/Admin/CategoryController.php | 211 +++++---- .../Controllers/Admin/DashboardController.php | 34 +- src/Cms/Controllers/Admin/PostController.php | 420 +++++++----------- .../Controllers/Admin/ProfileController.php | 102 ++--- src/Cms/Controllers/Admin/TagController.php | 201 ++++----- src/Cms/Controllers/Admin/UserController.php | 192 ++++---- src/Cms/Controllers/Auth/LoginController.php | 84 ++-- .../Auth/PasswordResetController.php | 138 +++--- src/Cms/Controllers/Blog.php | 278 +++++------- src/Cms/Controllers/Content.php | 82 ++-- src/Cms/Database/ConnectionFactory.php | 78 ++++ src/Cms/Email/helpers.php | 14 +- src/Cms/Maintenance/MaintenanceConfig.php | 36 +- src/Cms/Maintenance/MaintenanceFilter.php | 42 +- src/Cms/Maintenance/MaintenanceManager.php | 66 +-- src/Cms/Models/Category.php | 100 ++--- src/Cms/Models/PasswordResetToken.php | 94 ++-- src/Cms/Models/Post.php | 272 ++++++------ src/Cms/Models/Tag.php | 88 ++-- src/Cms/Models/User.php | 222 ++++----- .../DatabaseCategoryRepository.php | 135 +++--- .../DatabasePasswordResetTokenRepository.php | 89 ++-- .../Repositories/DatabasePostRepository.php | 322 +++++++------- .../Repositories/DatabaseTagRepository.php | 109 ++--- .../Repositories/DatabaseUserRepository.php | 181 ++++---- src/Cms/Repositories/ICategoryRepository.php | 20 +- .../IPasswordResetTokenRepository.php | 16 +- src/Cms/Repositories/IPostRepository.php | 64 +-- src/Cms/Repositories/ITagRepository.php | 12 +- src/Cms/Repositories/IUserRepository.php | 14 +- .../{EmailService.php => Email/Sender.php} | 116 ++--- src/Cms/Services/Post/Creator.php | 101 +++++ src/Cms/Services/Post/Deleter.php | 50 +++ src/Cms/Services/Post/Publisher.php | 95 ++++ src/Cms/Services/Post/Updater.php | 92 ++++ src/Cms/Services/Tag/Creator.php | 53 +++ src/Cms/Services/Tag/Resolver.php | 64 +++ tests/BootstrapTest.php | 116 ++--- tests/Cms/Auth/AuthManagerTest.php | 11 +- tests/Cms/BlogControllerTest.php | 94 ++-- tests/Cms/BlogTest.php | 318 ++++++------- .../Commands/Install/InstallCommandTest.php | 59 --- tests/Cms/ContentControllerTest.php | 136 +++--- .../Maintenance/MaintenanceCommandsTest.php | 120 ++--- .../Cms/Maintenance/MaintenanceConfigTest.php | 14 +- .../Cms/Maintenance/MaintenanceFilterTest.php | 56 +-- .../Maintenance/MaintenanceManagerTest.php | 110 ++--- .../DatabaseCategoryRepositoryTest.php | 2 +- .../DatabasePostRepositoryTest.php | 2 +- .../DatabaseTagRepositoryTest.php | 2 +- .../DatabaseUserRepositoryTest.php | 32 +- tests/Cms/Services/Post/CreatorTest.php | 306 +++++++++++++ tests/Cms/Services/Post/DeleterTest.php | 92 ++++ tests/Cms/Services/Post/PublisherTest.php | 199 +++++++++ tests/Cms/Services/Post/UpdaterTest.php | 288 ++++++++++++ tests/Cms/Services/Tag/CreatorTest.php | 143 ++++++ tests/Cms/Services/Tag/ResolverTest.php | 190 ++++++++ 81 files changed, 4659 insertions(+), 3450 deletions(-) create mode 100644 src/Cms/Database/ConnectionFactory.php rename src/Cms/Services/{EmailService.php => Email/Sender.php} (56%) create mode 100644 src/Cms/Services/Post/Creator.php create mode 100644 src/Cms/Services/Post/Deleter.php create mode 100644 src/Cms/Services/Post/Publisher.php create mode 100644 src/Cms/Services/Post/Updater.php create mode 100644 src/Cms/Services/Tag/Creator.php create mode 100644 src/Cms/Services/Tag/Resolver.php create mode 100644 tests/Cms/Services/Post/CreatorTest.php create mode 100644 tests/Cms/Services/Post/DeleterTest.php create mode 100644 tests/Cms/Services/Post/PublisherTest.php create mode 100644 tests/Cms/Services/Post/UpdaterTest.php create mode 100644 tests/Cms/Services/Tag/CreatorTest.php create mode 100644 tests/Cms/Services/Tag/ResolverTest.php diff --git a/resources/app/Initializers/AuthInitializer.php b/resources/app/Initializers/AuthInitializer.php index 3382f0e..a2085d5 100644 --- a/resources/app/Initializers/AuthInitializer.php +++ b/resources/app/Initializers/AuthInitializer.php @@ -20,58 +20,39 @@ class AuthInitializer implements IRunnable { /** * Run the initializer + * @param array $argv + * @return mixed + * @throws \Exception */ - public function run( array $Argv = [] ): mixed + public function run( array $argv = [] ): mixed { // Get Settings from Registry - $Settings = Registry::getInstance()->get( 'Settings' ); + $settings = Registry::getInstance()->get( 'Settings' ); - if( !$Settings || !$Settings instanceof \Neuron\Data\Setting\SettingManager ) + if( !$settings || !$settings instanceof \Neuron\Data\Setting\SettingManager ) { Log::error( "Settings not found in Registry, skipping auth initialization" ); return null; } // Get Application from Registry - $App = Registry::getInstance()->get( 'App' ); + $app = Registry::getInstance()->get( 'App' ); - if( !$App || !$App instanceof \Neuron\Mvc\Application ) + if( !$app || !$app instanceof \Neuron\Mvc\Application ) { Log::error( "Application not found in Registry, skipping auth initialization" ); return null; } - // Get database configuration - $dbConfig = []; + // Check if database is configured try { - $settingNames = $Settings->getSectionSettingNames( 'database' ); + $settingNames = $settings->getSectionSettingNames( 'database' ); if( !empty( $settingNames ) ) - { - foreach( $settingNames as $name ) - { - $value = $Settings->get( 'database', $name ); - if( $value !== null ) - { - // Convert string values to appropriate types - $dbConfig[$name] = ( $name === 'port' ) ? (int)$value : $value; - } - } - } - } - catch( \Exception $e ) - { - Log::error( "Failed to load database config: " . $e->getMessage() ); - } - - // Only register auth filter if database is configured - if( !empty( $dbConfig ) ) - { - try { // Initialize authentication components - $userRepository = new DatabaseUserRepository( $dbConfig ); + $userRepository = new DatabaseUserRepository( $settings ); $sessionManager = new SessionManager(); $passwordHasher = new PasswordHasher(); $authManager = new AuthManager( $userRepository, $sessionManager, $passwordHasher ); @@ -80,15 +61,15 @@ public function run( array $Argv = [] ): mixed $authFilter = new AuthenticationFilter( $authManager, '/login' ); // Register the auth filter with the Router - $App->getRouter()->registerFilter( 'auth', $authFilter ); + $app->getRouter()->registerFilter( 'auth', $authFilter ); // Store AuthManager in Registry for easy access Registry::getInstance()->set( 'AuthManager', $authManager ); } - catch( \Exception $e ) - { - Log::error( "Failed to register auth filter: " . $e->getMessage() ); - } + } + catch( \Exception $e ) + { + Log::error( "Failed to register auth filter: " . $e->getMessage() ); } return null; diff --git a/resources/app/Initializers/MaintenanceInitializer.php b/resources/app/Initializers/MaintenanceInitializer.php index c0bf599..fc44426 100644 --- a/resources/app/Initializers/MaintenanceInitializer.php +++ b/resources/app/Initializers/MaintenanceInitializer.php @@ -19,34 +19,37 @@ class MaintenanceInitializer implements IRunnable { /** * Run the initializer + * @param array $argv + * @return mixed + * @throws \Exception */ - public function run( array $Argv = [] ): mixed + public function run( array $argv = [] ): mixed { // Get Application from Registry - $App = Registry::getInstance()->get( 'App' ); + $app = Registry::getInstance()->get( 'App' ); - if( !$App || !$App instanceof \Neuron\Mvc\Application ) + if( !$app || !$app instanceof \Neuron\Mvc\Application ) { Log::error( "Application not found in Registry, skipping maintenance initialization" ); return null; } // Get base path for maintenance file (use application base path, not cwd) - $basePath = $App->getBasePath(); + $basePath = $app->getBasePath(); // Create maintenance manager $manager = new MaintenanceManager( $basePath ); // Get configuration (if available) $config = null; - $Settings = Registry::getInstance()->get( 'Settings' ); + $settings = Registry::getInstance()->get( 'Settings' ); - if( $Settings && $Settings instanceof \Neuron\Data\Setting\SettingManager ) + if( $settings && $settings instanceof \Neuron\Data\Setting\SettingManager ) { try { // Get the source from the SettingManager - $source = $Settings->getSource(); + $source = $settings->getSource(); $config = MaintenanceConfig::fromSettings( $source ); } catch( \Exception $e ) @@ -62,8 +65,8 @@ public function run( array $Argv = [] ): mixed ); // Register and apply filter globally to all routes - $App->getRouter()->registerFilter( 'maintenance', $filter ); - $App->getRouter()->addFilter( 'maintenance' ); + $app->getRouter()->registerFilter( 'maintenance', $filter ); + $app->getRouter()->addFilter( 'maintenance' ); // Store manager in registry for CLI commands Registry::getInstance()->set( 'maintenance.manager', $manager ); diff --git a/resources/app/Initializers/PasswordResetInitializer.php b/resources/app/Initializers/PasswordResetInitializer.php index ca8dfca..88a2245 100644 --- a/resources/app/Initializers/PasswordResetInitializer.php +++ b/resources/app/Initializers/PasswordResetInitializer.php @@ -20,61 +20,42 @@ class PasswordResetInitializer implements IRunnable { /** * Run the initializer + * @param array $argv + * @return mixed + * @throws \Exception */ - public function run( array $Argv = [] ): mixed + public function run( array $argv = [] ): mixed { // Get Settings from Registry - $Settings = Registry::getInstance()->get( 'Settings' ); + $settings = Registry::getInstance()->get( 'Settings' ); - if( !$Settings || !$Settings instanceof SettingManager ) + if( !$settings || !$settings instanceof SettingManager ) { Log::error( "Settings not found in Registry, skipping password reset initialization" ); return null; } - // Get database configuration - $dbConfig = []; + // Check if database is configured try { - $settingNames = $Settings->getSectionSettingNames( 'database' ); + $settingNames = $settings->getSectionSettingNames( 'database' ); if( !empty( $settingNames ) ) - { - foreach( $settingNames as $name ) - { - $value = $Settings->get( 'database', $name ); - if( $value !== null ) - { - // Convert string values to appropriate types - $dbConfig[$name] = ( $name === 'port' ) ? (int)$value : $value; - } - } - } - } - catch( \Exception $e ) - { - Log::error( "Failed to load database config: " . $e->getMessage() ); - } - - // Only initialize if database is configured - if( !empty( $dbConfig ) ) - { - try { // Get site configuration - $siteUrl = $Settings->get( 'site', 'url' ) ?? 'http://localhost:8000'; - $siteName = $Settings->get( 'site', 'name' ) ?? 'Neuron CMS'; + $siteUrl = $settings->get( 'site', 'url' ) ?? 'http://localhost:8000'; + $siteName = $settings->get( 'site', 'name' ) ?? 'Neuron CMS'; // Get email configuration (with fallbacks) - $fromEmail = $Settings->get( 'mail', 'from_email' ) ?? 'noreply@localhost'; - $fromName = $Settings->get( 'mail', 'from_name' ) ?? $siteName; + $fromEmail = $settings->get( 'mail', 'from_email' ) ?? 'noreply@localhost'; + $fromName = $settings->get( 'mail', 'from_name' ) ?? $siteName; // Get token expiration (default 60 minutes) - $tokenExpiration = $Settings->get( 'auth', 'password_reset_expiration' ) ?? 60; + $tokenExpiration = $settings->get( 'auth', 'password_reset_expiration' ) ?? 60; // Initialize components - $tokenRepository = new DatabasePasswordResetTokenRepository( $dbConfig ); - $userRepository = new DatabaseUserRepository( $dbConfig ); + $tokenRepository = new DatabasePasswordResetTokenRepository( $settings ); + $userRepository = new DatabaseUserRepository( $settings ); $passwordHasher = new PasswordHasher(); // Create password reset URL @@ -95,14 +76,12 @@ public function run( array $Argv = [] ): mixed // Store PasswordResetManager in Registry for easy access Registry::getInstance()->set( 'PasswordResetManager', $resetManager ); - - Log::debug( "Password reset system initialized" ); - } - catch( \Exception $e ) - { - Log::error( "Failed to initialize password reset: " . $e->getMessage() ); } } + catch( \Exception $e ) + { + Log::error( "Failed to initialize password reset: " . $e->getMessage() ); + } return null; } diff --git a/resources/public/index.php b/resources/public/index.php index cff61ef..446f0d5 100644 --- a/resources/public/index.php +++ b/resources/public/index.php @@ -11,6 +11,6 @@ error_reporting( E_ALL ); -$App = boot( '../config' ); +$app = boot( '../config' ); -dispatch( $App ); +dispatch( $app ); diff --git a/resources/views/admin/posts/edit.php b/resources/views/admin/posts/edit.php index eef90ac..5cb011a 100644 --- a/resources/views/admin/posts/edit.php +++ b/resources/views/admin/posts/edit.php @@ -23,7 +23,7 @@
- + Markdown supported
diff --git a/resources/views/admin/posts/index.php b/resources/views/admin/posts/index.php index 1e4e5a2..4ae4461 100644 --- a/resources/views/admin/posts/index.php +++ b/resources/views/admin/posts/index.php @@ -24,9 +24,9 @@ getId() ?> getTitle() ) ?> - getAuthor() ) ?> + getAuthor() ? htmlspecialchars( $post->getAuthor()->getUsername() ) : 'Unknown' ?> getStatus() ) ?> - getViews() ?> + getViewCount() ?> getCreatedAt() ? $post->getCreatedAt()->format( 'Y-m-d H:i' ) : 'N/A' ?> View diff --git a/resources/views/blog/category.php b/resources/views/blog/category.php index c9a4415..a46cfc5 100644 --- a/resources/views/blog/category.php +++ b/resources/views/blog/category.php @@ -23,7 +23,7 @@

- By getAuthor() ) ?> + By getAuthor() ? htmlspecialchars( $post->getAuthor()->getUsername() ) : 'Unknown' ?> on getCreatedAt() ? $post->getCreatedAt()->format( 'F j, Y' ) : '' ?>

diff --git a/resources/views/blog/tag.php b/resources/views/blog/tag.php index 1fea0e7..63b2321 100644 --- a/resources/views/blog/tag.php +++ b/resources/views/blog/tag.php @@ -20,7 +20,7 @@

- By getAuthor() ) ?> + By getAuthor() ? htmlspecialchars( $post->getAuthor()->getUsername() ) : 'Unknown' ?> on getCreatedAt() ? $post->getCreatedAt()->format( 'F j, Y' ) : '' ?>

diff --git a/src/Bootstrap.php b/src/Bootstrap.php index fc87151..eaf5a6e 100644 --- a/src/Bootstrap.php +++ b/src/Bootstrap.php @@ -21,18 +21,18 @@ /** * Bootstrap and initialize a Neuron CMS application. - * + * * This function initializes a complete CMS application with all necessary * components including routing, content management, blog functionality, * and site configuration. It delegates to the MVC boot function but * provides CMS-specific context and naming. * - * @param string $ConfigPath Path to the CMS configuration directory + * @param string $configPath Path to the CMS configuration directory * @return Application Fully configured CMS application instance * @throws \Exception If configuration loading or application initialization fails */ -function boot( string $ConfigPath ) : Application +function boot( string $configPath ) : Application { - return \Neuron\Mvc\boot( $ConfigPath ); + return \Neuron\Mvc\boot( $configPath ); } diff --git a/src/Cms/Auth/AuthManager.php b/src/Cms/Auth/AuthManager.php index 1dda54d..e51b647 100644 --- a/src/Cms/Auth/AuthManager.php +++ b/src/Cms/Auth/AuthManager.php @@ -16,80 +16,80 @@ */ class AuthManager { - private IUserRepository $_UserRepository; - private SessionManager $_SessionManager; - private PasswordHasher $_PasswordHasher; - private int $_MaxLoginAttempts = 5; - private int $_LockoutDuration = 15; // minutes + private IUserRepository $_userRepository; + private SessionManager $_sessionManager; + private PasswordHasher $_passwordHasher; + private int $_maxLoginAttempts = 5; + private int $_lockoutDuration = 15; // minutes public function __construct( - IUserRepository $UserRepository, - SessionManager $SessionManager, - PasswordHasher $PasswordHasher + IUserRepository $userRepository, + SessionManager $sessionManager, + PasswordHasher $passwordHasher ) { - $this->_UserRepository = $UserRepository; - $this->_SessionManager = $SessionManager; - $this->_PasswordHasher = $PasswordHasher; + $this->_userRepository = $userRepository; + $this->_sessionManager = $sessionManager; + $this->_passwordHasher = $passwordHasher; } /** * Attempt to authenticate a user */ - public function attempt( string $Username, string $Password, bool $Remember = false ): bool + public function attempt( string $username, string $password, bool $remember = false ): bool { - $User = $this->_UserRepository->findByUsername( $Username ); + $user = $this->_userRepository->findByUsername( $username ); - if( !$User ) + if( !$user ) { // Perform dummy hash to normalize timing - $this->_PasswordHasher->verify( $Password, '$2y$10$dummyhashtopreventtimingattack1234567890' ); + $this->_passwordHasher->verify( $password, '$2y$10$dummyhashtopreventtimingattack1234567890' ); return false; } // Check if account is locked - if( $User->isLockedOut() ) + if( $user->isLockedOut() ) { return false; } // Check if account is active - if( !$User->isActive() ) + if( !$user->isActive() ) { return false; } // Verify password - if( !$this->validateCredentials( $User, $Password ) ) + if( !$this->validateCredentials( $user, $password ) ) { // Increment failed login attempts - $User->incrementFailedLoginAttempts(); + $user->incrementFailedLoginAttempts(); // Lock account if too many failed attempts - if( $User->getFailedLoginAttempts() >= $this->_MaxLoginAttempts ) + if( $user->getFailedLoginAttempts() >= $this->_maxLoginAttempts ) { - $LockedUntil = (new DateTimeImmutable())->add( new DateInterval( "PT{$this->_LockoutDuration}M" ) ); - $User->setLockedUntil( $LockedUntil ); + $lockedUntil = (new DateTimeImmutable())->add( new DateInterval( "PT{$this->_lockoutDuration}M" ) ); + $user->setLockedUntil( $lockedUntil ); } - $this->_UserRepository->update( $User ); + $this->_userRepository->update( $user ); return false; } // Successful login - reset failed attempts - $User->resetFailedLoginAttempts(); - $User->setLastLoginAt( new DateTimeImmutable() ); + $user->resetFailedLoginAttempts(); + $user->setLastLoginAt( new DateTimeImmutable() ); // Check if password needs rehashing - if( $this->_PasswordHasher->needsRehash( $User->getPasswordHash() ) ) + if( $this->_passwordHasher->needsRehash( $user->getPasswordHash() ) ) { - $User->setPasswordHash( $this->_PasswordHasher->hash( $Password ) ); + $user->setPasswordHash( $this->_passwordHasher->hash( $password ) ); } - $this->_UserRepository->update( $User ); + $this->_userRepository->update( $user ); // Log the user in - $this->login( $User, $Remember ); + $this->login( $user, $remember ); return true; } @@ -97,19 +97,19 @@ public function attempt( string $Username, string $Password, bool $Remember = fa /** * Log a user in */ - public function login( User $User, bool $Remember = false ): void + public function login( User $user, bool $remember = false ): void { // Regenerate session ID to prevent session fixation - $this->_SessionManager->regenerate(); + $this->_sessionManager->regenerate(); // Store user ID in session - $this->_SessionManager->set( 'user_id', $User->getId() ); - $this->_SessionManager->set( 'user_role', $User->getRole() ); + $this->_sessionManager->set( 'user_id', $user->getId() ); + $this->_sessionManager->set( 'user_role', $user->getRole() ); // Handle remember me - if( $Remember ) + if( $remember ) { - $this->setRememberToken( $User ); + $this->setRememberToken( $user ); } } @@ -121,16 +121,16 @@ public function logout(): void // Clear remember token if exists if( $this->check() ) { - $User = $this->user(); - if( $User ) + $user = $this->user(); + if( $user ) { - $User->setRememberToken( null ); - $this->_UserRepository->update( $User ); + $user->setRememberToken( null ); + $this->_userRepository->update( $user ); } } // Destroy session - $this->_SessionManager->destroy(); + $this->_sessionManager->destroy(); // Delete remember me cookie if exists if( isset( $_COOKIE['remember_token'] ) ) @@ -145,7 +145,7 @@ public function logout(): void public function check(): bool { // Check session first - if( $this->_SessionManager->has( 'user_id' ) ) + if( $this->_sessionManager->has( 'user_id' ) ) { return true; } @@ -169,22 +169,22 @@ public function user(): ?User return null; } - $UserId = $this->_SessionManager->get( 'user_id' ); + $userId = $this->_sessionManager->get( 'user_id' ); - if( !$UserId ) + if( !$userId ) { return null; } - $User = $this->_UserRepository->findById( $UserId ); - - if( !$User ) + $user = $this->_userRepository->findById( $userId ); + + if( !$user ) { // Clear stale session if user no longer exists $this->logout(); } - - return $User; + + return $user; } /** @@ -196,37 +196,37 @@ public function id(): ?int { return null; } - - return $this->_SessionManager->get( 'user_id' ); + + return $this->_sessionManager->get( 'user_id' ); } /** * Validate user credentials */ - public function validateCredentials( User $User, string $Password ): bool + public function validateCredentials( User $user, string $password ): bool { - return $this->_PasswordHasher->verify( $Password, $User->getPasswordHash() ); + return $this->_passwordHasher->verify( $password, $user->getPasswordHash() ); } /** * Set remember me token for user */ - private function setRememberToken( User $User ): void + private function setRememberToken( User $user ): void { // Generate secure random token - $Token = bin2hex( random_bytes( 32 ) ); + $token = bin2hex( random_bytes( 32 ) ); // Hash the token before storing - $HashedToken = hash( 'sha256', $Token ); + $hashedToken = hash( 'sha256', $token ); // Store hashed token in user record - $User->setRememberToken( $HashedToken ); - $this->_UserRepository->update( $User ); + $user->setRememberToken( $hashedToken ); + $this->_userRepository->update( $user ); // Set cookie with plain token (30 days) setcookie( 'remember_token', - $Token, + $token, time() + (30 * 24 * 60 * 60), '/', '', @@ -238,20 +238,20 @@ private function setRememberToken( User $User ): void /** * Attempt to log in using remember token */ - public function loginUsingRememberToken( string $Token ): bool + public function loginUsingRememberToken( string $token ): bool { // Hash the token to compare with stored hash - $HashedToken = hash( 'sha256', $Token ); + $hashedToken = hash( 'sha256', $token ); - $User = $this->_UserRepository->findByRememberToken( $HashedToken ); + $user = $this->_userRepository->findByRememberToken( $hashedToken ); - if( !$User || !$User->isActive() ) + if( !$user || !$user->isActive() ) { return false; } // Log the user in - $this->login( $User, true ); + $this->login( $user, true ); return true; } @@ -259,28 +259,28 @@ public function loginUsingRememberToken( string $Token ): bool /** * Set maximum login attempts before lockout */ - public function setMaxLoginAttempts( int $MaxLoginAttempts ): self + public function setMaxLoginAttempts( int $maxLoginAttempts ): self { - $this->_MaxLoginAttempts = $MaxLoginAttempts; + $this->_maxLoginAttempts = $maxLoginAttempts; return $this; } /** * Set lockout duration in minutes */ - public function setLockoutDuration( int $LockoutDuration ): self + public function setLockoutDuration( int $lockoutDuration ): self { - $this->_LockoutDuration = $LockoutDuration; + $this->_lockoutDuration = $lockoutDuration; return $this; } /** * Check if user has a specific role */ - public function hasRole( string $Role ): bool + public function hasRole( string $role ): bool { - $User = $this->user(); - return $User && $User->getRole() === $Role; + $user = $this->user(); + return $user && $user->getRole() === $role; } /** @@ -296,13 +296,13 @@ public function isAdmin(): bool */ public function isEditorOrHigher(): bool { - $User = $this->user(); - if( !$User ) + $user = $this->user(); + if( !$user ) { return false; } - return in_array( $User->getRole(), [User::ROLE_ADMIN, User::ROLE_EDITOR] ); + return in_array( $user->getRole(), [User::ROLE_ADMIN, User::ROLE_EDITOR] ); } /** @@ -310,12 +310,12 @@ public function isEditorOrHigher(): bool */ public function isAuthorOrHigher(): bool { - $User = $this->user(); - if( !$User ) + $user = $this->user(); + if( !$user ) { return false; } - return in_array( $User->getRole(), [User::ROLE_ADMIN, User::ROLE_EDITOR, User::ROLE_AUTHOR] ); + return in_array( $user->getRole(), [User::ROLE_ADMIN, User::ROLE_EDITOR, User::ROLE_AUTHOR] ); } } diff --git a/src/Cms/Auth/CsrfTokenManager.php b/src/Cms/Auth/CsrfTokenManager.php index a525ae7..d16db0b 100644 --- a/src/Cms/Auth/CsrfTokenManager.php +++ b/src/Cms/Auth/CsrfTokenManager.php @@ -12,12 +12,12 @@ */ class CsrfTokenManager { - private SessionManager $_SessionManager; - private string $_TokenKey = 'csrf_token'; + private SessionManager $_sessionManager; + private string $_tokenKey = 'csrf_token'; - public function __construct( SessionManager $SessionManager ) + public function __construct( SessionManager $sessionManager ) { - $this->_SessionManager = $SessionManager; + $this->_sessionManager = $sessionManager; } /** @@ -25,9 +25,9 @@ public function __construct( SessionManager $SessionManager ) */ public function generate(): string { - $Token = bin2hex( random_bytes( 32 ) ); - $this->_SessionManager->set( $this->_TokenKey, $Token ); - return $Token; + $token = bin2hex( random_bytes( 32 ) ); + $this->_sessionManager->set( $this->_tokenKey, $token ); + return $token; } /** @@ -35,28 +35,28 @@ public function generate(): string */ public function getToken(): string { - if( !$this->_SessionManager->has( $this->_TokenKey ) ) + if( !$this->_sessionManager->has( $this->_tokenKey ) ) { return $this->generate(); } - return $this->_SessionManager->get( $this->_TokenKey ); + return $this->_sessionManager->get( $this->_tokenKey ); } /** * Validate a CSRF token */ - public function validate( string $Token ): bool + public function validate( string $token ): bool { - $StoredToken = $this->_SessionManager->get( $this->_TokenKey ); + $storedToken = $this->_sessionManager->get( $this->_tokenKey ); - if( !$StoredToken ) + if( !$storedToken ) { return false; } // Use hash_equals to prevent timing attacks - return hash_equals( $StoredToken, $Token ); + return hash_equals( $storedToken, $token ); } /** diff --git a/src/Cms/Auth/Filters/AuthenticationFilter.php b/src/Cms/Auth/Filters/AuthenticationFilter.php index 76a7025..df21001 100644 --- a/src/Cms/Auth/Filters/AuthenticationFilter.php +++ b/src/Cms/Auth/Filters/AuthenticationFilter.php @@ -17,17 +17,17 @@ */ class AuthenticationFilter extends Filter { - private AuthManager $_AuthManager; - private string $_LoginUrl = '/login'; - private string $_RedirectParam = 'redirect'; + private AuthManager $_authManager; + private string $_loginUrl = '/login'; + private string $_redirectParam = 'redirect'; - public function __construct( AuthManager $AuthManager, string $LoginUrl = '/login' ) + public function __construct( AuthManager $authManager, string $loginUrl = '/login' ) { - $this->_AuthManager = $AuthManager; - $this->_LoginUrl = $LoginUrl; + $this->_authManager = $authManager; + $this->_loginUrl = $loginUrl; parent::__construct( - function( RouteMap $Route ) { $this->checkAuthentication( $Route ); }, + function( RouteMap $route ) { $this->checkAuthentication( $route ); }, null ); } @@ -35,38 +35,38 @@ function( RouteMap $Route ) { $this->checkAuthentication( $Route ); }, /** * Check if user is authenticated */ - protected function checkAuthentication( RouteMap $Route ): void + protected function checkAuthentication( RouteMap $route ): void { - if( !$this->_AuthManager->check() ) + if( !$this->_authManager->check() ) { // Store intended URL for post-login redirect - $IntendedUrl = $_SERVER['REQUEST_URI'] ?? $Route->getPath(); + $intendedUrl = $_SERVER['REQUEST_URI'] ?? $route->getPath(); // Redirect to login page - $separator = ( strpos( $this->_LoginUrl, '?' ) === false ) ? '?' : '&'; - $query = http_build_query( [ $this->_RedirectParam => $IntendedUrl ] ); - $RedirectUrl = $this->_LoginUrl . $separator . $query; + $separator = ( strpos( $this->_loginUrl, '?' ) === false ) ? '?' : '&'; + $query = http_build_query( [ $this->_redirectParam => $intendedUrl ] ); + $redirectUrl = $this->_loginUrl . $separator . $query; - header( 'Location: ' . $RedirectUrl ); + header( 'Location: ' . $redirectUrl ); exit; } // Store authenticated user in Registry for easy access - $User = $this->_AuthManager->user(); - if( $User ) + $user = $this->_authManager->user(); + if( $user ) { - Registry::getInstance()->set( 'Auth.User', $User ); - Registry::getInstance()->set( 'Auth.UserId', $User->getId() ); - Registry::getInstance()->set( 'Auth.UserRole', $User->getRole() ); + Registry::getInstance()->set( 'Auth.User', $user ); + Registry::getInstance()->set( 'Auth.UserId', $user->getId() ); + Registry::getInstance()->set( 'Auth.UserRole', $user->getRole() ); } } /** * Set login URL */ - public function setLoginUrl( string $LoginUrl ): self + public function setLoginUrl( string $loginUrl ): self { - $this->_LoginUrl = $LoginUrl; + $this->_loginUrl = $loginUrl; return $this; } } diff --git a/src/Cms/Auth/Filters/CsrfFilter.php b/src/Cms/Auth/Filters/CsrfFilter.php index 39fea9c..5052ce9 100644 --- a/src/Cms/Auth/Filters/CsrfFilter.php +++ b/src/Cms/Auth/Filters/CsrfFilter.php @@ -17,15 +17,15 @@ */ class CsrfFilter extends Filter { - private CsrfTokenManager $_CsrfManager; - private array $_ExemptMethods = ['GET', 'HEAD', 'OPTIONS']; + private CsrfTokenManager $_csrfManager; + private array $_exemptMethods = ['GET', 'HEAD', 'OPTIONS']; - public function __construct( CsrfTokenManager $CsrfManager ) + public function __construct( CsrfTokenManager $csrfManager ) { - $this->_CsrfManager = $CsrfManager; + $this->_csrfManager = $csrfManager; parent::__construct( - function( RouteMap $Route ) { $this->validateCsrfToken( $Route ); }, + function( RouteMap $route ) { $this->validateCsrfToken( $route ); }, null ); } @@ -33,27 +33,27 @@ function( RouteMap $Route ) { $this->validateCsrfToken( $Route ); }, /** * Validate CSRF token */ - protected function validateCsrfToken( RouteMap $Route ): void + protected function validateCsrfToken( RouteMap $route ): void { - $Method = $_SERVER['REQUEST_METHOD'] ?? 'GET'; + $method = $_SERVER['REQUEST_METHOD'] ?? 'GET'; // Skip validation for safe methods - if( in_array( strtoupper( $Method ), $this->_ExemptMethods ) ) + if( in_array( strtoupper( $method ), $this->_exemptMethods ) ) { return; } // Get token from request - $Token = $this->getTokenFromRequest(); + $token = $this->getTokenFromRequest(); - if( !$Token ) + if( !$token ) { Log::warning( 'CSRF token missing from request' ); $this->respondForbidden( 'CSRF token missing' ); } // Validate token - if( !$this->_CsrfManager->validate( $Token ) ) + if( !$this->_csrfManager->validate( $token ) ) { Log::warning( 'Invalid CSRF token' ); $this->respondForbidden( 'Invalid CSRF token' ); @@ -83,11 +83,11 @@ private function getTokenFromRequest(): ?string /** * Respond with 403 Forbidden */ - private function respondForbidden( string $Message ): void + private function respondForbidden( string $message ): void { http_response_code( 403 ); echo '

403 Forbidden

'; - echo '

' . htmlspecialchars( $Message ) . '

'; + echo '

' . htmlspecialchars( $message ) . '

'; exit; } } diff --git a/src/Cms/Auth/PasswordHasher.php b/src/Cms/Auth/PasswordHasher.php index b48baa8..1b0b17f 100644 --- a/src/Cms/Auth/PasswordHasher.php +++ b/src/Cms/Auth/PasswordHasher.php @@ -12,72 +12,72 @@ */ class PasswordHasher { - private int $_MinLength = 8; - private bool $_RequireUppercase = true; - private bool $_RequireLowercase = true; - private bool $_RequireNumbers = true; - private bool $_RequireSpecialChars = false; + private int $_minLength = 8; + private bool $_requireUppercase = true; + private bool $_requireLowercase = true; + private bool $_requireNumbers = true; + private bool $_requireSpecialChars = false; /** * Hash a password using Argon2id or Bcrypt */ - public function hash( string $Password ): string + public function hash( string $password ): string { // Use Argon2id if available, otherwise fall back to Bcrypt $algorithm = defined( 'PASSWORD_ARGON2ID' ) ? PASSWORD_ARGON2ID : PASSWORD_BCRYPT; - return password_hash( $Password, $algorithm ); + return password_hash( $password, $algorithm ); } /** * Verify a password against a hash */ - public function verify( string $Password, string $Hash ): bool + public function verify( string $password, string $hash ): bool { - return password_verify( $Password, $Hash ); + return password_verify( $password, $hash ); } /** * Check if a hash needs to be rehashed (algorithm upgrade) */ - public function needsRehash( string $Hash ): bool + public function needsRehash( string $hash ): bool { $algorithm = defined( 'PASSWORD_ARGON2ID' ) ? PASSWORD_ARGON2ID : PASSWORD_BCRYPT; - return password_needs_rehash( $Hash, $algorithm ); + return password_needs_rehash( $hash, $algorithm ); } /** * Check if password meets strength requirements */ - public function meetsRequirements( string $Password ): bool + public function meetsRequirements( string $password ): bool { // Check minimum length - if( strlen( $Password ) < $this->_MinLength ) + if( strlen( $password ) < $this->_minLength ) { return false; } // Check for uppercase letters - if( $this->_RequireUppercase && !preg_match( '/[A-Z]/', $Password ) ) + if( $this->_requireUppercase && !preg_match( '/[A-Z]/', $password ) ) { return false; } // Check for lowercase letters - if( $this->_RequireLowercase && !preg_match( '/[a-z]/', $Password ) ) + if( $this->_requireLowercase && !preg_match( '/[a-z]/', $password ) ) { return false; } // Check for numbers - if( $this->_RequireNumbers && !preg_match( '/[0-9]/', $Password ) ) + if( $this->_requireNumbers && !preg_match( '/[0-9]/', $password ) ) { return false; } // Check for special characters - if( $this->_RequireSpecialChars && !preg_match( '/[^A-Za-z0-9]/', $Password ) ) + if( $this->_requireSpecialChars && !preg_match( '/[^A-Za-z0-9]/', $password ) ) { return false; } @@ -88,111 +88,111 @@ public function meetsRequirements( string $Password ): bool /** * Get password validation error messages */ - public function getValidationErrors( string $Password ): array + public function getValidationErrors( string $password ): array { - $Errors = []; + $errors = []; - if( strlen( $Password ) < $this->_MinLength ) + if( strlen( $password ) < $this->_minLength ) { - $Errors[] = "Password must be at least {$this->_MinLength} characters long"; + $errors[] = "Password must be at least {$this->_minLength} characters long"; } - if( $this->_RequireUppercase && !preg_match( '/[A-Z]/', $Password ) ) + if( $this->_requireUppercase && !preg_match( '/[A-Z]/', $password ) ) { - $Errors[] = 'Password must contain at least one uppercase letter'; + $errors[] = 'Password must contain at least one uppercase letter'; } - if( $this->_RequireLowercase && !preg_match( '/[a-z]/', $Password ) ) + if( $this->_requireLowercase && !preg_match( '/[a-z]/', $password ) ) { - $Errors[] = 'Password must contain at least one lowercase letter'; + $errors[] = 'Password must contain at least one lowercase letter'; } - if( $this->_RequireNumbers && !preg_match( '/[0-9]/', $Password ) ) + if( $this->_requireNumbers && !preg_match( '/[0-9]/', $password ) ) { - $Errors[] = 'Password must contain at least one number'; + $errors[] = 'Password must contain at least one number'; } - if( $this->_RequireSpecialChars && !preg_match( '/[^A-Za-z0-9]/', $Password ) ) + if( $this->_requireSpecialChars && !preg_match( '/[^A-Za-z0-9]/', $password ) ) { - $Errors[] = 'Password must contain at least one special character'; + $errors[] = 'Password must contain at least one special character'; } - return $Errors; + return $errors; } /** * Set minimum password length */ - public function setMinLength( int $MinLength ): self + public function setMinLength( int $minLength ): self { - $this->_MinLength = $MinLength; + $this->_minLength = $minLength; return $this; } /** * Set whether uppercase letters are required */ - public function setRequireUppercase( bool $RequireUppercase ): self + public function setRequireUppercase( bool $requireUppercase ): self { - $this->_RequireUppercase = $RequireUppercase; + $this->_requireUppercase = $requireUppercase; return $this; } /** * Set whether lowercase letters are required */ - public function setRequireLowercase( bool $RequireLowercase ): self + public function setRequireLowercase( bool $requireLowercase ): self { - $this->_RequireLowercase = $RequireLowercase; + $this->_requireLowercase = $requireLowercase; return $this; } /** * Set whether numbers are required */ - public function setRequireNumbers( bool $RequireNumbers ): self + public function setRequireNumbers( bool $requireNumbers ): self { - $this->_RequireNumbers = $RequireNumbers; + $this->_requireNumbers = $requireNumbers; return $this; } /** * Set whether special characters are required */ - public function setRequireSpecialChars( bool $RequireSpecialChars ): self + public function setRequireSpecialChars( bool $requireSpecialChars ): self { - $this->_RequireSpecialChars = $RequireSpecialChars; + $this->_requireSpecialChars = $requireSpecialChars; return $this; } /** * Configure password requirements from settings */ - public function configure( array $Settings ): self + public function configure( array $settings ): self { - if( isset( $Settings['min_length'] ) ) + if( isset( $settings['min_length'] ) ) { - $this->setMinLength( $Settings['min_length'] ); + $this->setMinLength( $settings['min_length'] ); } - if( isset( $Settings['require_uppercase'] ) ) + if( isset( $settings['require_uppercase'] ) ) { - $this->setRequireUppercase( $Settings['require_uppercase'] ); + $this->setRequireUppercase( $settings['require_uppercase'] ); } - if( isset( $Settings['require_lowercase'] ) ) + if( isset( $settings['require_lowercase'] ) ) { - $this->setRequireLowercase( $Settings['require_lowercase'] ); + $this->setRequireLowercase( $settings['require_lowercase'] ); } - if( isset( $Settings['require_numbers'] ) ) + if( isset( $settings['require_numbers'] ) ) { - $this->setRequireNumbers( $Settings['require_numbers'] ); + $this->setRequireNumbers( $settings['require_numbers'] ); } - if( isset( $Settings['require_special_chars'] ) ) + if( isset( $settings['require_special_chars'] ) ) { - $this->setRequireSpecialChars( $Settings['require_special_chars'] ); + $this->setRequireSpecialChars( $settings['require_special_chars'] ); } return $this; diff --git a/src/Cms/Auth/PasswordResetManager.php b/src/Cms/Auth/PasswordResetManager.php index 1b37ca9..113dc80 100644 --- a/src/Cms/Auth/PasswordResetManager.php +++ b/src/Cms/Auth/PasswordResetManager.php @@ -17,47 +17,47 @@ */ class PasswordResetManager { - private IPasswordResetTokenRepository $_TokenRepository; - private IUserRepository $_UserRepository; - private PasswordHasher $_PasswordHasher; - private string $_ResetUrl; - private string $_FromEmail; - private string $_FromName; - private int $_TokenExpirationMinutes = 60; + private IPasswordResetTokenRepository $_tokenRepository; + private IUserRepository $_userRepository; + private PasswordHasher $_passwordHasher; + private string $_resetUrl; + private string $_fromEmail; + private string $_fromName; + private int $_tokenExpirationMinutes = 60; /** * Constructor * - * @param IPasswordResetTokenRepository $TokenRepository Token repository - * @param IUserRepository $UserRepository User repository - * @param PasswordHasher $PasswordHasher Password hasher - * @param string $ResetUrl Base URL for password reset (token will be appended) - * @param string $FromEmail Email address to send from - * @param string $FromName Name to send from + * @param IPasswordResetTokenRepository $tokenRepository Token repository + * @param IUserRepository $userRepository User repository + * @param PasswordHasher $passwordHasher Password hasher + * @param string $resetUrl Base URL for password reset (token will be appended) + * @param string $fromEmail Email address to send from + * @param string $fromName Name to send from */ public function __construct( - IPasswordResetTokenRepository $TokenRepository, - IUserRepository $UserRepository, - PasswordHasher $PasswordHasher, - string $ResetUrl, - string $FromEmail, - string $FromName = 'System' + IPasswordResetTokenRepository $tokenRepository, + IUserRepository $userRepository, + PasswordHasher $passwordHasher, + string $resetUrl, + string $fromEmail, + string $fromName = 'System' ) { - $this->_TokenRepository = $TokenRepository; - $this->_UserRepository = $UserRepository; - $this->_PasswordHasher = $PasswordHasher; - $this->_ResetUrl = $ResetUrl; - $this->_FromEmail = $FromEmail; - $this->_FromName = $FromName; + $this->_tokenRepository = $tokenRepository; + $this->_userRepository = $userRepository; + $this->_passwordHasher = $passwordHasher; + $this->_resetUrl = $resetUrl; + $this->_fromEmail = $fromEmail; + $this->_fromName = $fromName; } /** * Set token expiration time in minutes */ - public function setTokenExpirationMinutes( int $Minutes ): self + public function setTokenExpirationMinutes( int $minutes ): self { - $this->_TokenExpirationMinutes = $Minutes; + $this->_tokenExpirationMinutes = $minutes; return $this; } @@ -66,39 +66,39 @@ public function setTokenExpirationMinutes( int $Minutes ): self * * Generates a secure token, stores it, and sends an email to the user. * - * @param string $Email User's email address + * @param string $email User's email address * @return bool True if reset email was sent, false if user not found * @throws Exception if email sending fails */ - public function requestReset( string $Email ): bool + public function requestReset( string $email ): bool { // Check if user exists - $User = $this->_UserRepository->findByEmail( $Email ); + $user = $this->_userRepository->findByEmail( $email ); - if( !$User ) + if( !$user ) { // Don't reveal whether email exists in system return true; } // Delete any existing tokens for this email - $this->_TokenRepository->deleteByEmail( $Email ); + $this->_tokenRepository->deleteByEmail( $email ); // Generate secure random token - $PlainToken = bin2hex( random_bytes( 32 ) ); - $HashedToken = hash( 'sha256', $PlainToken ); + $plainToken = bin2hex( random_bytes( 32 ) ); + $hashedToken = hash( 'sha256', $plainToken ); // Create and store token - $Token = new PasswordResetToken( - $Email, - $HashedToken, - $this->_TokenExpirationMinutes + $token = new PasswordResetToken( + $email, + $hashedToken, + $this->_tokenExpirationMinutes ); - $this->_TokenRepository->create( $Token ); + $this->_tokenRepository->create( $token ); // Send reset email - $this->sendResetEmail( $Email, $PlainToken ); + $this->sendResetEmail( $email, $plainToken ); return true; } @@ -106,62 +106,62 @@ public function requestReset( string $Email ): bool /** * Validate a reset token * - * @param string $PlainToken Plain text token from URL + * @param string $plainToken Plain text token from URL * @return PasswordResetToken|null Token if valid and not expired, null otherwise */ - public function validateToken( string $PlainToken ): ?PasswordResetToken + public function validateToken( string $plainToken ): ?PasswordResetToken { - $HashedToken = hash( 'sha256', $PlainToken ); + $hashedToken = hash( 'sha256', $plainToken ); - $Token = $this->_TokenRepository->findByToken( $HashedToken ); + $token = $this->_tokenRepository->findByToken( $hashedToken ); - if( !$Token || $Token->isExpired() ) + if( !$token || $token->isExpired() ) { return null; } - return $Token; + return $token; } /** * Reset password using a valid token * - * @param string $PlainToken Plain text token from URL - * @param string $NewPassword New password to set + * @param string $plainToken Plain text token from URL + * @param string $newPassword New password to set * @return bool True if password was reset, false if token invalid or expired * @throws Exception if password doesn't meet requirements or update fails */ - public function resetPassword( string $PlainToken, string $NewPassword ): bool + public function resetPassword( string $plainToken, string $newPassword ): bool { // Validate token - $Token = $this->validateToken( $PlainToken ); + $token = $this->validateToken( $plainToken ); - if( !$Token ) + if( !$token ) { return false; } // Validate new password - if( !$this->_PasswordHasher->meetsRequirements( $NewPassword ) ) + if( !$this->_passwordHasher->meetsRequirements( $newPassword ) ) { - $Errors = $this->_PasswordHasher->getValidationErrors( $NewPassword ); - throw new Exception( implode( ', ', $Errors ) ); + $errors = $this->_passwordHasher->getValidationErrors( $newPassword ); + throw new Exception( implode( ', ', $errors ) ); } // Find user - $User = $this->_UserRepository->findByEmail( $Token->getEmail() ); + $user = $this->_userRepository->findByEmail( $token->getEmail() ); - if( !$User ) + if( !$user ) { return false; } // Update password - $User->setPasswordHash( $this->_PasswordHasher->hash( $NewPassword ) ); - $this->_UserRepository->update( $User ); + $user->setPasswordHash( $this->_passwordHasher->hash( $newPassword ) ); + $this->_userRepository->update( $user ); // Delete the token - $this->_TokenRepository->deleteByToken( hash( 'sha256', $PlainToken ) ); + $this->_tokenRepository->deleteByToken( hash( 'sha256', $plainToken ) ); return true; } @@ -173,23 +173,23 @@ public function resetPassword( string $PlainToken, string $NewPassword ): bool */ public function cleanupExpiredTokens(): int { - return $this->_TokenRepository->deleteExpired(); + return $this->_tokenRepository->deleteExpired(); } /** * Send password reset email * - * @param string $Email Recipient email - * @param string $PlainToken Plain text token to include in URL + * @param string $email Recipient email + * @param string $plainToken Plain text token to include in URL * @throws Exception if email sending fails */ - private function sendResetEmail( string $Email, string $PlainToken ): void + private function sendResetEmail( string $email, string $plainToken ): void { - $ResetLink = $this->_ResetUrl . '?token=' . urlencode( $PlainToken ); + $resetLink = $this->_resetUrl . '?token=' . urlencode( $plainToken ); - $Subject = 'Password Reset Request'; + $subject = 'Password Reset Request'; - $Body = << @@ -210,10 +210,10 @@ private function sendResetEmail( string $Email, string $PlainToken ): void

You have requested to reset your password. Click the button below to proceed:

- Reset Password + Reset Password

Or copy and paste this link into your browser:

-

{$ResetLink}

-

This link will expire in {$this->_TokenExpirationMinutes} minutes.

+

{$resetLink}

+

This link will expire in {$this->_tokenExpirationMinutes} minutes.

If you did not request a password reset, please ignore this email.

@@ -226,10 +226,10 @@ private function sendResetEmail( string $Email, string $PlainToken ): void $mail = new Email(); $mail->setType( Email::EMAIL_HTML ); - $mail->setFrom( "{$this->_FromName} <{$this->_FromEmail}>" ); - $mail->addTo( $Email ); - $mail->setSubject( $Subject ); - $mail->setBody( $Body ); + $mail->setFrom( "{$this->_fromName} <{$this->_fromEmail}>" ); + $mail->addTo( $email ); + $mail->setSubject( $subject ); + $mail->setBody( $body ); if( !$mail->send() ) { diff --git a/src/Cms/Auth/SessionManager.php b/src/Cms/Auth/SessionManager.php index b39a3fb..6b2a249 100644 --- a/src/Cms/Auth/SessionManager.php +++ b/src/Cms/Auth/SessionManager.php @@ -12,18 +12,18 @@ */ class SessionManager { - private bool $_Started = false; - private array $_Config = []; + private bool $_started = false; + private array $_config = []; - public function __construct( array $Config = [] ) + public function __construct( array $config = [] ) { - $this->_Config = array_merge([ + $this->_config = array_merge([ 'lifetime' => 7200, // 2 hours 'cookie_httponly' => true, 'cookie_secure' => true, // HTTPS only 'cookie_samesite' => 'Lax', 'use_strict_mode' => true - ], $Config); + ], $config); } /** @@ -31,36 +31,36 @@ public function __construct( array $Config = [] ) */ public function start(): void { - if( $this->_Started || session_status() === PHP_SESSION_ACTIVE ) + if( $this->_started || session_status() === PHP_SESSION_ACTIVE ) { return; } // Configure session security - ini_set( 'session.cookie_httponly', $this->_Config['cookie_httponly'] ? '1' : '0' ); - ini_set( 'session.cookie_secure', $this->_Config['cookie_secure'] ? '1' : '0' ); - ini_set( 'session.cookie_samesite', $this->_Config['cookie_samesite'] ); - ini_set( 'session.use_strict_mode', $this->_Config['use_strict_mode'] ? '1' : '0' ); + ini_set( 'session.cookie_httponly', $this->_config['cookie_httponly'] ? '1' : '0' ); + ini_set( 'session.cookie_secure', $this->_config['cookie_secure'] ? '1' : '0' ); + ini_set( 'session.cookie_samesite', $this->_config['cookie_samesite'] ); + ini_set( 'session.use_strict_mode', $this->_config['use_strict_mode'] ? '1' : '0' ); session_set_cookie_params([ - 'lifetime' => $this->_Config['lifetime'], + 'lifetime' => $this->_config['lifetime'], 'path' => '/', - 'secure' => $this->_Config['cookie_secure'], - 'httponly' => $this->_Config['cookie_httponly'], - 'samesite' => $this->_Config['cookie_samesite'] + 'secure' => $this->_config['cookie_secure'], + 'httponly' => $this->_config['cookie_httponly'], + 'samesite' => $this->_config['cookie_samesite'] ]); session_start(); - $this->_Started = true; + $this->_started = true; } /** * Regenerate session ID (prevent session fixation) */ - public function regenerate( bool $DeleteOldSession = true ): bool + public function regenerate( bool $deleteOldSession = true ): bool { $this->start(); - return session_regenerate_id( $DeleteOldSession ); + return session_regenerate_id( $deleteOldSession ); } /** @@ -75,15 +75,15 @@ public function destroy(): bool // Delete session cookie if( isset( $_COOKIE[session_name()] ) ) { - $Params = session_get_cookie_params(); + $params = session_get_cookie_params(); setcookie( session_name(), '', time() - 42000, - $Params['path'], - $Params['domain'], - $Params['secure'], - $Params['httponly'] + $params['path'], + $params['domain'], + $params['secure'], + $params['httponly'] ); } @@ -93,66 +93,66 @@ public function destroy(): bool /** * Set a session value */ - public function set( string $Key, mixed $Value ): void + public function set( string $key, mixed $value ): void { $this->start(); - $_SESSION[ $Key ] = $Value; + $_SESSION[ $key ] = $value; } /** * Get a session value */ - public function get( string $Key, mixed $Default = null ): mixed + public function get( string $key, mixed $default = null ): mixed { $this->start(); - return $_SESSION[ $Key ] ?? $Default; + return $_SESSION[ $key ] ?? $default; } /** * Check if session has a key */ - public function has( string $Key ): bool + public function has( string $key ): bool { $this->start(); - return isset( $_SESSION[ $Key ] ); + return isset( $_SESSION[ $key ] ); } /** * Remove a session value */ - public function remove( string $Key ): void + public function remove( string $key ): void { $this->start(); - unset( $_SESSION[ $Key ] ); + unset( $_SESSION[ $key ] ); } /** * Set a flash message (available for next request only) */ - public function flash( string $Key, mixed $Value ): void + public function flash( string $key, mixed $value ): void { $this->start(); - $_SESSION['_flash'][ $Key ] = $Value; + $_SESSION['_flash'][ $key ] = $value; } /** * Get a flash message */ - public function getFlash( string $Key, mixed $Default = null ): mixed + public function getFlash( string $key, mixed $default = null ): mixed { $this->start(); - $Value = $_SESSION['_flash'][ $Key ] ?? $Default; - unset( $_SESSION['_flash'][ $Key ] ); - return $Value; + $value = $_SESSION['_flash'][ $key ] ?? $default; + unset( $_SESSION['_flash'][ $key ] ); + return $value; } /** * Check if flash message exists */ - public function hasFlash( string $Key ): bool + public function hasFlash( string $key ): bool { $this->start(); - return isset( $_SESSION['_flash'][ $Key ] ); + return isset( $_SESSION['_flash'][ $key ] ); } /** @@ -161,9 +161,9 @@ public function hasFlash( string $Key ): bool public function getAllFlash(): array { $this->start(); - $Flash = $_SESSION['_flash'] ?? []; + $flash = $_SESSION['_flash'] ?? []; unset( $_SESSION['_flash'] ); - return $Flash; + return $flash; } /** @@ -180,6 +180,6 @@ public function getId(): string */ public function isStarted(): bool { - return $this->_Started || session_status() === PHP_SESSION_ACTIVE; + return $this->_started || session_status() === PHP_SESSION_ACTIVE; } } diff --git a/src/Cms/Auth/helpers.php b/src/Cms/Auth/helpers.php index 0422482..c6d76f2 100644 --- a/src/Cms/Auth/helpers.php +++ b/src/Cms/Auth/helpers.php @@ -67,8 +67,8 @@ function is_guest(): bool */ function is_admin(): bool { - $User = auth(); - return $User && $User->isAdmin(); + $user = auth(); + return $user && $user->isAdmin(); } } @@ -78,8 +78,8 @@ function is_admin(): bool */ function is_editor(): bool { - $User = auth(); - return $User && $User->isEditor(); + $user = auth(); + return $user && $user->isEditor(); } } @@ -89,8 +89,8 @@ function is_editor(): bool */ function is_author(): bool { - $User = auth(); - return $User && $User->isAuthor(); + $user = auth(); + return $user && $user->isAuthor(); } } @@ -98,10 +98,10 @@ function is_author(): bool /** * Check if user has a specific role */ - function has_role(string $Role): bool + function has_role(string $role): bool { - $User = auth(); - return $User && $User->getRole() === $Role; + $user = auth(); + return $user && $user->getRole() === $role; } } @@ -121,7 +121,7 @@ function csrf_token(): string */ function csrf_field(): string { - $Token = csrf_token(); - return ''; + $token = csrf_token(); + return ''; } } diff --git a/src/Cms/Cli/Commands/Generate/EmailCommand.php b/src/Cms/Cli/Commands/Generate/EmailCommand.php index c5382e0..4f5fd5a 100644 --- a/src/Cms/Cli/Commands/Generate/EmailCommand.php +++ b/src/Cms/Cli/Commands/Generate/EmailCommand.php @@ -9,13 +9,13 @@ */ class EmailCommand extends Command { - private string $_ProjectPath; - private string $_ComponentPath; + private string $_projectPath; + private string $_componentPath; public function __construct() { - $this->_ProjectPath = getcwd(); - $this->_ComponentPath = dirname( dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) ); + $this->_projectPath = getcwd(); + $this->_componentPath = dirname( dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) ); } /** @@ -45,10 +45,10 @@ public function configure(): void /** * Execute the command */ - public function execute( array $Parameters = [] ): int + public function execute( array $parameters = [] ): int { // Get template name from first parameter - $templateName = $Parameters[0] ?? null; + $templateName = $parameters[0] ?? null; if( !$templateName ) { @@ -89,7 +89,7 @@ public function execute( array $Parameters = [] ): int */ private function createTemplate( string $name ): bool { - $emailsDir = $this->_ProjectPath . '/resources/views/emails'; + $emailsDir = $this->_projectPath . '/resources/views/emails'; // Create emails directory if it doesn't exist if( !is_dir( $emailsDir ) ) @@ -111,7 +111,7 @@ private function createTemplate( string $name ): bool } // Load stub template - $stubPath = $this->_ComponentPath . '/src/Cms/Cli/Commands/Generate/stubs/email.stub'; + $stubPath = $this->_componentPath . '/src/Cms/Cli/Commands/Generate/stubs/email.stub'; if( !file_exists( $stubPath ) ) { diff --git a/src/Cms/Cli/Commands/Install/InstallCommand.php b/src/Cms/Cli/Commands/Install/InstallCommand.php index 6e99c10..9a166db 100644 --- a/src/Cms/Cli/Commands/Install/InstallCommand.php +++ b/src/Cms/Cli/Commands/Install/InstallCommand.php @@ -17,17 +17,18 @@ */ class InstallCommand extends Command { - private string $_ProjectPath; - private string $_ComponentPath; - private array $_Messages = []; + + private string $_projectPath; + private string $_componentPath; + private array $_messages = []; public function __construct() { // Get project root (where composer.json is) - $this->_ProjectPath = getcwd(); + $this->_projectPath = getcwd(); // Get component path - $this->_ComponentPath = dirname( dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) ); + $this->_componentPath = dirname( dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) ); } /** @@ -57,22 +58,22 @@ public function configure(): void /** * Execute the command */ - public function execute( array $Parameters = [] ): int + public function execute( array $parameters = [] ): int { - $this->output( "\n╔═══════════════════════════════════════╗" ); - $this->output( "║ Neuron CMS - Installation ║" ); - $this->output( "╚═══════════════════════════════════════╝\n" ); + $this->output->writeln( "\n╔═══════════════════════════════════════╗" ); + $this->output->writeln( "║ Neuron CMS - Installation ║" ); + $this->output->writeln( "╚═══════════════════════════════════════╝\n" ); // Check if already installed if( $this->isAlreadyInstalled() ) { - $this->output( "⚠️ Admin UI appears to be already installed." ); - $this->output( "Resources directory exists: resources/views/admin/" ); - $this->output( "" ); + $this->output->warning( "Admin UI appears to be already installed." ); + $this->output->writeln( "Resources directory exists: resources/views/admin/" ); + $this->output->writeln( "" ); if( !$this->input->confirm( "Do you want to reinstall? This will overwrite existing files", false ) ) { - $this->output( "\n❌ Installation cancelled.\n" ); + $this->output->error( "Installation cancelled." ); return 1; } } @@ -90,11 +91,11 @@ public function execute( array $Parameters = [] ): int foreach( $steps as $method => $message ) { - $this->output( $message ); + $this->output->writeln( $message ); if( !$this->$method() ) { - $this->output( "\n❌ Installation failed!\n" ); + $this->output->error( "Installation failed!" ); return 1; } } @@ -102,39 +103,39 @@ public function execute( array $Parameters = [] ): int // Generate migration if( !$this->generateMigration() ) { - $this->output( "\n❌ Installation failed at migration generation!\n" ); + $this->output->error( "Installation failed at migration generation!" ); return 1; } // Ask to run migration - $this->output( "\n" ); + $this->output->writeln( "" ); if( $this->input->confirm( "Would you like to run the migration now?", true ) ) { if( !$this->runMigration() ) { - $this->output( "\n❌ Migration failed!\n" ); - $this->output( "ℹ️ You can run it manually with: php neuron db:migrate\n" ); + $this->output->error( "Migration failed!" ); + $this->output->info( "You can run it manually with: php neuron db:migrate" ); return 1; } } else { - $this->output( "\nℹ️ Remember to run migration with: php neuron db:migrate\n" ); + $this->output->info( "Remember to run migration with: php neuron db:migrate" ); } // Display summary - $this->output( "\n✅ Installation complete!\n" ); + $this->output->success( "Installation complete!" ); $this->displaySummary(); // Create first admin user - $this->output( "\n" ); + $this->output->writeln( "" ); if( $this->input->confirm( "Would you like to create an admin user now?", true ) ) { $this->createAdminUser(); } else { - $this->output( "\nℹ️ You can create an admin user later with: php neuron cms:user:create\n" ); + $this->output->info( "You can create an admin user later with: php neuron cms:user:create" ); } return 0; @@ -145,7 +146,7 @@ public function execute( array $Parameters = [] ): int */ private function isAlreadyInstalled(): bool { - return is_dir( $this->_ProjectPath . '/resources/views/admin' ); + return is_dir( $this->_projectPath . '/resources/views/admin' ); } /** @@ -196,17 +197,17 @@ private function createDirectories(): bool foreach( $directories as $dir ) { - $path = $this->_ProjectPath . $dir; + $path = $this->_projectPath . $dir; if( !is_dir( $path ) ) { if( !mkdir( $path, 0755, true ) ) { - $this->output( " ❌ Failed to create: $dir" ); + $this->output->error( " Failed to create: $dir" ); return false; } - $this->_Messages[] = "Created: $dir"; + $this->_messages[] = "Created: $dir"; } } @@ -223,19 +224,19 @@ private function publishViews(): bool foreach( $viewDirs as $dir ) { - $viewSource = $this->_ComponentPath . '/resources/views/' . $dir; - $viewDest = $this->_ProjectPath . '/resources/views/' . $dir; + $viewSource = $this->_componentPath . '/resources/views/' . $dir; + $viewDest = $this->_projectPath . '/resources/views/' . $dir; if( !is_dir( $viewSource ) ) { - $this->output( " ⚠️ Warning: Source views not found at: $viewSource" ); + $this->output->warning( " Source views not found at: $viewSource" ); continue; // Skip if directory doesn't exist } // Copy all view files recursively if( !$this->copyDirectory( $viewSource, $viewDest ) ) { - $this->output( " ❌ Failed to copy views from: $dir" ); + $this->output->error( " Failed to copy views from: $dir" ); return false; } } @@ -248,12 +249,12 @@ private function publishViews(): bool */ private function publishInitializers(): bool { - $initializerSource = $this->_ComponentPath . '/resources/app/Initializers'; - $initializerDest = $this->_ProjectPath . '/app/Initializers'; + $initializerSource = $this->_componentPath . '/resources/app/Initializers'; + $initializerDest = $this->_projectPath . '/app/Initializers'; if( !is_dir( $initializerSource ) ) { - $this->output( " ⚠️ Warning: Source initializers not found at: $initializerSource" ); + $this->output->warning( " Source initializers not found at: $initializerSource" ); return true; // Don't fail, initializers might not exist yet } @@ -266,19 +267,19 @@ private function publishInitializers(): bool */ private function createRouteConfig(): bool { - $routeFile = $this->_ProjectPath . '/config/routes.yaml'; - $resourceFile = $this->_ComponentPath . '/resources/config/routes.yaml'; + $routeFile = $this->_projectPath . '/config/routes.yaml'; + $resourceFile = $this->_componentPath . '/resources/config/routes.yaml'; // If routes.yaml doesn't exist, copy from resources if( !file_exists( $routeFile ) && file_exists( $resourceFile ) ) { if( copy( $resourceFile, $routeFile ) ) { - $this->_Messages[] = "Created: config/routes.yaml"; + $this->_messages[] = "Created: config/routes.yaml"; return true; } - $this->output( " ❌ Failed to create routes.yaml" ); + $this->output->error( " Failed to create routes.yaml" ); return false; } @@ -289,8 +290,8 @@ private function createRouteConfig(): bool if( strpos( $content, '/admin/dashboard' ) === false ) { - $this->_Messages[] = "⚠️ Please add admin routes to config/routes.yaml"; - $this->_Messages[] = " See resources/config/routes.yaml for reference"; + $this->_messages[] = "⚠️ Please add admin routes to config/routes.yaml"; + $this->_messages[] = " See resources/config/routes.yaml for reference"; } } @@ -302,19 +303,19 @@ private function createRouteConfig(): bool */ private function createAuthConfig(): bool { - $authFile = $this->_ProjectPath . '/config/auth.yaml'; - $resourceFile = $this->_ComponentPath . '/resources/config/auth.yaml'; + $authFile = $this->_projectPath . '/config/auth.yaml'; + $resourceFile = $this->_componentPath . '/resources/config/auth.yaml'; // If auth.yaml doesn't exist, copy from resources if( !file_exists( $authFile ) && file_exists( $resourceFile ) ) { if( copy( $resourceFile, $authFile ) ) { - $this->_Messages[] = "Created: config/auth.yaml"; + $this->_messages[] = "Created: config/auth.yaml"; return true; } - $this->output( " ❌ Failed to create auth.yaml" ); + $this->output->error( " Failed to create auth.yaml" ); return false; } @@ -326,24 +327,24 @@ private function createAuthConfig(): bool */ private function createPublicFiles(): bool { - $publicDir = $this->_ProjectPath . '/public'; + $publicDir = $this->_projectPath . '/public'; // Create public directory if it doesn't exist if( !is_dir( $publicDir ) ) { if( !mkdir( $publicDir, 0755, true ) ) { - $this->output( " ❌ Failed to create public directory" ); + $this->output->error( " Failed to create public directory" ); return false; } } // Copy all files from resources/public - $sourceDir = $this->_ComponentPath . '/resources/public'; + $sourceDir = $this->_componentPath . '/resources/public'; if( !is_dir( $sourceDir ) ) { - $this->output( " ❌ Source public directory not found" ); + $this->output->error( " Source public directory not found" ); return false; } @@ -370,11 +371,11 @@ private function createPublicFiles(): bool { if( copy( $sourceFile, $destFile ) ) { - $this->_Messages[] = "Created: public/" . $file; + $this->_messages[] = "Created: public/" . $file; } else { - $this->output( " ❌ Failed to copy: " . $file ); + $this->output->error( " Failed to copy: " . $file ); return false; } } @@ -386,19 +387,19 @@ private function createPublicFiles(): bool /** * Copy directory recursively */ - private function copyDirectory( string $Source, string $Dest ): bool + private function copyDirectory( string $source, string $dest ): bool { - if( !is_dir( $Source ) ) + if( !is_dir( $source ) ) { return false; } - if( !is_dir( $Dest ) ) + if( !is_dir( $dest ) ) { - mkdir( $Dest, 0755, true ); + mkdir( $dest, 0755, true ); } - $items = scandir( $Source ); + $items = scandir( $source ); foreach( $items as $item ) { @@ -407,8 +408,8 @@ private function copyDirectory( string $Source, string $Dest ): bool continue; } - $sourcePath = $Source . '/' . $item; - $destPath = $Dest . '/' . $item; + $sourcePath = $source . '/' . $item; + $destPath = $dest . '/' . $item; if( is_dir( $sourcePath ) ) { @@ -421,7 +422,7 @@ private function copyDirectory( string $Source, string $Dest ): bool { if( !copy( $sourcePath, $destPath ) ) { - $this->output( " ❌ Failed to copy: $item" ); + $this->output->error( " Failed to copy: $item" ); return false; } } @@ -435,9 +436,9 @@ private function copyDirectory( string $Source, string $Dest ): bool */ private function setupDatabase(): bool { - $this->output( "\n╔═══════════════════════════════════════╗" ); - $this->output( "║ Database Configuration ║" ); - $this->output( "╚═══════════════════════════════════════╝\n" ); + $this->output->writeln( "\n╔═══════════════════════════════════════╗" ); + $this->output->writeln( "║ Database Configuration ║" ); + $this->output->writeln( "╚═══════════════════════════════════════╝\n" ); $choice = $this->input->choice( "Select database adapter:", @@ -479,22 +480,22 @@ private function setupDatabase(): bool */ private function configureApplication(): array { - $this->output( "\n╔═══════════════════════════════════════╗" ); - $this->output( "║ Application Configuration ║" ); - $this->output( "╚═══════════════════════════════════════╝\n" ); + $this->output->writeln( "\n╔═══════════════════════════════════════╗" ); + $this->output->writeln( "║ Application Configuration ║" ); + $this->output->writeln( "╚═══════════════════════════════════════╝\n" ); // System timezone $defaultTimezone = date_default_timezone_get(); $timezone = $this->input->ask( "System timezone", $defaultTimezone ); // Site configuration - $this->output( "\n--- Site Information ---\n" ); + $this->output->writeln( "\n--- Site Information ---\n" ); $siteName = $this->input->ask( "Site name" ); if( !$siteName ) { - $this->output( "❌ Site name is required!" ); + $this->output->error( "Site name is required!" ); return []; } @@ -503,14 +504,14 @@ private function configureApplication(): array if( !$siteUrl ) { - $this->output( "❌ Site URL is required!" ); + $this->output->error( "Site URL is required!" ); return []; } $siteDescription = $this->input->ask( "Site description (optional)", "" ); - $this->_Messages[] = "Site: $siteName ($siteUrl)"; - $this->_Messages[] = "Timezone: $timezone"; + $this->_messages[] = "Site: $siteName ($siteUrl)"; + $this->_messages[] = "Timezone: $timezone"; return [ 'timezone' => $timezone, @@ -524,7 +525,7 @@ private function configureApplication(): array /** * Save complete configuration with all required sections */ - private function saveCompleteConfig( array $DatabaseConfig, array $AppConfig ): bool + private function saveCompleteConfig( array $databaseConfig, array $appConfig ): bool { // Build complete configuration $config = [ @@ -538,14 +539,14 @@ private function saveCompleteConfig( array $DatabaseConfig, array $AppConfig ): 'path' => 'resources/views' ], 'system' => [ - 'timezone' => $AppConfig['timezone'], - 'base_path' => $this->_ProjectPath + 'timezone' => $appConfig['timezone'], + 'base_path' => $this->_projectPath ], 'site' => [ - 'name' => $AppConfig['siteName'], - 'title' => $AppConfig['siteTitle'], - 'url' => $AppConfig['siteUrl'], - 'description' => $AppConfig['siteDescription'] + 'name' => $appConfig['siteName'], + 'title' => $appConfig['siteTitle'], + 'url' => $appConfig['siteUrl'], + 'description' => $appConfig['siteDescription'] ], 'cache' => [ 'enabled' => false, @@ -556,7 +557,7 @@ private function saveCompleteConfig( array $DatabaseConfig, array $AppConfig ): ]; // Merge database configuration - $config = array_merge( $config, $DatabaseConfig ); + $config = array_merge( $config, $databaseConfig ); // Save configuration return $this->saveConfig( $config ); @@ -567,14 +568,14 @@ private function saveCompleteConfig( array $DatabaseConfig, array $AppConfig ): */ private function configureSqlite(): array { - $this->output( "\n--- SQLite Configuration ---\n" ); + $this->output->writeln( "\n--- SQLite Configuration ---\n" ); $dbPath = $this->input->ask( "Database file path", "storage/database.sqlite3" ); // Make path absolute if relative if( !empty( $dbPath ) && $dbPath[0] !== '/' ) { - $dbPath = $this->_ProjectPath . '/' . $dbPath; + $dbPath = $this->_projectPath . '/' . $dbPath; } // Create directory if needed @@ -583,12 +584,12 @@ private function configureSqlite(): array { if( !mkdir( $dir, 0755, true ) ) { - $this->output( "❌ Failed to create directory: $dir" ); + $this->output->error( "Failed to create directory: $dir" ); return []; } } - $this->_Messages[] = "Database: SQLite ($dbPath)"; + $this->_messages[] = "Database: SQLite ($dbPath)"; return [ 'database' => [ @@ -603,7 +604,7 @@ private function configureSqlite(): array */ private function configureMysql(): array { - $this->output( "\n--- MySQL Configuration ---\n" ); + $this->output->writeln( "\n--- MySQL Configuration ---\n" ); $host = $this->input->ask( "Host", "localhost" ); $port = $this->input->ask( "Port", "3306" ); @@ -611,7 +612,7 @@ private function configureMysql(): array if( !$name ) { - $this->output( "❌ Database name is required!" ); + $this->output->error( "Database name is required!" ); return []; } @@ -619,14 +620,14 @@ private function configureMysql(): array if( !$user ) { - $this->output( "❌ Username is required!" ); + $this->output->error( "Username is required!" ); return []; } $pass = $this->input->askSecret( "Database password" ); $charset = $this->input->ask( "Character set (utf8mb4 recommended)", "utf8mb4" ); - $this->_Messages[] = "Database: MySQL ($host:$port/$name)"; + $this->_messages[] = "Database: MySQL ($host:$port/$name)"; return [ 'database' => [ @@ -646,7 +647,7 @@ private function configureMysql(): array */ private function configurePostgresql(): array { - $this->output( "\n--- PostgreSQL Configuration ---\n" ); + $this->output->writeln( "\n--- PostgreSQL Configuration ---\n" ); $host = $this->input->ask( "Host", "localhost" ); $port = $this->input->ask( "Port", "5432" ); @@ -654,7 +655,7 @@ private function configurePostgresql(): array if( !$name ) { - $this->output( "❌ Database name is required!" ); + $this->output->error( "Database name is required!" ); return []; } @@ -662,13 +663,13 @@ private function configurePostgresql(): array if( !$user ) { - $this->output( "❌ Username is required!" ); + $this->output->error( "Username is required!" ); return []; } $pass = $this->input->askSecret( "Database password" ); - $this->_Messages[] = "Database: PostgreSQL ($host:$port/$name)"; + $this->_messages[] = "Database: PostgreSQL ($host:$port/$name)"; return [ 'database' => [ @@ -685,9 +686,9 @@ private function configurePostgresql(): array /** * Save configuration to YAML file */ - private function saveConfig( array $Config ): bool + private function saveConfig( array $config ): bool { - $configFile = $this->_ProjectPath . '/config/config.yaml'; + $configFile = $this->_projectPath . '/config/config.yaml'; // If config exists, merge with existing $existingConfig = []; @@ -719,35 +720,35 @@ private function saveConfig( array $Config ): bool } // Merge configurations - $finalConfig = array_merge( $existingConfig, $Config ); + $finalConfig = array_merge( $existingConfig, $config ); // Convert to YAML manually (simple approach) $yamlContent = $this->arrayToYaml( $finalConfig ); if( file_put_contents( $configFile, $yamlContent ) === false ) { - $this->output( "❌ Failed to save configuration file!" ); + $this->output->error( "Failed to save configuration file!" ); return false; } - $this->_Messages[] = "Created: config/config.yaml"; + $this->_messages[] = "Created: config/config.yaml"; return true; } /** * Convert array to YAML format (simple implementation) */ - private function arrayToYaml( array $Data, int $Indent = 0 ): string + private function arrayToYaml( array $data, int $indent = 0 ): string { $yaml = ''; - $indentStr = str_repeat( ' ', $Indent ); + $indentStr = str_repeat( ' ', $indent ); - foreach( $Data as $key => $value ) + foreach( $data as $key => $value ) { if( is_array( $value ) ) { $yaml .= $indentStr . $key . ":\n"; - $yaml .= $this->arrayToYaml( $value, $Indent + 1 ); + $yaml .= $this->arrayToYaml( $value, $indent + 1 ); } else { @@ -761,24 +762,24 @@ private function arrayToYaml( array $Data, int $Indent = 0 ): string /** * Format value for YAML */ - private function yamlValue( $Value ): string + private function yamlValue( $value ): string { - if( is_bool( $Value ) ) + if( is_bool( $value ) ) { - return $Value ? 'true' : 'false'; + return $value ? 'true' : 'false'; } - if( is_int( $Value ) || is_float( $Value ) ) + if( is_int( $value ) || is_float( $value ) ) { - return (string)$Value; + return (string)$value; } - if( is_string( $Value ) && ( strpos( $Value, ' ' ) !== false || strpos( $Value, ':' ) !== false ) ) + if( is_string( $value ) && ( strpos( $value, ' ' ) !== false || strpos( $value, ':' ) !== false ) ) { - return '"' . addslashes( $Value ) . '"'; + return '"' . addslashes( $value ) . '"'; } - return (string)$Value; + return (string)$value; } /** @@ -786,20 +787,20 @@ private function yamlValue( $Value ): string */ private function generateMigration(): bool { - $this->output( "\nGenerating database migration..." ); + $this->output->writeln( "\nGenerating database migration..." ); $migrationName = 'CreateUsersTable'; $snakeCaseName = $this->camelToSnake( $migrationName ); // Use db/migrate path to match MigrationManager expectations - $migrationsDir = $this->_ProjectPath . '/db/migrate'; + $migrationsDir = $this->_projectPath . '/db/migrate'; // Create migrations directory if it doesn't exist if( !is_dir( $migrationsDir ) ) { if( !mkdir( $migrationsDir, 0755, true ) ) { - $this->output( "❌ Failed to create migrations directory!" ); + $this->output->error( "Failed to create migrations directory!" ); return false; } } @@ -809,8 +810,8 @@ private function generateMigration(): bool if( !empty( $existingFiles ) ) { $existingFile = basename( $existingFiles[0] ); - $this->output( "ℹ️ Migration already exists: $existingFile" ); - $this->_Messages[] = "Using existing migration: db/migrate/$existingFile"; + $this->output->info( "Migration already exists: $existingFile" ); + $this->_messages[] = "Using existing migration: db/migrate/$existingFile"; return true; } @@ -823,18 +824,18 @@ private function generateMigration(): bool if( file_put_contents( $filePath, $template ) === false ) { - $this->output( "❌ Failed to create migration file!" ); + $this->output->error( "Failed to create migration file!" ); return false; } - $this->_Messages[] = "Created: db/migrate/$fileName"; + $this->_messages[] = "Created: db/migrate/$fileName"; return true; } /** * Get migration template with users and password_reset_tokens table schema */ - private function getMigrationTemplate( string $ClassName ): string + private function getMigrationTemplate( string $className ): string { return <<output( "\nRunning migration...\n" ); + $this->output->writeln( "\nRunning migration...\n" ); try { @@ -912,14 +913,14 @@ private function runMigration(): bool if( !$app ) { - $this->output( "❌ CLI application not found in registry!" ); + $this->output->error( "CLI application not found in registry!" ); return false; } // Check if db:migrate command exists if( !$app->has( 'db:migrate' ) ) { - $this->output( "❌ db:migrate command not found!" ); + $this->output->error( "db:migrate command not found!" ); return false; } @@ -928,7 +929,7 @@ private function runMigration(): bool if( !class_exists( $commandClass ) ) { - $this->output( "❌ Migrate command class not found: {$commandClass}" ); + $this->output->error( "Migrate command class not found: {$commandClass}" ); return false; } @@ -947,16 +948,16 @@ private function runMigration(): bool if( $exitCode !== 0 ) { - $this->output( "\n❌ Migration failed with exit code: $exitCode" ); + $this->output->error( "Migration failed with exit code: $exitCode" ); return false; } - $this->output( "\n✅ Migration completed successfully!" ); + $this->output->success( "Migration completed successfully!" ); return true; } catch( \Exception $e ) { - $this->output( "❌ Error running migration: " . $e->getMessage() ); + $this->output->error( "Error running migration: " . $e->getMessage() ); return false; } } @@ -966,19 +967,19 @@ private function runMigration(): bool */ private function displaySummary(): void { - $this->output( "Installation Summary:" ); - $this->output( "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" ); + $this->output->writeln( "Installation Summary:" ); + $this->output->writeln( "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" ); - foreach( $this->_Messages as $message ) + foreach( $this->_messages as $message ) { - $this->output( " $message" ); + $this->output->writeln( " $message" ); } - $this->output( "\nNext Steps:" ); - $this->output( " 1. Create an admin user (prompted below)" ); - $this->output( " 2. Review config/routes.yaml for admin routes" ); - $this->output( " 3. Start your server and visit /login" ); - $this->output( " 4. Access admin at /admin/dashboard" ); + $this->output->writeln( "\nNext Steps:" ); + $this->output->writeln( " 1. Create an admin user (prompted below)" ); + $this->output->writeln( " 2. Review config/routes.yaml for admin routes" ); + $this->output->writeln( " 3. Start your server and visit /login" ); + $this->output->writeln( " 4. Access admin at /admin/dashboard" ); } /** @@ -986,35 +987,26 @@ private function displaySummary(): void */ private function createAdminUser(): bool { - $this->output( "\n╔═══════════════════════════════════════╗" ); - $this->output( "║ Create Admin User ║" ); - $this->output( "╚═══════════════════════════════════════╝\n" ); - - // Load database config - $configFile = $this->_ProjectPath . '/config/config.yaml'; - if( !file_exists( $configFile ) ) - { - $this->output( "\n❌ Configuration file not found!\n" ); - return false; - } + $this->output->writeln( "\n╔═══════════════════════════════════════╗" ); + $this->output->writeln( "║ Create Admin User ║" ); + $this->output->writeln( "╚═══════════════════════════════════════╝\n" ); try { - $yaml = new Yaml( $configFile ); - $settings = new SettingManager( $yaml ); - $dbConfig = $this->getDatabaseConfig( $settings ); + $settings = Registry::getInstance()->get( 'Settings' ); - if( !$dbConfig ) + if( !$settings ) { - $this->output( "\n❌ Database configuration not found!\n" ); + $this->output->error( "Application not initialized: Settings not found in Registry" ); + $this->output->writeln( "This is a configuration error - the application should load settings into the Registry" ); return false; } - $repository = new DatabaseUserRepository( $dbConfig ); + $repository = new DatabaseUserRepository( $settings ); } catch( \Exception $e ) { - $this->output( "\n❌ Database connection failed: " . $e->getMessage() . "\n" ); + $this->output->error( "Database connection failed: " . $e->getMessage() ); return false; } @@ -1026,8 +1018,8 @@ private function createAdminUser(): bool // Check if user exists if( $repository->findByUsername( $username ) ) { - $this->output( "\n⚠️ Warning: User '$username' already exists!" ); - $this->output( "You can manage users with: php neuron cms:user:list\n" ); + $this->output->warning( "User '$username' already exists!" ); + $this->output->writeln( "You can manage users with: php neuron cms:user:list" ); return true; } @@ -1035,26 +1027,26 @@ private function createAdminUser(): bool $email = $this->input->ask( "Email address", "admin@example.com" ); // Get password - $this->output( "Password requirements: min 8 chars, uppercase, lowercase, number, special char" ); + $this->output->writeln( "Password requirements: min 8 chars, uppercase, lowercase, number, special char" ); $password = $this->input->askSecret( "Password" ); if( strlen( $password ) < 8 ) { - $this->output( "\n❌ Error: Password must be at least 8 characters long!\n" ); + $this->output->error( "Password must be at least 8 characters long!" ); return false; } // Validate password if( !$hasher->meetsRequirements( $password ) ) { - $this->output( "\n❌ Error: Password does not meet requirements:" ); + $this->output->error( "Password does not meet requirements:" ); foreach( $hasher->getValidationErrors( $password ) as $error ) { - $this->output( " - $error" ); + $this->output->writeln( " - $error" ); } - $this->output( "" ); + $this->output->writeln( "" ); return false; } @@ -1071,66 +1063,19 @@ private function createAdminUser(): bool { $repository->create( $user ); - $this->output( "\n✅ Success! Admin user created:" ); - $this->output( " Username: " . $user->getUsername() ); - $this->output( " Email: " . $user->getEmail() ); - $this->output( " Role: " . $user->getRole() ); - $this->output( "\n🚀 You can now login at: http://localhost:8000/login\n" ); + $this->output->success( "Admin user created:" ); + $this->output->writeln( " Username: " . $user->getUsername() ); + $this->output->writeln( " Email: " . $user->getEmail() ); + $this->output->writeln( " Role: " . $user->getRole() ); + $this->output->writeln( "\n🚀 You can now login at: http://localhost:8000/login" ); return true; } catch( \Exception $e ) { - $this->output( "\n❌ Error creating user: " . $e->getMessage() . "\n" ); + $this->output->error( "Error creating user: " . $e->getMessage() ); return false; } } - /** - * Get database configuration from settings - */ - private function getDatabaseConfig( SettingManager $Settings ): ?array - { - try - { - $settingNames = $Settings->getSectionSettingNames( 'database' ); - - if( empty( $settingNames ) ) - { - return null; - } - - $config = []; - foreach( $settingNames as $name ) - { - $value = $Settings->get( 'database', $name ); - if( $value !== null ) - { - // Convert string values to appropriate types - if( $name === 'port' ) - { - $config[$name] = (int)$value; - } - else - { - $config[$name] = $value; - } - } - } - - return $config; - } - catch( \Exception $e ) - { - return null; - } - } - - /** - * Output message - */ - private function output( string $Message ): void - { - echo $Message . "\n"; - } } diff --git a/src/Cms/Cli/Commands/Maintenance/EnableCommand.php b/src/Cms/Cli/Commands/Maintenance/EnableCommand.php index dc3ef7b..283dedb 100644 --- a/src/Cms/Cli/Commands/Maintenance/EnableCommand.php +++ b/src/Cms/Cli/Commands/Maintenance/EnableCommand.php @@ -135,26 +135,26 @@ public function execute(): int /** * Parse allowed IPs from option or config * - * @param string|null $IpOption - * @param MaintenanceConfig|null $Config + * @param string|null $ipOption + * @param MaintenanceConfig|null $config * @return array */ - private function parseAllowedIps( ?string $IpOption, ?MaintenanceConfig $Config ): array + private function parseAllowedIps( ?string $ipOption, ?MaintenanceConfig $config ): array { // Check if option was provided (even if empty) - if( $IpOption !== null ) + if( $ipOption !== null ) { // Empty string means no IPs allowed - if( $IpOption === '' ) + if( $ipOption === '' ) { return []; } - return array_map( 'trim', explode( ',', $IpOption ) ); + return array_map( 'trim', explode( ',', $ipOption ) ); } - if( $Config ) + if( $config ) { - return $Config->getAllowedIps(); + return $config->getAllowedIps(); } return ['127.0.0.1', '::1']; diff --git a/src/Cms/Cli/Commands/Queue/InstallCommand.php b/src/Cms/Cli/Commands/Queue/InstallCommand.php index 58de95b..610583e 100644 --- a/src/Cms/Cli/Commands/Queue/InstallCommand.php +++ b/src/Cms/Cli/Commands/Queue/InstallCommand.php @@ -14,11 +14,11 @@ */ class InstallCommand extends Command { - private string $_ProjectPath; + private string $_projectPath; public function __construct() { - $this->_ProjectPath = getcwd(); + $this->_projectPath = getcwd(); } /** @@ -48,7 +48,7 @@ public function configure(): void /** * Execute the command */ - public function execute( array $Parameters = [] ): int + public function execute( array $parameters = [] ): int { $this->output->info( "╔═══════════════════════════════════════╗" ); $this->output->info( "║ Job Queue Installation ║" ); @@ -155,7 +155,7 @@ public function execute( array $Parameters = [] ): int */ private function isAlreadyInstalled(): bool { - $migrationsDir = $this->_ProjectPath . '/db/migrate'; + $migrationsDir = $this->_projectPath . '/db/migrate'; $snakeCaseName = $this->camelToSnake( 'CreateQueueTables' ); // Check for existing migration @@ -167,7 +167,7 @@ private function isAlreadyInstalled(): bool } // Check for queue config - $configFile = $this->_ProjectPath . '/config/config.yaml'; + $configFile = $this->_projectPath . '/config/config.yaml'; if( !file_exists( $configFile ) ) { @@ -195,7 +195,7 @@ private function generateMigration(): bool { $migrationName = 'CreateQueueTables'; $snakeCaseName = $this->camelToSnake( $migrationName ); - $migrationsDir = $this->_ProjectPath . '/db/migrate'; + $migrationsDir = $this->_projectPath . '/db/migrate'; // Create migrations directory if it doesn't exist if( !is_dir( $migrationsDir ) ) @@ -238,7 +238,7 @@ private function generateMigration(): bool /** * Get migration template */ - private function getMigrationTemplate( string $ClassName ): string + private function getMigrationTemplate( string $className ): string { return <<_ProjectPath . '/config/config.yaml'; + $configFile = $this->_projectPath . '/config/config.yaml'; if( !file_exists( $configFile ) ) { @@ -406,8 +406,8 @@ private function runMigration(): bool /** * Convert CamelCase to snake_case */ - private function camelToSnake( string $Input ): string + private function camelToSnake( string $input ): string { - return strtolower( preg_replace( '/(?output( "\n╔═══════════════════════════════════════╗" ); - $this->output( "║ Neuron CMS - Create User ║" ); - $this->output( "╚═══════════════════════════════════════╝\n" ); + $this->output->writeln( "\n╔═══════════════════════════════════════╗" ); + $this->output->writeln( "║ Neuron CMS - Create User ║" ); + $this->output->writeln( "╚═══════════════════════════════════════╝\n" ); // Load database configuration $repository = $this->getUserRepository(); @@ -62,14 +62,14 @@ public function execute( array $Parameters = [] ): int if( empty( $username ) ) { - $this->output( "\n❌ Error: Username is required!\n" ); + $this->output->error( "Username is required!" ); return 1; } // Check if user exists if( $repository->findByUsername( $username ) ) { - $this->output( "\n❌ Error: User '$username' already exists!\n" ); + $this->output->error( "User '$username' already exists!" ); return 1; } @@ -79,14 +79,14 @@ public function execute( array $Parameters = [] ): int if( empty( $email ) || !filter_var( $email, FILTER_VALIDATE_EMAIL ) ) { - $this->output( "\n❌ Error: Valid email is required!\n" ); + $this->output->error( "Valid email is required!" ); return 1; } // Check if email exists if( $repository->findByEmail( $email ) ) { - $this->output( "\n❌ Error: Email '$email' is already in use!\n" ); + $this->output->error( "Email '$email' is already in use!" ); return 1; } @@ -95,30 +95,30 @@ public function execute( array $Parameters = [] ): int if( strlen( $password ) < 8 ) { - $this->output( "\n❌ Error: Password must be at least 8 characters long!\n" ); + $this->output->error( "Password must be at least 8 characters long!" ); return 1; } // Validate password if( !$hasher->meetsRequirements( $password ) ) { - $this->output( "\n❌ Error: Password does not meet requirements:" ); + $this->output->error( "Password does not meet requirements:" ); foreach( $hasher->getValidationErrors( $password ) as $error ) { - $this->output( " - $error" ); + $this->output->writeln( " - $error" ); } - $this->output( "" ); + $this->output->writeln( "" ); return 1; } // Get role - $this->output( "\nAvailable roles:" ); - $this->output( " 1. Admin (full access)" ); - $this->output( " 2. Editor (manage all content)" ); - $this->output( " 3. Author (manage own content)" ); - $this->output( " 4. Subscriber (read-only)" ); + $this->output->writeln( "\nAvailable roles:" ); + $this->output->writeln( " 1. Admin (full access)" ); + $this->output->writeln( " 2. Editor (manage all content)" ); + $this->output->writeln( " 3. Author (manage own content)" ); + $this->output->writeln( " 4. Subscriber (read-only)" ); $roleChoice = $this->prompt( "\nSelect role (1-4) [3]: " ); $roleChoice = trim( $roleChoice ) ?: '3'; @@ -145,18 +145,18 @@ public function execute( array $Parameters = [] ): int { $repository->create( $user ); - $this->output( "\n✅ Success! User created:" ); - $this->output( " ID: " . $user->getId() ); - $this->output( " Username: " . $user->getUsername() ); - $this->output( " Email: " . $user->getEmail() ); - $this->output( " Role: " . $user->getRole() ); - $this->output( "" ); + $this->output->success( "User created:" ); + $this->output->writeln( " ID: " . $user->getId() ); + $this->output->writeln( " Username: " . $user->getUsername() ); + $this->output->writeln( " Email: " . $user->getEmail() ); + $this->output->writeln( " Role: " . $user->getRole() ); + $this->output->writeln( "" ); return 0; } catch( \Exception $e ) { - $this->output( "\n❌ Error creating user: " . $e->getMessage() . "\n" ); + $this->output->error( "Error creating user: " . $e->getMessage() ); return 1; } } @@ -165,76 +165,23 @@ public function execute( array $Parameters = [] ): int * Get user repository */ private function getUserRepository(): ?DatabaseUserRepository - { - $configFile = getcwd() . '/config/config.yaml'; - - if( !file_exists( $configFile ) ) - { - $this->output( "\n❌ Configuration file not found at: $configFile" ); - $this->output( "Please run: php neuron cms:install\n" ); - return null; - } - - try - { - $yaml = new Yaml( $configFile ); - $settings = new SettingManager( $yaml ); - - // Get database configuration - $dbConfig = $this->getDatabaseConfig( $settings ); - - if( !$dbConfig ) - { - $this->output( "\n❌ Database configuration not found!" ); - $this->output( "Please run: php neuron cms:install\n" ); - return null; - } - - return new DatabaseUserRepository( $dbConfig ); - } - catch( \Exception $e ) - { - $this->output( "\n❌ Database connection failed: " . $e->getMessage() . "\n" ); - return null; - } - } - - /** - * Get database configuration from settings - */ - private function getDatabaseConfig( SettingManager $Settings ): ?array { try { - $settingNames = $Settings->getSectionSettingNames( 'database' ); + $settings = Registry::getInstance()->get( 'Settings' ); - if( empty( $settingNames ) ) + if( !$settings ) { + $this->output->error( "Application not initialized: Settings not found in Registry" ); + $this->output->writeln( "This is a configuration error - the application should load settings into the Registry" ); return null; } - $config = []; - foreach( $settingNames as $name ) - { - $value = $Settings->get( 'database', $name ); - if( $value !== null ) - { - // Convert string values to appropriate types - if( $name === 'port' ) - { - $config[$name] = (int)$value; - } - else - { - $config[$name] = $value; - } - } - } - - return $config; + return new DatabaseUserRepository( $settings ); } catch( \Exception $e ) { + $this->output->error( "Database connection failed: " . $e->getMessage() ); return null; } } @@ -242,17 +189,9 @@ private function getDatabaseConfig( SettingManager $Settings ): ?array /** * Prompt for user input */ - private function prompt( string $Message ): string + private function prompt( string $message ): string { - echo $Message; + $this->output->write( $message, false ); return trim( fgets( STDIN ) ); } - - /** - * Output message - */ - private function output( string $Message ): void - { - echo $Message . "\n"; - } } diff --git a/src/Cms/Cli/Commands/User/DeleteCommand.php b/src/Cms/Cli/Commands/User/DeleteCommand.php index 1db835a..06a4f3f 100644 --- a/src/Cms/Cli/Commands/User/DeleteCommand.php +++ b/src/Cms/Cli/Commands/User/DeleteCommand.php @@ -4,14 +4,14 @@ use Neuron\Cli\Commands\Command; use Neuron\Cms\Repositories\DatabaseUserRepository; -use Neuron\Data\Setting\SettingManager; -use Neuron\Data\Setting\Source\Yaml; +use Neuron\Patterns\Registry; /** * Delete a user */ class DeleteCommand extends Command { + /** * @inheritDoc */ @@ -39,14 +39,14 @@ public function configure(): void /** * Execute the command */ - public function execute( array $Parameters = [] ): int + public function execute( array $parameters = [] ): int { - $identifier = $Parameters['identifier'] ?? null; + $identifier = $parameters['identifier'] ?? null; if( !$identifier ) { - $this->output( "\n❌ Error: Please provide a user ID or username.\n" ); - $this->output( "Usage: php neuron cms:user:delete \n" ); + $this->output->error( "Please provide a user ID or username." ); + $this->output->writeln( "Usage: php neuron cms:user:delete " ); return 1; } @@ -70,26 +70,26 @@ public function execute( array $Parameters = [] ): int if( !$user ) { - $this->output( "\n❌ Error: User '$identifier' not found.\n" ); + $this->output->error( "User '$identifier' not found." ); return 1; } // Display user info - $this->output( "\n⚠️ You are about to delete the following user:" ); - $this->output( "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" ); - $this->output( " ID: " . $user->getId() ); - $this->output( " Username: " . $user->getUsername() ); - $this->output( " Email: " . $user->getEmail() ); - $this->output( " Role: " . $user->getRole() ); - $this->output( " Status: " . $user->getStatus() ); - $this->output( "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n" ); + $this->output->warning( "You are about to delete the following user:" ); + $this->output->writeln( "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" ); + $this->output->writeln( " ID: " . $user->getId() ); + $this->output->writeln( " Username: " . $user->getUsername() ); + $this->output->writeln( " Email: " . $user->getEmail() ); + $this->output->writeln( " Role: " . $user->getRole() ); + $this->output->writeln( " Status: " . $user->getStatus() ); + $this->output->writeln( "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" ); // Confirm deletion $response = $this->prompt( "Are you sure you want to delete this user? Type 'DELETE' to confirm: " ); if( trim( $response ) !== 'DELETE' ) { - $this->output( "\n❌ Deletion cancelled.\n" ); + $this->output->error( "Deletion cancelled." ); return 1; } @@ -98,16 +98,16 @@ public function execute( array $Parameters = [] ): int { if( $repository->delete( $user->getId() ) ) { - $this->output( "\n✅ User deleted successfully.\n" ); + $this->output->success( "User deleted successfully." ); return 0; } - $this->output( "\n❌ Failed to delete user.\n" ); + $this->output->error( "Failed to delete user." ); return 1; } catch( \Exception $e ) { - $this->output( "\n❌ Error: " . $e->getMessage() . "\n" ); + $this->output->error( "Error: " . $e->getMessage() ); return 1; } } @@ -116,76 +116,23 @@ public function execute( array $Parameters = [] ): int * Get user repository */ private function getUserRepository(): ?DatabaseUserRepository - { - $configFile = getcwd() . '/config/config.yaml'; - - if( !file_exists( $configFile ) ) - { - $this->output( "\n❌ Configuration file not found at: $configFile" ); - $this->output( "Please run: php neuron cms:install\n" ); - return null; - } - - try - { - $yaml = new Yaml( $configFile ); - $settings = new SettingManager( $yaml ); - - // Get database configuration - $dbConfig = $this->getDatabaseConfig( $settings ); - - if( !$dbConfig ) - { - $this->output( "\n❌ Database configuration not found!" ); - $this->output( "Please run: php neuron cms:install\n" ); - return null; - } - - return new DatabaseUserRepository( $dbConfig ); - } - catch( \Exception $e ) - { - $this->output( "\n❌ Database connection failed: " . $e->getMessage() . "\n" ); - return null; - } - } - - /** - * Get database configuration from settings - */ - private function getDatabaseConfig( SettingManager $Settings ): ?array { try { - $settingNames = $Settings->getSectionSettingNames( 'database' ); + $settings = Registry::getInstance()->get( 'Settings' ); - if( empty( $settingNames ) ) + if( !$settings ) { + $this->output->error( "Application not initialized: Settings not found in Registry" ); + $this->output->writeln( "This is a configuration error - the application should load settings into the Registry" ); return null; } - $config = []; - foreach( $settingNames as $name ) - { - $value = $Settings->get( 'database', $name ); - if( $value !== null ) - { - // Convert string values to appropriate types - if( $name === 'port' ) - { - $config[$name] = (int)$value; - } - else - { - $config[$name] = $value; - } - } - } - - return $config; + return new DatabaseUserRepository( $settings ); } catch( \Exception $e ) { + $this->output->error( "Database connection failed: " . $e->getMessage() ); return null; } } @@ -193,17 +140,9 @@ private function getDatabaseConfig( SettingManager $Settings ): ?array /** * Prompt for user input */ - private function prompt( string $Message ): string + private function prompt( string $message ): string { - echo $Message; + $this->output->write( $message, false ); return trim( fgets( STDIN ) ); } - - /** - * Output message - */ - private function output( string $Message ): void - { - echo $Message . "\n"; - } } diff --git a/src/Cms/Cli/Commands/User/ListCommand.php b/src/Cms/Cli/Commands/User/ListCommand.php index da81af7..faa0703 100644 --- a/src/Cms/Cli/Commands/User/ListCommand.php +++ b/src/Cms/Cli/Commands/User/ListCommand.php @@ -4,14 +4,14 @@ use Neuron\Cli\Commands\Command; use Neuron\Cms\Repositories\DatabaseUserRepository; -use Neuron\Data\Setting\SettingManager; -use Neuron\Data\Setting\Source\Yaml; +use Neuron\Patterns\Registry; /** * List all users */ class ListCommand extends Command { + /** * @inheritDoc */ @@ -39,7 +39,7 @@ public function configure(): void /** * Execute the command */ - public function execute( array $Parameters = [] ): int + public function execute( array $parameters = [] ): int { $repository = $this->getUserRepository(); if( !$repository ) @@ -51,13 +51,13 @@ public function execute( array $Parameters = [] ): int if( empty( $users ) ) { - $this->output( "\nℹ️ No users found.\n" ); + $this->output->info( "No users found." ); return 0; } - $this->output( "\n" ); + $this->output->writeln( "" ); $this->displayUsersTable( $users ); - $this->output( "\nTotal users: " . count( $users ) . "\n" ); + $this->output->writeln( "\nTotal users: " . count( $users ) ); return 0; } @@ -65,7 +65,7 @@ public function execute( array $Parameters = [] ): int /** * Display users in a formatted table */ - private function displayUsersTable( array $Users ): void + private function displayUsersTable( array $users ): void { // Calculate column widths $idWidth = 4; @@ -76,8 +76,8 @@ private function displayUsersTable( array $Users ): void $createdWidth = 19; // Header - $this->output( str_repeat( '─', $idWidth + $usernameWidth + $emailWidth + $roleWidth + $statusWidth + $createdWidth + 17 ) ); - $this->output( + $this->output->writeln( str_repeat( '─', $idWidth + $usernameWidth + $emailWidth + $roleWidth + $statusWidth + $createdWidth + 17 ) ); + $this->output->writeln( $this->pad( 'ID', $idWidth ) . ' │ ' . $this->pad( 'Username', $usernameWidth ) . ' │ ' . $this->pad( 'Email', $emailWidth ) . ' │ ' . @@ -85,12 +85,12 @@ private function displayUsersTable( array $Users ): void $this->pad( 'Status', $statusWidth ) . ' │ ' . $this->pad( 'Created', $createdWidth ) ); - $this->output( str_repeat( '─', $idWidth + $usernameWidth + $emailWidth + $roleWidth + $statusWidth + $createdWidth + 17 ) ); + $this->output->writeln( str_repeat( '─', $idWidth + $usernameWidth + $emailWidth + $roleWidth + $statusWidth + $createdWidth + 17 ) ); // Rows - foreach( $Users as $user ) + foreach( $users as $user ) { - $this->output( + $this->output->writeln( $this->pad( (string)$user->getId(), $idWidth ) . ' │ ' . $this->pad( $this->truncate( $user->getUsername(), $usernameWidth ), $usernameWidth ) . ' │ ' . $this->pad( $this->truncate( $user->getEmail(), $emailWidth ), $emailWidth ) . ' │ ' . @@ -100,41 +100,41 @@ private function displayUsersTable( array $Users ): void ); } - $this->output( str_repeat( '─', $idWidth + $usernameWidth + $emailWidth + $roleWidth + $statusWidth + $createdWidth + 17 ) ); + $this->output->writeln( str_repeat( '─', $idWidth + $usernameWidth + $emailWidth + $roleWidth + $statusWidth + $createdWidth + 17 ) ); } /** * Format user status */ - private function formatStatus( $User ): string + private function formatStatus( $user ): string { - if( $User->isLockedOut() ) + if( $user->isLockedOut() ) { return '🔒 Locked'; } - return $User->getStatus(); + return $user->getStatus(); } /** * Pad string to width */ - private function pad( string $Text, int $Width ): string + private function pad( string $text, int $width ): string { - return str_pad( $Text, $Width ); + return str_pad( $text, $width ); } /** * Truncate string to width */ - private function truncate( string $Text, int $Width ): string + private function truncate( string $text, int $width ): string { - if( strlen( $Text ) <= $Width ) + if( strlen( $text ) <= $width ) { - return $Text; + return $text; } - return substr( $Text, 0, $Width - 3 ) . '...'; + return substr( $text, 0, $width - 3 ) . '...'; } /** @@ -142,84 +142,24 @@ private function truncate( string $Text, int $Width ): string */ private function getUserRepository(): ?DatabaseUserRepository { - $configFile = getcwd() . '/config/config.yaml'; - - if( !file_exists( $configFile ) ) - { - $this->output( "\n❌ Configuration file not found at: $configFile" ); - $this->output( "Please run: php neuron cms:install\n" ); - return null; - } - try { - $yaml = new Yaml( $configFile ); - $settings = new SettingManager( $yaml ); + $settings = Registry::getInstance()->get( 'Settings' ); - // Get database configuration - $dbConfig = $this->getDatabaseConfig( $settings ); - - if( !$dbConfig ) + if( !$settings ) { - $this->output( "\n❌ Database configuration not found!" ); - $this->output( "Please run: php neuron cms:install\n" ); + $this->output->error( "Application not initialized: Settings not found in Registry" ); + $this->output->writeln( "This is a configuration error - the application should load settings into the Registry" ); return null; } - return new DatabaseUserRepository( $dbConfig ); + return new DatabaseUserRepository( $settings ); } catch( \Exception $e ) { - $this->output( "\n❌ Database connection failed: " . $e->getMessage() . "\n" ); + $this->output->error( "Database connection failed: " . $e->getMessage() ); return null; } } - /** - * Get database configuration from settings - */ - private function getDatabaseConfig( SettingManager $Settings ): ?array - { - try - { - $settingNames = $Settings->getSectionSettingNames( 'database' ); - - if( empty( $settingNames ) ) - { - return null; - } - - $config = []; - foreach( $settingNames as $name ) - { - $value = $Settings->get( 'database', $name ); - if( $value !== null ) - { - // Convert string values to appropriate types - if( $name === 'port' ) - { - $config[$name] = (int)$value; - } - else - { - $config[$name] = $value; - } - } - } - - return $config; - } - catch( \Exception $e ) - { - return null; - } - } - - /** - * Output message - */ - private function output( string $Message ): void - { - echo $Message . "\n"; - } } diff --git a/src/Cms/Controllers/Admin/CategoryController.php b/src/Cms/Controllers/Admin/CategoryController.php index 4a9c0d0..e38ee6c 100644 --- a/src/Cms/Controllers/Admin/CategoryController.php +++ b/src/Cms/Controllers/Admin/CategoryController.php @@ -5,6 +5,7 @@ use Neuron\Cms\Controllers\Content; use Neuron\Cms\Models\Category; use Neuron\Cms\Repositories\DatabaseCategoryRepository; +use Neuron\Core\Exceptions\NotFound; use Neuron\Data\Setting\SettingManager; use Neuron\Mvc\Application; use Neuron\Mvc\Requests\Request; @@ -18,75 +19,82 @@ */ class CategoryController extends Content { - private DatabaseCategoryRepository $_CategoryRepository; + private DatabaseCategoryRepository $_categoryRepository; + + /** + * @param Application|null $app + * @throws \Exception + */ public function __construct( ?Application $app = null ) { parent::__construct( $app ); - // Get database config from settings - $Settings = Registry::getInstance()->get( 'Settings' ); - $dbConfig = $this->getDatabaseConfig( $Settings ); - - if( !$dbConfig ) - { - throw new \RuntimeException( 'Database configuration not found' ); - } + // Get settings for repositories + $settings = Registry::getInstance()->get( 'Settings' ); // Initialize repository - $this->_CategoryRepository = new DatabaseCategoryRepository( $dbConfig ); + $this->_categoryRepository = new DatabaseCategoryRepository( $settings ); } /** - * List all categories + * List categories + * @param array $parameters + * @param Request|null $request + * @return string + * @throws \Exception */ - public function index( array $Parameters, ?Request $Request ): string + public function index( array $parameters, ?Request $request ): string { - $User = Registry::getInstance()->get( 'Auth.User' ); + $user = Registry::getInstance()->get( 'Auth.User' ); - if( !$User ) + if( !$user ) { throw new \RuntimeException( 'Authenticated user not found' ); } - $categoriesWithCount = $this->_CategoryRepository->allWithPostCount(); + $categoriesWithCount = $this->_categoryRepository->allWithPostCount(); - $ViewData = [ + $viewData = [ 'Title' => 'Categories | Admin | ' . $this->getName(), 'Description' => 'Manage blog categories', - 'User' => $User, + 'User' => $user, 'CategoriesWithCount' => $categoriesWithCount ]; return $this->renderHtml( HttpResponseStatus::OK, - $ViewData, + $viewData, 'index', 'categories' ); } /** - * Show create category form + * List categories + * @param array $parameters + * @param Request|null $request + * @return string + * @throws \Exception */ - public function create( array $Parameters, ?Request $Request ): string + public function create( array $parameters, ?Request $request ): string { - $User = Registry::getInstance()->get( 'Auth.User' ); + $user = Registry::getInstance()->get( 'Auth.User' ); - if( !$User ) + if( !$user ) { throw new \RuntimeException( 'Authenticated user not found' ); } - $ViewData = [ + $viewData = [ 'Title' => 'Create Category | Admin | ' . $this->getName(), 'Description' => 'Create a new blog category', - 'User' => $User + 'User' => $user ]; return $this->renderHtml( HttpResponseStatus::OK, - $ViewData, + $viewData, 'create', 'categories' ); @@ -94,12 +102,16 @@ public function create( array $Parameters, ?Request $Request ): string /** * Store new category + * @param array $parameters + * @param Request|null $request + * @return string + * @throws NotFound */ - public function store( array $Parameters, ?Request $Request ): string + public function store( array $parameters, ?Request $request ): string { - $User = Registry::getInstance()->get( 'Auth.User' ); + $user = Registry::getInstance()->get( 'Auth.User' ); - if( !$User ) + if( !$user ) { throw new \RuntimeException( 'Authenticated user not found' ); } @@ -107,18 +119,18 @@ public function store( array $Parameters, ?Request $Request ): string try { // Get form data - $name = $Request->post( 'name' ); - $slug = $Request->post( 'slug' ); - $description = $Request->post( 'description' ); + $name = $request->post( 'name' ); + $slug = $request->post( 'slug' ); + $description = $request->post( 'description' ); // Create category - $Category = new Category(); - $Category->setName( $name ); - $Category->setSlug( $slug ?: $this->generateSlug( $name ) ); - $Category->setDescription( $description ); + $category = new Category(); + $category->setName( $name ); + $category->setSlug( $slug ?: $this->generateSlug( $name ) ); + $category->setDescription( $description ); // Save category - $this->_CategoryRepository->create( $Category ); + $this->_categoryRepository->create( $category ); // Redirect to category list header( 'Location: /admin/categories' ); @@ -126,16 +138,16 @@ public function store( array $Parameters, ?Request $Request ): string } catch( \Exception $e ) { - $ViewData = [ + $viewData = [ 'Title' => 'Create Category | Admin | ' . $this->getName(), 'Description' => 'Create a new blog category', - 'User' => $User, + 'User' => $user, 'Error' => $e->getMessage() ]; return $this->renderHtml( HttpResponseStatus::BAD_REQUEST, - $ViewData, + $viewData, 'create', 'categories' ); @@ -144,34 +156,38 @@ public function store( array $Parameters, ?Request $Request ): string /** * Show edit category form + * @param array $parameters + * @param Request|null $request + * @return string + * @throws \Exception */ - public function edit( array $Parameters, ?Request $Request ): string + public function edit( array $parameters, ?Request $request ): string { - $User = Registry::getInstance()->get( 'Auth.User' ); + $user = Registry::getInstance()->get( 'Auth.User' ); - if( !$User ) + if( !$user ) { throw new \RuntimeException( 'Authenticated user not found' ); } - $categoryId = (int)$Parameters['id']; - $Category = $this->_CategoryRepository->findById( $categoryId ); + $categoryId = (int)$parameters['id']; + $category = $this->_categoryRepository->findById( $categoryId ); - if( !$Category ) + if( !$category ) { throw new \RuntimeException( 'Category not found' ); } - $ViewData = [ + $viewData = [ 'Title' => 'Edit Category | Admin | ' . $this->getName(), 'Description' => 'Edit blog category', - 'User' => $User, - 'Category' => $Category + 'User' => $user, + 'Category' => $category ]; return $this->renderHtml( HttpResponseStatus::OK, - $ViewData, + $viewData, 'edit', 'categories' ); @@ -179,20 +195,24 @@ public function edit( array $Parameters, ?Request $Request ): string /** * Update category + * @param array $parameters + * @param Request|null $request + * @return string + * @throws \Exception */ - public function update( array $Parameters, ?Request $Request ): string + public function update( array $parameters, ?Request $request ): string { - $User = Registry::getInstance()->get( 'Auth.User' ); + $user = Registry::getInstance()->get( 'Auth.User' ); - if( !$User ) + if( !$user ) { throw new \RuntimeException( 'Authenticated user not found' ); } - $categoryId = (int)$Parameters['id']; - $Category = $this->_CategoryRepository->findById( $categoryId ); + $categoryId = (int)$parameters['id']; + $category = $this->_categoryRepository->findById( $categoryId ); - if( !$Category ) + if( !$category ) { throw new \RuntimeException( 'Category not found' ); } @@ -200,17 +220,17 @@ public function update( array $Parameters, ?Request $Request ): string try { // Get form data - $name = $Request->post( 'name' ); - $slug = $Request->post( 'slug' ); - $description = $Request->post( 'description' ); + $name = $request->post( 'name' ); + $slug = $request->post( 'slug' ); + $description = $request->post( 'description' ); // Update category - $Category->setName( $name ); - $Category->setSlug( $slug ?: $this->generateSlug( $name ) ); - $Category->setDescription( $description ); + $category->setName( $name ); + $category->setSlug( $slug ?: $this->generateSlug( $name ) ); + $category->setDescription( $description ); // Save category - $this->_CategoryRepository->update( $Category ); + $this->_categoryRepository->update( $category ); // Redirect to category list header( 'Location: /admin/categories' ); @@ -218,17 +238,17 @@ public function update( array $Parameters, ?Request $Request ): string } catch( \Exception $e ) { - $ViewData = [ + $viewData = [ 'Title' => 'Edit Category | Admin | ' . $this->getName(), 'Description' => 'Edit blog category', - 'User' => $User, - 'Category' => $Category, + 'User' => $user, + 'Category' => $category, 'Error' => $e->getMessage() ]; return $this->renderHtml( HttpResponseStatus::BAD_REQUEST, - $ViewData, + $viewData, 'edit', 'categories' ); @@ -237,27 +257,31 @@ public function update( array $Parameters, ?Request $Request ): string /** * Delete category + * @param array $parameters + * @param Request|null $request + * @return string + * @throws \Exception */ - public function destroy( array $Parameters, ?Request $Request ): string + public function destroy( array $parameters, ?Request $request ): string { - $User = Registry::getInstance()->get( 'Auth.User' ); + $user = Registry::getInstance()->get( 'Auth.User' ); - if( !$User ) + if( !$user ) { throw new \RuntimeException( 'Authenticated user not found' ); } - $categoryId = (int)$Parameters['id']; - $Category = $this->_CategoryRepository->findById( $categoryId ); + $categoryId = (int)$parameters['id']; + $category = $this->_categoryRepository->findById( $categoryId ); - if( !$Category ) + if( !$category ) { throw new \RuntimeException( 'Category not found' ); } try { - $this->_CategoryRepository->delete( $categoryId ); + $this->_categoryRepository->delete( $categoryId ); // Redirect to category list header( 'Location: /admin/categories' ); @@ -271,6 +295,8 @@ public function destroy( array $Parameters, ?Request $Request ): string /** * Generate slug from name + * @param string $name + * @return string */ private function generateSlug( string $name ): string { @@ -280,43 +306,4 @@ private function generateSlug( string $name ): string return trim( $slug, '-' ); } - /** - * Get database configuration from settings - */ - private function getDatabaseConfig( SettingManager $Settings ): ?array - { - try - { - $settingNames = $Settings->getSectionSettingNames( 'database' ); - - if( empty( $settingNames ) ) - { - return null; - } - - $config = []; - foreach( $settingNames as $name ) - { - $value = $Settings->get( 'database', $name ); - if( $value !== null ) - { - // Convert string values to appropriate types - if( $name === 'port' ) - { - $config[$name] = (int)$value; - } - else - { - $config[$name] = $value; - } - } - } - - return $config; - } - catch( \Exception $e ) - { - return null; - } - } } diff --git a/src/Cms/Controllers/Admin/DashboardController.php b/src/Cms/Controllers/Admin/DashboardController.php index 09b44eb..a21edc9 100644 --- a/src/Cms/Controllers/Admin/DashboardController.php +++ b/src/Cms/Controllers/Admin/DashboardController.php @@ -17,45 +17,53 @@ */ class DashboardController extends Content { + /** + * @param Application|null $app + * @return void + * @throws \Exception + */ public function __construct( ?Application $app = null ) { parent::__construct( $app ); } + /** * Show admin dashboard + * @param array $parameters + * @return string */ - public function index( array $Parameters ): string + public function index( array $parameters ): string { // Get authenticated user from Registry - $User = Registry::getInstance()->get( 'Auth.User' ); + $user = Registry::getInstance()->get( 'Auth.User' ); - if( !$User ) + if( !$user ) { throw new \RuntimeException( 'Authenticated user not found in Registry' ); } // Generate CSRF token and store in Registry for helper functions - $SessionManager = new SessionManager(); - $SessionManager->start(); - $CsrfManager = new CsrfTokenManager( $SessionManager ); - Registry::getInstance()->set( 'Auth.CsrfToken', $CsrfManager->getToken() ); + $sessionManager = new SessionManager(); + $sessionManager->start(); + $csrfManager = new CsrfTokenManager( $sessionManager ); + Registry::getInstance()->set( 'Auth.CsrfToken', $csrfManager->getToken() ); - $ViewData = [ + $viewData = [ 'Title' => 'Dashboard | ' . $this->getName(), 'Description' => 'Admin Dashboard', - 'User' => $User, - 'WelcomeMessage' => 'Welcome back, ' . $User->getUsername() . '!' + 'User' => $user, + 'WelcomeMessage' => 'Welcome back, ' . $user->getUsername() . '!' ]; // Manually render with custom controller path @http_response_code( HttpResponseStatus::OK->value ); - $View = new Html(); - $View->setController( 'Admin/Dashboard' ) + $view = new Html(); + $view->setController( 'Admin/Dashboard' ) ->setLayout( 'admin' ) ->setPage( 'index' ); - return $View->render( $ViewData ); + return $view->render( $viewData ); } } diff --git a/src/Cms/Controllers/Admin/PostController.php b/src/Cms/Controllers/Admin/PostController.php index 7261cb0..17383e3 100644 --- a/src/Cms/Controllers/Admin/PostController.php +++ b/src/Cms/Controllers/Admin/PostController.php @@ -2,14 +2,15 @@ namespace Neuron\Cms\Controllers\Admin; -use DateTimeImmutable; use Neuron\Cms\Controllers\Content; use Neuron\Cms\Models\Post; -use Neuron\Cms\Models\Category; -use Neuron\Cms\Models\Tag; use Neuron\Cms\Repositories\DatabasePostRepository; use Neuron\Cms\Repositories\DatabaseCategoryRepository; use Neuron\Cms\Repositories\DatabaseTagRepository; +use Neuron\Cms\Services\Post\Creator; +use Neuron\Cms\Services\Post\Updater; +use Neuron\Cms\Services\Post\Deleter; +use Neuron\Cms\Services\Tag\Resolver as TagResolver; use Neuron\Cms\Auth\CsrfTokenManager; use Neuron\Cms\Auth\SessionManager; use Neuron\Data\Setting\SettingManager; @@ -25,121 +26,152 @@ */ class PostController extends Content { - private DatabasePostRepository $_PostRepository; - private DatabaseCategoryRepository $_CategoryRepository; - private DatabaseTagRepository $_TagRepository; + private DatabasePostRepository $_postRepository; + private DatabaseCategoryRepository $_categoryRepository; + private DatabaseTagRepository $_tagRepository; + private Creator $_postCreator; + private Updater $_postUpdater; + private Deleter $_postDeleter; + + /** + * @param Application|null $app + * @throws \Exception + */ public function __construct( ?Application $app = null ) { parent::__construct( $app ); - // Get database config from settings - $Settings = Registry::getInstance()->get( 'Settings' ); - $dbConfig = $this->getDatabaseConfig( $Settings ); - - if( !$dbConfig ) - { - throw new \RuntimeException( 'Database configuration not found' ); - } + // Get settings for repositories + $settings = Registry::getInstance()->get( 'Settings' ); // Initialize repositories - $this->_PostRepository = new DatabasePostRepository( $dbConfig ); - $this->_CategoryRepository = new DatabaseCategoryRepository( $dbConfig ); - $this->_TagRepository = new DatabaseTagRepository( $dbConfig ); + $this->_postRepository = new DatabasePostRepository( $settings ); + $this->_categoryRepository = new DatabaseCategoryRepository( $settings ); + $this->_tagRepository = new DatabaseTagRepository( $settings ); + + // Initialize services + $tagResolver = new TagResolver( + $this->_tagRepository, + new \Neuron\Cms\Services\Tag\Creator( $this->_tagRepository ) + ); + + $this->_postCreator = new Creator( + $this->_postRepository, + $this->_categoryRepository, + $tagResolver + ); + + $this->_postUpdater = new Updater( + $this->_postRepository, + $this->_categoryRepository, + $tagResolver + ); + + $this->_postDeleter = new Deleter( $this->_postRepository ); } /** * List all posts + * @param array $parameters + * @return string + * @throws \Exception */ - public function index( array $Parameters ): string + public function index( array $parameters ): string { - $User = Registry::getInstance()->get( 'Auth.User' ); + $user = Registry::getInstance()->get( 'Auth.User' ); - if( !$User ) + if( !$user ) { throw new \RuntimeException( 'Authenticated user not found' ); } // Generate CSRF token - $SessionManager = new SessionManager(); - $SessionManager->start(); - $CsrfManager = new CsrfTokenManager( $SessionManager ); - Registry::getInstance()->set( 'Auth.CsrfToken', $CsrfManager->getToken() ); + $sessionManager = new SessionManager(); + $sessionManager->start(); + $csrfManager = new CsrfTokenManager( $sessionManager ); + Registry::getInstance()->set( 'Auth.CsrfToken', $csrfManager->getToken() ); // Get all posts or filter by author if not admin - if( $User->isAdmin() || $User->isEditor() ) + if( $user->isAdmin() || $user->isEditor() ) { - $posts = $this->_PostRepository->all(); + $posts = $this->_postRepository->all(); } else { - $posts = $this->_PostRepository->getByAuthor( $User->getUsername() ); + $posts = $this->_postRepository->getByAuthor( $user->getUsername() ); } - $ViewData = [ + $viewData = [ 'Title' => 'Posts | ' . $this->getName(), 'Description' => 'Manage blog posts', - 'User' => $User, + 'User' => $user, 'posts' => $posts, - 'Success' => $SessionManager->getFlash( 'success' ), - 'Error' => $SessionManager->getFlash( 'error' ) + 'Success' => $sessionManager->getFlash( 'success' ), + 'Error' => $sessionManager->getFlash( 'error' ) ]; @http_response_code( HttpResponseStatus::OK->value ); - $View = new Html(); - $View->setController( 'Admin/Posts' ) + $view = new Html(); + $view->setController( 'Admin/Posts' ) ->setLayout( 'admin' ) ->setPage( 'index' ); - return $View->render( $ViewData ); + return $view->render( $viewData ); } /** * Show create post form + * @param array $parameters + * @return string + * @throws \Exception */ - public function create( array $Parameters ): string + public function create( array $parameters ): string { - $User = Registry::getInstance()->get( 'Auth.User' ); + $user = Registry::getInstance()->get( 'Auth.User' ); - if( !$User ) + if( !$user ) { throw new \RuntimeException( 'Authenticated user not found' ); } // Generate CSRF token - $SessionManager = new SessionManager(); - $SessionManager->start(); - $CsrfManager = new CsrfTokenManager( $SessionManager ); - Registry::getInstance()->set( 'Auth.CsrfToken', $CsrfManager->getToken() ); + $sessionManager = new SessionManager(); + $sessionManager->start(); + $csrfManager = new CsrfTokenManager( $sessionManager ); + Registry::getInstance()->set( 'Auth.CsrfToken', $csrfManager->getToken() ); - $ViewData = [ + $viewData = [ 'Title' => 'Create Post | ' . $this->getName(), 'Description' => 'Create a new blog post', - 'User' => $User, - 'categories' => $this->_CategoryRepository->all() + 'User' => $user, + 'categories' => $this->_categoryRepository->all() ]; @http_response_code( HttpResponseStatus::OK->value ); - $View = new Html(); - $View->setController( 'Admin/Posts' ) + $view = new Html(); + $view->setController( 'Admin/Posts' ) ->setLayout( 'admin' ) ->setPage( 'create' ); - return $View->render( $ViewData ); + return $view->render( $viewData ); } /** * Store new post + * @param array $parameters + * @return string + * @throws \Exception */ - public function store( array $Parameters ): string + public function store( array $parameters ): string { - $User = Registry::getInstance()->get( 'Auth.User' ); - $SessionManager = new SessionManager(); - $SessionManager->start(); + $user = Registry::getInstance()->get( 'Auth.User' ); + $sessionManager = new SessionManager(); + $sessionManager->start(); - if( !$User ) + if( !$user ) { throw new \RuntimeException( 'Authenticated user not found' ); } @@ -156,67 +188,26 @@ public function store( array $Parameters ): string $categoryIds = $_POST['categories'] ?? []; $tagNames = $_POST['tags'] ?? ''; - // Create post - $Post = new Post(); - $Post->setTitle( $title ); - $Post->setSlug( $slug ?: $this->generateSlug( $title ) ); - $Post->setContent( $content ); - $Post->setExcerpt( $excerpt ); - $Post->setFeaturedImage( $featuredImage ); - $Post->setAuthor( $User->getUsername() ); - $Post->setStatus( $status ); - $Post->setCreatedAt( new DateTimeImmutable() ); - - // Set published date if status is published - if( $status === Post::STATUS_PUBLISHED ) - { - $Post->setPublishedAt( new DateTimeImmutable() ); - } - - // Load categories - $categories = []; - foreach( $categoryIds as $categoryId ) - { - $category = $this->_CategoryRepository->findById( (int)$categoryId ); - if( $category ) - { - $categories[] = $category; - } - } - $Post->setCategories( $categories ); - - // Parse and create/load tags - $tags = []; - if( !empty( $tagNames ) ) - { - $tagArray = array_map( 'trim', explode( ',', $tagNames ) ); - foreach( $tagArray as $tagName ) - { - if( empty( $tagName ) ) continue; - - $tag = $this->_TagRepository->findByName( $tagName ); - if( !$tag ) - { - $tag = new Tag(); - $tag->setName( $tagName ); - $tag->setSlug( $this->generateSlug( $tagName ) ); - $this->_TagRepository->create( $tag ); - } - $tags[] = $tag; - } - } - $Post->setTags( $tags ); - - // Save post - $this->_PostRepository->create( $Post ); - - $SessionManager->flash( 'success', 'Post created successfully' ); + // Create post using service + $this->_postCreator->create( + $title, + $content, + $user->getId(), + $status, + $slug ?: null, + $excerpt ?: null, + $featuredImage ?: null, + $categoryIds, + $tagNames + ); + + $sessionManager->flash( 'success', 'Post created successfully' ); header( 'Location: /admin/posts' ); exit; } catch( \Exception $e ) { - $SessionManager->flash( 'error', 'Failed to create post: ' . $e->getMessage() ); + $sessionManager->flash( 'error', 'Failed to create post: ' . $e->getMessage() ); header( 'Location: /admin/posts/create' ); exit; } @@ -224,84 +215,90 @@ public function store( array $Parameters ): string /** * Show edit post form + * @param array $parameters + * @return string + * @throws \Exception */ - public function edit( array $Parameters ): string + public function edit( array $parameters ): string { - $User = Registry::getInstance()->get( 'Auth.User' ); + $user = Registry::getInstance()->get( 'Auth.User' ); - if( !$User ) + if( !$user ) { throw new \RuntimeException( 'Authenticated user not found' ); } - $postId = (int)$Parameters['id']; - $post = $this->_PostRepository->findById( $postId ); + $postId = (int)$parameters['id']; + $post = $this->_postRepository->findById( $postId ); if( !$post ) { - $SessionManager = new SessionManager(); - $SessionManager->start(); - $SessionManager->flash( 'error', 'Post not found' ); + $sessionManager = new SessionManager(); + $sessionManager->start(); + $sessionManager->flash( 'error', 'Post not found' ); header( 'Location: /admin/posts' ); exit; } // Check permissions - if( !$User->isAdmin() && !$User->isEditor() && $post->getAuthor() !== $User->getUsername() ) + if( !$user->isAdmin() && !$user->isEditor() && $post->getAuthor() !== $user->getUsername() ) { throw new \RuntimeException( 'Unauthorized to edit this post' ); } // Generate CSRF token - $SessionManager = new SessionManager(); - $SessionManager->start(); - $CsrfManager = new CsrfTokenManager( $SessionManager ); - Registry::getInstance()->set( 'Auth.CsrfToken', $CsrfManager->getToken() ); + $sessionManager = new SessionManager(); + $sessionManager->start(); + $csrfManager = new CsrfTokenManager( $sessionManager ); + Registry::getInstance()->set( 'Auth.CsrfToken', $csrfManager->getToken() ); - $ViewData = [ + $viewData = [ 'Title' => 'Edit Post | ' . $this->getName(), 'Description' => 'Edit blog post', - 'User' => $User, + 'User' => $user, 'post' => $post, - 'categories' => $this->_CategoryRepository->all() + 'categories' => $this->_categoryRepository->all() ]; @http_response_code( HttpResponseStatus::OK->value ); - $View = new Html(); - $View->setController( 'Admin/Posts' ) + $view = new Html(); + $view->setController( 'Admin/Posts' ) ->setLayout( 'admin' ) ->setPage( 'edit' ); - return $View->render( $ViewData ); + return $view->render( $viewData ); } /** * Update post + * @param array $parameters + * @return string + * @throws \Exception */ - public function update( array $Parameters ): string + public function update( array $parameters ): string { - $User = Registry::getInstance()->get( 'Auth.User' ); - $SessionManager = new SessionManager(); - $SessionManager->start(); + $user = Registry::getInstance()->get( 'Auth.User' ); + $sessionManager = new SessionManager(); + $sessionManager->start(); - if( !$User ) + if( !$user ) { throw new \RuntimeException( 'Authenticated user not found' ); } - $postId = (int)$Parameters['id']; - $Post = $this->_PostRepository->findById( $postId ); + $postId = (int)$parameters['id']; + $post = $this->_postRepository->findById( $postId ); - if( !$Post ) + if( !$post ) { - $SessionManager->flash( 'error', 'Post not found' ); + $sessionManager->flash( 'error', 'Post not found' ); header( 'Location: /admin/posts' ); exit; } // Check permissions - if( !$User->isAdmin() && !$User->isEditor() && $Post->getAuthor() !== $User->getUsername() ) + if( !$user->isAdmin() && !$user->isEditor() && $post->getAuthor() !== $user->getUsername() ) { throw new \RuntimeException( 'Unauthorized to edit this post' ); } @@ -318,64 +315,26 @@ public function update( array $Parameters ): string $categoryIds = $_POST['categories'] ?? []; $tagNames = $_POST['tags'] ?? ''; - // Update post - $Post->setTitle( $title ); - $Post->setSlug( $slug ?: $this->generateSlug( $title ) ); - $Post->setContent( $content ); - $Post->setExcerpt( $excerpt ); - $Post->setFeaturedImage( $featuredImage ); - $Post->setStatus( $status ); - - // Set published date if status changed to published - if( $status === Post::STATUS_PUBLISHED && !$Post->getPublishedAt() ) - { - $Post->setPublishedAt( new DateTimeImmutable() ); - } - - // Load categories - $categories = []; - foreach( $categoryIds as $categoryId ) - { - $category = $this->_CategoryRepository->findById( (int)$categoryId ); - if( $category ) - { - $categories[] = $category; - } - } - $Post->setCategories( $categories ); - - // Parse and create/load tags - $tags = []; - if( !empty( $tagNames ) ) - { - $tagArray = array_map( 'trim', explode( ',', $tagNames ) ); - foreach( $tagArray as $tagName ) - { - if( empty( $tagName ) ) continue; - - $tag = $this->_TagRepository->findByName( $tagName ); - if( !$tag ) - { - $tag = new Tag(); - $tag->setName( $tagName ); - $tag->setSlug( $this->generateSlug( $tagName ) ); - $this->_TagRepository->create( $tag ); - } - $tags[] = $tag; - } - } - $Post->setTags( $tags ); - - // Save post - $this->_PostRepository->update( $Post ); - - $SessionManager->flash( 'success', 'Post updated successfully' ); + // Update post using service + $this->_postUpdater->update( + $post, + $title, + $content, + $status, + $slug ?: null, + $excerpt ?: null, + $featuredImage ?: null, + $categoryIds, + $tagNames + ); + + $sessionManager->flash( 'success', 'Post updated successfully' ); header( 'Location: /admin/posts' ); exit; } catch( \Exception $e ) { - $SessionManager->flash( 'error', 'Failed to update post: ' . $e->getMessage() ); + $sessionManager->flash( 'error', 'Failed to update post: ' . $e->getMessage() ); header( 'Location: /admin/posts/' . $postId . '/edit' ); exit; } @@ -383,98 +342,49 @@ public function update( array $Parameters ): string /** * Delete post + * @param array $parameters + * @return string */ - public function destroy( array $Parameters ): string + public function destroy( array $parameters ): string { - $User = Registry::getInstance()->get( 'Auth.User' ); - $SessionManager = new SessionManager(); - $SessionManager->start(); + $user = Registry::getInstance()->get( 'Auth.User' ); + $sessionManager = new SessionManager(); + $sessionManager->start(); - if( !$User ) + if( !$user ) { throw new \RuntimeException( 'Authenticated user not found' ); } - $postId = (int)$Parameters['id']; - $Post = $this->_PostRepository->findById( $postId ); + $postId = (int)$parameters['id']; + $post = $this->_postRepository->findById( $postId ); - if( !$Post ) + if( !$post ) { - $SessionManager->flash( 'error', 'Post not found' ); + $sessionManager->flash( 'error', 'Post not found' ); header( 'Location: /admin/posts' ); exit; } // Check permissions - if( !$User->isAdmin() && !$User->isEditor() && $Post->getAuthor() !== $User->getUsername() ) + if( !$user->isAdmin() && !$user->isEditor() && $post->getAuthor() !== $user->getUsername() ) { - $SessionManager->flash( 'error', 'Unauthorized to delete this post' ); + $sessionManager->flash( 'error', 'Unauthorized to delete this post' ); header( 'Location: /admin/posts' ); exit; } try { - $this->_PostRepository->delete( $postId ); - $SessionManager->flash( 'success', 'Post deleted successfully' ); + $this->_postDeleter->delete( $post ); + $sessionManager->flash( 'success', 'Post deleted successfully' ); } catch( \Exception $e ) { - $SessionManager->flash( 'error', 'Failed to delete post: ' . $e->getMessage() ); + $sessionManager->flash( 'error', 'Failed to delete post: ' . $e->getMessage() ); } header( 'Location: /admin/posts' ); exit; } - - /** - * Generate slug from title - */ - private function generateSlug( string $title ): string - { - $slug = strtolower( trim( $title ) ); - $slug = preg_replace( '/[^a-z0-9-]/', '-', $slug ); - $slug = preg_replace( '/-+/', '-', $slug ); - return trim( $slug, '-' ); - } - - /** - * Get database configuration from settings - */ - private function getDatabaseConfig( SettingManager $Settings ): ?array - { - try - { - $settingNames = $Settings->getSectionSettingNames( 'database' ); - - if( empty( $settingNames ) ) - { - return null; - } - - $config = []; - foreach( $settingNames as $name ) - { - $value = $Settings->get( 'database', $name ); - if( $value !== null ) - { - // Convert string values to appropriate types - if( $name === 'port' ) - { - $config[$name] = (int)$value; - } - else - { - $config[$name] = $value; - } - } - } - - return $config; - } - catch( \Exception $e ) - { - return null; - } - } } diff --git a/src/Cms/Controllers/Admin/ProfileController.php b/src/Cms/Controllers/Admin/ProfileController.php index 1ddea62..18db09c 100644 --- a/src/Cms/Controllers/Admin/ProfileController.php +++ b/src/Cms/Controllers/Admin/ProfileController.php @@ -20,66 +20,76 @@ */ class ProfileController extends Content { - private DatabaseUserRepository $_Repository; - private PasswordHasher $_Hasher; - private SessionManager $_SessionManager; + private DatabaseUserRepository $_repository; + private PasswordHasher $_hasher; + private SessionManager $_sessionManager; + + /** + * @param Application|null $app + * @throws \Exception + */ public function __construct( ?Application $app = null ) { parent::__construct( $app ); - // Get database config and initialize repository - $Settings = Registry::getInstance()->get( 'Settings' ); - $dbConfig = $this->getDatabaseConfig( $Settings ); + // Get settings and initialize repository + $settings = Registry::getInstance()->get( 'Settings' ); - $this->_Repository = new DatabaseUserRepository( $dbConfig ); - $this->_Hasher = new PasswordHasher(); - $this->_SessionManager = new SessionManager(); - $this->_SessionManager->start(); + $this->_repository = new DatabaseUserRepository( $settings ); + $this->_hasher = new PasswordHasher(); + $this->_sessionManager = new SessionManager(); + $this->_sessionManager->start(); } /** * Show profile edit form + * @param array $parameters + * @return string + * @throws \Exception */ - public function edit( array $Parameters ): string + public function edit( array $parameters ): string { - $User = Registry::getInstance()->get( 'Auth.User' ); + $user = Registry::getInstance()->get( 'Auth.User' ); - if( !$User ) + if( !$user ) { throw new \RuntimeException( 'Authenticated user not found' ); } // Generate CSRF token - $CsrfManager = new CsrfTokenManager( $this->_SessionManager ); - Registry::getInstance()->set( 'Auth.CsrfToken', $CsrfManager->getToken() ); + $csrfManager = new CsrfTokenManager( $this->_sessionManager ); + Registry::getInstance()->set( 'Auth.CsrfToken', $csrfManager->getToken() ); - $ViewData = [ + $viewData = [ 'Title' => 'Profile | ' . $this->getName(), 'Description' => 'Edit Your Profile', - 'User' => $User, - 'success' => $this->_SessionManager->getFlash( 'success' ), - 'error' => $this->_SessionManager->getFlash( 'error' ) + 'User' => $user, + 'success' => $this->_sessionManager->getFlash( 'success' ), + 'error' => $this->_sessionManager->getFlash( 'error' ) ]; @http_response_code( HttpResponseStatus::OK->value ); - $View = new Html(); - $View->setController( 'Admin/Profile' ) + $view = new Html(); + $view->setController( 'Admin/Profile' ) ->setLayout( 'admin' ) ->setPage( 'edit' ); - return $View->render( $ViewData ); + return $view->render( $viewData ); } /** * Update profile + * @param array $parameters + * @return string + * @throws \Exception */ - public function update( array $Parameters ): string + public function update( array $parameters ): string { - $User = Registry::getInstance()->get( 'Auth.User' ); + $user = Registry::getInstance()->get( 'Auth.User' ); - if( !$User ) + if( !$user ) { throw new \RuntimeException( 'Authenticated user not found' ); } @@ -90,18 +100,18 @@ public function update( array $Parameters ): string $confirmPassword = $_POST['confirm_password'] ?? ''; // Update email - if( !empty( $email ) && $email !== $User->getEmail() ) + if( !empty( $email ) && $email !== $user->getEmail() ) { - $User->setEmail( $email ); + $user->setEmail( $email ); } // Update password if provided if( !empty( $newPassword ) ) { // Verify current password - if( empty( $currentPassword ) || !$this->_Hasher->verify( $currentPassword, $User->getPasswordHash() ) ) + if( empty( $currentPassword ) || !$this->_hasher->verify( $currentPassword, $user->getPasswordHash() ) ) { - $this->_SessionManager->flash( 'error', 'Current password is incorrect' ); + $this->_sessionManager->flash( 'error', 'Current password is incorrect' ); header( 'Location: /admin/profile' ); exit; } @@ -109,52 +119,32 @@ public function update( array $Parameters ): string // Validate new password if( $newPassword !== $confirmPassword ) { - $this->_SessionManager->flash( 'error', 'New passwords do not match' ); + $this->_sessionManager->flash( 'error', 'New passwords do not match' ); header( 'Location: /admin/profile' ); exit; } - if( !$this->_Hasher->meetsRequirements( $newPassword ) ) + if( !$this->_hasher->meetsRequirements( $newPassword ) ) { - $this->_SessionManager->flash( 'error', 'Password does not meet requirements' ); + $this->_sessionManager->flash( 'error', 'Password does not meet requirements' ); header( 'Location: /admin/profile' ); exit; } - $User->setPasswordHash( $this->_Hasher->hash( $newPassword ) ); + $user->setPasswordHash( $this->_hasher->hash( $newPassword ) ); } try { - $this->_Repository->update( $User ); - $this->_SessionManager->flash( 'success', 'Profile updated successfully' ); + $this->_repository->update( $user ); + $this->_sessionManager->flash( 'success', 'Profile updated successfully' ); } catch( \Exception $e ) { - $this->_SessionManager->flash( 'error', 'Failed to update profile: ' . $e->getMessage() ); + $this->_sessionManager->flash( 'error', 'Failed to update profile: ' . $e->getMessage() ); } header( 'Location: /admin/profile' ); exit; } - - /** - * Get database configuration from settings - */ - private function getDatabaseConfig( SettingManager $Settings ): array - { - $config = []; - $settingNames = $Settings->getSectionSettingNames( 'database' ); - - foreach( $settingNames as $name ) - { - $value = $Settings->get( 'database', $name ); - if( $value !== null ) - { - $config[$name] = ( $name === 'port' ) ? (int)$value : $value; - } - } - - return $config; - } } diff --git a/src/Cms/Controllers/Admin/TagController.php b/src/Cms/Controllers/Admin/TagController.php index 589c801..2652e78 100644 --- a/src/Cms/Controllers/Admin/TagController.php +++ b/src/Cms/Controllers/Admin/TagController.php @@ -5,7 +5,6 @@ use Neuron\Cms\Controllers\Content; use Neuron\Cms\Models\Tag; use Neuron\Cms\Repositories\DatabaseTagRepository; -use Neuron\Data\Setting\SettingManager; use Neuron\Mvc\Application; use Neuron\Mvc\Requests\Request; use Neuron\Mvc\Responses\HttpResponseStatus; @@ -18,49 +17,52 @@ */ class TagController extends Content { - private DatabaseTagRepository $_TagRepository; + private DatabaseTagRepository $_tagRepository; + + /** + * @param Application|null $app + * @throws \Exception + */ public function __construct( ?Application $app = null ) { parent::__construct( $app ); - // Get database config from settings - $Settings = Registry::getInstance()->get( 'Settings' ); - $dbConfig = $this->getDatabaseConfig( $Settings ); - - if( !$dbConfig ) - { - throw new \RuntimeException( 'Database configuration not found' ); - } + // Get settings for repositories + $settings = Registry::getInstance()->get( 'Settings' ); // Initialize repository - $this->_TagRepository = new DatabaseTagRepository( $dbConfig ); + $this->_tagRepository = new DatabaseTagRepository( $settings ); } /** * List all tags + * @param array $parameters + * @param Request|null $request + * @return string + * @throws \Exception */ - public function index( array $Parameters, ?Request $Request ): string + public function index( array $parameters, ?Request $request ): string { - $User = Registry::getInstance()->get( 'Auth.User' ); + $user = Registry::getInstance()->get( 'Auth.User' ); - if( !$User ) + if( !$user ) { throw new \RuntimeException( 'Authenticated user not found' ); } - $tagsWithCount = $this->_TagRepository->allWithPostCount(); + $tagsWithCount = $this->_tagRepository->allWithPostCount(); - $ViewData = [ + $viewData = [ 'Title' => 'Tags | Admin | ' . $this->getName(), 'Description' => 'Manage blog tags', - 'User' => $User, + 'User' => $user, 'TagsWithCount' => $tagsWithCount ]; return $this->renderHtml( HttpResponseStatus::OK, - $ViewData, + $viewData, 'index', 'tags' ); @@ -68,25 +70,29 @@ public function index( array $Parameters, ?Request $Request ): string /** * Show create tag form + * @param array $parameters + * @param Request|null $request + * @return string + * @throws \Exception */ - public function create( array $Parameters, ?Request $Request ): string + public function create( array $parameters, ?Request $request ): string { - $User = Registry::getInstance()->get( 'Auth.User' ); + $user = Registry::getInstance()->get( 'Auth.User' ); - if( !$User ) + if( !$user ) { throw new \RuntimeException( 'Authenticated user not found' ); } - $ViewData = [ + $viewData = [ 'Title' => 'Create Tag | Admin | ' . $this->getName(), 'Description' => 'Create a new blog tag', - 'User' => $User + 'User' => $user ]; return $this->renderHtml( HttpResponseStatus::OK, - $ViewData, + $viewData, 'create', 'tags' ); @@ -94,12 +100,16 @@ public function create( array $Parameters, ?Request $Request ): string /** * Store new tag + * @param array $parameters + * @param Request|null $request + * @return string + * @throws \Exception */ - public function store( array $Parameters, ?Request $Request ): string + public function store( array $parameters, ?Request $request ): string { - $User = Registry::getInstance()->get( 'Auth.User' ); + $user = Registry::getInstance()->get( 'Auth.User' ); - if( !$User ) + if( !$user ) { throw new \RuntimeException( 'Authenticated user not found' ); } @@ -107,16 +117,16 @@ public function store( array $Parameters, ?Request $Request ): string try { // Get form data - $name = $Request->post( 'name' ); - $slug = $Request->post( 'slug' ); + $name = $request->post( 'name' ); + $slug = $request->post( 'slug' ); // Create tag - $Tag = new Tag(); - $Tag->setName( $name ); - $Tag->setSlug( $slug ?: $this->generateSlug( $name ) ); + $tag = new Tag(); + $tag->setName( $name ); + $tag->setSlug( $slug ?: $this->generateSlug( $name ) ); // Save tag - $this->_TagRepository->create( $Tag ); + $this->_tagRepository->create( $tag ); // Redirect to tag list header( 'Location: /admin/tags' ); @@ -124,16 +134,16 @@ public function store( array $Parameters, ?Request $Request ): string } catch( \Exception $e ) { - $ViewData = [ + $viewData = [ 'Title' => 'Create Tag | Admin | ' . $this->getName(), 'Description' => 'Create a new blog tag', - 'User' => $User, + 'User' => $user, 'Error' => $e->getMessage() ]; return $this->renderHtml( HttpResponseStatus::BAD_REQUEST, - $ViewData, + $viewData, 'create', 'tags' ); @@ -142,34 +152,38 @@ public function store( array $Parameters, ?Request $Request ): string /** * Show edit tag form + * @param array $parameters + * @param Request|null $request + * @return string + * @throws \Exception */ - public function edit( array $Parameters, ?Request $Request ): string + public function edit( array $parameters, ?Request $request ): string { - $User = Registry::getInstance()->get( 'Auth.User' ); + $user = Registry::getInstance()->get( 'Auth.User' ); - if( !$User ) + if( !$user ) { throw new \RuntimeException( 'Authenticated user not found' ); } - $tagId = (int)$Parameters['id']; - $Tag = $this->_TagRepository->findById( $tagId ); + $tagId = (int)$parameters['id']; + $tag = $this->_tagRepository->findById( $tagId ); - if( !$Tag ) + if( !$tag ) { throw new \RuntimeException( 'Tag not found' ); } - $ViewData = [ + $viewData = [ 'Title' => 'Edit Tag | Admin | ' . $this->getName(), 'Description' => 'Edit blog tag', - 'User' => $User, - 'Tag' => $Tag + 'User' => $user, + 'Tag' => $tag ]; return $this->renderHtml( HttpResponseStatus::OK, - $ViewData, + $viewData, 'edit', 'tags' ); @@ -177,20 +191,24 @@ public function edit( array $Parameters, ?Request $Request ): string /** * Update tag + * @param array $parameters + * @param Request|null $request + * @return string + * @throws \Exception */ - public function update( array $Parameters, ?Request $Request ): string + public function update( array $parameters, ?Request $request ): string { - $User = Registry::getInstance()->get( 'Auth.User' ); + $user = Registry::getInstance()->get( 'Auth.User' ); - if( !$User ) + if( !$user ) { throw new \RuntimeException( 'Authenticated user not found' ); } - $tagId = (int)$Parameters['id']; - $Tag = $this->_TagRepository->findById( $tagId ); + $tagId = (int)$parameters['id']; + $tag = $this->_tagRepository->findById( $tagId ); - if( !$Tag ) + if( !$tag ) { throw new \RuntimeException( 'Tag not found' ); } @@ -198,15 +216,15 @@ public function update( array $Parameters, ?Request $Request ): string try { // Get form data - $name = $Request->post( 'name' ); - $slug = $Request->post( 'slug' ); + $name = $request->post( 'name' ); + $slug = $request->post( 'slug' ); // Update tag - $Tag->setName( $name ); - $Tag->setSlug( $slug ?: $this->generateSlug( $name ) ); + $tag->setName( $name ); + $tag->setSlug( $slug ?: $this->generateSlug( $name ) ); // Save tag - $this->_TagRepository->update( $Tag ); + $this->_tagRepository->update( $tag ); // Redirect to tag list header( 'Location: /admin/tags' ); @@ -214,17 +232,17 @@ public function update( array $Parameters, ?Request $Request ): string } catch( \Exception $e ) { - $ViewData = [ + $viewData = [ 'Title' => 'Edit Tag | Admin | ' . $this->getName(), 'Description' => 'Edit blog tag', - 'User' => $User, - 'Tag' => $Tag, + 'User' => $user, + 'Tag' => $tag, 'Error' => $e->getMessage() ]; return $this->renderHtml( HttpResponseStatus::BAD_REQUEST, - $ViewData, + $viewData, 'edit', 'tags' ); @@ -233,27 +251,31 @@ public function update( array $Parameters, ?Request $Request ): string /** * Delete tag + * @param array $parameters + * @param Request|null $request + * @return string + * @throws \Exception */ - public function destroy( array $Parameters, ?Request $Request ): string + public function destroy( array $parameters, ?Request $request ): string { - $User = Registry::getInstance()->get( 'Auth.User' ); + $user = Registry::getInstance()->get( 'Auth.User' ); - if( !$User ) + if( !$user ) { throw new \RuntimeException( 'Authenticated user not found' ); } - $tagId = (int)$Parameters['id']; - $Tag = $this->_TagRepository->findById( $tagId ); + $tagId = (int)$parameters['id']; + $tag = $this->_tagRepository->findById( $tagId ); - if( !$Tag ) + if( !$tag ) { throw new \RuntimeException( 'Tag not found' ); } try { - $this->_TagRepository->delete( $tagId ); + $this->_tagRepository->delete( $tagId ); // Redirect to tag list header( 'Location: /admin/tags' ); @@ -267,6 +289,9 @@ public function destroy( array $Parameters, ?Request $Request ): string /** * Generate slug from name + * @param string $name + * @return string + * @throws \Exception */ private function generateSlug( string $name ): string { @@ -275,44 +300,4 @@ private function generateSlug( string $name ): string $slug = preg_replace( '/-+/', '-', $slug ); return trim( $slug, '-' ); } - - /** - * Get database configuration from settings - */ - private function getDatabaseConfig( SettingManager $Settings ): ?array - { - try - { - $settingNames = $Settings->getSectionSettingNames( 'database' ); - - if( empty( $settingNames ) ) - { - return null; - } - - $config = []; - foreach( $settingNames as $name ) - { - $value = $Settings->get( 'database', $name ); - if( $value !== null ) - { - // Convert string values to appropriate types - if( $name === 'port' ) - { - $config[$name] = (int)$value; - } - else - { - $config[$name] = $value; - } - } - } - - return $config; - } - catch( \Exception $e ) - { - return null; - } - } } diff --git a/src/Cms/Controllers/Admin/UserController.php b/src/Cms/Controllers/Admin/UserController.php index f838a63..232f77f 100644 --- a/src/Cms/Controllers/Admin/UserController.php +++ b/src/Cms/Controllers/Admin/UserController.php @@ -21,88 +21,101 @@ */ class UserController extends Content { - private DatabaseUserRepository $_Repository; - private PasswordHasher $_Hasher; - private SessionManager $_SessionManager; + private DatabaseUserRepository $_repository; + private PasswordHasher $_hasher; + private SessionManager $_sessionManager; + + /** + * @param Application|null $app + * @throws \Exception + */ public function __construct( ?Application $app = null ) { parent::__construct( $app ); - // Get database config and initialize repository - $Settings = Registry::getInstance()->get( 'Settings' ); - $dbConfig = $this->getDatabaseConfig( $Settings ); + // Get settings and initialize repository + $settings = Registry::getInstance()->get( 'Settings' ); - $this->_Repository = new DatabaseUserRepository( $dbConfig ); - $this->_Hasher = new PasswordHasher(); - $this->_SessionManager = new SessionManager(); - $this->_SessionManager->start(); + $this->_repository = new DatabaseUserRepository( $settings ); + $this->_hasher = new PasswordHasher(); + $this->_sessionManager = new SessionManager(); + $this->_sessionManager->start(); } /** * List all users + * @param array $parameters + * @return string + * @throws \Exception */ - public function index( array $Parameters ): string + public function index( array $parameters ): string { - $User = Registry::getInstance()->get( 'Auth.User' ); + $user = Registry::getInstance()->get( 'Auth.User' ); // Generate CSRF token - $CsrfManager = new CsrfTokenManager( $this->_SessionManager ); - Registry::getInstance()->set( 'Auth.CsrfToken', $CsrfManager->getToken() ); + $csrfManager = new CsrfTokenManager( $this->_sessionManager ); + Registry::getInstance()->set( 'Auth.CsrfToken', $csrfManager->getToken() ); - $users = $this->_Repository->all(); + $users = $this->_repository->all(); - $ViewData = [ + $viewData = [ 'Title' => 'Users | ' . $this->getName(), 'Description' => 'User Management', - 'User' => $User, + 'User' => $user, 'users' => $users, - 'Success' => $this->_SessionManager->getFlash( 'success' ), - 'Error' => $this->_SessionManager->getFlash( 'error' ) + 'Success' => $this->_sessionManager->getFlash( 'success' ), + 'Error' => $this->_sessionManager->getFlash( 'error' ) ]; @http_response_code( HttpResponseStatus::OK->value ); - $View = new Html(); - $View->setController( 'Admin/Users' ) + $view = new Html(); + $view->setController( 'Admin/Users' ) ->setLayout( 'admin' ) ->setPage( 'index' ); - return $View->render( $ViewData ); + return $view->render( $viewData ); } /** * Show create user form + * @param array $parameters + * @return string + * @throws \Exception */ - public function create( array $Parameters ): string + public function create( array $parameters ): string { - $User = Registry::getInstance()->get( 'Auth.User' ); + $user = Registry::getInstance()->get( 'Auth.User' ); // Generate CSRF token - $CsrfManager = new CsrfTokenManager( $this->_SessionManager ); - Registry::getInstance()->set( 'Auth.CsrfToken', $CsrfManager->getToken() ); + $csrfManager = new CsrfTokenManager( $this->_sessionManager ); + Registry::getInstance()->set( 'Auth.CsrfToken', $csrfManager->getToken() ); - $ViewData = [ + $viewData = [ 'Title' => 'Create User | ' . $this->getName(), 'Description' => 'Create New User', - 'User' => $User, + 'User' => $user, 'roles' => [User::ROLE_ADMIN, User::ROLE_EDITOR, User::ROLE_AUTHOR, User::ROLE_SUBSCRIBER] ]; @http_response_code( HttpResponseStatus::OK->value ); - $View = new Html(); - $View->setController( 'Admin/Users' ) + $view = new Html(); + $view->setController( 'Admin/Users' ) ->setLayout( 'admin' ) ->setPage( 'create' ); - return $View->render( $ViewData ); + return $view->render( $viewData ); } /** * Store new user + * @param array $parameters + * @return string + * @throws \Exception */ - public function store( array $Parameters ): string + public function store( array $parameters ): string { $username = $_POST['username'] ?? ''; $email = $_POST['email'] ?? ''; @@ -112,35 +125,35 @@ public function store( array $Parameters ): string // Validate if( empty( $username ) || empty( $email ) || empty( $password ) ) { - $this->_SessionManager->flash( 'error', 'All fields are required' ); + $this->_sessionManager->flash( 'error', 'All fields are required' ); header( 'Location: /admin/users/create' ); exit; } - if( !$this->_Hasher->meetsRequirements( $password ) ) + if( !$this->_hasher->meetsRequirements( $password ) ) { - $this->_SessionManager->flash( 'error', 'Password does not meet requirements' ); + $this->_sessionManager->flash( 'error', 'Password does not meet requirements' ); header( 'Location: /admin/users/create' ); exit; } // Create user - $user = new User(); - $user->setUsername( $username ); - $user->setEmail( $email ); - $user->setPasswordHash( $this->_Hasher->hash( $password ) ); - $user->setRole( $role ); - $user->setStatus( User::STATUS_ACTIVE ); - $user->setEmailVerified( true ); + $newUser = new User(); + $newUser->setUsername( $username ); + $newUser->setEmail( $email ); + $newUser->setPasswordHash( $this->_hasher->hash( $password ) ); + $newUser->setRole( $role ); + $newUser->setStatus( User::STATUS_ACTIVE ); + $newUser->setEmailVerified( true ); try { - $this->_Repository->create( $user ); - $this->_SessionManager->flash( 'success', 'User created successfully' ); + $this->_repository->create( $newUser ); + $this->_sessionManager->flash( 'success', 'User created successfully' ); } catch( \Exception $e ) { - $this->_SessionManager->flash( 'error', 'Failed to create user: ' . $e->getMessage() ); + $this->_sessionManager->flash( 'error', 'Failed to create user: ' . $e->getMessage() ); } header( 'Location: /admin/users' ); @@ -149,53 +162,59 @@ public function store( array $Parameters ): string /** * Show edit user form + * @param array $parameters + * @return string + * @throws \Exception */ - public function edit( array $Parameters ): string + public function edit( array $parameters ): string { - $id = (int)$Parameters['id']; - $User = Registry::getInstance()->get( 'Auth.User' ); - $user = $this->_Repository->findById( $id ); + $id = (int)$parameters['id']; + $currentUser = Registry::getInstance()->get( 'Auth.User' ); + $user = $this->_repository->findById( $id ); if( !$user ) { - $this->_SessionManager->flash( 'error', 'User not found' ); + $this->_sessionManager->flash( 'error', 'User not found' ); header( 'Location: /admin/users' ); exit; } // Generate CSRF token - $CsrfManager = new CsrfTokenManager( $this->_SessionManager ); - Registry::getInstance()->set( 'Auth.CsrfToken', $CsrfManager->getToken() ); + $csrfManager = new CsrfTokenManager( $this->_sessionManager ); + Registry::getInstance()->set( 'Auth.CsrfToken', $csrfManager->getToken() ); - $ViewData = [ + $viewData = [ 'Title' => 'Edit User | ' . $this->getName(), 'Description' => 'Edit User', - 'User' => $User, + 'User' => $currentUser, 'user' => $user, 'roles' => [User::ROLE_ADMIN, User::ROLE_EDITOR, User::ROLE_AUTHOR, User::ROLE_SUBSCRIBER] ]; @http_response_code( HttpResponseStatus::OK->value ); - $View = new Html(); - $View->setController( 'Admin/Users' ) + $view = new Html(); + $view->setController( 'Admin/Users' ) ->setLayout( 'admin' ) ->setPage( 'edit' ); - return $View->render( $ViewData ); + return $view->render( $viewData ); } /** * Update user + * @param array $parameters + * @return string + * @throws \Exception */ - public function update( array $Parameters ): string + public function update( array $parameters ): string { - $id = (int)$Parameters['id']; - $user = $this->_Repository->findById( $id ); + $id = (int)$parameters['id']; + $user = $this->_repository->findById( $id ); if( !$user ) { - $this->_SessionManager->flash( 'error', 'User not found' ); + $this->_sessionManager->flash( 'error', 'User not found' ); header( 'Location: /admin/users' ); exit; } @@ -210,24 +229,24 @@ public function update( array $Parameters ): string // Update password if provided if( !empty( $password ) ) { - if( !$this->_Hasher->meetsRequirements( $password ) ) + if( !$this->_hasher->meetsRequirements( $password ) ) { - $this->_SessionManager->flash( 'error', 'Password does not meet requirements' ); + $this->_sessionManager->flash( 'error', 'Password does not meet requirements' ); header( 'Location: /admin/users/' . $id . '/edit' ); exit; } - $user->setPasswordHash( $this->_Hasher->hash( $password ) ); + $user->setPasswordHash( $this->_hasher->hash( $password ) ); } try { - $this->_Repository->update( $user ); - $this->_SessionManager->flash( 'success', 'User updated successfully' ); + $this->_repository->update( $user ); + $this->_sessionManager->flash( 'success', 'User updated successfully' ); } catch( \Exception $e ) { - $this->_SessionManager->flash( 'error', 'Failed to update user: ' . $e->getMessage() ); + $this->_sessionManager->flash( 'error', 'Failed to update user: ' . $e->getMessage() ); } header( 'Location: /admin/users' ); @@ -236,51 +255,34 @@ public function update( array $Parameters ): string /** * Delete user + * @param array $parameters + * @return string + * @throws \Exception */ - public function destroy( array $Parameters ): string + public function destroy( array $parameters ): string { - $id = (int)$Parameters['id']; - $CurrentUser = Registry::getInstance()->get( 'Auth.User' ); + $id = (int)$parameters['id']; + $currentUser = Registry::getInstance()->get( 'Auth.User' ); // Prevent self-deletion - if( $CurrentUser && $CurrentUser->getId() === $id ) + if( $currentUser && $currentUser->getId() === $id ) { - $this->_SessionManager->flash( 'error', 'Cannot delete your own account' ); + $this->_sessionManager->flash( 'error', 'Cannot delete your own account' ); header( 'Location: /admin/users' ); exit; } try { - $this->_Repository->delete( $id ); - $this->_SessionManager->flash( 'success', 'User deleted successfully' ); + $this->_repository->delete( $id ); + $this->_sessionManager->flash( 'success', 'User deleted successfully' ); } catch( \Exception $e ) { - $this->_SessionManager->flash( 'error', 'Failed to delete user: ' . $e->getMessage() ); + $this->_sessionManager->flash( 'error', 'Failed to delete user: ' . $e->getMessage() ); } header( 'Location: /admin/users' ); exit; } - - /** - * Get database configuration from settings - */ - private function getDatabaseConfig( SettingManager $Settings ): array - { - $config = []; - $settingNames = $Settings->getSectionSettingNames( 'database' ); - - foreach( $settingNames as $name ) - { - $value = $Settings->get( 'database', $name ); - if( $value !== null ) - { - $config[$name] = ( $name === 'port' ) ? (int)$value : $value; - } - } - - return $config; - } } diff --git a/src/Cms/Controllers/Auth/LoginController.php b/src/Cms/Controllers/Auth/LoginController.php index d45d060..a15611d 100644 --- a/src/Cms/Controllers/Auth/LoginController.php +++ b/src/Cms/Controllers/Auth/LoginController.php @@ -20,122 +20,132 @@ */ class LoginController extends Content { - private ?AuthManager $_AuthManager; - private SessionManager $_SessionManager; - private CsrfTokenManager $_CsrfManager; + private ?AuthManager $_authManager; + private SessionManager $_sessionManager; + private CsrfTokenManager $_csrfManager; + /** + * @param Application|null $app + * @throws \Exception + */ public function __construct( ?Application $app = null ) { parent::__construct( $app ); // Get AuthManager from Registry (set up by AuthInitializer) - $this->_AuthManager = Registry::getInstance()->get( 'AuthManager' ); + $this->_authManager = Registry::getInstance()->get( 'AuthManager' ); - if( !$this->_AuthManager ) + if( !$this->_authManager ) { throw new \RuntimeException( 'AuthManager not found in Registry. Ensure authentication is properly configured and that Application is set in Registry before initializers run.' ); } // Initialize session and CSRF managers - $this->_SessionManager = new SessionManager(); - $this->_SessionManager->start(); + $this->_sessionManager = new SessionManager(); + $this->_sessionManager->start(); - $this->_CsrfManager = new CsrfTokenManager( $this->_SessionManager ); + $this->_csrfManager = new CsrfTokenManager( $this->_sessionManager ); } /** * Show login form + * @param array $parameters + * @return string */ - public function showLoginForm( array $Parameters ): string + public function showLoginForm( array $parameters ): string { // If already logged in, redirect to dashboard - if( $this->_AuthManager->check() ) + if( $this->_authManager->check() ) { header( 'Location: /admin/dashboard' ); exit; } $requestedRedirect = $_GET['redirect'] ?? '/admin/dashboard'; - $redirectUrl = $this->isValidRedirectUrl( $requestedRedirect ) - ? $requestedRedirect + $redirectUrl = $this->isValidRedirectUrl( $requestedRedirect ) + ? $requestedRedirect : '/admin/dashboard'; - $ViewData = [ + $viewData = [ 'Title' => 'Login | ' . $this->getName(), 'Description' => 'Login to ' . $this->getName(), - 'CsrfToken' => $this->_CsrfManager->getToken(), - 'Error' => $this->_SessionManager->getFlash( 'error' ), - 'Success' => $this->_SessionManager->getFlash( 'success' ), + 'CsrfToken' => $this->_csrfManager->getToken(), + 'Error' => $this->_sessionManager->getFlash( 'error' ), + 'Success' => $this->_sessionManager->getFlash( 'success' ), 'RedirectUrl' => $redirectUrl ]; // Manually render with custom controller path @http_response_code( HttpResponseStatus::OK->value ); - $View = new Html(); - $View->setController( 'Auth' ) + $view = new Html(); + $view->setController( 'Auth' ) ->setLayout( 'auth' ) ->setPage( 'login' ); - return $View->render( $ViewData ); + return $view->render( $viewData ); } /** * Process login + * @param array $parameters + * @return string */ - public function login( array $Parameters ): string + public function login( array $parameters ): string { // Validate CSRF token - $Token = $_POST['csrf_token'] ?? ''; - if( !$this->_CsrfManager->validate( $Token ) ) + $token = $_POST['csrf_token'] ?? ''; + if( !$this->_csrfManager->validate( $token ) ) { - $this->_SessionManager->flash( 'error', 'Invalid CSRF token. Please try again.' ); + $this->_sessionManager->flash( 'error', 'Invalid CSRF token. Please try again.' ); header( 'Location: /login' ); exit; } // Get credentials - $Username = $_POST['username'] ?? ''; - $Password = $_POST['password'] ?? ''; - $Remember = isset( $_POST['remember'] ); + $username = $_POST['username'] ?? ''; + $password = $_POST['password'] ?? ''; + $remember = isset( $_POST['remember'] ); // Validate input - if( empty( $Username ) || empty( $Password ) ) + if( empty( $username ) || empty( $password ) ) { - $this->_SessionManager->flash( 'error', 'Please enter both username and password.' ); + $this->_sessionManager->flash( 'error', 'Please enter both username and password.' ); header( 'Location: /login' ); exit; } // Attempt authentication - if( !$this->_AuthManager->attempt( $Username, $Password, $Remember ) ) + if( !$this->_authManager->attempt( $username, $password, $remember ) ) { - $this->_SessionManager->flash( 'error', 'Invalid username or password.' ); + $this->_sessionManager->flash( 'error', 'Invalid username or password.' ); header( 'Location: /login' ); exit; } // Successful login - $this->_SessionManager->flash( 'success', 'Welcome back!' ); + $this->_sessionManager->flash( 'success', 'Welcome back!' ); // Redirect to intended URL or dashboard $requestedRedirect = $_POST['redirect_url'] ?? '/admin/dashboard'; - $RedirectUrl = $this->isValidRedirectUrl( $requestedRedirect ) + $redirectUrl = $this->isValidRedirectUrl( $requestedRedirect ) ? $requestedRedirect : '/admin/dashboard'; - header( 'Location: ' . $RedirectUrl ); + header( 'Location: ' . $redirectUrl ); exit; } /** * Process logout + * @param array $parameters + * @return string */ - public function logout( array $Parameters ): string + public function logout( array $parameters ): string { - $this->_AuthManager->logout(); + $this->_authManager->logout(); - $this->_SessionManager->start(); - $this->_SessionManager->flash( 'success', 'You have been logged out successfully.' ); + $this->_sessionManager->start(); + $this->_sessionManager->flash( 'success', 'You have been logged out successfully.' ); header( 'Location: /login' ); exit; diff --git a/src/Cms/Controllers/Auth/PasswordResetController.php b/src/Cms/Controllers/Auth/PasswordResetController.php index d63c31a..2efab3b 100644 --- a/src/Cms/Controllers/Auth/PasswordResetController.php +++ b/src/Cms/Controllers/Auth/PasswordResetController.php @@ -22,82 +22,90 @@ */ class PasswordResetController extends Content { - private ?PasswordResetManager $_ResetManager; - private SessionManager $_SessionManager; - private CsrfTokenManager $_CsrfManager; + private ?PasswordResetManager $_resetManager; + private SessionManager $_sessionManager; + private CsrfTokenManager $_csrfManager; + /** + * @param Application|null $app + * @throws \Exception + */ public function __construct( ?Application $app = null ) { parent::__construct( $app ); // Get PasswordResetManager from Registry - $this->_ResetManager = Registry::getInstance()->get( 'PasswordResetManager' ); + $this->_resetManager = Registry::getInstance()->get( 'PasswordResetManager' ); - if( !$this->_ResetManager ) + if( !$this->_resetManager ) { throw new \RuntimeException( 'PasswordResetManager not found in Registry. Ensure password reset is properly configured.' ); } // Initialize session and CSRF managers - $this->_SessionManager = new SessionManager(); - $this->_SessionManager->start(); + $this->_sessionManager = new SessionManager(); + $this->_sessionManager->start(); - $this->_CsrfManager = new CsrfTokenManager( $this->_SessionManager ); + $this->_csrfManager = new CsrfTokenManager( $this->_sessionManager ); } /** * Show forgot password form + * @param array $parameters + * @return string */ - public function showForgotPasswordForm( array $Parameters ): string + public function showForgotPasswordForm( array $parameters ): string { - $ViewData = [ + $viewData = [ 'Title' => 'Forgot Password | ' . $this->getName(), 'Description' => 'Reset your password', 'PageSubtitle' => 'Reset Password', - 'CsrfToken' => $this->_CsrfManager->getToken(), - 'Error' => $this->_SessionManager->getFlash( 'error' ), - 'Success' => $this->_SessionManager->getFlash( 'success' ) + 'CsrfToken' => $this->_csrfManager->getToken(), + 'Error' => $this->_sessionManager->getFlash( 'error' ), + 'Success' => $this->_sessionManager->getFlash( 'success' ) ]; @http_response_code( HttpResponseStatus::OK->value ); - $View = new Html(); - $View->setController( 'Auth' ) + $view = new Html(); + $view->setController( 'Auth' ) ->setLayout( 'auth' ) ->setPage( 'forgot-password' ); - return $View->render( $ViewData ); + return $view->render( $viewData ); } /** * Process forgot password request + * @param array $parameters + * @return string */ - public function requestReset( array $Parameters ): string + public function requestReset( array $parameters ): string { // Validate CSRF token - $Token = $_POST['csrf_token'] ?? ''; - if( !$this->_CsrfManager->validate( $Token ) ) + $token = $_POST['csrf_token'] ?? ''; + if( !$this->_csrfManager->validate( $token ) ) { - $this->_SessionManager->flash( 'error', 'Invalid CSRF token. Please try again.' ); + $this->_sessionManager->flash( 'error', 'Invalid CSRF token. Please try again.' ); header( 'Location: /forgot-password' ); exit; } // Get email - $Email = $_POST['email'] ?? ''; + $email = $_POST['email'] ?? ''; // Validate input - if( empty( $Email ) ) + if( empty( $email ) ) { - $this->_SessionManager->flash( 'error', 'Please enter your email address.' ); + $this->_sessionManager->flash( 'error', 'Please enter your email address.' ); header( 'Location: /forgot-password' ); exit; } // Validate email format - if( !filter_var( $Email, FILTER_VALIDATE_EMAIL ) ) + if( !filter_var( $email, FILTER_VALIDATE_EMAIL ) ) { - $this->_SessionManager->flash( 'error', 'Please enter a valid email address.' ); + $this->_sessionManager->flash( 'error', 'Please enter a valid email address.' ); header( 'Location: /forgot-password' ); exit; } @@ -105,10 +113,10 @@ public function requestReset( array $Parameters ): string try { // Request password reset - $this->_ResetManager->requestReset( $Email ); + $this->_resetManager->requestReset( $email ); // Always show success message (don't reveal if email exists) - $this->_SessionManager->flash( + $this->_sessionManager->flash( 'success', 'If an account exists with that email address, you will receive password reset instructions shortly.' ); @@ -117,7 +125,7 @@ public function requestReset( array $Parameters ): string { // Log error but show generic message to user Log::error('Password reset request failed: ' . $e->getMessage() ); - $this->_SessionManager->flash( + $this->_sessionManager->flash( 'error', 'Unable to process password reset request. Please try again later.' ); @@ -129,107 +137,111 @@ public function requestReset( array $Parameters ): string /** * Show reset password form (with token) + * @param array $parameters + * @return string */ - public function showResetForm( array $Parameters ): string + public function showResetForm( array $parameters ): string { // Get token from query string - $Token = $_GET['token'] ?? ''; + $token = $_GET['token'] ?? ''; - if( empty( $Token ) ) + if( empty( $token ) ) { - $this->_SessionManager->flash( 'error', 'Invalid or missing reset token.' ); + $this->_sessionManager->flash( 'error', 'Invalid or missing reset token.' ); header( 'Location: /forgot-password' ); exit; } // Validate token - $TokenObj = $this->_ResetManager->validateToken( $Token ); + $tokenObj = $this->_resetManager->validateToken( $token ); - if( !$TokenObj ) + if( !$tokenObj ) { - $this->_SessionManager->flash( 'error', 'This password reset link is invalid or has expired.' ); + $this->_sessionManager->flash( 'error', 'This password reset link is invalid or has expired.' ); header( 'Location: /forgot-password' ); exit; } - $ViewData = [ + $viewData = [ 'Title' => 'Reset Password | ' . $this->getName(), 'Description' => 'Enter your new password', 'PageSubtitle' => 'Create New Password', - 'CsrfToken' => $this->_CsrfManager->getToken(), - 'Error' => $this->_SessionManager->getFlash( 'error' ), - 'Success' => $this->_SessionManager->getFlash( 'success' ), - 'Token' => $Token, - 'Email' => $TokenObj->getEmail() + 'CsrfToken' => $this->_csrfManager->getToken(), + 'Error' => $this->_sessionManager->getFlash( 'error' ), + 'Success' => $this->_sessionManager->getFlash( 'success' ), + 'Token' => $token, + 'Email' => $tokenObj->getEmail() ]; @http_response_code( HttpResponseStatus::OK->value ); - $View = new Html(); - $View->setController( 'Auth' ) + $view = new Html(); + $view->setController( 'Auth' ) ->setLayout( 'auth' ) ->setPage( 'reset-password' ); - return $View->render( $ViewData ); + return $view->render( $viewData ); } /** * Process password reset + * @param array $parameters + * @return string */ - public function resetPassword( array $Parameters ): string + public function resetPassword( array $parameters ): string { // Validate CSRF token - $CsrfToken = $_POST['csrf_token'] ?? ''; - if( !$this->_CsrfManager->validate( $CsrfToken ) ) + $csrfToken = $_POST['csrf_token'] ?? ''; + if( !$this->_csrfManager->validate( $csrfToken ) ) { - $this->_SessionManager->flash( 'error', 'Invalid CSRF token. Please try again.' ); + $this->_sessionManager->flash( 'error', 'Invalid CSRF token. Please try again.' ); header( 'Location: /forgot-password' ); exit; } // Get form data - $Token = $_POST['token'] ?? ''; - $Password = $_POST['password'] ?? ''; - $PasswordConfirmation = $_POST['password_confirmation'] ?? ''; + $token = $_POST['token'] ?? ''; + $password = $_POST['password'] ?? ''; + $passwordConfirmation = $_POST['password_confirmation'] ?? ''; // Validate input - if( empty( $Token ) || empty( $Password ) || empty( $PasswordConfirmation ) ) + if( empty( $token ) || empty( $password ) || empty( $passwordConfirmation ) ) { - $this->_SessionManager->flash( 'error', 'All fields are required.' ); - header( 'Location: /reset-password?token=' . urlencode( $Token ) ); + $this->_sessionManager->flash( 'error', 'All fields are required.' ); + header( 'Location: /reset-password?token=' . urlencode( $token ) ); exit; } // Validate passwords match - if( $Password !== $PasswordConfirmation ) + if( $password !== $passwordConfirmation ) { - $this->_SessionManager->flash( 'error', 'Passwords do not match.' ); - header( 'Location: /reset-password?token=' . urlencode( $Token ) ); + $this->_sessionManager->flash( 'error', 'Passwords do not match.' ); + header( 'Location: /reset-password?token=' . urlencode( $token ) ); exit; } try { // Attempt password reset - $Success = $this->_ResetManager->resetPassword( $Token, $Password ); + $success = $this->_resetManager->resetPassword( $token, $password ); - if( !$Success ) + if( !$success ) { - $this->_SessionManager->flash( 'error', 'This password reset link is invalid or has expired.' ); + $this->_sessionManager->flash( 'error', 'This password reset link is invalid or has expired.' ); header( 'Location: /forgot-password' ); exit; } // Success - $this->_SessionManager->flash( 'success', 'Your password has been reset successfully. You can now log in.' ); + $this->_sessionManager->flash( 'success', 'Your password has been reset successfully. You can now log in.' ); header( 'Location: /login' ); exit; } catch( Exception $e ) { // Show validation or other errors - $this->_SessionManager->flash( 'error', $e->getMessage() ); - header( 'Location: /reset-password?token=' . urlencode( $Token ) ); + $this->_sessionManager->flash( 'error', $e->getMessage() ); + header( 'Location: /reset-password?token=' . urlencode( $token ) ); exit; } } diff --git a/src/Cms/Controllers/Blog.php b/src/Cms/Controllers/Blog.php index f14d83b..8260da3 100644 --- a/src/Cms/Controllers/Blog.php +++ b/src/Cms/Controllers/Blog.php @@ -1,31 +1,7 @@ get( 'Settings' ); - $dbConfig = $this->getDatabaseConfig( $Settings ); - - if( !$dbConfig ) - { - throw new \RuntimeException( 'Database configuration not found' ); - } + // Get settings for repositories + $settings = Registry::getInstance()->get( 'Settings' ); // Initialize repositories - $this->_PostRepository = new DatabasePostRepository( $dbConfig ); - $this->_CategoryRepository = new DatabaseCategoryRepository( $dbConfig ); - $this->_TagRepository = new DatabaseTagRepository( $dbConfig ); + $this->_postRepository = new DatabasePostRepository( $settings ); + $this->_categoryRepository = new DatabaseCategoryRepository( $settings ); + $this->_tagRepository = new DatabaseTagRepository( $settings ); // Check for drafts parameter - $Get = new Get(); - $this->_ShowDrafts = $Get->filterScalar( 'drafts' ) ? true : false; + $get = new Get(); + $this->_showDrafts = $get->filterScalar( 'drafts' ) ? true : false; } - public function index( array $Parameters, ?Request $Request ): string + /** + * @param array $parameters + * @param Request|null $request + * @return string + * @throws \Neuron\Core\Exceptions\NotFound + */ + public function index( array $parameters, ?Request $request ): string { // Get published posts (or all if drafts mode) - if( $this->_ShowDrafts ) + if( $this->_showDrafts ) { - $Posts = $this->_PostRepository->all(); + $posts = $this->_postRepository->all(); } else { - $Posts = $this->_PostRepository->getPublished(); + $posts = $this->_postRepository->getPublished(); } - $Categories = $this->_CategoryRepository->all(); - $Tags = $this->_TagRepository->all(); + $categories = $this->_categoryRepository->all(); + $tags = $this->_tagRepository->all(); return $this->renderHtml( HttpResponseStatus::OK, [ - 'Posts' => $Posts, - 'Categories' => $Categories, - 'Tags' => $Tags, - 'Title' => $this->getTitle() . ' | ' . $this->getName(), + 'Posts' => $posts, + 'Categories' => $categories, + 'Tags' => $tags, + 'Title' => $this->getName() . ' | ' . $this->getTitle(), + 'Name' => $this->getName(), 'Description' => $this->getDescription(), ], 'index' @@ -100,79 +79,70 @@ public function index( array $Parameters, ?Request $Request ): string } /** - * @param array $Parameters - * @param Request|null $Request + * @param array $parameters + * @param Request|null $request * @return string * @throws \Neuron\Core\Exceptions\NotFound */ - public function show( array $Parameters, ?Request $Request ): string + public function show( array $parameters, ?Request $request ): string { - $slug = $Parameters['title']; - $Post = $this->_PostRepository->findBySlug( $slug ); + $slug = $parameters['slug'] ?? ''; + $post = $this->_postRepository->findBySlug( $slug ); - if( !$Post ) - { - // Create error post - $Post = new Post(); - $Post->setTitle( 'Article Not Found' ); - $Post->setBody( 'The requested article does not exist.' ); - $Post->setSlug( $slug ); - } - elseif( !$Post->isPublished() && !$this->_ShowDrafts ) + if( !$post || ( !$post->isPublished() && !$this->_showDrafts ) ) { - // Don't show drafts unless in draft mode - $Post = new Post(); - $Post->setTitle( 'Article Not Available' ); - $Post->setBody( 'This article is not yet published.' ); - $Post->setSlug( $slug ); + $post = new Post(); + $post->setTitle( 'Article Not Found' ); + $post->setBody( 'The requested article does not exist.' ); + $post->setSlug( $slug ); } else { // Increment view count for published posts - if( $Post->isPublished() ) + if( $post->isPublished() ) { - $this->_PostRepository->incrementViewCount( $Post->getId() ); + $this->_postRepository->incrementViewCount( $post->getId() ); } } - $Categories = $this->_CategoryRepository->all(); - $Tags = $this->_TagRepository->all(); + $categories = $this->_categoryRepository->all(); + $tags = $this->_tagRepository->all(); return $this->renderHtml( HttpResponseStatus::OK, [ - 'Categories' => $Categories, - 'Tags' => $Tags, - 'Post' => $Post, - 'Title' => $Post->getTitle() . ' | ' . $this->getName() + 'Categories' => $categories, + 'Tags' => $tags, + 'Post' => $post, + 'Title' => $post->getTitle() . ' | ' . $this->getName() ], 'show' ); } /** - * @param array $Parameters - * @param Request|null $Request + * @param array $parameters + * @param Request|null $request * @return string * @throws \Neuron\Core\Exceptions\NotFound */ - public function author( array $Parameters, ?Request $Request ): string + public function author( array $parameters, ?Request $request ): string { - $authorName = $Parameters['author']; + $authorName = $parameters['author'] ?? ''; // Note: This would need a user lookup by username // For now, we'll just show an empty list - $Posts = []; + $posts = []; - $Categories = $this->_CategoryRepository->all(); - $Tags = $this->_TagRepository->all(); + $categories = $this->_categoryRepository->all(); + $tags = $this->_tagRepository->all(); return $this->renderHtml( HttpResponseStatus::OK, [ - 'Categories' => $Categories, - 'Tags' => $Tags, - 'Posts' => $Posts, + 'Categories' => $categories, + 'Tags' => $tags, + 'Posts' => $posts, 'Title' => "Articles by $authorName | " . $this->getName(), 'Author' => $authorName ], @@ -182,37 +152,37 @@ public function author( array $Parameters, ?Request $Request ): string /** - * @param array $Parameters - * @param Request|null $Request + * @param array $parameters + * @param Request|null $request * @return string * @throws \Neuron\Core\Exceptions\NotFound */ - public function tag( array $Parameters, ?Request $Request ): string + public function tag( array $parameters, ?Request $request ): string { - $tagSlug = $Parameters['tag']; - $Tag = $this->_TagRepository->findBySlug( $tagSlug ); + $tagSlug = $parameters['tag'] ?? ''; + $tag = $this->_tagRepository->findBySlug( $tagSlug ); - if( !$Tag ) + if( !$tag ) { - $Posts = []; + $posts = []; $tagName = ucfirst( str_replace( '-', ' ', $tagSlug ) ); } else { - $status = $this->_ShowDrafts ? null : Post::STATUS_PUBLISHED; - $Posts = $this->_PostRepository->getByTag( $Tag->getId(), $status ); - $tagName = $Tag->getName(); + $status = $this->_showDrafts ? null : Post::STATUS_PUBLISHED; + $posts = $this->_postRepository->getByTag( $tag->getId(), $status ); + $tagName = $tag->getName(); } - $Categories = $this->_CategoryRepository->all(); - $Tags = $this->_TagRepository->all(); + $categories = $this->_categoryRepository->all(); + $tags = $this->_tagRepository->all(); return $this->renderHtml( HttpResponseStatus::OK, [ - 'Categories' => $Categories, - 'Tags' => $Tags, - 'Posts' => $Posts, + 'Categories' => $categories, + 'Tags' => $tags, + 'Posts' => $posts, 'Title' => "Articles tagged with $tagName | " . $this->getName(), 'Tag' => $tagName ], @@ -221,37 +191,37 @@ public function tag( array $Parameters, ?Request $Request ): string } /** - * @param array $Parameters - * @param Request|null $Request + * @param array $parameters + * @param Request|null $request * @return string * @throws \Neuron\Core\Exceptions\NotFound */ - public function category( array $Parameters, ?Request $Request ): string + public function category( array $parameters, ?Request $request ): string { - $categorySlug = $Parameters['category']; - $Category = $this->_CategoryRepository->findBySlug( $categorySlug ); + $categorySlug = $parameters['category'] ?? ''; + $category = $this->_categoryRepository->findBySlug( $categorySlug ); - if( !$Category ) + if( !$category ) { - $Posts = []; + $posts = []; $categoryName = ucfirst( str_replace( '-', ' ', $categorySlug ) ); } else { - $status = $this->_ShowDrafts ? null : Post::STATUS_PUBLISHED; - $Posts = $this->_PostRepository->getByCategory( $Category->getId(), $status ); - $categoryName = $Category->getName(); + $status = $this->_showDrafts ? null : Post::STATUS_PUBLISHED; + $posts = $this->_postRepository->getByCategory( $category->getId(), $status ); + $categoryName = $category->getName(); } - $Categories = $this->_CategoryRepository->all(); - $Tags = $this->_TagRepository->all(); + $categories = $this->_categoryRepository->all(); + $tags = $this->_tagRepository->all(); return $this->renderHtml( HttpResponseStatus::OK, [ - 'Categories' => $Categories, - 'Tags' => $Tags, - 'Posts' => $Posts, + 'Categories' => $categories, + 'Tags' => $tags, + 'Posts' => $posts, 'Title' => "Articles in category $categoryName | " . $this->getName(), 'Category' => $categoryName ], @@ -262,13 +232,13 @@ public function category( array $Parameters, ?Request $Request ): string /** * Generate RSS feed * - * @param array $Parameters - * @param Request|null $Request + * @param array $parameters + * @param Request|null $request * @return string */ - public function feed( array $Parameters, ?Request $Request ): string + public function feed( array $parameters, ?Request $request ): string { - $Posts = $this->_PostRepository->getPublished( 20 ); + $posts = $this->_postRepository->getPublished( 20 ); // Build RSS XML $xml = '' . "\n"; @@ -279,24 +249,24 @@ public function feed( array $Parameters, ?Request $Request ): string $xml .= '' . htmlspecialchars( $this->getDescription() ) . '' . "\n"; $xml .= '' . "\n"; - foreach( $Posts as $Post ) + foreach( $posts as $post ) { $xml .= '' . "\n"; - $xml .= '' . htmlspecialchars( $Post->getTitle() ) . '' . "\n"; - $xml .= '' . htmlspecialchars( $this->getUrl() . '/blog/article/' . $Post->getSlug() ) . '' . "\n"; - $xml .= '' . htmlspecialchars( $Post->getExcerpt() ?: substr( strip_tags( $Post->getBody() ), 0, 200 ) ) . '' . "\n"; + $xml .= '' . htmlspecialchars( $post->getTitle() ) . '' . "\n"; + $xml .= '' . htmlspecialchars( $this->getUrl() . '/blog/article/' . $post->getSlug() ) . '' . "\n"; + $xml .= '' . htmlspecialchars( $post->getExcerpt() ?: substr( strip_tags( $post->getBody() ), 0, 200 ) ) . '' . "\n"; - if( $Post->getPublishedAt() ) + if( $post->getPublishedAt() ) { - $xml .= '' . $Post->getPublishedAt()->format( 'r' ) . '' . "\n"; + $xml .= '' . $post->getPublishedAt()->format( 'r' ) . '' . "\n"; } - $xml .= '' . htmlspecialchars( $this->getUrl() . '/blog/article/' . $Post->getSlug() ) . '' . "\n"; + $xml .= '' . htmlspecialchars( $this->getUrl() . '/blog/article/' . $post->getSlug() ) . '' . "\n"; // Add categories - foreach( $Post->getCategories() as $Category ) + foreach( $post->getCategories() as $category ) { - $xml .= '' . htmlspecialchars( $Category->getName() ) . '' . "\n"; + $xml .= '' . htmlspecialchars( $category->getName() ) . '' . "\n"; } $xml .= '' . "\n"; @@ -310,44 +280,4 @@ public function feed( array $Parameters, ?Request $Request ): string echo $xml; exit; } - - /** - * Get database configuration from settings - */ - private function getDatabaseConfig( SettingManager $Settings ): ?array - { - try - { - $settingNames = $Settings->getSectionSettingNames( 'database' ); - - if( empty( $settingNames ) ) - { - return null; - } - - $config = []; - foreach( $settingNames as $name ) - { - $value = $Settings->get( 'database', $name ); - if( $value !== null ) - { - // Convert string values to appropriate types - if( $name === 'port' ) - { - $config[$name] = (int)$value; - } - else - { - $config[$name] = $value; - } - } - } - - return $config; - } - catch( \Exception $e ) - { - return null; - } - } } diff --git a/src/Cms/Controllers/Content.php b/src/Cms/Controllers/Content.php index cfdedc2..42c78d0 100644 --- a/src/Cms/Controllers/Content.php +++ b/src/Cms/Controllers/Content.php @@ -55,11 +55,11 @@ class Content extends Base { - private string $_Name = 'Blahg'; - private string $_Title = 'Blahg'; - private string $_Description = ''; - private string $_Url = 'example.com/bog'; - private string $_RssUrl = 'example.com/blog/rss'; + private string $_name = 'Blahg'; + private string $_title = 'Blahg'; + private string $_description = ''; + private string $_url = 'example.com/bog'; + private string $_rssUrl = 'example.com/blog/rss'; /** * @param Application $app @@ -68,20 +68,20 @@ public function __construct( ?Application $app = null ) { parent::__construct( $app ); - $Settings = Registry::getInstance()->get( 'Settings' ); + $settings = Registry::getInstance()->get( 'Settings' ); - $this->setName( $Settings->get( 'site', 'name' ) ?? 'Neuron CMS' ) - ->setTitle( $Settings->get( 'site', 'title' ) ?? 'Neuron CMS' ) - ->setDescription( $Settings->get( 'site', 'description' ) ?? '' ) - ->setUrl( $Settings->get( 'site', 'url' ) ?? '' ) + $this->setName( $settings->get( 'site', 'name' ) ?? 'Neuron CMS' ) + ->setTitle( $settings->get( 'site', 'title' ) ?? 'Neuron CMS' ) + ->setDescription( $settings->get( 'site', 'description' ) ?? '' ) + ->setUrl( $settings->get( 'site', 'url' ) ?? '' ) ->setRssUrl($this->getUrl() . "/blog/rss" ); try { - $Version = new Version(); - $Version->loadFromFile( "../.version.json" ); + $version = new Version(); + $version->loadFromFile( "../.version.json" ); - Registry::getInstance()->set( 'version', 'v'.$Version->getAsString() ); + Registry::getInstance()->set( 'version', 'v'.$version->getAsString() ); } catch( \Exception $e ) { @@ -97,18 +97,18 @@ public function __construct( ?Application $app = null ) */ public function getRssUrl(): string { - return $this->_RssUrl; + return $this->_rssUrl; } /** * Set the RSS URL for the site. * - * @param string $RssUrl + * @param string $rssUrl * @return Content */ - public function setRssUrl( string $RssUrl ): Content + public function setRssUrl( string $rssUrl ): Content { - $this->_RssUrl = $RssUrl; + $this->_rssUrl = $rssUrl; return $this; } @@ -117,16 +117,16 @@ public function setRssUrl( string $RssUrl ): Content */ public function getName(): string { - return $this->_Name; + return $this->_name; } /** - * @param string $Name + * @param string $name * @return $this */ - public function setName( string $Name ): Content + public function setName( string $name ): Content { - $this->_Name = $Name; + $this->_name = $name; return $this; } @@ -135,16 +135,16 @@ public function setName( string $Name ): Content */ public function getTitle(): string { - return $this->_Title; + return $this->_title; } /** - * @param string $Title + * @param string $title * @return $this */ - public function setTitle( string $Title ): Content + public function setTitle( string $title ): Content { - $this->_Title = $Title; + $this->_title = $title; return $this; } @@ -153,16 +153,16 @@ public function setTitle( string $Title ): Content */ public function getDescription(): string { - return $this->_Description; + return $this->_description; } /** - * @param string $Description + * @param string $description * @return $this */ - public function setDescription( string $Description ): Content + public function setDescription( string $description ): Content { - $this->_Description = $Description; + $this->_description = $description; return $this; } @@ -171,18 +171,18 @@ public function setDescription( string $Description ): Content */ public function getUrl(): string { - return $this->_Url; + return $this->_url; } /** * Set the URL for the site. * - * @param string $Url + * @param string $url * @return Content */ - public function setUrl( string $Url ): Content + public function setUrl( string $url ): Content { - $this->_Url = $Url; + $this->_url = $url; return $this; } @@ -190,21 +190,21 @@ public function setUrl( string $Url ): Content * @throws \Neuron\Core\Exceptions\NotFound * @throws \League\CommonMark\Exception\CommonMarkException */ - public function markdown( array $Parameters ): string + public function markdown( array $parameters ): string { - $ViewData = array(); + $viewData = array(); - $Title = $Parameters[ 'page' ]; + $title = $parameters[ 'page' ]; - $Title = str_replace( '-', ' ', $Title ); - $Title = ucwords( $Title ); + $title = str_replace( '-', ' ', $title ); + $title = ucwords( $title ); - $ViewData[ 'Title' ] = $this->getName() . ' | ' . $this->getTitle(); + $viewData[ 'Title' ] = $this->getName() . ' | ' . $this->getTitle(); return $this->renderMarkdown( HttpResponseStatus::OK, - $ViewData, - $Parameters[ 'page' ] + $viewData, + $parameters[ 'page' ] ); } } diff --git a/src/Cms/Database/ConnectionFactory.php b/src/Cms/Database/ConnectionFactory.php new file mode 100644 index 0000000..ce54419 --- /dev/null +++ b/src/Cms/Database/ConnectionFactory.php @@ -0,0 +1,78 @@ +getSection( 'database' ); + + if( !$config ) + { + throw new Exception( 'Database configuration not found in settings' ); + } + + return self::createFromConfig( $config ); + } + + /** + * Create a PDO connection from configuration array + * + * @param array $config Database configuration + * @return PDO + * @throws Exception if adapter is unsupported + */ + public static function createFromConfig( array $config ): PDO + { + $adapter = $config['adapter'] ?? 'sqlite'; + + $dsn = match( $adapter ) + { + 'sqlite' => "sqlite:{$config['name']}", + 'mysql' => sprintf( + "mysql:host=%s;port=%s;dbname=%s;charset=%s", + $config['host'] ?? 'localhost', + $config['port'] ?? 3306, + $config['name'], + $config['charset'] ?? 'utf8mb4' + ), + 'pgsql' => sprintf( + "pgsql:host=%s;port=%s;dbname=%s", + $config['host'] ?? 'localhost', + $config['port'] ?? 5432, + $config['name'] + ), + default => throw new Exception( "Unsupported database adapter: $adapter" ) + }; + + return new PDO( + $dsn, + $config['user'] ?? null, + $config['pass'] ?? null, + [ + PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, + PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC + ] + ); + } +} diff --git a/src/Cms/Email/helpers.php b/src/Cms/Email/helpers.php index 27c59b6..a5392f4 100644 --- a/src/Cms/Email/helpers.php +++ b/src/Cms/Email/helpers.php @@ -1,6 +1,6 @@ to( $to ) @@ -62,7 +62,7 @@ function sendEmailTemplate( string $to, string $subject, string $template, array { try { - $email = new EmailService( $settings, $basePath ); + $email = new Sender( $settings, $basePath ); return $email ->to( $to ) @@ -80,11 +80,11 @@ function sendEmailTemplate( string $to, string $subject, string $template, array if( !function_exists( 'email' ) ) { /** - * Create a new EmailService instance with fluent interface + * Create a new email Sender instance with fluent interface * * @param ISettingSource|null $settings Optional settings source for email configuration * @param string $basePath Base path for template resolution (default: current directory) - * @return EmailService + * @return Sender * * @example * email() @@ -95,8 +95,8 @@ function sendEmailTemplate( string $to, string $subject, string $template, array * ->attach('/path/to/invoice.pdf', 'invoice.pdf') * ->send(); */ - function email( ?ISettingSource $settings = null, string $basePath = '' ): EmailService + function email( ?ISettingSource $settings = null, string $basePath = '' ): Sender { - return new EmailService( $settings, $basePath ); + return new Sender( $settings, $basePath ); } } diff --git a/src/Cms/Maintenance/MaintenanceConfig.php b/src/Cms/Maintenance/MaintenanceConfig.php index ef7af58..8e74a1a 100644 --- a/src/Cms/Maintenance/MaintenanceConfig.php +++ b/src/Cms/Maintenance/MaintenanceConfig.php @@ -9,15 +9,15 @@ */ class MaintenanceConfig { - private ?ISettingSource $_SettingSource; - private array $_Config = []; + private ?ISettingSource $_settingSource; + private array $_config = []; /** - * @param ISettingSource|null $SettingSource + * @param ISettingSource|null $settingSource */ - public function __construct( ?ISettingSource $SettingSource = null ) + public function __construct( ?ISettingSource $settingSource = null ) { - $this->_SettingSource = $SettingSource; + $this->_settingSource = $settingSource; $this->loadConfig(); } @@ -28,17 +28,17 @@ public function __construct( ?ISettingSource $SettingSource = null ) */ private function loadConfig(): void { - if( !$this->_SettingSource ) + if( !$this->_settingSource ) { - $this->_Config = $this->getDefaults(); + $this->_config = $this->getDefaults(); return; } // Load maintenance configuration from settings $defaults = $this->getDefaults(); - $section = $this->_SettingSource->getSection( 'maintenance' ) ?? []; + $section = $this->_settingSource->getSection( 'maintenance' ) ?? []; - $this->_Config = [ + $this->_config = [ 'enabled' => $section['enabled'] ?? $defaults['enabled'], 'default_message' => $section['default_message'] ?? $defaults['default_message'], 'allowed_ips' => $section['allowed_ips'] ?? $defaults['allowed_ips'], @@ -72,7 +72,7 @@ private function getDefaults(): array */ public function isEnabled(): bool { - return $this->_Config['enabled'] ?? false; + return $this->_config['enabled'] ?? false; } /** @@ -82,7 +82,7 @@ public function isEnabled(): bool */ public function getDefaultMessage(): string { - return $this->_Config['default_message'] ?? 'Site is currently under maintenance.'; + return $this->_config['default_message'] ?? 'Site is currently under maintenance.'; } /** @@ -92,7 +92,7 @@ public function getDefaultMessage(): string */ public function getAllowedIps(): array { - $ips = $this->_Config['allowed_ips'] ?? []; + $ips = $this->_config['allowed_ips'] ?? []; // Ensure it's an array if( is_string( $ips ) ) @@ -110,7 +110,7 @@ public function getAllowedIps(): array */ public function getRetryAfter(): int { - return (int)($this->_Config['retry_after'] ?? 3600); + return (int)($this->_config['retry_after'] ?? 3600); } /** @@ -120,7 +120,7 @@ public function getRetryAfter(): int */ public function getCustomView(): ?string { - return $this->_Config['custom_view'] ?? null; + return $this->_config['custom_view'] ?? null; } /** @@ -130,17 +130,17 @@ public function getCustomView(): ?string */ public function shouldShowCountdown(): bool { - return $this->_Config['show_countdown'] ?? false; + return $this->_config['show_countdown'] ?? false; } /** * Create MaintenanceConfig from settings source * - * @param ISettingSource $Source + * @param ISettingSource $source * @return self */ - public static function fromSettings( ISettingSource $Source ): self + public static function fromSettings( ISettingSource $source ): self { - return new self( $Source ); + return new self( $source ); } } diff --git a/src/Cms/Maintenance/MaintenanceFilter.php b/src/Cms/Maintenance/MaintenanceFilter.php index c9bb7f8..67a272e 100644 --- a/src/Cms/Maintenance/MaintenanceFilter.php +++ b/src/Cms/Maintenance/MaintenanceFilter.php @@ -10,22 +10,22 @@ */ class MaintenanceFilter extends Filter { - private MaintenanceManager $_Manager; - private ?string $_CustomView; + private MaintenanceManager $_manager; + private ?string $_customView; /** - * @param MaintenanceManager $Manager - * @param string|null $CustomView Path to custom maintenance view + * @param MaintenanceManager $manager + * @param string|null $customView Path to custom maintenance view */ - public function __construct( MaintenanceManager $Manager, ?string $CustomView = null ) + public function __construct( MaintenanceManager $manager, ?string $customView = null ) { - $this->_Manager = $Manager; - $this->_CustomView = $CustomView; + $this->_manager = $manager; + $this->_customView = $customView; // Create filter with pre-execution check parent::__construct( - function( RouteMap $Route ) { - return $this->checkMaintenance( $Route ); + function( RouteMap $route ) { + return $this->checkMaintenance( $route ); }, null ); @@ -34,13 +34,13 @@ function( RouteMap $Route ) { /** * Check if site is in maintenance mode and handle accordingly * - * @param RouteMap $Route + * @param RouteMap $route * @return mixed|null Returns maintenance page or null to continue */ - private function checkMaintenance( RouteMap $Route ) + private function checkMaintenance( RouteMap $route ) { // If maintenance mode is not enabled, continue normal execution - if( !$this->_Manager->isEnabled() ) + if( !$this->_manager->isEnabled() ) { return null; } @@ -48,7 +48,7 @@ private function checkMaintenance( RouteMap $Route ) // Check if current IP is allowed $clientIp = $this->getClientIp(); - if( $this->_Manager->isIpAllowed( $clientIp ) ) + if( $this->_manager->isIpAllowed( $clientIp ) ) { return null; } @@ -68,7 +68,7 @@ private function renderMaintenancePage(): string @http_response_code( 503 ); // Set Retry-After header if configured - $retryAfter = $this->_Manager->getRetryAfter(); + $retryAfter = $this->_manager->getRetryAfter(); if( $retryAfter ) { @header( "Retry-After: $retryAfter" ); @@ -78,10 +78,10 @@ private function renderMaintenancePage(): string @header( 'Content-Type: text/html; charset=utf-8' ); // Check for custom view - if( $this->_CustomView && file_exists( $this->_CustomView ) ) + if( $this->_customView && file_exists( $this->_customView ) ) { // Validate path to prevent directory traversal attacks - $customViewPath = $this->_CustomView; + $customViewPath = $this->_customView; $realPath = realpath( $customViewPath ); // For virtual filesystems (like vfsStream in tests), realpath may return false @@ -105,9 +105,9 @@ private function renderMaintenancePage(): string throw new \RuntimeException( 'Invalid custom view path: path must be within the resources directory' ); } } - - $message = $this->_Manager->getMessage(); - $retryAfter = $this->_Manager->getRetryAfter(); + + $message = $this->_manager->getMessage(); + $retryAfter = $this->_manager->getRetryAfter(); ob_start(); include $realPath; return ob_get_clean(); @@ -124,8 +124,8 @@ private function renderMaintenancePage(): string */ private function getDefaultMaintenancePage(): string { - $message = htmlspecialchars( $this->_Manager->getMessage(), ENT_QUOTES, 'UTF-8' ); - $retryAfter = $this->_Manager->getRetryAfter(); + $message = htmlspecialchars( $this->_manager->getMessage(), ENT_QUOTES, 'UTF-8' ); + $retryAfter = $this->_manager->getRetryAfter(); $estimatedTime = ''; if( $retryAfter ) diff --git a/src/Cms/Maintenance/MaintenanceManager.php b/src/Cms/Maintenance/MaintenanceManager.php index a651c46..500983c 100644 --- a/src/Cms/Maintenance/MaintenanceManager.php +++ b/src/Cms/Maintenance/MaintenanceManager.php @@ -9,14 +9,14 @@ */ class MaintenanceManager { - private string $_MaintenanceFilePath; + private string $_maintenanceFilePath; /** - * @param string $BasePath Application base path + * @param string $basePath Application base path */ - public function __construct( string $BasePath ) + public function __construct( string $basePath ) { - $this->_MaintenanceFilePath = $BasePath . '/.maintenance.json'; + $this->_maintenanceFilePath = $basePath . '/.maintenance.json'; } /** @@ -26,7 +26,7 @@ public function __construct( string $BasePath ) */ public function isEnabled(): bool { - if( !file_exists( $this->_MaintenanceFilePath ) ) + if( !file_exists( $this->_maintenanceFilePath ) ) { return false; } @@ -39,32 +39,32 @@ public function isEnabled(): bool /** * Enable maintenance mode * - * @param string $Message Custom maintenance message - * @param array|null $AllowedIps List of allowed IP addresses (null = use defaults) - * @param int|null $RetryAfter Retry-After header value in seconds - * @param string|null $EnabledBy User who enabled maintenance mode + * @param string $message Custom maintenance message + * @param array|null $allowedIps List of allowed IP addresses (null = use defaults) + * @param int|null $retryAfter Retry-After header value in seconds + * @param string|null $enabledBy User who enabled maintenance mode * @return bool Success status */ public function enable( - string $Message = 'Site is currently under maintenance. Please check back soon.', - ?array $AllowedIps = null, - ?int $RetryAfter = null, - ?string $EnabledBy = null + string $message = 'Site is currently under maintenance. Please check back soon.', + ?array $allowedIps = null, + ?int $retryAfter = null, + ?string $enabledBy = null ): bool { // Add localhost to allowed IPs by default only if null (not provided) - if( $AllowedIps === null ) + if( $allowedIps === null ) { - $AllowedIps = ['127.0.0.1', '::1']; + $allowedIps = ['127.0.0.1', '::1']; } $data = [ 'enabled' => true, - 'message' => $Message, - 'allowed_ips' => $AllowedIps, - 'retry_after' => $RetryAfter, + 'message' => $message, + 'allowed_ips' => $allowedIps, + 'retry_after' => $retryAfter, 'enabled_at' => (new DateTime())->format( DateTime::ATOM ), - 'enabled_by' => $EnabledBy ?? get_current_user() + 'enabled_by' => $enabledBy ?? get_current_user() ]; return $this->writeMaintenanceFile( $data ); @@ -77,9 +77,9 @@ public function enable( */ public function disable(): bool { - if( file_exists( $this->_MaintenanceFilePath ) ) + if( file_exists( $this->_maintenanceFilePath ) ) { - return unlink( $this->_MaintenanceFilePath ); + return unlink( $this->_maintenanceFilePath ); } return true; @@ -92,7 +92,7 @@ public function disable(): bool */ public function getStatus(): ?array { - if( !file_exists( $this->_MaintenanceFilePath ) ) + if( !file_exists( $this->_maintenanceFilePath ) ) { return null; } @@ -103,10 +103,10 @@ public function getStatus(): ?array /** * Check if a specific IP address is allowed during maintenance * - * @param string $IpAddress + * @param string $ipAddress * @return bool */ - public function isIpAllowed( string $IpAddress ): bool + public function isIpAllowed( string $ipAddress ): bool { $status = $this->getStatus(); @@ -120,7 +120,7 @@ public function isIpAllowed( string $IpAddress ): bool foreach( $allowedIps as $allowed ) { // Check for exact match - if( $allowed === $IpAddress ) + if( $allowed === $ipAddress ) { return true; } @@ -128,7 +128,7 @@ public function isIpAllowed( string $IpAddress ): bool // Check for CIDR notation if( strpos( $allowed, '/' ) !== false ) { - if( $this->ipInCidr( $IpAddress, $allowed ) ) + if( $this->ipInCidr( $ipAddress, $allowed ) ) { return true; } @@ -169,7 +169,7 @@ public function getRetryAfter(): ?int */ private function readMaintenanceFile(): array { - $contents = file_get_contents( $this->_MaintenanceFilePath ); + $contents = file_get_contents( $this->_maintenanceFilePath ); if( $contents === false ) { @@ -191,7 +191,7 @@ private function writeMaintenanceFile( array $data ): bool { $json = json_encode( $data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES ); - $result = file_put_contents( $this->_MaintenanceFilePath, $json ); + $result = file_put_contents( $this->_maintenanceFilePath, $json ); return $result !== false; } @@ -199,16 +199,16 @@ private function writeMaintenanceFile( array $data ): bool /** * Check if an IP address is within a CIDR range * - * @param string $IpAddress IP address to check - * @param string $Cidr CIDR notation (e.g., "192.168.1.0/24") + * @param string $ipAddress IP address to check + * @param string $cidr CIDR notation (e.g., "192.168.1.0/24") * @return bool */ - private function ipInCidr( string $IpAddress, string $Cidr ): bool + private function ipInCidr( string $ipAddress, string $cidr ): bool { - list( $subnet, $mask ) = explode( '/', $Cidr ); + list( $subnet, $mask ) = explode( '/', $cidr ); // Convert IP addresses to long integers - $ipLong = ip2long( $IpAddress ); + $ipLong = ip2long( $ipAddress ); $subnetLong = ip2long( $subnet ); if( $ipLong === false || $subnetLong === false ) diff --git a/src/Cms/Models/Category.php b/src/Cms/Models/Category.php index 6081cc1..90bf984 100644 --- a/src/Cms/Models/Category.php +++ b/src/Cms/Models/Category.php @@ -12,16 +12,16 @@ */ class Category { - private ?int $_Id = null; - private string $_Name; - private string $_Slug; - private ?string $_Description = null; - private ?DateTimeImmutable $_CreatedAt = null; - private ?DateTimeImmutable $_UpdatedAt = null; + private ?int $_id = null; + private string $_name; + private string $_slug; + private ?string $_description = null; + private ?DateTimeImmutable $_createdAt = null; + private ?DateTimeImmutable $_updatedAt = null; public function __construct() { - $this->_CreatedAt = new DateTimeImmutable(); + $this->_createdAt = new DateTimeImmutable(); } /** @@ -29,15 +29,15 @@ public function __construct() */ public function getId(): ?int { - return $this->_Id; + return $this->_id; } /** * Set category ID */ - public function setId( int $Id ): self + public function setId( int $id ): self { - $this->_Id = $Id; + $this->_id = $id; return $this; } @@ -46,15 +46,15 @@ public function setId( int $Id ): self */ public function getName(): string { - return $this->_Name; + return $this->_name; } /** * Set name */ - public function setName( string $Name ): self + public function setName( string $name ): self { - $this->_Name = $Name; + $this->_name = $name; return $this; } @@ -63,15 +63,15 @@ public function setName( string $Name ): self */ public function getSlug(): string { - return $this->_Slug; + return $this->_slug; } /** * Set slug */ - public function setSlug( string $Slug ): self + public function setSlug( string $slug ): self { - $this->_Slug = $Slug; + $this->_slug = $slug; return $this; } @@ -80,15 +80,15 @@ public function setSlug( string $Slug ): self */ public function getDescription(): ?string { - return $this->_Description; + return $this->_description; } /** * Set description */ - public function setDescription( ?string $Description ): self + public function setDescription( ?string $description ): self { - $this->_Description = $Description; + $this->_description = $description; return $this; } @@ -97,15 +97,15 @@ public function setDescription( ?string $Description ): self */ public function getCreatedAt(): ?DateTimeImmutable { - return $this->_CreatedAt; + return $this->_createdAt; } /** * Set created timestamp */ - public function setCreatedAt( DateTimeImmutable $CreatedAt ): self + public function setCreatedAt( DateTimeImmutable $createdAt ): self { - $this->_CreatedAt = $CreatedAt; + $this->_createdAt = $createdAt; return $this; } @@ -114,57 +114,57 @@ public function setCreatedAt( DateTimeImmutable $CreatedAt ): self */ public function getUpdatedAt(): ?DateTimeImmutable { - return $this->_UpdatedAt; + return $this->_updatedAt; } /** * Set updated timestamp */ - public function setUpdatedAt( ?DateTimeImmutable $UpdatedAt ): self + public function setUpdatedAt( ?DateTimeImmutable $updatedAt ): self { - $this->_UpdatedAt = $UpdatedAt; + $this->_updatedAt = $updatedAt; return $this; } /** * Create Category from array data * - * @param array $Data Associative array of category data + * @param array $data Associative array of category data * @return Category * @throws Exception */ - public static function fromArray( array $Data ): Category + public static function fromArray( array $data ): Category { - $Category = new self(); + $category = new self(); - if( isset( $Data['id'] ) ) + if( isset( $data['id'] ) ) { - $Category->setId( (int)$Data['id'] ); + $category->setId( (int)$data['id'] ); } - $Category->setName( $Data['name'] ?? '' ); - $Category->setSlug( $Data['slug'] ?? '' ); - $Category->setDescription( $Data['description'] ?? null ); + $category->setName( $data['name'] ?? '' ); + $category->setSlug( $data['slug'] ?? '' ); + $category->setDescription( $data['description'] ?? null ); - if( isset( $Data['created_at'] ) && $Data['created_at'] ) + if( isset( $data['created_at'] ) && $data['created_at'] ) { - $Category->setCreatedAt( - is_string( $Data['created_at'] ) - ? new DateTimeImmutable( $Data['created_at'] ) - : $Data['created_at'] + $category->setCreatedAt( + is_string( $data['created_at'] ) + ? new DateTimeImmutable( $data['created_at'] ) + : $data['created_at'] ); } - if( isset( $Data['updated_at'] ) && $Data['updated_at'] ) + if( isset( $data['updated_at'] ) && $data['updated_at'] ) { - $Category->setUpdatedAt( - is_string( $Data['updated_at'] ) - ? new DateTimeImmutable( $Data['updated_at'] ) - : $Data['updated_at'] + $category->setUpdatedAt( + is_string( $data['updated_at'] ) + ? new DateTimeImmutable( $data['updated_at'] ) + : $data['updated_at'] ); } - return $Category; + return $category; } /** @@ -175,12 +175,12 @@ public static function fromArray( array $Data ): Category public function toArray(): array { return [ - 'id' => $this->_Id, - 'name' => $this->_Name, - 'slug' => $this->_Slug, - 'description' => $this->_Description, - 'created_at' => $this->_CreatedAt?->format( 'Y-m-d H:i:s' ), - 'updated_at' => $this->_UpdatedAt?->format( 'Y-m-d H:i:s' ), + 'id' => $this->_id, + 'name' => $this->_name, + 'slug' => $this->_slug, + 'description' => $this->_description, + 'created_at' => $this->_createdAt?->format( 'Y-m-d H:i:s' ), + 'updated_at' => $this->_updatedAt?->format( 'Y-m-d H:i:s' ), ]; } } diff --git a/src/Cms/Models/PasswordResetToken.php b/src/Cms/Models/PasswordResetToken.php index 4870d4a..4957fd3 100644 --- a/src/Cms/Models/PasswordResetToken.php +++ b/src/Cms/Models/PasswordResetToken.php @@ -13,25 +13,25 @@ */ class PasswordResetToken { - private ?int $_Id = null; - private string $_Email; - private string $_Token; - private DateTimeImmutable $_CreatedAt; - private DateTimeImmutable $_ExpiresAt; + private ?int $_id = null; + private string $_email; + private string $_token; + private DateTimeImmutable $_createdAt; + private DateTimeImmutable $_expiresAt; /** * Create a new password reset token * - * @param string $Email User's email address - * @param string $Token Hashed token - * @param int $ExpirationMinutes Token expiration in minutes (default: 60) + * @param string $email User's email address + * @param string $token Hashed token + * @param int $expirationMinutes Token expiration in minutes (default: 60) */ - public function __construct( string $Email = '', string $Token = '', int $ExpirationMinutes = 60 ) + public function __construct( string $email = '', string $token = '', int $expirationMinutes = 60 ) { - $this->_Email = $Email; - $this->_Token = $Token; - $this->_CreatedAt = new DateTimeImmutable(); - $this->_ExpiresAt = $this->_CreatedAt->modify( "+{$ExpirationMinutes} minutes" ); + $this->_email = $email; + $this->_token = $token; + $this->_createdAt = new DateTimeImmutable(); + $this->_expiresAt = $this->_createdAt->modify( "+{$expirationMinutes} minutes" ); } /** @@ -39,15 +39,15 @@ public function __construct( string $Email = '', string $Token = '', int $Expira */ public function getId(): ?int { - return $this->_Id; + return $this->_id; } /** * Set token ID */ - public function setId( int $Id ): self + public function setId( int $id ): self { - $this->_Id = $Id; + $this->_id = $id; return $this; } @@ -56,15 +56,15 @@ public function setId( int $Id ): self */ public function getEmail(): string { - return $this->_Email; + return $this->_email; } /** * Set email address */ - public function setEmail( string $Email ): self + public function setEmail( string $email ): self { - $this->_Email = $Email; + $this->_email = $email; return $this; } @@ -73,15 +73,15 @@ public function setEmail( string $Email ): self */ public function getToken(): string { - return $this->_Token; + return $this->_token; } /** * Set token (should be hashed before setting) */ - public function setToken( string $Token ): self + public function setToken( string $token ): self { - $this->_Token = $Token; + $this->_token = $token; return $this; } @@ -90,15 +90,15 @@ public function setToken( string $Token ): self */ public function getCreatedAt(): DateTimeImmutable { - return $this->_CreatedAt; + return $this->_createdAt; } /** * Set created timestamp */ - public function setCreatedAt( DateTimeImmutable $CreatedAt ): self + public function setCreatedAt( DateTimeImmutable $createdAt ): self { - $this->_CreatedAt = $CreatedAt; + $this->_createdAt = $createdAt; return $this; } @@ -107,15 +107,15 @@ public function setCreatedAt( DateTimeImmutable $CreatedAt ): self */ public function getExpiresAt(): DateTimeImmutable { - return $this->_ExpiresAt; + return $this->_expiresAt; } /** * Set expiration timestamp */ - public function setExpiresAt( DateTimeImmutable $ExpiresAt ): self + public function setExpiresAt( DateTimeImmutable $expiresAt ): self { - $this->_ExpiresAt = $ExpiresAt; + $this->_expiresAt = $expiresAt; return $this; } @@ -124,42 +124,42 @@ public function setExpiresAt( DateTimeImmutable $ExpiresAt ): self */ public function isExpired(): bool { - return new DateTimeImmutable() > $this->_ExpiresAt; + return new DateTimeImmutable() > $this->_expiresAt; } /** * Create token from array data */ - public static function fromArray( array $Data ): self + public static function fromArray( array $data ): self { - $Token = new self(); + $token = new self(); - if( isset( $Data['id'] ) ) + if( isset( $data['id'] ) ) { - $Token->setId( (int) $Data['id'] ); + $token->setId( (int) $data['id'] ); } - if( isset( $Data['email'] ) ) + if( isset( $data['email'] ) ) { - $Token->setEmail( $Data['email'] ); + $token->setEmail( $data['email'] ); } - if( isset( $Data['token'] ) ) + if( isset( $data['token'] ) ) { - $Token->setToken( $Data['token'] ); + $token->setToken( $data['token'] ); } - if( isset( $Data['created_at'] ) ) + if( isset( $data['created_at'] ) ) { - $Token->setCreatedAt( new DateTimeImmutable( $Data['created_at'] ) ); + $token->setCreatedAt( new DateTimeImmutable( $data['created_at'] ) ); } - if( isset( $Data['expires_at'] ) ) + if( isset( $data['expires_at'] ) ) { - $Token->setExpiresAt( new DateTimeImmutable( $Data['expires_at'] ) ); + $token->setExpiresAt( new DateTimeImmutable( $data['expires_at'] ) ); } - return $Token; + return $token; } /** @@ -168,11 +168,11 @@ public static function fromArray( array $Data ): self public function toArray(): array { return [ - 'id' => $this->_Id, - 'email' => $this->_Email, - 'token' => $this->_Token, - 'created_at' => $this->_CreatedAt->format( 'Y-m-d H:i:s' ), - 'expires_at' => $this->_ExpiresAt->format( 'Y-m-d H:i:s' ) + 'id' => $this->_id, + 'email' => $this->_email, + 'token' => $this->_token, + 'created_at' => $this->_createdAt->format( 'Y-m-d H:i:s' ), + 'expires_at' => $this->_expiresAt->format( 'Y-m-d H:i:s' ) ]; } } diff --git a/src/Cms/Models/Post.php b/src/Cms/Models/Post.php index fc8d027..cb2e2f4 100644 --- a/src/Cms/Models/Post.php +++ b/src/Cms/Models/Post.php @@ -12,23 +12,23 @@ */ class Post { - private ?int $_Id = null; - private string $_Title; - private string $_Slug; - private string $_Body; - private ?string $_Excerpt = null; - private ?string $_FeaturedImage = null; - private int $_AuthorId; - private string $_Status = 'draft'; - private ?DateTimeImmutable $_PublishedAt = null; - private int $_ViewCount = 0; - private ?DateTimeImmutable $_CreatedAt = null; - private ?DateTimeImmutable $_UpdatedAt = null; + private ?int $_id = null; + private string $_title; + private string $_slug; + private string $_body; + private ?string $_excerpt = null; + private ?string $_featuredImage = null; + private int $_authorId; + private string $_status = 'draft'; + private ?DateTimeImmutable $_publishedAt = null; + private int $_viewCount = 0; + private ?DateTimeImmutable $_createdAt = null; + private ?DateTimeImmutable $_updatedAt = null; // Relationships - these will be populated by the repository - private ?User $_Author = null; - private array $_Categories = []; - private array $_Tags = []; + private ?User $_author = null; + private array $_categories = []; + private array $_tags = []; /** * Post status constants @@ -39,7 +39,7 @@ class Post public function __construct() { - $this->_CreatedAt = new DateTimeImmutable(); + $this->_createdAt = new DateTimeImmutable(); } /** @@ -47,15 +47,15 @@ public function __construct() */ public function getId(): ?int { - return $this->_Id; + return $this->_id; } /** * Set post ID */ - public function setId( int $Id ): self + public function setId( int $id ): self { - $this->_Id = $Id; + $this->_id = $id; return $this; } @@ -64,15 +64,15 @@ public function setId( int $Id ): self */ public function getTitle(): string { - return $this->_Title; + return $this->_title; } /** * Set title */ - public function setTitle( string $Title ): self + public function setTitle( string $title ): self { - $this->_Title = $Title; + $this->_title = $title; return $this; } @@ -81,15 +81,15 @@ public function setTitle( string $Title ): self */ public function getSlug(): string { - return $this->_Slug; + return $this->_slug; } /** * Set slug */ - public function setSlug( string $Slug ): self + public function setSlug( string $slug ): self { - $this->_Slug = $Slug; + $this->_slug = $slug; return $this; } @@ -98,15 +98,15 @@ public function setSlug( string $Slug ): self */ public function getBody(): string { - return $this->_Body; + return $this->_body; } /** * Set body content */ - public function setBody( string $Body ): self + public function setBody( string $body ): self { - $this->_Body = $Body; + $this->_body = $body; return $this; } @@ -115,15 +115,15 @@ public function setBody( string $Body ): self */ public function getExcerpt(): ?string { - return $this->_Excerpt; + return $this->_excerpt; } /** * Set excerpt */ - public function setExcerpt( ?string $Excerpt ): self + public function setExcerpt( ?string $excerpt ): self { - $this->_Excerpt = $Excerpt; + $this->_excerpt = $excerpt; return $this; } @@ -132,15 +132,15 @@ public function setExcerpt( ?string $Excerpt ): self */ public function getFeaturedImage(): ?string { - return $this->_FeaturedImage; + return $this->_featuredImage; } /** * Set featured image */ - public function setFeaturedImage( ?string $FeaturedImage ): self + public function setFeaturedImage( ?string $featuredImage ): self { - $this->_FeaturedImage = $FeaturedImage; + $this->_featuredImage = $featuredImage; return $this; } @@ -149,15 +149,15 @@ public function setFeaturedImage( ?string $FeaturedImage ): self */ public function getAuthorId(): int { - return $this->_AuthorId; + return $this->_authorId; } /** * Set author ID */ - public function setAuthorId( int $AuthorId ): self + public function setAuthorId( int $authorId ): self { - $this->_AuthorId = $AuthorId; + $this->_authorId = $authorId; return $this; } @@ -166,18 +166,18 @@ public function setAuthorId( int $AuthorId ): self */ public function getAuthor(): ?User { - return $this->_Author; + return $this->_author; } /** * Set author */ - public function setAuthor( ?User $Author ): self + public function setAuthor( ?User $author ): self { - $this->_Author = $Author; - if( $Author && $Author->getId() ) + $this->_author = $author; + if( $author && $author->getId() ) { - $this->_AuthorId = $Author->getId(); + $this->_authorId = $author->getId(); } return $this; } @@ -187,15 +187,15 @@ public function setAuthor( ?User $Author ): self */ public function getStatus(): string { - return $this->_Status; + return $this->_status; } /** * Set status */ - public function setStatus( string $Status ): self + public function setStatus( string $status ): self { - $this->_Status = $Status; + $this->_status = $status; return $this; } @@ -204,7 +204,7 @@ public function setStatus( string $Status ): self */ public function isPublished(): bool { - return $this->_Status === self::STATUS_PUBLISHED; + return $this->_status === self::STATUS_PUBLISHED; } /** @@ -212,7 +212,7 @@ public function isPublished(): bool */ public function isDraft(): bool { - return $this->_Status === self::STATUS_DRAFT; + return $this->_status === self::STATUS_DRAFT; } /** @@ -220,7 +220,7 @@ public function isDraft(): bool */ public function isScheduled(): bool { - return $this->_Status === self::STATUS_SCHEDULED; + return $this->_status === self::STATUS_SCHEDULED; } /** @@ -228,15 +228,15 @@ public function isScheduled(): bool */ public function getPublishedAt(): ?DateTimeImmutable { - return $this->_PublishedAt; + return $this->_publishedAt; } /** * Set published date */ - public function setPublishedAt( ?DateTimeImmutable $PublishedAt ): self + public function setPublishedAt( ?DateTimeImmutable $publishedAt ): self { - $this->_PublishedAt = $PublishedAt; + $this->_publishedAt = $publishedAt; return $this; } @@ -245,15 +245,15 @@ public function setPublishedAt( ?DateTimeImmutable $PublishedAt ): self */ public function getViewCount(): int { - return $this->_ViewCount; + return $this->_viewCount; } /** * Set view count */ - public function setViewCount( int $ViewCount ): self + public function setViewCount( int $viewCount ): self { - $this->_ViewCount = $ViewCount; + $this->_viewCount = $viewCount; return $this; } @@ -262,7 +262,7 @@ public function setViewCount( int $ViewCount ): self */ public function incrementViewCount(): self { - $this->_ViewCount++; + $this->_viewCount++; return $this; } @@ -271,15 +271,15 @@ public function incrementViewCount(): self */ public function getCreatedAt(): ?DateTimeImmutable { - return $this->_CreatedAt; + return $this->_createdAt; } /** * Set created timestamp */ - public function setCreatedAt( DateTimeImmutable $CreatedAt ): self + public function setCreatedAt( DateTimeImmutable $createdAt ): self { - $this->_CreatedAt = $CreatedAt; + $this->_createdAt = $createdAt; return $this; } @@ -288,15 +288,15 @@ public function setCreatedAt( DateTimeImmutable $CreatedAt ): self */ public function getUpdatedAt(): ?DateTimeImmutable { - return $this->_UpdatedAt; + return $this->_updatedAt; } /** * Set updated timestamp */ - public function setUpdatedAt( ?DateTimeImmutable $UpdatedAt ): self + public function setUpdatedAt( ?DateTimeImmutable $updatedAt ): self { - $this->_UpdatedAt = $UpdatedAt; + $this->_updatedAt = $updatedAt; return $this; } @@ -307,28 +307,28 @@ public function setUpdatedAt( ?DateTimeImmutable $UpdatedAt ): self */ public function getCategories(): array { - return $this->_Categories; + return $this->_categories; } /** * Set categories * - * @param Category[] $Categories + * @param Category[] $categories */ - public function setCategories( array $Categories ): self + public function setCategories( array $categories ): self { - $this->_Categories = $Categories; + $this->_categories = $categories; return $this; } /** * Add category */ - public function addCategory( Category $Category ): self + public function addCategory( Category $category ): self { - if( !$this->hasCategory( $Category ) ) + if( !$this->hasCategory( $category ) ) { - $this->_Categories[] = $Category; + $this->_categories[] = $category; } return $this; } @@ -336,11 +336,11 @@ public function addCategory( Category $Category ): self /** * Remove category */ - public function removeCategory( Category $Category ): self + public function removeCategory( Category $category ): self { - $this->_Categories = array_filter( - $this->_Categories, - fn( $c ) => $c->getId() !== $Category->getId() + $this->_categories = array_filter( + $this->_categories, + fn( $c ) => $c->getId() !== $category->getId() ); return $this; } @@ -348,11 +348,11 @@ public function removeCategory( Category $Category ): self /** * Check if post has category */ - public function hasCategory( Category $Category ): bool + public function hasCategory( Category $category ): bool { - foreach( $this->_Categories as $c ) + foreach( $this->_categories as $c ) { - if( $c->getId() === $Category->getId() ) + if( $c->getId() === $category->getId() ) { return true; } @@ -367,28 +367,28 @@ public function hasCategory( Category $Category ): bool */ public function getTags(): array { - return $this->_Tags; + return $this->_tags; } /** * Set tags * - * @param Tag[] $Tags + * @param Tag[] $tags */ - public function setTags( array $Tags ): self + public function setTags( array $tags ): self { - $this->_Tags = $Tags; + $this->_tags = $tags; return $this; } /** * Add tag */ - public function addTag( Tag $Tag ): self + public function addTag( Tag $tag ): self { - if( !$this->hasTag( $Tag ) ) + if( !$this->hasTag( $tag ) ) { - $this->_Tags[] = $Tag; + $this->_tags[] = $tag; } return $this; } @@ -396,11 +396,11 @@ public function addTag( Tag $Tag ): self /** * Remove tag */ - public function removeTag( Tag $Tag ): self + public function removeTag( Tag $tag ): self { - $this->_Tags = array_filter( - $this->_Tags, - fn( $t ) => $t->getId() !== $Tag->getId() + $this->_tags = array_filter( + $this->_tags, + fn( $t ) => $t->getId() !== $tag->getId() ); return $this; } @@ -408,11 +408,11 @@ public function removeTag( Tag $Tag ): self /** * Check if post has tag */ - public function hasTag( Tag $Tag ): bool + public function hasTag( Tag $tag ): bool { - foreach( $this->_Tags as $t ) + foreach( $this->_tags as $t ) { - if( $t->getId() === $Tag->getId() ) + if( $t->getId() === $tag->getId() ) { return true; } @@ -423,72 +423,72 @@ public function hasTag( Tag $Tag ): bool /** * Create Post from array data * - * @param array $Data Associative array of post data + * @param array $data Associative array of post data * @return Post * @throws Exception */ - public static function fromArray( array $Data ): Post + public static function fromArray( array $data ): Post { - $Post = new self(); + $post = new self(); - if( isset( $Data['id'] ) ) + if( isset( $data['id'] ) ) { - $Post->setId( (int)$Data['id'] ); + $post->setId( (int)$data['id'] ); } - $Post->setTitle( $Data['title'] ?? '' ); - $Post->setSlug( $Data['slug'] ?? '' ); - $Post->setBody( $Data['body'] ?? '' ); - $Post->setExcerpt( $Data['excerpt'] ?? null ); - $Post->setFeaturedImage( $Data['featured_image'] ?? null ); - $Post->setAuthorId( (int)($Data['author_id'] ?? 0) ); - $Post->setStatus( $Data['status'] ?? self::STATUS_DRAFT ); - $Post->setViewCount( (int)($Data['view_count'] ?? 0) ); + $post->setTitle( $data['title'] ?? '' ); + $post->setSlug( $data['slug'] ?? '' ); + $post->setBody( $data['body'] ?? '' ); + $post->setExcerpt( $data['excerpt'] ?? null ); + $post->setFeaturedImage( $data['featured_image'] ?? null ); + $post->setAuthorId( (int)($data['author_id'] ?? 0) ); + $post->setStatus( $data['status'] ?? self::STATUS_DRAFT ); + $post->setViewCount( (int)($data['view_count'] ?? 0) ); - if( isset( $Data['published_at'] ) && $Data['published_at'] ) + if( isset( $data['published_at'] ) && $data['published_at'] ) { - $Post->setPublishedAt( - is_string( $Data['published_at'] ) - ? new DateTimeImmutable( $Data['published_at'] ) - : $Data['published_at'] + $post->setPublishedAt( + is_string( $data['published_at'] ) + ? new DateTimeImmutable( $data['published_at'] ) + : $data['published_at'] ); } - if( isset( $Data['created_at'] ) && $Data['created_at'] ) + if( isset( $data['created_at'] ) && $data['created_at'] ) { - $Post->setCreatedAt( - is_string( $Data['created_at'] ) - ? new DateTimeImmutable( $Data['created_at'] ) - : $Data['created_at'] + $post->setCreatedAt( + is_string( $data['created_at'] ) + ? new DateTimeImmutable( $data['created_at'] ) + : $data['created_at'] ); } - if( isset( $Data['updated_at'] ) && $Data['updated_at'] ) + if( isset( $data['updated_at'] ) && $data['updated_at'] ) { - $Post->setUpdatedAt( - is_string( $Data['updated_at'] ) - ? new DateTimeImmutable( $Data['updated_at'] ) - : $Data['updated_at'] + $post->setUpdatedAt( + is_string( $data['updated_at'] ) + ? new DateTimeImmutable( $data['updated_at'] ) + : $data['updated_at'] ); } // Relationships - if( isset( $Data['author'] ) && $Data['author'] instanceof User ) + if( isset( $data['author'] ) && $data['author'] instanceof User ) { - $Post->setAuthor( $Data['author'] ); + $post->setAuthor( $data['author'] ); } - if( isset( $Data['categories'] ) && is_array( $Data['categories'] ) ) + if( isset( $data['categories'] ) && is_array( $data['categories'] ) ) { - $Post->setCategories( $Data['categories'] ); + $post->setCategories( $data['categories'] ); } - if( isset( $Data['tags'] ) && is_array( $Data['tags'] ) ) + if( isset( $data['tags'] ) && is_array( $data['tags'] ) ) { - $Post->setTags( $Data['tags'] ); + $post->setTags( $data['tags'] ); } - return $Post; + return $post; } /** @@ -499,18 +499,18 @@ public static function fromArray( array $Data ): Post public function toArray(): array { return [ - 'id' => $this->_Id, - 'title' => $this->_Title, - 'slug' => $this->_Slug, - 'body' => $this->_Body, - 'excerpt' => $this->_Excerpt, - 'featured_image' => $this->_FeaturedImage, - 'author_id' => $this->_AuthorId, - 'status' => $this->_Status, - 'published_at' => $this->_PublishedAt?->format( 'Y-m-d H:i:s' ), - 'view_count' => $this->_ViewCount, - 'created_at' => $this->_CreatedAt?->format( 'Y-m-d H:i:s' ), - 'updated_at' => $this->_UpdatedAt?->format( 'Y-m-d H:i:s' ), + 'id' => $this->_id, + 'title' => $this->_title, + 'slug' => $this->_slug, + 'body' => $this->_body, + 'excerpt' => $this->_excerpt, + 'featured_image' => $this->_featuredImage, + 'author_id' => $this->_authorId, + 'status' => $this->_status, + 'published_at' => $this->_publishedAt?->format( 'Y-m-d H:i:s' ), + 'view_count' => $this->_viewCount, + 'created_at' => $this->_createdAt?->format( 'Y-m-d H:i:s' ), + 'updated_at' => $this->_updatedAt?->format( 'Y-m-d H:i:s' ), ]; } } diff --git a/src/Cms/Models/Tag.php b/src/Cms/Models/Tag.php index f1b3d3b..d268d8a 100644 --- a/src/Cms/Models/Tag.php +++ b/src/Cms/Models/Tag.php @@ -12,15 +12,15 @@ */ class Tag { - private ?int $_Id = null; - private string $_Name; - private string $_Slug; - private ?DateTimeImmutable $_CreatedAt = null; - private ?DateTimeImmutable $_UpdatedAt = null; + private ?int $_id = null; + private string $_name; + private string $_slug; + private ?DateTimeImmutable $_createdAt = null; + private ?DateTimeImmutable $_updatedAt = null; public function __construct() { - $this->_CreatedAt = new DateTimeImmutable(); + $this->_createdAt = new DateTimeImmutable(); } /** @@ -28,15 +28,15 @@ public function __construct() */ public function getId(): ?int { - return $this->_Id; + return $this->_id; } /** * Set tag ID */ - public function setId( int $Id ): self + public function setId( int $id ): self { - $this->_Id = $Id; + $this->_id = $id; return $this; } @@ -45,15 +45,15 @@ public function setId( int $Id ): self */ public function getName(): string { - return $this->_Name; + return $this->_name; } /** * Set name */ - public function setName( string $Name ): self + public function setName( string $name ): self { - $this->_Name = $Name; + $this->_name = $name; return $this; } @@ -62,15 +62,15 @@ public function setName( string $Name ): self */ public function getSlug(): string { - return $this->_Slug; + return $this->_slug; } /** * Set slug */ - public function setSlug( string $Slug ): self + public function setSlug( string $slug ): self { - $this->_Slug = $Slug; + $this->_slug = $slug; return $this; } @@ -79,15 +79,15 @@ public function setSlug( string $Slug ): self */ public function getCreatedAt(): ?DateTimeImmutable { - return $this->_CreatedAt; + return $this->_createdAt; } /** * Set created timestamp */ - public function setCreatedAt( DateTimeImmutable $CreatedAt ): self + public function setCreatedAt( DateTimeImmutable $createdAt ): self { - $this->_CreatedAt = $CreatedAt; + $this->_createdAt = $createdAt; return $this; } @@ -96,56 +96,56 @@ public function setCreatedAt( DateTimeImmutable $CreatedAt ): self */ public function getUpdatedAt(): ?DateTimeImmutable { - return $this->_UpdatedAt; + return $this->_updatedAt; } /** * Set updated timestamp */ - public function setUpdatedAt( ?DateTimeImmutable $UpdatedAt ): self + public function setUpdatedAt( ?DateTimeImmutable $updatedAt ): self { - $this->_UpdatedAt = $UpdatedAt; + $this->_updatedAt = $updatedAt; return $this; } /** * Create Tag from array data * - * @param array $Data Associative array of tag data + * @param array $data Associative array of tag data * @return Tag * @throws Exception */ - public static function fromArray( array $Data ): Tag + public static function fromArray( array $data ): Tag { - $Tag = new self(); + $tag = new self(); - if( isset( $Data['id'] ) ) + if( isset( $data['id'] ) ) { - $Tag->setId( (int)$Data['id'] ); + $tag->setId( (int)$data['id'] ); } - $Tag->setName( $Data['name'] ?? '' ); - $Tag->setSlug( $Data['slug'] ?? '' ); + $tag->setName( $data['name'] ?? '' ); + $tag->setSlug( $data['slug'] ?? '' ); - if( isset( $Data['created_at'] ) && $Data['created_at'] ) + if( isset( $data['created_at'] ) && $data['created_at'] ) { - $Tag->setCreatedAt( - is_string( $Data['created_at'] ) - ? new DateTimeImmutable( $Data['created_at'] ) - : $Data['created_at'] + $tag->setCreatedAt( + is_string( $data['created_at'] ) + ? new DateTimeImmutable( $data['created_at'] ) + : $data['created_at'] ); } - if( isset( $Data['updated_at'] ) && $Data['updated_at'] ) + if( isset( $data['updated_at'] ) && $data['updated_at'] ) { - $Tag->setUpdatedAt( - is_string( $Data['updated_at'] ) - ? new DateTimeImmutable( $Data['updated_at'] ) - : $Data['updated_at'] + $tag->setUpdatedAt( + is_string( $data['updated_at'] ) + ? new DateTimeImmutable( $data['updated_at'] ) + : $data['updated_at'] ); } - return $Tag; + return $tag; } /** @@ -156,11 +156,11 @@ public static function fromArray( array $Data ): Tag public function toArray(): array { return [ - 'id' => $this->_Id, - 'name' => $this->_Name, - 'slug' => $this->_Slug, - 'created_at' => $this->_CreatedAt?->format( 'Y-m-d H:i:s' ), - 'updated_at' => $this->_UpdatedAt?->format( 'Y-m-d H:i:s' ), + 'id' => $this->_id, + 'name' => $this->_name, + 'slug' => $this->_slug, + 'created_at' => $this->_createdAt?->format( 'Y-m-d H:i:s' ), + 'updated_at' => $this->_updatedAt?->format( 'Y-m-d H:i:s' ), ]; } } diff --git a/src/Cms/Models/User.php b/src/Cms/Models/User.php index 3756da2..e81d5a6 100644 --- a/src/Cms/Models/User.php +++ b/src/Cms/Models/User.php @@ -11,21 +11,21 @@ */ class User { - private ?int $_Id = null; - private string $_Username; - private string $_Email; - private string $_PasswordHash; - private string $_Role = 'subscriber'; - private string $_Status = 'active'; - private bool $_EmailVerified = false; - private ?string $_RememberToken = null; - private ?string $_TwoFactorSecret = null; - private ?array $_TwoFactorRecoveryCodes = null; - private int $_FailedLoginAttempts = 0; - private ?DateTimeImmutable $_LockedUntil = null; - private ?DateTimeImmutable $_CreatedAt = null; - private ?DateTimeImmutable $_UpdatedAt = null; - private ?DateTimeImmutable $_LastLoginAt = null; + private ?int $_id = null; + private string $_username; + private string $_email; + private string $_passwordHash; + private string $_role = 'subscriber'; + private string $_status = 'active'; + private bool $_emailVerified = false; + private ?string $_rememberToken = null; + private ?string $_twoFactorSecret = null; + private ?array $_twoFactorRecoveryCodes = null; + private int $_failedLoginAttempts = 0; + private ?DateTimeImmutable $_lockedUntil = null; + private ?DateTimeImmutable $_createdAt = null; + private ?DateTimeImmutable $_updatedAt = null; + private ?DateTimeImmutable $_lastLoginAt = null; /** * User roles @@ -44,7 +44,7 @@ class User public function __construct() { - $this->_CreatedAt = new DateTimeImmutable(); + $this->_createdAt = new DateTimeImmutable(); } /** @@ -52,15 +52,15 @@ public function __construct() */ public function getId(): ?int { - return $this->_Id; + return $this->_id; } /** * Set user ID */ - public function setId( int $Id ): self + public function setId( int $id ): self { - $this->_Id = $Id; + $this->_id = $id; return $this; } @@ -69,15 +69,15 @@ public function setId( int $Id ): self */ public function getUsername(): string { - return $this->_Username; + return $this->_username; } /** * Set username */ - public function setUsername( string $Username ): self + public function setUsername( string $username ): self { - $this->_Username = $Username; + $this->_username = $username; return $this; } @@ -86,15 +86,15 @@ public function setUsername( string $Username ): self */ public function getEmail(): string { - return $this->_Email; + return $this->_email; } /** * Set email */ - public function setEmail( string $Email ): self + public function setEmail( string $email ): self { - $this->_Email = $Email; + $this->_email = $email; return $this; } @@ -103,15 +103,15 @@ public function setEmail( string $Email ): self */ public function getPasswordHash(): string { - return $this->_PasswordHash; + return $this->_passwordHash; } /** * Set password hash */ - public function setPasswordHash( string $PasswordHash ): self + public function setPasswordHash( string $passwordHash ): self { - $this->_PasswordHash = $PasswordHash; + $this->_passwordHash = $passwordHash; return $this; } @@ -120,15 +120,15 @@ public function setPasswordHash( string $PasswordHash ): self */ public function getRole(): string { - return $this->_Role; + return $this->_role; } /** * Set user role */ - public function setRole( string $Role ): self + public function setRole( string $role ): self { - $this->_Role = $Role; + $this->_role = $role; return $this; } @@ -137,7 +137,7 @@ public function setRole( string $Role ): self */ public function isAdmin(): bool { - return $this->_Role === self::ROLE_ADMIN; + return $this->_role === self::ROLE_ADMIN; } /** @@ -145,7 +145,7 @@ public function isAdmin(): bool */ public function isEditor(): bool { - return $this->_Role === self::ROLE_EDITOR; + return $this->_role === self::ROLE_EDITOR; } /** @@ -153,7 +153,7 @@ public function isEditor(): bool */ public function isAuthor(): bool { - return $this->_Role === self::ROLE_AUTHOR; + return $this->_role === self::ROLE_AUTHOR; } /** @@ -161,15 +161,15 @@ public function isAuthor(): bool */ public function getStatus(): string { - return $this->_Status; + return $this->_status; } /** * Set user status */ - public function setStatus( string $Status ): self + public function setStatus( string $status ): self { - $this->_Status = $Status; + $this->_status = $status; return $this; } @@ -178,7 +178,7 @@ public function setStatus( string $Status ): self */ public function isActive(): bool { - return $this->_Status === self::STATUS_ACTIVE; + return $this->_status === self::STATUS_ACTIVE; } /** @@ -186,7 +186,7 @@ public function isActive(): bool */ public function isSuspended(): bool { - return $this->_Status === self::STATUS_SUSPENDED; + return $this->_status === self::STATUS_SUSPENDED; } /** @@ -194,15 +194,15 @@ public function isSuspended(): bool */ public function isEmailVerified(): bool { - return $this->_EmailVerified; + return $this->_emailVerified; } /** * Set email verified status */ - public function setEmailVerified( bool $EmailVerified ): self + public function setEmailVerified( bool $emailVerified ): self { - $this->_EmailVerified = $EmailVerified; + $this->_emailVerified = $emailVerified; return $this; } @@ -211,15 +211,15 @@ public function setEmailVerified( bool $EmailVerified ): self */ public function getRememberToken(): ?string { - return $this->_RememberToken; + return $this->_rememberToken; } /** * Set remember token */ - public function setRememberToken( ?string $RememberToken ): self + public function setRememberToken( ?string $rememberToken ): self { - $this->_RememberToken = $RememberToken; + $this->_rememberToken = $rememberToken; return $this; } @@ -228,15 +228,15 @@ public function setRememberToken( ?string $RememberToken ): self */ public function getTwoFactorSecret(): ?string { - return $this->_TwoFactorSecret; + return $this->_twoFactorSecret; } /** * Set two-factor secret */ - public function setTwoFactorSecret( ?string $TwoFactorSecret ): self + public function setTwoFactorSecret( ?string $twoFactorSecret ): self { - $this->_TwoFactorSecret = $TwoFactorSecret; + $this->_twoFactorSecret = $twoFactorSecret; return $this; } @@ -245,7 +245,7 @@ public function setTwoFactorSecret( ?string $TwoFactorSecret ): self */ public function hasTwoFactorEnabled(): bool { - return $this->_TwoFactorSecret !== null; + return $this->_twoFactorSecret !== null; } /** @@ -253,15 +253,15 @@ public function hasTwoFactorEnabled(): bool */ public function getTwoFactorRecoveryCodes(): ?array { - return $this->_TwoFactorRecoveryCodes; + return $this->_twoFactorRecoveryCodes; } /** * Set two-factor recovery codes */ - public function setTwoFactorRecoveryCodes( ?array $TwoFactorRecoveryCodes ): self + public function setTwoFactorRecoveryCodes( ?array $twoFactorRecoveryCodes ): self { - $this->_TwoFactorRecoveryCodes = $TwoFactorRecoveryCodes; + $this->_twoFactorRecoveryCodes = $twoFactorRecoveryCodes; return $this; } @@ -270,15 +270,15 @@ public function setTwoFactorRecoveryCodes( ?array $TwoFactorRecoveryCodes ): sel */ public function getFailedLoginAttempts(): int { - return $this->_FailedLoginAttempts; + return $this->_failedLoginAttempts; } /** * Set failed login attempts count */ - public function setFailedLoginAttempts( int $FailedLoginAttempts ): self + public function setFailedLoginAttempts( int $failedLoginAttempts ): self { - $this->_FailedLoginAttempts = $FailedLoginAttempts; + $this->_failedLoginAttempts = $failedLoginAttempts; return $this; } @@ -287,7 +287,7 @@ public function setFailedLoginAttempts( int $FailedLoginAttempts ): self */ public function incrementFailedLoginAttempts(): self { - $this->_FailedLoginAttempts++; + $this->_failedLoginAttempts++; return $this; } @@ -296,8 +296,8 @@ public function incrementFailedLoginAttempts(): self */ public function resetFailedLoginAttempts(): self { - $this->_FailedLoginAttempts = 0; - $this->_LockedUntil = null; + $this->_failedLoginAttempts = 0; + $this->_lockedUntil = null; return $this; } @@ -306,15 +306,15 @@ public function resetFailedLoginAttempts(): self */ public function getLockedUntil(): ?DateTimeImmutable { - return $this->_LockedUntil; + return $this->_lockedUntil; } /** * Set locked until timestamp */ - public function setLockedUntil( ?DateTimeImmutable $LockedUntil ): self + public function setLockedUntil( ?DateTimeImmutable $lockedUntil ): self { - $this->_LockedUntil = $LockedUntil; + $this->_lockedUntil = $lockedUntil; return $this; } @@ -323,12 +323,12 @@ public function setLockedUntil( ?DateTimeImmutable $LockedUntil ): self */ public function isLockedOut(): bool { - if( $this->_LockedUntil === null ) + if( $this->_lockedUntil === null ) { return false; } - return $this->_LockedUntil > new DateTimeImmutable(); + return $this->_lockedUntil > new DateTimeImmutable(); } /** @@ -336,15 +336,15 @@ public function isLockedOut(): bool */ public function getCreatedAt(): ?DateTimeImmutable { - return $this->_CreatedAt; + return $this->_createdAt; } /** * Set created at timestamp */ - public function setCreatedAt( DateTimeImmutable $CreatedAt ): self + public function setCreatedAt( DateTimeImmutable $createdAt ): self { - $this->_CreatedAt = $CreatedAt; + $this->_createdAt = $createdAt; return $this; } @@ -353,15 +353,15 @@ public function setCreatedAt( DateTimeImmutable $CreatedAt ): self */ public function getUpdatedAt(): ?DateTimeImmutable { - return $this->_UpdatedAt; + return $this->_updatedAt; } /** * Set updated at timestamp */ - public function setUpdatedAt( ?DateTimeImmutable $UpdatedAt ): self + public function setUpdatedAt( ?DateTimeImmutable $updatedAt ): self { - $this->_UpdatedAt = $UpdatedAt; + $this->_updatedAt = $updatedAt; return $this; } @@ -370,15 +370,15 @@ public function setUpdatedAt( ?DateTimeImmutable $UpdatedAt ): self */ public function getLastLoginAt(): ?DateTimeImmutable { - return $this->_LastLoginAt; + return $this->_lastLoginAt; } /** * Set last login at timestamp */ - public function setLastLoginAt( ?DateTimeImmutable $LastLoginAt ): self + public function setLastLoginAt( ?DateTimeImmutable $lastLoginAt ): self { - $this->_LastLoginAt = $LastLoginAt; + $this->_lastLoginAt = $lastLoginAt; return $this; } @@ -388,72 +388,72 @@ public function setLastLoginAt( ?DateTimeImmutable $LastLoginAt ): self public function toArray(): array { return [ - 'id' => $this->_Id, - 'username' => $this->_Username, - 'email' => $this->_Email, - 'password_hash' => $this->_PasswordHash, - 'role' => $this->_Role, - 'status' => $this->_Status, - 'email_verified' => $this->_EmailVerified, - 'remember_token' => $this->_RememberToken, - 'two_factor_secret' => $this->_TwoFactorSecret, - 'two_factor_recovery_codes' => $this->_TwoFactorRecoveryCodes ? json_encode( $this->_TwoFactorRecoveryCodes ) : null, - 'failed_login_attempts' => $this->_FailedLoginAttempts, - 'locked_until' => $this->_LockedUntil?->format( 'Y-m-d H:i:s' ), - 'created_at' => $this->_CreatedAt?->format( 'Y-m-d H:i:s' ), - 'updated_at' => $this->_UpdatedAt?->format( 'Y-m-d H:i:s' ), - 'last_login_at' => $this->_LastLoginAt?->format( 'Y-m-d H:i:s' ) + 'id' => $this->_id, + 'username' => $this->_username, + 'email' => $this->_email, + 'password_hash' => $this->_passwordHash, + 'role' => $this->_role, + 'status' => $this->_status, + 'email_verified' => $this->_emailVerified, + 'remember_token' => $this->_rememberToken, + 'two_factor_secret' => $this->_twoFactorSecret, + 'two_factor_recovery_codes' => $this->_twoFactorRecoveryCodes ? json_encode( $this->_twoFactorRecoveryCodes ) : null, + 'failed_login_attempts' => $this->_failedLoginAttempts, + 'locked_until' => $this->_lockedUntil?->format( 'Y-m-d H:i:s' ), + 'created_at' => $this->_createdAt?->format( 'Y-m-d H:i:s' ), + 'updated_at' => $this->_updatedAt?->format( 'Y-m-d H:i:s' ), + 'last_login_at' => $this->_lastLoginAt?->format( 'Y-m-d H:i:s' ) ]; } /** * Create user from array */ - public static function fromArray( array $Data ): self + public static function fromArray( array $data ): self { - $User = new self(); + $user = new self(); - if( isset( $Data['id'] ) ) + if( isset( $data['id'] ) ) { - $User->setId( $Data['id'] ); + $user->setId( $data['id'] ); } - $User->setUsername( $Data['username'] ); - $User->setEmail( $Data['email'] ); - $User->setPasswordHash( $Data['password_hash'] ); - $User->setRole( $Data['role'] ?? self::ROLE_SUBSCRIBER ); - $User->setStatus( $Data['status'] ?? self::STATUS_ACTIVE ); - $User->setEmailVerified( $Data['email_verified'] ?? false ); - $User->setRememberToken( $Data['remember_token'] ?? null ); - $User->setTwoFactorSecret( $Data['two_factor_secret'] ?? null ); + $user->setUsername( $data['username'] ); + $user->setEmail( $data['email'] ); + $user->setPasswordHash( $data['password_hash'] ); + $user->setRole( $data['role'] ?? self::ROLE_SUBSCRIBER ); + $user->setStatus( $data['status'] ?? self::STATUS_ACTIVE ); + $user->setEmailVerified( $data['email_verified'] ?? false ); + $user->setRememberToken( $data['remember_token'] ?? null ); + $user->setTwoFactorSecret( $data['two_factor_secret'] ?? null ); - if( isset( $Data['two_factor_recovery_codes'] ) && $Data['two_factor_recovery_codes'] ) + if( isset( $data['two_factor_recovery_codes'] ) && $data['two_factor_recovery_codes'] ) { - $User->setTwoFactorRecoveryCodes( json_decode( $Data['two_factor_recovery_codes'], true ) ); + $user->setTwoFactorRecoveryCodes( json_decode( $data['two_factor_recovery_codes'], true ) ); } - $User->setFailedLoginAttempts( $Data['failed_login_attempts'] ?? 0 ); + $user->setFailedLoginAttempts( $data['failed_login_attempts'] ?? 0 ); - if( isset( $Data['locked_until'] ) && $Data['locked_until'] ) + if( isset( $data['locked_until'] ) && $data['locked_until'] ) { - $User->setLockedUntil( new DateTimeImmutable( $Data['locked_until'] ) ); + $user->setLockedUntil( new DateTimeImmutable( $data['locked_until'] ) ); } - if( isset( $Data['created_at'] ) && $Data['created_at'] ) + if( isset( $data['created_at'] ) && $data['created_at'] ) { - $User->setCreatedAt( new DateTimeImmutable( $Data['created_at'] ) ); + $user->setCreatedAt( new DateTimeImmutable( $data['created_at'] ) ); } - if( isset( $Data['updated_at'] ) && $Data['updated_at'] ) + if( isset( $data['updated_at'] ) && $data['updated_at'] ) { - $User->setUpdatedAt( new DateTimeImmutable( $Data['updated_at'] ) ); + $user->setUpdatedAt( new DateTimeImmutable( $data['updated_at'] ) ); } - if( isset( $Data['last_login_at'] ) && $Data['last_login_at'] ) + if( isset( $data['last_login_at'] ) && $data['last_login_at'] ) { - $User->setLastLoginAt( new DateTimeImmutable( $Data['last_login_at'] ) ); + $user->setLastLoginAt( new DateTimeImmutable( $data['last_login_at'] ) ); } - return $User; + return $user; } } diff --git a/src/Cms/Repositories/DatabaseCategoryRepository.php b/src/Cms/Repositories/DatabaseCategoryRepository.php index 7dcecb4..419a6bc 100644 --- a/src/Cms/Repositories/DatabaseCategoryRepository.php +++ b/src/Cms/Repositories/DatabaseCategoryRepository.php @@ -2,7 +2,9 @@ namespace Neuron\Cms\Repositories; +use Neuron\Cms\Database\ConnectionFactory; use Neuron\Cms\Models\Category; +use Neuron\Data\Setting\SettingManager; use PDO; use Exception; use DateTimeImmutable; @@ -16,55 +18,26 @@ */ class DatabaseCategoryRepository implements ICategoryRepository { - private PDO $_PDO; + private PDO $_pdo; /** * Constructor * - * @param array $DatabaseConfig Database configuration - * @throws Exception if adapter is not supported + * @param SettingManager $settings Settings manager with database configuration + * @throws Exception if database configuration is missing or adapter is unsupported */ - public function __construct( array $DatabaseConfig ) + public function __construct( SettingManager $settings ) { - $adapter = $DatabaseConfig['adapter'] ?? 'sqlite'; - - $dsn = match( $adapter ) - { - 'sqlite' => "sqlite:{$DatabaseConfig['name']}", - 'mysql' => sprintf( - "mysql:host=%s;port=%s;dbname=%s;charset=%s", - $DatabaseConfig['host'] ?? 'localhost', - $DatabaseConfig['port'] ?? 3306, - $DatabaseConfig['name'], - $DatabaseConfig['charset'] ?? 'utf8mb4' - ), - 'pgsql' => sprintf( - "pgsql:host=%s;port=%s;dbname=%s", - $DatabaseConfig['host'] ?? 'localhost', - $DatabaseConfig['port'] ?? 5432, - $DatabaseConfig['name'] - ), - default => throw new Exception( "Unsupported database adapter: $adapter" ) - }; - - $this->_PDO = new PDO( - $dsn, - $DatabaseConfig['user'] ?? null, - $DatabaseConfig['pass'] ?? null, - [ - PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, - PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC - ] - ); + $this->_pdo = ConnectionFactory::createFromSettings( $settings ); } /** * Find category by ID */ - public function findById( int $Id ): ?Category + public function findById( int $id ): ?Category { - $stmt = $this->_PDO->prepare( "SELECT * FROM categories WHERE id = ? LIMIT 1" ); - $stmt->execute( [ $Id ] ); + $stmt = $this->_pdo->prepare( "SELECT * FROM categories WHERE id = ? LIMIT 1" ); + $stmt->execute( [ $id ] ); $row = $stmt->fetch(); @@ -74,10 +47,10 @@ public function findById( int $Id ): ?Category /** * Find category by slug */ - public function findBySlug( string $Slug ): ?Category + public function findBySlug( string $slug ): ?Category { - $stmt = $this->_PDO->prepare( "SELECT * FROM categories WHERE slug = ? LIMIT 1" ); - $stmt->execute( [ $Slug ] ); + $stmt = $this->_pdo->prepare( "SELECT * FROM categories WHERE slug = ? LIMIT 1" ); + $stmt->execute( [ $slug ] ); $row = $stmt->fetch(); @@ -87,76 +60,98 @@ public function findBySlug( string $Slug ): ?Category /** * Find category by name */ - public function findByName( string $Name ): ?Category + public function findByName( string $name ): ?Category { - $stmt = $this->_PDO->prepare( "SELECT * FROM categories WHERE name = ? LIMIT 1" ); - $stmt->execute( [ $Name ] ); + $stmt = $this->_pdo->prepare( "SELECT * FROM categories WHERE name = ? LIMIT 1" ); + $stmt->execute( [ $name ] ); $row = $stmt->fetch(); return $row ? Category::fromArray( $row ) : null; } + /** + * Find multiple categories by IDs + * + * @param array $ids Array of category IDs + * @return Category[] + */ + public function findByIds( array $ids ): array + { + if( empty( $ids ) ) + { + return []; + } + + $placeholders = implode( ',', array_fill( 0, count( $ids ), '?' ) ); + $stmt = $this->_pdo->prepare( "SELECT * FROM categories WHERE id IN ($placeholders)" ); + $stmt->execute( $ids ); + + $rows = $stmt->fetchAll(); + + return array_map( fn( $row ) => Category::fromArray( $row ), $rows ); + } + /** * Create a new category */ - public function create( Category $Category ): Category + public function create( Category $category ): Category { // Check for duplicate slug - if( $this->findBySlug( $Category->getSlug() ) ) + if( $this->findBySlug( $category->getSlug() ) ) { throw new Exception( 'Slug already exists' ); } // Check for duplicate name - if( $this->findByName( $Category->getName() ) ) + if( $this->findByName( $category->getName() ) ) { throw new Exception( 'Category name already exists' ); } - $stmt = $this->_PDO->prepare( + $stmt = $this->_pdo->prepare( "INSERT INTO categories (name, slug, description, created_at, updated_at) VALUES (?, ?, ?, ?, ?)" ); $stmt->execute([ - $Category->getName(), - $Category->getSlug(), - $Category->getDescription(), - $Category->getCreatedAt()->format( 'Y-m-d H:i:s' ), + $category->getName(), + $category->getSlug(), + $category->getDescription(), + $category->getCreatedAt()->format( 'Y-m-d H:i:s' ), (new DateTimeImmutable())->format( 'Y-m-d H:i:s' ) ]); - $Category->setId( (int)$this->_PDO->lastInsertId() ); + $category->setId( (int)$this->_pdo->lastInsertId() ); - return $Category; + return $category; } /** * Update an existing category */ - public function update( Category $Category ): bool + public function update( Category $category ): bool { - if( !$Category->getId() ) + if( !$category->getId() ) { return false; } // Check for duplicate slug (excluding current category) - $ExistingBySlug = $this->findBySlug( $Category->getSlug() ); - if( $ExistingBySlug && $ExistingBySlug->getId() !== $Category->getId() ) + $existingBySlug = $this->findBySlug( $category->getSlug() ); + if( $existingBySlug && $existingBySlug->getId() !== $category->getId() ) { throw new Exception( 'Slug already exists' ); } // Check for duplicate name (excluding current category) - $ExistingByName = $this->findByName( $Category->getName() ); - if( $ExistingByName && $ExistingByName->getId() !== $Category->getId() ) + $existingByName = $this->findByName( $category->getName() ); + if( $existingByName && $existingByName->getId() !== $category->getId() ) { throw new Exception( 'Category name already exists' ); } - $stmt = $this->_PDO->prepare( + $stmt = $this->_pdo->prepare( "UPDATE categories SET name = ?, slug = ?, @@ -166,22 +161,22 @@ public function update( Category $Category ): bool ); return $stmt->execute([ - $Category->getName(), - $Category->getSlug(), - $Category->getDescription(), + $category->getName(), + $category->getSlug(), + $category->getDescription(), (new DateTimeImmutable())->format( 'Y-m-d H:i:s' ), - $Category->getId() + $category->getId() ]); } /** * Delete a category */ - public function delete( int $Id ): bool + public function delete( int $id ): bool { // Foreign key constraints will handle cascade delete of post relationships - $stmt = $this->_PDO->prepare( "DELETE FROM categories WHERE id = ?" ); - $stmt->execute( [ $Id ] ); + $stmt = $this->_pdo->prepare( "DELETE FROM categories WHERE id = ?" ); + $stmt->execute( [ $id ] ); return $stmt->rowCount() > 0; } @@ -191,7 +186,7 @@ public function delete( int $Id ): bool */ public function all(): array { - $stmt = $this->_PDO->query( "SELECT * FROM categories ORDER BY name ASC" ); + $stmt = $this->_pdo->query( "SELECT * FROM categories ORDER BY name ASC" ); $rows = $stmt->fetchAll(); return array_map( fn( $row ) => Category::fromArray( $row ), $rows ); @@ -202,7 +197,7 @@ public function all(): array */ public function count(): int { - $stmt = $this->_PDO->query( "SELECT COUNT(*) as total FROM categories" ); + $stmt = $this->_pdo->query( "SELECT COUNT(*) as total FROM categories" ); $row = $stmt->fetch(); return (int)$row['total']; @@ -213,7 +208,7 @@ public function count(): int */ public function allWithPostCount(): array { - $stmt = $this->_PDO->query( + $stmt = $this->_pdo->query( "SELECT c.*, COUNT(pc.post_id) as post_count FROM categories c LEFT JOIN post_categories pc ON c.id = pc.category_id diff --git a/src/Cms/Repositories/DatabasePasswordResetTokenRepository.php b/src/Cms/Repositories/DatabasePasswordResetTokenRepository.php index 83480f3..edfed30 100644 --- a/src/Cms/Repositories/DatabasePasswordResetTokenRepository.php +++ b/src/Cms/Repositories/DatabasePasswordResetTokenRepository.php @@ -2,7 +2,9 @@ namespace Neuron\Cms\Repositories; +use Neuron\Cms\Database\ConnectionFactory; use Neuron\Cms\Models\PasswordResetToken; +use Neuron\Data\Setting\SettingManager; use PDO; use Exception; use DateTimeImmutable; @@ -16,77 +18,48 @@ */ class DatabasePasswordResetTokenRepository implements IPasswordResetTokenRepository { - private PDO $_PDO; + private PDO $_pdo; /** * Constructor * - * @param array $DatabaseConfig Database configuration - * @throws Exception if adapter is not supported + * @param SettingManager $settings Settings manager with database configuration + * @throws Exception if database configuration is missing or adapter is unsupported */ - public function __construct( array $DatabaseConfig ) + public function __construct( SettingManager $settings ) { - $adapter = $DatabaseConfig['adapter'] ?? 'sqlite'; - - $dsn = match( $adapter ) - { - 'sqlite' => "sqlite:{$DatabaseConfig['name']}", - 'mysql' => sprintf( - "mysql:host=%s;port=%s;dbname=%s;charset=%s", - $DatabaseConfig['host'] ?? 'localhost', - $DatabaseConfig['port'] ?? 3306, - $DatabaseConfig['name'], - $DatabaseConfig['charset'] ?? 'utf8mb4' - ), - 'pgsql' => sprintf( - "pgsql:host=%s;port=%s;dbname=%s", - $DatabaseConfig['host'] ?? 'localhost', - $DatabaseConfig['port'] ?? 5432, - $DatabaseConfig['name'] - ), - default => throw new Exception( "Unsupported database adapter: $adapter" ) - }; - - $this->_PDO = new PDO( - $dsn, - $DatabaseConfig['user'] ?? null, - $DatabaseConfig['pass'] ?? null, - [ - PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, - PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC - ] - ); + $this->_pdo = ConnectionFactory::createFromSettings( $settings ); } /** * Create a new password reset token */ - public function create( PasswordResetToken $Token ): PasswordResetToken + public function create( PasswordResetToken $token ): PasswordResetToken { - $stmt = $this->_PDO->prepare( + $stmt = $this->_pdo->prepare( "INSERT INTO password_reset_tokens (email, token, created_at, expires_at) VALUES (?, ?, ?, ?)" ); $stmt->execute([ - $Token->getEmail(), - $Token->getToken(), - $Token->getCreatedAt()->format( 'Y-m-d H:i:s' ), - $Token->getExpiresAt()->format( 'Y-m-d H:i:s' ) + $token->getEmail(), + $token->getToken(), + $token->getCreatedAt()->format( 'Y-m-d H:i:s' ), + $token->getExpiresAt()->format( 'Y-m-d H:i:s' ) ]); - $Token->setId( (int) $this->_PDO->lastInsertId() ); + $token->setId( (int) $this->_pdo->lastInsertId() ); - return $Token; + return $token; } /** * Find a token by its hashed value */ - public function findByToken( string $Token ): ?PasswordResetToken + public function findByToken( string $token ): ?PasswordResetToken { - $stmt = $this->_PDO->prepare( "SELECT * FROM password_reset_tokens WHERE token = ? LIMIT 1" ); - $stmt->execute( [ $Token ] ); + $stmt = $this->_pdo->prepare( "SELECT * FROM password_reset_tokens WHERE token = ? LIMIT 1" ); + $stmt->execute( [ $token ] ); $row = $stmt->fetch(); @@ -96,10 +69,10 @@ public function findByToken( string $Token ): ?PasswordResetToken /** * Delete all tokens for a given email address */ - public function deleteByEmail( string $Email ): int + public function deleteByEmail( string $email ): int { - $stmt = $this->_PDO->prepare( "DELETE FROM password_reset_tokens WHERE email = ?" ); - $stmt->execute( [ $Email ] ); + $stmt = $this->_pdo->prepare( "DELETE FROM password_reset_tokens WHERE email = ?" ); + $stmt->execute( [ $email ] ); return $stmt->rowCount(); } @@ -107,10 +80,10 @@ public function deleteByEmail( string $Email ): int /** * Delete a specific token by its hashed value */ - public function deleteByToken( string $Token ): bool + public function deleteByToken( string $token ): bool { - $stmt = $this->_PDO->prepare( "DELETE FROM password_reset_tokens WHERE token = ?" ); - $stmt->execute( [ $Token ] ); + $stmt = $this->_pdo->prepare( "DELETE FROM password_reset_tokens WHERE token = ?" ); + $stmt->execute( [ $token ] ); return $stmt->rowCount() > 0; } @@ -122,7 +95,7 @@ public function deleteExpired(): int { $now = (new DateTimeImmutable())->format( 'Y-m-d H:i:s' ); - $stmt = $this->_PDO->prepare( "DELETE FROM password_reset_tokens WHERE expires_at < ?" ); + $stmt = $this->_pdo->prepare( "DELETE FROM password_reset_tokens WHERE expires_at < ?" ); $stmt->execute( [ $now ] ); return $stmt->rowCount(); @@ -131,14 +104,14 @@ public function deleteExpired(): int /** * Map database row to PasswordResetToken object */ - private function mapRowToToken( array $Row ): PasswordResetToken + private function mapRowToToken( array $row ): PasswordResetToken { return PasswordResetToken::fromArray([ - 'id' => $Row['id'], - 'email' => $Row['email'], - 'token' => $Row['token'], - 'created_at' => $Row['created_at'], - 'expires_at' => $Row['expires_at'] + 'id' => $row['id'], + 'email' => $row['email'], + 'token' => $row['token'], + 'created_at' => $row['created_at'], + 'expires_at' => $row['expires_at'] ]); } } diff --git a/src/Cms/Repositories/DatabasePostRepository.php b/src/Cms/Repositories/DatabasePostRepository.php index c457518..2e6b90f 100644 --- a/src/Cms/Repositories/DatabasePostRepository.php +++ b/src/Cms/Repositories/DatabasePostRepository.php @@ -2,10 +2,12 @@ namespace Neuron\Cms\Repositories; +use Neuron\Cms\Database\ConnectionFactory; use Neuron\Cms\Models\Post; use Neuron\Cms\Models\User; use Neuron\Cms\Models\Category; use Neuron\Cms\Models\Tag; +use Neuron\Data\Setting\SettingManager; use PDO; use Exception; use DateTimeImmutable; @@ -19,55 +21,26 @@ */ class DatabasePostRepository implements IPostRepository { - private PDO $_PDO; + private PDO $_pdo; /** * Constructor * - * @param array $DatabaseConfig Database configuration - * @throws Exception if adapter is not supported + * @param SettingManager $settings Settings manager with database configuration + * @throws Exception if database configuration is missing or adapter is unsupported */ - public function __construct( array $DatabaseConfig ) + public function __construct( SettingManager $settings ) { - $adapter = $DatabaseConfig['adapter'] ?? 'sqlite'; - - $dsn = match( $adapter ) - { - 'sqlite' => "sqlite:{$DatabaseConfig['name']}", - 'mysql' => sprintf( - "mysql:host=%s;port=%s;dbname=%s;charset=%s", - $DatabaseConfig['host'] ?? 'localhost', - $DatabaseConfig['port'] ?? 3306, - $DatabaseConfig['name'], - $DatabaseConfig['charset'] ?? 'utf8mb4' - ), - 'pgsql' => sprintf( - "pgsql:host=%s;port=%s;dbname=%s", - $DatabaseConfig['host'] ?? 'localhost', - $DatabaseConfig['port'] ?? 5432, - $DatabaseConfig['name'] - ), - default => throw new Exception( "Unsupported database adapter: $adapter" ) - }; - - $this->_PDO = new PDO( - $dsn, - $DatabaseConfig['user'] ?? null, - $DatabaseConfig['pass'] ?? null, - [ - PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, - PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC - ] - ); + $this->_pdo = ConnectionFactory::createFromSettings( $settings ); } /** * Find post by ID */ - public function findById( int $Id ): ?Post + public function findById( int $id ): ?Post { - $stmt = $this->_PDO->prepare( "SELECT * FROM posts WHERE id = ? LIMIT 1" ); - $stmt->execute( [ $Id ] ); + $stmt = $this->_pdo->prepare( "SELECT * FROM posts WHERE id = ? LIMIT 1" ); + $stmt->execute( [ $id ] ); $row = $stmt->fetch(); @@ -82,10 +55,10 @@ public function findById( int $Id ): ?Post /** * Find post by slug */ - public function findBySlug( string $Slug ): ?Post + public function findBySlug( string $slug ): ?Post { - $stmt = $this->_PDO->prepare( "SELECT * FROM posts WHERE slug = ? LIMIT 1" ); - $stmt->execute( [ $Slug ] ); + $stmt = $this->_pdo->prepare( "SELECT * FROM posts WHERE slug = ? LIMIT 1" ); + $stmt->execute( [ $slug ] ); $row = $stmt->fetch(); @@ -100,15 +73,15 @@ public function findBySlug( string $Slug ): ?Post /** * Create a new post */ - public function create( Post $Post ): Post + public function create( Post $post ): Post { // Check for duplicate slug - if( $this->findBySlug( $Post->getSlug() ) ) + if( $this->findBySlug( $post->getSlug() ) ) { throw new Exception( 'Slug already exists' ); } - $stmt = $this->_PDO->prepare( + $stmt = $this->_pdo->prepare( "INSERT INTO posts ( title, slug, body, excerpt, featured_image, author_id, status, published_at, view_count, created_at, updated_at @@ -116,56 +89,56 @@ public function create( Post $Post ): Post ); $stmt->execute([ - $Post->getTitle(), - $Post->getSlug(), - $Post->getBody(), - $Post->getExcerpt(), - $Post->getFeaturedImage(), - $Post->getAuthorId(), - $Post->getStatus(), - $Post->getPublishedAt() ? $Post->getPublishedAt()->format( 'Y-m-d H:i:s' ) : null, - $Post->getViewCount(), - $Post->getCreatedAt()->format( 'Y-m-d H:i:s' ), + $post->getTitle(), + $post->getSlug(), + $post->getBody(), + $post->getExcerpt(), + $post->getFeaturedImage(), + $post->getAuthorId(), + $post->getStatus(), + $post->getPublishedAt() ? $post->getPublishedAt()->format( 'Y-m-d H:i:s' ) : null, + $post->getViewCount(), + $post->getCreatedAt()->format( 'Y-m-d H:i:s' ), (new DateTimeImmutable())->format( 'Y-m-d H:i:s' ) ]); - $Post->setId( (int)$this->_PDO->lastInsertId() ); + $post->setId( (int)$this->_pdo->lastInsertId() ); // Handle categories - if( count( $Post->getCategories() ) > 0 ) + if( count( $post->getCategories() ) > 0 ) { - $categoryIds = array_map( fn( $c ) => $c->getId(), $Post->getCategories() ); - $this->attachCategories( $Post->getId(), $categoryIds ); + $categoryIds = array_map( fn( $c ) => $c->getId(), $post->getCategories() ); + $this->attachCategories( $post->getId(), $categoryIds ); } // Handle tags - if( count( $Post->getTags() ) > 0 ) + if( count( $post->getTags() ) > 0 ) { - $tagIds = array_map( fn( $t ) => $t->getId(), $Post->getTags() ); - $this->attachTags( $Post->getId(), $tagIds ); + $tagIds = array_map( fn( $t ) => $t->getId(), $post->getTags() ); + $this->attachTags( $post->getId(), $tagIds ); } - return $Post; + return $post; } /** * Update an existing post */ - public function update( Post $Post ): bool + public function update( Post $post ): bool { - if( !$Post->getId() ) + if( !$post->getId() ) { return false; } // Check for duplicate slug (excluding current post) - $ExistingBySlug = $this->findBySlug( $Post->getSlug() ); - if( $ExistingBySlug && $ExistingBySlug->getId() !== $Post->getId() ) + $existingBySlug = $this->findBySlug( $post->getSlug() ); + if( $existingBySlug && $existingBySlug->getId() !== $post->getId() ) { throw new Exception( 'Slug already exists' ); } - $stmt = $this->_PDO->prepare( + $stmt = $this->_pdo->prepare( "UPDATE posts SET title = ?, slug = ?, @@ -181,33 +154,33 @@ public function update( Post $Post ): bool ); $result = $stmt->execute([ - $Post->getTitle(), - $Post->getSlug(), - $Post->getBody(), - $Post->getExcerpt(), - $Post->getFeaturedImage(), - $Post->getAuthorId(), - $Post->getStatus(), - $Post->getPublishedAt() ? $Post->getPublishedAt()->format( 'Y-m-d H:i:s' ) : null, - $Post->getViewCount(), + $post->getTitle(), + $post->getSlug(), + $post->getBody(), + $post->getExcerpt(), + $post->getFeaturedImage(), + $post->getAuthorId(), + $post->getStatus(), + $post->getPublishedAt() ? $post->getPublishedAt()->format( 'Y-m-d H:i:s' ) : null, + $post->getViewCount(), (new DateTimeImmutable())->format( 'Y-m-d H:i:s' ), - $Post->getId() + $post->getId() ]); // Update categories - $this->detachCategories( $Post->getId() ); - if( count( $Post->getCategories() ) > 0 ) + $this->detachCategories( $post->getId() ); + if( count( $post->getCategories() ) > 0 ) { - $categoryIds = array_map( fn( $c ) => $c->getId(), $Post->getCategories() ); - $this->attachCategories( $Post->getId(), $categoryIds ); + $categoryIds = array_map( fn( $c ) => $c->getId(), $post->getCategories() ); + $this->attachCategories( $post->getId(), $categoryIds ); } // Update tags - $this->detachTags( $Post->getId() ); - if( count( $Post->getTags() ) > 0 ) + $this->detachTags( $post->getId() ); + if( count( $post->getTags() ) > 0 ) { - $tagIds = array_map( fn( $t ) => $t->getId(), $Post->getTags() ); - $this->attachTags( $Post->getId(), $tagIds ); + $tagIds = array_map( fn( $t ) => $t->getId(), $post->getTags() ); + $this->attachTags( $post->getId(), $tagIds ); } return $result; @@ -216,11 +189,11 @@ public function update( Post $Post ): bool /** * Delete a post */ - public function delete( int $Id ): bool + public function delete( int $id ): bool { // Foreign key constraints will handle cascade delete of relationships - $stmt = $this->_PDO->prepare( "DELETE FROM posts WHERE id = ?" ); - $stmt->execute( [ $Id ] ); + $stmt = $this->_pdo->prepare( "DELETE FROM posts WHERE id = ?" ); + $stmt->execute( [ $id ] ); return $stmt->rowCount() > 0; } @@ -228,27 +201,27 @@ public function delete( int $Id ): bool /** * Get all posts */ - public function all( ?string $Status = null, int $Limit = 0, int $Offset = 0 ): array + public function all( ?string $status = null, int $limit = 0, int $offset = 0 ): array { $sql = "SELECT * FROM posts"; $params = []; - if( $Status ) + if( $status ) { $sql .= " WHERE status = ?"; - $params[] = $Status; + $params[] = $status; } $sql .= " ORDER BY created_at DESC"; - if( $Limit > 0 ) + if( $limit > 0 ) { $sql .= " LIMIT ? OFFSET ?"; - $params[] = $Limit; - $params[] = $Offset; + $params[] = $limit; + $params[] = $offset; } - $stmt = $this->_PDO->prepare( $sql ); + $stmt = $this->_pdo->prepare( $sql ); $stmt->execute( $params ); $rows = $stmt->fetchAll(); @@ -258,20 +231,20 @@ public function all( ?string $Status = null, int $Limit = 0, int $Offset = 0 ): /** * Get posts by author */ - public function getByAuthor( int $AuthorId, ?string $Status = null ): array + public function getByAuthor( int $authorId, ?string $status = null ): array { $sql = "SELECT * FROM posts WHERE author_id = ?"; - $params = [ $AuthorId ]; + $params = [ $authorId ]; - if( $Status ) + if( $status ) { $sql .= " AND status = ?"; - $params[] = $Status; + $params[] = $status; } $sql .= " ORDER BY created_at DESC"; - $stmt = $this->_PDO->prepare( $sql ); + $stmt = $this->_pdo->prepare( $sql ); $stmt->execute( $params ); $rows = $stmt->fetchAll(); @@ -281,22 +254,22 @@ public function getByAuthor( int $AuthorId, ?string $Status = null ): array /** * Get posts by category */ - public function getByCategory( int $CategoryId, ?string $Status = null ): array + public function getByCategory( int $categoryId, ?string $status = null ): array { $sql = "SELECT p.* FROM posts p INNER JOIN post_categories pc ON p.id = pc.post_id WHERE pc.category_id = ?"; - $params = [ $CategoryId ]; + $params = [ $categoryId ]; - if( $Status ) + if( $status ) { $sql .= " AND p.status = ?"; - $params[] = $Status; + $params[] = $status; } $sql .= " ORDER BY p.created_at DESC"; - $stmt = $this->_PDO->prepare( $sql ); + $stmt = $this->_pdo->prepare( $sql ); $stmt->execute( $params ); $rows = $stmt->fetchAll(); @@ -306,22 +279,22 @@ public function getByCategory( int $CategoryId, ?string $Status = null ): array /** * Get posts by tag */ - public function getByTag( int $TagId, ?string $Status = null ): array + public function getByTag( int $tagId, ?string $status = null ): array { $sql = "SELECT p.* FROM posts p INNER JOIN post_tags pt ON p.id = pt.post_id WHERE pt.tag_id = ?"; - $params = [ $TagId ]; + $params = [ $tagId ]; - if( $Status ) + if( $status ) { $sql .= " AND p.status = ?"; - $params[] = $Status; + $params[] = $status; } $sql .= " ORDER BY p.created_at DESC"; - $stmt = $this->_PDO->prepare( $sql ); + $stmt = $this->_pdo->prepare( $sql ); $stmt->execute( $params ); $rows = $stmt->fetchAll(); @@ -331,9 +304,9 @@ public function getByTag( int $TagId, ?string $Status = null ): array /** * Get published posts */ - public function getPublished( int $Limit = 0, int $Offset = 0 ): array + public function getPublished( int $limit = 0, int $offset = 0 ): array { - return $this->all( Post::STATUS_PUBLISHED, $Limit, $Offset ); + return $this->all( Post::STATUS_PUBLISHED, $limit, $offset ); } /** @@ -355,18 +328,18 @@ public function getScheduled(): array /** * Count total posts */ - public function count( ?string $Status = null ): int + public function count( ?string $status = null ): int { $sql = "SELECT COUNT(*) as total FROM posts"; $params = []; - if( $Status ) + if( $status ) { $sql .= " WHERE status = ?"; - $params[] = $Status; + $params[] = $status; } - $stmt = $this->_PDO->prepare( $sql ); + $stmt = $this->_pdo->prepare( $sql ); $stmt->execute( $params ); $row = $stmt->fetch(); @@ -376,10 +349,10 @@ public function count( ?string $Status = null ): int /** * Increment post view count */ - public function incrementViewCount( int $Id ): bool + public function incrementViewCount( int $id ): bool { - $stmt = $this->_PDO->prepare( "UPDATE posts SET view_count = view_count + 1 WHERE id = ?" ); - $stmt->execute( [ $Id ] ); + $stmt = $this->_pdo->prepare( "UPDATE posts SET view_count = view_count + 1 WHERE id = ?" ); + $stmt->execute( [ $id ] ); return $stmt->rowCount() > 0; } @@ -387,21 +360,21 @@ public function incrementViewCount( int $Id ): bool /** * Attach categories to post */ - public function attachCategories( int $PostId, array $CategoryIds ): bool + public function attachCategories( int $postId, array $categoryIds ): bool { - if( empty( $CategoryIds ) ) + if( empty( $categoryIds ) ) { return true; } - $stmt = $this->_PDO->prepare( + $stmt = $this->_pdo->prepare( "INSERT INTO post_categories (post_id, category_id, created_at) VALUES (?, ?, ?)" ); - foreach( $CategoryIds as $categoryId ) + foreach( $categoryIds as $categoryId ) { $stmt->execute([ - $PostId, + $postId, $categoryId, (new DateTimeImmutable())->format( 'Y-m-d H:i:s' ) ]); @@ -413,10 +386,10 @@ public function attachCategories( int $PostId, array $CategoryIds ): bool /** * Detach all categories from post */ - public function detachCategories( int $PostId ): bool + public function detachCategories( int $postId ): bool { - $stmt = $this->_PDO->prepare( "DELETE FROM post_categories WHERE post_id = ?" ); - $stmt->execute( [ $PostId ] ); + $stmt = $this->_pdo->prepare( "DELETE FROM post_categories WHERE post_id = ?" ); + $stmt->execute( [ $postId ] ); return true; } @@ -424,21 +397,21 @@ public function detachCategories( int $PostId ): bool /** * Attach tags to post */ - public function attachTags( int $PostId, array $TagIds ): bool + public function attachTags( int $postId, array $tagIds ): bool { - if( empty( $TagIds ) ) + if( empty( $tagIds ) ) { return true; } - $stmt = $this->_PDO->prepare( + $stmt = $this->_pdo->prepare( "INSERT INTO post_tags (post_id, tag_id, created_at) VALUES (?, ?, ?)" ); - foreach( $TagIds as $tagId ) + foreach( $tagIds as $tagId ) { $stmt->execute([ - $PostId, + $postId, $tagId, (new DateTimeImmutable())->format( 'Y-m-d H:i:s' ) ]); @@ -450,10 +423,10 @@ public function attachTags( int $PostId, array $TagIds ): bool /** * Detach all tags from post */ - public function detachTags( int $PostId ): bool + public function detachTags( int $postId ): bool { - $stmt = $this->_PDO->prepare( "DELETE FROM post_tags WHERE post_id = ?" ); - $stmt->execute( [ $PostId ] ); + $stmt = $this->_pdo->prepare( "DELETE FROM post_tags WHERE post_id = ?" ); + $stmt->execute( [ $postId ] ); return true; } @@ -461,50 +434,51 @@ public function detachTags( int $PostId ): bool /** * Map database row to Post object * - * @param array $Row Database row + * @param array $row Database row * @return Post */ - private function mapRowToPost( array $Row ): Post + private function mapRowToPost( array $row ): Post { $data = [ - 'id' => (int)$Row['id'], - 'title' => $Row['title'], - 'slug' => $Row['slug'], - 'body' => $Row['body'], - 'excerpt' => $Row['excerpt'], - 'featured_image' => $Row['featured_image'], - 'author_id' => (int)$Row['author_id'], - 'status' => $Row['status'], - 'view_count' => (int)$Row['view_count'], - 'published_at' => $Row['published_at'] ?? null, - 'created_at' => $Row['created_at'], - 'updated_at' => $Row['updated_at'] ?? null, + 'id' => (int)$row['id'], + 'title' => $row['title'], + 'slug' => $row['slug'], + 'body' => $row['body'], + 'excerpt' => $row['excerpt'], + 'featured_image' => $row['featured_image'], + 'author_id' => (int)$row['author_id'], + 'status' => $row['status'], + 'view_count' => (int)$row['view_count'], + 'published_at' => $row['published_at'] ?? null, + 'created_at' => $row['created_at'], + 'updated_at' => $row['updated_at'] ?? null, ]; - $Post = Post::fromArray( $data ); + $post = Post::fromArray( $data ); // Load relationships - $Post->setCategories( $this->loadCategories( $Post->getId() ) ); - $Post->setTags( $this->loadTags( $Post->getId() ) ); + $post->setAuthor( $this->loadAuthor( $post->getAuthorId() ) ); + $post->setCategories( $this->loadCategories( $post->getId() ) ); + $post->setTags( $this->loadTags( $post->getId() ) ); - return $Post; + return $post; } /** * Load categories for a post * - * @param int $PostId + * @param int $postId * @return Category[] */ - private function loadCategories( int $PostId ): array + private function loadCategories( int $postId ): array { - $stmt = $this->_PDO->prepare( + $stmt = $this->_pdo->prepare( "SELECT c.* FROM categories c INNER JOIN post_categories pc ON c.id = pc.category_id WHERE pc.post_id = ? ORDER BY c.name ASC" ); - $stmt->execute( [ $PostId ] ); + $stmt->execute( [ $postId ] ); $rows = $stmt->fetchAll(); return array_map( fn( $row ) => Category::fromArray( $row ), $rows ); @@ -513,20 +487,48 @@ private function loadCategories( int $PostId ): array /** * Load tags for a post * - * @param int $PostId + * @param int $postId * @return Tag[] */ - private function loadTags( int $PostId ): array + private function loadTags( int $postId ): array { - $stmt = $this->_PDO->prepare( + $stmt = $this->_pdo->prepare( "SELECT t.* FROM tags t INNER JOIN post_tags pt ON t.id = pt.tag_id WHERE pt.post_id = ? ORDER BY t.name ASC" ); - $stmt->execute( [ $PostId ] ); + $stmt->execute( [ $postId ] ); $rows = $stmt->fetchAll(); return array_map( fn( $row ) => Tag::fromArray( $row ), $rows ); } + + /** + * Load author for a post + * + * @param int $authorId + * @return User|null + */ + private function loadAuthor( int $authorId ): ?User + { + try + { + $stmt = $this->_pdo->prepare( "SELECT * FROM users WHERE id = ? LIMIT 1" ); + $stmt->execute( [ $authorId ] ); + $row = $stmt->fetch(); + + if( !$row ) + { + return null; + } + + return User::fromArray( $row ); + } + catch( \PDOException $e ) + { + // Users table may not exist in test environments + return null; + } + } } diff --git a/src/Cms/Repositories/DatabaseTagRepository.php b/src/Cms/Repositories/DatabaseTagRepository.php index dcd1044..851e4c8 100644 --- a/src/Cms/Repositories/DatabaseTagRepository.php +++ b/src/Cms/Repositories/DatabaseTagRepository.php @@ -2,7 +2,9 @@ namespace Neuron\Cms\Repositories; +use Neuron\Cms\Database\ConnectionFactory; use Neuron\Cms\Models\Tag; +use Neuron\Data\Setting\SettingManager; use PDO; use Exception; use DateTimeImmutable; @@ -16,55 +18,26 @@ */ class DatabaseTagRepository implements ITagRepository { - private PDO $_PDO; + private PDO $_pdo; /** * Constructor * - * @param array $DatabaseConfig Database configuration - * @throws Exception if adapter is not supported + * @param SettingManager $settings Settings manager with database configuration + * @throws Exception if database configuration is missing or adapter is unsupported */ - public function __construct( array $DatabaseConfig ) + public function __construct( SettingManager $settings ) { - $adapter = $DatabaseConfig['adapter'] ?? 'sqlite'; - - $dsn = match( $adapter ) - { - 'sqlite' => "sqlite:{$DatabaseConfig['name']}", - 'mysql' => sprintf( - "mysql:host=%s;port=%s;dbname=%s;charset=%s", - $DatabaseConfig['host'] ?? 'localhost', - $DatabaseConfig['port'] ?? 3306, - $DatabaseConfig['name'], - $DatabaseConfig['charset'] ?? 'utf8mb4' - ), - 'pgsql' => sprintf( - "pgsql:host=%s;port=%s;dbname=%s", - $DatabaseConfig['host'] ?? 'localhost', - $DatabaseConfig['port'] ?? 5432, - $DatabaseConfig['name'] - ), - default => throw new Exception( "Unsupported database adapter: $adapter" ) - }; - - $this->_PDO = new PDO( - $dsn, - $DatabaseConfig['user'] ?? null, - $DatabaseConfig['pass'] ?? null, - [ - PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, - PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC - ] - ); + $this->_pdo = ConnectionFactory::createFromSettings( $settings ); } /** * Find tag by ID */ - public function findById( int $Id ): ?Tag + public function findById( int $id ): ?Tag { - $stmt = $this->_PDO->prepare( "SELECT * FROM tags WHERE id = ? LIMIT 1" ); - $stmt->execute( [ $Id ] ); + $stmt = $this->_pdo->prepare( "SELECT * FROM tags WHERE id = ? LIMIT 1" ); + $stmt->execute( [ $id ] ); $row = $stmt->fetch(); @@ -74,10 +47,10 @@ public function findById( int $Id ): ?Tag /** * Find tag by slug */ - public function findBySlug( string $Slug ): ?Tag + public function findBySlug( string $slug ): ?Tag { - $stmt = $this->_PDO->prepare( "SELECT * FROM tags WHERE slug = ? LIMIT 1" ); - $stmt->execute( [ $Slug ] ); + $stmt = $this->_pdo->prepare( "SELECT * FROM tags WHERE slug = ? LIMIT 1" ); + $stmt->execute( [ $slug ] ); $row = $stmt->fetch(); @@ -87,10 +60,10 @@ public function findBySlug( string $Slug ): ?Tag /** * Find tag by name */ - public function findByName( string $Name ): ?Tag + public function findByName( string $name ): ?Tag { - $stmt = $this->_PDO->prepare( "SELECT * FROM tags WHERE name = ? LIMIT 1" ); - $stmt->execute( [ $Name ] ); + $stmt = $this->_pdo->prepare( "SELECT * FROM tags WHERE name = ? LIMIT 1" ); + $stmt->execute( [ $name ] ); $row = $stmt->fetch(); @@ -100,62 +73,62 @@ public function findByName( string $Name ): ?Tag /** * Create a new tag */ - public function create( Tag $Tag ): Tag + public function create( Tag $tag ): Tag { // Check for duplicate slug - if( $this->findBySlug( $Tag->getSlug() ) ) + if( $this->findBySlug( $tag->getSlug() ) ) { throw new Exception( 'Slug already exists' ); } // Check for duplicate name - if( $this->findByName( $Tag->getName() ) ) + if( $this->findByName( $tag->getName() ) ) { throw new Exception( 'Tag name already exists' ); } - $stmt = $this->_PDO->prepare( + $stmt = $this->_pdo->prepare( "INSERT INTO tags (name, slug, created_at, updated_at) VALUES (?, ?, ?, ?)" ); $stmt->execute([ - $Tag->getName(), - $Tag->getSlug(), - $Tag->getCreatedAt()->format( 'Y-m-d H:i:s' ), + $tag->getName(), + $tag->getSlug(), + $tag->getCreatedAt()->format( 'Y-m-d H:i:s' ), (new DateTimeImmutable())->format( 'Y-m-d H:i:s' ) ]); - $Tag->setId( (int)$this->_PDO->lastInsertId() ); + $tag->setId( (int)$this->_pdo->lastInsertId() ); - return $Tag; + return $tag; } /** * Update an existing tag */ - public function update( Tag $Tag ): bool + public function update( Tag $tag ): bool { - if( !$Tag->getId() ) + if( !$tag->getId() ) { return false; } // Check for duplicate slug (excluding current tag) - $ExistingBySlug = $this->findBySlug( $Tag->getSlug() ); - if( $ExistingBySlug && $ExistingBySlug->getId() !== $Tag->getId() ) + $existingBySlug = $this->findBySlug( $tag->getSlug() ); + if( $existingBySlug && $existingBySlug->getId() !== $tag->getId() ) { throw new Exception( 'Slug already exists' ); } // Check for duplicate name (excluding current tag) - $ExistingByName = $this->findByName( $Tag->getName() ); - if( $ExistingByName && $ExistingByName->getId() !== $Tag->getId() ) + $existingByName = $this->findByName( $tag->getName() ); + if( $existingByName && $existingByName->getId() !== $tag->getId() ) { throw new Exception( 'Tag name already exists' ); } - $stmt = $this->_PDO->prepare( + $stmt = $this->_pdo->prepare( "UPDATE tags SET name = ?, slug = ?, @@ -164,21 +137,21 @@ public function update( Tag $Tag ): bool ); return $stmt->execute([ - $Tag->getName(), - $Tag->getSlug(), + $tag->getName(), + $tag->getSlug(), (new DateTimeImmutable())->format( 'Y-m-d H:i:s' ), - $Tag->getId() + $tag->getId() ]); } /** * Delete a tag */ - public function delete( int $Id ): bool + public function delete( int $id ): bool { // Foreign key constraints will handle cascade delete of post relationships - $stmt = $this->_PDO->prepare( "DELETE FROM tags WHERE id = ?" ); - $stmt->execute( [ $Id ] ); + $stmt = $this->_pdo->prepare( "DELETE FROM tags WHERE id = ?" ); + $stmt->execute( [ $id ] ); return $stmt->rowCount() > 0; } @@ -188,7 +161,7 @@ public function delete( int $Id ): bool */ public function all(): array { - $stmt = $this->_PDO->query( "SELECT * FROM tags ORDER BY name ASC" ); + $stmt = $this->_pdo->query( "SELECT * FROM tags ORDER BY name ASC" ); $rows = $stmt->fetchAll(); return array_map( fn( $row ) => Tag::fromArray( $row ), $rows ); @@ -199,7 +172,7 @@ public function all(): array */ public function count(): int { - $stmt = $this->_PDO->query( "SELECT COUNT(*) as total FROM tags" ); + $stmt = $this->_pdo->query( "SELECT COUNT(*) as total FROM tags" ); $row = $stmt->fetch(); return (int)$row['total']; @@ -210,7 +183,7 @@ public function count(): int */ public function allWithPostCount(): array { - $stmt = $this->_PDO->query( + $stmt = $this->_pdo->query( "SELECT t.*, COUNT(pt.post_id) as post_count FROM tags t LEFT JOIN post_tags pt ON t.id = pt.tag_id diff --git a/src/Cms/Repositories/DatabaseUserRepository.php b/src/Cms/Repositories/DatabaseUserRepository.php index d36d295..a4a5c24 100644 --- a/src/Cms/Repositories/DatabaseUserRepository.php +++ b/src/Cms/Repositories/DatabaseUserRepository.php @@ -2,7 +2,9 @@ namespace Neuron\Cms\Repositories; +use Neuron\Cms\Database\ConnectionFactory; use Neuron\Cms\Models\User; +use Neuron\Data\Setting\SettingManager; use PDO; use Exception; use DateTimeImmutable; @@ -16,55 +18,26 @@ */ class DatabaseUserRepository implements IUserRepository { - private PDO $_PDO; + private PDO $_pdo; /** * Constructor * - * @param array $DatabaseConfig Database configuration - * @throws Exception if adapter is not supported + * @param SettingManager $settings Settings manager with database configuration + * @throws Exception if database configuration is missing or adapter is unsupported */ - public function __construct( array $DatabaseConfig ) + public function __construct( SettingManager $settings ) { - $adapter = $DatabaseConfig['adapter'] ?? 'sqlite'; - - $dsn = match( $adapter ) - { - 'sqlite' => "sqlite:{$DatabaseConfig['name']}", - 'mysql' => sprintf( - "mysql:host=%s;port=%s;dbname=%s;charset=%s", - $DatabaseConfig['host'] ?? 'localhost', - $DatabaseConfig['port'] ?? 3306, - $DatabaseConfig['name'], - $DatabaseConfig['charset'] ?? 'utf8mb4' - ), - 'pgsql' => sprintf( - "pgsql:host=%s;port=%s;dbname=%s", - $DatabaseConfig['host'] ?? 'localhost', - $DatabaseConfig['port'] ?? 5432, - $DatabaseConfig['name'] - ), - default => throw new Exception( "Unsupported database adapter: $adapter" ) - }; - - $this->_PDO = new PDO( - $dsn, - $DatabaseConfig['user'] ?? null, - $DatabaseConfig['pass'] ?? null, - [ - PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, - PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC - ] - ); + $this->_pdo = ConnectionFactory::createFromSettings( $settings ); } /** * Find user by ID */ - public function findById( int $Id ): ?User + public function findById( int $id ): ?User { - $stmt = $this->_PDO->prepare( "SELECT * FROM users WHERE id = ? LIMIT 1" ); - $stmt->execute( [ $Id ] ); + $stmt = $this->_pdo->prepare( "SELECT * FROM users WHERE id = ? LIMIT 1" ); + $stmt->execute( [ $id ] ); $row = $stmt->fetch(); @@ -74,10 +47,10 @@ public function findById( int $Id ): ?User /** * Find user by username */ - public function findByUsername( string $Username ): ?User + public function findByUsername( string $username ): ?User { - $stmt = $this->_PDO->prepare( "SELECT * FROM users WHERE username = ? LIMIT 1" ); - $stmt->execute( [ $Username ] ); + $stmt = $this->_pdo->prepare( "SELECT * FROM users WHERE username = ? LIMIT 1" ); + $stmt->execute( [ $username ] ); $row = $stmt->fetch(); @@ -87,10 +60,10 @@ public function findByUsername( string $Username ): ?User /** * Find user by email */ - public function findByEmail( string $Email ): ?User + public function findByEmail( string $email ): ?User { - $stmt = $this->_PDO->prepare( "SELECT * FROM users WHERE email = ? LIMIT 1" ); - $stmt->execute( [ $Email ] ); + $stmt = $this->_pdo->prepare( "SELECT * FROM users WHERE email = ? LIMIT 1" ); + $stmt->execute( [ $email ] ); $row = $stmt->fetch(); @@ -100,10 +73,10 @@ public function findByEmail( string $Email ): ?User /** * Find user by remember token */ - public function findByRememberToken( string $Token ): ?User + public function findByRememberToken( string $token ): ?User { - $stmt = $this->_PDO->prepare( "SELECT * FROM users WHERE remember_token = ? LIMIT 1" ); - $stmt->execute( [ $Token ] ); + $stmt = $this->_pdo->prepare( "SELECT * FROM users WHERE remember_token = ? LIMIT 1" ); + $stmt->execute( [ $token ] ); $row = $stmt->fetch(); @@ -113,21 +86,21 @@ public function findByRememberToken( string $Token ): ?User /** * Create a new user */ - public function create( User $User ): User + public function create( User $user ): User { // Check for duplicate username - if( $this->findByUsername( $User->getUsername() ) ) + if( $this->findByUsername( $user->getUsername() ) ) { throw new Exception( 'Username already exists' ); } // Check for duplicate email - if( $this->findByEmail( $User->getEmail() ) ) + if( $this->findByEmail( $user->getEmail() ) ) { throw new Exception( 'Email already exists' ); } - $stmt = $this->_PDO->prepare( + $stmt = $this->_pdo->prepare( "INSERT INTO users ( username, email, password_hash, role, status, email_verified, two_factor_secret, remember_token, failed_login_attempts, @@ -136,51 +109,51 @@ public function create( User $User ): User ); $stmt->execute([ - $User->getUsername(), - $User->getEmail(), - $User->getPasswordHash(), - $User->getRole(), - $User->getStatus(), - $User->isEmailVerified() ? 1 : 0, - $User->getTwoFactorSecret(), - $User->getRememberToken(), - $User->getFailedLoginAttempts(), - $User->getLockedUntil() ? $User->getLockedUntil()->format( 'Y-m-d H:i:s' ) : null, - $User->getLastLoginAt() ? $User->getLastLoginAt()->format( 'Y-m-d H:i:s' ) : null, - $User->getCreatedAt()->format( 'Y-m-d H:i:s' ), + $user->getUsername(), + $user->getEmail(), + $user->getPasswordHash(), + $user->getRole(), + $user->getStatus(), + $user->isEmailVerified() ? 1 : 0, + $user->getTwoFactorSecret(), + $user->getRememberToken(), + $user->getFailedLoginAttempts(), + $user->getLockedUntil() ? $user->getLockedUntil()->format( 'Y-m-d H:i:s' ) : null, + $user->getLastLoginAt() ? $user->getLastLoginAt()->format( 'Y-m-d H:i:s' ) : null, + $user->getCreatedAt()->format( 'Y-m-d H:i:s' ), (new DateTimeImmutable())->format( 'Y-m-d H:i:s' ) ]); - $User->setId( (int)$this->_PDO->lastInsertId() ); + $user->setId( (int)$this->_pdo->lastInsertId() ); - return $User; + return $user; } /** * Update an existing user */ - public function update( User $User ): bool + public function update( User $user ): bool { - if( !$User->getId() ) + if( !$user->getId() ) { return false; } // Check for duplicate username (excluding current user) - $ExistingByUsername = $this->findByUsername( $User->getUsername() ); - if( $ExistingByUsername && $ExistingByUsername->getId() !== $User->getId() ) + $existingByUsername = $this->findByUsername( $user->getUsername() ); + if( $existingByUsername && $existingByUsername->getId() !== $user->getId() ) { throw new Exception( 'Username already exists' ); } // Check for duplicate email (excluding current user) - $ExistingByEmail = $this->findByEmail( $User->getEmail() ); - if( $ExistingByEmail && $ExistingByEmail->getId() !== $User->getId() ) + $existingByEmail = $this->findByEmail( $user->getEmail() ); + if( $existingByEmail && $existingByEmail->getId() !== $user->getId() ) { throw new Exception( 'Email already exists' ); } - $stmt = $this->_PDO->prepare( + $stmt = $this->_pdo->prepare( "UPDATE users SET username = ?, email = ?, @@ -198,29 +171,29 @@ public function update( User $User ): bool ); return $stmt->execute([ - $User->getUsername(), - $User->getEmail(), - $User->getPasswordHash(), - $User->getRole(), - $User->getStatus(), - $User->isEmailVerified() ? 1 : 0, - $User->getTwoFactorSecret(), - $User->getRememberToken(), - $User->getFailedLoginAttempts(), - $User->getLockedUntil() ? $User->getLockedUntil()->format( 'Y-m-d H:i:s' ) : null, - $User->getLastLoginAt() ? $User->getLastLoginAt()->format( 'Y-m-d H:i:s' ) : null, + $user->getUsername(), + $user->getEmail(), + $user->getPasswordHash(), + $user->getRole(), + $user->getStatus(), + $user->isEmailVerified() ? 1 : 0, + $user->getTwoFactorSecret(), + $user->getRememberToken(), + $user->getFailedLoginAttempts(), + $user->getLockedUntil() ? $user->getLockedUntil()->format( 'Y-m-d H:i:s' ) : null, + $user->getLastLoginAt() ? $user->getLastLoginAt()->format( 'Y-m-d H:i:s' ) : null, (new DateTimeImmutable())->format( 'Y-m-d H:i:s' ), - $User->getId() + $user->getId() ]); } /** * Delete a user */ - public function delete( int $Id ): bool + public function delete( int $id ): bool { - $stmt = $this->_PDO->prepare( "DELETE FROM users WHERE id = ?" ); - $stmt->execute( [ $Id ] ); + $stmt = $this->_pdo->prepare( "DELETE FROM users WHERE id = ?" ); + $stmt->execute( [ $id ] ); return $stmt->rowCount() > 0; } @@ -230,7 +203,7 @@ public function delete( int $Id ): bool */ public function all(): array { - $stmt = $this->_PDO->query( "SELECT * FROM users ORDER BY created_at DESC" ); + $stmt = $this->_pdo->query( "SELECT * FROM users ORDER BY created_at DESC" ); $rows = $stmt->fetchAll(); return array_map( [ $this, 'mapRowToUser' ], $rows ); @@ -241,7 +214,7 @@ public function all(): array */ public function count(): int { - $stmt = $this->_PDO->query( "SELECT COUNT(*) as total FROM users" ); + $stmt = $this->_pdo->query( "SELECT COUNT(*) as total FROM users" ); $row = $stmt->fetch(); return (int)$row['total']; @@ -250,26 +223,26 @@ public function count(): int /** * Map database row to User object * - * @param array $Row Database row + * @param array $row Database row * @return User */ - private function mapRowToUser( array $Row ): User + private function mapRowToUser( array $row ): User { $data = [ - 'id' => (int)$Row['id'], - 'username' => $Row['username'], - 'email' => $Row['email'], - 'password_hash' => $Row['password_hash'], - 'role' => $Row['role'], - 'status' => $Row['status'], - 'email_verified' => (bool)$Row['email_verified'], - 'two_factor_secret' => $Row['two_factor_secret'], - 'remember_token' => $Row['remember_token'], - 'failed_login_attempts' => (int)$Row['failed_login_attempts'], - 'locked_until' => $Row['locked_until'] ?? null, - 'last_login_at' => $Row['last_login_at'] ?? null, - 'created_at' => $Row['created_at'], - 'updated_at' => $Row['updated_at'] ?? null, + 'id' => (int)$row['id'], + 'username' => $row['username'], + 'email' => $row['email'], + 'password_hash' => $row['password_hash'], + 'role' => $row['role'], + 'status' => $row['status'], + 'email_verified' => (bool)$row['email_verified'], + 'two_factor_secret' => $row['two_factor_secret'], + 'remember_token' => $row['remember_token'], + 'failed_login_attempts' => (int)$row['failed_login_attempts'], + 'locked_until' => $row['locked_until'] ?? null, + 'last_login_at' => $row['last_login_at'] ?? null, + 'created_at' => $row['created_at'], + 'updated_at' => $row['updated_at'] ?? null, ]; return User::fromArray( $data ); diff --git a/src/Cms/Repositories/ICategoryRepository.php b/src/Cms/Repositories/ICategoryRepository.php index c2317d3..a24f2f5 100644 --- a/src/Cms/Repositories/ICategoryRepository.php +++ b/src/Cms/Repositories/ICategoryRepository.php @@ -14,32 +14,40 @@ interface ICategoryRepository /** * Find category by ID */ - public function findById( int $Id ): ?Category; + public function findById( int $id ): ?Category; /** * Find category by slug */ - public function findBySlug( string $Slug ): ?Category; + public function findBySlug( string $slug ): ?Category; /** * Find category by name */ - public function findByName( string $Name ): ?Category; + public function findByName( string $name ): ?Category; + + /** + * Find multiple categories by IDs + * + * @param array $ids Array of category IDs + * @return Category[] + */ + public function findByIds( array $ids ): array; /** * Create a new category */ - public function create( Category $Category ): Category; + public function create( Category $category ): Category; /** * Update an existing category */ - public function update( Category $Category ): bool; + public function update( Category $category ): bool; /** * Delete a category */ - public function delete( int $Id ): bool; + public function delete( int $id ): bool; /** * Get all categories diff --git a/src/Cms/Repositories/IPasswordResetTokenRepository.php b/src/Cms/Repositories/IPasswordResetTokenRepository.php index f8a8cf3..a247e6d 100644 --- a/src/Cms/Repositories/IPasswordResetTokenRepository.php +++ b/src/Cms/Repositories/IPasswordResetTokenRepository.php @@ -16,34 +16,34 @@ interface IPasswordResetTokenRepository /** * Create a new password reset token * - * @param PasswordResetToken $Token Token to create + * @param PasswordResetToken $token Token to create * @return PasswordResetToken Created token with ID set */ - public function create( PasswordResetToken $Token ): PasswordResetToken; + public function create( PasswordResetToken $token ): PasswordResetToken; /** * Find a token by its hashed value * - * @param string $Token Hashed token + * @param string $token Hashed token * @return PasswordResetToken|null Token if found, null otherwise */ - public function findByToken( string $Token ): ?PasswordResetToken; + public function findByToken( string $token ): ?PasswordResetToken; /** * Delete all tokens for a given email address * - * @param string $Email Email address + * @param string $email Email address * @return int Number of tokens deleted */ - public function deleteByEmail( string $Email ): int; + public function deleteByEmail( string $email ): int; /** * Delete a specific token by its hashed value * - * @param string $Token Hashed token + * @param string $token Hashed token * @return bool True if deleted, false otherwise */ - public function deleteByToken( string $Token ): bool; + public function deleteByToken( string $token ): bool; /** * Delete all expired tokens diff --git a/src/Cms/Repositories/IPostRepository.php b/src/Cms/Repositories/IPostRepository.php index ae74d5c..e7f1ecd 100644 --- a/src/Cms/Repositories/IPostRepository.php +++ b/src/Cms/Repositories/IPostRepository.php @@ -14,73 +14,73 @@ interface IPostRepository /** * Find post by ID */ - public function findById( int $Id ): ?Post; + public function findById( int $id ): ?Post; /** * Find post by slug */ - public function findBySlug( string $Slug ): ?Post; + public function findBySlug( string $slug ): ?Post; /** * Create a new post */ - public function create( Post $Post ): Post; + public function create( Post $post ): Post; /** * Update an existing post */ - public function update( Post $Post ): bool; + public function update( Post $post ): bool; /** * Delete a post */ - public function delete( int $Id ): bool; + public function delete( int $id ): bool; /** * Get all posts * - * @param string|null $Status Filter by status (published, draft, scheduled) - * @param int $Limit Limit number of results (0 = no limit) - * @param int $Offset Offset for pagination + * @param string|null $status Filter by status (published, draft, scheduled) + * @param int $limit Limit number of results (0 = no limit) + * @param int $offset Offset for pagination * @return Post[] */ - public function all( ?string $Status = null, int $Limit = 0, int $Offset = 0 ): array; + public function all( ?string $status = null, int $limit = 0, int $offset = 0 ): array; /** * Get posts by author * - * @param int $AuthorId Author user ID - * @param string|null $Status Filter by status + * @param int $authorId Author user ID + * @param string|null $status Filter by status * @return Post[] */ - public function getByAuthor( int $AuthorId, ?string $Status = null ): array; + public function getByAuthor( int $authorId, ?string $status = null ): array; /** * Get posts by category * - * @param int $CategoryId Category ID - * @param string|null $Status Filter by status + * @param int $categoryId Category ID + * @param string|null $status Filter by status * @return Post[] */ - public function getByCategory( int $CategoryId, ?string $Status = null ): array; + public function getByCategory( int $categoryId, ?string $status = null ): array; /** * Get posts by tag * - * @param int $TagId Tag ID - * @param string|null $Status Filter by status + * @param int $tagId Tag ID + * @param string|null $status Filter by status * @return Post[] */ - public function getByTag( int $TagId, ?string $Status = null ): array; + public function getByTag( int $tagId, ?string $status = null ): array; /** * Get published posts * - * @param int $Limit Limit number of results (0 = no limit) - * @param int $Offset Offset for pagination + * @param int $limit Limit number of results (0 = no limit) + * @param int $offset Offset for pagination * @return Post[] */ - public function getPublished( int $Limit = 0, int $Offset = 0 ): array; + public function getPublished( int $limit = 0, int $offset = 0 ): array; /** * Get draft posts @@ -99,38 +99,38 @@ public function getScheduled(): array; /** * Count total posts * - * @param string|null $Status Filter by status + * @param string|null $status Filter by status */ - public function count( ?string $Status = null ): int; + public function count( ?string $status = null ): int; /** * Increment post view count */ - public function incrementViewCount( int $Id ): bool; + public function incrementViewCount( int $id ): bool; /** * Attach categories to post * - * @param int $PostId Post ID - * @param array $CategoryIds Array of category IDs + * @param int $postId Post ID + * @param array $categoryIds Array of category IDs */ - public function attachCategories( int $PostId, array $CategoryIds ): bool; + public function attachCategories( int $postId, array $categoryIds ): bool; /** * Detach all categories from post */ - public function detachCategories( int $PostId ): bool; + public function detachCategories( int $postId ): bool; /** * Attach tags to post * - * @param int $PostId Post ID - * @param array $TagIds Array of tag IDs + * @param int $postId Post ID + * @param array $tagIds Array of tag IDs */ - public function attachTags( int $PostId, array $TagIds ): bool; + public function attachTags( int $postId, array $tagIds ): bool; /** * Detach all tags from post */ - public function detachTags( int $PostId ): bool; + public function detachTags( int $postId ): bool; } diff --git a/src/Cms/Repositories/ITagRepository.php b/src/Cms/Repositories/ITagRepository.php index 8f6ba13..98b0510 100644 --- a/src/Cms/Repositories/ITagRepository.php +++ b/src/Cms/Repositories/ITagRepository.php @@ -14,32 +14,32 @@ interface ITagRepository /** * Find tag by ID */ - public function findById( int $Id ): ?Tag; + public function findById( int $id ): ?Tag; /** * Find tag by slug */ - public function findBySlug( string $Slug ): ?Tag; + public function findBySlug( string $slug ): ?Tag; /** * Find tag by name */ - public function findByName( string $Name ): ?Tag; + public function findByName( string $name ): ?Tag; /** * Create a new tag */ - public function create( Tag $Tag ): Tag; + public function create( Tag $tag ): Tag; /** * Update an existing tag */ - public function update( Tag $Tag ): bool; + public function update( Tag $tag ): bool; /** * Delete a tag */ - public function delete( int $Id ): bool; + public function delete( int $id ): bool; /** * Get all tags diff --git a/src/Cms/Repositories/IUserRepository.php b/src/Cms/Repositories/IUserRepository.php index 0e63b16..bfc59af 100644 --- a/src/Cms/Repositories/IUserRepository.php +++ b/src/Cms/Repositories/IUserRepository.php @@ -14,37 +14,37 @@ interface IUserRepository /** * Find user by ID */ - public function findById( int $Id ): ?User; + public function findById( int $id ): ?User; /** * Find user by username */ - public function findByUsername( string $Username ): ?User; + public function findByUsername( string $username ): ?User; /** * Find user by email */ - public function findByEmail( string $Email ): ?User; + public function findByEmail( string $email ): ?User; /** * Find user by remember token */ - public function findByRememberToken( string $Token ): ?User; + public function findByRememberToken( string $token ): ?User; /** * Create a new user */ - public function create( User $User ): User; + public function create( User $user ): User; /** * Update an existing user */ - public function update( User $User ): bool; + public function update( User $user ): bool; /** * Delete a user */ - public function delete( int $Id ): bool; + public function delete( int $id ): bool; /** * Get all users diff --git a/src/Cms/Services/EmailService.php b/src/Cms/Services/Email/Sender.php similarity index 56% rename from src/Cms/Services/EmailService.php rename to src/Cms/Services/Email/Sender.php index fa1e681..e54de85 100644 --- a/src/Cms/Services/EmailService.php +++ b/src/Cms/Services/Email/Sender.php @@ -1,6 +1,6 @@ _Settings = $Settings; - $this->_BasePath = $BasePath ?: getcwd(); + $this->_settings = $settings; + $this->_basePath = $basePath ?: getcwd(); } /** @@ -36,7 +40,7 @@ public function __construct( ?ISettingSource $Settings = null, string $BasePath */ public function to( string $email, string $name = '' ): self { - $this->_To[] = [ 'email' => $email, 'name' => $name ]; + $this->_to[] = [ 'email' => $email, 'name' => $name ]; return $this; } @@ -45,7 +49,7 @@ public function to( string $email, string $name = '' ): self */ public function cc( string $email, string $name = '' ): self { - $this->_Cc[] = [ 'email' => $email, 'name' => $name ]; + $this->_cc[] = [ 'email' => $email, 'name' => $name ]; return $this; } @@ -54,7 +58,7 @@ public function cc( string $email, string $name = '' ): self */ public function bcc( string $email, string $name = '' ): self { - $this->_Bcc[] = [ 'email' => $email, 'name' => $name ]; + $this->_bcc[] = [ 'email' => $email, 'name' => $name ]; return $this; } @@ -63,7 +67,7 @@ public function bcc( string $email, string $name = '' ): self */ public function subject( string $subject ): self { - $this->_Subject = $subject; + $this->_subject = $subject; return $this; } @@ -72,8 +76,8 @@ public function subject( string $subject ): self */ public function body( string $body, bool $isHtml = true ): self { - $this->_Body = $body; - $this->_IsHtml = $isHtml; + $this->_body = $body; + $this->_isHtml = $isHtml; return $this; } @@ -82,8 +86,8 @@ public function body( string $body, bool $isHtml = true ): self */ public function replyTo( string $email, string $name = '' ): self { - $this->_ReplyTo = $email; - $this->_ReplyToName = $name; + $this->_replyTo = $email; + $this->_replyToName = $name; return $this; } @@ -92,7 +96,7 @@ public function replyTo( string $email, string $name = '' ): self */ public function attach( string $filePath, string $name = '' ): self { - $this->_Attachments[] = [ 'path' => $filePath, 'name' => $name ]; + $this->_attachments[] = [ 'path' => $filePath, 'name' => $name ]; return $this; } @@ -104,7 +108,7 @@ public function template( string $templatePath, array $data = [] ): self try { $view = new Html(); - $view->setViewPath( $this->_BasePath . '/resources/views' ); + $view->setViewPath( $this->_basePath . '/resources/views' ); $view->setPage( $templatePath ); // Render the template @@ -114,14 +118,14 @@ public function template( string $templatePath, array $data = [] ): self $$key = $value; } require $view->getViewPath() . '/' . $templatePath . '.php'; - $this->_Body = ob_get_clean(); - $this->_IsHtml = true; + $this->_body = ob_get_clean(); + $this->_isHtml = true; return $this; } - catch( \Exception $e ) + catch( \Exception $exception ) { - Log::error( "Email template error: " . $e->getMessage() ); + Log::error( "Email template error: " . $exception->getMessage() ); throw new \RuntimeException( "Failed to render email template: {$templatePath}" ); } } @@ -132,7 +136,7 @@ public function template( string $templatePath, array $data = [] ): self public function send(): bool { // Check for test mode - if( $this->_Settings && $this->_Settings->get( 'email.test_mode' ) ) + if( $this->_settings && $this->_settings->get( 'email.test_mode' ) ) { return $this->logEmail(); } @@ -142,51 +146,51 @@ public function send(): bool $mail = $this->createMailer(); // Recipients - foreach( $this->_To as $recipient ) + foreach( $this->_to as $recipient ) { $mail->addAddress( $recipient['email'], $recipient['name'] ); } - foreach( $this->_Cc as $recipient ) + foreach( $this->_cc as $recipient ) { $mail->addCC( $recipient['email'], $recipient['name'] ); } - foreach( $this->_Bcc as $recipient ) + foreach( $this->_bcc as $recipient ) { $mail->addBCC( $recipient['email'], $recipient['name'] ); } // Reply-To - if( $this->_ReplyTo ) + if( $this->_replyTo ) { - $mail->addReplyTo( $this->_ReplyTo, $this->_ReplyToName ?? '' ); + $mail->addReplyTo( $this->_replyTo, $this->_replyToName ?? '' ); } // Attachments - foreach( $this->_Attachments as $attachment ) + foreach( $this->_attachments as $attachment ) { $mail->addAttachment( $attachment['path'], $attachment['name'] ); } // Content - $mail->Subject = $this->_Subject; - $mail->Body = $this->_Body; - $mail->isHTML( $this->_IsHtml ); + $mail->Subject = $this->_subject; + $mail->Body = $this->_body; + $mail->isHTML( $this->_isHtml ); // Send $result = $mail->send(); if( $result ) { - Log::info( "Email sent to: " . $this->_To[0]['email'] ); + Log::info( "Email sent to: " . $this->_to[0]['email'] ); } return $result; } - catch( PHPMailerException $e ) + catch( PHPMailerException $exception ) { - Log::error( "Email send failed: " . $e->getMessage() ); + Log::error( "Email send failed: " . $exception->getMessage() ); return false; } } @@ -199,14 +203,14 @@ private function createMailer(): PHPMailer $mail = new PHPMailer( true ); // Get config - $driver = $this->_Settings?->get( 'email.driver' ) ?? 'mail'; - $host = $this->_Settings?->get( 'email.host' ) ?? ''; - $port = $this->_Settings?->get( 'email.port' ) ?? 587; - $username = $this->_Settings?->get( 'email.username' ) ?? ''; - $password = $this->_Settings?->get( 'email.password' ) ?? ''; - $encryption = $this->_Settings?->get( 'email.encryption' ) ?? 'tls'; - $fromAddress = $this->_Settings?->get( 'email.from_address' ) ?? 'noreply@example.com'; - $fromName = $this->_Settings?->get( 'email.from_name' ) ?? 'Neuron CMS'; + $driver = $this->_settings?->get( 'email.driver' ) ?? 'mail'; + $host = $this->_settings?->get( 'email.host' ) ?? ''; + $port = $this->_settings?->get( 'email.port' ) ?? 587; + $username = $this->_settings?->get( 'email.username' ) ?? ''; + $password = $this->_settings?->get( 'email.password' ) ?? ''; + $encryption = $this->_settings?->get( 'email.encryption' ) ?? 'tls'; + $fromAddress = $this->_settings?->get( 'email.from_address' ) ?? 'noreply@example.com'; + $fromName = $this->_settings?->get( 'email.from_name' ) ?? 'Neuron CMS'; // Configure based on driver if( $driver === 'smtp' ) @@ -254,12 +258,12 @@ private function createMailer(): PHPMailer */ private function logEmail(): bool { - $recipients = array_map( fn($r) => $r['email'], $this->_To ); + $recipients = array_map( fn($recipient) => $recipient['email'], $this->_to ); Log::info( "TEST MODE - Email not sent" ); Log::info( " To: " . implode( ', ', $recipients ) ); - Log::info( " Subject: " . $this->_Subject ); - Log::info( " Body: " . substr( strip_tags( $this->_Body ), 0, 100 ) . '...' ); + Log::info( " Subject: " . $this->_subject ); + Log::info( " Body: " . substr( strip_tags( $this->_body ), 0, 100 ) . '...' ); return true; } diff --git a/src/Cms/Services/Post/Creator.php b/src/Cms/Services/Post/Creator.php new file mode 100644 index 0000000..666adde --- /dev/null +++ b/src/Cms/Services/Post/Creator.php @@ -0,0 +1,101 @@ +_postRepository = $postRepository; + $this->_categoryRepository = $categoryRepository; + $this->_tagResolver = $tagResolver; + } + + /** + * Create a new post + * + * @param string $title Post title + * @param string $body Post body content + * @param int $authorId Author user ID + * @param string $status Post status (draft, published, scheduled) + * @param string|null $slug Optional custom slug (auto-generated if not provided) + * @param string|null $excerpt Optional excerpt + * @param string|null $featuredImage Optional featured image URL + * @param array $categoryIds Array of category IDs + * @param string $tagNames Comma-separated tag names + * @return Post + */ + public function create( + string $title, + string $body, + int $authorId, + string $status, + ?string $slug = null, + ?string $excerpt = null, + ?string $featuredImage = null, + array $categoryIds = [], + string $tagNames = '' + ): Post + { + $post = new Post(); + $post->setTitle( $title ); + $post->setSlug( $slug ?: $this->generateSlug( $title ) ); + $post->setBody( $body ); + $post->setExcerpt( $excerpt ); + $post->setFeaturedImage( $featuredImage ); + $post->setAuthorId( $authorId ); + $post->setStatus( $status ); + $post->setCreatedAt( new DateTimeImmutable() ); + + // Business rule: auto-set published date for published posts + if( $status === Post::STATUS_PUBLISHED ) + { + $post->setPublishedAt( new DateTimeImmutable() ); + } + + // Attach categories + $categories = $this->_categoryRepository->findByIds( $categoryIds ); + $post->setCategories( $categories ); + + // Resolve and attach tags + $tags = $this->_tagResolver->resolveFromString( $tagNames ); + $post->setTags( $tags ); + + return $this->_postRepository->create( $post ); + } + + /** + * Generate URL-friendly slug from title + * + * @param string $title + * @return string + */ + private function generateSlug( string $title ): string + { + $slug = strtolower( trim( $title ) ); + $slug = preg_replace( '/[^a-z0-9-]/', '-', $slug ); + $slug = preg_replace( '/-+/', '-', $slug ); + return trim( $slug, '-' ); + } +} diff --git a/src/Cms/Services/Post/Deleter.php b/src/Cms/Services/Post/Deleter.php new file mode 100644 index 0000000..3386498 --- /dev/null +++ b/src/Cms/Services/Post/Deleter.php @@ -0,0 +1,50 @@ +_postRepository = $postRepository; + } + + /** + * Delete a post + * + * @param Post $post The post to delete + * @return bool True if deleted successfully + */ + public function delete( Post $post ): bool + { + if( !$post->getId() ) + { + return false; + } + + return $this->_postRepository->delete( $post->getId() ); + } + + /** + * Delete a post by ID + * + * @param int $id Post ID + * @return bool True if deleted successfully + */ + public function deleteById( int $id ): bool + { + return $this->_postRepository->delete( $id ); + } +} diff --git a/src/Cms/Services/Post/Publisher.php b/src/Cms/Services/Post/Publisher.php new file mode 100644 index 0000000..fb89fc5 --- /dev/null +++ b/src/Cms/Services/Post/Publisher.php @@ -0,0 +1,95 @@ +_postRepository = $postRepository; + } + + /** + * Publish a draft post + * + * @param Post $post The post to publish + * @return Post + * @throws Exception if post is already published + */ + public function publish( Post $post ): Post + { + // Validate post isn't already published + if( $post->getStatus() === Post::STATUS_PUBLISHED ) + { + throw new Exception( 'Post is already published' ); + } + + $post->setStatus( Post::STATUS_PUBLISHED ); + $post->setPublishedAt( new DateTimeImmutable() ); + + $this->_postRepository->update( $post ); + + return $post; + } + + /** + * Unpublish a post (revert to draft) + * + * @param Post $post The post to unpublish + * @return Post + * @throws Exception if post is not published + */ + public function unpublish( Post $post ): Post + { + // Validate post is currently published + if( $post->getStatus() !== Post::STATUS_PUBLISHED ) + { + throw new Exception( 'Post is not currently published' ); + } + + $post->setStatus( Post::STATUS_DRAFT ); + $post->setPublishedAt( null ); + + $this->_postRepository->update( $post ); + + return $post; + } + + /** + * Schedule a post for future publication + * + * @param Post $post The post to schedule + * @param DateTimeImmutable $publishAt When to publish + * @return Post + * @throws Exception if scheduled date is in the past + */ + public function schedule( Post $post, DateTimeImmutable $publishAt ): Post + { + // Validate scheduled date is in the future + if( $publishAt <= new DateTimeImmutable() ) + { + throw new Exception( 'Scheduled publish date must be in the future' ); + } + + $post->setStatus( Post::STATUS_SCHEDULED ); + $post->setPublishedAt( $publishAt ); + + $this->_postRepository->update( $post ); + + return $post; + } +} diff --git a/src/Cms/Services/Post/Updater.php b/src/Cms/Services/Post/Updater.php new file mode 100644 index 0000000..8e3a045 --- /dev/null +++ b/src/Cms/Services/Post/Updater.php @@ -0,0 +1,92 @@ +_postRepository = $postRepository; + $this->_categoryRepository = $categoryRepository; + $this->_tagResolver = $tagResolver; + } + + /** + * Update an existing post + * + * @param Post $post The post to update + * @param string $title Post title + * @param string $body Post body content + * @param string $status Post status + * @param string|null $slug Custom slug + * @param string|null $excerpt Excerpt + * @param string|null $featuredImage Featured image URL + * @param array $categoryIds Array of category IDs + * @param string $tagNames Comma-separated tag names + * @return Post + */ + public function update( + Post $post, + string $title, + string $body, + string $status, + ?string $slug = null, + ?string $excerpt = null, + ?string $featuredImage = null, + array $categoryIds = [], + string $tagNames = '' + ): Post + { + $post->setTitle( $title ); + $post->setSlug( $slug ?: $this->generateSlug( $title ) ); + $post->setBody( $body ); + $post->setExcerpt( $excerpt ); + $post->setFeaturedImage( $featuredImage ); + $post->setStatus( $status ); + + // Update relationships + $categories = $this->_categoryRepository->findByIds( $categoryIds ); + $post->setCategories( $categories ); + + $tags = $this->_tagResolver->resolveFromString( $tagNames ); + $post->setTags( $tags ); + + $this->_postRepository->update( $post ); + + return $post; + } + + /** + * Generate URL-friendly slug from title + * + * @param string $title + * @return string + */ + private function generateSlug( string $title ): string + { + $slug = strtolower( trim( $title ) ); + $slug = preg_replace( '/[^a-z0-9-]/', '-', $slug ); + $slug = preg_replace( '/-+/', '-', $slug ); + return trim( $slug, '-' ); + } +} diff --git a/src/Cms/Services/Tag/Creator.php b/src/Cms/Services/Tag/Creator.php new file mode 100644 index 0000000..b85b87b --- /dev/null +++ b/src/Cms/Services/Tag/Creator.php @@ -0,0 +1,53 @@ +_tagRepository = $tagRepository; + } + + /** + * Create a new tag + * + * @param string $name Tag name + * @param string|null $slug Optional custom slug (auto-generated if not provided) + * @return Tag + */ + public function create( string $name, ?string $slug = null ): Tag + { + $tag = new Tag(); + $tag->setName( $name ); + $tag->setSlug( $slug ?: $this->generateSlug( $name ) ); + + return $this->_tagRepository->create( $tag ); + } + + /** + * Generate URL-friendly slug from name + * + * @param string $name + * @return string + */ + private function generateSlug( string $name ): string + { + $slug = strtolower( trim( $name ) ); + $slug = preg_replace( '/[^a-z0-9-]/', '-', $slug ); + $slug = preg_replace( '/-+/', '-', $slug ); + return trim( $slug, '-' ); + } +} diff --git a/src/Cms/Services/Tag/Resolver.php b/src/Cms/Services/Tag/Resolver.php new file mode 100644 index 0000000..0dbc0bd --- /dev/null +++ b/src/Cms/Services/Tag/Resolver.php @@ -0,0 +1,64 @@ +_tagRepository = $tagRepository; + $this->_tagCreator = $tagCreator; + } + + /** + * Resolve comma-separated tag names to Tag objects. + * Creates tags that don't exist. + * + * @param string $tagNames Comma-separated tag names + * @return Tag[] + */ + public function resolveFromString( string $tagNames ): array + { + if( empty( $tagNames ) ) + { + return []; + } + + $tags = []; + $tagArray = array_map( 'trim', explode( ',', $tagNames ) ); + + foreach( $tagArray as $tagName ) + { + if( empty( $tagName ) ) + { + continue; + } + + $tag = $this->_tagRepository->findByName( $tagName ); + if( !$tag ) + { + $tag = $this->_tagCreator->create( $tagName ); + } + $tags[] = $tag; + } + + return $tags; + } +} diff --git a/tests/BootstrapTest.php b/tests/BootstrapTest.php index ad86392..8e02270 100644 --- a/tests/BootstrapTest.php +++ b/tests/BootstrapTest.php @@ -11,18 +11,18 @@ class BootstrapTest extends TestCase { - private $Root; - private $OriginalEnv; + private $root; + private $originalEnv; protected function setUp(): void { parent::setUp(); // Create virtual filesystem - $this->Root = vfsStream::setup( 'test' ); - + $this->root = vfsStream::setup( 'test' ); + // Store original environment - $this->OriginalEnv = $_ENV ?? []; + $this->originalEnv = $_ENV ?? []; // Clear environment variable putenv( 'SYSTEM_BASE_PATH' ); @@ -31,7 +31,7 @@ protected function setUp(): void protected function tearDown(): void { // Restore original environment - $_ENV = $this->OriginalEnv; + $_ENV = $this->originalEnv; // Clear environment variable putenv( 'SYSTEM_BASE_PATH' ); @@ -45,7 +45,7 @@ protected function tearDown(): void public function testBootWithValidConfig() { // Create config.yaml - $ConfigContent = <<at( $this->Root ) - ->setContent( $ConfigContent ); - + ->at( $this->root ) + ->setContent( $configContent ); + // Create version.json - $VersionContent = json_encode([ + $versionContent = json_encode([ 'major' => 1, 'minor' => 0, 'patch' => 0 ]); - + vfsStream::newFile( '.version.json' ) - ->at( $this->Root ) - ->setContent( $VersionContent ); - + ->at( $this->root ) + ->setContent( $versionContent ); + // Mock base path - $BasePath = vfsStream::url( 'test' ); - + $basePath = vfsStream::url( 'test' ); + // Update config to use virtual filesystem path - $ConfigContent = str_replace( '/app', $BasePath, $ConfigContent ); - $this->Root->getChild( 'config.yaml' )->setContent( $ConfigContent ); - + $configContent = str_replace( '/app', $basePath, $configContent ); + $this->root->getChild( 'config.yaml' )->setContent( $configContent ); + // Boot the application - $App = Boot( $BasePath ); - + $app = Boot( $basePath ); + // Assertions - $this->assertInstanceOf( Application::class, $App ); - $this->assertEquals( '1.0.0', $App->getVersion() ); + $this->assertInstanceOf( Application::class, $app ); + $this->assertEquals( '1.0.0', $app->getVersion() ); } /** @@ -97,26 +97,26 @@ public function testBootWithValidConfig() public function testBootWithMissingConfig() { // Set environment variable - $BasePath = vfsStream::url( 'test' ); - putenv( "SYSTEM_BASE_PATH=$BasePath" ); - + $basePath = vfsStream::url( 'test' ); + putenv( "SYSTEM_BASE_PATH=$basePath" ); + // Create version.json - $VersionContent = json_encode([ + $versionContent = json_encode([ 'major' => 2, 'minor' => 1, 'patch' => 0 ]); - + vfsStream::newFile( '.version.json' ) - ->at( $this->Root ) - ->setContent( $VersionContent ); - + ->at( $this->root ) + ->setContent( $versionContent ); + // Boot with non-existent config path - should use environment variable - $App = Boot( vfsStream::url( 'test/nonexistent' ) ); - + $app = Boot( vfsStream::url( 'test/nonexistent' ) ); + // Should successfully create application with environment path - $this->assertInstanceOf( Application::class, $App ); - $this->assertEquals( '2.1.0', $App->getVersion() ); + $this->assertInstanceOf( Application::class, $app ); + $this->assertEquals( '2.1.0', $app->getVersion() ); } /** @@ -126,40 +126,40 @@ public function testBootWithDefaultBasePath() { // Clear environment variable putenv( 'SYSTEM_BASE_PATH' ); - + // Create version.json - $VersionContent = json_encode([ + $versionContent = json_encode([ 'major' => 3, 'minor' => 0, 'patch' => 1 ]); - + // Create a temporary directory for this test - $TempDir = sys_get_temp_dir() . '/neuron_cms_test_' . uniqid(); - mkdir( $TempDir ); - $TempVersionFile = $TempDir . '/.version.json'; - file_put_contents( $TempVersionFile, $VersionContent ); - + $tempDir = sys_get_temp_dir() . '/neuron_cms_test_' . uniqid(); + mkdir( $tempDir ); + $tempVersionFile = $tempDir . '/.version.json'; + file_put_contents( $tempVersionFile, $versionContent ); + // Save original CWD and change to temp directory - $OriginalCwd = getcwd(); - chdir( $TempDir ); - + $originalCwd = getcwd(); + chdir( $tempDir ); + try { // Boot with non-existent config path - will use current directory - $App = Boot( vfsStream::url( 'test/nonexistent' ) ); - + $app = Boot( vfsStream::url( 'test/nonexistent' ) ); + // Should successfully create application - $this->assertInstanceOf( Application::class, $App ); - $this->assertEquals( '3.0.1', $App->getVersion() ); + $this->assertInstanceOf( Application::class, $app ); + $this->assertEquals( '3.0.1', $app->getVersion() ); } finally { // Restore original directory - chdir( $OriginalCwd ); + chdir( $originalCwd ); // Clean up temp files - @unlink( $TempVersionFile ); - @rmdir( $TempDir ); + @unlink( $tempVersionFile ); + @rmdir( $tempDir ); } } @@ -170,7 +170,7 @@ public function testBootDelegatesToMvc() { // The CMS Boot function should call the MVC Boot function // Let's test with a valid config in examples directory - $App = Boot( 'examples/config' ); - $this->assertInstanceOf( Application::class, $App ); + $app = Boot( 'examples/config' ); + $this->assertInstanceOf( Application::class, $app ); } } \ No newline at end of file diff --git a/tests/Cms/Auth/AuthManagerTest.php b/tests/Cms/Auth/AuthManagerTest.php index f8617a7..d84de10 100644 --- a/tests/Cms/Auth/AuthManagerTest.php +++ b/tests/Cms/Auth/AuthManagerTest.php @@ -8,6 +8,7 @@ use Neuron\Cms\Auth\PasswordHasher; use Neuron\Cms\Models\User; use Neuron\Cms\Repositories\DatabaseUserRepository; +use Neuron\Data\Setting\SettingManager; use DateTimeImmutable; use PDO; @@ -31,11 +32,17 @@ protected function setUp(): void 'name' => ':memory:' ]; - $this->userRepository = new DatabaseUserRepository($config); + // Mock SettingManager + $settings = $this->createMock( SettingManager::class ); + $settings->method( 'getSection' ) + ->with( 'database' ) + ->willReturn( $config ); + + $this->userRepository = new DatabaseUserRepository($settings); // Get PDO connection via reflection to create table $reflection = new \ReflectionClass($this->userRepository); - $property = $reflection->getProperty('_PDO'); + $property = $reflection->getProperty('_pdo'); $property->setAccessible(true); $this->pdo = $property->getValue($this->userRepository); diff --git a/tests/Cms/BlogControllerTest.php b/tests/Cms/BlogControllerTest.php index e4ccc01..5b32570 100644 --- a/tests/Cms/BlogControllerTest.php +++ b/tests/Cms/BlogControllerTest.php @@ -19,25 +19,25 @@ class BlogControllerTest extends TestCase { - private PDO $_PDO; - private DatabasePostRepository $_PostRepository; - private DatabaseCategoryRepository $_CategoryRepository; - private DatabaseTagRepository $_TagRepository; - private $OriginalRegistry; + private PDO $_pdo; + private DatabasePostRepository $_postRepository; + private DatabaseCategoryRepository $_categoryRepository; + private DatabaseTagRepository $_tagRepository; + private $originalRegistry; protected function setUp(): void { parent::setUp(); // Store original registry values - $this->OriginalRegistry = [ + $this->originalRegistry = [ 'Settings' => Registry::getInstance()->get( 'Settings' ), 'Base.Path' => Registry::getInstance()->get( 'Base.Path' ), 'Views.Path' => Registry::getInstance()->get( 'Views.Path' ) ]; // Set up in-memory database - $this->_PDO = new PDO( + $this->_pdo = new PDO( 'sqlite::memory:', null, null, @@ -51,18 +51,18 @@ protected function setUp(): void $this->createTables(); // Set up Settings with database config - $Settings = new Memory(); - $Settings->set( 'site', 'name', 'Test Blog' ); - $Settings->set( 'site', 'title', 'Test Blog Title' ); - $Settings->set( 'site', 'description', 'Test Blog Description' ); - $Settings->set( 'site', 'url', 'http://test.com' ); - $Settings->set( 'database', 'adapter', 'sqlite' ); - $Settings->set( 'database', 'name', ':memory:' ); + $settings = new Memory(); + $settings->set( 'site', 'name', 'Test Blog' ); + $settings->set( 'site', 'title', 'Test Blog Title' ); + $settings->set( 'site', 'description', 'Test Blog Description' ); + $settings->set( 'site', 'url', 'http://test.com' ); + $settings->set( 'database', 'adapter', 'sqlite' ); + $settings->set( 'database', 'name', ':memory:' ); // Wrap in SettingManager - $SettingManager = new SettingManager( $Settings ); + $settingManager = new SettingManager( $settings ); - Registry::getInstance()->set( 'Settings', $SettingManager ); + Registry::getInstance()->set( 'Settings', $settingManager ); // Set paths for views - point to CMS component's resources Registry::getInstance()->set( 'Base.Path', __DIR__ . '/../..' ); @@ -75,9 +75,9 @@ protected function setUp(): void protected function tearDown(): void { // Restore original registry values - foreach( $this->OriginalRegistry as $Key => $Value ) + foreach( $this->originalRegistry as $key => $value ) { - Registry::getInstance()->set( $Key, $Value ); + Registry::getInstance()->set( $key, $value ); } parent::tearDown(); } @@ -85,7 +85,7 @@ protected function tearDown(): void private function createTables(): void { // Create posts table - $this->_PDO->exec( " + $this->_pdo->exec( " CREATE TABLE posts ( id INTEGER PRIMARY KEY AUTOINCREMENT, title VARCHAR(255) NOT NULL, @@ -103,7 +103,7 @@ private function createTables(): void " ); // Create categories table - $this->_PDO->exec( " + $this->_pdo->exec( " CREATE TABLE categories ( id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(255) NOT NULL, @@ -115,7 +115,7 @@ private function createTables(): void " ); // Create tags table - $this->_PDO->exec( " + $this->_pdo->exec( " CREATE TABLE tags ( id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(100) NOT NULL, @@ -126,7 +126,7 @@ private function createTables(): void " ); // Create junction tables - $this->_PDO->exec( " + $this->_pdo->exec( " CREATE TABLE post_categories ( post_id INTEGER NOT NULL, category_id INTEGER NOT NULL, @@ -137,7 +137,7 @@ private function createTables(): void ) " ); - $this->_PDO->exec( " + $this->_pdo->exec( " CREATE TABLE post_tags ( post_id INTEGER NOT NULL, tag_id INTEGER NOT NULL, @@ -151,37 +151,37 @@ private function createTables(): void private function initializeRepositories(): void { - $pdo = $this->_PDO; + $pdo = $this->_pdo; // Create repositories using reflection to inject PDO - $this->_PostRepository = new class( $pdo ) extends DatabasePostRepository + $this->_postRepository = new class( $pdo ) extends DatabasePostRepository { public function __construct( PDO $PDO ) { $reflection = new \ReflectionClass( DatabasePostRepository::class ); - $property = $reflection->getProperty( '_PDO' ); + $property = $reflection->getProperty( '_pdo' ); $property->setAccessible( true ); $property->setValue( $this, $PDO ); } }; - $this->_CategoryRepository = new class( $pdo ) extends DatabaseCategoryRepository + $this->_categoryRepository = new class( $pdo ) extends DatabaseCategoryRepository { public function __construct( PDO $PDO ) { $reflection = new \ReflectionClass( DatabaseCategoryRepository::class ); - $property = $reflection->getProperty( '_PDO' ); + $property = $reflection->getProperty( '_pdo' ); $property->setAccessible( true ); $property->setValue( $this, $PDO ); } }; - $this->_TagRepository = new class( $pdo ) extends DatabaseTagRepository + $this->_tagRepository = new class( $pdo ) extends DatabaseTagRepository { public function __construct( PDO $PDO ) { $reflection = new \ReflectionClass( DatabaseTagRepository::class ); - $property = $reflection->getProperty( '_PDO' ); + $property = $reflection->getProperty( '_pdo' ); $property->setAccessible( true ); $property->setValue( $this, $PDO ); } @@ -191,24 +191,24 @@ public function __construct( PDO $PDO ) private function createBlogWithInjectedRepositories(): Blog { // Create Blog controller - $Blog = new Blog(); + $blog = new Blog(); // Inject our test repositories using reflection - $reflection = new \ReflectionClass( $Blog ); + $reflection = new \ReflectionClass( $blog ); - $postRepoProp = $reflection->getProperty( '_PostRepository' ); + $postRepoProp = $reflection->getProperty( '_postRepository' ); $postRepoProp->setAccessible( true ); - $postRepoProp->setValue( $Blog, $this->_PostRepository ); + $postRepoProp->setValue( $blog, $this->_postRepository ); - $categoryRepoProp = $reflection->getProperty( '_CategoryRepository' ); + $categoryRepoProp = $reflection->getProperty( '_categoryRepository' ); $categoryRepoProp->setAccessible( true ); - $categoryRepoProp->setValue( $Blog, $this->_CategoryRepository ); + $categoryRepoProp->setValue( $blog, $this->_categoryRepository ); - $tagRepoProp = $reflection->getProperty( '_TagRepository' ); + $tagRepoProp = $reflection->getProperty( '_tagRepository' ); $tagRepoProp->setAccessible( true ); - $tagRepoProp->setValue( $Blog, $this->_TagRepository ); + $tagRepoProp->setValue( $blog, $this->_tagRepository ); - return $Blog; + return $blog; } private function createTestPost( @@ -230,7 +230,7 @@ private function createTestPost( $post->setPublishedAt( new DateTimeImmutable() ); } - return $this->_PostRepository->create( $post ); + return $this->_postRepository->create( $post ); } private function createTestCategory( string $name, string $slug ): Category @@ -239,7 +239,7 @@ private function createTestCategory( string $name, string $slug ): Category $category->setName( $name ); $category->setSlug( $slug ); - return $this->_CategoryRepository->create( $category ); + return $this->_categoryRepository->create( $category ); } private function createTestTag( string $name, string $slug ): Tag @@ -248,7 +248,7 @@ private function createTestTag( string $name, string $slug ): Tag $tag->setName( $name ); $tag->setSlug( $slug ); - return $this->_TagRepository->create( $tag ); + return $this->_tagRepository->create( $tag ); } public function testIndexReturnsPublishedPosts(): void @@ -289,7 +289,7 @@ public function testTagFiltersPostsByTag(): void $post1 = $this->createTestPost( 'PHP Post', 'php-post', Post::STATUS_PUBLISHED ); $post1->addTag( $tag ); - $this->_PostRepository->update( $post1 ); + $this->_postRepository->update( $post1 ); $this->createTestPost( 'Other Post', 'other-post', Post::STATUS_PUBLISHED ); @@ -305,7 +305,7 @@ public function testCategoryFiltersPostsByCategory(): void $post1 = $this->createTestPost( 'Tech Post', 'tech-post', Post::STATUS_PUBLISHED ); $post1->addCategory( $category ); - $this->_PostRepository->update( $post1 ); + $this->_postRepository->update( $post1 ); $this->createTestPost( 'Other Post', 'other-post', Post::STATUS_PUBLISHED ); @@ -350,8 +350,8 @@ public function testRequestParameterIsOptional(): void $this->assertIsString( $blog->show( [ 'title' => 'test-post' ], null ) ); // Test with actual Request object - $MockRequest = $this->createMock( Request::class ); - $this->assertIsString( $blog->index( [], $MockRequest ) ); - $this->assertIsString( $blog->show( [ 'title' => 'test-post' ], $MockRequest ) ); + $mockRequest = $this->createMock( Request::class ); + $this->assertIsString( $blog->index( [], $mockRequest ) ); + $this->assertIsString( $blog->show( [ 'title' => 'test-post' ], $mockRequest ) ); } } diff --git a/tests/Cms/BlogTest.php b/tests/Cms/BlogTest.php index c8de7d1..4c4f78d 100644 --- a/tests/Cms/BlogTest.php +++ b/tests/Cms/BlogTest.php @@ -47,8 +47,8 @@ public function testConstructor() $this->markTestSkipped( 'SiteController class not available in test environment' ); } - $Blog = new Blog( $this->Router ); - $this->assertInstanceOf( Blog::class, $Blog ); + $blog = new Blog( $this->Router ); + $this->assertInstanceOf( Blog::class, $blog ); } public function testRepository() @@ -59,14 +59,14 @@ public function testRepository() $this->markTestSkipped( 'SiteController class not available in test environment' ); } - $Blog = new Blog( $this->Router ); + $blog = new Blog( $this->Router ); // Check that the repository is set correctly - $this->assertInstanceOf( Repository::class, $Blog->getRepository() ); + $this->assertInstanceOf( Repository::class, $blog->getRepository() ); // Set a mock repository and check it - $Blog->setRepository( $this->Repository ); - $this->assertSame( $this->Repository, $Blog->getRepository() ); + $blog->setRepository( $this->Repository ); + $this->assertSame( $this->Repository, $blog->getRepository() ); } /** @@ -81,40 +81,40 @@ public function testIndexMethod() } // Create a partial mock that only mocks specific methods - $Blog = $this->getMockBuilder( Blog::class ) + $blog = $this->getMockBuilder( Blog::class ) ->setConstructorArgs( [ $this->Router ] ) ->onlyMethods( [ 'renderHtml', 'getName', 'getTitle', 'getDescription' ] ) ->getMock(); - - $Blog->expects( $this->once() ) + + $blog->expects( $this->once() ) ->method( 'getName' ) ->willReturn( 'Test Blog' ); - - $Blog->expects( $this->once() ) + + $blog->expects( $this->once() ) ->method( 'getTitle' ) ->willReturn( 'Blog Title' ); - - $Blog->expects( $this->once() ) + + $blog->expects( $this->once() ) ->method( 'getDescription' ) ->willReturn( 'Blog Description' ); - - $Blog->expects( $this->once() ) + + $blog->expects( $this->once() ) ->method( 'renderHtml' ) ->with( HttpResponseStatus::OK, - $this->callback( function( $Data ) { - return isset( $Data['Title'] ) && - isset( $Data['Description'] ) && - array_key_exists( 'Articles', $Data ) && - array_key_exists( 'Categories', $Data ) && - array_key_exists( 'Tags', $Data ); + $this->callback( function( $data ) { + return isset( $data['Title'] ) && + isset( $data['Description'] ) && + array_key_exists( 'Articles', $data ) && + array_key_exists( 'Categories', $data ) && + array_key_exists( 'Tags', $data ); }), 'index' ) ->willReturn( 'Index Page' ); - - $Result = $Blog->index( [], null ); - $this->assertEquals( 'Index Page', $Result ); + + $result = $blog->index( [], null ); + $this->assertEquals( 'Index Page', $result ); } /** @@ -129,59 +129,59 @@ public function testShowMethodWithValidArticle() } // Create mock article - $Article = $this->createMock( Article::class ); - $Article->expects( $this->any() ) + $article = $this->createMock( Article::class ); + $article->expects( $this->any() ) ->method( 'getTitle' ) ->willReturn( 'Test Article' ); - + // Create Blog mock with repository that returns the article - $Blog = $this->getMockBuilder( Blog::class ) + $blog = $this->getMockBuilder( Blog::class ) ->setConstructorArgs( [ $this->Router ] ) ->onlyMethods( [ 'renderHtml', 'getName' ] ) ->getMock(); - + // Use reflection to set the private repository property - $Reflection = new \ReflectionClass( $Blog ); - $Property = $Reflection->getProperty( 'repository' ); - $Property->setAccessible( true ); - - $MockRepo = $this->createMock( Repository::class ); - $MockRepo->expects( $this->once() ) + $reflection = new \ReflectionClass( $blog ); + $property = $reflection->getProperty( 'repository' ); + $property->setAccessible( true ); + + $mockRepo = $this->createMock( Repository::class ); + $mockRepo->expects( $this->once() ) ->method( 'getArticleBySlug' ) ->with( 'test-article' ) - ->willReturn( $Article ); - - $MockRepo->expects( $this->any() ) + ->willReturn( $article ); + + $mockRepo->expects( $this->any() ) ->method( 'getCategories' ) ->willReturn( [] ); - - $MockRepo->expects( $this->any() ) + + $mockRepo->expects( $this->any() ) ->method( 'getTags' ) ->willReturn( [] ); - - $Property->setValue( $Blog, $MockRepo ); - - $Blog->expects( $this->once() ) + + $property->setValue( $blog, $mockRepo ); + + $blog->expects( $this->once() ) ->method( 'getName' ) ->willReturn( 'Test Blog' ); - - $Blog->expects( $this->once() ) + + $blog->expects( $this->once() ) ->method( 'renderHtml' ) ->with( HttpResponseStatus::OK, - $this->callback( function( $Data ) use ( $Article ) { - return isset( $Data['Article'] ) && - $Data['Article'] === $Article && - isset( $Data['Title'] ) && - $Data['Title'] === 'Test Article | Test Blog'; + $this->callback( function( $data ) use ( $article ) { + return isset( $data['Article'] ) && + $data['Article'] === $article && + isset( $data['Title'] ) && + $data['Title'] === 'Test Article | Test Blog'; }), 'show' ) ->willReturn( 'Article Page' ); - - $Parameters = [ 'title' => 'test-article' ]; - $Result = $Blog->show( $Parameters, null ); - $this->assertEquals( 'Article Page', $Result ); + + $parameters = [ 'title' => 'test-article' ]; + $result = $blog->show( $parameters, null ); + $this->assertEquals( 'Article Page', $result ); } /** @@ -196,53 +196,53 @@ public function testShowMethodWithArticleNotFound() } // Create Blog mock - $Blog = $this->getMockBuilder( Blog::class ) + $blog = $this->getMockBuilder( Blog::class ) ->setConstructorArgs( [ $this->Router ] ) ->onlyMethods( [ 'renderHtml', 'getName' ] ) ->getMock(); - + // Use reflection to set the private repository property - $Reflection = new \ReflectionClass( $Blog ); - $Property = $Reflection->getProperty( 'repository' ); - $Property->setAccessible( true ); - - $MockRepo = $this->createMock( Repository::class ); - $MockRepo->expects( $this->once() ) + $reflection = new \ReflectionClass( $blog ); + $property = $reflection->getProperty( 'repository' ); + $property->setAccessible( true ); + + $mockRepo = $this->createMock( Repository::class ); + $mockRepo->expects( $this->once() ) ->method( 'getArticleBySlug' ) ->with( 'missing-article' ) ->willThrowException( new ArticleNotFound( 'Not found' ) ); - - $MockRepo->expects( $this->any() ) + + $mockRepo->expects( $this->any() ) ->method( 'getCategories' ) ->willReturn( [] ); - - $MockRepo->expects( $this->any() ) + + $mockRepo->expects( $this->any() ) ->method( 'getTags' ) ->willReturn( [] ); - - $Property->setValue( $Blog, $MockRepo ); - - $Blog->expects( $this->once() ) + + $property->setValue( $blog, $mockRepo ); + + $blog->expects( $this->once() ) ->method( 'getName' ) ->willReturn( 'Test Blog' ); - - $Blog->expects( $this->once() ) + + $blog->expects( $this->once() ) ->method( 'renderHtml' ) ->with( HttpResponseStatus::OK, - $this->callback( function( $Data ) { - return isset( $Data['Article'] ) && - $Data['Article'] instanceof Article && - isset( $Data['Title'] ) && - $Data['Title'] === 'Article Not Found | Test Blog'; + $this->callback( function( $data ) { + return isset( $data['Article'] ) && + $data['Article'] instanceof Article && + isset( $data['Title'] ) && + $data['Title'] === 'Article Not Found | Test Blog'; }), 'show' ) ->willReturn( 'Not Found Page' ); - - $Parameters = [ 'title' => 'missing-article' ]; - $Result = $Blog->show( $Parameters, null ); - $this->assertEquals( 'Not Found Page', $Result ); + + $parameters = [ 'title' => 'missing-article' ]; + $result = $blog->show( $parameters, null ); + $this->assertEquals( 'Not Found Page', $result ); } /** @@ -256,53 +256,53 @@ public function testTagMethod() $this->markTestSkipped( 'SiteController class not available in test environment' ); } - $Blog = $this->getMockBuilder( Blog::class ) + $blog = $this->getMockBuilder( Blog::class ) ->setConstructorArgs( [ $this->Router ] ) ->onlyMethods( [ 'renderHtml', 'getName' ] ) ->getMock(); - + // Set up mock repository - $Reflection = new \ReflectionClass( $Blog ); - $Property = $Reflection->getProperty( 'repository' ); - $Property->setAccessible( true ); - - $MockRepo = $this->createMock( Repository::class ); - $MockRepo->expects( $this->once() ) + $reflection = new \ReflectionClass( $blog ); + $property = $reflection->getProperty( 'repository' ); + $property->setAccessible( true ); + + $mockRepo = $this->createMock( Repository::class ); + $mockRepo->expects( $this->once() ) ->method( 'getArticlesByTag' ) ->with( 'php' ) ->willReturn( [] ); - - $MockRepo->expects( $this->any() ) + + $mockRepo->expects( $this->any() ) ->method( 'getCategories' ) ->willReturn( [] ); - - $MockRepo->expects( $this->any() ) + + $mockRepo->expects( $this->any() ) ->method( 'getTags' ) ->willReturn( [ 'php', 'javascript' ] ); - - $Property->setValue( $Blog, $MockRepo ); - - $Blog->expects( $this->once() ) + + $property->setValue( $blog, $mockRepo ); + + $blog->expects( $this->once() ) ->method( 'getName' ) ->willReturn( 'Test Blog' ); - - $Blog->expects( $this->once() ) + + $blog->expects( $this->once() ) ->method( 'renderHtml' ) ->with( HttpResponseStatus::OK, - $this->callback( function( $Data ) { - return isset( $Data['Tag'] ) && - $Data['Tag'] === 'php' && - isset( $Data['Title'] ) && - $Data['Title'] === 'Articles tagged with php | Test Blog'; + $this->callback( function( $data ) { + return isset( $data['Tag'] ) && + $data['Tag'] === 'php' && + isset( $data['Title'] ) && + $data['Title'] === 'Articles tagged with php | Test Blog'; }), 'index' ) ->willReturn( 'Tag Page' ); - - $Parameters = [ 'tag' => 'php' ]; - $Result = $Blog->tag( $Parameters, null ); - $this->assertEquals( 'Tag Page', $Result ); + + $parameters = [ 'tag' => 'php' ]; + $result = $blog->tag( $parameters, null ); + $this->assertEquals( 'Tag Page', $result ); } /** @@ -316,53 +316,53 @@ public function testCategoryMethod() $this->markTestSkipped( 'SiteController class not available in test environment' ); } - $Blog = $this->getMockBuilder( Blog::class ) + $blog = $this->getMockBuilder( Blog::class ) ->setConstructorArgs( [ $this->Router ] ) ->onlyMethods( [ 'renderHtml', 'getName' ] ) ->getMock(); - + // Set up mock repository - $Reflection = new \ReflectionClass( $Blog ); - $Property = $Reflection->getProperty( 'repository' ); - $Property->setAccessible( true ); - - $MockRepo = $this->createMock( Repository::class ); - $MockRepo->expects( $this->once() ) + $reflection = new \ReflectionClass( $blog ); + $property = $reflection->getProperty( 'repository' ); + $property->setAccessible( true ); + + $mockRepo = $this->createMock( Repository::class ); + $mockRepo->expects( $this->once() ) ->method( 'getArticlesByCategory' ) ->with( 'tech' ) ->willReturn( [] ); - - $MockRepo->expects( $this->any() ) + + $mockRepo->expects( $this->any() ) ->method( 'getCategories' ) ->willReturn( [ 'tech', 'news' ] ); - - $MockRepo->expects( $this->any() ) + + $mockRepo->expects( $this->any() ) ->method( 'getTags' ) ->willReturn( [] ); - - $Property->setValue( $Blog, $MockRepo ); - - $Blog->expects( $this->once() ) + + $property->setValue( $blog, $mockRepo ); + + $blog->expects( $this->once() ) ->method( 'getName' ) ->willReturn( 'Test Blog' ); - - $Blog->expects( $this->once() ) + + $blog->expects( $this->once() ) ->method( 'renderHtml' ) ->with( HttpResponseStatus::OK, - $this->callback( function( $Data ) { - return isset( $Data['Category'] ) && - $Data['Category'] === 'tech' && - isset( $Data['Title'] ) && - $Data['Title'] === 'Articles in campaign tech | Test Blog'; + $this->callback( function( $data ) { + return isset( $data['Category'] ) && + $data['Category'] === 'tech' && + isset( $data['Title'] ) && + $data['Title'] === 'Articles in campaign tech | Test Blog'; }), 'index' ) ->willReturn( 'Category Page' ); - - $Parameters = [ 'category' => 'tech' ]; - $Result = $Blog->category( $Parameters, null ); - $this->assertEquals( 'Category Page', $Result ); + + $parameters = [ 'category' => 'tech' ]; + $result = $blog->category( $parameters, null ); + $this->assertEquals( 'Category Page', $result ); } /** @@ -376,22 +376,22 @@ public function testFeedMethod() $this->markTestSkipped( 'SiteController class not available in test environment' ); } - $Blog = $this->getMockBuilder( Blog::class ) + $blog = $this->getMockBuilder( Blog::class ) ->setConstructorArgs( [ $this->Router ] ) ->onlyMethods( [ 'getName', 'getDescription', 'getUrl', 'getRssUrl' ] ) ->getMock(); - + // Set up mock repository - $Reflection = new \ReflectionClass( $Blog ); - $Property = $Reflection->getProperty( 'repository' ); - $Property->setAccessible( true ); - - $MockRepo = $this->createMock( Repository::class ); - $MockRepo->expects( $this->once() ) + $reflection = new \ReflectionClass( $blog ); + $property = $reflection->getProperty( 'repository' ); + $property->setAccessible( true ); + + $mockRepo = $this->createMock( Repository::class ); + $mockRepo->expects( $this->once() ) ->method( 'getArticles' ) ->willReturn( [] ); - - $MockRepo->expects( $this->once() ) + + $mockRepo->expects( $this->once() ) ->method( 'getFeed' ) ->with( 'Test Blog', @@ -401,33 +401,33 @@ public function testFeedMethod() [] ) ->willReturn( 'Feed Content' ); - - $Property->setValue( $Blog, $MockRepo ); - - $Blog->expects( $this->once() ) + + $property->setValue( $blog, $mockRepo ); + + $blog->expects( $this->once() ) ->method( 'getName' ) ->willReturn( 'Test Blog' ); - - $Blog->expects( $this->once() ) + + $blog->expects( $this->once() ) ->method( 'getDescription' ) ->willReturn( 'Test Description' ); - - $Blog->expects( $this->once() ) + + $blog->expects( $this->once() ) ->method( 'getUrl' ) ->willReturn( 'http://test.com' ); - - $Blog->expects( $this->once() ) + + $blog->expects( $this->once() ) ->method( 'getRssUrl' ) ->willReturn( 'http://test.com/rss' ); - + // The feed method calls die(), so we can't test it fully // We'll test that it doesn't throw an exception before die() $this->expectOutputString( 'Feed Content' ); - + // Suppress the exit/die try { - $Blog->feed( [], null ); + $blog->feed( [], null ); } catch ( \Exception $e ) { diff --git a/tests/Cms/Cli/Commands/Install/InstallCommandTest.php b/tests/Cms/Cli/Commands/Install/InstallCommandTest.php index 2d2e9e3..1f27d90 100644 --- a/tests/Cms/Cli/Commands/Install/InstallCommandTest.php +++ b/tests/Cms/Cli/Commands/Install/InstallCommandTest.php @@ -141,65 +141,6 @@ public function testGetMigrationTemplateGeneratesValidPhp(): void $this->assertStringContainsString('->addIndex( [ \'username\' ]', $result); } - public function testGetDatabaseConfigReturnsValidArray(): void - { - // Create test YAML config - $configContent = <<at($this->root) - ->setContent($configContent); - - $yaml = new Yaml(vfsStream::url('test/config.yaml')); - $settings = new SettingManager($yaml); - - $command = new InstallCommand(); - - // Use reflection to call private method - $reflection = new \ReflectionClass($command); - $method = $reflection->getMethod('getDatabaseConfig'); - $method->setAccessible(true); - - $result = $method->invoke($command, $settings); - - $this->assertIsArray($result); - $this->assertEquals('sqlite', $result['adapter']); - $this->assertEquals('test.db', $result['name']); - $this->assertEquals(3306, $result['port']); // Should be integer - $this->assertIsInt($result['port']); - } - - public function testGetDatabaseConfigWithEmptySection(): void - { - // Create test YAML config without database section - $configContent = <<at($this->root) - ->setContent($configContent); - - $yaml = new Yaml(vfsStream::url('test/config.yaml')); - $settings = new SettingManager($yaml); - - $command = new InstallCommand(); - - // Use reflection to call private method - $reflection = new \ReflectionClass($command); - $method = $reflection->getMethod('getDatabaseConfig'); - $method->setAccessible(true); - - $result = $method->invoke($command, $settings); - - $this->assertNull($result); - } /** * Helper to set stdin input for testing diff --git a/tests/Cms/ContentControllerTest.php b/tests/Cms/ContentControllerTest.php index ff781fd..c39f0df 100644 --- a/tests/Cms/ContentControllerTest.php +++ b/tests/Cms/ContentControllerTest.php @@ -12,47 +12,47 @@ class ContentControllerTest extends TestCase { - private $Root; - private $Router; - private $Settings; + private $root; + private $router; + private $settings; protected function setUp(): void { parent::setUp(); // Create virtual filesystem - $this->Root = vfsStream::setup( 'test' ); - + $this->root = vfsStream::setup( 'test' ); + // Create mock router - $this->Router = $this->createMock( Router::class ); - + $this->router = $this->createMock( Router::class ); + // Create mock settings - $this->Settings = new Memory(); - $this->Settings->set( 'site', 'name', 'Test Site' ); - $this->Settings->set( 'site', 'title', 'Test Title' ); - $this->Settings->set( 'site', 'description', 'Test Description' ); - $this->Settings->set( 'site', 'url', 'http://test.com' ); - + $this->settings = new Memory(); + $this->settings->set( 'site', 'name', 'Test Site' ); + $this->settings->set( 'site', 'title', 'Test Title' ); + $this->settings->set( 'site', 'description', 'Test Description' ); + $this->settings->set( 'site', 'url', 'http://test.com' ); + // Store settings in registry - Registry::getInstance()->set( 'Settings', $this->Settings ); - + Registry::getInstance()->set( 'Settings', $this->settings ); + // Create version file - $VersionContent = json_encode([ + $versionContent = json_encode([ 'major' => 1, 'minor' => 2, 'patch' => 3 ]); - + vfsStream::newFile( '.version.json' ) - ->at( $this->Root ) - ->setContent( $VersionContent ); - + ->at( $this->root ) + ->setContent( $versionContent ); + // Create a real version file in parent directory for the controller // ContentController loads from "../.version.json" - $ParentDir = dirname( getcwd() ); - if ( !file_exists( $ParentDir . '/.version.json' ) ) + $parentDir = dirname( getcwd() ); + if ( !file_exists( $parentDir . '/.version.json' ) ) { - file_put_contents( $ParentDir . '/.version.json', $VersionContent ); + file_put_contents( $parentDir . '/.version.json', $versionContent ); } } @@ -65,8 +65,8 @@ protected function tearDown(): void Registry::getInstance()->set( 'rss_url', null ); // Clean up temp version file - $ParentDir = dirname( getcwd() ); - @unlink( $ParentDir . '/.version.json' ); + $parentDir = dirname( getcwd() ); + @unlink( $parentDir . '/.version.json' ); parent::tearDown(); } @@ -76,15 +76,15 @@ protected function tearDown(): void */ public function testConstructor() { - $Controller = new Content(); - + $controller = new Content(); + // Check that properties were set from settings - $this->assertEquals( 'Test Site', $Controller->getName() ); - $this->assertEquals( 'Test Title', $Controller->getTitle() ); - $this->assertEquals( 'Test Description', $Controller->getDescription() ); - $this->assertEquals( 'http://test.com', $Controller->getUrl() ); - $this->assertEquals( 'http://test.com/blog/rss', $Controller->getRssUrl() ); - + $this->assertEquals( 'Test Site', $controller->getName() ); + $this->assertEquals( 'Test Title', $controller->getTitle() ); + $this->assertEquals( 'Test Description', $controller->getDescription() ); + $this->assertEquals( 'http://test.com', $controller->getUrl() ); + $this->assertEquals( 'http://test.com/blog/rss', $controller->getRssUrl() ); + // Check registry values were set $this->assertEquals( 'v1.2.3', Registry::getInstance()->get( 'version' ) ); $this->assertEquals( 'Test Site', Registry::getInstance()->get( 'name' ) ); @@ -96,27 +96,27 @@ public function testConstructor() */ public function testSettersAndGetters() { - $Controller = new Content(); - + $controller = new Content(); + // Test Name - $Controller->setName( 'New Name' ); - $this->assertEquals( 'New Name', $Controller->getName() ); - + $controller->setName( 'New Name' ); + $this->assertEquals( 'New Name', $controller->getName() ); + // Test Title - $Controller->setTitle( 'New Title' ); - $this->assertEquals( 'New Title', $Controller->getTitle() ); - + $controller->setTitle( 'New Title' ); + $this->assertEquals( 'New Title', $controller->getTitle() ); + // Test Description - $Controller->setDescription( 'New Description' ); - $this->assertEquals( 'New Description', $Controller->getDescription() ); - + $controller->setDescription( 'New Description' ); + $this->assertEquals( 'New Description', $controller->getDescription() ); + // Test URL - $Controller->setUrl( 'http://newurl.com' ); - $this->assertEquals( 'http://newurl.com', $Controller->getUrl() ); - + $controller->setUrl( 'http://newurl.com' ); + $this->assertEquals( 'http://newurl.com', $controller->getUrl() ); + // Test RSS URL - $Controller->setRssUrl( 'http://newurl.com/rss' ); - $this->assertEquals( 'http://newurl.com/rss', $Controller->getRssUrl() ); + $controller->setRssUrl( 'http://newurl.com/rss' ); + $this->assertEquals( 'http://newurl.com/rss', $controller->getRssUrl() ); } /** @@ -124,24 +124,24 @@ public function testSettersAndGetters() */ public function testMethodChaining() { - $Controller = new Content(); - - $Result = $Controller + $controller = new Content(); + + $result = $controller ->setName( 'Chained Name' ) ->setTitle( 'Chained Title' ) ->setDescription( 'Chained Description' ) ->setUrl( 'http://chained.com' ) ->setRssUrl( 'http://chained.com/rss' ); - + // Should return the controller itself for chaining - $this->assertInstanceOf( Content::class, $Result ); - + $this->assertInstanceOf( Content::class, $result ); + // Values should be set - $this->assertEquals( 'Chained Name', $Controller->getName() ); - $this->assertEquals( 'Chained Title', $Controller->getTitle() ); - $this->assertEquals( 'Chained Description', $Controller->getDescription() ); - $this->assertEquals( 'http://chained.com', $Controller->getUrl() ); - $this->assertEquals( 'http://chained.com/rss', $Controller->getRssUrl() ); + $this->assertEquals( 'Chained Name', $controller->getName() ); + $this->assertEquals( 'Chained Title', $controller->getTitle() ); + $this->assertEquals( 'Chained Description', $controller->getDescription() ); + $this->assertEquals( 'http://chained.com', $controller->getUrl() ); + $this->assertEquals( 'http://chained.com/rss', $controller->getRssUrl() ); } /** @@ -151,11 +151,11 @@ public function testMethodChaining() */ public function testMarkdownMethod() { - $Controller = $this->getMockBuilder( Content::class ) + $controller = $this->getMockBuilder( Content::class ) ->onlyMethods( [ 'renderMarkdown' ] ) ->getMock(); - - $Controller->expects( $this->once() ) + + $controller->expects( $this->once() ) ->method( 'renderMarkdown' ) ->with( HttpResponseStatus::OK, @@ -163,10 +163,10 @@ public function testMarkdownMethod() 'test-page' ) ->willReturn( 'Test Content' ); - - $Parameters = [ 'page' => 'test-page' ]; - $Result = $Controller->markdown( $Parameters ); - - $this->assertEquals( 'Test Content', $Result ); + + $parameters = [ 'page' => 'test-page' ]; + $result = $controller->markdown( $parameters ); + + $this->assertEquals( 'Test Content', $result ); } } diff --git a/tests/Cms/Maintenance/MaintenanceCommandsTest.php b/tests/Cms/Maintenance/MaintenanceCommandsTest.php index d8a58b6..72dccf6 100644 --- a/tests/Cms/Maintenance/MaintenanceCommandsTest.php +++ b/tests/Cms/Maintenance/MaintenanceCommandsTest.php @@ -12,18 +12,18 @@ */ class MaintenanceCommandsTest extends TestCase { - private $Root; - private $BasePath; - private MaintenanceManager $Manager; + private $root; + private $basePath; + private MaintenanceManager $manager; protected function setUp(): void { parent::setUp(); // Create virtual filesystem - $this->Root = vfsStream::setup( 'test' ); - $this->BasePath = vfsStream::url( 'test' ); - $this->Manager = new MaintenanceManager( $this->BasePath ); + $this->root = vfsStream::setup( 'test' ); + $this->basePath = vfsStream::url( 'test' ); + $this->manager = new MaintenanceManager( $this->basePath ); } /** @@ -32,21 +32,21 @@ protected function setUp(): void public function testCompleteMaintenanceWorkflow(): void { // 1. Initially disabled - $this->assertFalse( $this->Manager->isEnabled() ); - $this->assertNull( $this->Manager->getStatus() ); + $this->assertFalse( $this->manager->isEnabled() ); + $this->assertNull( $this->manager->getStatus() ); // 2. Enable maintenance mode (simulates cms:maintenance:enable) $message = 'Site under maintenance for testing'; $allowedIps = ['127.0.0.1', '192.168.1.0/24']; $retryAfter = 1800; - $enabled = $this->Manager->enable( $message, $allowedIps, $retryAfter, 'testuser' ); + $enabled = $this->manager->enable( $message, $allowedIps, $retryAfter, 'testuser' ); $this->assertTrue( $enabled ); - $this->assertTrue( $this->Manager->isEnabled() ); + $this->assertTrue( $this->manager->isEnabled() ); // 3. Check status (simulates cms:maintenance:status) - $status = $this->Manager->getStatus(); + $status = $this->manager->getStatus(); $this->assertIsArray( $status ); $this->assertTrue( $status['enabled'] ); @@ -57,20 +57,20 @@ public function testCompleteMaintenanceWorkflow(): void $this->assertArrayHasKey( 'enabled_at', $status ); // Verify message and retry-after getters - $this->assertEquals( $message, $this->Manager->getMessage() ); - $this->assertEquals( $retryAfter, $this->Manager->getRetryAfter() ); + $this->assertEquals( $message, $this->manager->getMessage() ); + $this->assertEquals( $retryAfter, $this->manager->getRetryAfter() ); // 4. Verify IP checking works - $this->assertTrue( $this->Manager->isIpAllowed( '127.0.0.1' ) ); - $this->assertTrue( $this->Manager->isIpAllowed( '192.168.1.50' ) ); - $this->assertFalse( $this->Manager->isIpAllowed( '10.0.0.1' ) ); + $this->assertTrue( $this->manager->isIpAllowed( '127.0.0.1' ) ); + $this->assertTrue( $this->manager->isIpAllowed( '192.168.1.50' ) ); + $this->assertFalse( $this->manager->isIpAllowed( '10.0.0.1' ) ); // 5. Disable maintenance mode (simulates cms:maintenance:disable) - $disabled = $this->Manager->disable(); + $disabled = $this->manager->disable(); $this->assertTrue( $disabled ); - $this->assertFalse( $this->Manager->isEnabled() ); - $this->assertNull( $this->Manager->getStatus() ); + $this->assertFalse( $this->manager->isEnabled() ); + $this->assertNull( $this->manager->getStatus() ); } /** @@ -80,11 +80,11 @@ public function testEnableWithDefaults(): void { // Enable with just a message (simulates: cms:maintenance:enable -m "Message") $message = 'Quick maintenance'; - $this->Manager->enable( $message ); + $this->manager->enable( $message ); - $this->assertTrue( $this->Manager->isEnabled() ); + $this->assertTrue( $this->manager->isEnabled() ); - $status = $this->Manager->getStatus(); + $status = $this->manager->getStatus(); $this->assertEquals( $message, $status['message'] ); $this->assertContains( '127.0.0.1', $status['allowed_ips'] ); $this->assertContains( '::1', $status['allowed_ips'] ); @@ -97,11 +97,11 @@ public function testEnableWithDefaults(): void public function testStatusWhenNotEnabled(): void { // Simulates: cms:maintenance:status (when disabled) - $this->assertFalse( $this->Manager->isEnabled() ); - $this->assertNull( $this->Manager->getStatus() ); + $this->assertFalse( $this->manager->isEnabled() ); + $this->assertNull( $this->manager->getStatus() ); // Default message should still be available - $message = $this->Manager->getMessage(); + $message = $this->manager->getMessage(); $this->assertIsString( $message ); $this->assertNotEmpty( $message ); } @@ -112,12 +112,12 @@ public function testStatusWhenNotEnabled(): void public function testDisableWhenAlreadyDisabled(): void { // Simulates: cms:maintenance:disable (when already disabled) - $this->assertFalse( $this->Manager->isEnabled() ); + $this->assertFalse( $this->manager->isEnabled() ); - $result = $this->Manager->disable(); + $result = $this->manager->disable(); $this->assertTrue( $result ); // Should succeed - $this->assertFalse( $this->Manager->isEnabled() ); + $this->assertFalse( $this->manager->isEnabled() ); } /** @@ -126,23 +126,23 @@ public function testDisableWhenAlreadyDisabled(): void public function testMultipleEnableDisableCycles(): void { // Cycle 1 - $this->Manager->enable( 'Cycle 1' ); - $this->assertTrue( $this->Manager->isEnabled() ); - $this->Manager->disable(); - $this->assertFalse( $this->Manager->isEnabled() ); + $this->manager->enable( 'Cycle 1' ); + $this->assertTrue( $this->manager->isEnabled() ); + $this->manager->disable(); + $this->assertFalse( $this->manager->isEnabled() ); // Cycle 2 - $this->Manager->enable( 'Cycle 2', ['10.0.0.1'], 900 ); - $this->assertTrue( $this->Manager->isEnabled() ); - $this->assertEquals( 'Cycle 2', $this->Manager->getMessage() ); - $this->Manager->disable(); - $this->assertFalse( $this->Manager->isEnabled() ); + $this->manager->enable( 'Cycle 2', ['10.0.0.1'], 900 ); + $this->assertTrue( $this->manager->isEnabled() ); + $this->assertEquals( 'Cycle 2', $this->manager->getMessage() ); + $this->manager->disable(); + $this->assertFalse( $this->manager->isEnabled() ); // Cycle 3 - $this->Manager->enable( 'Cycle 3' ); - $this->assertTrue( $this->Manager->isEnabled() ); - $this->Manager->disable(); - $this->assertFalse( $this->Manager->isEnabled() ); + $this->manager->enable( 'Cycle 3' ); + $this->assertTrue( $this->manager->isEnabled() ); + $this->manager->disable(); + $this->assertFalse( $this->manager->isEnabled() ); } /** @@ -152,10 +152,10 @@ public function testFilePersistenceAcrossInstances(): void { // Enable with first instance $message = 'Persistent maintenance'; - $this->Manager->enable( $message, ['192.168.1.1'], 3600 ); + $this->manager->enable( $message, ['192.168.1.1'], 3600 ); // Create new instance (simulates new command invocation) - $newManager = new MaintenanceManager( $this->BasePath ); + $newManager = new MaintenanceManager( $this->basePath ); // Should still be enabled $this->assertTrue( $newManager->isEnabled() ); @@ -170,7 +170,7 @@ public function testFilePersistenceAcrossInstances(): void $newManager->disable(); // Create another instance to verify it's disabled - $thirdManager = new MaintenanceManager( $this->BasePath ); + $thirdManager = new MaintenanceManager( $this->basePath ); $this->assertFalse( $thirdManager->isEnabled() ); } @@ -180,16 +180,16 @@ public function testFilePersistenceAcrossInstances(): void public function testUpdateMaintenanceMode(): void { // Initial enable - $this->Manager->enable( 'Initial message', ['127.0.0.1'], 1800 ); + $this->manager->enable( 'Initial message', ['127.0.0.1'], 1800 ); - $status1 = $this->Manager->getStatus(); + $status1 = $this->manager->getStatus(); $this->assertEquals( 'Initial message', $status1['message'] ); $this->assertEquals( 1800, $status1['retry_after'] ); // Update by re-enabling with different settings - $this->Manager->enable( 'Updated message', ['127.0.0.1', '10.0.0.0/8'], 3600 ); + $this->manager->enable( 'Updated message', ['127.0.0.1', '10.0.0.0/8'], 3600 ); - $status2 = $this->Manager->getStatus(); + $status2 = $this->manager->getStatus(); $this->assertEquals( 'Updated message', $status2['message'] ); $this->assertEquals( 3600, $status2['retry_after'] ); $this->assertContains( '10.0.0.0/8', $status2['allowed_ips'] ); @@ -208,25 +208,25 @@ public function testIpWhitelistVariousFormats(): void '203.0.113.5', // Another single IP ]; - $this->Manager->enable( 'Test IPs', $allowedIps ); + $this->manager->enable( 'Test IPs', $allowedIps ); // Test single IPs - $this->assertTrue( $this->Manager->isIpAllowed( '192.168.1.100' ) ); - $this->assertTrue( $this->Manager->isIpAllowed( '203.0.113.5' ) ); + $this->assertTrue( $this->manager->isIpAllowed( '192.168.1.100' ) ); + $this->assertTrue( $this->manager->isIpAllowed( '203.0.113.5' ) ); // Test /8 CIDR - $this->assertTrue( $this->Manager->isIpAllowed( '10.0.0.1' ) ); - $this->assertTrue( $this->Manager->isIpAllowed( '10.255.255.254' ) ); - $this->assertFalse( $this->Manager->isIpAllowed( '11.0.0.1' ) ); + $this->assertTrue( $this->manager->isIpAllowed( '10.0.0.1' ) ); + $this->assertTrue( $this->manager->isIpAllowed( '10.255.255.254' ) ); + $this->assertFalse( $this->manager->isIpAllowed( '11.0.0.1' ) ); // Test /16 CIDR - $this->assertTrue( $this->Manager->isIpAllowed( '172.16.0.1' ) ); - $this->assertTrue( $this->Manager->isIpAllowed( '172.16.255.254' ) ); - $this->assertFalse( $this->Manager->isIpAllowed( '172.17.0.1' ) ); + $this->assertTrue( $this->manager->isIpAllowed( '172.16.0.1' ) ); + $this->assertTrue( $this->manager->isIpAllowed( '172.16.255.254' ) ); + $this->assertFalse( $this->manager->isIpAllowed( '172.17.0.1' ) ); // Test /24 CIDR - $this->assertTrue( $this->Manager->isIpAllowed( '192.168.100.1' ) ); - $this->assertTrue( $this->Manager->isIpAllowed( '192.168.100.254' ) ); - $this->assertFalse( $this->Manager->isIpAllowed( '192.168.101.1' ) ); + $this->assertTrue( $this->manager->isIpAllowed( '192.168.100.1' ) ); + $this->assertTrue( $this->manager->isIpAllowed( '192.168.100.254' ) ); + $this->assertFalse( $this->manager->isIpAllowed( '192.168.101.1' ) ); } } diff --git a/tests/Cms/Maintenance/MaintenanceConfigTest.php b/tests/Cms/Maintenance/MaintenanceConfigTest.php index dc4fcd3..a09f886 100644 --- a/tests/Cms/Maintenance/MaintenanceConfigTest.php +++ b/tests/Cms/Maintenance/MaintenanceConfigTest.php @@ -12,12 +12,12 @@ */ class MaintenanceConfigTest extends TestCase { - private $Root; + private $root; protected function setUp(): void { parent::setUp(); - $this->Root = vfsStream::setup( 'test' ); + $this->root = vfsStream::setup( 'test' ); } /** @@ -56,7 +56,7 @@ public function testConfigFromSettingsSource(): void YAML; vfsStream::newFile( 'config.yaml' ) - ->at( $this->Root ) + ->at( $this->root ) ->setContent( $configContent ); $settings = new Yaml( vfsStream::url( 'test/config.yaml' ) ); @@ -83,7 +83,7 @@ public function testFromSettingsFactory(): void YAML; vfsStream::newFile( 'config.yaml' ) - ->at( $this->Root ) + ->at( $this->root ) ->setContent( $configContent ); $settings = new Yaml( vfsStream::url( 'test/config.yaml' ) ); @@ -105,7 +105,7 @@ public function testAllowedIpsAsString(): void YAML; vfsStream::newFile( 'config.yaml' ) - ->at( $this->Root ) + ->at( $this->root ) ->setContent( $configContent ); $settings = new Yaml( vfsStream::url( 'test/config.yaml' ) ); @@ -129,7 +129,7 @@ public function testPartialConfigUsesDefaults(): void YAML; vfsStream::newFile( 'config.yaml' ) - ->at( $this->Root ) + ->at( $this->root ) ->setContent( $configContent ); $settings = new Yaml( vfsStream::url( 'test/config.yaml' ) ); @@ -153,7 +153,7 @@ public function testEmptyConfigUsesDefaults(): void YAML; vfsStream::newFile( 'config.yaml' ) - ->at( $this->Root ) + ->at( $this->root ) ->setContent( $configContent ); $settings = new Yaml( vfsStream::url( 'test/config.yaml' ) ); diff --git a/tests/Cms/Maintenance/MaintenanceFilterTest.php b/tests/Cms/Maintenance/MaintenanceFilterTest.php index cd9def5..9599f3e 100644 --- a/tests/Cms/Maintenance/MaintenanceFilterTest.php +++ b/tests/Cms/Maintenance/MaintenanceFilterTest.php @@ -13,18 +13,18 @@ */ class MaintenanceFilterTest extends TestCase { - private $Root; - private $BasePath; - private MaintenanceManager $Manager; + private $root; + private $basePath; + private MaintenanceManager $manager; protected function setUp(): void { parent::setUp(); // Create virtual filesystem - $this->Root = vfsStream::setup( 'test' ); - $this->BasePath = vfsStream::url( 'test' ); - $this->Manager = new MaintenanceManager( $this->BasePath ); + $this->root = vfsStream::setup( 'test' ); + $this->basePath = vfsStream::url( 'test' ); + $this->manager = new MaintenanceManager( $this->basePath ); // Clear any server variables $_SERVER = []; @@ -41,7 +41,7 @@ protected function tearDown(): void */ public function testFilterAllowsWhenMaintenanceDisabled(): void { - $filter = new MaintenanceFilter( $this->Manager ); + $filter = new MaintenanceFilter( $this->manager ); $route = $this->createMockRoute(); $result = $filter->pre( $route ); @@ -54,11 +54,11 @@ public function testFilterAllowsWhenMaintenanceDisabled(): void */ public function testFilterBlocksWhenMaintenanceEnabled(): void { - $this->Manager->enable( 'Test maintenance' ); + $this->manager->enable( 'Test maintenance' ); $_SERVER['REMOTE_ADDR'] = '203.0.113.5'; // Not in allowed list - $filter = new MaintenanceFilter( $this->Manager ); + $filter = new MaintenanceFilter( $this->manager ); $route = $this->createMockRoute(); $result = $filter->pre( $route ); @@ -74,11 +74,11 @@ public function testFilterBlocksWhenMaintenanceEnabled(): void public function testFilterAllowsWhitelistedIps(): void { $allowedIp = '192.168.1.100'; - $this->Manager->enable( 'Test', [$allowedIp] ); + $this->manager->enable( 'Test', [$allowedIp] ); $_SERVER['REMOTE_ADDR'] = $allowedIp; - $filter = new MaintenanceFilter( $this->Manager ); + $filter = new MaintenanceFilter( $this->manager ); $route = $this->createMockRoute(); $result = $filter->pre( $route ); @@ -91,11 +91,11 @@ public function testFilterAllowsWhitelistedIps(): void */ public function testFilterAllowsLocalhost(): void { - $this->Manager->enable( 'Test' ); // Default includes 127.0.0.1 + $this->manager->enable( 'Test' ); // Default includes 127.0.0.1 $_SERVER['REMOTE_ADDR'] = '127.0.0.1'; - $filter = new MaintenanceFilter( $this->Manager ); + $filter = new MaintenanceFilter( $this->manager ); $route = $this->createMockRoute(); $result = $filter->pre( $route ); @@ -109,11 +109,11 @@ public function testFilterAllowsLocalhost(): void public function testFilterMaintenancePageContainsMessage(): void { $customMessage = 'Custom maintenance message'; - $this->Manager->enable( $customMessage ); + $this->manager->enable( $customMessage ); $_SERVER['REMOTE_ADDR'] = '203.0.113.5'; - $filter = new MaintenanceFilter( $this->Manager ); + $filter = new MaintenanceFilter( $this->manager ); $route = $this->createMockRoute(); $result = $filter->pre( $route ); @@ -127,12 +127,12 @@ public function testFilterMaintenancePageContainsMessage(): void public function testFilterRespectsXForwardedFor(): void { $allowedIp = '192.168.1.50'; - $this->Manager->enable( 'Test', [$allowedIp] ); + $this->manager->enable( 'Test', [$allowedIp] ); $_SERVER['REMOTE_ADDR'] = '10.0.0.1'; // Proxy IP $_SERVER['HTTP_X_FORWARDED_FOR'] = $allowedIp; // Real client IP - $filter = new MaintenanceFilter( $this->Manager ); + $filter = new MaintenanceFilter( $this->manager ); $route = $this->createMockRoute(); $result = $filter->pre( $route ); @@ -146,12 +146,12 @@ public function testFilterRespectsXForwardedFor(): void public function testFilterRespectsXRealIp(): void { $allowedIp = '192.168.1.75'; - $this->Manager->enable( 'Test', [$allowedIp] ); + $this->manager->enable( 'Test', [$allowedIp] ); $_SERVER['REMOTE_ADDR'] = '10.0.0.1'; $_SERVER['HTTP_X_REAL_IP'] = $allowedIp; - $filter = new MaintenanceFilter( $this->Manager ); + $filter = new MaintenanceFilter( $this->manager ); $route = $this->createMockRoute(); $result = $filter->pre( $route ); @@ -167,13 +167,13 @@ public function testFilterWithCustomView(): void $customViewContent = 'Custom Maintenance Page'; $customView = vfsStream::newFile( 'custom-maintenance.php' ) - ->at( $this->Root ) + ->at( $this->root ) ->setContent( $customViewContent ); - $this->Manager->enable( 'Test' ); + $this->manager->enable( 'Test' ); $_SERVER['REMOTE_ADDR'] = '203.0.113.5'; - $filter = new MaintenanceFilter( $this->Manager, $customView->url() ); + $filter = new MaintenanceFilter( $this->manager, $customView->url() ); $route = $this->createMockRoute(); $result = $filter->pre( $route ); @@ -186,10 +186,10 @@ public function testFilterWithCustomView(): void */ public function testDefaultMaintenancePageStructure(): void { - $this->Manager->enable( 'Test message', [], 3600 ); + $this->manager->enable( 'Test message', [], 3600 ); $_SERVER['REMOTE_ADDR'] = '203.0.113.5'; - $filter = new MaintenanceFilter( $this->Manager ); + $filter = new MaintenanceFilter( $this->manager ); $route = $this->createMockRoute(); $result = $filter->pre( $route ); @@ -209,10 +209,10 @@ public function testDefaultMaintenancePageStructure(): void */ public function testMaintenancePageIncludesMetaTags(): void { - $this->Manager->enable( 'Test' ); + $this->manager->enable( 'Test' ); $_SERVER['REMOTE_ADDR'] = '203.0.113.5'; - $filter = new MaintenanceFilter( $this->Manager ); + $filter = new MaintenanceFilter( $this->manager ); $route = $this->createMockRoute(); $result = $filter->pre( $route ); @@ -227,10 +227,10 @@ public function testMaintenancePageIncludesMetaTags(): void */ public function testMaintenancePageShowsRetryEstimate(): void { - $this->Manager->enable( 'Test', [], 3600 ); // 1 hour + $this->manager->enable( 'Test', [], 3600 ); // 1 hour $_SERVER['REMOTE_ADDR'] = '203.0.113.5'; - $filter = new MaintenanceFilter( $this->Manager ); + $filter = new MaintenanceFilter( $this->manager ); $route = $this->createMockRoute(); $result = $filter->pre( $route ); diff --git a/tests/Cms/Maintenance/MaintenanceManagerTest.php b/tests/Cms/Maintenance/MaintenanceManagerTest.php index 2a8063e..0212224 100644 --- a/tests/Cms/Maintenance/MaintenanceManagerTest.php +++ b/tests/Cms/Maintenance/MaintenanceManagerTest.php @@ -11,18 +11,18 @@ */ class MaintenanceManagerTest extends TestCase { - private $Root; - private $BasePath; - private MaintenanceManager $Manager; + private $root; + private $basePath; + private MaintenanceManager $manager; protected function setUp(): void { parent::setUp(); // Create virtual filesystem - $this->Root = vfsStream::setup( 'test' ); - $this->BasePath = vfsStream::url( 'test' ); - $this->Manager = new MaintenanceManager( $this->BasePath ); + $this->root = vfsStream::setup( 'test' ); + $this->basePath = vfsStream::url( 'test' ); + $this->manager = new MaintenanceManager( $this->basePath ); } protected function tearDown(): void @@ -35,8 +35,8 @@ protected function tearDown(): void */ public function testMaintenanceModeDisabledByDefault(): void { - $this->assertFalse( $this->Manager->isEnabled() ); - $this->assertNull( $this->Manager->getStatus() ); + $this->assertFalse( $this->manager->isEnabled() ); + $this->assertNull( $this->manager->getStatus() ); } /** @@ -48,12 +48,12 @@ public function testEnableMaintenanceMode(): void $allowedIps = ['192.168.1.1', '10.0.0.0/8']; $retryAfter = 3600; - $result = $this->Manager->enable( $message, $allowedIps, $retryAfter, 'testuser' ); + $result = $this->manager->enable( $message, $allowedIps, $retryAfter, 'testuser' ); $this->assertTrue( $result ); - $this->assertTrue( $this->Manager->isEnabled() ); + $this->assertTrue( $this->manager->isEnabled() ); - $status = $this->Manager->getStatus(); + $status = $this->manager->getStatus(); $this->assertIsArray( $status ); $this->assertEquals( $message, $status['message'] ); $this->assertEquals( $allowedIps, $status['allowed_ips'] ); @@ -67,9 +67,9 @@ public function testEnableMaintenanceMode(): void */ public function testEnableWithDefaultAllowedIps(): void { - $this->Manager->enable( 'Test message' ); + $this->manager->enable( 'Test message' ); - $status = $this->Manager->getStatus(); + $status = $this->manager->getStatus(); $this->assertContains( '127.0.0.1', $status['allowed_ips'] ); $this->assertContains( '::1', $status['allowed_ips'] ); } @@ -80,15 +80,15 @@ public function testEnableWithDefaultAllowedIps(): void public function testDisableMaintenanceMode(): void { // First enable - $this->Manager->enable( 'Test' ); - $this->assertTrue( $this->Manager->isEnabled() ); + $this->manager->enable( 'Test' ); + $this->assertTrue( $this->manager->isEnabled() ); // Then disable - $result = $this->Manager->disable(); + $result = $this->manager->disable(); $this->assertTrue( $result ); - $this->assertFalse( $this->Manager->isEnabled() ); - $this->assertNull( $this->Manager->getStatus() ); + $this->assertFalse( $this->manager->isEnabled() ); + $this->assertNull( $this->manager->getStatus() ); } /** @@ -96,7 +96,7 @@ public function testDisableMaintenanceMode(): void */ public function testDisableWhenAlreadyDisabled(): void { - $result = $this->Manager->disable(); + $result = $this->manager->disable(); $this->assertTrue( $result ); } @@ -106,9 +106,9 @@ public function testDisableWhenAlreadyDisabled(): void public function testGetMessage(): void { $message = 'Custom maintenance message'; - $this->Manager->enable( $message ); + $this->manager->enable( $message ); - $this->assertEquals( $message, $this->Manager->getMessage() ); + $this->assertEquals( $message, $this->manager->getMessage() ); } /** @@ -116,7 +116,7 @@ public function testGetMessage(): void */ public function testGetMessageWhenDisabled(): void { - $message = $this->Manager->getMessage(); + $message = $this->manager->getMessage(); $this->assertIsString( $message ); $this->assertStringContainsString( 'maintenance', strtolower( $message ) ); } @@ -127,9 +127,9 @@ public function testGetMessageWhenDisabled(): void public function testGetRetryAfter(): void { $retryAfter = 7200; - $this->Manager->enable( 'Test', [], $retryAfter ); + $this->manager->enable( 'Test', [], $retryAfter ); - $this->assertEquals( $retryAfter, $this->Manager->getRetryAfter() ); + $this->assertEquals( $retryAfter, $this->manager->getRetryAfter() ); } /** @@ -137,7 +137,7 @@ public function testGetRetryAfter(): void */ public function testGetRetryAfterWhenDisabled(): void { - $this->assertNull( $this->Manager->getRetryAfter() ); + $this->assertNull( $this->manager->getRetryAfter() ); } /** @@ -146,11 +146,11 @@ public function testGetRetryAfterWhenDisabled(): void public function testIsIpAllowedExactMatch(): void { $allowedIps = ['192.168.1.100', '10.0.0.5']; - $this->Manager->enable( 'Test', $allowedIps ); + $this->manager->enable( 'Test', $allowedIps ); - $this->assertTrue( $this->Manager->isIpAllowed( '192.168.1.100' ) ); - $this->assertTrue( $this->Manager->isIpAllowed( '10.0.0.5' ) ); - $this->assertFalse( $this->Manager->isIpAllowed( '192.168.1.101' ) ); + $this->assertTrue( $this->manager->isIpAllowed( '192.168.1.100' ) ); + $this->assertTrue( $this->manager->isIpAllowed( '10.0.0.5' ) ); + $this->assertFalse( $this->manager->isIpAllowed( '192.168.1.101' ) ); } /** @@ -159,16 +159,16 @@ public function testIsIpAllowedExactMatch(): void public function testIsIpAllowedCidr(): void { $allowedIps = ['192.168.1.0/24']; - $this->Manager->enable( 'Test', $allowedIps ); + $this->manager->enable( 'Test', $allowedIps ); // Should allow entire subnet - $this->assertTrue( $this->Manager->isIpAllowed( '192.168.1.1' ) ); - $this->assertTrue( $this->Manager->isIpAllowed( '192.168.1.100' ) ); - $this->assertTrue( $this->Manager->isIpAllowed( '192.168.1.254' ) ); + $this->assertTrue( $this->manager->isIpAllowed( '192.168.1.1' ) ); + $this->assertTrue( $this->manager->isIpAllowed( '192.168.1.100' ) ); + $this->assertTrue( $this->manager->isIpAllowed( '192.168.1.254' ) ); // Should not allow outside subnet - $this->assertFalse( $this->Manager->isIpAllowed( '192.168.2.1' ) ); - $this->assertFalse( $this->Manager->isIpAllowed( '10.0.0.1' ) ); + $this->assertFalse( $this->manager->isIpAllowed( '192.168.2.1' ) ); + $this->assertFalse( $this->manager->isIpAllowed( '10.0.0.1' ) ); } /** @@ -177,8 +177,8 @@ public function testIsIpAllowedCidr(): void public function testIsIpAllowedWhenDisabled(): void { // All IPs should be allowed when maintenance is disabled - $this->assertTrue( $this->Manager->isIpAllowed( '192.168.1.1' ) ); - $this->assertTrue( $this->Manager->isIpAllowed( '10.0.0.1' ) ); + $this->assertTrue( $this->manager->isIpAllowed( '192.168.1.1' ) ); + $this->assertTrue( $this->manager->isIpAllowed( '10.0.0.1' ) ); } /** @@ -186,10 +186,10 @@ public function testIsIpAllowedWhenDisabled(): void */ public function testLocalhostAllowedByDefault(): void { - $this->Manager->enable( 'Test' ); // No explicit IPs + $this->manager->enable( 'Test' ); // No explicit IPs - $this->assertTrue( $this->Manager->isIpAllowed( '127.0.0.1' ) ); - $this->assertTrue( $this->Manager->isIpAllowed( '::1' ) ); + $this->assertTrue( $this->manager->isIpAllowed( '127.0.0.1' ) ); + $this->assertTrue( $this->manager->isIpAllowed( '::1' ) ); } /** @@ -198,11 +198,11 @@ public function testLocalhostAllowedByDefault(): void public function testCidrSlash8Network(): void { $allowedIps = ['10.0.0.0/8']; - $this->Manager->enable( 'Test', $allowedIps ); + $this->manager->enable( 'Test', $allowedIps ); - $this->assertTrue( $this->Manager->isIpAllowed( '10.0.0.1' ) ); - $this->assertTrue( $this->Manager->isIpAllowed( '10.255.255.254' ) ); - $this->assertFalse( $this->Manager->isIpAllowed( '11.0.0.1' ) ); + $this->assertTrue( $this->manager->isIpAllowed( '10.0.0.1' ) ); + $this->assertTrue( $this->manager->isIpAllowed( '10.255.255.254' ) ); + $this->assertFalse( $this->manager->isIpAllowed( '11.0.0.1' ) ); } /** @@ -211,11 +211,11 @@ public function testCidrSlash8Network(): void public function testCidrSlash16Network(): void { $allowedIps = ['172.16.0.0/16']; - $this->Manager->enable( 'Test', $allowedIps ); + $this->manager->enable( 'Test', $allowedIps ); - $this->assertTrue( $this->Manager->isIpAllowed( '172.16.0.1' ) ); - $this->assertTrue( $this->Manager->isIpAllowed( '172.16.255.254' ) ); - $this->assertFalse( $this->Manager->isIpAllowed( '172.17.0.1' ) ); + $this->assertTrue( $this->manager->isIpAllowed( '172.16.0.1' ) ); + $this->assertTrue( $this->manager->isIpAllowed( '172.16.255.254' ) ); + $this->assertFalse( $this->manager->isIpAllowed( '172.17.0.1' ) ); } /** @@ -223,9 +223,9 @@ public function testCidrSlash16Network(): void */ public function testMaintenanceFileCreated(): void { - $this->Manager->enable( 'Test' ); + $this->manager->enable( 'Test' ); - $filePath = $this->BasePath . '/.maintenance.json'; + $filePath = $this->basePath . '/.maintenance.json'; $this->assertTrue( file_exists( $filePath ) ); $contents = file_get_contents( $filePath ); @@ -240,11 +240,11 @@ public function testMaintenanceFileCreated(): void */ public function testMaintenanceFileDeletedWhenDisabled(): void { - $this->Manager->enable( 'Test' ); - $filePath = $this->BasePath . '/.maintenance.json'; + $this->manager->enable( 'Test' ); + $filePath = $this->basePath . '/.maintenance.json'; $this->assertTrue( file_exists( $filePath ) ); - $this->Manager->disable(); + $this->manager->disable(); $this->assertFalse( file_exists( $filePath ) ); } @@ -257,9 +257,9 @@ public function testMaintenanceFileJsonFormat(): void $allowedIps = ['192.168.1.1']; $retryAfter = 1800; - $this->Manager->enable( $message, $allowedIps, $retryAfter, 'admin' ); + $this->manager->enable( $message, $allowedIps, $retryAfter, 'admin' ); - $filePath = $this->BasePath . '/.maintenance.json'; + $filePath = $this->basePath . '/.maintenance.json'; $contents = file_get_contents( $filePath ); $data = json_decode( $contents, true ); diff --git a/tests/Cms/Repositories/DatabaseCategoryRepositoryTest.php b/tests/Cms/Repositories/DatabaseCategoryRepositoryTest.php index 0bb72a7..c1651df 100644 --- a/tests/Cms/Repositories/DatabaseCategoryRepositoryTest.php +++ b/tests/Cms/Repositories/DatabaseCategoryRepositoryTest.php @@ -38,7 +38,7 @@ public function __construct( PDO $PDO ) { // Skip parent constructor and directly assign PDO $reflection = new \ReflectionClass( DatabaseCategoryRepository::class ); - $property = $reflection->getProperty( '_PDO' ); + $property = $reflection->getProperty( '_pdo' ); $property->setAccessible( true ); $property->setValue( $this, $PDO ); } diff --git a/tests/Cms/Repositories/DatabasePostRepositoryTest.php b/tests/Cms/Repositories/DatabasePostRepositoryTest.php index c380d4c..9737afc 100644 --- a/tests/Cms/Repositories/DatabasePostRepositoryTest.php +++ b/tests/Cms/Repositories/DatabasePostRepositoryTest.php @@ -40,7 +40,7 @@ public function __construct( PDO $PDO ) { // Skip parent constructor and directly assign PDO $reflection = new \ReflectionClass( DatabasePostRepository::class ); - $property = $reflection->getProperty( '_PDO' ); + $property = $reflection->getProperty( '_pdo' ); $property->setAccessible( true ); $property->setValue( $this, $PDO ); } diff --git a/tests/Cms/Repositories/DatabaseTagRepositoryTest.php b/tests/Cms/Repositories/DatabaseTagRepositoryTest.php index da9857a..3f13745 100644 --- a/tests/Cms/Repositories/DatabaseTagRepositoryTest.php +++ b/tests/Cms/Repositories/DatabaseTagRepositoryTest.php @@ -38,7 +38,7 @@ public function __construct( PDO $PDO ) { // Skip parent constructor and directly assign PDO $reflection = new \ReflectionClass( DatabaseTagRepository::class ); - $property = $reflection->getProperty( '_PDO' ); + $property = $reflection->getProperty( '_pdo' ); $property->setAccessible( true ); $property->setValue( $this, $PDO ); } diff --git a/tests/Cms/Repositories/DatabaseUserRepositoryTest.php b/tests/Cms/Repositories/DatabaseUserRepositoryTest.php index da1b0ff..16a2088 100644 --- a/tests/Cms/Repositories/DatabaseUserRepositoryTest.php +++ b/tests/Cms/Repositories/DatabaseUserRepositoryTest.php @@ -5,6 +5,7 @@ use PHPUnit\Framework\TestCase; use Neuron\Cms\Repositories\DatabaseUserRepository; use Neuron\Cms\Models\User; +use Neuron\Data\Setting\SettingManager; use PDO; use DateTimeImmutable; @@ -28,11 +29,17 @@ protected function setUp(): void 'name' => $this->dbPath ]; - $this->repository = new DatabaseUserRepository( $config ); + // Mock SettingManager + $settings = $this->createMock( SettingManager::class ); + $settings->method( 'getSection' ) + ->with( 'database' ) + ->willReturn( $config ); + + $this->repository = new DatabaseUserRepository( $settings ); // Get PDO connection via reflection to create table $reflection = new \ReflectionClass( $this->repository ); - $property = $reflection->getProperty( '_PDO' ); + $property = $reflection->getProperty( '_pdo' ); $property->setAccessible( true ); $this->pdo = $property->getValue( $this->repository ); @@ -71,7 +78,12 @@ public function testConstructorWithSqlite(): void 'name' => ':memory:' ]; - $repository = new DatabaseUserRepository( $config ); + $settings = $this->createMock( SettingManager::class ); + $settings->method( 'getSection' ) + ->with( 'database' ) + ->willReturn( $config ); + + $repository = new DatabaseUserRepository( $settings ); $this->assertInstanceOf( DatabaseUserRepository::class, $repository ); } @@ -89,7 +101,12 @@ public function testConstructorWithMysql(): void 'charset' => 'utf8mb4' ]; - new DatabaseUserRepository( $config ); + $settings = $this->createMock( SettingManager::class ); + $settings->method( 'getSection' ) + ->with( 'database' ) + ->willReturn( $config ); + + new DatabaseUserRepository( $settings ); } public function testConstructorWithInvalidAdapter(): void @@ -102,7 +119,12 @@ public function testConstructorWithInvalidAdapter(): void 'name' => 'test.db' ]; - new DatabaseUserRepository( $config ); + $settings = $this->createMock( SettingManager::class ); + $settings->method( 'getSection' ) + ->with( 'database' ) + ->willReturn( $config ); + + new DatabaseUserRepository( $settings ); } public function testFindById(): void diff --git a/tests/Cms/Services/Post/CreatorTest.php b/tests/Cms/Services/Post/CreatorTest.php new file mode 100644 index 0000000..f936088 --- /dev/null +++ b/tests/Cms/Services/Post/CreatorTest.php @@ -0,0 +1,306 @@ +_mockPostRepository = $this->createMock( IPostRepository::class ); + $this->_mockCategoryRepository = $this->createMock( ICategoryRepository::class ); + $this->_mockTagResolver = $this->createMock( TagResolver::class ); + + $this->_creator = new Creator( + $this->_mockPostRepository, + $this->_mockCategoryRepository, + $this->_mockTagResolver + ); + } + + public function testCreatesPostWithRequiredFields(): void + { + $this->_mockCategoryRepository + ->method( 'findByIds' ) + ->willReturn( [] ); + + $this->_mockTagResolver + ->method( 'resolveFromString' ) + ->willReturn( [] ); + + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'create' ) + ->with( $this->callback( function( Post $post ) { + return $post->getTitle() === 'Test Post' + && $post->getBody() === 'Test body content' + && $post->getAuthorId() === 1 + && $post->getStatus() === Post::STATUS_DRAFT + && $post->getCreatedAt() instanceof DateTimeImmutable; + } ) ) + ->willReturnArgument( 0 ); + + $result = $this->_creator->create( + 'Test Post', + 'Test body content', + 1, + Post::STATUS_DRAFT + ); + + $this->assertEquals( 'Test Post', $result->getTitle() ); + $this->assertEquals( 'Test body content', $result->getBody() ); + } + + public function testGeneratesSlugWhenNotProvided(): void + { + $this->_mockCategoryRepository + ->method( 'findByIds' ) + ->willReturn( [] ); + + $this->_mockTagResolver + ->method( 'resolveFromString' ) + ->willReturn( [] ); + + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'create' ) + ->with( $this->callback( function( Post $post ) { + return $post->getSlug() === 'test-post-title'; + } ) ) + ->willReturnArgument( 0 ); + + $result = $this->_creator->create( + 'Test Post Title', + 'Body', + 1, + Post::STATUS_DRAFT + ); + + $this->assertEquals( 'test-post-title', $result->getSlug() ); + } + + public function testUsesCustomSlugWhenProvided(): void + { + $this->_mockCategoryRepository + ->method( 'findByIds' ) + ->willReturn( [] ); + + $this->_mockTagResolver + ->method( 'resolveFromString' ) + ->willReturn( [] ); + + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'create' ) + ->with( $this->callback( function( Post $post ) { + return $post->getSlug() === 'custom-slug'; + } ) ) + ->willReturnArgument( 0 ); + + $result = $this->_creator->create( + 'Test Post', + 'Body', + 1, + Post::STATUS_DRAFT, + 'custom-slug' + ); + + $this->assertEquals( 'custom-slug', $result->getSlug() ); + } + + public function testSetsPublishedDateForPublishedPosts(): void + { + $this->_mockCategoryRepository + ->method( 'findByIds' ) + ->willReturn( [] ); + + $this->_mockTagResolver + ->method( 'resolveFromString' ) + ->willReturn( [] ); + + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'create' ) + ->with( $this->callback( function( Post $post ) { + return $post->getStatus() === Post::STATUS_PUBLISHED + && $post->getPublishedAt() instanceof DateTimeImmutable; + } ) ) + ->willReturnArgument( 0 ); + + $result = $this->_creator->create( + 'Published Post', + 'Body', + 1, + Post::STATUS_PUBLISHED + ); + + $this->assertInstanceOf( DateTimeImmutable::class, $result->getPublishedAt() ); + } + + public function testDoesNotSetPublishedDateForDraftPosts(): void + { + $this->_mockCategoryRepository + ->method( 'findByIds' ) + ->willReturn( [] ); + + $this->_mockTagResolver + ->method( 'resolveFromString' ) + ->willReturn( [] ); + + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'create' ) + ->with( $this->callback( function( Post $post ) { + return $post->getStatus() === Post::STATUS_DRAFT + && $post->getPublishedAt() === null; + } ) ) + ->willReturnArgument( 0 ); + + $result = $this->_creator->create( + 'Draft Post', + 'Body', + 1, + Post::STATUS_DRAFT + ); + + $this->assertNull( $result->getPublishedAt() ); + } + + public function testAttachesCategoriesToPost(): void + { + $category1 = new Category(); + $category1->setId( 1 ); + $category1->setName( 'Technology' ); + + $category2 = new Category(); + $category2->setId( 2 ); + $category2->setName( 'Programming' ); + + $this->_mockCategoryRepository + ->expects( $this->once() ) + ->method( 'findByIds' ) + ->with( [ 1, 2 ] ) + ->willReturn( [ $category1, $category2 ] ); + + $this->_mockTagResolver + ->method( 'resolveFromString' ) + ->willReturn( [] ); + + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'create' ) + ->with( $this->callback( function( Post $post ) { + $categories = $post->getCategories(); + return count( $categories ) === 2 + && $categories[0]->getName() === 'Technology' + && $categories[1]->getName() === 'Programming'; + } ) ) + ->willReturnArgument( 0 ); + + $result = $this->_creator->create( + 'Test Post', + 'Body', + 1, + Post::STATUS_DRAFT, + null, + null, + null, + [ 1, 2 ] + ); + + $this->assertCount( 2, $result->getCategories() ); + } + + public function testResolvesTags(): void + { + $tag1 = new Tag(); + $tag1->setId( 1 ); + $tag1->setName( 'PHP' ); + + $tag2 = new Tag(); + $tag2->setId( 2 ); + $tag2->setName( 'Testing' ); + + $this->_mockCategoryRepository + ->method( 'findByIds' ) + ->willReturn( [] ); + + $this->_mockTagResolver + ->expects( $this->once() ) + ->method( 'resolveFromString' ) + ->with( 'PHP, Testing' ) + ->willReturn( [ $tag1, $tag2 ] ); + + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'create' ) + ->with( $this->callback( function( Post $post ) { + $tags = $post->getTags(); + return count( $tags ) === 2 + && $tags[0]->getName() === 'PHP' + && $tags[1]->getName() === 'Testing'; + } ) ) + ->willReturnArgument( 0 ); + + $result = $this->_creator->create( + 'Test Post', + 'Body', + 1, + Post::STATUS_DRAFT, + null, + null, + null, + [], + 'PHP, Testing' + ); + + $this->assertCount( 2, $result->getTags() ); + } + + public function testSetsOptionalFields(): void + { + $this->_mockCategoryRepository + ->method( 'findByIds' ) + ->willReturn( [] ); + + $this->_mockTagResolver + ->method( 'resolveFromString' ) + ->willReturn( [] ); + + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'create' ) + ->with( $this->callback( function( Post $post ) { + return $post->getExcerpt() === 'Test excerpt' + && $post->getFeaturedImage() === 'image.jpg'; + } ) ) + ->willReturnArgument( 0 ); + + $result = $this->_creator->create( + 'Test Post', + 'Body', + 1, + Post::STATUS_DRAFT, + null, + 'Test excerpt', + 'image.jpg' + ); + + $this->assertEquals( 'Test excerpt', $result->getExcerpt() ); + $this->assertEquals( 'image.jpg', $result->getFeaturedImage() ); + } +} diff --git a/tests/Cms/Services/Post/DeleterTest.php b/tests/Cms/Services/Post/DeleterTest.php new file mode 100644 index 0000000..4de0aa6 --- /dev/null +++ b/tests/Cms/Services/Post/DeleterTest.php @@ -0,0 +1,92 @@ +_mockPostRepository = $this->createMock( IPostRepository::class ); + $this->_deleter = new Deleter( $this->_mockPostRepository ); + } + + public function testDeletesPostWithId(): void + { + $post = new Post(); + $post->setId( 1 ); + + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'delete' ) + ->with( 1 ) + ->willReturn( true ); + + $result = $this->_deleter->delete( $post ); + + $this->assertTrue( $result ); + } + + public function testReturnsFalseWhenDeletingPostWithoutId(): void + { + $post = new Post(); + // Post has no ID set + + $this->_mockPostRepository + ->expects( $this->never() ) + ->method( 'delete' ); + + $result = $this->_deleter->delete( $post ); + + $this->assertFalse( $result ); + } + + public function testDeletesByIdDirectly(): void + { + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'delete' ) + ->with( 42 ) + ->willReturn( true ); + + $result = $this->_deleter->deleteById( 42 ); + + $this->assertTrue( $result ); + } + + public function testDeleteByIdReturnsFalseWhenRepositoryFails(): void + { + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'delete' ) + ->with( 999 ) + ->willReturn( false ); + + $result = $this->_deleter->deleteById( 999 ); + + $this->assertFalse( $result ); + } + + public function testDeleteReturnsFalseWhenRepositoryFails(): void + { + $post = new Post(); + $post->setId( 1 ); + + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'delete' ) + ->with( 1 ) + ->willReturn( false ); + + $result = $this->_deleter->delete( $post ); + + $this->assertFalse( $result ); + } +} diff --git a/tests/Cms/Services/Post/PublisherTest.php b/tests/Cms/Services/Post/PublisherTest.php new file mode 100644 index 0000000..c6b0c17 --- /dev/null +++ b/tests/Cms/Services/Post/PublisherTest.php @@ -0,0 +1,199 @@ +_mockPostRepository = $this->createMock( IPostRepository::class ); + $this->_publisher = new Publisher( $this->_mockPostRepository ); + } + + public function testPublishesDraftPost(): void + { + $post = new Post(); + $post->setId( 1 ); + $post->setStatus( Post::STATUS_DRAFT ); + + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'update' ) + ->with( $this->callback( function( Post $p ) { + return $p->getStatus() === Post::STATUS_PUBLISHED + && $p->getPublishedAt() instanceof DateTimeImmutable; + } ) ); + + $result = $this->_publisher->publish( $post ); + + $this->assertEquals( Post::STATUS_PUBLISHED, $result->getStatus() ); + $this->assertInstanceOf( DateTimeImmutable::class, $result->getPublishedAt() ); + } + + public function testThrowsExceptionWhenPublishingAlreadyPublishedPost(): void + { + $post = new Post(); + $post->setId( 1 ); + $post->setStatus( Post::STATUS_PUBLISHED ); + + $this->_mockPostRepository + ->expects( $this->never() ) + ->method( 'update' ); + + $this->expectException( \Exception::class ); + $this->expectExceptionMessage( 'Post is already published' ); + + $this->_publisher->publish( $post ); + } + + public function testUnpublishesPublishedPost(): void + { + $post = new Post(); + $post->setId( 1 ); + $post->setStatus( Post::STATUS_PUBLISHED ); + $post->setPublishedAt( new DateTimeImmutable() ); + + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'update' ) + ->with( $this->callback( function( Post $p ) { + return $p->getStatus() === Post::STATUS_DRAFT + && $p->getPublishedAt() === null; + } ) ); + + $result = $this->_publisher->unpublish( $post ); + + $this->assertEquals( Post::STATUS_DRAFT, $result->getStatus() ); + $this->assertNull( $result->getPublishedAt() ); + } + + public function testThrowsExceptionWhenUnpublishingNonPublishedPost(): void + { + $post = new Post(); + $post->setId( 1 ); + $post->setStatus( Post::STATUS_DRAFT ); + + $this->_mockPostRepository + ->expects( $this->never() ) + ->method( 'update' ); + + $this->expectException( \Exception::class ); + $this->expectExceptionMessage( 'Post is not currently published' ); + + $this->_publisher->unpublish( $post ); + } + + public function testSchedulesPostForFuturePublication(): void + { + $post = new Post(); + $post->setId( 1 ); + $post->setStatus( Post::STATUS_DRAFT ); + + $futureDate = ( new DateTimeImmutable() )->modify( '+1 day' ); + + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'update' ) + ->with( $this->callback( function( Post $p ) use ( $futureDate ) { + return $p->getStatus() === Post::STATUS_SCHEDULED + && $p->getPublishedAt() instanceof DateTimeImmutable + && $p->getPublishedAt()->getTimestamp() === $futureDate->getTimestamp(); + } ) ); + + $result = $this->_publisher->schedule( $post, $futureDate ); + + $this->assertEquals( Post::STATUS_SCHEDULED, $result->getStatus() ); + $this->assertEquals( $futureDate->getTimestamp(), $result->getPublishedAt()->getTimestamp() ); + } + + public function testThrowsExceptionWhenSchedulingWithPastDate(): void + { + $post = new Post(); + $post->setId( 1 ); + $post->setStatus( Post::STATUS_DRAFT ); + + $pastDate = ( new DateTimeImmutable() )->modify( '-1 day' ); + + $this->_mockPostRepository + ->expects( $this->never() ) + ->method( 'update' ); + + $this->expectException( \Exception::class ); + $this->expectExceptionMessage( 'Scheduled publish date must be in the future' ); + + $this->_publisher->schedule( $post, $pastDate ); + } + + public function testThrowsExceptionWhenSchedulingWithCurrentTime(): void + { + $post = new Post(); + $post->setId( 1 ); + $post->setStatus( Post::STATUS_DRAFT ); + + // Create a date that's exactly now (which is technically in the past when compared) + $now = new DateTimeImmutable(); + + $this->_mockPostRepository + ->expects( $this->never() ) + ->method( 'update' ); + + $this->expectException( \Exception::class ); + $this->expectExceptionMessage( 'Scheduled publish date must be in the future' ); + + $this->_publisher->schedule( $post, $now ); + } + + public function testReturnsUpdatedPostAfterPublishing(): void + { + $post = new Post(); + $post->setId( 1 ); + $post->setStatus( Post::STATUS_DRAFT ); + + $this->_mockPostRepository + ->method( 'update' ); + + $result = $this->_publisher->publish( $post ); + + $this->assertSame( $post, $result ); + } + + public function testReturnsUpdatedPostAfterUnpublishing(): void + { + $post = new Post(); + $post->setId( 1 ); + $post->setStatus( Post::STATUS_PUBLISHED ); + $post->setPublishedAt( new DateTimeImmutable() ); + + $this->_mockPostRepository + ->method( 'update' ); + + $result = $this->_publisher->unpublish( $post ); + + $this->assertSame( $post, $result ); + } + + public function testReturnsUpdatedPostAfterScheduling(): void + { + $post = new Post(); + $post->setId( 1 ); + $post->setStatus( Post::STATUS_DRAFT ); + + $futureDate = ( new DateTimeImmutable() )->modify( '+1 day' ); + + $this->_mockPostRepository + ->method( 'update' ); + + $result = $this->_publisher->schedule( $post, $futureDate ); + + $this->assertSame( $post, $result ); + } +} diff --git a/tests/Cms/Services/Post/UpdaterTest.php b/tests/Cms/Services/Post/UpdaterTest.php new file mode 100644 index 0000000..7d8e0bc --- /dev/null +++ b/tests/Cms/Services/Post/UpdaterTest.php @@ -0,0 +1,288 @@ +_mockPostRepository = $this->createMock( IPostRepository::class ); + $this->_mockCategoryRepository = $this->createMock( ICategoryRepository::class ); + $this->_mockTagResolver = $this->createMock( TagResolver::class ); + + $this->_updater = new Updater( + $this->_mockPostRepository, + $this->_mockCategoryRepository, + $this->_mockTagResolver + ); + } + + public function testUpdatesPostWithRequiredFields(): void + { + $post = new Post(); + $post->setId( 1 ); + $post->setTitle( 'Original Title' ); + $post->setBody( 'Original Body' ); + + $this->_mockCategoryRepository + ->method( 'findByIds' ) + ->willReturn( [] ); + + $this->_mockTagResolver + ->method( 'resolveFromString' ) + ->willReturn( [] ); + + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'update' ) + ->with( $this->callback( function( Post $p ) { + return $p->getTitle() === 'Updated Title' + && $p->getBody() === 'Updated Body' + && $p->getStatus() === Post::STATUS_PUBLISHED; + } ) ); + + $result = $this->_updater->update( + $post, + 'Updated Title', + 'Updated Body', + Post::STATUS_PUBLISHED + ); + + $this->assertEquals( 'Updated Title', $result->getTitle() ); + $this->assertEquals( 'Updated Body', $result->getBody() ); + $this->assertEquals( Post::STATUS_PUBLISHED, $result->getStatus() ); + } + + public function testGeneratesSlugWhenNotProvided(): void + { + $post = new Post(); + $post->setId( 1 ); + + $this->_mockCategoryRepository + ->method( 'findByIds' ) + ->willReturn( [] ); + + $this->_mockTagResolver + ->method( 'resolveFromString' ) + ->willReturn( [] ); + + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'update' ) + ->with( $this->callback( function( Post $p ) { + return $p->getSlug() === 'new-post-title'; + } ) ); + + $result = $this->_updater->update( + $post, + 'New Post Title', + 'Body', + Post::STATUS_DRAFT + ); + + $this->assertEquals( 'new-post-title', $result->getSlug() ); + } + + public function testUsesProvidedSlug(): void + { + $post = new Post(); + $post->setId( 1 ); + + $this->_mockCategoryRepository + ->method( 'findByIds' ) + ->willReturn( [] ); + + $this->_mockTagResolver + ->method( 'resolveFromString' ) + ->willReturn( [] ); + + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'update' ) + ->with( $this->callback( function( Post $p ) { + return $p->getSlug() === 'custom-slug'; + } ) ); + + $result = $this->_updater->update( + $post, + 'Title', + 'Body', + Post::STATUS_DRAFT, + 'custom-slug' + ); + + $this->assertEquals( 'custom-slug', $result->getSlug() ); + } + + public function testUpdatesCategories(): void + { + $post = new Post(); + $post->setId( 1 ); + + $category1 = new Category(); + $category1->setId( 1 ); + $category1->setName( 'Tech' ); + + $category2 = new Category(); + $category2->setId( 2 ); + $category2->setName( 'News' ); + + $this->_mockCategoryRepository + ->expects( $this->once() ) + ->method( 'findByIds' ) + ->with( [ 1, 2 ] ) + ->willReturn( [ $category1, $category2 ] ); + + $this->_mockTagResolver + ->method( 'resolveFromString' ) + ->willReturn( [] ); + + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'update' ) + ->with( $this->callback( function( Post $p ) { + $categories = $p->getCategories(); + return count( $categories ) === 2 + && $categories[0]->getName() === 'Tech' + && $categories[1]->getName() === 'News'; + } ) ); + + $result = $this->_updater->update( + $post, + 'Title', + 'Body', + Post::STATUS_DRAFT, + null, + null, + null, + [ 1, 2 ] + ); + + $this->assertCount( 2, $result->getCategories() ); + } + + public function testUpdatesTags(): void + { + $post = new Post(); + $post->setId( 1 ); + + $tag1 = new Tag(); + $tag1->setId( 1 ); + $tag1->setName( 'PHP' ); + + $tag2 = new Tag(); + $tag2->setId( 2 ); + $tag2->setName( 'Testing' ); + + $this->_mockCategoryRepository + ->method( 'findByIds' ) + ->willReturn( [] ); + + $this->_mockTagResolver + ->expects( $this->once() ) + ->method( 'resolveFromString' ) + ->with( 'PHP, Testing' ) + ->willReturn( [ $tag1, $tag2 ] ); + + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'update' ) + ->with( $this->callback( function( Post $p ) { + $tags = $p->getTags(); + return count( $tags ) === 2 + && $tags[0]->getName() === 'PHP' + && $tags[1]->getName() === 'Testing'; + } ) ); + + $result = $this->_updater->update( + $post, + 'Title', + 'Body', + Post::STATUS_DRAFT, + null, + null, + null, + [], + 'PHP, Testing' + ); + + $this->assertCount( 2, $result->getTags() ); + } + + public function testUpdatesOptionalFields(): void + { + $post = new Post(); + $post->setId( 1 ); + + $this->_mockCategoryRepository + ->method( 'findByIds' ) + ->willReturn( [] ); + + $this->_mockTagResolver + ->method( 'resolveFromString' ) + ->willReturn( [] ); + + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'update' ) + ->with( $this->callback( function( Post $p ) { + return $p->getExcerpt() === 'New excerpt' + && $p->getFeaturedImage() === 'new-image.jpg'; + } ) ); + + $result = $this->_updater->update( + $post, + 'Title', + 'Body', + Post::STATUS_DRAFT, + null, + 'New excerpt', + 'new-image.jpg' + ); + + $this->assertEquals( 'New excerpt', $result->getExcerpt() ); + $this->assertEquals( 'new-image.jpg', $result->getFeaturedImage() ); + } + + public function testReturnsUpdatedPost(): void + { + $post = new Post(); + $post->setId( 1 ); + $post->setTitle( 'Original' ); + + $this->_mockCategoryRepository + ->method( 'findByIds' ) + ->willReturn( [] ); + + $this->_mockTagResolver + ->method( 'resolveFromString' ) + ->willReturn( [] ); + + $this->_mockPostRepository + ->method( 'update' ); + + $result = $this->_updater->update( + $post, + 'Updated', + 'Body', + Post::STATUS_DRAFT + ); + + $this->assertSame( $post, $result ); + $this->assertEquals( 'Updated', $result->getTitle() ); + } +} diff --git a/tests/Cms/Services/Tag/CreatorTest.php b/tests/Cms/Services/Tag/CreatorTest.php new file mode 100644 index 0000000..120031e --- /dev/null +++ b/tests/Cms/Services/Tag/CreatorTest.php @@ -0,0 +1,143 @@ +_mockRepository = $this->createMock( ITagRepository::class ); + $this->_creator = new Creator( $this->_mockRepository ); + } + + public function testCreatesTagWithGivenNameAndSlug(): void + { + $expectedTag = new Tag(); + $expectedTag->setId( 1 ); + $expectedTag->setName( 'PHP' ); + $expectedTag->setSlug( 'custom-slug' ); + + $this->_mockRepository + ->expects( $this->once() ) + ->method( 'create' ) + ->with( $this->callback( function( Tag $tag ) { + return $tag->getName() === 'PHP' && $tag->getSlug() === 'custom-slug'; + } ) ) + ->willReturn( $expectedTag ); + + $result = $this->_creator->create( 'PHP', 'custom-slug' ); + + $this->assertEquals( 1, $result->getId() ); + $this->assertEquals( 'PHP', $result->getName() ); + $this->assertEquals( 'custom-slug', $result->getSlug() ); + } + + public function testGeneratesSlugWhenNotProvided(): void + { + $expectedTag = new Tag(); + $expectedTag->setId( 1 ); + $expectedTag->setName( 'Test Tag Name' ); + $expectedTag->setSlug( 'test-tag-name' ); + + $this->_mockRepository + ->expects( $this->once() ) + ->method( 'create' ) + ->with( $this->callback( function( Tag $tag ) { + return $tag->getName() === 'Test Tag Name' + && $tag->getSlug() === 'test-tag-name'; + } ) ) + ->willReturn( $expectedTag ); + + $result = $this->_creator->create( 'Test Tag Name' ); + + $this->assertEquals( 'test-tag-name', $result->getSlug() ); + } + + public function testSlugGenerationHandlesSpecialCharacters(): void + { + $expectedTag = new Tag(); + $expectedTag->setId( 1 ); + $expectedTag->setName( 'C++ Programming!' ); + $expectedTag->setSlug( 'c-programming' ); + + $this->_mockRepository + ->expects( $this->once() ) + ->method( 'create' ) + ->with( $this->callback( function( Tag $tag ) { + return $tag->getSlug() === 'c-programming'; + } ) ) + ->willReturn( $expectedTag ); + + $result = $this->_creator->create( 'C++ Programming!' ); + + $this->assertEquals( 'c-programming', $result->getSlug() ); + } + + public function testSlugGenerationHandlesMultipleSpaces(): void + { + $expectedTag = new Tag(); + $expectedTag->setId( 1 ); + $expectedTag->setName( 'Multiple Spaces Here' ); + $expectedTag->setSlug( 'multiple-spaces-here' ); + + $this->_mockRepository + ->expects( $this->once() ) + ->method( 'create' ) + ->with( $this->callback( function( Tag $tag ) { + return $tag->getSlug() === 'multiple-spaces-here'; + } ) ) + ->willReturn( $expectedTag ); + + $result = $this->_creator->create( 'Multiple Spaces Here' ); + + $this->assertEquals( 'multiple-spaces-here', $result->getSlug() ); + } + + public function testSlugGenerationTrimsLeadingAndTrailingDashes(): void + { + $expectedTag = new Tag(); + $expectedTag->setId( 1 ); + $expectedTag->setName( '---Test---' ); + $expectedTag->setSlug( 'test' ); + + $this->_mockRepository + ->expects( $this->once() ) + ->method( 'create' ) + ->with( $this->callback( function( Tag $tag ) { + return $tag->getSlug() === 'test'; + } ) ) + ->willReturn( $expectedTag ); + + $result = $this->_creator->create( '---Test---' ); + + $this->assertEquals( 'test', $result->getSlug() ); + } + + public function testSlugGenerationConvertsToLowercase(): void + { + $expectedTag = new Tag(); + $expectedTag->setId( 1 ); + $expectedTag->setName( 'UPPERCASE TAG' ); + $expectedTag->setSlug( 'uppercase-tag' ); + + $this->_mockRepository + ->expects( $this->once() ) + ->method( 'create' ) + ->with( $this->callback( function( Tag $tag ) { + return $tag->getSlug() === 'uppercase-tag'; + } ) ) + ->willReturn( $expectedTag ); + + $result = $this->_creator->create( 'UPPERCASE TAG' ); + + $this->assertEquals( 'uppercase-tag', $result->getSlug() ); + } +} diff --git a/tests/Cms/Services/Tag/ResolverTest.php b/tests/Cms/Services/Tag/ResolverTest.php new file mode 100644 index 0000000..243aa14 --- /dev/null +++ b/tests/Cms/Services/Tag/ResolverTest.php @@ -0,0 +1,190 @@ +_mockRepository = $this->createMock( ITagRepository::class ); + $this->_mockCreator = $this->createMock( Creator::class ); + $this->_resolver = new Resolver( $this->_mockRepository, $this->_mockCreator ); + } + + public function testReturnsEmptyArrayForEmptyString(): void + { + $result = $this->_resolver->resolveFromString( '' ); + + $this->assertIsArray( $result ); + $this->assertEmpty( $result ); + } + + public function testResolvesExistingTag(): void + { + $existingTag = new Tag(); + $existingTag->setId( 1 ); + $existingTag->setName( 'PHP' ); + $existingTag->setSlug( 'php' ); + + $this->_mockRepository + ->expects( $this->once() ) + ->method( 'findByName' ) + ->with( 'PHP' ) + ->willReturn( $existingTag ); + + $this->_mockCreator + ->expects( $this->never() ) + ->method( 'create' ); + + $result = $this->_resolver->resolveFromString( 'PHP' ); + + $this->assertCount( 1, $result ); + $this->assertEquals( 'PHP', $result[0]->getName() ); + } + + public function testCreatesNonExistingTag(): void + { + $newTag = new Tag(); + $newTag->setId( 1 ); + $newTag->setName( 'NewTag' ); + $newTag->setSlug( 'newtag' ); + + $this->_mockRepository + ->expects( $this->once() ) + ->method( 'findByName' ) + ->with( 'NewTag' ) + ->willReturn( null ); + + $this->_mockCreator + ->expects( $this->once() ) + ->method( 'create' ) + ->with( 'NewTag' ) + ->willReturn( $newTag ); + + $result = $this->_resolver->resolveFromString( 'NewTag' ); + + $this->assertCount( 1, $result ); + $this->assertEquals( 'NewTag', $result[0]->getName() ); + } + + public function testResolvesMultipleTagsFromCommaSeparatedString(): void + { + $tag1 = new Tag(); + $tag1->setId( 1 ); + $tag1->setName( 'PHP' ); + + $tag2 = new Tag(); + $tag2->setId( 2 ); + $tag2->setName( 'JavaScript' ); + + $tag3 = new Tag(); + $tag3->setId( 3 ); + $tag3->setName( 'Python' ); + + $this->_mockRepository + ->expects( $this->exactly( 3 ) ) + ->method( 'findByName' ) + ->willReturnCallback( function( $name ) use ( $tag1, $tag2, $tag3 ) { + return match( $name ) { + 'PHP' => $tag1, + 'JavaScript' => $tag2, + 'Python' => $tag3, + default => null + }; + } ); + + $result = $this->_resolver->resolveFromString( 'PHP, JavaScript, Python' ); + + $this->assertCount( 3, $result ); + $this->assertEquals( 'PHP', $result[0]->getName() ); + $this->assertEquals( 'JavaScript', $result[1]->getName() ); + $this->assertEquals( 'Python', $result[2]->getName() ); + } + + public function testTrimsWhitespaceFromTagNames(): void + { + $tag = new Tag(); + $tag->setId( 1 ); + $tag->setName( 'PHP' ); + + $this->_mockRepository + ->expects( $this->once() ) + ->method( 'findByName' ) + ->with( 'PHP' ) + ->willReturn( $tag ); + + $result = $this->_resolver->resolveFromString( ' PHP ' ); + + $this->assertCount( 1, $result ); + $this->assertEquals( 'PHP', $result[0]->getName() ); + } + + public function testSkipsEmptyTagNames(): void + { + $tag1 = new Tag(); + $tag1->setId( 1 ); + $tag1->setName( 'PHP' ); + + $tag2 = new Tag(); + $tag2->setId( 2 ); + $tag2->setName( 'JavaScript' ); + + $this->_mockRepository + ->expects( $this->exactly( 2 ) ) + ->method( 'findByName' ) + ->willReturnCallback( function( $name ) use ( $tag1, $tag2 ) { + return match( $name ) { + 'PHP' => $tag1, + 'JavaScript' => $tag2, + default => null + }; + } ); + + // Multiple commas and spaces should result in only 2 tags + $result = $this->_resolver->resolveFromString( 'PHP, , ,JavaScript' ); + + $this->assertCount( 2, $result ); + $this->assertEquals( 'PHP', $result[0]->getName() ); + $this->assertEquals( 'JavaScript', $result[1]->getName() ); + } + + public function testMixOfExistingAndNewTags(): void + { + $existingTag = new Tag(); + $existingTag->setId( 1 ); + $existingTag->setName( 'PHP' ); + + $newTag = new Tag(); + $newTag->setId( 2 ); + $newTag->setName( 'Rust' ); + + $this->_mockRepository + ->expects( $this->exactly( 2 ) ) + ->method( 'findByName' ) + ->willReturnCallback( function( $name ) use ( $existingTag ) { + return $name === 'PHP' ? $existingTag : null; + } ); + + $this->_mockCreator + ->expects( $this->once() ) + ->method( 'create' ) + ->with( 'Rust' ) + ->willReturn( $newTag ); + + $result = $this->_resolver->resolveFromString( 'PHP, Rust' ); + + $this->assertCount( 2, $result ); + $this->assertEquals( 'PHP', $result[0]->getName() ); + $this->assertEquals( 'Rust', $result[1]->getName() ); + } +} From fdbee69d8efdea1a790db0a37f5ec8e472b86890 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 11 Nov 2025 03:07:44 +0000 Subject: [PATCH 03/21] Initial plan From d1b2b0e10b488b1e1083879ecf488a236a71942c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 11 Nov 2025 03:08:19 +0000 Subject: [PATCH 04/21] Initial plan From ccd951265db1ff37564e3b5e03dd6929c2fa75ba Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 11 Nov 2025 03:08:58 +0000 Subject: [PATCH 05/21] Initial plan From 3bbcb4dd5685ef1e721f65b48d4b642c1cb1b755 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 11 Nov 2025 03:09:17 +0000 Subject: [PATCH 06/21] Initial plan From 91dd71095246102d76d57dba74e3604ee981436b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 11 Nov 2025 03:11:10 +0000 Subject: [PATCH 07/21] Fix authentication filter to prevent stale session security issue Co-authored-by: ljonesfl <1099983+ljonesfl@users.noreply.github.com> --- src/Cms/Auth/Filters/AuthenticationFilter.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/Cms/Auth/Filters/AuthenticationFilter.php b/src/Cms/Auth/Filters/AuthenticationFilter.php index df21001..e4accc4 100644 --- a/src/Cms/Auth/Filters/AuthenticationFilter.php +++ b/src/Cms/Auth/Filters/AuthenticationFilter.php @@ -37,7 +37,8 @@ function( RouteMap $route ) { $this->checkAuthentication( $route ); }, */ protected function checkAuthentication( RouteMap $route ): void { - if( !$this->_authManager->check() ) + $user = $this->_authManager->user(); + if( !$user ) { // Store intended URL for post-login redirect $intendedUrl = $_SERVER['REQUEST_URI'] ?? $route->getPath(); @@ -51,14 +52,9 @@ protected function checkAuthentication( RouteMap $route ): void exit; } - // Store authenticated user in Registry for easy access - $user = $this->_authManager->user(); - if( $user ) - { - Registry::getInstance()->set( 'Auth.User', $user ); - Registry::getInstance()->set( 'Auth.UserId', $user->getId() ); - Registry::getInstance()->set( 'Auth.UserRole', $user->getRole() ); - } + Registry::getInstance()->set( 'Auth.User', $user ); + Registry::getInstance()->set( 'Auth.UserId', $user->getId() ); + Registry::getInstance()->set( 'Auth.UserRole', $user->getRole() ); } /** From 9194a3954d9f98ff4f88906c0e667ac6f86c91a5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 11 Nov 2025 03:12:12 +0000 Subject: [PATCH 08/21] Fix authorization checks to compare IDs instead of object with string Co-authored-by: ljonesfl <1099983+ljonesfl@users.noreply.github.com> --- src/Cms/Controllers/Admin/PostController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Cms/Controllers/Admin/PostController.php b/src/Cms/Controllers/Admin/PostController.php index 17383e3..b23aa4f 100644 --- a/src/Cms/Controllers/Admin/PostController.php +++ b/src/Cms/Controllers/Admin/PostController.php @@ -241,7 +241,7 @@ public function edit( array $parameters ): string } // Check permissions - if( !$user->isAdmin() && !$user->isEditor() && $post->getAuthor() !== $user->getUsername() ) + if( !$user->isAdmin() && !$user->isEditor() && $post->getAuthorId() !== $user->getId() ) { throw new \RuntimeException( 'Unauthorized to edit this post' ); } @@ -298,7 +298,7 @@ public function update( array $parameters ): string } // Check permissions - if( !$user->isAdmin() && !$user->isEditor() && $post->getAuthor() !== $user->getUsername() ) + if( !$user->isAdmin() && !$user->isEditor() && $post->getAuthorId() !== $user->getId() ) { throw new \RuntimeException( 'Unauthorized to edit this post' ); } @@ -367,7 +367,7 @@ public function destroy( array $parameters ): string } // Check permissions - if( !$user->isAdmin() && !$user->isEditor() && $post->getAuthor() !== $user->getUsername() ) + if( !$user->isAdmin() && !$user->isEditor() && $post->getAuthorId() !== $user->getId() ) { $sessionManager->flash( 'error', 'Unauthorized to delete this post' ); header( 'Location: /admin/posts' ); From b79f4f69481643d585b520eb0032cb10d2f6ce72 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 11 Nov 2025 03:12:23 +0000 Subject: [PATCH 09/21] Initial plan From c1cd742f30cd7b4a56e05ef397b2eeb7ad21a397 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 11 Nov 2025 03:13:00 +0000 Subject: [PATCH 10/21] Initial plan From 5617a5733f3192bed021d203d434bcedd92d0afe Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 11 Nov 2025 03:13:04 +0000 Subject: [PATCH 11/21] Fix authorization check type mismatch in PostController Co-authored-by: ljonesfl <1099983+ljonesfl@users.noreply.github.com> --- src/Cms/Controllers/Admin/PostController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Cms/Controllers/Admin/PostController.php b/src/Cms/Controllers/Admin/PostController.php index 17383e3..b23aa4f 100644 --- a/src/Cms/Controllers/Admin/PostController.php +++ b/src/Cms/Controllers/Admin/PostController.php @@ -241,7 +241,7 @@ public function edit( array $parameters ): string } // Check permissions - if( !$user->isAdmin() && !$user->isEditor() && $post->getAuthor() !== $user->getUsername() ) + if( !$user->isAdmin() && !$user->isEditor() && $post->getAuthorId() !== $user->getId() ) { throw new \RuntimeException( 'Unauthorized to edit this post' ); } @@ -298,7 +298,7 @@ public function update( array $parameters ): string } // Check permissions - if( !$user->isAdmin() && !$user->isEditor() && $post->getAuthor() !== $user->getUsername() ) + if( !$user->isAdmin() && !$user->isEditor() && $post->getAuthorId() !== $user->getId() ) { throw new \RuntimeException( 'Unauthorized to edit this post' ); } @@ -367,7 +367,7 @@ public function destroy( array $parameters ): string } // Check permissions - if( !$user->isAdmin() && !$user->isEditor() && $post->getAuthor() !== $user->getUsername() ) + if( !$user->isAdmin() && !$user->isEditor() && $post->getAuthorId() !== $user->getId() ) { $sessionManager->flash( 'error', 'Unauthorized to delete this post' ); header( 'Location: /admin/posts' ); From ed6e2c2290a38e612acc2ced4726d42c5ebaeed3 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 11 Nov 2025 03:13:29 +0000 Subject: [PATCH 12/21] Fix authorization check type mismatch in PostController Co-authored-by: ljonesfl <1099983+ljonesfl@users.noreply.github.com> --- src/Cms/Controllers/Admin/PostController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Cms/Controllers/Admin/PostController.php b/src/Cms/Controllers/Admin/PostController.php index 17383e3..b23aa4f 100644 --- a/src/Cms/Controllers/Admin/PostController.php +++ b/src/Cms/Controllers/Admin/PostController.php @@ -241,7 +241,7 @@ public function edit( array $parameters ): string } // Check permissions - if( !$user->isAdmin() && !$user->isEditor() && $post->getAuthor() !== $user->getUsername() ) + if( !$user->isAdmin() && !$user->isEditor() && $post->getAuthorId() !== $user->getId() ) { throw new \RuntimeException( 'Unauthorized to edit this post' ); } @@ -298,7 +298,7 @@ public function update( array $parameters ): string } // Check permissions - if( !$user->isAdmin() && !$user->isEditor() && $post->getAuthor() !== $user->getUsername() ) + if( !$user->isAdmin() && !$user->isEditor() && $post->getAuthorId() !== $user->getId() ) { throw new \RuntimeException( 'Unauthorized to edit this post' ); } @@ -367,7 +367,7 @@ public function destroy( array $parameters ): string } // Check permissions - if( !$user->isAdmin() && !$user->isEditor() && $post->getAuthor() !== $user->getUsername() ) + if( !$user->isAdmin() && !$user->isEditor() && $post->getAuthorId() !== $user->getId() ) { $sessionManager->flash( 'error', 'Unauthorized to delete this post' ); header( 'Location: /admin/posts' ); From b9f0e5d9b0d1d21c80b414ca0dfd7b0c4842a703 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 11 Nov 2025 03:15:44 +0000 Subject: [PATCH 13/21] Add error handling for repository persistence failures in Publisher service Co-authored-by: ljonesfl <1099983+ljonesfl@users.noreply.github.com> --- src/Cms/Services/Post/Publisher.php | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/Cms/Services/Post/Publisher.php b/src/Cms/Services/Post/Publisher.php index fb89fc5..4fc2507 100644 --- a/src/Cms/Services/Post/Publisher.php +++ b/src/Cms/Services/Post/Publisher.php @@ -28,7 +28,7 @@ public function __construct( IPostRepository $postRepository ) * * @param Post $post The post to publish * @return Post - * @throws Exception if post is already published + * @throws Exception if post is already published or persistence fails */ public function publish( Post $post ): Post { @@ -41,7 +41,10 @@ public function publish( Post $post ): Post $post->setStatus( Post::STATUS_PUBLISHED ); $post->setPublishedAt( new DateTimeImmutable() ); - $this->_postRepository->update( $post ); + if( !$this->_postRepository->update( $post ) ) + { + throw new Exception( 'Failed to persist post changes' ); + } return $post; } @@ -51,7 +54,7 @@ public function publish( Post $post ): Post * * @param Post $post The post to unpublish * @return Post - * @throws Exception if post is not published + * @throws Exception if post is not published or persistence fails */ public function unpublish( Post $post ): Post { @@ -64,7 +67,10 @@ public function unpublish( Post $post ): Post $post->setStatus( Post::STATUS_DRAFT ); $post->setPublishedAt( null ); - $this->_postRepository->update( $post ); + if( !$this->_postRepository->update( $post ) ) + { + throw new Exception( 'Failed to persist post changes' ); + } return $post; } @@ -75,7 +81,7 @@ public function unpublish( Post $post ): Post * @param Post $post The post to schedule * @param DateTimeImmutable $publishAt When to publish * @return Post - * @throws Exception if scheduled date is in the past + * @throws Exception if scheduled date is in the past or persistence fails */ public function schedule( Post $post, DateTimeImmutable $publishAt ): Post { @@ -88,7 +94,10 @@ public function schedule( Post $post, DateTimeImmutable $publishAt ): Post $post->setStatus( Post::STATUS_SCHEDULED ); $post->setPublishedAt( $publishAt ); - $this->_postRepository->update( $post ); + if( !$this->_postRepository->update( $post ) ) + { + throw new Exception( 'Failed to persist post changes' ); + } return $post; } From 35d1d3d3c20f35c1a7cc90ff00040660c34ac31e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 11 Nov 2025 03:17:55 +0000 Subject: [PATCH 14/21] Add publishedAt auto-setting to Updater service Co-authored-by: ljonesfl <1099983+ljonesfl@users.noreply.github.com> --- src/Cms/Services/Post/Updater.php | 6 +++ tests/Cms/Services/Post/UpdaterTest.php | 72 +++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/src/Cms/Services/Post/Updater.php b/src/Cms/Services/Post/Updater.php index 8e3a045..e7d1796 100644 --- a/src/Cms/Services/Post/Updater.php +++ b/src/Cms/Services/Post/Updater.php @@ -64,6 +64,12 @@ public function update( $post->setFeaturedImage( $featuredImage ); $post->setStatus( $status ); + // Business rule: auto-set published date when changing to published status + if( $status === Post::STATUS_PUBLISHED && !$post->getPublishedAt() ) + { + $post->setPublishedAt( new \DateTimeImmutable() ); + } + // Update relationships $categories = $this->_categoryRepository->findByIds( $categoryIds ); $post->setCategories( $categories ); diff --git a/tests/Cms/Services/Post/UpdaterTest.php b/tests/Cms/Services/Post/UpdaterTest.php index 7d8e0bc..a5881b2 100644 --- a/tests/Cms/Services/Post/UpdaterTest.php +++ b/tests/Cms/Services/Post/UpdaterTest.php @@ -285,4 +285,76 @@ public function testReturnsUpdatedPost(): void $this->assertSame( $post, $result ); $this->assertEquals( 'Updated', $result->getTitle() ); } + + public function testSetsPublishedAtWhenChangingToPublished(): void + { + $post = new Post(); + $post->setId( 1 ); + $post->setTitle( 'Draft Post' ); + $post->setStatus( Post::STATUS_DRAFT ); + // Ensure publishedAt is not set + $this->assertNull( $post->getPublishedAt() ); + + $this->_mockCategoryRepository + ->method( 'findByIds' ) + ->willReturn( [] ); + + $this->_mockTagResolver + ->method( 'resolveFromString' ) + ->willReturn( [] ); + + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'update' ) + ->with( $this->callback( function( Post $p ) { + return $p->getStatus() === Post::STATUS_PUBLISHED + && $p->getPublishedAt() instanceof \DateTimeImmutable; + } ) ); + + $result = $this->_updater->update( + $post, + 'Published Post', + 'Body', + Post::STATUS_PUBLISHED + ); + + $this->assertEquals( Post::STATUS_PUBLISHED, $result->getStatus() ); + $this->assertInstanceOf( \DateTimeImmutable::class, $result->getPublishedAt() ); + } + + public function testDoesNotOverwriteExistingPublishedAt(): void + { + $post = new Post(); + $post->setId( 1 ); + $post->setTitle( 'Published Post' ); + $post->setStatus( Post::STATUS_PUBLISHED ); + $existingPublishedAt = new \DateTimeImmutable( '2024-01-01 12:00:00' ); + $post->setPublishedAt( $existingPublishedAt ); + + $this->_mockCategoryRepository + ->method( 'findByIds' ) + ->willReturn( [] ); + + $this->_mockTagResolver + ->method( 'resolveFromString' ) + ->willReturn( [] ); + + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'update' ) + ->with( $this->callback( function( Post $p ) use ( $existingPublishedAt ) { + return $p->getStatus() === Post::STATUS_PUBLISHED + && $p->getPublishedAt() === $existingPublishedAt; + } ) ); + + $result = $this->_updater->update( + $post, + 'Updated Published Post', + 'Body', + Post::STATUS_PUBLISHED + ); + + $this->assertEquals( Post::STATUS_PUBLISHED, $result->getStatus() ); + $this->assertSame( $existingPublishedAt, $result->getPublishedAt() ); + } } From 8a50ee3effc00d72efb0a88a94904accfdb2bac3 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 11 Nov 2025 03:32:24 +0000 Subject: [PATCH 15/21] Fix PublisherTest mocks to return true for update() calls Co-authored-by: ljonesfl <1099983+ljonesfl@users.noreply.github.com> --- tests/Cms/Services/Post/PublisherTest.php | 72 +++++++++++++++++++++-- 1 file changed, 66 insertions(+), 6 deletions(-) diff --git a/tests/Cms/Services/Post/PublisherTest.php b/tests/Cms/Services/Post/PublisherTest.php index c6b0c17..95a0962 100644 --- a/tests/Cms/Services/Post/PublisherTest.php +++ b/tests/Cms/Services/Post/PublisherTest.php @@ -31,7 +31,8 @@ public function testPublishesDraftPost(): void ->with( $this->callback( function( Post $p ) { return $p->getStatus() === Post::STATUS_PUBLISHED && $p->getPublishedAt() instanceof DateTimeImmutable; - } ) ); + } ) ) + ->willReturn( true ); $result = $this->_publisher->publish( $post ); @@ -68,7 +69,8 @@ public function testUnpublishesPublishedPost(): void ->with( $this->callback( function( Post $p ) { return $p->getStatus() === Post::STATUS_DRAFT && $p->getPublishedAt() === null; - } ) ); + } ) ) + ->willReturn( true ); $result = $this->_publisher->unpublish( $post ); @@ -107,7 +109,8 @@ public function testSchedulesPostForFuturePublication(): void return $p->getStatus() === Post::STATUS_SCHEDULED && $p->getPublishedAt() instanceof DateTimeImmutable && $p->getPublishedAt()->getTimestamp() === $futureDate->getTimestamp(); - } ) ); + } ) ) + ->willReturn( true ); $result = $this->_publisher->schedule( $post, $futureDate ); @@ -159,7 +162,8 @@ public function testReturnsUpdatedPostAfterPublishing(): void $post->setStatus( Post::STATUS_DRAFT ); $this->_mockPostRepository - ->method( 'update' ); + ->method( 'update' ) + ->willReturn( true ); $result = $this->_publisher->publish( $post ); @@ -174,7 +178,8 @@ public function testReturnsUpdatedPostAfterUnpublishing(): void $post->setPublishedAt( new DateTimeImmutable() ); $this->_mockPostRepository - ->method( 'update' ); + ->method( 'update' ) + ->willReturn( true ); $result = $this->_publisher->unpublish( $post ); @@ -190,10 +195,65 @@ public function testReturnsUpdatedPostAfterScheduling(): void $futureDate = ( new DateTimeImmutable() )->modify( '+1 day' ); $this->_mockPostRepository - ->method( 'update' ); + ->method( 'update' ) + ->willReturn( true ); $result = $this->_publisher->schedule( $post, $futureDate ); $this->assertSame( $post, $result ); } + + public function testThrowsExceptionWhenPublishPersistenceFails(): void + { + $post = new Post(); + $post->setId( 1 ); + $post->setStatus( Post::STATUS_DRAFT ); + + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'update' ) + ->willReturn( false ); + + $this->expectException( \Exception::class ); + $this->expectExceptionMessage( 'Failed to persist post changes' ); + + $this->_publisher->publish( $post ); + } + + public function testThrowsExceptionWhenUnpublishPersistenceFails(): void + { + $post = new Post(); + $post->setId( 1 ); + $post->setStatus( Post::STATUS_PUBLISHED ); + $post->setPublishedAt( new DateTimeImmutable() ); + + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'update' ) + ->willReturn( false ); + + $this->expectException( \Exception::class ); + $this->expectExceptionMessage( 'Failed to persist post changes' ); + + $this->_publisher->unpublish( $post ); + } + + public function testThrowsExceptionWhenSchedulePersistenceFails(): void + { + $post = new Post(); + $post->setId( 1 ); + $post->setStatus( Post::STATUS_DRAFT ); + + $futureDate = ( new DateTimeImmutable() )->modify( '+1 day' ); + + $this->_mockPostRepository + ->expects( $this->once() ) + ->method( 'update' ) + ->willReturn( false ); + + $this->expectException( \Exception::class ); + $this->expectExceptionMessage( 'Failed to persist post changes' ); + + $this->_publisher->schedule( $post, $futureDate ); + } } From d76bcbfec25678ec5cd5a0bb16b2c0b784e06ea4 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Mon, 10 Nov 2025 21:41:52 -0600 Subject: [PATCH 16/21] Update src/Cms/Database/ConnectionFactory.php Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- src/Cms/Database/ConnectionFactory.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/Cms/Database/ConnectionFactory.php b/src/Cms/Database/ConnectionFactory.php index ce54419..5e423bb 100644 --- a/src/Cms/Database/ConnectionFactory.php +++ b/src/Cms/Database/ConnectionFactory.php @@ -46,6 +46,16 @@ public static function createFromConfig( array $config ): PDO { $adapter = $config['adapter'] ?? 'sqlite'; + if( empty( $config['name'] ) ) + { + throw new Exception( + sprintf( + 'Database "name" configuration is required for %s connections.', + $adapter + ) + ); + } + $dsn = match( $adapter ) { 'sqlite' => "sqlite:{$config['name']}", From 76b26fa31918698e72ffc08afe9557ebc1533e9b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 11 Nov 2025 03:47:35 +0000 Subject: [PATCH 17/21] Initial plan From 0e8620a650508323789e94008c8298c89c8ac807 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 11 Nov 2025 03:52:34 +0000 Subject: [PATCH 18/21] Fix boolean casting for email_verified field to support PostgreSQL Co-authored-by: ljonesfl <1099983+ljonesfl@users.noreply.github.com> --- src/Cms/Repositories/DatabaseUserRepository.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Cms/Repositories/DatabaseUserRepository.php b/src/Cms/Repositories/DatabaseUserRepository.php index a4a5c24..2286c85 100644 --- a/src/Cms/Repositories/DatabaseUserRepository.php +++ b/src/Cms/Repositories/DatabaseUserRepository.php @@ -228,6 +228,15 @@ public function count(): int */ private function mapRowToUser( array $row ): User { + $emailVerifiedRaw = $row['email_verified'] ?? null; + $emailVerified = is_bool( $emailVerifiedRaw ) + ? $emailVerifiedRaw + : in_array( + strtolower( (string)$emailVerifiedRaw ), + [ '1', 'true', 't', 'yes', 'on' ], + true + ); + $data = [ 'id' => (int)$row['id'], 'username' => $row['username'], @@ -235,7 +244,7 @@ private function mapRowToUser( array $row ): User 'password_hash' => $row['password_hash'], 'role' => $row['role'], 'status' => $row['status'], - 'email_verified' => (bool)$row['email_verified'], + 'email_verified' => $emailVerified, 'two_factor_secret' => $row['two_factor_secret'], 'remember_token' => $row['remember_token'], 'failed_login_attempts' => (int)$row['failed_login_attempts'], From 3188ef0da265e5d03e2f554436d17620700e29f3 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Mon, 10 Nov 2025 22:01:22 -0600 Subject: [PATCH 19/21] Update tests/Cms/Services/Post/PublisherTest.php Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- tests/Cms/Services/Post/PublisherTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Cms/Services/Post/PublisherTest.php b/tests/Cms/Services/Post/PublisherTest.php index 95a0962..7cd9974 100644 --- a/tests/Cms/Services/Post/PublisherTest.php +++ b/tests/Cms/Services/Post/PublisherTest.php @@ -142,8 +142,8 @@ public function testThrowsExceptionWhenSchedulingWithCurrentTime(): void $post->setId( 1 ); $post->setStatus( Post::STATUS_DRAFT ); - // Create a date that's exactly now (which is technically in the past when compared) - $now = new DateTimeImmutable(); + // Use a fixed timestamp that's clearly not in the future + $now = new DateTimeImmutable( '-1 second' ); $this->_mockPostRepository ->expects( $this->never() ) From b923652e844360733eca0be5c4e31c95d09da108 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Mon, 10 Nov 2025 22:05:04 -0600 Subject: [PATCH 20/21] updated readme. --- readme.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/readme.md b/readme.md index f97b1d1..7445484 100644 --- a/readme.md +++ b/readme.md @@ -205,6 +205,16 @@ All view templates are in `resources/views/` and can be customized: - `blog/show.php` - Individual post - `admin/*` - Admin panel templates +### Scheduling Jobs + +Start the scheduler: + +```bash +php neuron jobs:schedule +``` + +This will process scheduled jobs. + ### Running Background Jobs Start the queue worker: From 31605d6d3b7e9e11549986cdde89aefebfd58ead Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Mon, 10 Nov 2025 22:09:33 -0600 Subject: [PATCH 21/21] fixes profile update failure handling. --- src/Cms/Controllers/Admin/ProfileController.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Cms/Controllers/Admin/ProfileController.php b/src/Cms/Controllers/Admin/ProfileController.php index 18db09c..e6dc12b 100644 --- a/src/Cms/Controllers/Admin/ProfileController.php +++ b/src/Cms/Controllers/Admin/ProfileController.php @@ -134,14 +134,13 @@ public function update( array $parameters ): string $user->setPasswordHash( $this->_hasher->hash( $newPassword ) ); } - try + if( $this->_repository->update( $user ) ) { - $this->_repository->update( $user ); $this->_sessionManager->flash( 'success', 'Profile updated successfully' ); } - catch( \Exception $e ) + else { - $this->_sessionManager->flash( 'error', 'Failed to update profile: ' . $e->getMessage() ); + $this->_sessionManager->flash( 'error', 'Failed to update profile' ); } header( 'Location: /admin/profile' );