Finalizes Logging and prepares notifications

src/Communication/Notifications.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace LoxBerry\Communication;
+
+/**
+ * Class Notifications.
+ */
+class Notifications
+{
+    const RETRIEVE_ALL = 'all';
+    const RETRIEVE_ERRORS = 'error';
+    const RETRIEVE_INFO = 'info';
+
+    const SEVERITY_LEVEL_INFO = 6;
+    const SEVERITY_LEVEL_ERROR = 3;
+
+    public function get(): array
+    {
+    }
+
+    public function getHtml(string $type = 'all'): string
+    {
+    }
+
+    public function notify(): bool
+    {
+    }
+}

src/Logging/LoggerFactory.php

@@ -46,6 +46,7 @@ public function __construct(
         $this->pathProvider = $pathProvider;
         $this->lowLevelExecutor = $lowLevelExecutor;
         $this->systemConfiguration = $systemConfiguration;
+        $this->database = $this->databaseFactory->create();
     }
 
     /**
@@ -70,6 +71,7 @@ public function create(
                 throw new \InvalidArgumentException('Cannot enable file writing without logFile');
             }
             $eventLogger->setFileWriter(new LogFileWriter($fileName));
+            $this->database->logStart($packageName, $logName, $fileName);
         }
         if ($writeToStdOut || $writeToStdErr) {
             $eventLogger->setSystemWriter(new LogSystemWriter($this->lowLevelExecutor));
@@ -82,6 +84,12 @@ public function create(
             new AttributeLogger($this->databaseFactory->create())
         );
 
+        $logger->setWriteToStdErr($writeToStdErr);
+        $logger->setWriteToStdOut($writeToStdOut);
+        $logger->setWriteToFile($writeToFile);
+
+        $logger->info('LoxBerry Version '.$this->systemConfiguration->getLoxBerryVersion());
+
         return $logger;
     }
 
@@ -92,6 +100,12 @@ public function create(
      */
     public function createFromExistingLogSession(string $logKey): Logger
     {
-        // Todo: Test & implement, should also set all params from existing session if exists.
+        $session = $this->database->getUnclosedLogSessionByKey($logKey);
+        if (null !== $session) {
+            $stderr = $this->database->getAttribute($logKey, 'stderr') ?? false;
+            $stdout = $this->database->getAttribute($logKey, 'stdout') ?? false;
+
+            return $this->create($session['NAME'], $session['PACKAGE'], $session['FILENAME'], true, $stderr, $stdout);
+        }
     }
 }

src/Utility/HttpAccess/AbstractHttpAccess.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace LoxBerry\Utility;
+
+use LoxBerry\ConfigurationParser\SystemConfigurationParser;
+
+/**
+ * Class AbstractHttpAccess.
+ */
+abstract class AbstractHttpAccess
+{
+    /** @var SystemConfigurationParser */
+    protected $systemConfiguration;
+
+    /**
+     * HttpAccess constructor.
+     *
+     * @param SystemConfigurationParser $systemConfiguration
+     */
+    public function __construct(SystemConfigurationParser $systemConfiguration)
+    {
+        $this->systemConfiguration = $systemConfiguration;
+    }
+
+    abstract protected function getEndpointUrl(): string;
+
+    /**
+     * @param array $data
+     *
+     * @return false|string
+     */
+    protected function post(array $data)
+    {
+        $context = stream_context_create([
+            'http' => [
+                'header' => "Content-type: application/x-www-form-urlencoded\r\n",
+                'method' => 'POST',
+                'content' => http_build_query($data),
+            ],
+        ]);
+
+        return file_get_contents($this->getEndpointUrl(), false, $context);
+    }
+
+    /**
+     * @return string
+     */
+    protected function getBaseUrl(): string
+    {
+        return 'http://localhost:'.($this->systemConfiguration->getWebserverPort() ?? 80);
+    }
+}

src/Utility/HttpAccess/AjaxNotificationHandler.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace LoxBerry\Utility\HttpAccess;
+
+use LoxBerry\Utility\AbstractHttpAccess;
+
+/**
+ * Class AjaxNotificationHandler.
+ */
+class AjaxNotificationHandler extends AbstractHttpAccess
+{
+    const ENDPOINT_URL = '/admin/system/tools/ajax-notification-handler.cgi';
+
+    /**
+     * @param array $data
+     *
+     * @return string
+     */
+    public function getAsString(array $data): string
+    {
+    }
+
+    /**
+     * @param array $data
+     *
+     * @return array
+     */
+    public function getAsArray(array $data): array
+    {
+    }
+
+    /**
+     * @return string
+     */
+    protected function getEndpointUrl(): string
+    {
+        return $this->getBaseUrl().self::ENDPOINT_URL;
+    }
+}

