Signed-off-by: Katsuki Shuto <stk2k@sazysoft.com>

stk2k · Jun 5, 2021 · 879c350 · 879c350
1 parent 3774674
commit 879c350
Show file tree

Hide file tree

Showing 26 changed files with 111 additions and 52 deletions.
diff --git a/composer.json b/composer.json
@@ -20,7 +20,12 @@
   },
   "autoload": {
     "psr-4": {
-      "Stk2k\\Util\\": "src/"
+      "stk2k\\Util\\": "src/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "stk2k\\Util\\Test\\": "test/"
     }
   }
 }
diff --git a/src/EqualableInterface.php b/src/EqualableInterface.php
@@ -1,5 +1,7 @@
 <?php
-namespace Stk2k\Util;
+declare(strict_types=1);
+
+namespace stk2k\Util;
 
 interface EqualableInterface
 {

diff --git a/src/Exception/MacroHandlerException.php b/src/Exception/MacroHandlerException.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Stk2k\Util\Exception;
+namespace stk2k\Util\Exception;
 
 use Throwable;
 use Exception;

diff --git a/src/Exception/UtilExceptionInterface.php b/src/Exception/UtilExceptionInterface.php
@@ -1,7 +1,7 @@
 <?php
-namespace Stk2k\Util\Exception;
+declare(strict_types=1);
 
-use Calgamo\Exception\CalgamoExceptionInterface;
+namespace stk2k\Util\Exception;
 
 interface UtilExceptionInterface
 {

diff --git a/src/Handler/CombinedMacroHandler.php b/src/Handler/CombinedMacroHandler.php
@@ -1,7 +1,9 @@
 <?php
-namespace Stk2k\Util\Handler;
+declare(strict_types=1);
 
-use Stk2k\Util\MacroHandlerInterface;
+namespace stk2k\Util\Handler;
+
+use stk2k\Util\MacroHandlerInterface;
 
 final class CombinedMacroHandler implements MacroHandlerInterface
 {

diff --git a/src/Handler/CookieMacroHandler.php b/src/Handler/CookieMacroHandler.php
@@ -1,7 +1,9 @@
 <?php
-namespace Stk2k\Util\Handler;
+declare(strict_types=1);
 
-use Stk2k\Util\MacroHandlerInterface;
+namespace stk2k\Util\Handler;
+
+use stk2k\Util\MacroHandlerInterface;
 
 class CookieMacroHandler implements MacroHandlerInterface
 {

diff --git a/src/Handler/DateMacroHandler.php b/src/Handler/DateMacroHandler.php
@@ -1,7 +1,9 @@
 <?php
-namespace Stk2k\Util\Handler;
+declare(strict_types=1);
 
-use Stk2k\Util\MacroHandlerInterface;
+namespace stk2k\Util\Handler;
+
+use stk2k\Util\MacroHandlerInterface;
 
 class DateMacroHandler implements MacroHandlerInterface
 {

diff --git a/src/Handler/EnvMacroHandler.php b/src/Handler/EnvMacroHandler.php
@@ -1,7 +1,9 @@
 <?php
-namespace Stk2k\Util\Handler;
+declare(strict_types=1);
 
-use Stk2k\Util\MacroHandlerInterface;
+namespace stk2k\Util\Handler;
+
+use stk2k\Util\MacroHandlerInterface;
 
 class EnvMacroHandler implements MacroHandlerInterface
 {

diff --git a/src/Handler/GetMacroHandler.php b/src/Handler/GetMacroHandler.php
@@ -1,7 +1,9 @@
 <?php
-namespace Stk2k\Util\Handler;
+declare(strict_types=1);
 
-use Stk2k\Util\MacroHandlerInterface;
+namespace stk2k\Util\Handler;
+
+use stk2k\Util\MacroHandlerInterface;
 
 class GetMacroHandler implements MacroHandlerInterface
 {

diff --git a/src/Handler/PostMacroHandler.php b/src/Handler/PostMacroHandler.php
@@ -1,7 +1,9 @@
 <?php
-namespace Stk2k\Util\Handler;
+declare(strict_types=1);
 
-use Stk2k\Util\MacroHandlerInterface;
+namespace stk2k\Util\Handler;
+
+use stk2k\Util\MacroHandlerInterface;
 
 class PostMacroHandler implements MacroHandlerInterface
 {

diff --git a/src/Handler/RequestMacroHandler.php b/src/Handler/RequestMacroHandler.php
@@ -1,7 +1,9 @@
 <?php
-namespace Stk2k\Util\Handler;
+declare(strict_types=1);
 
-use Stk2k\Util\MacroHandlerInterface;
+namespace stk2k\Util\Handler;
+
+use stk2k\Util\MacroHandlerInterface;
 
 class RequestMacroHandler implements MacroHandlerInterface
 {

diff --git a/src/Handler/ServerMacroHandler.php b/src/Handler/ServerMacroHandler.php
@@ -1,7 +1,9 @@
 <?php
-namespace Stk2k\Util\Handler;
+declare(strict_types=1);
 
-use Stk2k\Util\MacroHandlerInterface;
+namespace stk2k\Util\Handler;
+
+use stk2k\Util\MacroHandlerInterface;
 
 class ServerMacroHandler implements MacroHandlerInterface
 {

diff --git a/src/Handler/SessionMacroHandler.php b/src/Handler/SessionMacroHandler.php
@@ -1,7 +1,9 @@
 <?php
-namespace Stk2k\Util\Handler;
+declare(strict_types=1);
 
-use Stk2k\Util\MacroHandlerInterface;
+namespace stk2k\Util\Handler;
+
+use stk2k\Util\MacroHandlerInterface;
 
 class SessionMacroHandler implements MacroHandlerInterface
 {

diff --git a/src/Handler/SystemMacroHandler.php b/src/Handler/SystemMacroHandler.php
@@ -1,7 +1,9 @@
 <?php
-namespace Stk2k\Util\Handler;
+declare(strict_types=1);
 
-use Stk2k\Util\MacroHandlerInterface;
+namespace stk2k\Util\Handler;
+
+use stk2k\Util\MacroHandlerInterface;
 
 class SystemMacroHandler implements MacroHandlerInterface
 {

diff --git a/src/HashableInterface.php b/src/HashableInterface.php
@@ -1,5 +1,7 @@
 <?php
-namespace Stk2k\Util;
+declare(strict_types=1);
+
+namespace stk2k\Util;
 
 interface HashableInterface
 {

diff --git a/src/MacroHandlerInterface.php b/src/MacroHandlerInterface.php
@@ -1,6 +1,7 @@
 <?php
-namespace Stk2k\Util;
+declare(strict_types=1);
 
+namespace stk2k\Util;
 
 interface MacroHandlerInterface
 {

diff --git a/src/MacroProcessor.php b/src/MacroProcessor.php
@@ -1,17 +1,19 @@
 <?php
-namespace Stk2k\Util;
+declare(strict_types=1);
 
-use Stk2k\Util\Exception\MacroHandlerException;
-use Stk2k\Util\Handler\SystemMacroHandler;
-use Stk2k\Util\Handler\DateMacroHandler;
-use Stk2k\Util\Handler\ServerMacroHandler;
-use Stk2k\Util\Handler\EnvMacroHandler;
-use Stk2k\Util\Handler\CookieMacroHandler;
-use Stk2k\Util\Handler\SessionMacroHandler;
-use Stk2k\Util\Handler\GetMacroHandler;
-use Stk2k\Util\Handler\PostMacroHandler;
-use Stk2k\Util\Handler\RequestMacroHandler;
-use Stk2k\Util\Enum\EnumMacroHandler;
+namespace stk2k\Util;
+
+use stk2k\Util\Exception\MacroHandlerException;
+use stk2k\Util\Handler\SystemMacroHandler;
+use stk2k\Util\Handler\DateMacroHandler;
+use stk2k\Util\Handler\ServerMacroHandler;
+use stk2k\Util\Handler\EnvMacroHandler;
+use stk2k\Util\Handler\CookieMacroHandler;
+use stk2k\Util\Handler\SessionMacroHandler;
+use stk2k\Util\Handler\GetMacroHandler;
+use stk2k\Util\Handler\PostMacroHandler;
+use stk2k\Util\Handler\RequestMacroHandler;
+use stk2k\Util\Enum\EnumMacroHandler;
 
 class MacroProcessor
 {

diff --git a/src/MemoryUtil.php b/src/MemoryUtil.php
@@ -1,9 +1,11 @@
 <?php
-namespace Stk2k\Util;
+declare(strict_types=1);
+
+namespace stk2k\Util;
 
 use InvalidArgumentException;
 
-use Stk2k\Util\Enum\EnumMemoryUnit as EnumMemoryUnit;
+use stk2k\Util\Enum\EnumMemoryUnit as EnumMemoryUnit;
 
 /**
 * Utility class of memory calculations

diff --git a/src/StringUtil.php b/src/StringUtil.php
@@ -1,5 +1,7 @@
 <?php
-namespace Stk2k\Util;
+declare(strict_types=1);
+
+namespace stk2k\Util;
 
 final class StringUtil
 {

diff --git a/src/Util.php b/src/Util.php
@@ -1,5 +1,7 @@
 <?php
-namespace Stk2k\Util;
+declare(strict_types=1);
+
+namespace stk2k\Util;
 
 use Throwable;
 use Traversable;

diff --git a/test/DateMacroHandlerTest.php b/test/DateMacroHandlerTest.php
@@ -1,8 +1,12 @@
 <?php
+declare(strict_types=1);
+
+namespace stk2k\Util\Test;
+
 
 use PHPUnit\Framework\TestCase;
-use Stk2k\Util\MacroProcessor;
-use Stk2k\Util\Enum\EnumMacroHandler;
+use stk2k\Util\MacroProcessor;
+use stk2k\Util\Enum\EnumMacroHandler;
 
 class DateMacroHandlerTest extends TestCase
 {

diff --git a/test/MacroProcessorTest.php b/test/MacroProcessorTest.php
@@ -1,7 +1,11 @@
 <?php
+declare(strict_types=1);
+
+namespace stk2k\Util\Test;
+
 
 use PHPUnit\Framework\TestCase;
-use Stk2k\Util\MacroProcessor;
+use stk2k\Util\MacroProcessor;
 
 class MacroProcessorTest extends TestCase
 {

diff --git a/test/ServerMacroHandlerTest.php b/test/ServerMacroHandlerTest.php
@@ -1,8 +1,12 @@
 <?php
+declare(strict_types=1);
+
+namespace stk2k\Util\Test;
+
 
 use PHPUnit\Framework\TestCase;
-use Stk2k\Util\MacroProcessor;
-use Stk2k\Util\Enum\EnumMacroHandler;
+use stk2k\Util\MacroProcessor;
+use stk2k\Util\Enum\EnumMacroHandler;
 
 class ServerMacroHandlerTest extends TestCase
 {

diff --git a/test/StringUtilTest.php b/test/StringUtilTest.php
@@ -1,7 +1,10 @@
 <?php
-namespace Stk2k\Util;
+declare(strict_types=1);
+
+namespace stk2k\Util\Test;
 
 use PHPUnit\Framework\TestCase;
+use stk2k\Util\StringUtil;
 
 class StringUtilTest extends TestCase
 {

diff --git a/test/SystemMacroHandlerTest.php b/test/SystemMacroHandlerTest.php
@@ -1,8 +1,12 @@
 <?php
+declare(strict_types=1);
+
+namespace stk2k\Util\Test;
+
 
 use PHPUnit\Framework\TestCase;
-use Stk2k\Util\MacroProcessor;
-use Stk2k\Util\Enum\EnumMacroHandler;
+use stk2k\Util\MacroProcessor;
+use stk2k\Util\Enum\EnumMacroHandler;
 
 class SystemMacroHandlerTest extends TestCase
 {

diff --git a/test/UtilTest.php b/test/UtilTest.php
@@ -1,5 +1,7 @@
 <?php
-namespace Stk2k\Util;
+declare(strict_types=1);
+
+namespace stk2k\Util\Test;
 
 use Exception;
 use Throwable;