mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-14 10:45:54 +02:00
Code Issues Releases Wiki Activity

Add update to accommodate different "not" logic in a new notAll() method for WireArray/PageArray per processwire/processwire-issues#383

Browse Source
This commit is contained in:
Ryan Cramer
2019-04-05 12:06:08 -04:00
parent 711b6b8f3d
commit e0b1c5c1bd
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wire/core/PageArray.php
View File

@@ -453,7 +453,7 @@ class PageArray extends PaginatedArray implements WirePaginatable {
* This is applicable to and destructive to the WireArray. * This is applicable to and destructive to the WireArray.
* *
* @param string|Selectors|array $selectors AttributeSelector string to use as the filter. * @param string|Selectors|array $selectors AttributeSelector string to use as the filter.
* @param bool $not Make this a "not" filter? (default is false) * @param bool|int $not Make this a "not" filter? Use int 1 for "not all". (default is false)
* @return PageArray|WireArray reference to current [filtered] PageArray * @return PageArray|WireArray reference to current [filtered] PageArray
* *
*/ */

27
wire/core/WireArray.php
View File

@@ -1449,7 +1449,7 @@ class WireArray extends Wire implements \IteratorAggregate, \ArrayAccess, \Count
* This function contains additions and modifications by @niklaka. * This function contains additions and modifications by @niklaka.
* *
* @param string|array|Selectors $selectors Selector string|array to use as the filter. * @param string|array|Selectors $selectors Selector string|array to use as the filter.
* @param bool $not Make this a "not" filter? (default is false) * @param bool|int $not Make this a "not" filter? Use int 1 for “not all” mode as if selectors had brackets around it. (default is false)
* @return $this reference to current [filtered] instance * @return $this reference to current [filtered] instance
* *
*/ */
@@ -1470,6 +1470,8 @@ class WireArray extends Wire implements \IteratorAggregate, \ArrayAccess, \Count
$start = 0; $start = 0;
$limit = null; $limit = null;
$eq = null; $eq = null;
$notAll = $not === 1;
if($notAll) $not = true;
// leave sort, limit and start away from filtering selectors // leave sort, limit and start away from filtering selectors
foreach($selectors as $selector) { foreach($selectors as $selector) {
@@ -1506,7 +1508,10 @@ class WireArray extends Wire implements \IteratorAggregate, \ArrayAccess, \Count
// now filter the data according to the selectors that remain // now filter the data according to the selectors that remain
foreach($this->data as $key => $item) { foreach($this->data as $key => $item) {
$qty = 0;
$qtyMatch = 0;
foreach($selectors as $selector) { foreach($selectors as $selector) {
$qty++;
if(is_array($selector->field)) { if(is_array($selector->field)) {
$value = array(); $value = array();
foreach($selector->field as $field) $value[] = (string) $this->getItemPropertyValue($item, $field); foreach($selector->field as $field) $value[] = (string) $this->getItemPropertyValue($item, $field);
@@ -1514,10 +1519,16 @@ class WireArray extends Wire implements \IteratorAggregate, \ArrayAccess, \Count
$value = (string) $this->getItemPropertyValue($item, $selector->field); $value = (string) $this->getItemPropertyValue($item, $selector->field);
} }
if($not === $selector->matches($value) && isset($this->data[$key])) { if($not === $selector->matches($value) && isset($this->data[$key])) {
$qtyMatch++;
if($notAll) continue; // will do this outside the loop of all in $selectors match
$this->trackRemove($this->data[$key], $key); $this->trackRemove($this->data[$key], $key);
unset($this->data[$key]); unset($this->data[$key]);
} }
} }
if($notAll && $qty && $qty === $qtyMatch) {
$this->trackRemove($this->data[$key], $key);
unset($this->data[$key]);
}
} }
if(!is_null($eq)) { if(!is_null($eq)) {
@@ -1612,6 +1623,20 @@ class WireArray extends Wire implements \IteratorAggregate, \ArrayAccess, \Count
return $this->filterData($selector, true); return $this->filterData($selector, true);
} }
/**
* Like the not() method but $selector evaluated as if it had (brackets) around it
*
* #pw-internal Until we've got a better description for what this does
*
* @param string|array|Selectors $selector
* @return $this reference to current instance.
* @see filterData
*
*/
public function notAll($selector) {
return $this->filterData($selector, 1);
}
/** /**
* Find all items in this WireArray that match the given selector. * Find all items in this WireArray that match the given selector.
* *