Commit graph

535 commits

Author SHA1 Message Date
Tim Nagel
8f49b246bc Merge tag 'v2.0.3' into 2.1.x v2.1.3 2013-10-30 09:01:05 +11:00
Tim Nagel
f97dc21030 Merge pull request #355 from richardmiller/add-mlt v2.0.3
Add moreLikeThis query to finder
2013-10-29 14:55:00 -07:00
Tim Nagel
cfaa85f1c5 Merge pull request #389 from XWB/add_format_field
Add date format field
2013-10-29 14:54:17 -07:00
Karel Souffriau
9d1201099d Add date format field 2013-10-29 12:20:32 +01:00
Richard Miller
79501dc319 Add moreLikeThis query to finder 2013-08-12 11:04:54 +01:00
Jeremy Mikola
4a889406e9 Merge branch '2.0.x' into 2.1.x
Conflicts:
	Tests/Transformer/ModelToElasticaAutoTransformerTest.php
2013-07-17 15:55:55 -04:00
Jeremy Mikola
ab0c27c481 Fix expected exception class (related to #338)
This corrects a typo in a66a37aebd.
2013-07-17 15:54:06 -04:00
Jeremy Mikola
7ae4be0062 Merge branch '2.0.x' into 2.1.x
Conflicts:
	Tests/Transformer/ModelToElasticaAutoTransformerTest.php
2013-07-17 15:49:09 -04:00
Jeremy Mikola
a66a37aebd Merge pull request #338 from FriendsOfSymfony/2.0.x-property-access
Fix missing getter for private field test for PropertyAccess 2.3+
2013-07-17 12:44:57 -07:00
Jeremy Mikola
9e2e8ab1c9 Fix missing getter for private field test for PropertyAccess 2.3+
See: df67239b02
2013-07-12 17:32:33 -04:00
Jeremy Mikola
2dfbfffbd0 Update 2.1.x changelog v2.1.2 2013-06-06 11:19:59 -04:00
Jeremy Mikola
692d224b08 Merge branch '2.0.x' into 2.1.x
Conflicts:
	composer.json
2013-06-06 11:18:47 -04:00
Jeremy Mikola
cd48a36687 Update 2.0.x changelog v2.0.2 2013-06-06 11:13:12 -04:00
Jeremy Mikola
00e9a49460 Allow Symfony dependencies until 3.0 2013-06-06 11:02:55 -04:00
Jeremy Mikola
41c747907c Create 2.1.x changelog v2.1.1 2013-05-15 10:55:30 -05:00
Tim Nagel
c05e0caa9c Added documentation for ignoring missing hits 2013-05-15 09:59:52 -05:00
Tim Nagel
00b67fd8a4 Ignore missing index hits 2013-05-15 09:59:43 -05:00
Jeremy Mikola
a161b0657a Merge branch '2.0.x' v2.1.0 2013-04-17 11:23:58 -04:00
Thomas Tourlourat
4b4a56db1e Check for "indexes" key in Configuration::getNestings() 2013-04-17 11:23:30 -04:00
Jeremy Mikola
7e79fa6f35 Merge branch '2.0.x' 2013-04-16 13:27:46 -04:00
Jeremy Mikola
8ffd1a7c3d Update install version and add links to compatibility info 2013-04-16 13:26:14 -04:00
Jeremy Mikola
b5037d1c77 Merge branch '2.0.x' 2013-04-16 13:19:50 -04:00
Jeremy Mikola
36e38cb576 Merge branch '1.0.x' into 2.0.x 2013-04-16 13:17:39 -04:00
Jeremy Mikola
58e983fb06 Document installation via composer in README (closes #271) 2013-04-16 13:16:53 -04:00
Jeremy Mikola
c24a647a43 Merge pull request #267 from XWB/collector-update
Collector: print query data as json instead of yaml
2013-04-10 12:39:04 -07:00
Jeremy Mikola
ae4f676c25 Create 2.1.x-dev branch alias for master 2013-04-05 13:38:03 -04:00
Jeremy Mikola
8e03ed2663 Merge pull request #266 from XWB/property-access-update
Use the PropertyAccess component
2013-04-05 10:26:57 -07:00
Karel Souffriau
4f5be038ef Collector: print query data as json instead of yaml 2013-04-05 13:17:00 +02:00
Karel Souffriau
83e27ede93 Require PropertyAccess component 2013-04-04 21:51:03 +02:00
Jeremy Mikola
e82b6e983f Create 2.0.x changelog v2.0.1 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 v2.0.0
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 v1.0.0 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