cviebrock / laravel-elasticsearch

src/Manager.php

Indentation +121 added lines, -121 removed lines

@@ -13,125 +13,125 @@
 class Manager
 {
 
-    /**
-     * The application instance.
-     *
-     * @var \Illuminate\Contracts\Foundation\Application
-     */
-    protected $app;
-
-    /**
-     * The Elasticsearch connection factory instance.
-     *
-     * @var Factory
-     */
-    protected $factory;
-
-    /**
-     * The active connection instances.
-     *
-     * @var array
-     */
-    protected $connections = [];
-
-    /**
-     * @param Application $app
-     * @param Factory $factory
-     */
-    public function __construct(Application $app, Factory $factory)
-    {
-        $this->app = $app;
-        $this->factory = $factory;
-    }
-
-    /**
-     * Retrieve or build the named connection.
-     *
-     * @param null $name
-     * @return \Elasticsearch\Client|mixed
-     */
-    public function connection($name = null)
-    {
-        $name = $name ?: $this->getDefaultConnection();
-
-        if (!isset($this->connections[$name])) {
-            $client = $this->makeConnection($name);
-
-            $this->connections[$name] = $client;
-        }
-
-        return $this->connections[$name];
-    }
-
-    /**
-     * Get the default connection.
-     *
-     * @return string
-     */
-    public function getDefaultConnection()
-    {
-        return $this->app['config']['elasticsearch.defaultConnection'];
-    }
-
-    /**
-     * Set the default connection.
-     *
-     * @param string $connection
-     */
-    public function setDefaultConnection($connection)
-    {
-        $this->app['config']['elasticsearch.defaultConnection'] = $connection;
-    }
-
-    /**
-     * Make a new connection.
-     *
-     * @param $name
-     * @return \Elasticsearch\Client|mixed
-     */
-    protected function makeConnection($name)
-    {
-        $config = $this->getConfig($name);
-
-        return $this->factory->make($config);
-    }
-
-    /**
-     * Get the configuration for a named connection.
-     *
-     * @param $name
-     * @return mixed
-     */
-    protected function getConfig($name)
-    {
-        $connections = $this->app['config']['elasticsearch.connections'];
-
-        if (is_null($config = array_get($connections, $name))) {
-            throw new \InvalidArgumentException("Elasticsearch connection [$name] not configured.");
-        }
-
-        return $config;
-    }
-
-    /**
-     * Return all of the created connections.
-     *
-     * @return array
-     */
-    public function getConnections()
-    {
-        return $this->connections;
-    }
-
-    /**
-     * Dynamically pass methods to the default connection.
-     *
-     * @param  string $method
-     * @param  array $parameters
-     * @return mixed
-     */
-    public function __call($method, $parameters)
-    {
-        return call_user_func_array([$this->connection(), $method], $parameters);
-    }
+	/**
+	 * The application instance.
+	 *
+	 * @var \Illuminate\Contracts\Foundation\Application
+	 */
+	protected $app;
+
+	/**
+	 * The Elasticsearch connection factory instance.
+	 *
+	 * @var Factory
+	 */
+	protected $factory;
+
+	/**
+	 * The active connection instances.
+	 *
+	 * @var array
+	 */
+	protected $connections = [];
+
+	/**
+	 * @param Application $app
+	 * @param Factory $factory
+	 */
+	public function __construct(Application $app, Factory $factory)
+	{
+		$this->app = $app;
+		$this->factory = $factory;
+	}
+
+	/**
+	 * Retrieve or build the named connection.
+	 *
+	 * @param null $name
+	 * @return \Elasticsearch\Client|mixed
+	 */
+	public function connection($name = null)
+	{
+		$name = $name ?: $this->getDefaultConnection();
+
+		if (!isset($this->connections[$name])) {
+			$client = $this->makeConnection($name);
+
+			$this->connections[$name] = $client;
+		}
+
+		return $this->connections[$name];
+	}
+
+	/**
+	 * Get the default connection.
+	 *
+	 * @return string
+	 */
+	public function getDefaultConnection()
+	{
+		return $this->app['config']['elasticsearch.defaultConnection'];
+	}
+
+	/**
+	 * Set the default connection.
+	 *
+	 * @param string $connection
+	 */
+	public function setDefaultConnection($connection)
+	{
+		$this->app['config']['elasticsearch.defaultConnection'] = $connection;
+	}
+
+	/**
+	 * Make a new connection.
+	 *
+	 * @param $name
+	 * @return \Elasticsearch\Client|mixed
+	 */
+	protected function makeConnection($name)
+	{
+		$config = $this->getConfig($name);
+
+		return $this->factory->make($config);
+	}
+
+	/**
+	 * Get the configuration for a named connection.
+	 *
+	 * @param $name
+	 * @return mixed
+	 */
+	protected function getConfig($name)
+	{
+		$connections = $this->app['config']['elasticsearch.connections'];
+
+		if (is_null($config = array_get($connections, $name))) {
+			throw new \InvalidArgumentException("Elasticsearch connection [$name] not configured.");
+		}
+
+		return $config;
+	}
+
+	/**
+	 * Return all of the created connections.
+	 *
+	 * @return array
+	 */
+	public function getConnections()
+	{
+		return $this->connections;
+	}
+
+	/**
+	 * Dynamically pass methods to the default connection.
+	 *
+	 * @param  string $method
+	 * @param  array $parameters
+	 * @return mixed
+	 */
+	public function __call($method, $parameters)
+	{
+		return call_user_func_array([$this->connection(), $method], $parameters);
+	}
 }