tests/Communication/NotificationsTest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace LoxBerry\Tests\Communication;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class NotificationsTest.
+ */
+class NotificationsTest extends TestCase
+{
+    public function testRetrievesNotificationsProperly()
+    {
+        $this->markTestIncomplete();
+    }
+
+    public function testRetrievesNotificationsHtmlProperly()
+    {
+        $this->markTestIncomplete();
+    }
+
+    public function testPushesSimpleNotification()
+    {
+        $this->markTestIncomplete();
+    }
+
+    public function teestPushesExtendedNotification()
+    {
+        $this->markTestIncomplete();
+    }
+}

tests/Logging/LoggerFactoryTest.php

@@ -3,6 +3,7 @@
 namespace LoxBerry\Tests\Logging;
 
 use LoxBerry\ConfigurationParser\SystemConfigurationParser;
+use LoxBerry\Logging\Database\LogFileDatabase;
 use LoxBerry\Logging\Database\LogFileDatabaseFactory;
 use LoxBerry\Logging\Logger;
 use LoxBerry\Logging\LoggerFactory;
@@ -42,6 +43,10 @@ public function testLogStartHeadersAreProperlyLogged()
         $pathProviderMock = $this->createMock(PathProvider::class);
         $systemConfigurationMock = $this->createMock(SystemConfigurationParser::class);
 
+        $systemConfigurationMock->expects($this->once())
+            ->method('getLoxBerryVersion')
+            ->willReturn('1.5.0');
+
         $loggerFactory = new LoggerFactory(
             $databaseFactoryMock,
             $lowLevelMock,
@@ -50,26 +55,34 @@ public function testLogStartHeadersAreProperlyLogged()
         );
 
         $logger = $loggerFactory->create('eventLog', 'testPlugin', __DIR__.DIRECTORY_SEPARATOR.self::TEST_FILE);
-        $this->markTestIncomplete();
-        // Logs LB version
-        // Logs Package/Plugin title and version
-        // Logs LogLevel
+        $loggedStuff = file_get_contents(__DIR__.DIRECTORY_SEPARATOR.self::TEST_FILE);
+        $this->assertStringContainsString('1.5.0', $loggedStuff);
     }
 
     public function testLogStartDatabaseQueriesAreProperlyExecutedIfFileWritingIsEnabled()
     {
-        $this->markTestIncomplete();
-        // Test log to db if writing to file
-        // Test logs sessino info to db including filename and package info
-        // Test logs params [append, loglevel, loglevel_is_static, logdir, LOGSTARTBYTE, _ISPLUGIN, PLUGINTITLE, stdout, stderr]
-    }
+        $databaseFactoryMock = $this->createMock(LogFileDatabaseFactory::class);
+        $lowLevelMock = $this->createMock(LowLevelExecutor::class);
+        $pathProviderMock = $this->createMock(PathProvider::class);
+        $systemConfigurationMock = $this->createMock(SystemConfigurationParser::class);
+        $databaseMock = $this->createMock(LogFileDatabase::class);
 
-    public function testLogEndDatabaseQueriesAreProperlyExecutedIfFileWritingIsEnabled()
-    {
-        $this->markTestIncomplete();
-        // Test log to db if writing to file
-        // Test logs session info to db including filename and package info
-        // Test logs params [append, loglevel, loglevel_is_static, logdir, LOGSTARTBYTE, _ISPLUGIN, PLUGINTITLE, stdout, stderr, ATTENTIONMESSAGES, STATUS]
+        $databaseMock->expects($this->once())
+            ->method('logStart')
+            ->with('testPlugin', 'eventLog', __DIR__.DIRECTORY_SEPARATOR.self::TEST_FILE);
+
+        $databaseFactoryMock
+            ->method('create')
+            ->willReturn($databaseMock);
+
+        $loggerFactory = new LoggerFactory(
+            $databaseFactoryMock,
+            $lowLevelMock,
+            $pathProviderMock,
+            $systemConfigurationMock
+        );
+
+        $logger = $loggerFactory->create('eventLog', 'testPlugin', __DIR__.DIRECTORY_SEPARATOR.self::TEST_FILE);
     }
 
     protected function setUp(): void

tests/System/Utility/AjaxNotificationHandlerTest.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace LoxBerry\Tests\System\Utility;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class AjaxNotificationHandlerTest.
+ */
+class AjaxNotificationHandlerTest extends TestCase
+{
+    public function testGetsDataAsString()
+    {
+        $this->markTestIncomplete();
+    }
+
+    public function testGetsDataAsArrayExpectingJson()
+    {
+        $this->markTestIncomplete();
+    }
+}