Merge branch 'master' of https://github.com/windwalker-io/framework

windwalker-io · Jan 24, 2024 · 7c00a53 · 7c00a53
2 parents 4cd74d8 + 2cb4b47
commit 7c00a53
Show file tree

Hide file tree

Showing 29 changed files with 416 additions and 115 deletions.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,8 @@
         "paragonie/constant_time_encoding": "^2.3",
         "composer/ca-bundle": "^1.2",
         "symfony/options-resolver": "^5.0||^6.0||^7.0",
-        "symfony/polyfill-php83": "^1.27"
+        "symfony/polyfill-php83": "^1.27",
+        "asika/object-metadata": "^1.0"
     },
     "require-dev": {
         "asika/sql-splitter": "^1.0",
@@ -272,4 +273,4 @@
             "yarn.lock"
         ]
     }
-}
+}
diff --git a/packages/database/src/Driver/AbstractStatement.php b/packages/database/src/Driver/AbstractStatement.php
@@ -225,7 +225,7 @@ protected function fetchedEvent(?array $item): ?array
      */
     public function loadColumn(int|string $offset = 0): Collection
     {
-        $all = $this->all();
+        $all = $this->all(Collection::class);
 
         if (is_numeric($offset)) {
             return $all->mapProxy()

diff --git a/packages/database/test/Platform/PostgreSQLPlatformTest.php b/packages/database/test/Platform/PostgreSQLPlatformTest.php
@@ -121,7 +121,7 @@ public function testGetViews(): void
     ww_articles.language,
     ww_articles.params
    FROM ww_articles;'
-                    )
+                        )
                     ),
                     'CHECK_OPTION' => 'NONE',
                     'IS_UPDATABLE' => 'YES',

diff --git a/packages/filesystem/src/FileObject.php b/packages/filesystem/src/FileObject.php
@@ -668,8 +668,6 @@ public function exists(int $sensitive = Path::CASE_OS_DEFAULT): bool
     }
 
     /**
-     * getParent
-     *
      * @param  int  $levels
      *
      * @return  static
@@ -679,6 +677,11 @@ public function getParent(int $levels = 1): static
         return static::wrap(dirname($this->getPathname(), $levels));
     }
 
+    public function getPathObject(): static
+    {
+        return static::wrap($this->getPath());
+    }
+
     /**
      * getStream
      *

diff --git a/packages/filter/src/Rule/Clamp.php b/packages/filter/src/Rule/Clamp.php
@@ -5,7 +5,6 @@
 namespace Windwalker\Filter\Rule;
 
 use Windwalker\Filter\AbstractFilter;
-
 use Windwalker\Utilities\TypeCast;
 
 use function Windwalker\clamp;

diff --git a/packages/form/src/Field/AbstractField.php b/packages/form/src/Field/AbstractField.php
@@ -7,7 +7,6 @@
 use BadMethodCallException;
 use Closure;
 use InvalidArgumentException;
-use Windwalker\Data\Collection;
 use Windwalker\DOM\DOMElement;
 use Windwalker\Form\Field\Concern\{ManageFilterTrait,
     ManageInputTrait,
@@ -23,9 +22,6 @@
 use Windwalker\Utilities\Options\StateAccessTrait;
 use Windwalker\Utilities\Str;
 
-use Windwalker\Utilities\TypeCast;
-
-use function Windwalker\collect;
 use function Windwalker\DOM\h;
 
 /**

diff --git a/packages/form/src/Field/TextField.php b/packages/form/src/Field/TextField.php
@@ -7,7 +7,6 @@
 use Windwalker\DOM\DOMElement;
 use Windwalker\Filter\Rule\Length;
 use Windwalker\Form\Field\Concern\ListOptionsTrait;
-
 use Windwalker\Utilities\TypeCast;
 
 use function Windwalker\DOM\h;

diff --git a/packages/http/src/CaBundleFinder.php b/packages/http/src/CaBundleFinder.php
@@ -25,7 +25,7 @@ public static function find(): ?string
 
         $finder = static::getFinder();
 
-        $file =$finder();
+        $file = $finder();
 
         if (file_exists($file)) {
             return $file;

diff --git a/packages/http/test/HttpClientTest.php b/packages/http/test/HttpClientTest.php
@@ -15,11 +15,9 @@
 use Windwalker\Http\Test\Mock\MockTransport;
 use Windwalker\Http\Transport\CurlTransport;
 use Windwalker\Promise\Promise;
-use Windwalker\Promise\Scheduler\TaskQueue;
 use Windwalker\Test\Traits\BaseAssertionTrait;
 use Windwalker\Uri\Uri;
 use Windwalker\Uri\UriHelper;
-
 use Windwalker\Utilities\Str;
 
 use function Windwalker\Uri\uri_prepare;

diff --git a/packages/orm/composer.json b/packages/orm/composer.json
@@ -17,6 +17,7 @@
     "license": "MIT",
     "require": {
         "php": ">=8.2.0",
+        "asika/object-metadata": "^1.0",
         "windwalker/attributes": "^4.0",
         "windwalker/database": "^4.0",
         "windwalker/utilities": "^4.0",