src/Facade.php

Indentation +9 added lines, -9 removed lines

@@ -13,13 +13,13 @@
 class Facade extends BaseFacade
 {
 
-    /**
-     * Get the registered name of the component.
-     *
-     * @return string
-     */
-    protected static function getFacadeAccessor()
-    {
-        return 'elasticsearch';
-    }
+	/**
+	 * Get the registered name of the component.
+	 *
+	 * @return string
+	 */
+	protected static function getFacadeAccessor()
+	{
+		return 'elasticsearch';
+	}
 }

src/LumenManager.php

Indentation +121 added lines, -121 removed lines

@@ -13,125 +13,125 @@
 class LumenManager
 {
 
-    /**
-     * The application instance.
-     *
-     * @var \Illuminate\Contracts\Foundation\Application
-     */
-    protected $app;
-
-    /**
-     * The Elasticsearch connection factory instance.
-     *
-     * @var Factory
-     */
-    protected $factory;
-
-    /**
-     * The active connection instances.
-     *
-     * @var array
-     */
-    protected $connections = [];
-
-    /**
-     * @param Application $app
-     * @param Factory $factory
-     */
-    public function __construct($app, Factory $factory)
-    {
-        $this->app = $app;
-        $this->factory = $factory;
-    }
-
-    /**
-     * Retrieve or build the named connection.
-     *
-     * @param null $name
-     * @return \Elasticsearch\Client|mixed
-     */
-    public function connection($name = null)
-    {
-        $name = $name ?: $this->getDefaultConnection();
-
-        if (!isset($this->connections[$name])) {
-            $client = $this->makeConnection($name);
-
-            $this->connections[$name] = $client;
-        }
-
-        return $this->connections[$name];
-    }
-
-    /**
-     * Get the default connection.
-     *
-     * @return string
-     */
-    public function getDefaultConnection()
-    {
-        return $this->app['config']['elasticsearch.defaultConnection'];
-    }
-
-    /**
-     * Set the default connection.
-     *
-     * @param string $connection
-     */
-    public function setDefaultConnection($connection)
-    {
-        $this->app['config']['elasticsearch.defaultConnection'] = $connection;
-    }
-
-    /**
-     * Make a new connection.
-     *
-     * @param $name
-     * @return \Elasticsearch\Client|mixed
-     */
-    protected function makeConnection($name)
-    {
-        $config = $this->getConfig($name);
-
-        return $this->factory->make($config);
-    }
-
-    /**
-     * Get the configuration for a named connection.
-     *
-     * @param $name
-     * @return mixed
-     */
-    protected function getConfig($name)
-    {
-        $connections = $this->app['config']['elasticsearch.connections'];
-
-        if (is_null($config = array_get($connections, $name))) {
-            throw new \InvalidArgumentException("Elasticsearch connection [$name] not configured.");
-        }
-
-        return $config;
-    }
-
-    /**
-     * Return all of the created connections.
-     *
-     * @return array
-     */
-    public function getConnections()
-    {
-        return $this->connections;
-    }
-
-    /**
-     * Dynamically pass methods to the default connection.
-     *
-     * @param  string $method
-     * @param  array $parameters
-     * @return mixed
-     */
-    public function __call($method, $parameters)
-    {
-        return call_user_func_array([$this->connection(), $method], $parameters);
-    }
+	/**
+	 * The application instance.
+	 *
+	 * @var \Illuminate\Contracts\Foundation\Application
+	 */
+	protected $app;
+
+	/**
+	 * The Elasticsearch connection factory instance.
+	 *
+	 * @var Factory
+	 */
+	protected $factory;
+
+	/**
+	 * The active connection instances.
+	 *
+	 * @var array
+	 */
+	protected $connections = [];
+
+	/**
+	 * @param Application $app
+	 * @param Factory $factory
+	 */
+	public function __construct($app, Factory $factory)
+	{
+		$this->app = $app;
+		$this->factory = $factory;
+	}
+
+	/**
+	 * Retrieve or build the named connection.
+	 *
+	 * @param null $name
+	 * @return \Elasticsearch\Client|mixed
+	 */
+	public function connection($name = null)
+	{
+		$name = $name ?: $this->getDefaultConnection();
+
+		if (!isset($this->connections[$name])) {
+			$client = $this->makeConnection($name);
+
+			$this->connections[$name] = $client;
+		}
+
+		return $this->connections[$name];
+	}
+
+	/**
+	 * Get the default connection.
+	 *
+	 * @return string
+	 */
+	public function getDefaultConnection()
+	{
+		return $this->app['config']['elasticsearch.defaultConnection'];
+	}
+
+	/**
+	 * Set the default connection.
+	 *
+	 * @param string $connection
+	 */
+	public function setDefaultConnection($connection)
+	{
+		$this->app['config']['elasticsearch.defaultConnection'] = $connection;
+	}
+
+	/**
+	 * Make a new connection.
+	 *
+	 * @param $name
+	 * @return \Elasticsearch\Client|mixed
+	 */
+	protected function makeConnection($name)
+	{
+		$config = $this->getConfig($name);
+
+		return $this->factory->make($config);
+	}
+
+	/**
+	 * Get the configuration for a named connection.
+	 *
+	 * @param $name
+	 * @return mixed
+	 */
+	protected function getConfig($name)
+	{
+		$connections = $this->app['config']['elasticsearch.connections'];
+
+		if (is_null($config = array_get($connections, $name))) {
+			throw new \InvalidArgumentException("Elasticsearch connection [$name] not configured.");
+		}
+
+		return $config;
+	}
+
+	/**
+	 * Return all of the created connections.
+	 *
+	 * @return array
+	 */
+	public function getConnections()
+	{
+		return $this->connections;
+	}
+
+	/**
+	 * Dynamically pass methods to the default connection.
+	 *
+	 * @param  string $method
+	 * @param  array $parameters
+	 * @return mixed
+	 */
+	public function __call($method, $parameters)
+	{
+		return call_user_func_array([$this->connection(), $method], $parameters);
+	}
 }

