diff --git a/Gateway/Request/BasicParameter/ClientIPDataBuilder.php b/Gateway/Request/BasicParameter/ClientIPDataBuilder.php index 6587c22c6..bebdbd682 100644 --- a/Gateway/Request/BasicParameter/ClientIPDataBuilder.php +++ b/Gateway/Request/BasicParameter/ClientIPDataBuilder.php @@ -28,7 +28,6 @@ use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress; use Magento\Payment\Gateway\Request\BuilderInterface; use Magento\Sales\Model\Order; -use Zend\Stdlib\ParametersInterface; class ClientIPDataBuilder implements BuilderInterface { diff --git a/Model/Service/Order.php b/Model/Service/Order.php index d2fc25d77..415cd8bad 100644 --- a/Model/Service/Order.php +++ b/Model/Service/Order.php @@ -33,6 +33,7 @@ use Magento\Sales\Model\ResourceModel\Order\CollectionFactory; use Buckaroo\Magento2\Helper\Data; use Magento\Framework\App\ResourceConnection; +use Laminas\Db\Sql\Expression; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) @@ -158,11 +159,11 @@ protected function cancelExpiredTransferOrdersPerStore(StoreInterface $store) ) ->addFieldToFilter( 'created_at', - ['lt' => new \Zend_Db_Expr('NOW() - INTERVAL ' . $dueDays . ' DAY')] + ['lt' => new Expression('NOW() - INTERVAL ' . $dueDays . ' DAY')] ) ->addFieldToFilter( 'created_at', - ['gt' => new \Zend_Db_Expr('NOW() - INTERVAL ' . ($dueDays + 7) . ' DAY')] + ['gt' => new Expression('NOW() - INTERVAL ' . ($dueDays + 7) . ' DAY')] ); $orderCollection->getSelect() @@ -238,11 +239,11 @@ protected function cancelExpiredPPEOrdersPerStore(StoreInterface $store) ) ->addFieldToFilter( 'created_at', - ['lt' => new \Zend_Db_Expr('NOW() - INTERVAL ' . $dueDays . ' DAY')] + ['lt' => new Expression('NOW() - INTERVAL ' . $dueDays . ' DAY')] ) ->addFieldToFilter( 'created_at', - ['gt' => new \Zend_Db_Expr('NOW() - INTERVAL ' . ($dueDays + 7) . ' DAY')] + ['gt' => new Expression('NOW() - INTERVAL ' . ($dueDays + 7) . ' DAY')] ); $orderCollection->getSelect() diff --git a/Ui/Component/Listing/Column/Method/Filter.php b/Ui/Component/Listing/Column/Method/Filter.php index 5682c129e..51851edad 100644 --- a/Ui/Component/Listing/Column/Method/Filter.php +++ b/Ui/Component/Listing/Column/Method/Filter.php @@ -25,6 +25,7 @@ use Magento\Framework\App\ResourceConnection; use Magento\Payment\Helper\Data; use Zend_Db_Statement_Exception; +use Laminas\Db\Sql\Expression; class Filter extends \Magento\Payment\Ui\Component\Listing\Column\Method\Options { @@ -81,8 +82,8 @@ public function toOptionArray(): array ->joinInner( ['bmgc' => $giftcardTable], 'bmgc.servicecode = bmg.servicecode', - ['giftcard_codes' => new \Zend_Db_Expr('GROUP_CONCAT(DISTINCT ' . $connection->quoteIdentifier('bmgc.servicecode') . ' SEPARATOR "-")'), - 'giftcard_titles' => new \Zend_Db_Expr('GROUP_CONCAT(DISTINCT ' . $connection->quoteIdentifier('bmgc.label') . ' SEPARATOR "-")')] + ['giftcard_codes' => new Expression('GROUP_CONCAT(DISTINCT ' . $connection->quoteIdentifier('bmgc.servicecode') . ' SEPARATOR "-")'), + 'giftcard_titles' => new Expression('GROUP_CONCAT(DISTINCT ' . $connection->quoteIdentifier('bmgc.label') . ' SEPARATOR "-")')] ) ->group('bmg.order_id'); diff --git a/Ui/Component/Listing/Column/Method/Options.php b/Ui/Component/Listing/Column/Method/Options.php index 930524d9b..1acca921d 100644 --- a/Ui/Component/Listing/Column/Method/Options.php +++ b/Ui/Component/Listing/Column/Method/Options.php @@ -26,6 +26,7 @@ use Magento\Framework\View\Element\UiComponentFactory; use Magento\Ui\Component\Listing\Columns\Column; use Magento\Sales\Model\ResourceModel\Order\CollectionFactory as OrderCollectionFactory; +use Laminas\Db\Sql\Expression; class Options extends Column @@ -105,7 +106,7 @@ private function getGroupTransactionData(array $incrementIds): array [] ) ->columns([ - 'giftcard_codes' => new \Zend_Db_Expr("GROUP_CONCAT(DISTINCT group_transaction.servicecode SEPARATOR '-')") + 'giftcard_codes' => new Expression("GROUP_CONCAT(DISTINCT group_transaction.servicecode SEPARATOR '-')") ]) ->where('order.increment_id IN (?)', $incrementIds) ->group('order.increment_id');