Skip to content

[REV-2027] PHP 8.4 support #57

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

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

[REV-2027] PHP 8.4 support #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8a6ddf6
Explicit nullable type must be used instead
IbrahimS2 May 6, 2025
e0ef8a7
Add variable types
aj2967 Jun 24, 2025
2560914
Add rating snippet properties
aj2967 Jun 24, 2025
97cf423
Type hint
aj2967 Jun 24, 2025
fd9fe9e
Add compatible nullable types
aj2967 Jun 24, 2025
521e062
Use correct nullable type
aj2967 Jun 26, 2025
d71ca8f
Merge branch 'master' into update/rev-2027-php-8.4-support
aj2967 Aug 8, 2025
4b96f4a
Update readme
aj2967 Aug 8, 2025
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
24 changes: 16 additions & 8 deletions Block/Product/RatingSnippet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,31 @@

class RatingSnippet extends ListProduct
{
// protected $_storeManager = StoreManagerInterface::class;
protected $_customerSession;
protected $reviewsConfig;
protected $postDataHelper;
protected $layerResolver;
protected $categoryRepository;
protected $urlHelper;
protected $customerSession;
protected $categoryFactory;
//protected $reviewsConfig = Reviews\Helper\Config;
// protected $_storeManager = StoreManagerInterface::class;
protected $reviewsConfigHelper;
protected $storeManager;
protected $store;
protected $reviewsConfig;

/**
* ListProduct constructor.
* @param \Magento\Catalog\Block\Product\Context $context
* @param \Magento\Framework\Data\Helper\PostHelper $postDataHelper
* @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
* @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
* @param \Magento\Framework\Url\Helper\Data $urlHelper
* @param Helper $helper
* @param array $data
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
* @param \Reviewscouk\Reviews\Helper\Config $reviewsConfigHelper
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Catalog\Block\Product\Context $context,
Expand All @@ -39,10 +47,10 @@ public function __construct(
\Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository,
\Magento\Framework\Url\Helper\Data $urlHelper,
array $data = [],
\Magento\Customer\Model\Session $customerSession = null,
\Magento\Catalog\Model\CategoryFactory $categoryFactory = null,
ReviewsConfig $reviewsConfigHelper = null,
StoreManagerInterface $storeManager = null
?\Magento\Customer\Model\Session $customerSession = null,
?\Magento\Catalog\Model\CategoryFactory $categoryFactory = null,
?ReviewsConfig $reviewsConfigHelper = null,
?StoreManagerInterface $storeManager = null
) {
$this->_customerSession = $customerSession;
$this->categoryFactory = $categoryFactory;
Expand Down
2 changes: 1 addition & 1 deletion Block/Richsnippet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public function getRichSnippetSource()
return '<script src="' . $url . '"></script>';
}

public function getRichSnippet($sku = null, $product = null)
public function getRichSnippet(?array $sku = null, ?array $product = null)
{
if (isset($sku) && is_array($sku)) {
$sku = implode(';', $sku);
Expand Down
4 changes: 2 additions & 2 deletions Model/Api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public function __construct(
$this->store = $storeManagerInterface->getStore();
}

public function apiPost($url, $data, $magento_store_id = null)
public function apiPost($url, $data, ?string $magento_store_id = null)
{
if ($magento_store_id == null) {
$magento_store_id = $this->store->getId();
Expand All @@ -51,7 +51,7 @@ public function apiPost($url, $data, $magento_store_id = null)
return $response;
}

protected function getApiDomain($magento_store_id = null)
protected function getApiDomain(?string $magento_store_id = null)
{
return $this->configHelper->getRegion($magento_store_id) == 'US' ? 'api.reviews.io' : 'api.reviews.co.uk';
}
Expand Down
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ You'll need to sign up at [Reviews.co.uk](https://www.reviews.co.uk "Reviews.co.

| Magento Version | Php Version | REVIEWS.io Plugin Version |
|-----------------|-------------|----------------------------|
| >= 2.4.8 | 8.3, 8.4 | reviewscouk/reviews:0.0.67 |
| >= 2.4.6 | 8.1, 8.2 | reviewscouk/reviews:0.0.66 |
| >= 2.4.4 | 8.1 | reviewscouk/reviews:0.0.66 |
| <= 2.4.3 | <= 7.4 | reviewscouk/reviews:0.0.66 |
Expand All @@ -18,7 +19,7 @@ You'll need to sign up at [Reviews.co.uk](https://www.reviews.co.uk "Reviews.co.
2. As this plugin is hosted on [packagist.org](http://packagist.org), you simply use the following to instruct composer to fetch and install the module:

```bash
composer require reviewscouk/reviews:0.0.66
composer require reviewscouk/reviews:0.0.67
```

3. When this is complete, `cd` to `/bin` and run the following:
Expand Down