config/elasticsearch.php

Indentation +161 added lines, -161 removed lines

@@ -2,166 +2,166 @@
 
 return [
 
-    /**
-     * You can specify one of several different connections when building an
-     * Elasticsearch client.
-     *
-     * Here you may specify which of the connections below you wish to use
-     * as your default connection when building an client. Of course you may
-     * use create several clients at once, each with different configurations.
-     */
-
-    'defaultConnection' => 'default',
-
-    /**
-     * These are the connection parameters used when building a client.
-     */
-
-    'connections' => [
-
-        'default' => [
-
-            /**
-             * Hosts
-             *
-             * This is an array of hosts that the client will connect to. It can be a
-             * single host name, or an array if you are running a cluster of Elasticsearch
-             * instances.
-             *
-             * This is the only configuration value that is mandatory.
-             *
-             * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_host_configuration
-             */
-
-            'hosts' => [
-                'localhost:9200',
-            ],
-
-            /**
-             * SSL
-             *
-             * If your Elasticsearch instance uses an out-dated or self-signed SSL
-             * certificate, you will need to pass in the certificate bundle.  This can
-             * either be the path to the certificate file (for self-signed certs), or a
-             * package like https://github.com/Kdyby/CurlCaBundle.  See the documentation
-             * below for all the details.
-             *
-             * If you are using SSL instances, and the certificates are up-to-date and
-             * signed by a public certificate authority, then you can leave this null and
-             * just use "https" in the host path(s) above and you should be fine.
-             *
-             * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_security.html#_ssl_encryption_2
-             */
-
-            'sslVerification' => null,
-
-            /**
-             * Logging
-             *
-             * Logging is handled by passing in an instance of Monolog\Logger (which
-             * coincidentally is what Laravel's default logger is).
-             *
-             * If logging is enabled, you either need to set the path and log level
-             * (some defaults are given for you below), or you can use a custom logger by
-             * setting 'logObject' to an instance of Psr\Log\LoggerInterface.  In fact,
-             * if you just want to use the default Laravel logger, then set 'logObject'
-             * to \Log::getMonolog().
-             *
-             * Note: 'logObject' takes precedent over 'logPath'/'logLevel', so set
-             * 'logObject' null if you just want file-based logging to a custom path.
-             *
-             * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#enabling_logger
-             */
-
-            'logging' => false,
-
-            // If you have an existing instance of Monolog you can use it here.
-            //'logObject' => \Log::getMonolog(),
-
-            'logPath' => storage_path('logs/elasticsearch.log'),
-
-            'logLevel' => Monolog\Logger::INFO,
-
-            /**
-             * Retries
-             *
-             * By default, the client will retry n times, where n = number of nodes in
-             * your cluster. If you would like to disable retries, or change the number,
-             * you can do so here.
-             *
-             * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_set_retries
-             */
-
-            'retries' => null,
-
-            /**
-             * The remainder of the configuration options can almost always be left
-             * as-is unless you have specific reasons to change them.  Refer to the
-             * appropriate sections in the Elasticsearch documentation for what each option
-             * does and what values it expects.
-             */
-
-            /**
-             * Sniff On Start
-             *
-             * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html
-             */
-
-            'sniffOnStart' => false,
-
-            /**
-             * HTTP Handler
-             *
-             * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_configure_the_http_handler
-             * @see http://ringphp.readthedocs.org/en/latest/client_handlers.html
-             */
-
-            'httpHandler' => null,
-
-            /**
-             * Connection Pool
-             *
-             * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_setting_the_connection_pool
-             * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_connection_pool.html
-             */
-
-            'connectionPool' => null,
-
-            /**
-             * Connection Selector
-             *
-             * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_setting_the_connection_selector
-             * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_selectors.html
-             */
-
-            'connectionSelector' => null,
-
-            /**
-             * Serializer
-             *
-             * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_setting_the_serializer
-             * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_serializers.html
-             */
-
-            'serializer' => null,
-
-            /**
-             * Connection Factory
-             *
-             * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_setting_a_custom_connectionfactory
-             */
-
-            'connectionFactory' => null,
-
-            /**
-             * Endpoint
-             *
-             * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_set_the_endpoint_closure
-             */
-
-            'endpoint' => null,
-
-        ],
-    ],
+	/**
+	 * You can specify one of several different connections when building an
+	 * Elasticsearch client.
+	 *
+	 * Here you may specify which of the connections below you wish to use
+	 * as your default connection when building an client. Of course you may
+	 * use create several clients at once, each with different configurations.
+	 */
+
+	'defaultConnection' => 'default',
+
+	/**
+	 * These are the connection parameters used when building a client.
+	 */
+
+	'connections' => [
+
+		'default' => [
+
+			/**
+			 * Hosts
+			 *
+			 * This is an array of hosts that the client will connect to. It can be a
+			 * single host name, or an array if you are running a cluster of Elasticsearch
+			 * instances.
+			 *
+			 * This is the only configuration value that is mandatory.
+			 *
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_host_configuration
+			 */
+
+			'hosts' => [
+				'localhost:9200',
+			],
+
+			/**
+			 * SSL
+			 *
+			 * If your Elasticsearch instance uses an out-dated or self-signed SSL
+			 * certificate, you will need to pass in the certificate bundle.  This can
+			 * either be the path to the certificate file (for self-signed certs), or a
+			 * package like https://github.com/Kdyby/CurlCaBundle.  See the documentation
+			 * below for all the details.
+			 *
+			 * If you are using SSL instances, and the certificates are up-to-date and
+			 * signed by a public certificate authority, then you can leave this null and
+			 * just use "https" in the host path(s) above and you should be fine.
+			 *
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_security.html#_ssl_encryption_2
+			 */
+
+			'sslVerification' => null,
+
+			/**
+			 * Logging
+			 *
+			 * Logging is handled by passing in an instance of Monolog\Logger (which
+			 * coincidentally is what Laravel's default logger is).
+			 *
+			 * If logging is enabled, you either need to set the path and log level
+			 * (some defaults are given for you below), or you can use a custom logger by
+			 * setting 'logObject' to an instance of Psr\Log\LoggerInterface.  In fact,
+			 * if you just want to use the default Laravel logger, then set 'logObject'
+			 * to \Log::getMonolog().
+			 *
+			 * Note: 'logObject' takes precedent over 'logPath'/'logLevel', so set
+			 * 'logObject' null if you just want file-based logging to a custom path.
+			 *
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#enabling_logger
+			 */
+
+			'logging' => false,
+
+			// If you have an existing instance of Monolog you can use it here.
+			//'logObject' => \Log::getMonolog(),
+
+			'logPath' => storage_path('logs/elasticsearch.log'),
+
+			'logLevel' => Monolog\Logger::INFO,
+
+			/**
+			 * Retries
+			 *
+			 * By default, the client will retry n times, where n = number of nodes in
+			 * your cluster. If you would like to disable retries, or change the number,
+			 * you can do so here.
+			 *
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_set_retries
+			 */
+
+			'retries' => null,
+
+			/**
+			 * The remainder of the configuration options can almost always be left
+			 * as-is unless you have specific reasons to change them.  Refer to the
+			 * appropriate sections in the Elasticsearch documentation for what each option
+			 * does and what values it expects.
+			 */
+
+			/**
+			 * Sniff On Start
+			 *
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html
+			 */
+
+			'sniffOnStart' => false,
+
+			/**
+			 * HTTP Handler
+			 *
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_configure_the_http_handler
+			 * @see http://ringphp.readthedocs.org/en/latest/client_handlers.html
+			 */
+
+			'httpHandler' => null,
+
+			/**
+			 * Connection Pool
+			 *
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_setting_the_connection_pool
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_connection_pool.html
+			 */
+
+			'connectionPool' => null,
+
+			/**
+			 * Connection Selector
+			 *
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_setting_the_connection_selector
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_selectors.html
+			 */
+
+			'connectionSelector' => null,
+
+			/**
+			 * Serializer
+			 *
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_setting_the_serializer
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_serializers.html
+			 */
+
+			'serializer' => null,
+
+			/**
+			 * Connection Factory
+			 *
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_setting_a_custom_connectionfactory
+			 */
+
+			'connectionFactory' => null,
+
+			/**
+			 * Endpoint
+			 *
+			 * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_set_the_endpoint_closure
+			 */
+
+			'endpoint' => null,
+
+		],
+	],
 
 ];

src/Factory.php

Indentation +73 added lines, -73 removed lines

@@ -9,77 +9,77 @@
 class Factory
 {
 
-    /**
-     * Map configuration array keys with ES ClientBuilder setters
-     *
-     * @var array
-     */
-    protected $configMappings = [
-        'sslVerification'    => 'setSSLVerification',
-        'sniffOnStart'       => 'setSniffOnStart',
-        'retries'            => 'setRetries',
-        'httpHandler'        => 'setHandler',
-        'connectionPool'     => 'setConnectionPool',
-        'connectionSelector' => 'setSelector',
-        'serializer'         => 'setSerializer',
-        'connectionFactory'  => 'setConnectionFactory',
-        'endpoint'           => 'setEndpoint',
-    ];
-
-    /**
-     * Make the Elasticsearch client for the given named configuration, or
-     * the default client.
-     *
-     * @param array $config
-     * @return \Elasticsearch\Client|mixed
-     */
-    public function make(array $config)
-    {
-
-        // Build the client
-        return $this->buildClient($config);
-    }
-
-    /**
-     * Build and configure an Elasticsearch client.
-     *
-     * @param array $config
-     * @return \Elasticsearch\Client
-     */
-    protected function buildClient(array $config)
-    {
-
-        $clientBuilder = ClientBuilder::create();
-
-        // Configure hosts
-
-        $clientBuilder->setHosts($config['hosts']);
-
-        // Configure logging
-
-        if (array_get($config, 'logging')) {
-            $logObject = array_get($config, 'logObject');
-            $logPath = array_get($config, 'logPath');
-            $logLevel = array_get($config, 'logLevel');
-            if ($logObject && $logObject instanceof LoggerInterface) {
-                $clientBuilder->setLogger($logObject);
-            } else if ($logPath && $logLevel) {
-                $logObject = ClientBuilder::defaultLogger($logPath, $logLevel);
-                $clientBuilder->setLogger($logObject);
-            }
-        }
-
-        // Set additional client configuration
-
-        foreach ($this->configMappings as $key => $method) {
-            $value = array_get($config, $key);
-            if ($value !== null) {
-                call_user_func([$clientBuilder, $method], $value);
-            }
-        }
-
-        // Build and return the client
-
-        return $clientBuilder->build();
-    }
+	/**
+	 * Map configuration array keys with ES ClientBuilder setters
+	 *
+	 * @var array
+	 */
+	protected $configMappings = [
+		'sslVerification'    => 'setSSLVerification',
+		'sniffOnStart'       => 'setSniffOnStart',
+		'retries'            => 'setRetries',
+		'httpHandler'        => 'setHandler',
+		'connectionPool'     => 'setConnectionPool',
+		'connectionSelector' => 'setSelector',
+		'serializer'         => 'setSerializer',
+		'connectionFactory'  => 'setConnectionFactory',
+		'endpoint'           => 'setEndpoint',
+	];
+
+	/**
+	 * Make the Elasticsearch client for the given named configuration, or
+	 * the default client.
+	 *
+	 * @param array $config
+	 * @return \Elasticsearch\Client|mixed
+	 */
+	public function make(array $config)
+	{
+
+		// Build the client
+		return $this->buildClient($config);
+	}
+
+	/**
+	 * Build and configure an Elasticsearch client.
+	 *
+	 * @param array $config
+	 * @return \Elasticsearch\Client
+	 */
+	protected function buildClient(array $config)
+	{
+
+		$clientBuilder = ClientBuilder::create();
+
+		// Configure hosts
+
+		$clientBuilder->setHosts($config['hosts']);
+
+		// Configure logging
+
+		if (array_get($config, 'logging')) {
+			$logObject = array_get($config, 'logObject');
+			$logPath = array_get($config, 'logPath');
+			$logLevel = array_get($config, 'logLevel');
+			if ($logObject && $logObject instanceof LoggerInterface) {
+				$clientBuilder->setLogger($logObject);
+			} else if ($logPath && $logLevel) {
+				$logObject = ClientBuilder::defaultLogger($logPath, $logLevel);
+				$clientBuilder->setLogger($logObject);
+			}
+		}
+
+		// Set additional client configuration
+
+		foreach ($this->configMappings as $key => $method) {
+			$value = array_get($config, $key);
+			if ($value !== null) {
+				call_user_func([$clientBuilder, $method], $value);
+			}
+		}
+
+		// Build and return the client
+
+		return $clientBuilder->build();
+	}
 }

src/ServiceProvider.php

Indentation +41 added lines, -41 removed lines

@@ -14,45 +14,45 @@
 class ServiceProvider extends BaseServiceProvider
 {
 
-    /**
-     * Indicates if loading of the provider is deferred.
-     *
-     * @var bool
-     */
-    protected $defer = false;
-
-    /**
-     * Bootstrap the application events.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $configPath = realpath(__DIR__ . '/../config/elasticsearch.php');
-        $this->publishes([
-            $configPath => config_path('elasticsearch.php'),
-        ]);
-    }
-
-    /**
-     * Register the service provider.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $app = $this->app;
-
-        $app->singleton('elasticsearch.factory', function($app) {
-            return new Factory();
-        });
-
-        $app->singleton('elasticsearch', function($app) {
-            return new Manager($app, $app['elasticsearch.factory']);
-        });
-
-        $app->singleton(Client::class, function($app) {
-            return $app['elasticsearch']->connection();
-        });
-    }
+	/**
+	 * Indicates if loading of the provider is deferred.
+	 *
+	 * @var bool
+	 */
+	protected $defer = false;
+
+	/**
+	 * Bootstrap the application events.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$configPath = realpath(__DIR__ . '/../config/elasticsearch.php');
+		$this->publishes([
+			$configPath => config_path('elasticsearch.php'),
+		]);
+	}
+
+	/**
+	 * Register the service provider.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		$app = $this->app;
+
+		$app->singleton('elasticsearch.factory', function($app) {
+			return new Factory();
+		});
+
+		$app->singleton('elasticsearch', function($app) {
+			return new Manager($app, $app['elasticsearch.factory']);
+		});
+
+		$app->singleton(Client::class, function($app) {
+			return $app['elasticsearch']->connection();
+		});
+	}
 }

src/LumenServiceProvider.php

Indentation +24 added lines, -24 removed lines

@@ -13,28 +13,28 @@
 class LumenServiceProvider extends BaseServiceProvider
 {
 
-    /**
-     * Indicates if loading of the provider is deferred.
-     *
-     * @var bool
-     */
-    protected $defer = false;
-
-    /**
-     * Register the service provider.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $app = $this->app;
-
-        $app->singleton('elasticsearch.factory', function($app) {
-            return new Factory();
-        });
-
-        $app->singleton('elasticsearch', function($app) {
-            return new LumenManager($app, $app['elasticsearch.factory']);
-        });
-    }
+	/**
+	 * Indicates if loading of the provider is deferred.
+	 *
+	 * @var bool
+	 */
+	protected $defer = false;
+
+	/**
+	 * Register the service provider.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		$app = $this->app;
+
+		$app->singleton('elasticsearch.factory', function($app) {
+			return new Factory();
+		});
+
+		$app->singleton('elasticsearch', function($app) {
+			return new LumenManager($app, $app['elasticsearch.factory']);
+		});
+	}
 }