hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some fixup for ES instance

Browse Source
This commit is contained in:
Benoît Burnichon
2015-03-11 15:18:59 +01:00
parent 359c115291
commit 118bb2f03c
42 changed files with 78 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml
View File

@@ -26,28 +26,23 @@ main:
type: ArrayCache
options: []
search-engine:
type: Alchemy\Phrasea\SearchEngine\Phrasea\PhraseaEngine
options: []
type: elasticsearch
# type: phrasea
options:
host: localhost
port: 9200
task-manager:
status: started
enabled: true
logger:
max-files: 10
enabled: true
level: INFO
listener:
options:
protocol: tcp
host: 127.0.0.1
port: 6660
linger: 500
websocket-server:
host: local.phrasea
port: 9090
ip: 0.0.0.0
subscriber:
protocol: tcp
host: 127.0.0.1
port: 13598
logger:
max-files: 10
enabled: true
level: INFO
session:
type: 'file'
options: []

27
tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml
View File

@@ -26,28 +26,23 @@ main:
type: ArrayCache
options: []
search-engine:
type: Alchemy\Phrasea\SearchEngine\Phrasea\PhraseaEngine
options: []
type: elasticsearch
# type: phrasea
options:
host: localhost
port: 9200
task-manager:
status: started
enabled: true
logger:
max-files: 10
enabled: true
level: INFO
listener:
options:
protocol: tcp
host: 127.0.0.1
port: 6660
linger: 500
websocket-server:
host: local.phrasea
port: 9090
ip: 0.0.0.0
subscriber:
protocol: tcp
host: 127.0.0.1
port: 13598
logger:
max-files: 10
enabled: true
level: INFO
session:
type: 'file'
options: []
@@ -207,4 +202,4 @@ crossdomain:
allow-access-from:
-
domain: '*.cooliris.com'
secure: 'false'
secure: 'false'

3
tests/Alchemy/Tests/Phrasea/Core/Provider/SearchEngineServiceProviderTest.php
View File

@@ -9,9 +9,6 @@ class SearchEngineServiceProviderTest extends ServiceProviderTestCase
{
public function setUp()
{
if (!extension_loaded('phrasea2')) {
$this->markTestSkipped('Phrasea2 is required for this test');
}
parent::setUp();
}