mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-09 16:26:59 +02:00
Code Issues Releases Wiki Activity

Additional updates for processwire/processwire-issues#1467

Browse Source
This commit is contained in:
Ryan Cramer
2022-01-24 11:07:10 -05:00
parent beaad6e8dd
commit 25da592578
5 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wire/core/PageArrayIterator.php
View File

@@ -135,6 +135,7 @@ class PageArrayIterator extends Wire implements \Iterator {
* Rewind to beginning * Rewind to beginning
* *
*/ */
#[\ReturnTypeWillChange]
public function rewind() { public function rewind() {
$this->pagesPosition = 0; $this->pagesPosition = 0;
$this->position = 0; $this->position = 0;
@@ -149,6 +150,7 @@ class PageArrayIterator extends Wire implements \Iterator {
* @return Page * @return Page
* *
*/ */
#[\ReturnTypeWillChange]
public function current() { public function current() {
return $this->pages[$this->pagesPosition]; return $this->pages[$this->pagesPosition];
} }
@@ -159,6 +161,7 @@ class PageArrayIterator extends Wire implements \Iterator {
* @return int * @return int
* *
*/ */
#[\ReturnTypeWillChange]
public function key() { public function key() {
return $this->position; return $this->position;
} }
@@ -167,6 +170,7 @@ class PageArrayIterator extends Wire implements \Iterator {
* Update current position to next * Update current position to next
* *
*/ */
#[\ReturnTypeWillChange]
public function next() { public function next() {
$this->pagesPosition++; $this->pagesPosition++;
$this->position++; $this->position++;
@@ -178,6 +182,7 @@ class PageArrayIterator extends Wire implements \Iterator {
* @return bool * @return bool
* *
*/ */
#[\ReturnTypeWillChange]
public function valid() { public function valid() {
if($this->position === 0 || $this->pagesPosition >= $this->pagesCount) { if($this->position === 0 || $this->pagesPosition >= $this->pagesCount) {
// If we have just been rewound or if we have reached the end of the buffer, // If we have just been rewound or if we have reached the end of the buffer,

2
wire/core/PagesEditor.php
View File

@@ -369,7 +369,7 @@ class PagesEditor extends Wire {
foreach($page->template->fieldgroup as $field) { foreach($page->template->fieldgroup as $field) {
if($page->isLoaded($field->name)) continue; // value already set if($page->isLoaded($field->name)) continue; // value already set
if(!$page->hasField($field)) continue; // field not valid for page if(!$page->hasField($field)) continue; // field not valid for page
if(!strlen($field->defaultValue)) continue; // no defaultValue property defined with Fieldtype config inputfields if(!strlen("$field->defaultValue")) continue; // no defaultValue property defined with Fieldtype config inputfields
try { try {
$blankValue = $field->type->getBlankValue($page, $field); $blankValue = $field->type->getBlankValue($page, $field);
if(is_object($blankValue) || is_array($blankValue)) continue; // we don't currently handle complex types if(is_object($blankValue) || is_array($blankValue)) continue; // we don't currently handle complex types

1
wire/core/PagesType.php
View File

@@ -622,6 +622,7 @@ class PagesType extends Wire implements \IteratorAggregate, \Countable {
* @see Pages::count() * @see Pages::count()
* *
*/ */
#[\ReturnTypeWillChange]
public function count($selectorString = '', array $options = array()) { public function count($selectorString = '', array $options = array()) {
if(empty($selectorString) && empty($options) && count($this->parents) == 1) { if(empty($selectorString) && empty($options) && count($this->parents) == 1) {
return $this->getParent()->numChildren(); return $this->getParent()->numChildren();

2
wire/core/WireDateTime.php
View File

@@ -266,7 +266,7 @@ class WireDateTime extends Wire {
public function formatDate($value, $format) { public function formatDate($value, $format) {
if(!$value) return ''; if(!$value) return '';
if(!strlen($format) || $format == 'U' || $format == '%s') return (int) $value; // unix timestamp if(!strlen("$format") || $format === 'U' || $format === '%s') return (int) $value; // unix timestamp
$relativeStr = ''; $relativeStr = '';
if(strpos($format, '!') !== false) { if(strpos($format, '!') !== false) {

2
wire/modules/Process/ProcessPageLister/ProcessPageLister.module
View File

@@ -504,7 +504,7 @@ class ProcessPageLister extends Process implements ConfigurableModule {
if(in_array('disableFilters', $this->toggles)) { if(in_array('disableFilters', $this->toggles)) {
$s->attr('disabled', 'disabled'); $s->attr('disabled', 'disabled');
} }
$selector = $this->sessionGet('selector'); $selector = (string) $this->sessionGet('selector');
if($this->initSelector) { if($this->initSelector) {
if(strpos($selector, $this->initSelector) !== false) { if(strpos($selector, $this->initSelector) !== false) {
$selector = str_replace($this->initSelector, '', $selector); // ensure that $selector does not contain initSelector $selector = str_replace($this->initSelector, '', $selector); // ensure that $selector does not contain initSelector