15 changed files with 64 additions and 100 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -1,12 +0,0 @@
 # These are supported funding model platforms
 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
 open_collective: querylist # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
 custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
--- a/.gitignore
+++ b/.gitignore
@ -2,4 +2,3 @@
 .idea/
 composer.lock
 .DS_Store
 *.cache
--- a/README-ZH.md
+++ b/README-ZH.md
@ -29,7 +29,7 @@
 - .....
 ## 环境要求
- PHP >= 7.1
+- PHP >= 7.0
 > 如果你的PHP版本还停留在PHP5，或者不会使用Composer,你可以选择使用QueryList3,QueryList3支持php5.3以及手动安装。
 QueryList3 文档:http://v3.querylist.cc
--- a/README.md
+++ b/README.md
@ -31,7 +31,7 @@ Through plug-ins you can easily implement things like:
 - .....
 ## Requirements
- PHP >= 7.1
+- PHP >= 7.0
 ## Installation
 By Composer installation:
--- a/composer.json
+++ b/composer.json
@ -4,11 +4,11 @@
    "keywords":["QueryList","phpQuery","spider"],
    "homepage": "http://querylist.cc",
    "require": {
-        "PHP":">=7.1",
+        "PHP":">=7.0",
        "jaeger/phpquery-single": "^1",
        "tightenco/collect": "^5",
        "jaeger/g-http": "^1.1",
-        "ext-dom": "*",
+        "ext-dom": "*"
        "tightenco/collect": ">5.0"
    },
    "suggest":{
@ -32,9 +32,6 @@
    },
    "require-dev": {
        "symfony/var-dumper": "^3.3",
-        "phpunit/phpunit": "^8.5"
+        "phpunit/phpunit": "^7.5"
    },
    "scripts": {
        "test": "./vendor/bin/phpunit"
    }
 }
--- a/src/Config.php
+++ b/src/Config.php
@ -7,7 +7,6 @@
 namespace QL;
 use Closure;
 use Tightenco\Collect\Support\Collection;
 class Config
 {
@ -21,8 +20,8 @@ class Config
     */
    public function __construct()
    {
-        $this->plugins = new Collection();
+        $this->plugins = collect();
-        $this->binds = new Collection();
+        $this->binds = collect();
    }
--- a/src/Dom/Elements.php
+++ b/src/Dom/Elements.php
@ -9,7 +9,6 @@ namespace QL\Dom;
 use phpDocumentor\Reflection\Types\Null_;
 use phpQueryObject;
 use Tightenco\Collect\Support\Collection;
 /**
 * Class Elements
@ -192,7 +191,7 @@ class Elements
     */
    public function map($callback)
    {
-        $collection = new Collection();
+        $collection = collect();
        $this->elements->each(function ($dom) use (& $collection, $callback) {
            $collection->push($callback(new self(pq($dom))));
        });
--- a/src/Dom/Query.php
+++ b/src/Dom/Query.php
@ -35,12 +35,11 @@ class Query
    }
    /**
-     * @param bool $rel
+     * @return mixed
     * @return String
     */
-    public function getHtml($rel = true)
+    public function getHtml()
    {
-        return $rel ? $this->document->htmlOuter() : $this->html;
+        return $this->html;
    }
    /**
@ -64,7 +63,7 @@ class Query
     */
    public function getData(Closure $callback = null)
    {
-        return $this->handleData($this->data, $callback);
+        return  is_null($callback) ? $this->data : $this->data->map($callback);
    }
    /**
@ -125,8 +124,8 @@ class Query
     */
    public function removeHead()
    {
-        $html = preg_replace('/(<head>|<head\s+.+?>).+?<\/head>/is', '<head></head>', $this->html);
+        $html = preg_replace('/<head.+?>.+<\/head>/is','<head></head>',$this->html);
-        $html && $this->setHtml($html);
+        $this->setHtml($html);
        return $this->ql;
    }
@ -139,23 +138,10 @@ class Query
    public function query(Closure $callback = null)
    {
        $this->data = $this->getList();
-        $this->data = $this->handleData($this->data, $callback);
+        $callback && $this->data = $this->data->map($callback);
        return $this->ql;
    }
    public function handleData(Collection $data, $callback)
    {
        if (is_callable($callback)) {
            if (empty($this->range)) {
                $data = new Collection($callback($data->all(), null));
            } else {
                $data = $data->map($callback);
            }
        }
        return $data;
    }
    protected function getList()
    {
        $data = [];
@ -178,7 +164,7 @@ class Query
            }
        }
-        return new Collection($data);
+        return collect($data);
    }
    protected function extractContent(phpQueryObject $pqObj, $ruleName, $rule)
