Merge pull request #1826 from jygaulier/PHRAS-1094_ES-LIB-UPGRADE

PHRAS-1094_ES-LIB-UPGRADE
This commit is contained in:
jygaulier
2016-04-28 19:32:45 +02:00
5 changed files with 277 additions and 109 deletions

View File

@@ -25,6 +25,7 @@ dependencies:
- pecl install json - pecl install json
- yes '' | pecl install zmq-beta - yes '' | pecl install zmq-beta
- sed -i 's/^\(session.cache_limiter = \).*/\1""/' ~/.phpenv/versions/$(phpenv global)/etc/php.ini - sed -i 's/^\(session.cache_limiter = \).*/\1""/' ~/.phpenv/versions/$(phpenv global)/etc/php.ini
- npm rebuild node-sass
override: override:
- composer install --no-progress --no-interaction --optimize-autoloader - composer install --no-progress --no-interaction --optimize-autoloader
post: post:

View File

@@ -51,7 +51,7 @@
"doctrine/dbal": "^2.4.0", "doctrine/dbal": "^2.4.0",
"doctrine/migrations": "^1.0.0", "doctrine/migrations": "^1.0.0",
"doctrine/orm": "^2.4.0", "doctrine/orm": "^2.4.0",
"elasticsearch/elasticsearch": "~1.0", "elasticsearch/elasticsearch": "~2.0",
"facebook/php-sdk": "~3.0", "facebook/php-sdk": "~3.0",
"firebase/php-jwt": "^3.0.0", "firebase/php-jwt": "^3.0.0",
"gedmo/doctrine-extensions": "~2.3.0", "gedmo/doctrine-extensions": "~2.3.0",

371
composer.lock generated
View File

