small fixes, removed dot-errorhandler and added dot-log

Signed-off-by: sergiu <[email protected]>

Author: SergiuBota1

bin/composer-post-install-script.php

@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+require_once 'vendor/autoload.php';
+
+const ENVIRONMENT_DEVELOPMENT = 'development';
+const ENVIRONMENT_PRODUCTION  = 'production';
+
+// phpcs:disable PSR1.Files.SideEffects.FoundWithSymbols
+
+/**
+ * @param array{source: string, destination: string, environment: array<string>} $file
+ */
+function copyFile(array $file): void
+{
+    if (! in_array(getEnvironment(), $file['environment'])) {
+        echo "Skipping the copy of {$file['source']} due to environment settings." . PHP_EOL;
+        return;
+    }
+
+    if (is_readable($file['destination'])) {
+        echo "File {$file['destination']} already exists. Skipping..." . PHP_EOL;
+        return;
+    }
+
+    if (! copy($file['source'], $file['destination'])) {
+        echo "Cannot copy {$file['source']} file to {$file['destination']}" . PHP_EOL;
+    } else {
+        echo "File {$file['source']} copied successfully to {$file['destination']}." . PHP_EOL;
+    }
+}
+
+function getEnvironment(): string
+{
+    return getenv('COMPOSER_DEV_MODE') === '1' ? ENVIRONMENT_DEVELOPMENT : ENVIRONMENT_PRODUCTION;
+}
+
+/**
+ * When adding files to the below array:
+ * - `source` and `destination` paths must be relative to the project root folder
+ * - `environment` key will indicate on what environments the file will be copied
+ */
+$files = [
+    [
+        'source'      => 'config/autoload/local.php.dist',
+        'destination' => 'config/autoload/local.php',
+        'environment' => [ENVIRONMENT_DEVELOPMENT, ENVIRONMENT_PRODUCTION],
+    ],
+    [
+        'source'      => 'vendor/dotkernel/dot-mail/config/mail.global.php.dist',
+        'destination' => 'config/autoload/mail.global.php',
+        'environment' => [ENVIRONMENT_DEVELOPMENT, ENVIRONMENT_PRODUCTION],
+    ],
+];
+
+echo "Using environment setting: " . getEnvironment() . PHP_EOL;
+
+array_walk($files, 'copyFile');

composer.json

@@ -50,7 +50,7 @@
         "dotkernel/dot-cli": "^3.9",
         "dotkernel/dot-data-fixtures": "^1.4.0",
         "dotkernel/dot-dependency-injection": "^1.2",
-        "dotkernel/dot-errorhandler": "^4.0.0",
+        "dotkernel/dot-log": "4.0.4",
         "dotkernel/dot-mail": "^5.3.0",
         "dotkernel/dot-twigrenderer": "3.6.0",
         "laminas/laminas-component-installer": "^3.5",
@@ -79,8 +79,7 @@
             "Core\\App\\": "src/Core/src/App/src",
             "Core\\Security\\": "src/Core/src/Security/src",
             "Core\\Setting\\": "src/Core/src/Setting/src",
-            "Core\\User\\": "src/Core/src/User/src",
-            "Core\\NotificationSystem\\": "src/Core/src/NotificationSystem/src"
+            "Core\\User\\": "src/Core/src/User/src"
         }
     },
     "autoload-dev": {
@@ -89,6 +88,9 @@
         }
     },
     "scripts": {
+        "post-update-cmd": [
+            "php bin/composer-post-install-script.php"
+        ],
         "check": [
             "@cs-check",
             "@test",

config/autoload/.gitignore

@@ -1,3 +1,3 @@
 local.php
 *.local.php
-mail.global.php
+

config/autoload/local.php.dist

@@ -13,11 +13,11 @@ $baseUrl = 'http://localhost:8080';
 
 $databases = [
     'default' => [
-        'host'     => '',
-        'dbname'   => '',
+        'host'     => 'localhost',
+        'dbname'   => 'dotkernel',
         'user'     => '',
         'password' => '',
-        'port'     => ,
+        'port'     => 3306,
         'driver'   => 'pdo_mysql',
         'charset'  => 'utf8mb4',
         'collate'  => 'utf8mb4_general_ci',
@@ -46,4 +46,4 @@ return [
             'eof'      => "\n",
         ],
     ],
-];
+];

config/autoload/log.local.php.dist

@@ -23,3 +23,4 @@ return [
         ],
     ],
 ];
+

config/autoload/mail.global.php.dist

@@ -26,7 +26,6 @@
     // Dotkernel packages
     Dot\Log\ConfigProvider::class,
     Dot\Cli\ConfigProvider::class,
-    Dot\ErrorHandler\ConfigProvider::class,
     Dot\DataFixtures\ConfigProvider::class,
     Dot\DependencyInjection\ConfigProvider::class,
     Dot\Mail\ConfigProvider::class,
@@ -39,7 +38,6 @@
     Core\Security\ConfigProvider::class,
     Core\Setting\ConfigProvider::class,
     Core\User\ConfigProvider::class,
-    Core\NotificationSystem\ConfigProvider::class,
 
     // Load application config in a pre-defined order in such a way that local settings
     // overwrite global settings. (Loaded as first to last):

config/config.php

@@ -2,7 +2,6 @@
 
 declare(strict_types=1);
 
-use Dot\ErrorHandler\ErrorHandlerInterface;
 use Mezzio\Application;
 use Mezzio\MiddlewareFactory;
 use Psr\Container\ContainerInterface;
@@ -14,7 +13,6 @@
 return function (Application $app, MiddlewareFactory $factory, ContainerInterface $container): void {
     // The error handler should be the first (most outer) middleware to catch
     // all Exceptions.
-    $app->pipe(ErrorHandlerInterface::class);
 
     // Pipe more middleware here that you want to execute on every request:
     // - bootstrapping

config/pipeline.php

@@ -49,7 +49,7 @@ public function getTemplates(): array
     {
         return [
             'paths' => [
-                'notification-email' => [__DIR__ . '/../../templates'],
+                'notification-email' => [__DIR__ . '/templates'],
             ],
         ];
     }