Merge remote-tracking branch 'origin/dev' into dev

dxkite · Jan 30, 2020 · 9e1c42e · 9e1c42e
2 parents 15eb278 + bff4879
commit 9e1c42e
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 24 deletions.
diff --git a/suda/src/application/debug/RequestDumper.php b/suda/src/application/debug/RequestDumper.php
@@ -29,16 +29,4 @@ public function __construct(Application $application, Request $request, Response
         parent::__construct($application, $context);
         $this->response = $response;
     }
-
-    /**
-     * @param Throwable $throwable
-     */
-    public function dumpThrowable($throwable)
-    {
-        parent::dumpThrowable($throwable);
-        if ($this->response->isSend() === false) {
-            $this->response->sendContent($throwable);
-            $this->response->end();
-        }
-    }
 }
diff --git a/suda/src/application/template/ModuleTemplateBase.php b/suda/src/application/template/ModuleTemplateBase.php
@@ -210,10 +210,9 @@ protected function getModuleStaticAssetRoot(?string $module)
     protected function prepareStaticModuleSource(?string $module, ?string  $name = null)
     {
         $copySource = $this->application->conf('copy-static-source', SUDA_DEBUG);
-        if ($copySource) {
-            $static = $this->getModuleStaticPath($module, $name);
-            $staticCopyed = is_dir($static) && in_array($static, static::$copiedStaticPaths);
-            if ($staticCopyed === false) {
+        $static = $this->getModuleStaticPath($module, $name);
+        if ($copySource && is_dir($static)) {
+            if (in_array($static, static::$copiedStaticPaths) === false) {
                 $from = $static;
                 $to = $this->getModuleStaticOutputPath($module, $name);
                 $time = sprintf('copy template static source %s => %s ', $from, $to);

diff --git a/suda/src/application/template/RawTemplate.php b/suda/src/application/template/RawTemplate.php
@@ -177,19 +177,20 @@ public function exec(string $name)
      */
     public function getRenderedString()
     {
-        if (file_exists($this->getPath())) {
+        $path = $this->getPath();
+        if (file_exists($path)) {
             ob_start();
             extract($this->value);
-            include $this->getPath();
+            include $path;
             if ($this->extend) {
                 $this->include($this->extend);
             }
             return ob_get_clean() ?: '';
         }
         throw new NoTemplateFoundException(
-            'missing dest at ' . $this->getPath(),
+            'missing dest at ' . $path ,
             E_USER_ERROR,
-            $this->getPath(),
+            $path ,
             1
         );
     }

diff --git a/suda/src/application/wrapper/TemplateWrapper.php b/suda/src/application/wrapper/TemplateWrapper.php
@@ -20,6 +20,7 @@ class TemplateWrapper extends AbstractContentWrapper
     public function getWrappedContent(Response $response):Stream
     {
         $content = $this->content;
-        return new StringStream($content->getRenderedString());
+        $text = $content->getRenderedString();
+        return new StringStream($text);
     }
 }
diff --git a/suda/src/database/statement/QueryAccess.php b/suda/src/database/statement/QueryAccess.php
@@ -134,7 +134,9 @@ protected function createPDOStatement(Connection $connection, Statement $stateme
         $queryObj = $statement->getQuery();
         $query = $connection->prefix($queryObj->getQuery());
         if ($statement->isScroll()) {
-            $stmt = $connection->getPdo()->prepare($query, [PDO::ATTR_CURSOR => PDO::CURSOR_SCROLL]);
+            $stmt = $connection->getPdo()->prepare($query, [
+                PDO::ATTR_CURSOR => PDO::CURSOR_SCROLL
+            ]);
         } else {
             $stmt = $connection->getPdo()->prepare($query);
         }

diff --git a/suda/src/database/struct/QueryStatement.php b/suda/src/database/struct/QueryStatement.php
@@ -148,7 +148,9 @@ public function id():string
      * @throws SQLException
      */
     public function count() {
-        $totalQuery = new QueryStatement($this->getAccess(), sprintf("SELECT count(*) as count from (%s) as total", $this->getString()),
+        $query = $this->getString();
+        $query = preg_replace('/LIMIT\s+\d+(\s*,\s*\d+)?\s*$/ims', '', $query);
+        $totalQuery = new QueryStatement($this->getAccess(), sprintf("SELECT count(*) as count from (%s) as total", $query),
             $this->getBinder());
         $totalQuery->wantType(null);
         $data = $totalQuery->one();

diff --git a/suda/src/database/struct/ReadStatement.php b/suda/src/database/struct/ReadStatement.php
@@ -120,7 +120,15 @@ public function fetchAll(?string $class = null, array $args = []): array
      * @throws SQLException
      */
     public function count() {
-        $totalQuery = new QueryStatement($this->getAccess(), sprintf("SELECT count(*) as count from (%s) as total", $this->getString()),
+        $query = clone $this;
+        $query->orderBy = '';
+        $query->limit = '';
+        $fields = $this->struct->all();
+        if (count($fields) > 0) {
+            $field = \array_shift($fields);
+            $query->read([$field->getName()]);
+        }
+        $totalQuery = new QueryStatement($this->getAccess(), sprintf("SELECT count(*) as count from (%s) as total", $query->getString()),
             $this->getBinder());
         $totalQuery->wantType(null);
         $data = $totalQuery->one();

diff --git a/suda/src/framework/loader/Path.php b/suda/src/framework/loader/Path.php
@@ -18,6 +18,9 @@ class Path
      */
     public static function format(string $path):?string
     {
+        if (strlen(trim($path)) === 0) {
+            return null;
+        }
         return static::existCharset($path, ['GBK','GB2312','BIG5']);
     }