Merge pull request #38 from tab-engineer/1.x

1.x
next-laboratory · Aug 20, 2022 · 7bd7727 · 7bd7727
2 parents bd41a90 + 200c445
commit 7bd7727
Show file tree

Hide file tree

Showing 49 changed files with 403 additions and 779 deletions.
diff --git a/src/aop/README.md b/src/aop/README.md
@@ -5,7 +5,7 @@
 > 环境要求 PHP >= 8.0
 
 ```shell
-composer require max/aop:dev-master
+composer require max/aop
 ```
 
 # 使用，以下以webman为例

diff --git a/src/aop/composer.json b/src/aop/composer.json
@@ -17,8 +17,8 @@
     "require": {
         "php": "^8.0",
         "ext-pcntl": "*",
-        "max/utils": "dev-master",
-        "max/di": "dev-master",
+        "max/utils": "^0.1",
+        "max/di": "^0.1",
         "nikic/php-parser": "^4.13",
         "symfony/finder": "*"
     }

diff --git a/src/aop/src/PropertyHandlerVisitor.php b/src/aop/src/PropertyHandlerVisitor.php
@@ -36,8 +36,9 @@
 
 class PropertyHandlerVisitor extends NodeVisitorAbstract
 {
-    public function __construct(protected Metadata $metadata)
-    {
+    public function __construct(
+        protected Metadata $metadata
+    ) {
     }
 
     public function enterNode(Node $node)

diff --git a/src/aop/src/ProxyHandlerVisitor.php b/src/aop/src/ProxyHandlerVisitor.php
@@ -28,8 +28,9 @@
 
 class ProxyHandlerVisitor extends NodeVisitorAbstract
 {
-    public function __construct(protected Metadata $metadata)
-    {
+    public function __construct(
+        protected Metadata $metadata
+    ) {
     }
 
     public function leaveNode(Node $node)

diff --git a/src/cache/README.md b/src/cache/README.md
@@ -16,7 +16,7 @@
 缓存组件基于PSR16开发，已经独立，不再必须使用MaxPHP。你可以使用下面的命令安装开发版本。
 
 ```
-composer require max/cache:dev-master
+composer require max/cache
 ```
 
 # 使用

diff --git a/src/cache/composer.json b/src/cache/composer.json
@@ -27,9 +27,9 @@
     },
     "require": {
         "php": "^8.0",
-        "max/utils": "dev-master",
+        "max/utils": "^0.1",
         "psr/simple-cache": "^1.0",
-        "max/redis": "dev-master"
+        "max/redis": "^0.1"
     },
     "extra": {
         "max": {

diff --git a/src/cache/src/Cache.php b/src/cache/src/Cache.php
@@ -20,9 +20,6 @@
 
 class Cache implements CacheInterface
 {
-    /**
-     * @param CacheDriverInterface $driver
-     */
     public function __construct(
         protected CacheDriverInterface $driver
     ) {
@@ -113,12 +110,6 @@ public function deleteMultiple($keys)
         }
     }
 
-    /**
-     * @param string $key
-     * @param Closure $callback
-     * @param int|null $ttl
-     * @return mixed
-     */
     public function remember(string $key, Closure $callback, ?int $ttl = null): mixed
     {
         if (! $this->has($key)) {
@@ -127,30 +118,16 @@ public function remember(string $key, Closure $callback, ?int $ttl = null): mixe
         return $this->get($key);
     }
 
-    /**
-     * @param string $key
-     * @param int $step
-     * @return int
-     */
     public function increment(string $key, int $step = 1): int
     {
         return $this->driver->increment($key, $step);
     }
 
-    /**
-     * @param string $key
-     * @param int $step
-     * @return int
-     */
     public function decrement(string $key, int $step = 1): int
     {
         return $this->driver->decrement($key, $step);
     }
 
-    /**
-     * @param string $key
-     * @return mixed
-     */
     public function pull(string $key): mixed
     {
         $value = $this->get($key);

diff --git a/src/config/composer.json b/src/config/composer.json
@@ -19,7 +19,7 @@
     },
     "require": {
         "php": "^8.0",
-        "max/utils": "dev-master"
+        "max/utils": "^0.1"
     },
     "extra": {
         "max": {

diff --git a/src/database/composer.json b/src/database/composer.json
@@ -20,9 +20,9 @@
         "php": "^8.0",
         "ext-pdo": "*",
         "ext-json": "*",
-        "max/utils": "dev-master",
-        "max/config": "dev-master",
-        "max/context": "dev-master"
+        "max/utils": "^0.1",
+        "max/config": "^0.1",
+        "max/context": "^0.1"
     },
     "extra": {
         "max": {

diff --git a/src/database/src/Connector/AutoConnector.php b/src/database/src/Connector/AutoConnector.php
@@ -26,8 +26,9 @@ class AutoConnector implements ConnectorInterface
 
     protected array $container = [];
 
-    public function __construct(protected DatabaseConfig $config)
-    {
+    public function __construct(
+        protected DatabaseConfig $config
+    ) {
     }
 
     /**

diff --git a/src/database/src/Connector/BaseConnector.php b/src/database/src/Connector/BaseConnector.php
@@ -20,8 +20,9 @@ class BaseConnector implements ConnectorInterface
 {
     protected ArrayObject $pool;
 
-    public function __construct(protected DatabaseConfig $config)
-    {
+    public function __construct(
+        protected DatabaseConfig $config
+    ) {
         $this->pool = new ArrayObject();
     }
 

diff --git a/src/database/src/Connector/PoolConnector.php b/src/database/src/Connector/PoolConnector.php
@@ -34,8 +34,9 @@ class PoolConnector implements ConnectorInterface, PoolInterface
      */
     protected int $size = 0;
 
-    public function __construct(protected DatabaseConfig $config)
-    {
+    public function __construct(
+        protected DatabaseConfig $config
+    ) {
         $this->pool = new Channel($this->capacity = $config->getPoolSize());
         if ($config->isAutofill()) {
             $this->fill();

diff --git a/src/database/src/Eloquent/Relation/HasMany.php b/src/database/src/Eloquent/Relation/HasMany.php
@@ -16,7 +16,11 @@
 
 class HasMany
 {
-    public function __construct(Builder $builder, Model $owner, $foreignKey, $localKey)
-    {
+    public function __construct(
+        protected Builder $builder,
+        protected Model $owner,
+        protected $foreignKey,
+        protected $localKey
+    ) {
     }
 }
diff --git a/src/database/src/Manager.php b/src/database/src/Manager.php
@@ -52,8 +52,8 @@ public function __call(string $name, array $arguments)
     public function connection(?string $name = null): Query
     {
         $name ??= $this->defaultConnection;
-        if (!isset($this->connections[$name])) {
-            if (!isset($this->config[$name])) {
+        if (! isset($this->connections[$name])) {
+            if (! isset($this->config[$name])) {
                 throw new InvalidArgumentException('没有相关数据库连接');
             }
             $config                   = $this->config[$name];

diff --git a/src/database/src/Query/Builder.php b/src/database/src/Query/Builder.php
@@ -123,7 +123,7 @@ public function whereLike($column, $value): static
      */
     public function whereIn(string $column, array $in): static
     {
-        if (!empty($in)) {
+        if (! empty($in)) {
             $this->addBindings($in);
             $this->where[] = [$column, 'IN', sprintf('(%s)', rtrim(str_repeat('?, ', count($in)), ' ,'))];
         }
@@ -341,7 +341,7 @@ public function avg($column): int
 
     public function exists(): bool
     {
-        return (bool)$this->query->statement(
+        return (bool) $this->query->statement(
             sprintf('SELECT EXISTS(%s) AS MAX_EXIST', $this->toSql()),
             $this->bindings
         )->fetchColumn();
@@ -381,7 +381,7 @@ public function insert(array $record): int
             $this->bindings,
         );
 
-        return (int)$this->query->getPdo()->lastInsertId();
+        return (int) $this->query->getPdo()->lastInsertId();
     }
 
     public function insertMany(array $records): mixed
@@ -398,7 +398,7 @@ public function insertMany(array $records): mixed
 
     public function insertAll(array $data): array
     {
-        return array_map(fn($item) => $this->insert($item), $data);
+        return array_map(fn ($item) => $this->insert($item), $data);
     }
 
     public function update(array $data): int
@@ -411,7 +411,7 @@ public function generateSelectQuery(): string
         $query = 'SELECT ';
         foreach (static::$clause as $value) {
             $compiler = 'compile' . ucfirst($value);
-            if (!empty($this->{$value})) {
+            if (! empty($this->{$value})) {
                 $query .= $this->{$compiler}($this);
             }
         }
@@ -465,15 +465,15 @@ protected function addBindings($value): void
 
     protected function aggregate(string $expression): int
     {
-        return (int)$this->query->statement(
-            $this->toSql((array)($expression . ' AS AGGREGATE')),
+        return (int) $this->query->statement(
+            $this->toSql((array) ($expression . ' AS AGGREGATE')),
             $this->bindings
         )->fetchColumn();
     }
 
     protected function compileJoin(): string
     {
-        $joins = array_map(function(Join $item) {
+        $joins     = array_map(function (Join $item) {
             $alias = $item->alias ? 'AS ' . $item->alias : '';
             $on    = $item->on ? ('ON ' . implode(' ', $item->on)) : '';
             return ' ' . $item->league . ' ' . $item->table . ' ' . $alias . ' ' . $on;
@@ -513,7 +513,7 @@ protected function compileOffset(): string
 
     protected function compileOrder(): string
     {
-        $orderBy = array_map(fn($item) => $item[0] instanceof Expression ? $item[0]->__toString() : implode(' ', $item), $this->order);
+        $orderBy = array_map(fn ($item) => $item[0] instanceof Expression ? $item[0]->__toString() : implode(' ', $item), $this->order);
         return ' ORDER BY ' . implode(', ', $orderBy);
     }
 
@@ -524,7 +524,7 @@ protected function compileGroup(): string
 
     protected function compileHaving(): string
     {
-        $having = array_map(fn($item) => implode(' ', $item), $this->having);
+        $having = array_map(fn ($item) => implode(' ', $item), $this->having);
 
         return ' HAVING ' . implode(' AND ', $having);
     }

diff --git a/src/database/src/Query/Join.php b/src/database/src/Query/Join.php
@@ -38,11 +38,8 @@ public function __call($method, $args)
     }
 
     /**
-     * @param        $first
-     * @param        $last
-     * @param string $operator
-     *
-     * @return Builder
+     * @param $first
+     * @param $last
      */
     public function on($first, $last, string $operator = '='): Builder
     {

diff --git a/src/framework/src/Exception/VarDumperAbort.php b/src/framework/src/Exception/VarDumperAbort.php
@@ -15,7 +15,8 @@
 
 class VarDumperAbort extends Exception
 {
-    public function __construct(public mixed $vars)
-    {
+    public function __construct(
+        public mixed $vars
+    ) {
     }
 }
diff --git a/src/http-message/composer.json b/src/http-message/composer.json
@@ -20,6 +20,6 @@
     "require": {
         "php": "^8.0",
         "psr/http-message": "^1.0",
-        "max/utils": "dev-master"
+        "max/utils": "^0.1"
     }
 }
diff --git a/src/http-message/src/Bag/FileBag.php b/src/http-message/src/Bag/FileBag.php
@@ -16,8 +16,9 @@
 
 class FileBag
 {
-    public function __construct(protected array $uploadedFiles = [])
-    {
+    public function __construct(
+        protected array $uploadedFiles = []
+    ) {
     }
 
     public static function createFromGlobal(): static

diff --git a/src/http-message/src/Contract/HeaderInterface.php b/src/http-message/src/Contract/HeaderInterface.php
@@ -1,21 +1,43 @@
 <?php
 
+declare(strict_types=1);
+
+/**
+ * This file is part of MaxPHP.
+ *
+ * @link     https://github.com/marxphp
+ * @license  https://github.com/marxphp/max/blob/master/LICENSE
+ */
+
 namespace Max\Http\Message\Contract;
 
 interface HeaderInterface
 {
     public const HEADER_CONTENT_TYPE                     = 'Content-Type';
+
     public const HEADER_SET_COOKIE                       = 'Set-Cookie';
+
     public const HEADER_PRAGMA                           = 'Pragma';
+
     public const HEADER_ACCEPT                           = 'Accept';
+
     public const HEADER_EXPIRES                          = 'Expires';
+
     public const HEADER_CACHE_CONTROL                    = 'Cache-Control';
+
     public const HEADER_CONTENT_TRANSFER_ENCODING        = 'Content-Transfer-Encoding';
+
     public const HEADER_CONTENT_DISPOSITION              = 'Content-Disposition';
+
     public const HEADER_ORIGIN                           = 'Origin';
+
     public const HEADER_ACCESS_CONTROL_ALLOW_ORIGIN      = 'Access-Control-Allow-Origin';
+
     public const HEADER_ACCESS_CONTROL_MAX_AGE           = 'Access-Control-Max-Age';
+
     public const HEADER_ACCESS_CONTROL_ALLOW_CREDENTIALS = 'Access-Control-Allow-Credentials';
+
     public const HEADER_ACCESS_CONTROL_ALLOW_METHODS     = 'Access-Control-Allow-Methods';
+
     public const HEADER_ACCESS_CONTROL_ALLOW_HEADERS     = 'Access-Control-Allow-Headers';
 }