Latest changes from head

.gitignore

@@ -0,0 +1,11 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Composer template
+composer.phar
+vendor/
+bin/
+
+# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+# composer.lock
+
+

.travis.yml

@@ -1,21 +1,21 @@
 language: php
-
-services: mongodb
+sudo: false
 
 php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
+  - 7.0
+  - 7.1
+  - 7.2
+  - 7.3
+
 before_script:
-    - echo "extension=mongo.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
-    - curl -s http://getcomposer.org/installer | php
-    - php composer.phar install --dev
-    - curl -sSL https://raw.githubusercontent.com/moliware/travis-solr/master/travis-solr.sh | SOLR_VERSION=4.8.0 bash
+    - curl -sSL https://raw.githubusercontent.com/floriansemm/travis-solr/master/travis-solr.sh | SOLR_CORE=core0 DEBUG=1 SOLR_VERSION=4.8.0 SOLR_CONFS="Tests/Resources/config/schema.xml" bash
 
+install:
+  - composer self-update
+  - if [[ ${TRAVIS_PHP_VERSION:0:2} == "5." ]]; then yes '' | pecl -q install -f mongo; fi
+  - if [[ ${TRAVIS_PHP_VERSION:0:2} == "7." ]]; then pecl install -f mongodb; fi
+  - if [[ ${TRAVIS_PHP_VERSION:0:2} == "7." ]]; then composer config "platform.ext-mongo" "1.6.16" && composer require alcaeus/mongo-php-adapter; fi
+  - composer update
 
 script:
-    - phpunit
-notifications:
-  email:
-    - fsemm.travis-ci@gmx.de    
+    - ./bin/phpunit

Client/Builder.php

@@ -1,6 +1,6 @@
 <?php
-namespace FS\SolrBundle\Client;
 
+namespace FS\SolrBundle\Client;
 
 interface Builder
 {

Client/Solarium/Plugin/LoggerPlugin.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace FS\SolrBundle\Client\Solarium\Plugin;
+
+use FS\SolrBundle\Logging\SolrLoggerInterface;
+use Solarium\Core\Client\Client;
+use Solarium\Core\Event\Events;
+use Solarium\Core\Event\PreExecuteRequest;
+use Solarium\Core\Plugin\AbstractPlugin;
+
+/**
+ * Registers a logger to collection data about request
+ */
+class LoggerPlugin extends AbstractPlugin
+{
+    /**
+     * @var SolrLoggerInterface
+     */
+    protected $logger;
+
+    /**
+     * @param SolrLoggerInterface $logger
+     */
+    public function __construct(SolrLoggerInterface $logger)
+    {
+        $this->logger = $logger;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function initPluginType()
+    {
+        $dispatcher = $this->client->getEventDispatcher();
+        $dispatcher->addListener(Events::PRE_EXECUTE_REQUEST,   [$this, 'preExecuteRequest']);
+        $dispatcher->addListener(Events::POST_EXECUTE_REQUEST,  [$this, 'postExecuteRequest']);
+    }
+
+    /**
+     * @param PreExecuteRequest $event
+     */
+    public function preExecuteRequest(PreExecuteRequest $event)
+    {
+        $endpoint = $event->getEndpoint();
+        $request = $event->getRequest();
+        $uri = $request->getUri();
+
+        $path = sprintf('%s://%s:%s%s/%s', $endpoint->getScheme(), $endpoint->getHost(), $endpoint->getPort(), $endpoint->getPath(), urldecode($uri));
+
+        $requestInformation = [
+            'uri' => $path,
+            'method' => $request->getMethod(),
+            'raw_data' => $request->getRawData()
+        ];
+
+        $this->logger->startRequest($requestInformation);
+    }
+
+    /**
+     * Issue stop logger
+     */
+    public function postExecuteRequest()
+    {
+        $this->logger->stopRequest();
+    }
+
+    /**
+     * @return Client
+     */
+    public function getClient()
+    {
+        return $this->client;
+    }
+}

Client/Solarium/Plugin/RequestDebugger.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace FS\SolrBundle\Client\Solarium\Plugin;
+
+use Psr\Log\LoggerInterface;
+use Solarium\Core\Event\Events;
+use Solarium\Core\Event\PreExecuteRequest;
+use Solarium\Core\Plugin\AbstractPlugin;
+
+/**
+ * Listens on solarium.core.preExecuteRequest event
+ */
+class RequestDebugger extends AbstractPlugin
+{
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param LoggerInterface $logger
+     */
+    public function __construct(LoggerInterface $logger)
+    {
+        $this->logger = $logger;
+
+        parent::__construct();
+    }
+
+    /**
+     * @param PreExecuteRequest $event
+     */
+    public function preExecuteRequest(PreExecuteRequest $event)
+    {
+        $this->logger->info(sprintf('run request: %s', urldecode($event->getRequest()->getUri())));
+    }
+
+}

Client/Solarium/SolariumClientBuilder.php

@@ -0,0 +1,92 @@
+<?php
+
+namespace FS\SolrBundle\Client\Solarium;
+
+use FS\SolrBundle\Client\Builder;
+use Solarium\Client;
+use Solarium\Core\Plugin\AbstractPlugin;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+
+/**
+ * Creates an instance of the Solarium Client
+ */
+class SolariumClientBuilder implements Builder
+{
+    /**
+     * @var array
+     */
+    private $settings = array();
+
+    /**
+     * @var AbstractPlugin[]
+     */
+    private $plugins = array();
+
+    /**
+     * @var EventDispatcherInterface
+     */
+    private $eventDispatcher;
+
+    /**
+     * @param array                    $settings
+     * @param EventDispatcherInterface $eventDispatcher
+     */
+    public function __construct(array $settings, EventDispatcherInterface $eventDispatcher)
+    {
+        $this->settings = $settings;
+        $this->eventDispatcher = $eventDispatcher;
+    }
+
+    /**
+     * @param string         $pluginName
+     * @param AbstractPlugin $plugin
+     */
+    public function addPlugin($pluginName, AbstractPlugin $plugin)
+    {
+        $this->plugins[$pluginName] = $plugin;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return Client
+     */
+    public function build()
+    {
+        $settings = [];
+        foreach ($this->settings as $name => $options) {
+            if (isset($options['dsn'])) {
+                unset(
+                    $options['scheme'],
+                    $options['host'],
+                    $options['port'],
+                    $options['path']
+                );
+
+                $parsedDsn = parse_url($options['dsn']);
+                unset($options['dsn']);
+                if ($parsedDsn) {
+                    $options['scheme'] = isset($parsedDsn['scheme']) ? $parsedDsn['scheme'] : 'http';
+                    if (isset($parsedDsn['host'])) {
+                        $options['host'] = $parsedDsn['host'];
+                    }
+                    if (isset($parsedDsn['user'])) {
+                        $auth = $parsedDsn['user'] . (isset($parsedDsn['pass']) ? ':' . $parsedDsn['pass'] : '');
+                        $options['host'] = $auth . '@' . $options['host'];
+                    }
+                    $options['port'] = isset($parsedDsn['port']) ? $parsedDsn['port'] : 80;
+                    $options['path'] = isset($parsedDsn['path']) ? $parsedDsn['path'] : '';
+                }
+            }
+
+            $settings[$name] = $options;
+        }
+
+        $solariumClient = new Client(array('endpoint' => $settings), $this->eventDispatcher);
+        foreach ($this->plugins as $pluginName => $plugin) {
+            $solariumClient->registerPlugin($pluginName, $plugin);
+        }
+
+        return $solariumClient;
+    }
+}

Client/Client.php → Client/Solarium/SolariumMulticoreClient.php

@@ -1,26 +1,28 @@
 <?php
 
-namespace FS\SolrBundle\Client;
+namespace FS\SolrBundle\Client\Solarium;
 
+use FS\SolrBundle\Doctrine\Mapper\MetaInformationInterface;
+use FS\SolrBundle\Query\DeleteDocumentQuery;
 use FS\SolrBundle\Query\FindByIdentifierQuery;
 use Solarium\Core\Query\QueryInterface;
 use Solarium\QueryType\Update\Query\Document\DocumentInterface;
-use \Solarium\Client as SolariumClient;
+use \Solarium\Client;
 
 /**
  * Wrapper class for \Solarium\Client to perform actions on multiple cores
  */
-class Client
+class SolariumMulticoreClient
 {
     /**
-     * @var SolariumClient
+     * @var Client
      */
     private $solariumClient;
 
     /**
-     * @param SolariumClient $solariumClient
+     * @param Client $solariumClient
      */
-    public function __construct(SolariumClient $solariumClient)
+    public function __construct(Client $solariumClient)
     {
         $this->solariumClient = $solariumClient;
     }
@@ -44,8 +46,12 @@ public function update(DocumentInterface $doc, $index)
      */
     public function delete(DocumentInterface $document, $index)
     {
-        $deleteQuery = new FindByIdentifierQuery();
+        $documentFields = $document->getFields();
+        $documentKey = $documentFields[MetaInformationInterface::DOCUMENT_KEY_FIELD_NAME];
+
+        $deleteQuery = new DeleteDocumentQuery();
         $deleteQuery->setDocument($document);
+        $deleteQuery->setDocumentKey($documentKey);
 
         $delete = $this->solariumClient->createUpdate();
         $delete->addDeleteQuery($deleteQuery->getQuery());
@@ -54,6 +60,9 @@ public function delete(DocumentInterface $document, $index)
         $this->applyQuery($delete, $index);
     }
 
+    /**
+     * Runs a *:* delete query on all cores
+     */
     public function clearCores()
     {
         $delete = $this->solariumClient->createUpdate();