diff --git a/composer.json b/composer.json index 62f2416be1..3ed9ee51ed 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "require": { "php": ">=5.3.3", "symfony/symfony": "2.1.*", - "doctrine/orm": "2.2.*", + "doctrine/orm": "2.3.*", "doctrine/doctrine-bundle": "dev-master", "twig/extensions": "dev-master", "symfony/assetic-bundle": "dev-master", diff --git a/composer.lock b/composer.lock index 030b83fb3e..700804adbf 100644 --- a/composer.lock +++ b/composer.lock @@ -1,27 +1,29 @@ { - "hash": "ab7ccf177098603cace942212179431f", + "hash": "eb4a006ba4008620e70aecf4620dae06", "packages": [ { "package": "doctrine/common", - "version": "2.2.2" + "version": "2.3.x-dev", + "source-reference": "b0ed9cc35ec28b7cd23d3d001e6fd4c7b5092926", + "commit-date": "1343082138" }, { "package": "doctrine/dbal", - "version": "2.2.x-dev", - "source-reference": "b961a3fce6bf220f1dca47d7d747b9074bea4730", - "commit-date": "1341779435" + "version": "2.3.x-dev", + "source-reference": "3d426e5b3957790b97008c341ac6e53e08a50503", + "commit-date": "1343082205" }, { "package": "doctrine/doctrine-bundle", "version": "dev-master", - "source-reference": "c9ea46d1f0c48bb88bb87b44214fe44e03c0c692", - "commit-date": "1341405737" + "source-reference": "62134e6a8dd3f330131ee6a970f0cee1d7760c1d", + "commit-date": "1343203511" }, { "package": "doctrine/orm", - "version": "2.2.x-dev", - "source-reference": "5d2a3bcb3b467f41ee58575764f3ba84937f76e4", - "commit-date": "1341676080" + "version": "2.3.x-dev", + "source-reference": "5b55739990e9407fc8c815de29763b7da065e0c2", + "commit-date": "1343082239" }, { "package": "jms/aop-bundle", @@ -33,7 +35,15 @@ }, { "package": "jms/di-extra-bundle", - "version": "1.0.1" + "version": "dev-master", + "alias-pretty-version": "1.1.x-dev", + "alias-version": "1.1.9999999.9999999-dev" + }, + { + "package": "jms/di-extra-bundle", + "version": "dev-master", + "source-reference": "7cf571672d33ac826869fac4135e7c3ac5e611fd", + "commit-date": "1343171490" }, { "package": "jms/metadata", @@ -41,7 +51,15 @@ }, { "package": "jms/security-extra-bundle", - "version": "1.1.0" + "version": "dev-master", + "alias-pretty-version": "1.2.x-dev", + "alias-version": "1.2.9999999.9999999-dev" + }, + { + "package": "jms/security-extra-bundle", + "version": "dev-master", + "source-reference": "1c2b2bef3505c390208f0411be82cc85cf5899eb", + "commit-date": "1343171612" }, { "package": "kriswallsmith/assetic", @@ -52,8 +70,8 @@ { "package": "kriswallsmith/assetic", "version": "dev-master", - "source-reference": "5c1c9b658b732a980312e8f29cec4e175c2bb6b2", - "commit-date": "1342787613" + "source-reference": "c518a48ddc26af898191410cc35f7f30aaed448e", + "commit-date": "1343084248" }, { "package": "monolog/monolog", @@ -68,8 +86,8 @@ { "package": "sensio/framework-extra-bundle", "version": "dev-master", - "source-reference": "e9ac8f1a911ed29e30296c7f1549f53d4c94eddf", - "commit-date": "1342084432" + "source-reference": "b2cdb24737aa0c7381faf53d2e2f31a667113adc", + "commit-date": "1343195639" }, { "package": "sensio/generator-bundle", @@ -92,14 +110,8 @@ { "package": "symfony/assetic-bundle", "version": "dev-master", - "source-reference": "e5e9a56a872d9e1f305d14cd8296bf77888388af", - "commit-date": "1342820047" - }, - { - "package": "symfony/monolog-bundle", - "version": "dev-master", - "alias-pretty-version": "2.1.x-dev", - "alias-version": "2.1.9999999.9999999-dev" + "source-reference": "a5daf7ca4588f88105c808de9a28ba1e66bfa082", + "commit-date": "1343161458" }, { "package": "symfony/monolog-bundle", @@ -107,12 +119,6 @@ "source-reference": "v2.1.0-BETA4", "commit-date": "1341078487" }, - { - "package": "symfony/swiftmailer-bundle", - "version": "dev-master", - "alias-pretty-version": "2.1.x-dev", - "alias-version": "2.1.9999999.9999999-dev" - }, { "package": "symfony/swiftmailer-bundle", "version": "dev-master", @@ -128,8 +134,8 @@ { "package": "symfony/symfony", "version": "dev-master", - "source-reference": "v2.1.0-BETA4", - "commit-date": "1343063410" + "source-reference": "f4570d5e731f66198c3d69fe2baddc5785ff8318", + "commit-date": "1343209062" }, { "package": "twig/extensions",