From e28d7e73a454e001a4f3cdfa794f8c2688b104e4 Mon Sep 17 00:00:00 2001 From: adamzero1 Date: Tue, 11 Nov 2025 11:50:13 +0000 Subject: [PATCH] feat: php 8.4 compat --- src/Migration/App/ConsoleOutputFactory.php | 2 +- src/Migration/ResourceModel/Adapter/Mysql.php | 2 +- src/Migration/ResourceModel/AdapterInterface.php | 2 +- src/Migration/ResourceModel/Record.php | 2 +- src/Migration/ResourceModel/Source.php | 2 +- src/Migration/Step/Customer/Data.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Migration/App/ConsoleOutputFactory.php b/src/Migration/App/ConsoleOutputFactory.php index feb6ae78b..b68db69a8 100644 --- a/src/Migration/App/ConsoleOutputFactory.php +++ b/src/Migration/App/ConsoleOutputFactory.php @@ -24,7 +24,7 @@ class ConsoleOutputFactory public function create( $verbosity = ConsoleOutput::VERBOSITY_NORMAL, $decorated = null, - OutputFormatterInterface $formatter = null + ?OutputFormatterInterface $formatter = null ) { return new ConsoleOutput($verbosity, $decorated, $formatter); } diff --git a/src/Migration/ResourceModel/Adapter/Mysql.php b/src/Migration/ResourceModel/Adapter/Mysql.php index b7922e88b..adba893a8 100644 --- a/src/Migration/ResourceModel/Adapter/Mysql.php +++ b/src/Migration/ResourceModel/Adapter/Mysql.php @@ -112,7 +112,7 @@ public function loadPage( $pageSize, $identityField = null, $identityId = null, - \Zend_Db_Expr $condition = null + ?\Zend_Db_Expr $condition = null ) { $select = $this->getSelect(); $select->from($documentName, '*'); diff --git a/src/Migration/ResourceModel/AdapterInterface.php b/src/Migration/ResourceModel/AdapterInterface.php index 0be207b19..f129fdd89 100644 --- a/src/Migration/ResourceModel/AdapterInterface.php +++ b/src/Migration/ResourceModel/AdapterInterface.php @@ -57,7 +57,7 @@ public function loadPage( $pageSize, $identityField = null, $identityId = null, - \Zend_Db_Expr $condition = null + ?\Zend_Db_Expr $condition = null ); /** diff --git a/src/Migration/ResourceModel/Record.php b/src/Migration/ResourceModel/Record.php index 796e78777..7169c139f 100644 --- a/src/Migration/ResourceModel/Record.php +++ b/src/Migration/ResourceModel/Record.php @@ -31,7 +31,7 @@ class Record * @param array $data * @param Document $document */ - public function __construct(array $data = [], Document $document = null) + public function __construct(array $data = [], ?Document $document = null) { $this->data = $data; if ($document !== null) { diff --git a/src/Migration/ResourceModel/Source.php b/src/Migration/ResourceModel/Source.php index a50edbfe7..f5cfc7ca3 100644 --- a/src/Migration/ResourceModel/Source.php +++ b/src/Migration/ResourceModel/Source.php @@ -62,7 +62,7 @@ public function loadPage($documentName, $pageNumber) * @param \Zend_Db_Expr $condition * @return array */ - public function getRecords($documentName, $pageNumber, $pageSize = null, \Zend_Db_Expr $condition = null) + public function getRecords($documentName, $pageNumber, $pageSize = null, ?\Zend_Db_Expr $condition = null) { $pageSize = $pageSize ?: $this->getPageSize($documentName) ; $identityField = $this->getIdentityField($documentName); diff --git a/src/Migration/Step/Customer/Data.php b/src/Migration/Step/Customer/Data.php index 7036a58ff..1390252b5 100644 --- a/src/Migration/Step/Customer/Data.php +++ b/src/Migration/Step/Customer/Data.php @@ -174,7 +174,7 @@ public function perform() */ private function transformDocumentRecords( $sourceDocName, - array $attributesToSkip = null + array $attributesToSkip = [] ) { $sourceEntityDocuments = array_keys($this->readerGroups->getGroup('source_entity_documents')); $sourceDocument = $this->source->getDocument($sourceDocName);