Merge pull request #2 from Micro-PHP/rename-package-core

Asisyas · web-flow · commit 659fbfc39300 · 2023-01-15T23:12:01.000+03:00
Rename package core
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "micro/http-core": "^1",
+        "micro/plugin-http-core": "^1",
         "micro/plugin-logger-core": "^1"
     },
     "require-dev": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -16,15 +16,6 @@
             <directory>tests/Unit</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-            <exclude>
-                <directory>src/Exception</directory>
-                <file>src/HttpCorePlugin.php</file>
-            </exclude>
-        </whitelist>
-    </filter>
     <coverage>
         <include>
             <directory suffix=".php">src</directory>
diff --git a/src/Business/Executor/HttpExecutorLoggerAwareDecoratorFactory.php b/src/Business/Executor/HttpExecutorLoggerAwareDecoratorFactory.php
@@ -15,7 +15,7 @@
 
 use Micro\Plugin\Http\Business\Logger\Formatter\LogFormatterFactoryInterface;
 use Micro\Plugin\Http\HttpLoggerPluginConfigurationInterface;
-use Micro\Plugin\Logger\LoggerFacadeInterface;
+use Micro\Plugin\Logger\Facade\LoggerFacadeInterface;
 
 /**
  * @author Stanislau Komar <kost@micro-php.net>
diff --git a/src/Business/Logger/Formatter/Format/AbstractFormat.php b/src/Business/Logger/Formatter/Format/AbstractFormat.php
@@ -19,6 +19,8 @@
 
 /**
  * @author Stanislau Komar <kost@micro-php.net>
+ *
+ * @codeCoverageIgnore
  */
 abstract class AbstractFormat implements LogFormatterInterface
 {
diff --git a/src/HttpLoggerPlugin.php b/src/HttpLoggerPlugin.php
@@ -24,13 +24,15 @@
 use Micro\Plugin\Http\Business\Logger\Formatter\LogFormatterFactoryInterface;
 use Micro\Plugin\Http\Decorator\HttpFacadeLoggerDecorator;
 use Micro\Plugin\Http\Facade\HttpFacadeInterface;
-use Micro\Plugin\Logger\LoggerFacadeInterface;
+use Micro\Plugin\Logger\Facade\LoggerFacadeInterface;
 use Micro\Plugin\Logger\LoggerPlugin;
 
 /**
  * @author Stanislau Komar <kost@micro-php.net>
  *
  * @method HttpLoggerPluginConfigurationInterface configuration()
+ *
+ * @codeCoverageIgnore
  */
 class HttpLoggerPlugin implements DependencyProviderInterface, PluginDependedInterface, ConfigurableInterface
 {
diff --git a/src/HttpLoggerPluginConfiguration.php b/src/HttpLoggerPluginConfiguration.php
@@ -14,6 +14,7 @@
 namespace Micro\Plugin\Http;
 
 use Micro\Framework\Kernel\Configuration\PluginConfiguration;
+use Micro\Plugin\Logger\LoggerPluginConfiguration;
 
 /**
  * @author Stanislau Komar <kost@micro-php.net>
@@ -31,14 +32,14 @@ class HttpLoggerPluginConfiguration extends PluginConfiguration implements HttpL
 
     public const DECORATION_DEFAULT = 10;
 
-    public function getAccessLoggerName(): string|null
+    public function getAccessLoggerName(): string
     {
-        return $this->configuration->get(self::CFG_LOGGER_ACCESS);
+        return (string) $this->configuration->get(self::CFG_LOGGER_ACCESS, LoggerPluginConfiguration::LOGGER_NAME_DEFAULT);
     }
 
-    public function getErrorLoggerName(): string|null
+    public function getErrorLoggerName(): string
     {
-        return $this->configuration->get(self::CFG_LOGGER_ERROR);
+        return (string) $this->configuration->get(self::CFG_LOGGER_ERROR, LoggerPluginConfiguration::LOGGER_NAME_DEFAULT);
     }
 
     public function getWeight(): int
diff --git a/src/HttpLoggerPluginConfigurationInterface.php b/src/HttpLoggerPluginConfigurationInterface.php
@@ -18,9 +18,9 @@
  */
 interface HttpLoggerPluginConfigurationInterface
 {
-    public function getAccessLoggerName(): string|null;
+    public function getAccessLoggerName(): string;
 
-    public function getErrorLoggerName(): string|null;
+    public function getErrorLoggerName(): string;
 
     public function getErrorLogFormat(): string;
 
diff --git a/tests/Unit/Business/Executor/HttpExecutorLoggerAwareDecoratorFactoryTest.php b/tests/Unit/Business/Executor/HttpExecutorLoggerAwareDecoratorFactoryTest.php
@@ -9,12 +9,14 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Executor;
+namespace Micro\Plugin\Http\Test\Unit\Business\Executor;
 
+use Micro\Plugin\Http\Business\Executor\HttpExecutorLoggerAwareDecoratorFactory;
+use Micro\Plugin\Http\Business\Executor\RouteExecutorInterface;
 use Micro\Plugin\Http\Business\Logger\Formatter\LogFormatterFactoryInterface;
 use Micro\Plugin\Http\Facade\HttpFacadeInterface;
 use Micro\Plugin\Http\HttpLoggerPluginConfigurationInterface;
-use Micro\Plugin\Logger\LoggerFacadeInterface;
+use Micro\Plugin\Logger\Facade\LoggerFacadeInterface;
 use PHPUnit\Framework\TestCase;
 
 class HttpExecutorLoggerAwareDecoratorFactoryTest extends TestCase
diff --git a/tests/Unit/Business/Executor/HttpExecutorLoggerAwareDecoratorTest.php b/tests/Unit/Business/Executor/HttpExecutorLoggerAwareDecoratorTest.php
@@ -9,8 +9,9 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Executor;
+namespace Micro\Plugin\Http\Test\Unit\Business\Executor;
 
+use Micro\Plugin\Http\Business\Executor\HttpExecutorLoggerAwareDecorator;
 use Micro\Plugin\Http\Business\Logger\Formatter\LogFormatterInterface;
 use Micro\Plugin\Http\Exception\HttpException;
 use Micro\Plugin\Http\Facade\HttpFacadeInterface;
diff --git a/tests/Unit/Business/Logger/Formatter/Format/AbstractFormatTest.php b/tests/Unit/Business/Logger/Formatter/Format/AbstractFormatTest.php
@@ -11,7 +11,7 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Logger\Formatter\Format;
+namespace Micro\Plugin\Http\Test\Unit\Business\Logger\Formatter\Format;
 
 use Micro\Plugin\Http\Business\Logger\Formatter\LogFormatterInterface;
 use Micro\Plugin\Http\Exception\HttpException;
@@ -31,7 +31,8 @@ public function testFormat(bool $hasResponse, \Throwable|null $throwable)
     {
         $object = $this->createTestObject();
 
-        $this->assertIsString(
+        $this->assertResult(
+            $object,
             $object->format(
                 $this->createRequest(),
                 $this->createResponse($hasResponse),
@@ -52,6 +53,14 @@ public function dataProvider()
         ];
     }
 
+    protected function assertResult(mixed $object, mixed $result)
+    {
+        $this->assertEquals(
+            $this->getVariable(),
+            $result
+        );
+    }
+
     public function createThrowable(\Throwable|null $throwable): \Throwable|null
     {
         return $throwable;
diff --git a/tests/Unit/Business/Logger/Formatter/Format/HttpRefererFormatTest.php b/tests/Unit/Business/Logger/Formatter/Format/HttpRefererFormatTest.php
@@ -9,7 +9,9 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Logger\Formatter\Format;
+namespace Micro\Plugin\Http\Test\Unit\Business\Logger\Formatter\Format;
+
+use Micro\Plugin\Http\Business\Logger\Formatter\Format\HttpRefererFormat;
 
 class HttpRefererFormatTest extends AbstractFormatTest
 {
@@ -22,4 +24,9 @@ public function getVariable(): string
     {
         return 'http_referer';
     }
+
+    public function assertResult(mixed $object, mixed $result)
+    {
+        $this->assertEquals('', $result);
+    }
 }
diff --git a/tests/Unit/Business/Logger/Formatter/Format/IpFormatTest.php b/tests/Unit/Business/Logger/Formatter/Format/IpFormatTest.php
@@ -9,8 +9,9 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Logger\Formatter\Format;
+namespace Micro\Plugin\Http\Test\Unit\Business\Logger\Formatter\Format;
 
+use Micro\Plugin\Http\Business\Logger\Formatter\Format\IpFormat;
 use Micro\Plugin\Http\Exception\HttpException;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -23,7 +24,8 @@ public function testFormat(bool $hasResponse, \Throwable|null $throwable, $hasIp
     {
         $object = $this->createTestObject();
 
-        $this->assertIsString(
+        $this->assertEquals(
+            '127.0.0.1',
             $object->format(
                 $this->createRequest($hasIp),
                 $this->createResponse($hasResponse),
@@ -60,7 +62,9 @@ protected function createRequest(bool $hasIp = null): Request
             return parent::createRequest();
         }
 
-        $request = new Request([], [], [], [], [], ['REMOTE_ADDR' => '0.0.0.0']);
+        return parent::createRequest();
+
+        $request = new Request([], [], [], [], [], []);
 
         return $request;
     }
@@ -72,6 +76,6 @@ protected function getTestClass(): string
 
     public function getVariable(): string
     {
-        return 'remote_ip';
+        return 'remote_addr';
     }
 }
diff --git a/tests/Unit/Business/Logger/Formatter/Format/MethodFormatTest.php b/tests/Unit/Business/Logger/Formatter/Format/MethodFormatTest.php
@@ -9,7 +9,9 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Logger\Formatter\Format;
+namespace Micro\Plugin\Http\Test\Unit\Business\Logger\Formatter\Format;
+
+use Micro\Plugin\Http\Business\Logger\Formatter\Format\MethodFormat;
 
 class MethodFormatTest extends AbstractFormatTest
 {
@@ -22,4 +24,9 @@ public function getVariable(): string
     {
         return 'request_method';
     }
+
+    public function assertResult(mixed $object, mixed $result)
+    {
+        $this->assertEquals('GET', $result);
+    }
 }
diff --git a/tests/Unit/Business/Logger/Formatter/Format/RequestBodyFormatTest.php b/tests/Unit/Business/Logger/Formatter/Format/RequestBodyFormatTest.php
@@ -9,8 +9,9 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Logger\Formatter\Format;
+namespace Micro\Plugin\Http\Test\Unit\Business\Logger\Formatter\Format;
 
+use Micro\Plugin\Http\Business\Logger\Formatter\Format\RequestBodyFormat;
 use Symfony\Component\HttpFoundation\Request;
 
 class RequestBodyFormatTest extends AbstractFormatTest
diff --git a/tests/Unit/Business/Logger/Formatter/Format/RequestFormatTest.php b/tests/Unit/Business/Logger/Formatter/Format/RequestFormatTest.php
@@ -9,7 +9,9 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Logger\Formatter\Format;
+namespace Micro\Plugin\Http\Test\Unit\Business\Logger\Formatter\Format;
+
+use Micro\Plugin\Http\Business\Logger\Formatter\Format\RequestFormat;
 
 class RequestFormatTest extends AbstractFormatTest
 {
@@ -22,4 +24,9 @@ public function getVariable(): string
     {
         return 'request';
     }
+
+    public function assertResult(mixed $object, mixed $result)
+    {
+        $this->assertEquals('/test', $result);
+    }
 }
diff --git a/tests/Unit/Business/Logger/Formatter/Format/StatusFormatTest.php b/tests/Unit/Business/Logger/Formatter/Format/StatusFormatTest.php
@@ -9,7 +9,9 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Logger\Formatter\Format;
+namespace Micro\Plugin\Http\Test\Unit\Business\Logger\Formatter\Format;
+
+use Micro\Plugin\Http\Business\Logger\Formatter\Format\StatusFormat;
 
 class StatusFormatTest extends AbstractFormatTest
 {
@@ -22,4 +24,11 @@ public function getVariable(): string
     {
         return 'status';
     }
+
+    protected function assertResult(mixed $object, mixed $result)
+    {
+        $this->assertTrue(
+            \in_array($result, ['500', 0])
+        );
+    }
 }
diff --git a/tests/Unit/Business/Logger/Formatter/Format/TimeFormatTest.php b/tests/Unit/Business/Logger/Formatter/Format/TimeFormatTest.php
@@ -9,7 +9,9 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Logger\Formatter\Format;
+namespace Micro\Plugin\Http\Test\Unit\Business\Logger\Formatter\Format;
+
+use Micro\Plugin\Http\Business\Logger\Formatter\Format\TimeFormat;
 
 class TimeFormatTest extends AbstractFormatTest
 {
@@ -22,4 +24,11 @@ public function getVariable(): string
     {
         return 'time';
     }
+
+    public function assertResult(mixed $object, mixed $result)
+    {
+        $date = new \DateTime($result);
+
+        $this->assertEquals($result, $date->format('c'));
+    }
 }
diff --git a/tests/Unit/Business/Logger/Formatter/Format/UsernameFormatTest.php b/tests/Unit/Business/Logger/Formatter/Format/UsernameFormatTest.php
@@ -9,7 +9,9 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Logger\Formatter\Format;
+namespace Micro\Plugin\Http\Test\Unit\Business\Logger\Formatter\Format;
+
+use Micro\Plugin\Http\Business\Logger\Formatter\Format\UsernameFormat;
 
 class UsernameFormatTest extends AbstractFormatTest
 {
@@ -22,4 +24,9 @@ public function getVariable(): string
     {
         return 'remote_user';
     }
+
+    public function assertResult(mixed $object, mixed $result)
+    {
+        $this->assertEquals('', $result);
+    }
 }
diff --git a/tests/Unit/Business/Logger/Formatter/LogFormatterFactoryTest.php b/tests/Unit/Business/Logger/Formatter/LogFormatterFactoryTest.php
@@ -9,8 +9,10 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Logger\Formatter;
+namespace Micro\Plugin\Http\Test\Unit\Business\Logger\Formatter;
 
+use Micro\Plugin\Http\Business\Logger\Formatter\LogFormatterFactory;
+use Micro\Plugin\Http\Business\Logger\Formatter\LogFormatterInterface;
 use PHPUnit\Framework\TestCase;
 
 class LogFormatterFactoryTest extends TestCase
diff --git a/tests/Unit/Business/Logger/Formatter/LogFormatterTest.php b/tests/Unit/Business/Logger/Formatter/LogFormatterTest.php
@@ -9,8 +9,10 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Logger\Formatter;
+namespace Micro\Plugin\Http\Test\Unit\Business\Logger\Formatter;
 
+use Micro\Plugin\Http\Business\Logger\Formatter\LogFormatter;
+use Micro\Plugin\Http\Business\Logger\Formatter\LogFormatterInterface;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/tests/Unit/Decorator/HttpFacadeLoggerDecoratorTest.php b/tests/Unit/Decorator/HttpFacadeLoggerDecoratorTest.php
@@ -9,11 +9,12 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Decorator;
+namespace Micro\Plugin\Http\Test\Unit\Decorator;
 
 use Micro\Plugin\Http\Business\Executor\RouteExecutorFactoryInterface;
 use Micro\Plugin\Http\Business\Route\RouteBuilderInterface;
 use Micro\Plugin\Http\Business\Route\RouteInterface;
+use Micro\Plugin\Http\Decorator\HttpFacadeLoggerDecorator;
 use Micro\Plugin\Http\Facade\HttpFacadeInterface;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/tests/Unit/HttpLoggerPluginConfigurationTest.php b/tests/Unit/HttpLoggerPluginConfigurationTest.php
diff --git a/tests/Unit/HttpLoggerPluginTest.php b/tests/Unit/HttpLoggerPluginTest.php
diff --git a/tests/Unit/TestHtpLoggerPlugin.php b/tests/Unit/TestHtpLoggerPlugin.php

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`}`
`11`	`11`	`],`
`12`	`12`	`"require": {`
`13`		`- "micro/http-core": "^1",`
	`13`	`+ "micro/plugin-http-core": "^1",`
`14`	`14`	`"micro/plugin-logger-core": "^1"`
`15`	`15`	`},`
`16`	`16`	`"require-dev": {`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@`
`19`	`19`
`20`	`20`	`/**`
`21`	`21`	`* @author Stanislau Komar <kost@micro-php.net>`
	`22`	`+ *`
	`23`	`+ * @codeCoverageIgnore`
`22`	`24`	`*/`
`23`	`25`	`abstract class AbstractFormat implements LogFormatterInterface`
`24`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`namespace Micro\Plugin\Http;`
`15`	`15`
`16`	`16`	`use Micro\Framework\Kernel\Configuration\PluginConfiguration;`
	`17`	`+use Micro\Plugin\Logger\LoggerPluginConfiguration;`
`17`	`18`
`18`	`19`	`/**`
`19`	`20`	`* @author Stanislau Komar <kost@micro-php.net>`
`@@ -31,14 +32,14 @@ class HttpLoggerPluginConfiguration extends PluginConfiguration implements HttpL`
`31`	`32`
`32`	`33`	`public const DECORATION_DEFAULT = 10;`
`33`	`34`
`34`		`- public function getAccessLoggerName(): string\|null`
	`35`	`+ public function getAccessLoggerName(): string`
`35`	`36`	`{`
`36`		`- return $this->configuration->get(self::CFG_LOGGER_ACCESS);`
	`37`	`+ return (string) $this->configuration->get(self::CFG_LOGGER_ACCESS, LoggerPluginConfiguration::LOGGER_NAME_DEFAULT);`
`37`	`38`	`}`
`38`	`39`
`39`		`- public function getErrorLoggerName(): string\|null`
	`40`	`+ public function getErrorLoggerName(): string`
`40`	`41`	`{`
`41`		`- return $this->configuration->get(self::CFG_LOGGER_ERROR);`
	`42`	`+ return (string) $this->configuration->get(self::CFG_LOGGER_ERROR, LoggerPluginConfiguration::LOGGER_NAME_DEFAULT);`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`public function getWeight(): int`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,9 @@`
`18`	`18`	`*/`
`19`	`19`	`interface HttpLoggerPluginConfigurationInterface`
`20`	`20`	`{`
`21`		`- public function getAccessLoggerName(): string\|null;`
	`21`	`+ public function getAccessLoggerName(): string;`
`22`	`22`
`23`		`- public function getErrorLoggerName(): string\|null;`
	`23`	`+ public function getErrorLoggerName(): string;`
`24`	`24`
`25`	`25`	`public function getErrorLogFormat(): string;`
`26`	`26`