Merge branch 'develop'

Author: avstudnitz

.gitignore

@@ -1,4 +1,6 @@
 phpunit.xml
 composer.lock
+wercker.env
+.wercker
 /vendor/
 .idea/

build/install-magento.sh

@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+set -e
+set -x
+echo memory_limit=-1 >> /usr/local/etc/php/php.ini
+git checkout -b tmp
+git add -A
+git commit --allow-empty -m "tmp"
+export MODULE_DIR=`pwd`
+export M2SETUP_DB_HOST=$MYSQL_CI_PORT_3306_TCP_ADDR
+export M2SETUP_DB_USER=root
+export M2SETUP_DB_PASSWORD=$MYSQL_CI_ENV_MYSQL_ROOT_PASSWORD
+export M2SETUP_DB_NAME=magento
+export M2SETUP_BASE_URL=http://m2.localhost:8000/
+export M2SETUP_ADMIN_FIRSTNAME=Admin
+export M2SETUP_ADMIN_LASTNAME=User
+export [email protected]
+export M2SETUP_ADMIN_USER=magento2
+export M2SETUP_ADMIN_PASSWORD=magento2
+export M2SETUP_VERSION=$1
+export M2SETUP_USE_SAMPLE_DATA=false
+export M2SETUP_USE_ARCHIVE=true
+export COMPOSER_HOME=$WERCKER_CACHE_DIR/composer
+mysqladmin -u$M2SETUP_DB_USER -p"$M2SETUP_DB_PASSWORD" -h$M2SETUP_DB_HOST create $M2SETUP_DB_NAME
+/usr/local/bin/mage-setup
+cd /srv/www
+composer config http-basic.repo.magento.com $MAGENTO_REPO_PUBLIC_KEY $MAGENTO_REPO_PRIVATE_KEY
+composer config repositories.solr-module vcs $MODULE_DIR
+composer config repositories.solr-autosuggest vcs [email protected]:integer-net/solr-magento2-autosuggest.git
+composer config repositories.solr-base vcs [email protected]:integer-net/solr-base.git
+composer config repositories.solr-pro vcs [email protected]:integer-net/solr-pro.git
+sed -i -e 's/"psr-4": {/"psr-4": {\n      "IntegerNet\\\\Solr\\\\": ["vendor\/integer-net\/solr-magento2\/main\/test\/unit", "vendor\/integer-net\/solr-magento2\/main\/test\/integration", "vendor\/integer-net\/solr-base\/test\/Solr" ],/g' composer.json
+composer config minimum-stability dev
+composer require integer-net/solr-magento2 dev-tmp --no-update
+composer require --dev tddwizard/magento2-fixtures 0.3.0 --no-update
+phpunit_version="$(composer info | grep "phpunit/phpunit " | awk '{ print $2 }')"
+phpunit_minimum="5.7.0"
+if [ "$(printf "$phpunit_minimum\n$phpunit_version" | sort -V | head -n1)" == "$phpunit_version" ] && [ "$phpunit_version" != "$phpunit_minimum" ]; then
+    composer require --dev phpunit/phpunit ^5.7 --no-update
+fi
+
+composer update
+sed -i -e "s/8983/$SOLR_CI_PORT_8983_TCP_PORT/g"  vendor/integer-net/solr-magento2/main/test/integration/_files/solr_config.dist.php
+sed -i -e "s/localhost/$SOLR_CI_PORT_8983_TCP_ADDR/g" vendor/integer-net/solr-magento2/main/test/integration/_files/solr_config.dist.php
+sed -i -e "s/solr-magento2-tests/core0/g" vendor/integer-net/solr-magento2/main/test/integration/_files/solr_config.dist.php
+bin/magento module:enable IntegerNet_Solr
+bin/magento setup:upgrade

build/integration-tests.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+set -e
+set -x
+export MODULE_DIR=`pwd`
+export M2SETUP_DB_HOST=$MYSQL_CI_PORT_3306_TCP_ADDR
+export M2SETUP_DB_USER=root
+export M2SETUP_DB_PASSWORD=$MYSQL_CI_ENV_MYSQL_ROOT_PASSWORD
+export TEST_DB_NAME=magento_integration_tests
+mysqladmin -u$M2SETUP_DB_USER -p"$M2SETUP_DB_PASSWORD" -h$M2SETUP_DB_HOST create $TEST_DB_NAME
+cp $MODULE_DIR/main/test/integration/phpunit.xml.dist /srv/www/dev/tests/integration/phpunit.xml
+cp $MODULE_DIR/main/test/integration/install-config-mysql.php /srv/www/dev/tests/integration/etc/
+sed -i -e "s/DB_HOST/$M2SETUP_DB_HOST/g" /srv/www/dev/tests/integration/etc/install-config-mysql.php
+sed -i -e "s/DB_USER/$M2SETUP_DB_USER/g" /srv/www/dev/tests/integration/etc/install-config-mysql.php
+sed -i -e "s/DB_PASSWORD/$M2SETUP_DB_PASSWORD/g" /srv/www/dev/tests/integration/etc/install-config-mysql.php
+sed -i -e "s/DB_NAME/$TEST_DB_NAME/g" /srv/www/dev/tests/integration/etc/install-config-mysql.php
+cd /srv/www/dev/tests/integration
+php ../../../vendor/phpunit/phpunit/phpunit
+
+cp $MODULE_DIR/categories/test/integration/phpunit.xml.dist /srv/www/dev/tests/integration/phpunit.xml
+cd /srv/www/dev/tests/integration
+php ../../../vendor/phpunit/phpunit/phpunit

