From 4341f38400d9eec3e502237337337928620a4f0f Mon Sep 17 00:00:00 2001 From: Viktor Rad Date: Fri, 15 Apr 2022 15:23:42 -0500 Subject: [PATCH] 2.4.4 not compatible with php 8.1 --- src/Migration/Handler/Placeholder.php | 1 + src/Migration/ResourceModel/AbstractCollection.php | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Migration/Handler/Placeholder.php b/src/Migration/Handler/Placeholder.php index 35b1bf479..028f021c5 100644 --- a/src/Migration/Handler/Placeholder.php +++ b/src/Migration/Handler/Placeholder.php @@ -62,6 +62,7 @@ protected function processContent($content) $classDestination = []; foreach ($this->classMap->getMap() as $classOldFashion => $classNewStyle) { $classSource[] = sprintf('type="%s"', $classOldFashion); + $classNewStyle = $classNewStyle ?? ''; $classDestination[] = sprintf('type="%s"', str_replace('\\', '\\\\', $classNewStyle)); } $content = str_replace($classSource, $classDestination, $content); diff --git a/src/Migration/ResourceModel/AbstractCollection.php b/src/Migration/ResourceModel/AbstractCollection.php index fce6be624..21c1f3cd6 100644 --- a/src/Migration/ResourceModel/AbstractCollection.php +++ b/src/Migration/ResourceModel/AbstractCollection.php @@ -32,7 +32,7 @@ public function __construct(array $data = []) /** * @inheritdoc */ - public function current() + public function current(): mixed { return $this->data[$this->position]; } @@ -40,7 +40,7 @@ public function current() /** * @inheritdoc */ - public function key() + public function key(): mixed { return $this->position; } @@ -48,7 +48,7 @@ public function key() /** * @inheritdoc */ - public function next() + public function next(): void { $this->position++; } @@ -56,7 +56,7 @@ public function next() /** * @inheritdoc */ - public function rewind() + public function rewind(): void { $this->position = 0; } @@ -64,7 +64,7 @@ public function rewind() /** * @inheritdoc */ - public function valid() + public function valid(): bool { return $this->key() < count($this->data); } @@ -72,7 +72,7 @@ public function valid() /** * @inheritdoc */ - public function count() + public function count(): int { return count($this->data); }