Skip to content

Commit 19b364a

Browse files
authored
Merge pull request #1494 from algolia/feature/MAGE-827
Feature/mage 827 - PHP connector v4
2 parents c80d0c5 + 6d1be4e commit 19b364a

20 files changed

+581
-437
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ composer.lock
44
vendor/
55
.php_cs.cache
66
.vscode
7+
.idea

Controller/Adminhtml/Landingpage/Delete.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Algolia\AlgoliaSearch\Controller\Adminhtml\Landingpage;
44

5+
use Algolia\AlgoliaSearch\Model\LandingPage;
56
use Magento\Framework\Controller\ResultFactory;
67

78
class Delete extends AbstractAction
@@ -15,7 +16,7 @@ public function execute()
1516
$landingPageId = $this->getRequest()->getParam('id');
1617
if ($landingPageId) {
1718
try {
18-
/** @var \Algolia\AlgoliaSearch\Model\LandingPage $landingPage */
19+
/** @var LandingPage $landingPage */
1920
$landingPage = $this->landingPageFactory->create();
2021
$landingPage->getResource()->load($landingPage, $landingPageId);
2122
$landingPage->getResource()->delete($landingPage);
@@ -35,7 +36,12 @@ public function execute()
3536
return $resultRedirect->setPath('*/*/');
3637
}
3738

38-
private function deleteQueryRules($landingPage)
39+
/**
40+
* @param LandingPage $landingPage
41+
* @return void
42+
* @throws \Magento\Framework\Exception\NoSuchEntityException
43+
*/
44+
private function deleteQueryRules(LandingPage $landingPage): void
3945
{
4046
$stores = [];
4147
if ($landingPage->getStoreId() == 0) {

Controller/Adminhtml/Landingpage/Duplicate.php

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace Algolia\AlgoliaSearch\Controller\Adminhtml\Landingpage;
44

5+
use Algolia\AlgoliaSearch\Exceptions\AlgoliaException;
6+
use Algolia\AlgoliaSearch\Model\LandingPage;
57
use Magento\Framework\Controller\ResultFactory;
68
use Magento\Framework\Exception\LocalizedException;
79

@@ -20,7 +22,7 @@ public function execute()
2022
return $resultRedirect->setPath('*/*/');
2123
}
2224

23-
/** @var \Algolia\AlgoliaSearch\Model\LandingPage $landingPage */
25+
/** @var LandingPage $landingPage */
2426
$landingPage = $this->landingPageFactory->create();
2527
$landingPage->getResource()->load($landingPage, $landingPageId);
2628

@@ -53,9 +55,13 @@ public function execute()
5355
return $resultRedirect->setPath('*/*/');
5456
}
5557

56-
private function duplicateLandingPage($landingPage)
58+
/**
59+
* @param LandingPage $landingPage
60+
* @return LandingPage
61+
*/
62+
private function duplicateLandingPage(LandingPage $landingPage): LandingPage
5763
{
58-
/** @var \Algolia\AlgoliaSearch\Model\LandingPage $newLandingPage */
64+
/** @var LandingPage $newLandingPage */
5965
$newLandingPage = $this->landingPageFactory->create();
6066
$newLandingPage->setData($landingPage->getData());
6167
$newLandingPage->setId(null);
@@ -65,7 +71,13 @@ private function duplicateLandingPage($landingPage)
6571
return $newLandingPage;
6672
}
6773

68-
private function copyQueryRules($landingPageFromId, $landingPageToId)
74+
/**
75+
* @param int $landingPageFromId
76+
* @param int $landingPageToId
77+
* @return void
78+
* @throws AlgoliaException|\Magento\Framework\Exception\NoSuchEntityException
79+
*/
80+
private function copyQueryRules(int $landingPageFromId, int $landingPageToId): void
6981
{
7082
$stores = [];
7183
if ($landingPageFromId) {

Controller/Adminhtml/Landingpage/Save.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,12 @@ public function execute()
154154
}
155155

156156
/**
157-
* @param $landingPageId
158-
* @param $data
157+
* @param int $landingPageId
158+
* @param array<string, mixed> $data
159159
* @return void
160+
* @throws \Magento\Framework\Exception\NoSuchEntityException
160161
*/
161-
protected function manageQueryRules($landingPageId, $data)
162+
protected function manageQueryRules(int $landingPageId, array $data): void
162163
{
163164
$positions = json_decode($data['algolia_merchandising_positions'], true);
164165
$stores = [];

Controller/Adminhtml/Query/Delete.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Algolia\AlgoliaSearch\Controller\Adminhtml\Query;
44

5+
use Algolia\AlgoliaSearch\Model\Query;
56
use Magento\Framework\Controller\ResultFactory;
67

78
class Delete extends AbstractAction
@@ -15,7 +16,7 @@ public function execute()
1516
$queryId = $this->getRequest()->getParam('id');
1617
if ($queryId) {
1718
try {
18-
/** @var \Algolia\AlgoliaSearch\Model\Query $query */
19+
/** @var Query $query */
1920
$query = $this->queryFactory->create();
2021
$query->getResource()->load($query, $queryId);
2122
$query->getResource()->delete($query);
@@ -35,7 +36,12 @@ public function execute()
3536
return $resultRedirect->setPath('*/*/');
3637
}
3738

38-
private function deleteQueryRules($query)
39+
/**
40+
* @param Query $query
41+
* @return void
42+
* @throws \Magento\Framework\Exception\NoSuchEntityException
43+
*/
44+
private function deleteQueryRules(Query $query): void
3945
{
4046
$stores = [];
4147
if ($query->getStoreId() == 0) {

Controller/Adminhtml/Query/Save.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,13 @@ public function execute()
149149
return $resultRedirect->setPath('*/*/');
150150
}
151151

152-
private function manageQueryRules($queryId, $data)
152+
/**
153+
* @param int $queryId
154+
* @param array<string, mixed> $data
155+
* @return void
156+
* @throws \Magento\Framework\Exception\NoSuchEntityException
157+
*/
158+
private function manageQueryRules(int $queryId, array $data): void
153159
{
154160
$positions = json_decode($data['algolia_merchandising_positions'], true);
155161
$stores = [];

Helper/AdapterHelper.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public function __construct(
4545
* Get search result from Algolia
4646
*
4747
* @return array
48+
* @internal This method is currently unstable and should not be used. It may be revisited ar fixed in a future version.
4849
*/
4950
public function getDocumentsFromAlgolia()
5051
{

0 commit comments

Comments
 (0)