Commit graph

36 commits

Author SHA1 Message Date
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 00e9a49460 Allow Symfony dependencies until 3.0 2013-06-06 11:02:55 -04:00
Jeremy Mikola ae4f676c25 Create 2.1.x-dev branch alias for master 2013-04-05 13:38:03 -04:00
Karel Souffriau 83e27ede93 Require PropertyAccess component 2013-04-04 21:51:03 +02:00
Jeremy Mikola 89284df831 Revert "Provide branch alias for 2.0"
This reverts commit 920f16965f.
2013-03-28 13:52:48 -04:00
Tim Nagel 920f16965f Provide branch alias for 2.0 2013-03-28 11:24:11 +11: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 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 fb73ded604 Replace minimum-stability with ODM dev requirements 2013-03-15 15:15:26 -04:00
cevou b03ee7cc76 Removed property path changes again 2013-03-04 21:20:55 +01:00
cevou cbe6071969 Code cleanup
- updated deprecated calls
- cleaned up PHPDoc comments
2013-03-02 12:23:44 +01:00
Vyacheslav Salakhutdinov e9be67d59b Updated dev deps 2013-01-25 14:59:24 +04:00
NicolasBadey ab84d89eb7 rebase upstream 2012-12-05 17:28:34 +01:00
daFish e6bfda8e80 Added support for Symfony 2.2 to composer.json 2012-11-18 20:30:51 +01:00
Nicolas Badey 1f2fd479e3 Update composer.json
new version fix some issues ( _count with query filtered )
2012-08-30 12:41:32 +03:00
Chris Tickner fcb9e8f2f5 Updated the DoctrineMongoDBBundle service IDs
The service IDs for the DoctrineMongoDBBundle have changed for version 2.1.  This is an update to reflect that change.

https://github.com/doctrine/DoctrineMongoDBBundle/pull/134
2012-08-15 08:45:43 -03:00
Richard Miller c7e0e88ece Merge branch '2.0'
Conflicts:
	composer.json
2012-07-10 22:50:04 +01:00
Richard Miller 60d3ef69f3 Specified specific Elastica version in composer.json 2012-07-10 22:48:40 +01:00
Richard Miller 2732296aed Merge branch '2.0'
Conflicts:
	Doctrine/AbstractElasticaToModelTransformer.php
	Doctrine/MongoDB/ElasticaToModelTransformer.php
	Doctrine/ORM/ElasticaToModelTransformer.php
	composer.json
2012-07-10 21:37:23 +01:00
Richard Miller cc410cb804 Added require-dev section to composer.json 2012-07-10 21:29:18 +01:00
Richard Miller e37d22c220 Added minimum-stability to composer.json 2012-07-08 14:22:39 +01:00
Francisco Facioni d5778bda4b Added composer dependency to symfony/form 2012-05-21 15:00:56 -03:00
Richard Miller f9cab6e48d Update Elastica version required in composer.json
Conflicts:

	composer.json
2012-05-04 12:22:12 +01:00
Richard Miller 123816795a Update Elastica version required in composer.json 2012-05-02 10:08:48 +02:00
Jeremy Mikola c3391d957a Add suggested Doctrine and Propel deps for test suite coverage 2012-04-10 17:51:02 -04:00
Jeremy Mikola 22789c1b01 Add suggested Doctrine and Propel deps for test suite coverage 2012-04-10 14:35:08 -04:00
Jeremy Mikola 02f162fd79 Update Elastica dependency for Resetter changes
Resetter depends on Elastica_Type::delete(), which was a recent addition to Elastica. See: af6c92b92e5374f92323a65cb6ea957b74fcb1dd
2012-03-12 12:08:53 -04:00
Richard Miller 41f18a47af Merge branch '2.0'
Conflicts:
	composer.json
2012-03-07 10:20:24 +00:00
Richard Miller 1f8993557b Added symfony/console to composer.json 2012-03-07 10:18:25 +00:00
Jeremy Mikola ebeff1aae4 Update composer.json to require Symfony 2.1 2012-03-03 22:48:22 -05:00
Jeremy Mikola 62c410f464 Revise composer.json and require Symfony 2.0 explicitly 2012-03-03 22:46:34 -05:00
daFish 67d44a767d Add composer support. 2012-03-03 22:34:16 -05:00