Compare commits
No commits in common. "master" and "V4.2.3" have entirely different histories.
12
.github/FUNDING.yml
vendored
12
.github/FUNDING.yml
vendored
@ -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']
|
|
||||||
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,4 +2,3 @@
|
|||||||
.idea/
|
.idea/
|
||||||
composer.lock
|
composer.lock
|
||||||
.DS_Store
|
.DS_Store
|
||||||
*.cache
|
|
||||||
@ -29,7 +29,7 @@
|
|||||||
- .....
|
- .....
|
||||||
|
|
||||||
## 环境要求
|
## 环境要求
|
||||||
- PHP >= 7.1
|
- PHP >= 7.0
|
||||||
|
|
||||||
> 如果你的PHP版本还停留在PHP5，或者不会使用Composer,你可以选择使用QueryList3,QueryList3支持php5.3以及手动安装。
|
> 如果你的PHP版本还停留在PHP5，或者不会使用Composer,你可以选择使用QueryList3,QueryList3支持php5.3以及手动安装。
|
||||||
QueryList3 文档:http://v3.querylist.cc
|
QueryList3 文档:http://v3.querylist.cc
|
||||||
|
|||||||
@ -31,7 +31,7 @@ Through plug-ins you can easily implement things like:
|
|||||||
- .....
|
- .....
|
||||||
|
|
||||||
## Requirements
|
## Requirements
|
||||||
- PHP >= 7.1
|
- PHP >= 7.0
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
By Composer installation:
|
By Composer installation:
|
||||||
|
|||||||
@ -6,9 +6,9 @@
|
|||||||
"require": {
|
"require": {
|
||||||
"PHP":">=7.1",
|
"PHP":">=7.1",
|
||||||
"jaeger/phpquery-single": "^1",
|
"jaeger/phpquery-single": "^1",
|
||||||
|
"tightenco/collect": "^5",
|
||||||
"jaeger/g-http": "^1.1",
|
"jaeger/g-http": "^1.1",
|
||||||
"ext-dom": "*",
|
"ext-dom": "*"
|
||||||
"tightenco/collect": ">5.0"
|
|
||||||
},
|
},
|
||||||
"suggest":{
|
"suggest":{
|
||||||
|
|
||||||
|
|||||||
@ -7,7 +7,6 @@
|
|||||||
|
|
||||||
namespace QL;
|
namespace QL;
|
||||||
use Closure;
|
use Closure;
|
||||||
use Tightenco\Collect\Support\Collection;
|
|
||||||
|
|
||||||
class Config
|
class Config
|
||||||
{
|
{
|
||||||
@ -21,8 +20,8 @@ class Config
|
|||||||
*/
|
*/
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
$this->plugins = new Collection();
|
$this->plugins = collect();
|
||||||
$this->binds = new Collection();
|
$this->binds = collect();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -9,7 +9,6 @@ namespace QL\Dom;
|
|||||||
|
|
||||||
use phpDocumentor\Reflection\Types\Null_;
|
use phpDocumentor\Reflection\Types\Null_;
|
||||||
use phpQueryObject;
|
use phpQueryObject;
|
||||||
use Tightenco\Collect\Support\Collection;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class Elements
|
* Class Elements
|
||||||
@ -192,7 +191,7 @@ class Elements
|
|||||||
*/
|
*/
|
||||||
public function map($callback)
|
public function map($callback)
|
||||||
{
|
{
|
||||||
$collection = new Collection();
|
$collection = collect();
|
||||||
$this->elements->each(function ($dom) use (& $collection, $callback) {
|
$this->elements->each(function ($dom) use (& $collection, $callback) {
|
||||||
$collection->push($callback(new self(pq($dom))));
|
$collection->push($callback(new self(pq($dom))));
|
||||||
});
|
});
|
||||||
|
|||||||
@ -125,8 +125,8 @@ class Query
|
|||||||
*/
|
*/
|
||||||
public function removeHead()
|
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;
|
return $this->ql;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -147,7 +147,7 @@ class Query
|
|||||||
{
|
{
|
||||||
if (is_callable($callback)) {
|
if (is_callable($callback)) {
|
||||||
if (empty($this->range)) {
|
if (empty($this->range)) {
|
||||||
$data = new Collection($callback($data->all(), null));
|
$data = collect($callback($data->all(), null));
|
||||||
} else {
|
} else {
|
||||||
$data = $data->map($callback);
|
$data = $data->map($callback);
|
||||||
}
|
}
|
||||||
@ -178,7 +178,7 @@ class Query
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return new Collection($data);
|
return collect($data);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function extractContent(phpQueryObject $pqObj, $ruleName, $rule)
|
protected function extractContent(phpQueryObject $pqObj, $ruleName, $rule)
|
||||||
@ -209,13 +209,7 @@ class Query
|
|||||||
})->all();
|
})->all();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if(preg_match('/attr\((.+)\)/', $rule['attr'], $arr)) {
|
$content = $pqObj->attr($rule['attr']);
|
||||||
$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;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -14,7 +14,6 @@ use Closure;
|
|||||||
use QL\Providers\HttpServiceProvider;
|
use QL\Providers\HttpServiceProvider;
|
||||||
use QL\Providers\PluginServiceProvider;
|
use QL\Providers\PluginServiceProvider;
|
||||||
use QL\Providers\SystemServiceProvider;
|
use QL\Providers\SystemServiceProvider;
|
||||||
use Tightenco\Collect\Support\Collection;
|
|
||||||
|
|
||||||
class Kernel
|
class Kernel
|
||||||
{
|
{
|
||||||
@ -35,7 +34,7 @@ class Kernel
|
|||||||
public function __construct(QueryList $ql)
|
public function __construct(QueryList $ql)
|
||||||
{
|
{
|
||||||
$this->ql = $ql;
|
$this->ql = $ql;
|
||||||
$this->binds = new Collection();
|
$this->binds = collect();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function bootstrap()
|
public function bootstrap()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user