Skip to content

D
doctrine-dbal
Commit 517f039e authored by Benjamin Eberlei's avatar Benjamin Eberlei
Browse files
Options

Update composer.json for 2.4 release.

parent 07323929
Show whitespace changes
Inline Side-by-side
Showing with 92 additions and 70 deletions
composer.json
View file @ 517f039e
...@@ -13,11 +13,11 @@ ...@@ -13,11 +13,11 @@
], ],
"require": { "require": {
"php": ">=5.3.2", "php": ">=5.3.2",
"doctrine/common": "2.4.*@beta" "doctrine/common": "~2.4"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "3.7.*", "phpunit/phpunit": "3.7.*",
"symfony/console": "2.*" "symfony/console": "~2.0"
}, },
"suggest": { "suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files." "symfony/console": "For helpful console commands such as SQL execution and import of files."
...@@ -28,11 +28,6 @@ ...@@ -28,11 +28,6 @@
"autoload": { "autoload": {
"psr-0": { "Doctrine\\DBAL\\": "lib/" } "psr-0": { "Doctrine\\DBAL\\": "lib/" }
}, },
"extra": {
"branch-alias": {
"dev-master": "2.5.x-dev"
}
},
"archive": { "archive": {
"exclude": ["!vendor", "tests", "*phpunit.xml", ".travis.yml", "build.xml", "build.properties", "composer.phar"] "exclude": ["!vendor", "tests", "*phpunit.xml", ".travis.yml", "build.xml", "build.properties", "composer.phar"]
} }
......
composer.lock
View file @ 517f039e
...@@ -3,20 +3,20 @@ ...@@ -3,20 +3,20 @@
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
], ],
"hash": "66538e950918bed1d8ce86aa828ca12c", "hash": "ce376b1731cb063432716dedd975ee25",
"packages": [ "packages": [
{ {
"name": "doctrine/annotations", "name": "doctrine/annotations",
"version": "v1.1.1", "version": "v1.1.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/annotations.git", "url": "https://github.com/doctrine/annotations.git",
"reference": "v1.1.1" "reference": "40db0c96985aab2822edbc4848b3bd2429e02670"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/v1.1.1", "url": "https://api.github.com/repos/doctrine/annotations/zipball/40db0c96985aab2822edbc4848b3bd2429e02670",
"reference": "v1.1.1", "reference": "40db0c96985aab2822edbc4848b3bd2429e02670",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
{ {
"name": "Johannes Schmitt", "name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com", "email": "schmittjoh@gmail.com",
"homepage": "https://github.com/schmittjoh", "homepage": "http://jmsyst.com",
"role": "Developer of wrapped JMSSerializerBundle" "role": "Developer of wrapped JMSSerializerBundle"
} }
], ],
...@@ -74,26 +74,34 @@ ...@@ -74,26 +74,34 @@
"docblock", "docblock",
"parser" "parser"
], ],
"time": "2013-04-20 08:30:17" "time": "2013-06-16 21:33:03"
}, },
{ {
"name": "doctrine/cache", "name": "doctrine/cache",
"version": "v1.0", "version": "v1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/cache.git", "url": "https://github.com/doctrine/cache.git",
"reference": "v1.0" "reference": "2c9761ff1d13e188d5f7378066c1ce2882d7a336"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/doctrine/cache/archive/v1.0.zip", "url": "https://api.github.com/repos/doctrine/cache/zipball/2c9761ff1d13e188d5f7378066c1ce2882d7a336",
"reference": "v1.0", "reference": "2c9761ff1d13e188d5f7378066c1ce2882d7a336",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.2" "php": ">=5.3.2"
}, },
"conflict": {
"doctrine/common": ">2.2,<2.4"
},
"type": "library", "type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": { "autoload": {
"psr-0": { "psr-0": {
"Doctrine\\Common\\Cache\\": "lib/" "Doctrine\\Common\\Cache\\": "lib/"
...@@ -123,9 +131,9 @@ ...@@ -123,9 +131,9 @@
"email": "kontakt@beberlei.de" "email": "kontakt@beberlei.de"
}, },
{ {
"name": "Johannes Schmitt", "name": "Johannes M. Schmitt",
"email": "schmittjoh@gmail.com", "email": "schmittjoh@gmail.com",
"homepage": "https://github.com/schmittjoh", "homepage": "http://jmsyst.com",
"role": "Developer of wrapped JMSSerializerBundle" "role": "Developer of wrapped JMSSerializerBundle"
} }
], ],
...@@ -135,7 +143,7 @@ ...@@ -135,7 +143,7 @@
"cache", "cache",
"caching" "caching"
], ],
"time": "2013-01-10 22:43:46" "time": "2013-08-07 16:04:25"
}, },
{ {
"name": "doctrine/collections", "name": "doctrine/collections",
...@@ -206,16 +214,16 @@ ...@@ -206,16 +214,16 @@
}, },
{ {
"name": "doctrine/common", "name": "doctrine/common",
"version": "2.4.0-RC2", "version": "v2.4.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/common.git", "url": "https://github.com/doctrine/common.git",
"reference": "2.4.0-RC2" "reference": "ceb18cf9b0230f3ea208b6238130fd415abda0a7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/common/zipball/2.4.0-RC2", "url": "https://api.github.com/repos/doctrine/common/zipball/ceb18cf9b0230f3ea208b6238130fd415abda0a7",
"reference": "2.4.0-RC2", "reference": "ceb18cf9b0230f3ea208b6238130fd415abda0a7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -263,7 +271,7 @@ ...@@ -263,7 +271,7 @@
{ {
"name": "Johannes Schmitt", "name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com", "email": "schmittjoh@gmail.com",
"homepage": "https://github.com/schmittjoh", "homepage": "http://jmsyst.com",
"role": "Developer of wrapped JMSSerializerBundle" "role": "Developer of wrapped JMSSerializerBundle"
} }
], ],
...@@ -276,7 +284,7 @@ ...@@ -276,7 +284,7 @@
"persistence", "persistence",
"spl" "spl"
], ],
"time": "2013-05-09 21:35:24" "time": "2013-09-07 10:20:34"
}, },
{ {
"name": "doctrine/inflector", "name": "doctrine/inflector",
...@@ -397,16 +405,16 @@ ...@@ -397,16 +405,16 @@
"packages-dev": [ "packages-dev": [
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
"version": "1.2.9", "version": "1.2.12",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "1.2.9" "reference": "0e9958c459d675fb497d8dc5001c91d335734e48"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/1.2.9", "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/0e9958c459d675fb497d8dc5001c91d335734e48",
"reference": "1.2.9", "reference": "0e9958c459d675fb497d8dc5001c91d335734e48",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -415,11 +423,19 @@ ...@@ -415,11 +423,19 @@
"phpunit/php-text-template": ">=1.1.1@stable", "phpunit/php-text-template": ">=1.1.1@stable",
"phpunit/php-token-stream": ">=1.1.3@stable" "phpunit/php-token-stream": ">=1.1.3@stable"
}, },
"require-dev": {
"phpunit/phpunit": "3.7.*@dev"
},
"suggest": { "suggest": {
"ext-dom": "*", "ext-dom": "*",
"ext-xdebug": ">=2.0.5" "ext-xdebug": ">=2.0.5"
}, },
"type": "library", "type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.2.x-dev"
}
},
"autoload": { "autoload": {
"classmap": [ "classmap": [
"PHP/" "PHP/"
...@@ -446,7 +462,7 @@ ...@@ -446,7 +462,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2013-02-26 18:55:56" "time": "2013-07-06 06:26:16"
}, },
{ {
"name": "phpunit/php-file-iterator", "name": "phpunit/php-file-iterator",
...@@ -539,16 +555,16 @@ ...@@ -539,16 +555,16 @@
}, },
{ {
"name": "phpunit/php-timer", "name": "phpunit/php-timer",
"version": "1.0.4", "version": "1.0.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "git://github.com/sebastianbergmann/php-timer.git", "url": "https://github.com/sebastianbergmann/php-timer.git",
"reference": "1.0.4" "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/sebastianbergmann/php-timer/zipball/1.0.4", "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
"reference": "1.0.4", "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -575,24 +591,24 @@ ...@@ -575,24 +591,24 @@
} }
], ],
"description": "Utility class for timing", "description": "Utility class for timing",
"homepage": "http://www.phpunit.de/", "homepage": "https://github.com/sebastianbergmann/php-timer/",
"keywords": [ "keywords": [
"timer" "timer"
], ],
"time": "2012-10-11 04:45:58" "time": "2013-08-02 07:42:54"
}, },
{ {
"name": "phpunit/php-token-stream", "name": "phpunit/php-token-stream",
"version": "1.1.5", "version": "1.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "git://github.com/sebastianbergmann/php-token-stream.git", "url": "https://github.com/sebastianbergmann/php-token-stream.git",
"reference": "1.1.5" "reference": "31babf400e5b5868573bf49a000a3519d3978233"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/sebastianbergmann/php-token-stream/zipball/1.1.5", "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/31babf400e5b5868573bf49a000a3519d3978233",
"reference": "1.1.5", "reference": "31babf400e5b5868573bf49a000a3519d3978233",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -600,6 +616,11 @@ ...@@ -600,6 +616,11 @@
"php": ">=5.3.3" "php": ">=5.3.3"
}, },
"type": "library", "type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.2-dev"
}
},
"autoload": { "autoload": {
"classmap": [ "classmap": [
"PHP/" "PHP/"
...@@ -620,24 +641,24 @@ ...@@ -620,24 +641,24 @@
} }
], ],
"description": "Wrapper around PHP's tokenizer extension.", "description": "Wrapper around PHP's tokenizer extension.",
"homepage": "http://www.phpunit.de/", "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
"keywords": [ "keywords": [
"tokenizer" "tokenizer"
], ],
"time": "2012-10-11 04:47:14" "time": "2013-08-04 05:57:48"
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "3.7.19", "version": "3.7.24",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "3.7.19" "reference": "af7b77ccb5c64458bdfca95665d29558d1df7d08"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.19", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/af7b77ccb5c64458bdfca95665d29558d1df7d08",
"reference": "3.7.19", "reference": "af7b77ccb5c64458bdfca95665d29558d1df7d08",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -646,12 +667,12 @@ ...@@ -646,12 +667,12 @@
"ext-reflection": "*", "ext-reflection": "*",
"ext-spl": "*", "ext-spl": "*",
"php": ">=5.3.3", "php": ">=5.3.3",
"phpunit/php-code-coverage": ">=1.2.1,<1.3.0", "phpunit/php-code-coverage": "~1.2.1",
"phpunit/php-file-iterator": ">=1.3.1", "phpunit/php-file-iterator": ">=1.3.1",
"phpunit/php-text-template": ">=1.1.1", "phpunit/php-text-template": ">=1.1.1",
"phpunit/php-timer": ">=1.0.2,<1.1.0", "phpunit/php-timer": ">=1.0.4",
"phpunit/phpunit-mock-objects": ">=1.2.0,<1.3.0", "phpunit/phpunit-mock-objects": "~1.2.0",
"symfony/yaml": ">=2.0.0,<2.3.0" "symfony/yaml": "~2.0"
}, },
"require-dev": { "require-dev": {
"pear-pear/pear": "1.9.4" "pear-pear/pear": "1.9.4"
...@@ -698,7 +719,7 @@ ...@@ -698,7 +719,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2013-03-25 11:45:06" "time": "2013-08-09 06:58:24"
}, },
{ {
"name": "phpunit/phpunit-mock-objects", "name": "phpunit/phpunit-mock-objects",
...@@ -751,26 +772,32 @@ ...@@ -751,26 +772,32 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v2.2.1", "version": "v2.3.4",
"target-dir": "Symfony/Component/Console", "target-dir": "Symfony/Component/Console",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Console.git", "url": "https://github.com/symfony/Console.git",
"reference": "v2.2.1" "reference": "db78f8ff7fc9e28d25ff9a0bf6ddf9f0e35fbbe3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Console/zipball/v2.2.1", "url": "https://api.github.com/repos/symfony/Console/zipball/db78f8ff7fc9e28d25ff9a0bf6ddf9f0e35fbbe3",
"reference": "v2.2.1", "reference": "db78f8ff7fc9e28d25ff9a0bf6ddf9f0e35fbbe3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.3.3"
}, },
"require-dev": {
"symfony/event-dispatcher": "~2.1"
},
"suggest": {
"symfony/event-dispatcher": ""
},
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.2-dev" "dev-master": "2.3-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -794,21 +821,21 @@ ...@@ -794,21 +821,21 @@
], ],
"description": "Symfony Console Component", "description": "Symfony Console Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2013-03-19 20:48:08" "time": "2013-08-17 16:34:49"
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
"version": "v2.2.1", "version": "v2.3.4",
"target-dir": "Symfony/Component/Yaml", "target-dir": "Symfony/Component/Yaml",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Yaml.git", "url": "https://github.com/symfony/Yaml.git",
"reference": "v2.2.1" "reference": "5a279f1b5f5e1045a6c432354d9ea727ff3a9847"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Yaml/zipball/v2.2.1", "url": "https://api.github.com/repos/symfony/Yaml/zipball/5a279f1b5f5e1045a6c432354d9ea727ff3a9847",
"reference": "v2.2.1", "reference": "5a279f1b5f5e1045a6c432354d9ea727ff3a9847",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -817,7 +844,7 @@ ...@@ -817,7 +844,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.2-dev" "dev-master": "2.3-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -841,16 +868,16 @@ ...@@ -841,16 +868,16 @@
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2013-03-23 07:49:54" "time": "2013-08-24 15:26:22"
} }
], ],
"aliases": [ "aliases": [
], ],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": { "stability-flags": [
"doctrine/common": 10
}, ],
"platform": { "platform": {
"php": ">=5.3.2" "php": ">=5.3.2"
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment