commit by Simon.Ye

meiguonet · Sep 1, 2021 · ffe60c1 · ffe60c1
1 parent d4cb2dc
commit ffe60c1
Show file tree

Hide file tree

Showing 47 changed files with 1,188 additions and 569 deletions.
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
   },
   "require": {
     "php": ">=7.3.0",
-    "meiguonet/mgboot-common-php7": "^1.1.0",
+    "meiguonet/mgboot-common-php7": "^1.0.0",
     "nikic/fast-route": "^1.3.0"
   }
 }
diff --git a/src/MgBoot.php b/src/MgBoot.php
@@ -26,28 +26,60 @@
 
 final class MgBoot
 {
-    private static string $controllerDir = '';
-    private static ?LoggerInterface $runtimeLogger = null;
-    private static bool $requestLogEnabled = false;
-    private static ?LoggerInterface $requestLogLogger = null;
-    private static bool $executeTimeLogEnabled = false;
-    private static ?LoggerInterface $executeTimeLogLogger = null;
-    private static ?CorsSettings $corsSettings = null;
+    /**
+     * @var string
+     */
+    private static $controllerDir = '';
+
+    /**
+     * @var LoggerInterface|null
+     */
+    private static $runtimeLogger = null;
+
+    /**
+     * @var bool
+     */
+    private static $requestLogEnabled = false;
+
+    /**
+     * @var LoggerInterface|null
+     */
+    private static $requestLogLogger = null;
+
+    /**
+     * @var bool
+     */
+    private static $executeTimeLogEnabled = false;
+
+    /**
+     * @var LoggerInterface|null
+     */
+    private static $executeTimeLogLogger = null;
+
+    /**
+     * @var CorsSettings|null
+     */
+    private static $corsSettings = null;
+
     /**
      * @var JwtSettings[]
      */
-    private static array $jwtSettings = [];
-    private static bool $gzipOutputEnabled = true;
+    private static $jwtSettings = [];
+
+    /**
+     * @var bool
+     */
+    private static $gzipOutputEnabled = true;
 
     /**
      * @var ExceptionHandler[]
      */
-    private static array $exceptionHandlers = [];
+    private static $exceptionHandlers = [];
 
     /**
      * @var Middleware[]
      */
-    private static array $middlewares = [];
+    private static $middlewares = [];
 
     private function __construct()
     {
@@ -80,7 +112,7 @@ public static function handleRequest(Request $request, Response $response): void
         $httpMethod = strtoupper($request->getMethod());
         $uri = $request->getRequestUrl();
 
-        if (str_contains($uri, '?')) {
+        if (strpos($uri, '?') !== false) {
             $uri = substr($uri, 0, strpos($uri, '?'));
         }
 
@@ -266,7 +298,7 @@ private static function checkNecessaryExceptionHandlers(): void
             $found = false;
 
             foreach (self::$exceptionHandlers as $handler) {
-                if (str_contains($handler->getExceptionClassName(), $clazz)) {
+                if (strpos($handler->getExceptionClassName(), $clazz) !== false) {
                     $found = true;
                     break;
                 }
@@ -313,8 +345,7 @@ private static function setRouteRuleToRequest(Request $request, string $httpMeth
         }
 
         if ($matched instanceof RouteRule) {
-            /** @noinspection PhpUndefinedVariableInspection */
-            $request->withRouteRule($rule);
+            $request->withRouteRule($matched);
             return true;
         }
 

diff --git a/src/annotation/ClientIp.php b/src/annotation/ClientIp.php
@@ -2,9 +2,13 @@
 
 namespace mgboot\core\annotation;
 
-use Attribute;
 
-#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
+use Doctrine\Common\Annotations\Annotation\Target;
+
+/**
+ * @Annotation
+ * @Target({"ANNOTATION", "PROPERTY"})
+ */
 final class ClientIp
 {
 }
diff --git a/src/annotation/DeleteMapping.php b/src/annotation/DeleteMapping.php
@@ -2,16 +2,30 @@
 
 namespace mgboot\core\annotation;
 
-use Attribute;
+use Doctrine\Common\Annotations\Annotation\Target;
 
-#[Attribute(Attribute::TARGET_METHOD)]
+/**
+ * @Annotation
+ * @Target("METHOD")
+ */
 final class DeleteMapping
 {
-    private string $value;
+    /**
+     * @var string
+     */
+    private $value;
 
-    public function __construct(string $arg0)
+    public function __construct($arg0)
     {
-        $this->value = $arg0;
+        $value = '';
+
+        if (is_string($arg0) && $arg0 !== '') {
+            $value = $arg0;
+        } else if (is_array($arg0) && is_string($arg0['value']) && $arg0['value'] !== '') {
+            $value = $arg0['value'];
+        }
+
+        $this->value = $value;
     }
 
     /**

diff --git a/src/annotation/DtoBind.php b/src/annotation/DtoBind.php
@@ -2,9 +2,12 @@
 
 namespace mgboot\core\annotation;
 
-use Attribute;
+use Doctrine\Common\Annotations\Annotation\Target;
 
-#[Attribute(Attribute::TARGET_PARAMETER)]
+/**
+ * @Annotation
+ * @Target("ANNOTATION")
+ */
 final class DtoBind
 {
 }
diff --git a/src/annotation/GetMapping.php b/src/annotation/GetMapping.php
@@ -2,16 +2,28 @@
 
 namespace mgboot\core\annotation;
 
-use Attribute;
-
-#[Attribute(Attribute::TARGET_METHOD)]
+/**
+ * @Annotation
+ * @Target("METHOD")
+ */
 final class GetMapping
 {
-    private string $value;
+    /**
+     * @var string
+     */
+    private $value;
 
-    public function __construct(string $arg0)
+    public function __construct($arg0)
     {
-        $this->value = $arg0;
+        $value = '';
+
+        if (is_string($arg0) && $arg0 !== '') {
+            $value = $arg0;
+        } else if (is_array($arg0) && is_string($arg0['value']) && $arg0['value'] !== '') {
+            $value = $arg0['value'];
+        }
+
+        $this->value = $value;
     }
 
     /**

diff --git a/src/annotation/HttpHeader.php b/src/annotation/HttpHeader.php
@@ -2,16 +2,22 @@
 
 namespace mgboot\core\annotation;
 
-use Attribute;
+use Doctrine\Common\Annotations\Annotation\Target;
 
-#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
+/**
+ * @Annotation
+ * @Target({"ANNOTATION", "PROPERTY"})
+ */
 final class HttpHeader
 {
-    private string $name;
+    /**
+     * @var string
+     */
+    private $name;
 
-    public function __construct(string $arg0)
+    public function __construct(?string $name = null)
     {
-        $this->name = $arg0;
+        $this->name = empty($name) ? '' : $name;
     }
 
     /**

diff --git a/src/annotation/JwtAuth.php b/src/annotation/JwtAuth.php
@@ -2,23 +2,37 @@
 
 namespace mgboot\core\annotation;
 
-use Attribute;
+use Doctrine\Common\Annotations\Annotation\Target;
 
-#[Attribute(Attribute::TARGET_METHOD)]
+/**
+ * @Annotation
+ * @Target("METHOD")
+ */
 final class JwtAuth
 {
-    private string $settingsKey;
+    /**
+     * @var string
+     */
+    private $value;
 
-    public function __construct(string $arg0)
+    public function __construct($arg0)
     {
-        $this->settingsKey = $arg0;
+        $value = '';
+
+        if (is_string($arg0) && $arg0 !== '') {
+            $value = $arg0;
+        } else if (is_array($arg0) && is_string($arg0['value']) && $arg0['value'] !== '') {
+            $value = $arg0['value'];
+        }
+
+        $this->value = $value;
     }
 
     /**
      * @return string
      */
-    public function getSettingsKey(): string
+    public function getValue(): string
     {
-        return $this->settingsKey;
+        return $this->value;
     }
 }
diff --git a/src/annotation/JwtClaim.php b/src/annotation/JwtClaim.php
@@ -2,16 +2,23 @@
 
 namespace mgboot\core\annotation;
 
-use Attribute;
+use Doctrine\Common\Annotations\Annotation\Target;
+use mgboot\Cast;
 
-#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
+/**
+ * @Annotation
+ * @Target({"ANNOTATION", "PROPERTY"})
+ */
 final class JwtClaim
 {
-    private string $name;
+    /**
+     * @var string
+     */
+    private $name;
 
-    public function __construct(string $arg0 = '')
+    public function __construct(?string $name = null)
     {
-        $this->name = $arg0;
+        $this->name = empty($name) ? '' : $name;
     }
 
     /**

diff --git a/src/annotation/MapBind.php b/src/annotation/MapBind.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace mgboot\core\annotation;
+
+use Doctrine\Common\Annotations\Annotation\Target;
+use mgboot\constant\Regexp;
+
+/**
+ * @Annotation
+ * @Target("ANNOTATION")
+ */
+final class MapBind
+{
+    /**
+     * @var string[]
+     */
+    private $rules;
+
+    public function __construct($arg0 = null)
+    {
+        $rules = [];
+
+        if (is_string($arg0) && $arg0 !== '') {
+            $rules = preg_split(Regexp::COMMA_SEP, $arg0);
+        } else if (is_array($arg0) && !empty($arg0)) {
+            foreach ($arg0 as $s1) {
+                if (!is_string($s1) || $s1 === '') {
+                    continue;
+                }
+
+                $rules[] = $s1;
+            }
+        }
+
+        $this->rules = $rules;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getRules(): array
+    {
+        return $this->rules;
+    }
+}
diff --git a/src/annotation/ParamInject.php b/src/annotation/ParamInject.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace mgboot\core\annotation;
+
+use Doctrine\Common\Annotations\Annotation\Target;
+
+/**
+ * @Annotation
+ * @Target("METHOD")
+ */
+final class ParamInject
+{
+    /**
+     * @var array
+     */
+    private $value;
+
+    public function __construct(array $values)
+    {
+        $this->value = $values;
+    }
+
+    /**
+     * @return array
+     */
+    public function getValue(): array
+    {
+        return $this->value;
+    }
+}