Updated module to support ZF3

.coveralls.yml

@@ -0,0 +1,2 @@
+service_name: travis-pro
+repo_token: 2VO5MRpRQxkxYiQnbJF064rTEZIJ1AbVW

.gitignore

@@ -0,0 +1,3 @@
+.idea
+vendor
+composer.lock

.travis.yml

@@ -0,0 +1,11 @@
+language: php
+php:
+   - '5.6'
+   - '7.0'
+install:
+   - composer install
+script:
+  - mkdir -p build/logs
+  - php vendor/bin/phpunit
+after_success:
+  - travis_retry php vendor/bin/coveralls -v

Module.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace EwgoSolarium;
+namespace SynergySolarium;
 
 use Zend\ModuleManager\Feature\AutoloaderProviderInterface;
 use Zend\ModuleManager\Feature\ConfigProviderInterface;

README.md

@@ -1,18 +1,23 @@
-# EwgoSolarium module
+[![Build Status](https://travis-ci.org/odiaseo/SolariumModule.svg?branch=master)](https://travis-ci.org/odiaseo/SolariumModule)
+[![Coverage Status](https://coveralls.io/repos/github/odiaseo/SolariumModule/badge.svg?branch=master)](https://coveralls.io/github/odiaseo/SolariumModule?branch=master)
+
+# SynergySolarium module
 
 ## About
 
-The EwgoSolarium module provides ZF2 integration with [Solarium](http://www.solarium-project.org) solr client.
+The SynergySolarium module provides ZF3 integration with [Solarium](http://www.solarium-project.org) solr client.
 
 It also integrates with [Zend Developer Tools](https://github.com/zendframework/ZendDeveloperTools).
 
+Inspired by Ewgo/SolariumModule ZF2 module
+
 ## Installation
 
 ``` bash
-$ php composer.phar require ewgo/solarium-module
+$ php composer.phar require synergy/solarium-module
 ```
 
-Add "EwgoSolarium" to the list of loaded modules.
+Add "SynergySolarium" to the list of loaded modules.
 
 ## Basic configuration
 
@@ -47,7 +52,7 @@ For more information see the [Solarium documentation](http://www.solarium-projec
 This module also provides an adapter for Zend\Paginator.
 ```php
 $paginator = new \Zend\Paginator\Paginator(
-    new \EwgoSolarium\Paginator\Adapter\SolariumPaginator($client, $query)
+    new \SynergySolarium\Paginator\Adapter\SolariumPaginator($client, $query)
 );
 $paginator->setCurrentPageNumber($page);
 $paginator->setItemCountPerPage($countPerPage);

autoload_classmap.php

@@ -0,0 +1,2 @@
+<?php
+return [];

composer.json

@@ -1,15 +1,40 @@
 {
-    "name": "ewgo/solarium-module",
-    "description": "Zend Framework 2 integration with solarium solr client",
-    "keywords": ["zf2", "solr", "solarium", "search"],
-    "license": "MIT",
-    "type": "zf2-module",
-    "require": {
-        "zendframework/zendframework": "2.*",
-        "solarium/solarium": "3.*"
+  "name": "synergy/solarium-module",
+  "description": "Zend Framework 3 integration with solarium solr search client client",
+  "keywords": [
+    "zf3",
+    "solr",
+    "solarium",
+    "search"
+  ],
+  "license": "MIT",
+  "type": "zf3-module",
+  "prefer-stable": true,
+  "require": {
+    "zendframework/zend-component-installer": "^1.0 || ^0.3 || ^1.0.0-dev@dev",
+    "zendframework/zendframework": "^3",
+    "zendframework/zend-mvc": "^3",
+    "solarium/solarium": "~3"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "~5",
+    "satooshi/php-coveralls": "^1",
+    "zendframework/zend-developer-tools": "dev-master"
+  },
+  "autoload": {
+    "psr-0": {
+      "SynergySolarium": "src/",
+      "SynergySolariumTest": "tests/"
     },
-    "autoload": {
-        "psr-0": { "EwgoSolarium": "src/" },
-        "classmap": [ "./Module.php" ]
+    "classmap": [
+      "./tests/SynergySolariumTest/Module.php",
+      "./Module.php"
+    ]
+  },
+  "authors": [
+    {
+      "name": "Pele Odiase",
+      "email": "peleodiase@yahoo.co.uk"
     }
-}
+  ]
+}

config/module.config.php

@@ -3,14 +3,14 @@
 return array(
     'service_manager' => array(
         'factories' => array(
-            'Solarium\Client' => 'EwgoSolarium\Service\SolariumFactory',
-            'EwgoSolarium\Collector\RequestCollector' => 'EwgoSolarium\Service\RequestCollectorFactory',
-            'EwgoSolarium\Plugin\RequestLogger' => 'EwgoSolarium\Service\RequestLoggerFactory'
+            'Solarium\Client' =>   SynergySolarium\Service\SolariumFactory::class,
+            'SynergySolarium\Collector\RequestCollector' => SynergySolarium\Service\RequestCollectorFactory::class,
+            'SynergySolarium\Plugin\RequestLogger' => SynergySolarium\Service\RequestLoggerFactory::class
         ),
         'aliases' => array(
-            'solarium' => 'Solarium\Client',
-            'solarium.collector' => 'EwgoSolarium\Collector\RequestCollector',
-            'solarium.logger' => 'EwgoSolarium\Plugin\RequestLogger'
+            'solarium' => Solarium\Client::class,
+            'solarium.collector' => SynergySolarium\Collector\RequestCollector::class,
+            'solarium.logger' => SynergySolarium\Plugin\RequestLogger::class
         )
     ),
 
@@ -23,12 +23,12 @@
     'zenddevelopertools' => array(
         'profiler' => array(
             'collectors' => array(
-                'solarium'  => 'solarium.collector',
+                'solarium' => 'solarium.collector',
             ),
         ),
         'toolbar' => array(
             'entries' => array(
-                'solarium'  => 'zend-developer-tools/toolbar/solarium-requests',
+                'solarium' => 'zend-developer-tools/toolbar/solarium-requests',
             ),
         ),
     ),

init_autoloader.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/ZendSkeletonApplication for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+/**
+ * This autoloading setup is really more complicated than it needs to be for most
+ * applications. The added complexity is simply to reduce the time it takes for
+ * new developers to be productive with a fresh skeleton. It allows autoloading
+ * to be correctly configured, regardless of the installation method and keeps
+ * the use of composer completely optional. This setup should work fine for
+ * most users, however, feel free to configure autoloading however you'd like.
+ */
+
+// Composer autoloading
+if (file_exists('vendor/autoload.php')) {
+    $loader = include 'vendor/autoload.php';
+}
+
+// Support for ZF2_PATH environment variable or git submodule
+if (($zf2Path = getenv('ZF2_PATH')
+        ?: (is_dir('vendor/zendframework/zendframework/library') ? 'vendor/zendframework/zendframework/library'
+            : false)) !== false
+) {
+    if (isset($loader)) {
+        $loader->add('Zend', $zf2Path . '/Zend');
+    } else {
+        include $zf2Path . '/Zend/Loader/AutoloaderFactory.php';
+        Zend\Loader\AutoloaderFactory::factory(
+            array(
+                'Zend\Loader\StandardAutoloader' => array(
+                    'autoregister_zf' => true
+                )
+            )
+        );
+    }
+}
+
+if ( ! class_exists('Zend\Loader\AutoloaderFactory')) {
+    throw new RuntimeException(
+        'Unable to load ZF2. Run `php composer.phar install` or define a ZF2_PATH environment variable.'
+    );
+}

phpunit.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="tests/Bootstrap.php" colors="true" backupGlobals="false" backupStaticAttributes="false">
+
+    <testsuites>
+        <testsuite name="Synergy Solarium Test">
+            <directory suffix="Test.php">tests</directory>
+        </testsuite>
+    </testsuites>
+    <php>
+        <includePath>tests</includePath>
+        <includePath>../../vendor</includePath>
+        <includePath>../../src</includePath>
+    </php>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">src</directory>
+        </whitelist>
+    </filter>
+</phpunit>

phpunit.xml.dist

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="tests/Bootstrap.php" colors="true" backupGlobals="false" backupStaticAttributes="false">
+
+    <testsuites>
+        <testsuite name="Synergy Solarium Test">
+            <directory suffix="Test.php">tests</directory>
+        </testsuite>
+    </testsuites>
+    <php>
+        <includePath>tests</includePath>
+        <includePath>../../vendor</includePath>
+        <includePath>../../src</includePath>
+    </php>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">src</directory>
+        </whitelist>
+    </filter>
+</phpunit>

src/EwgoSolarium/Collector/RequestCollector.php → src/SynergySolarium/Collector/RequestCollector.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace EwgoSolarium\Collector;
+namespace SynergySolarium\Collector;
 
 use ZendDeveloperTools\Collector\AutoHideInterface;
 use ZendDeveloperTools\Collector\CollectorInterface;
-use EwgoSolarium\Plugin\RequestLogger;
+use SynergySolarium\Plugin\RequestLogger;
 use Zend\Mvc\MvcEvent;
 
 /**
  * Zend Developer Toolbar collector for Solarium requests
  *
  * @license MIT
- * @package EwgoSolarium
+ * @package SynergySolarium
  */
 class RequestCollector implements CollectorInterface, AutoHideInterface
 {

src/EwgoSolarium/Paginator/Adapter/SolariumPaginator.php → src/SynergySolarium/Paginator/Adapter/SolariumPaginator.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace EwgoSolarium\Paginator\Adapter;
+namespace SynergySolarium\Paginator\Adapter;
 
 use Zend\Paginator\Adapter\AdapterInterface;
 use Solarium\Client;
@@ -10,7 +10,7 @@
  * Solarium result paginator
  *
  * @license MIT
- * @package EwgoSolarium
+ * @package SynergySolarium
  */
 class SolariumPaginator implements AdapterInterface
 {