Skip to content

Commit

Permalink
Init
Browse files Browse the repository at this point in the history
  • Loading branch information
Nyholm committed Aug 8, 2019
1 parent b6d0f2a commit cf05e57
Show file tree
Hide file tree
Showing 13 changed files with 385 additions and 0 deletions.
8 changes: 8 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.editorconfig export-ignore
.gitattributes export-ignore
.gitignore export-ignore
/.php_cs export-ignore
/.styleci.yml export-ignore
/.scrutinizer.yml export-ignore
/.travis.yml export-ignore
/Tests/ export-ignore
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/.php_cs.cache
/.phpunit.result.cache
/composer.lock
/phpunit.xml
/vendor/
14 changes: 14 additions & 0 deletions .php_cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

$finder = PhpCsFixer\Finder::create()
->in(__DIR__.'/src')
->in(__DIR__.'/tests')
;

return PhpCsFixer\Config::create()
->setRules([
'@Symfony' => true,
'array_syntax' => ['syntax' => 'short'],
])
->setFinder($finder)
;
9 changes: 9 additions & 0 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
filter:
excluded_paths: [vendor/*, Tests/*]
checks:
php:
code_rating: true
duplication: true
tools:
external_code_coverage:
timeout: 1800 # Timeout in seconds.
47 changes: 47 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
language: php
sudo: false
cache:
directories:
- $HOME/.composer/cache/files

env:
global:
- PHPUNIT_FLAGS="-v"

matrix:
fast_finish: true
include:
# Minimum supported dependencies with the latest and oldest PHP version
- php: 7.2
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
- php: 7.3
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest"

# Test the latest stable release
- php: 7.2
- php: 7.3
env: COVERAGE=true PHPUNIT_FLAGS="-v --coverage-text --coverage-clover=coverage.xml"

# Latest commit to master
- php: 7.3
env: STABILITY="dev"

allow_failures:
# Dev-master is allowed to fail.
- env: STABILITY="dev"

before_install:
- if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi
- if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; fi;

install:
- composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction

script:
- composer validate --strict --no-check-lock
- ./vendor/bin/phpunit $PHPUNIT_FLAGS

after_success:
- if [[ $COVERAGE = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
- if [[ $COVERAGE = true ]]; then php ocular.phar code-coverage:upload --format=php-clover coverage.xml; fi

21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2019 Tobias Nyholm

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# elastica-dsn

Client factory with DSN support for ruflin/Elastica
29 changes: 29 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"name": "happyr/elastica-dsn",
"description": "DSN support to ruflin/Elastica",
"type": "library",
"license": "MIT",
"authors": [
{
"name": "Nyholm",
"email": "[email protected]"
}
],
"require": {
"ruflin/elastica": "^6.1"
},
"require-dev": {
"nyholm/nsa": "^1.1",
"phpunit/phpunit": "^8.2"
},
"autoload": {
"psr-4": {
"Happyr\\ElasticaDsn\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"Tests\\Happyr\\ElasticaDsn\\": "tests/"
}
}
}
33 changes: 33 additions & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit backupGlobals="false"
backupStaticAttributes="false"
colors="false"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
bootstrap="./vendor/autoload.php"
>

<php>
<env name="ENV" value="test" />
</php>

<testsuites>
<testsuite name="Test Suite">
<directory>./tests</directory>
</testsuite>
</testsuites>

<filter>
<whitelist>
<directory suffix=".php">./</directory>
<exclude>
<directory>vendor</directory>
<directory>tests</directory>
</exclude>
</whitelist>
</filter>
</phpunit>
142 changes: 142 additions & 0 deletions src/ClientFactory.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
<?php

declare(strict_types=1);

namespace Happyr\ElasticaDsn;

use Happyr\ElasticaDsn\Exception\InvalidArgumentException;
use Elastica\Client;

/**
* Creates a Elastic search client.
*
* @author Tobias Nyholm <[email protected]>
* @author Rob Frawley 2nd <[email protected]>
* @author Nicolas Grekas <[email protected]>
*/
final class ClientFactory
{
public static function create($servers, array $options = []): Client
{
return new Client(self::getConfig($servers, $options));
}

/**
* @param string|string[] $servers An array of servers, a DSN, or an array of DSNs
* @param array $options Valid keys are "username" and "password"
*/
public static function getConfig($servers, array $options = []): array
{
if (\is_string($servers)) {
$servers = [$servers];
} elseif (!\is_array($servers)) {
throw new InvalidArgumentException(\sprintf('ClientFactory::create() expects array or string as first argument, %s given.', \gettype($servers)));
}

\set_error_handler(function ($type, $msg, $file, $line) {
throw new \ErrorException($msg, 0, $type, $file, $line);
});
try {
return self::doGetConfig($servers, $options);
} finally {
\restore_error_handler();
}
}

private static function doGetConfig(array $input, array $options): array
{
$servers = [];
$username = $options['username'] ?? null;
$password = $options['password'] ?? null;

// parse any DSN in $servers
foreach ($input as $i => $dsn) {
if (\is_array($dsn)) {
continue;
}
if (0 !== \mb_strpos($dsn, 'elasticsearch:')) {
throw new InvalidArgumentException(
\sprintf('Invalid Elasticsearch DSN: %s does not start with "elasticsearch:"', $dsn)
);
}
$params = \preg_replace_callback(
'#^elasticsearch:(//)?(?:([^@]*+)@)?#',
function ($m) use (&$username, &$password) {
if (!empty($m[2])) {
list($username, $password) = \explode(':', $m[2], 2) + [1 => null];
}

return 'file:'.($m[1] ?? '');
},
$dsn
);

if (false === $params = \parse_url($params)) {
throw new InvalidArgumentException(\sprintf('Invalid Elasticsearch DSN: %s', $dsn));
}

$query = $hosts = [];
if (isset($params['query'])) {
\parse_str($params['query'], $query);

if (isset($query['host'])) {
if (!\is_array($hosts = $query['host'])) {
throw new InvalidArgumentException(\sprintf('Invalid Elasticsearch DSN: %s', $dsn));
}
foreach ($hosts as $host => $value) {
if (false === $port = \mb_strrpos($host, ':')) {
$hosts[$host] = ['host' => $host, 'port' => 9200];
} else {
$hosts[$host] = ['host' => \mb_substr($host, 0, $port), 'port' => (int) \mb_substr($host, 1 + $port)];
}
}
$hosts = \array_values($hosts);
unset($query['host']);
}
if ($hosts && !isset($params['host']) && !isset($params['path'])) {
$servers = \array_merge($servers, $hosts);
continue;
}
}

if (!isset($params['host']) && !isset($params['path'])) {
throw new InvalidArgumentException(\sprintf('Invalid Elasticsearch DSN: %s', $dsn));
}

if (isset($params['path']) && \preg_match('#/(\d+)$#', $params['path'], $m)) {
$params['path'] = \mb_substr($params['path'], 0, -\mb_strlen($m[0]));
}

if (isset($params['path']) && \preg_match('#:(\d+)$#', $params['path'], $m)) {
$params['host'] = \mb_substr($params['path'], 0, -\mb_strlen($m[0]));
$params['port'] = $m[1];
unset($params['path']);
}

$params += [
'host' => $params['host'] ?? $params['path'],
'port' => !isset($params['port']) ? 9200 : null,
];
if ($query) {
$params += $query;
$options = $query + $options;
}

$servers[] = ['host' => $params['host'], 'port' => $params['port']];

if ($hosts) {
$servers = \array_merge($servers, $hosts);
}
}

$config = ['servers' => $servers];
if (null !== $username) {
$config['username'] = $username;
}
if (null !== $password) {
$config['password'] = $password;
}

return $config;
}
}
9 changes: 9 additions & 0 deletions src/Exception.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?php

declare(strict_types=1);

namespace Happyr\ElasticaDsn;

interface Exception
{
}
11 changes: 11 additions & 0 deletions src/Exception/InvalidArgumentException.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

declare(strict_types=1);

namespace Happyr\ElasticaDsn\Exception;

use Happyr\ElasticaDsn\Exception;

final class InvalidArgumentException extends \InvalidArgumentException implements Exception
{
}
Loading

0 comments on commit cf05e57

Please sign in to comment.