categories/src/Block/Result/Categories.php

@@ -10,31 +10,32 @@
 namespace IntegerNet\SolrCategories\Block\Result;
 
 use IntegerNet\SolrCategories\Model\ResourceModel\CategoriesCollection;
+use IntegerNet\SolrCategories\Model\ResourceModel\CategoriesCollectionFactory;
 use Magento\Catalog\Block\Product\Context;
 
 class Categories extends \Magento\Catalog\Block\Product\AbstractProduct
 {
     /**
-     * @var CategoriesCollection
+     * @var CategoriesCollectionFactory
      */
-    private $categoriesCollection;
+    private $categoriesCollectionFactory;
 
     public function __construct(
         Context $context,
-        CategoriesCollection $categoriesCollection,
+        CategoriesCollectionFactory $categoriesCollectionFactory,
         array $data
     )
     {
         parent::__construct($context, $data);
-        $this->categoriesCollection = $categoriesCollection;
+        $this->categoriesCollectionFactory = $categoriesCollectionFactory;
     }
 
     /**
      * @return CategoriesCollection
      */
     public function getResultsCollection()
     {
-        return $this->categoriesCollection;
+        return $this->categoriesCollectionFactory->create();
     }
 
     /**

categories/src/Setup/UpgradeData.php

@@ -0,0 +1,83 @@
+<?php
+/**
+ * integer_net Magento Module
+ *
+ * @category   IntegerNet
+ * @package    IntegerNet_Solr
+ * @copyright  Copyright (c) 2017 integer_net GmbH (http://www.integer-net.de/)
+ * @author     Andreas von Studnitz <[email protected]>
+ */
+namespace IntegerNet\SolrCategories\Setup;
+
+use Magento\Catalog\Model\Category;
+use Magento\Eav\Setup\EavSetup;
+use Magento\Eav\Setup\EavSetupFactory;
+use Magento\Framework\Setup\UpgradeDataInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+
+class UpgradeData implements UpgradeDataInterface
+{
+    /**
+     * EAV setup factory
+     *
+     * @var EavSetupFactory
+     */
+    private $eavSetupFactory;
+
+    /**
+     * Init
+     *
+     * @param EavSetupFactory $eavSetupFactory
+     */
+    public function __construct(EavSetupFactory $eavSetupFactory)
+    {
+        $this->eavSetupFactory = $eavSetupFactory;
+    }
+
+    /**
+     * Upgrades data for a module
+     *
+     * @param ModuleDataSetupInterface $setup
+     * @param ModuleContextInterface $context
+     * @return void
+     */
+    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $setup->startSetup();
+
+        /** @var EavSetup $eavSetup */
+        $eavSetup = $this->eavSetupFactory->create(['setup' => $setup]);
+
+        if (version_compare($context->getVersion(), '1.2.0', '<')) {
+
+            $this->addSolrBoostCategoryAttribute($eavSetup);
+        }
+
+        $setup->endSetup();
+    }
+
+    /**
+     * @param EavSetup $eavSetup
+     */
+    private function addSolrBoostCategoryAttribute(EavSetup $eavSetup)
+    {
+        $eavSetup->addAttribute(
+            Category::ENTITY,
+            'solr_boost',
+            [
+                'type'              => 'decimal',
+                'input'             => 'text',
+                'label'             => 'Solr Priority',
+                'frontend_class'    => 'validate-number',
+                'note'              => '1 is default, use higher numbers for higher priority.',
+                'required'          => 0,
+                'user_defined'      => 0,
+                'group'             => 'Solr',
+                'global'            => 0,
+                'visible'           => 1,
+                'default'           => 1,
+            ]
+        );
+    }
+}

categories/src/etc/module.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="IntegerNet_SolrCategories" setup_version="1.1.0">
+    <module name="IntegerNet_SolrCategories" setup_version="1.2.0">
         <sequence>
             <module name="IntegerNet_Solr"/>
         </sequence>