Skip to content

Commit 0a15e48

Browse files
author
Jan Petr
authored
Merge pull request #571 from algolia/develop
Develop
2 parents 2aeb25c + 0252707 commit 0a15e48

File tree

297 files changed

+3403
-15524
lines changed

Some content is hidden

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

297 files changed

+3403
-15524
lines changed

‎.php_cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
22

33
$finder = Symfony\CS\Finder\DefaultFinder::create()
4-
->in(__DIR__.DIRECTORY_SEPARATOR.'code');
4+
->in(__DIR__.DIRECTORY_SEPARATOR.'app/code/');
55

66
return Symfony\CS\Config\Config::create()
77
->setUsingCache(true)
88
->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
99
->fixers([
1010
'align_double_arrow',
11-
'short_array_syntax',
11+
'long_array_syntax',
1212
'-multiline_array_trailing_comma',
1313
'-pre_increment'
1414
])->finder($finder);

‎CHANGELOG.md‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,36 @@
11
## Change Log
22

3+
### 1.7.0
4+
5+
#### FEATURES
6+
- Option to choose if attributes' "No" values should or shouldn't be indexed (#554)
7+
8+
#### UPDATES
9+
- Optimized front-end - **BC break** (#507, #531)
10+
- All JS code except the extension's config and JS templates was moved to separate JS files
11+
- Reduced the size of inline HTML code
12+
- Better caching abilities
13+
- Better readability of the code
14+
- Removed templateloader.phtml file
15+
- Use `allItems` template in hits widget instead of single `item` (#553)
16+
- Restored support of PHP 5.3 (#524)
17+
- The extension now follows the standart file structure as Magento (#517)
18+
- All extension's assets were move to CSS files as SVGs (#521)
19+
- Small visual updates in icons
20+
- Supports retina displays now
21+
- New versions of [instantsearch.js](https://github.com/algolia/instantsearch.js) and [autocomplete.js](https://github.com/algolia/autocomplete.js) libraries (#549)
22+
- PHP API client updated to 1.10.2 version (#529)
23+
- The extension follows new Algolia's UA convention (#530)
24+
- Updated [FAQ](https://community.algolia.com/magento/faq/) (#509, #519, #525, #536)
25+
26+
#### FIXES
27+
- Fixed issue with CDN images (#518)
28+
- Whole images' URLs are now indexed
29+
- **BC break!** It's mandatory to reindex all your data
30+
- Fixed issue with overriding `top.search` block (#531)
31+
- Encoded query attribute within additional sections in autocomplete menu (#534)
32+
- Fixed notices from `array_unique` (#552)
33+
334
### 1.6.1
435

536
#### UPDATES

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This extension replaces the default search of Magento with a typo-tolerant, fast
77

88
See features and benefits of [Algolia Search Extension for Magento](https://community.algolia.com/magento).
99

10-
![Latest version](https://img.shields.io/badge/latest-1.6.1-green.svg)
10+
![Latest version](https://img.shields.io/badge/latest-1.7.0-green.svg)
1111
![Magento 1.6.2](https://img.shields.io/badge/magento-1.6.2-blue.svg)
1212
![Magento 1.7.1](https://img.shields.io/badge/magento-1.7.1-blue.svg)
1313
![Magento 1.8.1](https://img.shields.io/badge/magento-1.8.1-blue.svg)

‎code/Block/System/Config/Form/Field/AbstractField.php‎ renamed to ‎app/code/community/Algolia/Algoliasearch/Block/System/Config/Form/Field/AbstractField.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
abstract class Algolia_Algoliasearch_Block_System_Config_Form_Field_AbstractField extends Mage_Adminhtml_Block_System_Config_Form_Field_Array_Abstract
44
{
55
protected $settings;
6-
protected $selectFields = [];
6+
protected $selectFields = array();
77

88
public function __construct()
99
{
@@ -12,7 +12,7 @@ public function __construct()
1212
}
1313

1414
foreach ($this->settings['columns'] as $columnName => $columnSettings) {
15-
$fieldSettings = [];
15+
$fieldSettings = array();
1616

1717
if (isset($columnSettings['label'])) {
1818
$fieldSettings['label'] = Mage::helper('adminhtml')->__($columnSettings['label']);

‎code/Block/System/Config/Form/Field/AdditionalSections.php‎ renamed to ‎app/code/community/Algolia/Algoliasearch/Block/System/Config/Form/Field/AdditionalSections.php‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ class Algolia_Algoliasearch_Block_System_Config_Form_Field_AdditionalSections ex
77
{
88
public function __construct()
99
{
10-
$this->settings = [
11-
'columns' => [
12-
'name' => [
10+
$this->settings = array(
11+
'columns' => array(
12+
'name' => array(
1313
'label' => 'Section',
1414
'options' => function () {
15-
$options = [];
15+
$options = array();
1616

17-
$sections = [
18-
['name' => 'pages', 'label' => 'Pages'],
19-
];
17+
$sections = array(
18+
array('name' => 'pages', 'label' => 'Pages'),
19+
);
2020

2121
/** @var Algolia_Algoliasearch_Helper_Config $config */
2222
$config = Mage::helper('algoliasearch/config');
@@ -27,10 +27,10 @@ public function __construct()
2727
continue;
2828
}
2929

30-
$sections[] = [
30+
$sections[] = array(
3131
'name' => $attribute['attribute'],
3232
'label' => $attribute['label'] ? $attribute['label'] : $attribute['attribute']
33-
];
33+
);
3434
}
3535

3636
foreach ($sections as $section) {
@@ -41,20 +41,20 @@ public function __construct()
4141
},
4242
'rowMethod' => 'getName',
4343
'width' => 130,
44-
],
45-
'label' => [
44+
),
45+
'label' => array(
4646
'label' => 'Label',
4747
'style' => 'width: 100px;',
48-
],
49-
'hitsPerPage' => [
48+
),
49+
'hitsPerPage' => array(
5050
'label' => 'Hits per page',
5151
'style' => 'width: 100px;',
5252
'class' => 'required-entry input-text validate-number',
53-
],
54-
],
53+
),
54+
),
5555
'buttonLabel' => 'Add Section',
5656
'addAfter' => false,
57-
];
57+
);
5858

5959
parent::__construct();
6060
}

‎code/Block/System/Config/Form/Field/CategoryAdditionalAttributes.php‎ renamed to ‎app/code/community/Algolia/Algoliasearch/Block/System/Config/Form/Field/CategoryAdditionalAttributes.php‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ class Algolia_Algoliasearch_Block_System_Config_Form_Field_CategoryAdditionalAtt
77
{
88
public function __construct()
99
{
10-
$this->settings = [
11-
'columns' => [
12-
'attribute' => [
10+
$this->settings = array(
11+
'columns' => array(
12+
'attribute' => array(
1313
'label' => 'Attribute',
1414
'options' => function () {
15-
$options = [];
15+
$options = array();
1616

1717
/** @var Algolia_Algoliasearch_Helper_Entity_Categoryhelper $category_helper */
1818
$category_helper = Mage::helper('algoliasearch/entity_categoryhelper');
@@ -26,35 +26,35 @@ public function __construct()
2626
},
2727
'rowMethod' => 'getAttribute',
2828
'width' => 160,
29-
],
30-
'searchable' => [
29+
),
30+
'searchable' => array(
3131
'label' => 'Searchable',
32-
'options' => [
32+
'options' => array(
3333
'1' => 'Yes',
3434
'0' => 'No',
35-
],
35+
),
3636
'rowMethod' => 'getSearchable',
37-
],
38-
'retrievable' => [
37+
),
38+
'retrievable' => array(
3939
'label' => 'Retrievable',
40-
'options' => [
40+
'options' => array(
4141
'1' => 'Yes',
4242
'0' => 'No',
43-
],
43+
),
4444
'rowMethod' => 'getRetrievable',
45-
],
46-
'order' => [
45+
),
46+
'order' => array(
4747
'label' => 'Ordered',
48-
'options' => [
48+
'options' => array(
4949
'ordered' => 'Ordered',
5050
'unordered' => 'Unordered',
51-
],
51+
),
5252
'rowMethod' => 'getOrder',
53-
],
54-
],
53+
),
54+
),
5555
'buttonLabel' => 'Add Attribute',
5656
'addAfter' => false,
57-
];
57+
);
5858

5959
parent::__construct();
6060
}

‎code/Block/System/Config/Form/Field/CustomRankingCategoryAttributes.php‎ renamed to ‎app/code/community/Algolia/Algoliasearch/Block/System/Config/Form/Field/CustomRankingCategoryAttributes.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ class Algolia_Algoliasearch_Block_System_Config_Form_Field_CustomRankingCategory
77
{
88
public function __construct()
99
{
10-
$this->settings = [
11-
'columns' => [
12-
'attribute' => [
10+
$this->settings = array(
11+
'columns' => array(
12+
'attribute' => array(
1313
'label' => 'Attribute',
1414
'options' => function () {
15-
$options = [];
15+
$options = array();
1616

1717
/** @var Algolia_Algoliasearch_Helper_Config $config */
1818
$config = Mage::helper('algoliasearch/config');
@@ -25,19 +25,19 @@ public function __construct()
2525
return $options;
2626
},
2727
'rowMethod' => 'getAttribute',
28-
],
29-
'order' => [
28+
),
29+
'order' => array(
3030
'label' => 'Asc / Desc',
31-
'options' => [
31+
'options' => array(
3232
'desc' => 'Descending',
3333
'asc' => 'Ascending',
34-
],
34+
),
3535
'rowMethod' => 'getOrder',
36-
],
37-
],
36+
),
37+
),
3838
'buttonLabel' => 'Add Ranking Criterion',
3939
'addAfter' => false,
40-
];
40+
);
4141

4242
parent::__construct();
4343
}

‎code/Block/System/Config/Form/Field/CustomRankingProductAttributes.php‎ renamed to ‎app/code/community/Algolia/Algoliasearch/Block/System/Config/Form/Field/CustomRankingProductAttributes.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ class Algolia_Algoliasearch_Block_System_Config_Form_Field_CustomRankingProductA
77
{
88
public function __construct()
99
{
10-
$this->settings = [
11-
'columns' => [
12-
'attribute' => [
10+
$this->settings = array(
11+
'columns' => array(
12+
'attribute' => array(
1313
'label' => 'Attribute',
1414
'options' => function () {
15-
$options = [];
15+
$options = array();
1616

1717
/** @var Algolia_Algoliasearch_Helper_Config $config */
1818
$config = Mage::helper('algoliasearch/config');
@@ -25,19 +25,19 @@ public function __construct()
2525
return $options;
2626
},
2727
'rowMethod' => 'getAttribute',
28-
],
29-
'order' => [
28+
),
29+
'order' => array(
3030
'label' => 'Asc / Desc',
31-
'options' => [
31+
'options' => array(
3232
'desc' => 'Descending',
3333
'asc' => 'Ascending',
34-
],
34+
),
3535
'rowMethod' => 'getOrder',
36-
],
37-
],
36+
),
37+
),
3838
'buttonLabel' => 'Add Ranking Criterion',
3939
'addAfter' => false,
40-
];
40+
);
4141

4242
parent::__construct();
4343
}

‎code/Block/System/Config/Form/Field/ExcludedPages.php‎ renamed to ‎app/code/community/Algolia/Algoliasearch/Block/System/Config/Form/Field/ExcludedPages.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ class Algolia_Algoliasearch_Block_System_Config_Form_Field_ExcludedPages extends
77
{
88
public function __construct()
99
{
10-
$this->settings = [
11-
'columns' => [
12-
'pages' => [
10+
$this->settings = array(
11+
'columns' => array(
12+
'pages' => array(
1313
'label' => 'Pages',
1414
'options' => function () {
15-
$options = [];
15+
$options = array();
1616

1717
/** @var Mage_Cms_Model_Resource_Page_Collection $magento_pages */
1818
$magento_pages = Mage::getModel('cms/page')->getCollection()->addFieldToFilter('is_active', 1);
@@ -26,11 +26,11 @@ public function __construct()
2626
},
2727
'rowMethod' => 'getPages',
2828
'width' => 230,
29-
],
30-
],
29+
),
30+
),
3131
'buttonLabel' => 'Add Excluded Page',
3232
'addAfter' => false,
33-
];
33+
);
3434

3535
parent::__construct();
3636
}

‎code/Block/System/Config/Form/Field/Facets.php‎ renamed to ‎app/code/community/Algolia/Algoliasearch/Block/System/Config/Form/Field/Facets.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ class Algolia_Algoliasearch_Block_System_Config_Form_Field_Facets extends Algoli
77
{
88
public function __construct()
99
{
10-
$this->settings = [
11-
'columns' => [
12-
'attribute' => [
10+
$this->settings = array(
11+
'columns' => array(
12+
'attribute' => array(
1313
'label' => 'Attribute',
1414
'options' => function () {
15-
$options = [];
15+
$options = array();
1616

1717
/** @var Algolia_Algoliasearch_Helper_Entity_Producthelper $product_helper */
1818
$product_helper = Mage::helper('algoliasearch/entity_producthelper');
@@ -26,25 +26,25 @@ public function __construct()
2626
},
2727
'rowMethod' => 'getAttribute',
2828
'width' => 160,
29-
],
30-
'type' => [
29+
),
30+
'type' => array(
3131
'label' => 'Facet type',
32-
'options' => [
32+
'options' => array(
3333
'conjunctive' => 'Conjunctive',
3434
'disjunctive' => 'Disjunctive',
3535
'slider' => 'Slider',
3636
'priceRanges' => 'Price Ranges',
37-
],
37+
),
3838
'rowMethod' => 'getType',
39-
],
40-
'label' => [
39+
),
40+
'label' => array(
4141
'label' => 'Label',
4242
'style' => 'width: 100px;',
43-
],
44-
],
43+
),
44+
),
4545
'buttonLabel' => 'Add Facet',
4646
'addAfter' => false,
47-
];
47+
);
4848

4949
parent::__construct();
5050
}

0 commit comments

Comments
 (0)