@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "c14533f5de6e67350e76f68e5814e122", "hash": "befb0baa21178f9579b2ea7340bc2243",
"content-hash": "b49e25a0ed3d566b1411aa46f3f563df", "content-hash": "e45d7dc1efd9ba860d7d6e73c96e62e3",
"packages": [ "packages": [
{ {
"name": "alchemy-fr/tcpdf-clone", "name": "alchemy-fr/tcpdf-clone",
@@ -15,6 +15,12 @@
"url": "https://github.com/alchemy-fr/tcpdf-clone.git", "url": "https://github.com/alchemy-fr/tcpdf-clone.git",
"reference": "2ba0248a7187f1626df6c128750650416267f0e7" "reference": "2ba0248a7187f1626df6c128750650416267f0e7"
}, },
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/alchemy-fr/tcpdf-clone/zipball/2ba0248a7187f1626df6c128750650416267f0e7",
"reference": "2ba0248a7187f1626df6c128750650416267f0e7",
"shasum": ""
},
"require": { "require": {
"php": ">=5.3.0" "php": ">=5.3.0"
}, },
@@ -61,6 +67,10 @@
"qrcode", "qrcode",
"tcpdf" "tcpdf"
], ],
"support": {
"source": "https://github.com/alchemy-fr/tcpdf-clone/tree/6.0.039",
"issues": "https://github.com/alchemy-fr/tcpdf-clone/issues"
},
"time": "2013-10-13 16:11:17" "time": "2013-10-13 16:11:17"
}, },
{ {
@@ -536,6 +546,12 @@
"url": "https://github.com/alchemy-fr/symfony-cors.git", "url": "https://github.com/alchemy-fr/symfony-cors.git",
"reference": "dbf7fcff1ce9fc1265db12955476ff169eab7375" "reference": "dbf7fcff1ce9fc1265db12955476ff169eab7375"
}, },
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/alchemy-fr/symfony-cors/zipball/dbf7fcff1ce9fc1265db12955476ff169eab7375",
"reference": "dbf7fcff1ce9fc1265db12955476ff169eab7375",
"shasum": ""
},
"require": { "require": {
"symfony/http-kernel": "^2.3.0|^3.0.0" "symfony/http-kernel": "^2.3.0|^3.0.0"
}, },
@@ -556,11 +572,7 @@
"Alchemy\\CorsBundle\\": "src/Bundle/" "Alchemy\\CorsBundle\\": "src/Bundle/"
} }
}, },
"autoload-dev": { "notification-url": "https://packagist.org/downloads/",
"psr-4": {
"Alchemy\\Cors\\Tests\\": "tests/unit/Component/"
}
},
"license": [ "license": [
"MIT" "MIT"
], ],
@@ -700,16 +712,16 @@
}, },
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
"version": "2.8.27", "version": "2.8.29",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/aws/aws-sdk-php.git", "url": "https://github.com/aws/aws-sdk-php.git",
"reference": "c1605360b6624958a5397601ad5543cd45fcf8f7" "reference": "83b86d1bbbca452b00a1f0bbea6fcbb506c76650"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c1605360b6624958a5397601ad5543cd45fcf8f7", "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/83b86d1bbbca452b00a1f0bbea6fcbb506c76650",
"reference": "c1605360b6624958a5397601ad5543cd45fcf8f7", "reference": "83b86d1bbbca452b00a1f0bbea6fcbb506c76650",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -759,20 +771,20 @@
"s3", "s3",
"sdk" "sdk"
], ],
"time": "2016-01-30 00:53:32" "time": "2016-04-11 17:00:10"
}, },
{ {
"name": "beberlei/assert", "name": "beberlei/assert",
"version": "v2.4", "version": "v2.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/beberlei/assert.git", "url": "https://github.com/beberlei/assert.git",
"reference": "7281b1fd8118b31cb9162c2fb5a4cc6f01d62ed6" "reference": "91e2690c4ecc8a4e3e2d333430069f6a0c694a7a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/beberlei/assert/zipball/7281b1fd8118b31cb9162c2fb5a4cc6f01d62ed6", "url": "https://api.github.com/repos/beberlei/assert/zipball/91e2690c4ecc8a4e3e2d333430069f6a0c694a7a",
"reference": "7281b1fd8118b31cb9162c2fb5a4cc6f01d62ed6", "reference": "91e2690c4ecc8a4e3e2d333430069f6a0c694a7a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -812,7 +824,7 @@
"assertion", "assertion",
"validation" "validation"
], ],
"time": "2015-08-21 16:50:17" "time": "2016-03-22 14:34:51"
}, },
{ {
"name": "behat/transliterator", "name": "behat/transliterator",
@@ -856,16 +868,16 @@
}, },
{ {
"name": "cocur/slugify", "name": "cocur/slugify",
"version": "v2.0", "version": "v2.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/cocur/slugify.git", "url": "https://github.com/cocur/slugify.git",
"reference": "912bf41f940f9a4e38ff1284b1841eaa71911d7f" "reference": "eee9879958875921082293dbdbf4866b641864f2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/cocur/slugify/zipball/912bf41f940f9a4e38ff1284b1841eaa71911d7f", "url": "https://api.github.com/repos/cocur/slugify/zipball/eee9879958875921082293dbdbf4866b641864f2",
"reference": "912bf41f940f9a4e38ff1284b1841eaa71911d7f", "reference": "eee9879958875921082293dbdbf4866b641864f2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -881,6 +893,7 @@
"pimple/pimple": "~1.1", "pimple/pimple": "~1.1",
"plumphp/plum": "~0.1", "plumphp/plum": "~0.1",
"silex/silex": "~1.3", "silex/silex": "~1.3",
"symfony/config": "~2.4|~3.0",
"symfony/dependency-injection": "~2.4|~3.0", "symfony/dependency-injection": "~2.4|~3.0",
"symfony/http-kernel": "~2.4|~3.0", "symfony/http-kernel": "~2.4|~3.0",
"twig/twig": "~1.12", "twig/twig": "~1.12",
@@ -914,7 +927,7 @@
"slug", "slug",
"slugify" "slugify"
], ],
"time": "2016-02-24 21:50:50" "time": "2016-04-08 18:57:21"
}, },
{ {
"name": "dailymotion/sdk", "name": "dailymotion/sdk",
@@ -1730,42 +1743,39 @@
}, },
{ {
"name": "elasticsearch/elasticsearch", "name": "elasticsearch/elasticsearch",
"version": "v1.1.0", "version": "v2.1.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/elastic/elasticsearch-php.git", "url": "https://github.com/elastic/elasticsearch-php.git",
"reference": "fd304b1c12778c9eab9b1c1a9e07d791f40bd56d" "reference": "c1675245c0a6f789cbb80b3e0b333b9ef521a627"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/fd304b1c12778c9eab9b1c1a9e07d791f40bd56d", "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/c1675245c0a6f789cbb80b3e0b333b9ef521a627",
"reference": "fd304b1c12778c9eab9b1c1a9e07d791f40bd56d", "reference": "c1675245c0a6f789cbb80b3e0b333b9ef521a627",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-curl": "*", "guzzlehttp/ringphp": "~1.0",
"guzzle/guzzle": "~3.7", "php": ">=5.4",
"monolog/monolog": "~1.5",
"php": ">=5.3.9",
"pimple/pimple": "~1.0",
"psr/log": "~1.0" "psr/log": "~1.0"
}, },
"require-dev": { "require-dev": {
"athletic/athletic": "~0.1", "athletic/athletic": "~0.1",
"cpliakas/git-wrapper": "~1.0", "cpliakas/git-wrapper": "~1.0",
"mikey179/vfsstream": "~1.2", "mockery/mockery": "0.9.4",
"mockery/mockery": "dev-master@dev", "phpunit/phpunit": "~4.7",
"phpunit/phpunit": "3.7.*",
"satooshi/php-coveralls": "dev-master",
"symfony/yaml": "2.4.3 as 2.4.2", "symfony/yaml": "2.4.3 as 2.4.2",
"twig/twig": "1.*" "twig/twig": "1.*"
}, },
"suggest": {
"ext-curl": "*",
"monolog/monolog": "Allows for client-level logging and tracing"
},
"type": "library", "type": "library",
"autoload": { "autoload": {
"psr-0": { "psr-4": {
"Elasticsearch": "src/", "Elasticsearch\\": "src/Elasticsearch/"
"Elasticsearch\\Tests": "tests/",
"Elasticsearch\\Benchmarks": "benchmarks/"
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
@@ -1783,7 +1793,7 @@
"elasticsearch", "elasticsearch",
"search" "search"
], ],
"time": "2014-05-07 15:54:46" "time": "2016-03-18 16:31:37"
}, },
{ {
"name": "evenement/evenement", "name": "evenement/evenement",
@@ -1791,12 +1801,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/igorw/evenement.git", "url": "https://github.com/igorw/evenement.git",
"reference": "v1.0.0" "reference": "fa966683e7df3e5dd5929d984a44abfbd6bafe8d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/igorw/evenement/zipball/fa966683e7df3e5dd5929d984a44abfbd6bafe8d", "url": "https://api.github.com/repos/igorw/evenement/zipball/fa966683e7df3e5dd5929d984a44abfbd6bafe8d",
"reference": "v1.0.0", "reference": "fa966683e7df3e5dd5929d984a44abfbd6bafe8d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1823,7 +1833,7 @@
"keywords": [ "keywords": [
"event-dispatcher" "event-dispatcher"
], ],
"time": "2012-05-30 08:01:08" "time": "2012-05-30 15:01:08"
}, },
{ {
"name": "facebook/php-sdk", "name": "facebook/php-sdk",
@@ -1869,6 +1879,7 @@
"facebook", "facebook",
"sdk" "sdk"
], ],
"abandoned": "facebook/php-sdk-v4",
"time": "2013-11-19 23:11:14" "time": "2013-11-19 23:11:14"
}, },
{ {
@@ -2144,6 +2155,107 @@
], ],
"time": "2015-03-18 18:23:50" "time": "2015-03-18 18:23:50"
}, },
{
"name": "guzzlehttp/ringphp",
"version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/RingPHP.git",
"reference": "dbbb91d7f6c191e5e405e900e3102ac7f261bc0b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/RingPHP/zipball/dbbb91d7f6c191e5e405e900e3102ac7f261bc0b",
"reference": "dbbb91d7f6c191e5e405e900e3102ac7f261bc0b",
"shasum": ""
},
"require": {
"guzzlehttp/streams": "~3.0",
"php": ">=5.4.0",
"react/promise": "~2.0"
},
"require-dev": {
"ext-curl": "*",
"phpunit/phpunit": "~4.0"
},
"suggest": {
"ext-curl": "Guzzle will use specific adapters if cURL is present"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1-dev"
}
},
"autoload": {
"psr-4": {
"GuzzleHttp\\Ring\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
}
],
"description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.",
"time": "2015-05-20 03:37:09"
},
{
"name": "guzzlehttp/streams",
"version": "3.0.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/streams.git",
"reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/streams/zipball/47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
"reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
"shasum": ""
},
"require": {
"php": ">=5.4.0"
},
"require-dev": {
"phpunit/phpunit": "~4.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.0-dev"
}
},
"autoload": {
"psr-4": {
"GuzzleHttp\\Stream\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
}
],
"description": "Provides a simple abstraction over streams of data",
"homepage": "http://guzzlephp.org/",
"keywords": [
"Guzzle",
"stream"
],
"time": "2014-10-12 19:18:40"
},
{ {
"name": "hoa/compiler", "name": "hoa/compiler",
"version": "2.15.10.29", "version": "2.15.10.29",
@@ -2710,12 +2822,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/hoaproject/Stream.git", "url": "https://github.com/hoaproject/Stream.git",
"reference": "011ab91d942f1d7096deade4c8a10fe57d51c5b3" "reference": "3bc446bc00849bf51166adc415d77aa375d48d8c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/hoaproject/Stream/zipball/3bc446bc00849bf51166adc415d77aa375d48d8c", "url": "https://api.github.com/repos/hoaproject/Stream/zipball/3bc446bc00849bf51166adc415d77aa375d48d8c",
"reference": "011ab91d942f1d7096deade4c8a10fe57d51c5b3", "reference": "3bc446bc00849bf51166adc415d77aa375d48d8c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -2760,7 +2872,7 @@
"stream", "stream",
"wrapper" "wrapper"
], ],
"time": "2015-10-22 06:30:43" "time": "2015-10-26 12:21:43"
}, },
{ {
"name": "hoa/ustring", "name": "hoa/ustring",
@@ -3418,16 +3530,16 @@
}, },
{ {
"name": "league/flysystem", "name": "league/flysystem",
"version": "1.0.20", "version": "1.0.21",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/flysystem.git", "url": "https://github.com/thephpleague/flysystem.git",
"reference": "e87a786e3ae12a25cf78a71bb07b4b384bfaa83a" "reference": "35a83cf67d80d7040f306c77b0a84b9fbcc4fbfb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/e87a786e3ae12a25cf78a71bb07b4b384bfaa83a", "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/35a83cf67d80d7040f306c77b0a84b9fbcc4fbfb",
"reference": "e87a786e3ae12a25cf78a71bb07b4b384bfaa83a", "reference": "35a83cf67d80d7040f306c77b0a84b9fbcc4fbfb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -3497,7 +3609,7 @@
"sftp", "sftp",
"storage" "storage"
], ],
"time": "2016-03-14 21:54:11" "time": "2016-04-22 10:56:25"
}, },
{ {
"name": "league/flysystem-aws-s3-v2", "name": "league/flysystem-aws-s3-v2",
@@ -3685,16 +3797,16 @@
}, },
{ {
"name": "monolog/monolog", "name": "monolog/monolog",
"version": "1.18.1", "version": "1.19.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Seldaek/monolog.git", "url": "https://github.com/Seldaek/monolog.git",
"reference": "a5f2734e8c16f3aa21b3da09715d10e15b4d2d45" "reference": "5f56ed5212dc509c8dc8caeba2715732abb32dbf"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/a5f2734e8c16f3aa21b3da09715d10e15b4d2d45", "url": "https://api.github.com/repos/Seldaek/monolog/zipball/5f56ed5212dc509c8dc8caeba2715732abb32dbf",
"reference": "a5f2734e8c16f3aa21b3da09715d10e15b4d2d45", "reference": "5f56ed5212dc509c8dc8caeba2715732abb32dbf",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -3709,13 +3821,13 @@
"doctrine/couchdb": "~1.0@dev", "doctrine/couchdb": "~1.0@dev",
"graylog2/gelf-php": "~1.0", "graylog2/gelf-php": "~1.0",
"jakub-onderka/php-parallel-lint": "0.9", "jakub-onderka/php-parallel-lint": "0.9",
"php-amqplib/php-amqplib": "~2.4",
"php-console/php-console": "^3.1.3", "php-console/php-console": "^3.1.3",
"phpunit/phpunit": "~4.5", "phpunit/phpunit": "~4.5",
"phpunit/phpunit-mock-objects": "2.3.0", "phpunit/phpunit-mock-objects": "2.3.0",
"raven/raven": "^0.13", "raven/raven": "^0.13",
"ruflin/elastica": ">=0.90 <3.0", "ruflin/elastica": ">=0.90 <3.0",
"swiftmailer/swiftmailer": "~5.3", "swiftmailer/swiftmailer": "~5.3"
"videlalvaro/php-amqplib": "~2.4"
}, },
"suggest": { "suggest": {
"aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
@@ -3724,11 +3836,11 @@
"ext-mongo": "Allow sending log messages to a MongoDB server", "ext-mongo": "Allow sending log messages to a MongoDB server",
"graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
"mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver", "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
"php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
"php-console/php-console": "Allow sending log messages to Google Chrome", "php-console/php-console": "Allow sending log messages to Google Chrome",
"raven/raven": "Allow sending log messages to a Sentry server", "raven/raven": "Allow sending log messages to a Sentry server",
"rollbar/rollbar": "Allow sending log messages to Rollbar", "rollbar/rollbar": "Allow sending log messages to Rollbar",
"ruflin/elastica": "Allow sending log messages to an Elastic Search server", "ruflin/elastica": "Allow sending log messages to an Elastic Search server"
"videlalvaro/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@@ -3759,7 +3871,7 @@
"logging", "logging",
"psr-3" "psr-3"
], ],
"time": "2016-03-13 16:08:35" "time": "2016-04-12 18:29:35"
}, },
{ {
"name": "mrclay/minify", "name": "mrclay/minify",
@@ -3791,7 +3903,7 @@
], ],
"authors": [ "authors": [
{ {
"name": "Stephen Clay", "name": "Steve Clay",
"email": "steve@mrclay.org", "email": "steve@mrclay.org",
"homepage": "http://www.mrclay.org/", "homepage": "http://www.mrclay.org/",
"role": "Developer" "role": "Developer"
@@ -3977,21 +4089,21 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/romainneutron/Imagine-Silex-Service-Provider.git", "url": "https://github.com/romainneutron/Imagine-Silex-Service-Provider.git",
"reference": "0.1.2" "reference": "a8a7862ae90419f2b23746cd8436c2310e4eb084"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/romainneutron/Imagine-Silex-Service-Provider/zipball/a8a7862ae90419f2b23746cd8436c2310e4eb084", "url": "https://api.github.com/repos/romainneutron/Imagine-Silex-Service-Provider/zipball/a8a7862ae90419f2b23746cd8436c2310e4eb084",
"reference": "0.1.2", "reference": "a8a7862ae90419f2b23746cd8436c2310e4eb084",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"imagine/imagine": "*", "imagine/imagine": "*",
"php": ">=5.3.3", "php": ">=5.3.3",
"silex/silex": ">=1.0,<2.0" "silex/silex": "~1.0"
}, },
"require-dev": { "require-dev": {
"symfony/browser-kit": ">=2.0,<3.0" "symfony/browser-kit": "~2.0"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@@ -4235,16 +4347,16 @@
}, },
{ {
"name": "paragonie/random_compat", "name": "paragonie/random_compat",
"version": "v1.2.2", "version": "v1.4.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/paragonie/random_compat.git", "url": "https://github.com/paragonie/random_compat.git",
"reference": "b3313b618f4edd76523572531d5d7e22fe747430" "reference": "c7e26a21ba357863de030f0b9e701c7d04593774"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/b3313b618f4edd76523572531d5d7e22fe747430", "url": "https://api.github.com/repos/paragonie/random_compat/zipball/c7e26a21ba357863de030f0b9e701c7d04593774",
"reference": "b3313b618f4edd76523572531d5d7e22fe747430", "reference": "c7e26a21ba357863de030f0b9e701c7d04593774",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -4279,7 +4391,7 @@
"pseudorandom", "pseudorandom",
"random" "random"
], ],
"time": "2016-03-11 19:54:08" "time": "2016-03-18 20:34:03"
}, },
{ {
"name": "php-ffmpeg/php-ffmpeg", "name": "php-ffmpeg/php-ffmpeg",
@@ -4722,19 +4834,20 @@
}, },
{ {
"name": "ramsey/uuid", "name": "ramsey/uuid",
"version": "3.2.0", "version": "3.4.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/ramsey/uuid.git", "url": "https://github.com/ramsey/uuid.git",
"reference": "adee1ba4a6885ed800021a98dd69ae2394d695ec" "reference": "b4fe3b7387cb323fd15ad5837cae992422c9fa5c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/ramsey/uuid/zipball/adee1ba4a6885ed800021a98dd69ae2394d695ec", "url": "https://api.github.com/repos/ramsey/uuid/zipball/b4fe3b7387cb323fd15ad5837cae992422c9fa5c",
"reference": "adee1ba4a6885ed800021a98dd69ae2394d695ec", "reference": "b4fe3b7387cb323fd15ad5837cae992422c9fa5c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"paragonie/random_compat": "^1.0|^2.0",
"php": ">=5.4" "php": ">=5.4"
}, },
"replace": { "replace": {
@@ -4742,8 +4855,11 @@
}, },
"require-dev": { "require-dev": {
"apigen/apigen": "^4.1", "apigen/apigen": "^4.1",
"codeception/aspect-mock": "1.0.0",
"goaop/framework": "1.0.0-alpha.2",
"ircmaxell/random-lib": "^1.1", "ircmaxell/random-lib": "^1.1",
"jakub-onderka/php-parallel-lint": "^0.9.0", "jakub-onderka/php-parallel-lint": "^0.9.0",
"mockery/mockery": "^0.9.4",
"moontoast/math": "^1.1", "moontoast/math": "^1.1",
"phpunit/phpunit": "^4.7|^5.0", "phpunit/phpunit": "^4.7|^5.0",
"satooshi/php-coveralls": "^0.6.1", "satooshi/php-coveralls": "^0.6.1",
@@ -4758,6 +4874,11 @@
"ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type." "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type."
}, },
"type": "library", "type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.x-dev"
}
},
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Ramsey\\Uuid\\": "src/" "Ramsey\\Uuid\\": "src/"
@@ -4789,7 +4910,51 @@
"identifier", "identifier",
"uuid" "uuid"
], ],
"time": "2016-02-17 23:32:34" "time": "2016-04-24 00:30:41"
},
{
"name": "react/promise",
"version": "v2.4.0",
"source": {
"type": "git",
"url": "https://github.com/reactphp/promise.git",
"reference": "f942da7b505d1a294284ab343d05df42d02ad6d9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/reactphp/promise/zipball/f942da7b505d1a294284ab343d05df42d02ad6d9",
"reference": "f942da7b505d1a294284ab343d05df42d02ad6d9",
"shasum": ""
},
"require": {
"php": ">=5.4.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0-dev"
}
},
"autoload": {
"psr-4": {
"React\\Promise\\": "src/"
},
"files": [
"src/functions_include.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Jan Sorgalla",
"email": "jsorgalla@gmail.com"
}
],
"description": "A lightweight implementation of CommonJS Promises/A for PHP",
"time": "2016-03-31 13:10:33"
}, },
{ {
"name": "roave/security-advisories", "name": "roave/security-advisories",
@@ -4797,12 +4962,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git", "url": "https://github.com/Roave/SecurityAdvisories.git",
"reference": "438196c8f66647073bcaf99908b543bda7ffd6d4" "reference": "c671d3899901257a98ec4c4fd39685d14112efc7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/438196c8f66647073bcaf99908b543bda7ffd6d4", "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/c671d3899901257a98ec4c4fd39685d14112efc7",
"reference": "438196c8f66647073bcaf99908b543bda7ffd6d4", "reference": "c671d3899901257a98ec4c4fd39685d14112efc7",
"shasum": "" "shasum": ""
}, },
"conflict": { "conflict": {
@@ -4888,7 +5053,7 @@
"zendframework/zend-view": ">=2,<2.2.7|>=2.3,<2.3.1", "zendframework/zend-view": ">=2,<2.2.7|>=2.3,<2.3.1",
"zendframework/zend-xmlrpc": ">=2.1,<2.1.6|>=2.2,<2.2.6", "zendframework/zend-xmlrpc": ">=2.1,<2.1.6|>=2.2,<2.2.6",
"zendframework/zendframework": ">=2,<2.4.9|>=2.5,<2.5.1", "zendframework/zendframework": ">=2,<2.4.9|>=2.5,<2.5.1",
"zendframework/zendframework1": ">=1,<1.11.15|>=1.12,<1.12.17", "zendframework/zendframework1": ">=1,<1.11.15|>=1.12,<1.12.18",
"zendframework/zendopenid": ">=2,<2.0.2", "zendframework/zendopenid": ">=2,<2.0.2",
"zendframework/zendxml": ">=1,<1.0.1", "zendframework/zendxml": ">=1,<1.0.1",
"zf-commons/zfc-user": "<1.2.2", "zf-commons/zfc-user": "<1.2.2",
@@ -4908,7 +5073,7 @@
} }
], ],
"description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it",
"time": "2016-04-11 16:52:34" "time": "2016-04-21 06:36:58"
}, },
{ {
"name": "seld/jsonlint", "name": "seld/jsonlint",
@@ -5411,7 +5576,7 @@
}, },
{ {
"name": "Phraseanet Team", "name": "Phraseanet Team",
"email": "support@alchemy.fr", "email": "info@alchemy.fr",
"homepage": "http://www.phraseanet.com/" "homepage": "http://www.phraseanet.com/"
} }
], ],
@@ -5989,16 +6154,16 @@
}, },
{ {
"name": "symfony/symfony", "name": "symfony/symfony",
"version": "v2.8.3", "version": "v2.8.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/symfony.git", "url": "https://github.com/symfony/symfony.git",
"reference": "7a9a5fce7ce6e448e527f635463dda00761e12c2" "reference": "9e14f9f4869c19188a376eab61d9a1c1f1fee347"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/symfony/zipball/7a9a5fce7ce6e448e527f635463dda00761e12c2", "url": "https://api.github.com/repos/symfony/symfony/zipball/9e14f9f4869c19188a376eab61d9a1c1f1fee347",
"reference": "7a9a5fce7ce6e448e527f635463dda00761e12c2", "reference": "9e14f9f4869c19188a376eab61d9a1c1f1fee347",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -6085,11 +6250,7 @@
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Symfony\\Bridge\\Doctrine\\": "src/Symfony/Bridge/Doctrine/", "Symfony\\Bridge\\": "src/Symfony/Bridge/",
"Symfony\\Bridge\\Monolog\\": "src/Symfony/Bridge/Monolog/",
"Symfony\\Bridge\\ProxyManager\\": "src/Symfony/Bridge/ProxyManager/",
"Symfony\\Bridge\\Swiftmailer\\": "src/Symfony/Bridge/Swiftmailer/",
"Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/",
"Symfony\\Bundle\\": "src/Symfony/Bundle/", "Symfony\\Bundle\\": "src/Symfony/Bundle/",
"Symfony\\Component\\": "src/Symfony/Component/" "Symfony\\Component\\": "src/Symfony/Component/"
}, },
@@ -6119,7 +6280,7 @@
"keywords": [ "keywords": [
"framework" "framework"
], ],
"time": "2016-02-28 21:06:29" "time": "2016-03-27 12:57:53"
}, },
{ {
"name": "themattharris/tmhoauth", "name": "themattharris/tmhoauth",
@@ -6560,27 +6721,27 @@
}, },
{ {
"name": "zendframework/zend-code", "name": "zendframework/zend-code",
"version": "2.6.2", "version": "2.6.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zendframework/zend-code.git", "url": "https://github.com/zendframework/zend-code.git",
"reference": "c4e8f976a772cfb14b47dabd69b5245a423082b4" "reference": "95033f061b083e16cdee60530ec260d7d628b887"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zendframework/zend-code/zipball/c4e8f976a772cfb14b47dabd69b5245a423082b4", "url": "https://api.github.com/repos/zendframework/zend-code/zipball/95033f061b083e16cdee60530ec260d7d628b887",
"reference": "c4e8f976a772cfb14b47dabd69b5245a423082b4", "reference": "95033f061b083e16cdee60530ec260d7d628b887",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.5", "php": "^5.5 || 7.0.0 - 7.0.4 || ^7.0.6",
"zendframework/zend-eventmanager": "^2.6|^3.0" "zendframework/zend-eventmanager": "^2.6 || ^3.0"
}, },
"require-dev": { "require-dev": {
"doctrine/annotations": "~1.0", "doctrine/annotations": "~1.0",
"fabpot/php-cs-fixer": "1.7.*", "fabpot/php-cs-fixer": "1.7.*",
"phpunit/phpunit": "~4.0", "phpunit/phpunit": "^4.8.21",
"zendframework/zend-stdlib": "~2.7" "zendframework/zend-stdlib": "^2.7 || ^3.0"
}, },
"suggest": { "suggest": {
"doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features", "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
@@ -6608,7 +6769,7 @@
"code", "code",
"zf2" "zf2"
], ],
"time": "2016-01-05 05:58:37" "time": "2016-04-20 17:26:42"
}, },
{ {
"name": "zendframework/zend-eventmanager", "name": "zendframework/zend-eventmanager",
@@ -6668,16 +6829,16 @@
"packages-dev": [ "packages-dev": [
{ {
"name": "mikey179/vfsStream", "name": "mikey179/vfsStream",
"version": "v1.6.2", "version": "v1.6.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/mikey179/vfsStream.git", "url": "https://github.com/mikey179/vfsStream.git",
"reference": "fefd182fa739d4e23d9dc7c80d3344f528d600ab" "reference": "c19925cd0390d3c436a0203ae859afa460d0474b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/mikey179/vfsStream/zipball/fefd182fa739d4e23d9dc7c80d3344f528d600ab", "url": "https://api.github.com/repos/mikey179/vfsStream/zipball/c19925cd0390d3c436a0203ae859afa460d0474b",
"reference": "fefd182fa739d4e23d9dc7c80d3344f528d600ab", "reference": "c19925cd0390d3c436a0203ae859afa460d0474b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -6710,7 +6871,7 @@
], ],
"description": "Virtual file system to mock the real file system in unit tests.", "description": "Virtual file system to mock the real file system in unit tests.",
"homepage": "http://vfs.bovigo.org/", "homepage": "http://vfs.bovigo.org/",
"time": "2016-01-13 09:41:49" "time": "2016-04-09 09:42:01"
}, },
{ {
"name": "phpdocumentor/reflection-docblock", "name": "phpdocumentor/reflection-docblock",

View File

@@ -29,7 +29,7 @@ use Alchemy\Phrasea\SearchEngine\Elastic\Search\QueryContextFactory;
use Alchemy\Phrasea\SearchEngine\Elastic\Search\QueryCompiler; use Alchemy\Phrasea\SearchEngine\Elastic\Search\QueryCompiler;
use Alchemy\Phrasea\SearchEngine\Elastic\Structure\GlobalStructure; use Alchemy\Phrasea\SearchEngine\Elastic\Structure\GlobalStructure;
use Alchemy\Phrasea\SearchEngine\Elastic\Thesaurus; use Alchemy\Phrasea\SearchEngine\Elastic\Thesaurus;
use Elasticsearch\Client; use Elasticsearch\ClientBuilder;
use Hoa\Compiler; use Hoa\Compiler;
use Hoa\File; use Hoa\File;
use Monolog\Handler\ErrorLogHandler; use Monolog\Handler\ErrorLogHandler;
@@ -153,7 +153,13 @@ class SearchEngineServiceProvider implements ServiceProviderInterface
$clientParams['logging'] = true; $clientParams['logging'] = true;
} }
return new Client($clientParams); $clientBuilder = ClientBuilder::create()
->setHosts($clientParams['hosts']);
if(array_key_exists('logObject', $clientParams)) {
$clientBuilder->setLogger($clientParams['logObject']);
}
return $clientBuilder->build();
}); });
$app['elasticsearch.options'] = $app->share(function($app) { $app['elasticsearch.options'] = $app->share(function($app) {

View File

@@ -106,7 +106,7 @@ class Mapping
unset($field['index_analyzer'], $field['search_analyzer']); unset($field['index_analyzer'], $field['search_analyzer']);
break; break;
case 'indexing': case 'indexing':
$field['index_analyzer'] = $analyzer; $field['analyzer'] = $analyzer;
break; break;
case 'searching': case 'searching':
$field['search_analyzer'] = $analyzer; $field['search_analyzer'] = $analyzer;