Skip to content

Commit adf0740

Browse files
authored
Bump to 1.12.1 (#909)
1 parent 2cfb5a9 commit adf0740

File tree

80 files changed

+1325
-317
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1325
-317
lines changed

.circleci/config.yml

Lines changed: 42 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -64,33 +64,52 @@ jobs:
6464
docker:
6565
- image: algolia/magento2-circleci:2.3.0
6666

67-
"phpcompatibility":
68-
docker: # run the steps with Docker with PHP 7.2
69-
- image: circleci/php:7.2
70-
steps:
71-
- checkout
72-
- run: sudo composer self-update
73-
- run: composer config http-basic.repo.magento.com ${MAGENTO_AUTH_USERNAME} ${MAGENTO_AUTH_PASSWORD}
74-
- restore_cache:
75-
keys:
76-
- composer-v1-{{ checksum "composer.lock" }}
77-
- composer-v1-
78-
- run: composer install -n --prefer-dist --ignore-platform-reqs --no-progress
79-
- save_cache:
80-
key: composer-v1-{{ checksum "composer.lock" }}
81-
paths:
82-
- vendor
83-
- run:
84-
name: PHPCS PHPCompatibility
85-
command: |
86-
./vendor/bin/phpcs --config-set installed_paths vendor/phpcompatibility/php-compatibility/PHPCompatibility/
87-
# vendor/ is large and seems to break phpcs, ls+grep+xargs hack is used to send folders to phpcs
88-
ls -d */ | grep -vE 'dev|Test|vendor' | xargs ./vendor/bin/phpcs -p --standard=PHPCompatibility --runtime-set testVersion 7.1- --runtime-set ignore_warnings_on_exit true
67+
"quality-tools":
68+
docker:
69+
- image: algolia/magento2-circleci:2.3.0
70+
working_directory: ~/build_directory/algoliasearch-magento-2
71+
steps:
72+
- checkout
73+
- run:
74+
name: Setting permissions
75+
command: |
76+
sudo chown circleci:circleci ~/.composer/
77+
- restore_cache:
78+
keys:
79+
- composer-v2-{{ checksum "composer.json" }}
80+
- composer-v2-
81+
82+
- run:
83+
name: Prepare environment
84+
command: |
85+
sudo composer self-update
86+
composer config http-basic.'repo.magento.com' ${MAGENTO_AUTH_USERNAME} ${MAGENTO_AUTH_PASSWORD}
87+
composer install -n --prefer-dist --ignore-platform-reqs --no-progress
88+
sudo chown circleci:circleci ~/.composer/
89+
composer global config prefer-stable true
90+
composer global config minimum-stability dev
91+
composer global require algolia/magento2-tools --ignore-platform-reqs
92+
93+
# We have to do this again because we restore the cache above, overwriting the vendor with the original.
94+
cd ~/magento_directory/vendor/algolia
95+
rm -rf algoliasearch-magento-2
96+
cp -R ~/build_directory/algoliasearch-magento-2 ~/magento_directory/vendor/algolia
97+
cd ~/magento_directory
98+
composer dump-autoload
99+
- save_cache:
100+
key: composer-v2-{{ checksum "composer.json" }}
101+
paths:
102+
- vendor
103+
- ~/.composer/vendor
104+
- run:
105+
name: Quality tools
106+
command: |
107+
sudo ~/.composer/vendor/bin/magento2-test ~/magento_directory/vendor/algolia/algoliasearch-magento-2 ~/.composer/vendor/bin/
89108
90109
workflows:
91110
version: 2
92111
build:
93112
jobs:
94113
- "magento-2.2"
95114
- "magento-2.3"
96-
- "phpcompatibility"
115+
- "quality-tools"

.styleci.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
11
preset: PSR2
2-
finder:
3-
path:
4-
- "code"

Block/Adminhtml/BaseAdminTemplate.php

Lines changed: 0 additions & 30 deletions
This file was deleted.

Block/LandingPage.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
use Magento\Cms\Model\Template\FilterProvider;
1111
use Magento\Search\Model\QueryFactory;
1212

13+
/**
14+
* @method int getPageId()
15+
*/
1316
class LandingPage extends Result
1417
{
1518
/** @var FilterProvider */

Block/Navigation/Renderer/CategoryRenderer.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ class CategoryRenderer extends Template implements FilterRendererInterface
1111
/** @var string */
1212
protected $_template = 'Algolia_AlgoliaSearch::layer/filter/category.phtml';
1313

14+
/** @var FilterInterface */
15+
protected $filter;
16+
1417
public function isMultipleSelectEnabled()
1518
{
1619
return false;

Block/Navigation/Renderer/DefaultRenderer.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ class DefaultRenderer extends Template implements FilterRendererInterface
2424
/** @var ConfigHelper */
2525
private $configHelper;
2626

27+
/** @var FilterInterface */
28+
protected $filter;
29+
2730
/**
2831
* Constructor.
2932
*

Block/Navigation/Renderer/SliderRenderer.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ class SliderRenderer extends Template implements FilterRendererInterface
2323
/** @var FormatInterface */
2424
protected $localeFormat;
2525

26+
/** @var FilterInterface */
27+
protected $filter;
28+
2629
/**
2730
*
2831
* @param Context $context

CHANGELOG.md

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,56 @@
11
# CHANGE LOG
22

3+
## 1.12.1
4+
5+
This release has been made possible thanks to the involvement of the community, with about half of the pull requests merged coming from the Magento ecosystem.
6+
7+
The Magento team at Algolia really wanted to thank our amazing community for its help.
8+
For this release, a big shout out for:
9+
10+
- @DavidLambauer
11+
- @JosephMaxwell
12+
- @peterjaap
13+
- @unicoder88
14+
- @VincentMarmiesse
15+
- @vmalyk
16+
17+
Thanks A LOT for your PRs, we really appreciate!
18+
19+
What this release brings:
20+
21+
### FEATURES
22+
- Add extension notifier (#868)
23+
24+
### UPDATES
25+
- Removed objectManager from ProductHelper (#814) (by @peterjaap)
26+
- Removing the BaseAdminTemplate block (#822)
27+
- Add config warnings for ES and MSI (#889)
28+
- Remove catalog index price update by schedule subscription (#870) (by @unicoder88)
29+
- Added alt attribute for img tags (#896) (by @vmalyk)
30+
- Add "suggest" section modules in composer.json (#898) (by @vmalyk)
31+
- Create replicas if Backend Facet Rendering is enabled (#902) (by @VincentMarmiesse)
32+
33+
### FIXES
34+
- Fixed the dependency list (#843) (by @DavidLambauer)
35+
- Pass set product website_id to load catalogrule prices with enabled customer groups (#853) (by @unicoder88)
36+
- Clean scope code resolver when starting environment emulation (#857) (by @unicoder88)
37+
- Fixing order of setting parameters (#859) (by @JosephMaxwell)
38+
- Fixed Composer requirements and README.md (#884) (by @vmalyk)
39+
- Fix Tier Price calculation (#887)
40+
- Fix autocomplete additional sections link URL (#891)
41+
- Fix errors in code instead ignore in PHPStan (#878) (by @vmalyk)
42+
- Fix product image helper method to return set images (#899)
43+
- Fix version to 1.12.1 for unsubscribe Mview migration (PR #870) (#910) (by @vmalyk)
44+
45+
### TOOLING
46+
- Events tracking (#805)
47+
- chore: fixes styleci configuration (#847)
48+
- chore(ignores-phpstan-fixed-errors): sets reportUnmatchedIgnoredError (#877)
49+
- ci: quality assurance tools (#882)
50+
- Ci/quality tools (#886)
51+
- chore: increases phpstan level to 1 (#892)
52+
- Make changes to pass new Marketplace test expectations (#906)
53+
354
## 1.12.0
455

556
### FEATURES

Controller/Adminhtml/Analytics/Update.php

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

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

5-
use Algolia\AlgoliaSearch\Block\Adminhtml\BaseAdminTemplate;
65
use Algolia\AlgoliaSearch\ViewModel\Adminhtml\Analytics\Overview;
6+
use Magento\Backend\Block\Template;
77
use Magento\Framework\DataObject;
88

99
class Update extends AbstractAction
@@ -18,7 +18,7 @@ public function execute()
1818
$layout = $this->layoutFactory->create();
1919

2020
$block = $layout
21-
->createBlock(BaseAdminTemplate::class)
21+
->createBlock(Template::class)
2222
->setData('view_model', $this->_objectManager->create(Overview::class))
2323
->setTemplate('Algolia_AlgoliaSearch::analytics/overview.phtml')
2424
->toHtml();

Controller/Adminhtml/Landingpage/Duplicate.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ private function copyQueryRules($landingPageFromId, $landingPageToId)
7575
$stores[] = $store->getId();
7676
}
7777
}
78-
} else {
79-
$stores[] = $data['store_id'];
8078
}
8179

8280
foreach ($stores as $storeId) {

0 commit comments

Comments
 (0)