Skip to content

Merge master into 2.3-dev #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
callum-zero1 merged 3 commits into from
Sep 3, 2026
Merged

Merge master into 2.3-dev #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea3c8d8
PHP 8.4 Nullable Deprecation Notice
lefte Jun 8, 2026
0f1492d
Additional PHP 8.4 Nullable
lefte Jun 9, 2026
083cfc6
Merge pull request #20 from lefte/php84-nullable
arronmoss Aug 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Model/PaymentMethod/Layaways.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ public function __construct(
\Magento\Payment\Model\Method\Logger $logger,
OpenPosConfiguration $openPosConfiguration,
TillSessionManagement $tillSessionManagement,
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
?\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
?\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
array $data = [],
DirectoryHelper $directory = null
?DirectoryHelper $directory = null
) {
parent::__construct(
$context,
Expand All @@ -93,7 +93,7 @@ public function __construct(
* @param \Magento\Quote\Api\Data\CartInterface|null $quote
* @return bool
*/
public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
public function isAvailable(?\Magento\Quote\Api\Data\CartInterface $quote = null)
{
// Check if POS module is enabled
if(!$this->openPosConfiguration->isEnabled()) {
Expand Down
4 changes: 2 additions & 2 deletions Model/TillSessionManagement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ public function getTillSession(): ?TillSessionInterface
* @param TillSessionInterface|null $tillSession
* @return bool
*/
public function isTillSessionActive(TillSessionInterface $tillSession = null): bool
public function isTillSessionActive(?TillSessionInterface $tillSession = null): bool
{
if($this->openPosConfiguration->isEnabled() !== true || $this->currentlyOnPosStore() == false) {
$this->destroySession();
Expand Down Expand Up @@ -296,7 +296,7 @@ public function startTillSession(User $adminUser): TillSessionInterface
* @param TillSessionInterface|null $tillSession
* @return User|null
*/
public function getAdminUserFromTillSession(TillSessionInterface $tillSession = null): ?User
public function getAdminUserFromTillSession(?TillSessionInterface $tillSession = null): ?User
{
if(!$tillSession) {
$tillSession = $this->getTillSession();
Expand Down