Skip to content

Commit

Permalink
Merge pull request #571 from algolia/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
Jan Petr authored Sep 12, 2016
2 parents 2aeb25c + 0252707 commit 0a15e48
Show file tree
Hide file tree
Showing 297 changed files with 3,403 additions and 15,524 deletions.
4 changes: 2 additions & 2 deletions .php_cs
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?php

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

return Symfony\CS\Config\Config::create()
->setUsingCache(true)
->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
->fixers([
'align_double_arrow',
'short_array_syntax',
'long_array_syntax',
'-multiline_array_trailing_comma',
'-pre_increment'
])->finder($finder);
31 changes: 31 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,36 @@
## Change Log

### 1.7.0

#### FEATURES
- Option to choose if attributes' "No" values should or shouldn't be indexed (#554)

#### UPDATES
- Optimized front-end - **BC break** (#507, #531)
- All JS code except the extension's config and JS templates was moved to separate JS files
- Reduced the size of inline HTML code
- Better caching abilities
- Better readability of the code
- Removed templateloader.phtml file
- Use `allItems` template in hits widget instead of single `item` (#553)
- Restored support of PHP 5.3 (#524)
- The extension now follows the standart file structure as Magento (#517)
- All extension's assets were move to CSS files as SVGs (#521)
- Small visual updates in icons
- Supports retina displays now
- New versions of [instantsearch.js](https://github.com/algolia/instantsearch.js) and [autocomplete.js](https://github.com/algolia/autocomplete.js) libraries (#549)
- PHP API client updated to 1.10.2 version (#529)
- The extension follows new Algolia's UA convention (#530)
- Updated [FAQ](https://community.algolia.com/magento/faq/) (#509, #519, #525, #536)

#### FIXES
- Fixed issue with CDN images (#518)
- Whole images' URLs are now indexed
- **BC break!** It's mandatory to reindex all your data
- Fixed issue with overriding `top.search` block (#531)
- Encoded query attribute within additional sections in autocomplete menu (#534)
- Fixed notices from `array_unique` (#552)

### 1.6.1

#### UPDATES
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This extension replaces the default search of Magento with a typo-tolerant, fast

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

![Latest version](https://img.shields.io/badge/latest-1.6.1-green.svg)
![Latest version](https://img.shields.io/badge/latest-1.7.0-green.svg)
![Magento 1.6.2](https://img.shields.io/badge/magento-1.6.2-blue.svg)
![Magento 1.7.1](https://img.shields.io/badge/magento-1.7.1-blue.svg)
![Magento 1.8.1](https://img.shields.io/badge/magento-1.8.1-blue.svg)
Expand Down
4 changes: 2 additions & 2 deletions ...ystem/Config/Form/Field/AbstractField.php → ...ystem/Config/Form/Field/AbstractField.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
abstract class Algolia_Algoliasearch_Block_System_Config_Form_Field_AbstractField extends Mage_Adminhtml_Block_System_Config_Form_Field_Array_Abstract
{
protected $settings;
protected $selectFields = [];
protected $selectFields = array();

public function __construct()
{
Expand All @@ -12,7 +12,7 @@ public function __construct()
}

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

if (isset($columnSettings['label'])) {
$fieldSettings['label'] = Mage::helper('adminhtml')->__($columnSettings['label']);
Expand Down
32 changes: 16 additions & 16 deletions .../Config/Form/Field/AdditionalSections.php → .../Config/Form/Field/AdditionalSections.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ class Algolia_Algoliasearch_Block_System_Config_Form_Field_AdditionalSections ex
{
public function __construct()
{
$this->settings = [
'columns' => [
'name' => [
$this->settings = array(
'columns' => array(
'name' => array(
'label' => 'Section',
'options' => function () {
$options = [];
$options = array();

$sections = [
['name' => 'pages', 'label' => 'Pages'],
];
$sections = array(
array('name' => 'pages', 'label' => 'Pages'),
);

/** @var Algolia_Algoliasearch_Helper_Config $config */
$config = Mage::helper('algoliasearch/config');
Expand All @@ -27,10 +27,10 @@ public function __construct()
continue;
}

$sections[] = [
$sections[] = array(
'name' => $attribute['attribute'],
'label' => $attribute['label'] ? $attribute['label'] : $attribute['attribute']
];
);
}

foreach ($sections as $section) {
Expand All @@ -41,20 +41,20 @@ public function __construct()
},
'rowMethod' => 'getName',
'width' => 130,
],
'label' => [
),
'label' => array(
'label' => 'Label',
'style' => 'width: 100px;',
],
'hitsPerPage' => [
),
'hitsPerPage' => array(
'label' => 'Hits per page',
'style' => 'width: 100px;',
'class' => 'required-entry input-text validate-number',
],
],
),
),
'buttonLabel' => 'Add Section',
'addAfter' => false,
];
);

parent::__construct();
}
Expand Down
38 changes: 19 additions & 19 deletions ...rm/Field/CategoryAdditionalAttributes.php → ...rm/Field/CategoryAdditionalAttributes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ class Algolia_Algoliasearch_Block_System_Config_Form_Field_CategoryAdditionalAtt
{
public function __construct()
{
$this->settings = [
'columns' => [
'attribute' => [
$this->settings = array(
'columns' => array(
'attribute' => array(
'label' => 'Attribute',
'options' => function () {
$options = [];
$options = array();

/** @var Algolia_Algoliasearch_Helper_Entity_Categoryhelper $category_helper */
$category_helper = Mage::helper('algoliasearch/entity_categoryhelper');
Expand All @@ -26,35 +26,35 @@ public function __construct()
},
'rowMethod' => 'getAttribute',
'width' => 160,
],
'searchable' => [
),
'searchable' => array(
'label' => 'Searchable',
'options' => [
'options' => array(
'1' => 'Yes',
'0' => 'No',
],
),
'rowMethod' => 'getSearchable',
],
'retrievable' => [
),
'retrievable' => array(
'label' => 'Retrievable',
'options' => [
'options' => array(
'1' => 'Yes',
'0' => 'No',
],
),
'rowMethod' => 'getRetrievable',
],
'order' => [
),
'order' => array(
'label' => 'Ordered',
'options' => [
'options' => array(
'ordered' => 'Ordered',
'unordered' => 'Unordered',
],
),
'rowMethod' => 'getOrder',
],
],
),
),
'buttonLabel' => 'Add Attribute',
'addAfter' => false,
];
);

parent::__construct();
}
Expand Down
22 changes: 11 additions & 11 deletions ...Field/CustomRankingCategoryAttributes.php → ...Field/CustomRankingCategoryAttributes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ class Algolia_Algoliasearch_Block_System_Config_Form_Field_CustomRankingCategory
{
public function __construct()
{
$this->settings = [
'columns' => [
'attribute' => [
$this->settings = array(
'columns' => array(
'attribute' => array(
'label' => 'Attribute',
'options' => function () {
$options = [];
$options = array();

/** @var Algolia_Algoliasearch_Helper_Config $config */
$config = Mage::helper('algoliasearch/config');
Expand All @@ -25,19 +25,19 @@ public function __construct()
return $options;
},
'rowMethod' => 'getAttribute',
],
'order' => [
),
'order' => array(
'label' => 'Asc / Desc',
'options' => [
'options' => array(
'desc' => 'Descending',
'asc' => 'Ascending',
],
),
'rowMethod' => 'getOrder',
],
],
),
),
'buttonLabel' => 'Add Ranking Criterion',
'addAfter' => false,
];
);

parent::__construct();
}
Expand Down
22 changes: 11 additions & 11 deletions .../Field/CustomRankingProductAttributes.php → .../Field/CustomRankingProductAttributes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ class Algolia_Algoliasearch_Block_System_Config_Form_Field_CustomRankingProductA
{
public function __construct()
{
$this->settings = [
'columns' => [
'attribute' => [
$this->settings = array(
'columns' => array(
'attribute' => array(
'label' => 'Attribute',
'options' => function () {
$options = [];
$options = array();

/** @var Algolia_Algoliasearch_Helper_Config $config */
$config = Mage::helper('algoliasearch/config');
Expand All @@ -25,19 +25,19 @@ public function __construct()
return $options;
},
'rowMethod' => 'getAttribute',
],
'order' => [
),
'order' => array(
'label' => 'Asc / Desc',
'options' => [
'options' => array(
'desc' => 'Descending',
'asc' => 'Ascending',
],
),
'rowMethod' => 'getOrder',
],
],
),
),
'buttonLabel' => 'Add Ranking Criterion',
'addAfter' => false,
];
);

parent::__construct();
}
Expand Down
14 changes: 7 additions & 7 deletions ...ystem/Config/Form/Field/ExcludedPages.php → ...ystem/Config/Form/Field/ExcludedPages.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ class Algolia_Algoliasearch_Block_System_Config_Form_Field_ExcludedPages extends
{
public function __construct()
{
$this->settings = [
'columns' => [
'pages' => [
$this->settings = array(
'columns' => array(
'pages' => array(
'label' => 'Pages',
'options' => function () {
$options = [];
$options = array();

/** @var Mage_Cms_Model_Resource_Page_Collection $magento_pages */
$magento_pages = Mage::getModel('cms/page')->getCollection()->addFieldToFilter('is_active', 1);
Expand All @@ -26,11 +26,11 @@ public function __construct()
},
'rowMethod' => 'getPages',
'width' => 230,
],
],
),
),
'buttonLabel' => 'Add Excluded Page',
'addAfter' => false,
];
);

parent::__construct();
}
Expand Down
26 changes: 13 additions & 13 deletions ...Block/System/Config/Form/Field/Facets.php → ...Block/System/Config/Form/Field/Facets.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ class Algolia_Algoliasearch_Block_System_Config_Form_Field_Facets extends Algoli
{
public function __construct()
{
$this->settings = [
'columns' => [
'attribute' => [
$this->settings = array(
'columns' => array(
'attribute' => array(
'label' => 'Attribute',
'options' => function () {
$options = [];
$options = array();

/** @var Algolia_Algoliasearch_Helper_Entity_Producthelper $product_helper */
$product_helper = Mage::helper('algoliasearch/entity_producthelper');
Expand All @@ -26,25 +26,25 @@ public function __construct()
},
'rowMethod' => 'getAttribute',
'width' => 160,
],
'type' => [
),
'type' => array(
'label' => 'Facet type',
'options' => [
'options' => array(
'conjunctive' => 'Conjunctive',
'disjunctive' => 'Disjunctive',
'slider' => 'Slider',
'priceRanges' => 'Price Ranges',
],
),
'rowMethod' => 'getType',
],
'label' => [
),
'label' => array(
'label' => 'Label',
'style' => 'width: 100px;',
],
],
),
),
'buttonLabel' => 'Add Facet',
'addAfter' => false,
];
);

parent::__construct();
}
Expand Down
Loading

0 comments on commit 0a15e48

Please sign in to comment.