mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-13 18:24:57 +02:00
Code Issues Releases Wiki Activity

Updates for PHP 8.4 support per processwire/processwire-issues#2000 Also note that these changes require we adjust our minimum required PHP version from 7.0 up to 7.1, with PHP 8.x still recommended.

Browse Source
This commit is contained in:
Ryan Cramer
2024-11-29 13:29:28 -05:00
parent ac4dfebfab
commit 1c5f2f7e3c
72 changed files with 208 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wire/core/PageFinder.php
View File

@@ -3587,10 +3587,11 @@ class PageFinder extends Wire {
if(count($fields) > 1) {
// OR fields present
array_shift($fields);
$subfields = array($subfields);
$subfields = array($subfields); // 1. subfields is definitely an array…
foreach($fields as $name) {
if(strpos($name, "$fieldName.") === 0) {
list(,$name) = explode('__owner.', $name);
list(,$name) = explode('__owner.', $name);
/** @var array $subfields 2. …but PhpStorm in PHP8 mode can't tell it's an array without this */
$subfields[] = $name;
} else {
$this->syntaxError(
@@ -3662,7 +3663,7 @@ class PageFinder extends Wire {
* @return array
*
*/
public function getPageArrayData(PageArray $pageArray = null) {
public function getPageArrayData(?PageArray $pageArray = null) {
if($pageArray !== null && count($this->pageArrayData)) {
$pageArray->data($this->pageArrayData);
}