Commit graph

506 commits

Author SHA1 Message Date
Jeremy Mikola e82b6e983f Create 2.0.x changelog 2013-04-04 11:46:06 -04:00
Jeremy Mikola 55920a3397 Merge branch '1.0.x' into 2.0.x 2013-03-28 16:36:46 -04:00
Jeremy Mikola f0d3a4d956 Ensure mongo extension is available in Travis CI 2013-03-28 16:31:26 -04:00
Jeremy Mikola 8c3863bb5f Merge branch 'pr/262' into 2.0.x 2013-03-28 13:53:16 -04:00
Jeremy Mikola c99f0458df Merge branch '1.0.x' into 2.0.x 2013-03-28 13:52:58 -04:00
Jeremy Mikola 89284df831 Revert "Provide branch alias for 2.0"
This reverts commit 920f16965f.
2013-03-28 13:52:48 -04:00
Jeremy Mikola 49a9ad31f2 Revert "Provide branch alias for 1.0"
This reverts commit e8ea4e910f.
2013-03-28 13:51:45 -04:00
ShurtMaiden 1f26318875 Avoid using a feature not supported in PHP5.3 2013-03-28 12:15:02 +01:00
Tim Nagel 920f16965f Provide branch alias for 2.0 2013-03-28 11:24:11 +11:00
Tim Nagel e8ea4e910f Provide branch alias for 1.0 2013-03-28 11:23:43 +11:00
Jeremy Mikola 8146f8e9ab Merge pull request #255 from FriendsOfSymfony/property-access
Support Symfony 2.2 PropertyAccess with BC for 2.1 (closes #218)
2013-03-27 14:33:45 -07:00
Jeremy Mikola 2e7d2f2452 Support Symfony 2.2 PropertyAccess with BC for 2.1 (closes #218)
By abstracting the property access, we can easily support Symfony 2.1's Form component and 2.2's PropertyAccess component.

The PropertyAccessor service will be injected into transformers if it is available. Tests were modified to do the same, and expect the appropriate exception depending on which implementation is available.
2013-03-27 17:26:47 -04:00
Jeremy Mikola 91090ed37a Fix pagerfanta dependecy 2013-03-27 15:00:54 -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 cf4cc7f578 Require Symfony 2.1.x 2013-03-27 14:33:30 -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 a7b37f3c41 Merge branch '1.0.x'
Conflicts:
	Command/PopulateCommand.php
	Command/SearchCommand.php
	DependencyInjection/Compiler/AddProviderPass.php
	DependencyInjection/FOQElasticaExtension.php
	Doctrine/AbstractListener.php
	Doctrine/AbstractProvider.php
	Doctrine/MongoDB/Listener.php
	Doctrine/MongoDB/Provider.php
	Doctrine/ORM/Listener.php
	Doctrine/ORM/Provider.php
	FOQElasticaBundle.php
	Finder/TransformedFinder.php
	IndexManager.php
	MappingRegistry.php
	Paginator/AbstractPaginatorAdapter.php
	Paginator/RawPaginatorAdapter.php
	Paginator/TransformedPaginatorAdapter.php
	Populator.php
	Propel/Provider.php
	Provider/ProviderInterface.php
	README.md
	Repository.php
	Reseter.php
	Resources/config/config.xml
	Resources/config/mongodb.xml
	Resources/config/orm.xml
	Resources/config/propel.xml
	Tests/Doctrine/MongoDB/ListenerTest.php
	Tests/Doctrine/ORM/ListenerTest.php
	Tests/IndexManagerTest.php
	Tests/MappingRegistryTest.php
	Tests/PopulatorTest.php
	Tests/ReseterTest.php
	Transformer/ElasticaToModelTransformerCollection.php
2013-03-27 13:57:39 -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
Jeremy Mikola 4e11e20071 Merge branch '2.0'
Conflicts:
	.travis.yml
	composer.json
2013-03-15 15:24:43 -04:00
Jeremy Mikola 22ad3cfe01 Update package installation for Travis CI 2013-03-15 15:15:55 -04:00
Jeremy Mikola fb73ded604 Replace minimum-stability with ODM dev requirements 2013-03-15 15:15:26 -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
Jeremy Mikola b12b92845c Merge branch '2.0' 2013-03-07 17:54:21 -05:00
Jeremy Mikola 9ec6a0ae1b Update test assertions for date format 2013-03-07 17:53:08 -05:00
Jeremy Mikola 1a6fe2c362 Fix format typo for ISO 8601 date conversion
See: dd00409e85 (typo on my part when cherry-picking that commit).
2013-03-07 17:51:20 -05:00
Jeremy Mikola 8f5f12315d Merge branch '2.0'
Conflicts:
	Transformer/ModelToElasticaAutoTransformer.php
2013-03-07 17:38:42 -05:00
Miha Vrhovnik dd00409e85 Normalize DateTime values as ISO 8601 strings 2013-03-07 17:33:07 -05:00
Jeremy Mikola d3602e075b Revise language for advanced query example 2013-03-07 17:12:14 -05:00
topweb 14d2b82529 Add advanced query example to README 2013-03-07 17:12:14 -05:00
Jeremy Mikola 7f3e3919e7 Merge pull request #248 from kostiklv/missing-field-options
Added missing string field attributes
2013-03-07 13:56:03 -08: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
cevou b03ee7cc76 Removed property path changes again 2013-03-04 21:20:55 +01: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
Jeremy Mikola dea32f9b56 Merge pull request #243 from uehondor/fix-search-command
fix search command
2013-02-26 12:58:59 -08: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
Jeremy Mikola 423576638a Merge pull request #210 from liip-forks/recursive_field_config
Adding support for infinite nesting level in field configurations
2013-02-25 07:55:06 -08:00
Jeremy Mikola 3ea70afd7e Merge pull request #241 from nurikabe/patch-1
Fix odd grammar
2013-02-22 11:27:58 -08:00
Evan Owens 1992d6f0d6 Fix odd grammar 2013-02-22 14:03:40 -05: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
Jeremy Mikola 737b73b947 Merge pull request #240 from tyx/dev/query-time-debugbar
Query time in debugbar
2013-02-21 09:44:26 -08:00
tyx f66858ff3e Add test for the query time in datacollector 2013-02-21 10:52:49 +01:00
tyx 9c60a5ccac Add totalquery time in debugbar (like Doctrine does) 2013-02-21 10:37:04 +01:00
Jeremy Mikola 2171755e5a Merge pull request #231 from marcoleong/patch-1
The finder was not created in that section
2013-02-11 12:51:52 -08:00
Marco Leong 6995d75dc8 The finder was not created in that section
The finder was not created in that section, use repository instead, make more sense for user
2013-02-07 17:12:38 +08: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