@ -209,13 +195,7 @@ class Query
                })->all();
                break;
            default:
                if(preg_match('/attr\((.+)\)/', $rule['attr'], $arr)) {
                    $content = $pqObj->attr($arr[1]);
                } elseif (preg_match('/attrs\((.+)\)/', $rule['attr'], $arr)) {
                    $content = (new Elements($pqObj))->attrs($arr[1])->all();
                } else {
                $content = $pqObj->attr($rule['attr']);
                }
                break;
        }
@ -276,8 +256,10 @@ class Query
    {
        $tagArr = preg_split("/\s+/",$tags_str,-1,PREG_SPLIT_NO_EMPTY);
        $tags = array(array(),array());
-        foreach ($tagArr as $tag) {
+        foreach($tagArr as $tag)
-            if (preg_match('/-(.+)/', $tag, $arr)) {
+        {
            if(preg_match('/-(.+)/', $tag,$arr))
            {
                array_push($tags[1], $arr[1]);
            }else{
                array_push($tags[0], $tag);
@ -295,7 +277,8 @@ class Query
    protected function removeTags($html,$tags)
    {
        $tag_str = '';
-        if (count($tags)) {
+        if(count($tags))
        {
            foreach ($tags as $tag) {
                $tag_str .= $tag_str?','.$tag:$tag;
            }
--- a/src/Kernel.php
+++ b/src/Kernel.php
@ -14,7 +14,6 @@ use Closure;
 use QL\Providers\HttpServiceProvider;
 use QL\Providers\PluginServiceProvider;
 use QL\Providers\SystemServiceProvider;
 use Tightenco\Collect\Support\Collection;
 class Kernel
 {
@ -35,7 +34,7 @@ class Kernel
    public function __construct(QueryList $ql)
    {
        $this->ql = $ql;
-        $this->binds = new Collection();
+        $this->binds = collect();
    }
    public function bootstrap()
--- a/src/QueryList.php
+++ b/src/QueryList.php
@ -23,7 +23,7 @@ use QL\Services\MultiRequestService;
 * Class QueryList
 * @package QL
 *
- * @method string getHtml($rel = true)
+ * @method string getHtml()
 * @method QueryList setHtml($html)
 * @method QueryList html($html)
 * @method Dom\Elements find($selector)
--- a/tests/Dom/FindTest.php
+++ b/tests/Dom/FindTest.php
@ -17,7 +17,7 @@ class FindTest extends TestCaseBase
    protected $html;
    protected $ql;
-    protected function setUp(): void
+    public function setUp()
    {
        $this->html = $this->getSnippet('snippet-1');
        $this->ql = QueryList::html($this->html);
--- a/tests/Dom/RulesTest.php
+++ b/tests/Dom/RulesTest.php
@ -18,7 +18,7 @@ class RulesTest extends TestCaseBase
    protected $html;
    protected $ql;
-    protected function setUp(): void
+    public function setUp()
    {
        $this->html = $this->getSnippet('snippet-2');
        $this->ql = QueryList::html($this->html);
--- a/tests/Feature/HttpTest.php
+++ b/tests/Feature/HttpTest.php
@ -18,7 +18,7 @@ class HttpTest extends TestCaseBase
 {
    protected $urls;
-    protected function setUp(): void
+    public function setUp()
    {
        $this->urls = [
            'http://httpbin.org/get?name=php',
--- a/tests/Feature/InstanceTest.php
+++ b/tests/Feature/InstanceTest.php
@ -16,7 +16,7 @@ class InstanceTest extends TestCaseBase
 {
    protected $html;
-    protected function setUp(): void
+    public function setUp()
    {
        $this->html = $this->getSnippet('snippet-1');
    }
@ -38,11 +38,11 @@ class InstanceTest extends TestCaseBase
    public function get_new_object()
    {
        $ql = (new QueryList())->html($this->html);
-        $ql2 = (new QueryList())->html('');
+        $ql2 = new QueryList();
        $this->assertNotEquals($ql->getHtml(),$ql2->getHtml());
        $ql = QueryList::range('')->html($this->html);
-        $ql2 = QueryList::range('')->html('');
+        $ql2 = QueryList::range('');
        $this->assertNotEquals($ql->getHtml(),$ql2->getHtml());
    }
 }
--- a/tests/Feature/MethodTest.php
+++ b/tests/Feature/MethodTest.php
@ -16,7 +16,7 @@ class MethodTest extends TestCaseBase
 {
    protected $html;
-    protected function setUp(): void
+    public function setUp()
    {
        $this->html = $this->getSnippet('snippet-1');
    }
@ -30,7 +30,7 @@ class MethodTest extends TestCaseBase
        $qlHtml = QueryList::pipe(function(QueryList $ql) use($html){
            $ql->setHtml($html);
            return $ql;
-        })->getHtml(false);
+        })->getHtml();
        $this->assertEquals($html,$qlHtml);
    }
 }