Commit graph

153 commits

Author SHA1 Message Date
Richard Miller a227a3f076 Merge branch '2.1.x' 2013-12-04 08:03:04 +00:00
Richard Miller 2980ee818a Merge branch '2.0.x' into 2.1.x 2013-12-04 08:02:22 +00:00
Ben Longden 8b6dffbc14 Adds enabled mapping option (default true) 2013-12-04 07:53:08 +00:00
Tim Nagel 3c26f157aa Merge branch '2.1.x'
Conflicts:
	Tests/ResetterTest.php
2013-11-11 13:30:29 +11:00
Tim Nagel 9b6b0b0148 Add query_builder_method option to the transformers 2013-11-11 13:14:02 +11:00
Tim Nagel d5c606c64a Merge pull request #388 from XWB/dynamic_template_support
Add support for dynamic templates
2013-11-04 13:49:48 -08:00
Tim Nagel 28641427d5 Merge tag 'v2.1.3-PL1' 2013-11-01 09:17:17 +11:00
Tim Nagel 7f8a8e95e6 Merge tag 'v2.0.3-PL1' into 2.1.x 2013-11-01 09:16:27 +11:00
Tim Nagel 21ce3cf6ff Fix definition decorators (closes #393) 2013-11-01 09:15:38 +11:00
Jeremy Mikola 467ccbf753 Tag client services in DI extension class
These tags were originally introduced in 16ecd7cca3. #339 removed the fos_elastica.client definition from config.xml, so this tag needs to be added via the DI extension class now.
2013-10-30 17:15:09 -04:00
Jeremy Mikola 68092eb4db Merge branch '2.1.x'
Conflicts:
	Resources/config/config.xml
2013-10-30 17:14:20 -04:00
Jeremy Mikola 11d0dd8f91 Merge branch '2.0.x' into 2.1.x 2013-10-30 17:10:04 -04:00
Jeremy Mikola 74d993b642 Do not clobber existing client definitions (closes #336 and #324)
While we could have used an abstract definition, its ID would likely conflict with the alias we set for the default client. Remove the abstract definition altogether and simply construct new definitions for each client. This resolves the previous issue where multiple clients would overwrite the constructor arguments of the previous definition.
2013-10-30 15:15:26 -04:00
Jeremy Mikola 604193396f Remove "prototype" from abstract definition IDs; note possible conflicts
Due to the naming of transformer, listener, and finder services, it's possible for index/type services to clobber the ID of another concrete or abstract service. This cannot be helped without breaking BC, but we should note it within the extension class.
2013-10-30 15:15:25 -04:00
Karel Souffriau c68bb411ac Add support for dynamic templates 2013-10-30 13:39:43 +01:00
Tim Nagel 85c4dc92f9 Merge tag 'v2.1.3'
Conflicts:
	DependencyInjection/Configuration.php
	README.md
2013-10-30 09:06:48 +11:00
Karel Souffriau 9d1201099d Add date format field 2013-10-29 12:20:32 +01:00
Antonio J. García Lagar 7f3cfa49fb Make the property param optional 2013-06-19 13:57:15 +02:00
Antonio J. García Lagar a386ffefe3 Fix parent mapping 2013-06-17 21:19:11 +02:00
Lukas Kahwe Smith 43d1531cd4 cs fix 2013-05-23 00:25:38 +03:00
Lukas Kahwe Smith 50730cca3d added path support, see http://www.elasticsearch.org/guide/reference/mapping/id-field/ 2013-05-17 00:22:46 +02:00
Jeremy Mikola 814460dbf2 Merge branch '2.1.x' 2013-05-15 10:58:47 -05:00
Tim Nagel 00b67fd8a4 Ignore missing index hits 2013-05-15 09:59:43 -05:00
Lukas Kahwe Smith 800e38f8aa tweaked the callback handling 2013-04-26 14:10:06 +02:00
Lukas Kahwe Smith 8a9a9686ba various tweaks 2013-04-26 14:10:05 +02:00
Lukas Kahwe Smith aafb6e53fb made the bundle compatible with Elastica 0.20.x 2013-04-26 14:10:05 +02:00
Lea Haensenberger 1abe1f48dd Having a parameter name defining a class for the serializer callback, because directly putting service id or parameter doesn't work because these values are not available at bundle configuration time 2013-04-26 14:10:05 +02:00
Lea Haensenberger a139d18b22 Adding default callback for serialization if serialization is turned on 2013-04-26 14:09:42 +02:00
Lea Haensenberger 73fd4fe6b0 Creating a serializer callable for every type in an index and passing it to elastica 2013-04-26 14:06:49 +02:00
Lea Haensenberger c5ee26099b Adding support to pass a serializer to elastica 2013-04-26 14:06:48 +02:00
Thomas Tourlourat 4b4a56db1e Check for "indexes" key in Configuration::getNestings() 2013-04-17 11:23:30 -04:00
Jeremy Mikola 440c36f537 Merge remote-tracking branch 'cevou/master' into pr/245
Conflicts:
	Command/PopulateCommand.php
	Command/SearchCommand.php
	DependencyInjection/Configuration.php
	Doctrine/AbstractElasticaToModelTransformer.php
	Doctrine/AbstractListener.php
	Doctrine/MongoDB/ElasticaToModelTransformer.php
	Doctrine/ORM/ElasticaToModelTransformer.php
	Doctrine/RepositoryManager.php
	Finder/TransformedFinder.php
	Paginator/PaginatorAdapterInterface.php
	Paginator/RawPaginatorAdapter.php
	Persister/ObjectPersister.php
	Propel/ElasticaToModelTransformer.php
	Subscriber/PaginateElasticaQuerySubscriber.php
	Tests/DataCollector/ElasticaDataCollectorTest.php
	Tests/Doctrine/AbstractProviderTest.php
	Tests/Doctrine/RepositoryManagerTest.php
	Tests/Manager/RepositoryManagerTest.php
	Tests/RepositoryTest.php
	Transformer/ElasticaToModelTransformerCollection.php
	composer.json
2013-03-27 14:58:34 -04:00
Jeremy Mikola 744f05814a Merge branch '1.0.x' 2013-03-27 13:58:57 -04:00
Jeremy Mikola 4aa8fefe2d Rename FOQ filenames to FOS 2013-03-27 13:58:32 -04:00
Jeremy Mikola 49de4d361d Rename FOQ namespaces and services to FOS 2013-03-27 13:44:44 -04:00
Jeremy Mikola 3fb9aaa56a Rename FOQ namespaces and services to FOS 2013-03-27 13:44:06 -04:00
Stanislav Petrov 3f93f93a45 Changed configuration to implement ConfigurationInterface 2013-03-15 14:54:48 -04:00
skuro 904a664dfe Allow processing of null mappings in configuration 2013-03-15 14:35:01 -04:00
Konstantin Tjuterev 5e835f5b2c Added missing string field attributes, according to http://www.elasticsearch.org/guide/reference/mapping/core-types.html 2013-03-05 15:06:11 +02:00
Jeremy Mikola 8d11082a02 Skip config processing of indexes without types (fixes #246) 2013-03-04 14:59:04 -05:00
Jeremy Mikola eff52c2c9b Revert "fix search command"
This reverts commit f874e1d34f from PR #243.
2013-03-04 14:57:08 -05:00
cevou cbe6071969 Code cleanup
- updated deprecated calls
- cleaned up PHPDoc comments
2013-03-02 12:23:44 +01:00
Uyi Ehondor f874e1d34f fix search command
The bug:
The Search command throws an invalid argument exception when the index
alias and the index_name are different (see pull request 207 for a
background about the issue).

Fix:
The first argument of the index manager should be an array of index
objects having index names as keys, and should only fall back to using index aliases
if the index_name config param is not set.

See: pull request 207
(https://github.com/Exercise/FOQElasticaBundle/pull/207) for a background
on the issue.
2013-02-26 10:50:33 +00:00
Lea Haensenberger 7e85f79f8e Merge remote-tracking branch 'origin/master' into recursive_field_config
Conflicts:
	DependencyInjection/Configuration.php
2013-02-22 10:46:43 +01:00
Richard Miller 48d665e2ea Merge pull request #211 from liip-forks/fields_in_properties
Adding the fields configuration to the properties so multi_field fields ...
2013-02-03 11:49:51 -08:00
Richard Miller c82999fd8e Merge pull request #204 from micjohnson/patch-4
Add access to compression and disabling of _source from configuration
2013-02-03 11:45:37 -08:00
Richard Miller bfb0f823c1 Merge pull request #203 from micjohnson/patch-3
Adding _routing to type configuration
2013-02-03 11:44:51 -08:00
Richard Miller 94d89159bd Merge pull request #207 from Exercise/index-aliasing
Adding configuring index name separately from service name
2013-02-03 11:32:37 -08:00
Lea Haensenberger 71ccacc6b3 using getConfiguration and removing unnecessary end statements 2013-02-01 15:37:57 +01:00
Lea Haensenberger decd8a318d fixing CS problems 2013-02-01 14:55:59 +01:00