Merge pull request #4 from mineadmin/2.0-dev

2.0 dev

.gitignore

@@ -1,4 +1,5 @@
 composer.lock
 .idea
 vendor
-*.cache
+*.cache
+runtime

phpunit.xml

@@ -8,6 +8,7 @@
       <directory suffix="Test.php">./src/office</directory>
       <directory suffix="Test.php">./src/gateway</directory>
       <directory suffix="Test.php">./src/translatable</directory>
+      <directory suffix="Test.php">./tests</directory>
     </testsuite>
   </testsuites>
   <source>
@@ -17,6 +18,7 @@
       <directory suffix=".php">./src/office/tests</directory>
       <directory suffix=".php">./src/gateway/tests</directory>
       <directory suffix=".php">./src/translatable/tests</directory>
+      <directory suffix=".php">./tests</directory>
     </include>
   </source>
 </phpunit>

src/jwt-auth/src/Exception/TokenExpireException.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  [email protected]
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace Xmo\JWTAuth\Exception;
+
+class TokenExpireException extends \RuntimeException {}

src/jwt-auth/src/Util/JWTUtil.php

@@ -20,6 +20,7 @@
 use Lcobucci\JWT\Validation\Constraint\IdentifiedBy;
 use Lcobucci\JWT\Validation\Constraint\SignedWith;
 use Lcobucci\JWT\ValidationData;
+use Xmo\JWTAuth\Exception\TokenExpireException;
 
 /**
  * JWT工具类.
@@ -83,15 +84,16 @@ public static function getParser(Signer $signer, Key $key)
     /**
      * @return ValidationData
      */
-    public static function getValidationData(Signer $signer, Key $key, string $token)
+    public static function getValidationData(Signer $signer, Key $key, string $token): bool
     {
         $config = self::getConfiguration($signer, $key);
         $parser = $config->parser()->parse($token);
         $claims = $parser->claims()->all();
         $now = new \DateTimeImmutable();
 
+        // 这是基于用户给定的。不是后端解析后来判断的
         if ($claims['nbf'] > $now || $claims['exp'] < $now) {
-            return false;
+            throw new TokenExpireException('Token has expired');
         }
 
         $config->setValidationConstraints(new IdentifiedBy($claims['jti']));

src/mine-helpers/src/Ip2region.php

@@ -12,8 +12,8 @@
 
 namespace Mine\Helper;
 
+use Composer\Autoload\ClassLoader;
 use Hyperf\Contract\StdoutLoggerInterface;
-use Hyperf\Support\Composer;
 
 class Ip2region
 {
@@ -23,17 +23,17 @@ class Ip2region
      * @see https://github.com/zoujingli/ip2region
      * @throws \Exception
      */
-    public function __construct(protected StdoutLoggerInterface $logger)
+    public function __construct(protected ?StdoutLoggerInterface $logger = null)
     {
-        $composerLoader = Composer::getLoader();
+        $composerLoader = $this->getLoader();
         $path = $composerLoader->findFile(\XdbSearcher::class);
 
         $dbFile = dirname(realpath($path)) . '/ip2region.xdb';
 
         // 1、从 dbPath 加载整个 xdb 到内存。
         $cBuff = \XdbSearcher::loadContentFromFile($dbFile);
         if ($cBuff === null) {
-            $this->logger->error('failed to load content buffer from {db_file}', ['db_file' => $dbFile]);
+            $this->logger?->error('failed to load content buffer from {db_file}', ['db_file' => $dbFile]);
             return;
         }
         // 2、使用全局的 cBuff 创建带完全基于内存的查询对象。
@@ -59,4 +59,17 @@ public function search(string $ip): string
         }
         return $country;
     }
+
+    private function getLoader(): ClassLoader
+    {
+        $loaders = spl_autoload_functions();
+
+        foreach ($loaders as $loader) {
+            if (is_array($loader) && $loader[0] instanceof ClassLoader) {
+                return $loader[0];
+            }
+        }
+
+        throw new \RuntimeException('Composer loader not found.');
+    }
 }

src/mine-helpers/src/functions.php

@@ -12,6 +12,7 @@
 use Hyperf\Context\ApplicationContext;
 use Hyperf\Context\Context;
 use Hyperf\Contract\StdoutLoggerInterface;
+use Hyperf\HttpServer\Contract\RequestInterface;
 use Hyperf\Logger\LoggerFactory;
 use Hyperf\Redis\Redis;
 use Hyperf\Snowflake\IdGeneratorInterface;
@@ -103,7 +104,9 @@ function format_size(int $size): string
      */
     function lang(): string
     {
-        $acceptLanguage = container()->get(MineRequest::class)->getHeaderLine('accept-language');
+        $acceptLanguage = container()
+            ->get(RequestInterface::class)
+            ->getHeaderLine('accept-language');
         return str_replace('-', '_', ! empty($acceptLanguage) ? explode(',', $acceptLanguage)[0] : 'zh_CN');
     }
 }

tests/Helpers/Ip2regionTest.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  [email protected]
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace Mine\Tests\Helpers;
+
+use Mine\Helper\Ip2region;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+class Ip2regionTest extends TestCase
+{
+    public function testMake(): void
+    {
+        $ip2region = new Ip2region();
+        $this->assertInstanceOf(Ip2region::class, $ip2region);
+    }
+
+    public function testSearch()
+    {
+        $ip2region = new Ip2region();
+        $result = $ip2region->search('114.114.114.114');
+        $this->assertIsString($result);
+    }
+}

tests/bootstrap.php

@@ -9,7 +9,27 @@
  * @contact  [email protected]
  * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
  */
-ini_set('display_errors', 'on');
-ini_set('display_startup_errors', 'on');
-error_reporting(E_ALL);
-date_default_timezone_set('PRC');
+use Hyperf\Config\Listener\RegisterPropertyHandlerListener;
+use Hyperf\Di\Aop\AstVisitorRegistry;
+use Hyperf\Di\Aop\PropertyHandlerVisitor;
+use Hyperf\Di\Aop\ProxyCallVisitor;
+use Hyperf\Di\Aop\RegisterInjectPropertyHandler;
+
+// ini_set('display_errors', 'on');
+// ini_set('display_startup_errors', 'on');
+//
+// error_reporting(E_ALL);
+
+! defined('BASE_PATH') && define('BASE_PATH', dirname(__DIR__));
+! defined('SWOOLE_HOOK_FLAGS') && define('SWOOLE_HOOK_FLAGS', SWOOLE_HOOK_ALL);
+
+require_once BASE_PATH . '/vendor/autoload.php';
+
+// Register AST visitors to the collector.
+AstVisitorRegistry::insert(PropertyHandlerVisitor::class);
+AstVisitorRegistry::insert(ProxyCallVisitor::class);
+
+// Register Property Handler.
+RegisterInjectPropertyHandler::register();
+
+(new RegisterPropertyHandlerListener())->process(new stdClass());