Fix latest merge

This commit is contained in:
Nicolas Le Goff
2014-08-11 22:53:13 +02:00
parent 2899f152fb
commit 4fa1f613e4
35 changed files with 378 additions and 275 deletions

289
composer.lock generated
View File

@@ -4,16 +4,22 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "81820d7853d2c85cbb34fc57910d6963",
"hash": "2ddab4a9d0ebb3a7ff949171dd62a1d2",
"packages": [
{
"name": "alchemy-fr/tcpdf-clone",
"version": "6.0.039",
"source": {
"type": "git",
"url": "https://github.com/alchemy-fr/tcpdf-clone",
"url": "https://github.com/alchemy-fr/tcpdf-clone.git",
"reference": "2ba0248a7187f1626df6c128750650416267f0e7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/alchemy-fr/tcpdf-clone/zipball/2ba0248a7187f1626df6c128750650416267f0e7",
"reference": "2ba0248a7187f1626df6c128750650416267f0e7",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
@@ -60,6 +66,10 @@
"qrcode",
"tcpdf"
],
"support": {
"source": "https://github.com/alchemy-fr/tcpdf-clone/tree/6.0.039",
"issues": "https://github.com/alchemy-fr/tcpdf-clone/issues"
},
"time": "2013-10-13 16:11:17"
},
{
@@ -103,7 +113,7 @@
"homepage": "http://www.lickmychip.com/"
},
{
"name": "Nicolas Le Goff",
"name": "nlegoff",
"email": "legoff.n@gmail.com"
},
{
@@ -291,7 +301,7 @@
}
},
"notification-url": "https://packagist.org/downloads/",
"time": "2014-07-07 14:01:51"
"time": "2014-07-07 16:25:07"
},
{
"name": "alchemy/task-manager",
@@ -362,12 +372,12 @@
"source": {
"type": "git",
"url": "https://github.com/alchemy-fr/Zippy.git",
"reference": "8ccc695f66c3b61ffdb3b9e88474602da52401ae"
"reference": "d2f5e88f2436b9c1294e8819d951822abe39e9a7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/alchemy-fr/Zippy/zipball/8ccc695f66c3b61ffdb3b9e88474602da52401ae",
"reference": "8ccc695f66c3b61ffdb3b9e88474602da52401ae",
"url": "https://api.github.com/repos/alchemy-fr/Zippy/zipball/d2f5e88f2436b9c1294e8819d951822abe39e9a7",
"reference": "d2f5e88f2436b9c1294e8819d951822abe39e9a7",
"shasum": ""
},
"require": {
@@ -416,19 +426,19 @@
"tar",
"zip"
],
"time": "2014-02-18 22:09:18"
"time": "2014-05-05 13:39:00"
},
{
"name": "cboden/ratchet",
"version": "v0.3.0",
"source": {
"type": "git",
"url": "https://github.com/cboden/Ratchet.git",
"url": "https://github.com/ratchetphp/Ratchet.git",
"reference": "d756e0b507a5f3cdbf8c59dbb7baf68574dc7d58"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/cboden/Ratchet/zipball/d756e0b507a5f3cdbf8c59dbb7baf68574dc7d58",
"url": "https://api.github.com/repos/ratchetphp/Ratchet/zipball/d756e0b507a5f3cdbf8c59dbb7baf68574dc7d58",
"reference": "d756e0b507a5f3cdbf8c59dbb7baf68574dc7d58",
"shasum": ""
},
@@ -547,16 +557,16 @@
},
{
"name": "doctrine/annotations",
"version": "v1.1.2",
"version": "v1.2.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
"reference": "40db0c96985aab2822edbc4848b3bd2429e02670"
"reference": "d9b1a37e9351ddde1f19f09a02e3d6ee92e82efd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/40db0c96985aab2822edbc4848b3bd2429e02670",
"reference": "40db0c96985aab2822edbc4848b3bd2429e02670",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/d9b1a37e9351ddde1f19f09a02e3d6ee92e82efd",
"reference": "d9b1a37e9351ddde1f19f09a02e3d6ee92e82efd",
"shasum": ""
},
"require": {
@@ -564,12 +574,13 @@
"php": ">=5.3.2"
},
"require-dev": {
"doctrine/cache": "1.*"
"doctrine/cache": "1.*",
"phpunit/phpunit": "4.*"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
"dev-master": "1.3.x-dev"
}
},
"autoload": {
@@ -585,7 +596,8 @@
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com",
"homepage": "http://www.jwage.com/"
"homepage": "http://www.jwage.com/",
"role": "Creator"
},
{
"name": "Guilherme Blanco",
@@ -603,7 +615,7 @@
{
"name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com",
"homepage": "http://jmsyst.com",
"homepage": "https://github.com/schmittjoh",
"role": "Developer of wrapped JMSSerializerBundle"
}
],
@@ -614,7 +626,7 @@
"docblock",
"parser"
],
"time": "2013-06-16 21:33:03"
"time": "2014-07-06 15:52:21"
},
{
"name": "doctrine/cache",
@@ -678,7 +690,7 @@
{
"name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com",
"homepage": "http://jmsyst.com",
"homepage": "https://github.com/schmittjoh",
"role": "Developer of wrapped JMSSerializerBundle"
}
],
@@ -745,7 +757,7 @@
{
"name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com",
"homepage": "http://jmsyst.com",
"homepage": "https://github.com/schmittjoh",
"role": "Developer of wrapped JMSSerializerBundle"
}
],
@@ -760,16 +772,16 @@
},
{
"name": "doctrine/common",
"version": "v2.4.1",
"version": "v2.4.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/common.git",
"reference": "ceb18cf9b0230f3ea208b6238130fd415abda0a7"
"reference": "5db6ab40e4c531f14dad4ca96a394dfce5d4255b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/common/zipball/ceb18cf9b0230f3ea208b6238130fd415abda0a7",
"reference": "ceb18cf9b0230f3ea208b6238130fd415abda0a7",
"url": "https://api.github.com/repos/doctrine/common/zipball/5db6ab40e4c531f14dad4ca96a394dfce5d4255b",
"reference": "5db6ab40e4c531f14dad4ca96a394dfce5d4255b",
"shasum": ""
},
"require": {
@@ -780,6 +792,9 @@
"doctrine/lexer": "1.*",
"php": ">=5.3.2"
},
"require-dev": {
"phpunit/phpunit": "~3.7"
},
"type": "library",
"extra": {
"branch-alias": {
@@ -799,7 +814,8 @@
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com",
"homepage": "http://www.jwage.com/"
"homepage": "http://www.jwage.com/",
"role": "Creator"
},
{
"name": "Guilherme Blanco",
@@ -817,7 +833,7 @@
{
"name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com",
"homepage": "http://jmsyst.com",
"homepage": "https://github.com/schmittjoh",
"role": "Developer of wrapped JMSSerializerBundle"
}
],
@@ -830,7 +846,7 @@
"persistence",
"spl"
],
"time": "2013-09-07 10:20:34"
"time": "2014-05-21 19:28:51"
},
{
"name": "doctrine/dbal",
@@ -929,7 +945,8 @@
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com",
"homepage": "http://www.jwage.com/"
"homepage": "http://www.jwage.com/",
"role": "Creator"
},
{
"name": "Guilherme Blanco",
@@ -947,7 +964,7 @@
{
"name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com",
"homepage": "http://jmsyst.com",
"homepage": "https://github.com/schmittjoh",
"role": "Developer of wrapped JMSSerializerBundle"
}
],
@@ -1001,7 +1018,7 @@
{
"name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com",
"homepage": "http://jmsyst.com",
"homepage": "https://github.com/schmittjoh",
"role": "Developer of wrapped JMSSerializerBundle"
}
],
@@ -1019,12 +1036,12 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/migrations.git",
"reference": "0742fc7167a4deedaabc8639849a3e71082999f1"
"reference": "4256449c5e2603a6b6ee5a78c7c4521d4d4430b8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/migrations/zipball/0742fc7167a4deedaabc8639849a3e71082999f1",
"reference": "0742fc7167a4deedaabc8639849a3e71082999f1",
"url": "https://api.github.com/repos/doctrine/migrations/zipball/4256449c5e2603a6b6ee5a78c7c4521d4d4430b8",
"reference": "4256449c5e2603a6b6ee5a78c7c4521d4d4430b8",
"shasum": ""
},
"require": {
@@ -1055,7 +1072,7 @@
],
"authors": [
{
"name": "Jonathan H. Wage",
"name": "Jonathan Wage",
"email": "jonwage@gmail.com",
"homepage": "http://www.jwage.com/",
"role": "Creator"
@@ -1071,7 +1088,7 @@
"database",
"migrations"
],
"time": "2014-01-20 11:29:43"
"time": "2014-07-09 07:58:02"
},
{
"name": "doctrine/orm",
@@ -1211,13 +1228,13 @@
"version": "v1.0.0",
"source": {
"type": "git",
"url": "https://github.com/igorw/evenement",
"reference": "v1.0.0"
"url": "https://github.com/igorw/evenement.git",
"reference": "fa966683e7df3e5dd5929d984a44abfbd6bafe8d"
},
"dist": {
"type": "zip",
"url": "https://github.com/igorw/evenement/zipball/v1.0.0",
"reference": "v1.0.0",
"url": "https://api.github.com/repos/igorw/evenement/zipball/fa966683e7df3e5dd5929d984a44abfbd6bafe8d",
"reference": "fa966683e7df3e5dd5929d984a44abfbd6bafe8d",
"shasum": ""
},
"require": {
@@ -1244,7 +1261,7 @@
"keywords": [
"event-dispatcher"
],
"time": "2012-05-30 08:01:08"
"time": "2012-05-30 15:01:08"
},
{
"name": "facebook/php-sdk",
@@ -1297,12 +1314,12 @@
"version": "v2.3.9",
"source": {
"type": "git",
"url": "https://github.com/l3pp4rd/DoctrineExtensions.git",
"url": "https://github.com/Atlantic18/DoctrineExtensions.git",
"reference": "35adcaae1a3f50d0d5b73aa50ed8fd28ee35ce54"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/l3pp4rd/DoctrineExtensions/zipball/35adcaae1a3f50d0d5b73aa50ed8fd28ee35ce54",
"url": "https://api.github.com/repos/Atlantic18/DoctrineExtensions/zipball/35adcaae1a3f50d0d5b73aa50ed8fd28ee35ce54",
"reference": "35adcaae1a3f50d0d5b73aa50ed8fd28ee35ce54",
"shasum": ""
},
@@ -1370,7 +1387,7 @@
"tree",
"uploadable"
],
"time": "2013-08-18 07:18:44"
"time": "2014-01-12 16:34:06"
},
{
"name": "goodby/csv",
@@ -1722,16 +1739,16 @@
},
{
"name": "jms/metadata",
"version": "1.5.0",
"version": "1.5.1",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/metadata.git",
"reference": "88ffa28bc987e4c26229fc84a2e541b6ed4e1459"
"reference": "22b72455559a25777cfd28c4ffda81ff7639f353"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/schmittjoh/metadata/zipball/88ffa28bc987e4c26229fc84a2e541b6ed4e1459",
"reference": "88ffa28bc987e4c26229fc84a2e541b6ed4e1459",
"url": "https://api.github.com/repos/schmittjoh/metadata/zipball/22b72455559a25777cfd28c4ffda81ff7639f353",
"reference": "22b72455559a25777cfd28c4ffda81ff7639f353",
"shasum": ""
},
"require": {
@@ -1757,9 +1774,9 @@
],
"authors": [
{
"name": "Johannes M. Schmitt",
"name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com",
"homepage": "http://jmsyst.com",
"homepage": "https://github.com/schmittjoh",
"role": "Developer of wrapped JMSSerializerBundle"
}
],
@@ -1770,7 +1787,7 @@
"xml",
"yaml"
],
"time": "2013-11-05 23:02:36"
"time": "2014-07-12 07:13:19"
},
{
"name": "jms/parser-lib",
@@ -1860,9 +1877,9 @@
],
"authors": [
{
"name": "Johannes M. Schmitt",
"name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com",
"homepage": "http://jmsyst.com",
"homepage": "https://github.com/schmittjoh",
"role": "Developer of wrapped JMSSerializerBundle"
}
],
@@ -1931,9 +1948,9 @@
],
"authors": [
{
"name": "Johannes M. Schmitt",
"name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com",
"homepage": "http://jmsyst.com",
"homepage": "https://github.com/schmittjoh",
"role": "Developer of wrapped JMSSerializerBundle"
}
],
@@ -2007,7 +2024,7 @@
},
{
"name": "Robert Schönthal",
"email": "seroscho@googlemail.com",
"email": "robert.schoenthal@gmail.com",
"homepage": "http://digitalkaoz.net"
}
],
@@ -2099,12 +2116,12 @@
"version": "dev-fix-video-dim",
"source": {
"type": "git",
"url": "https://github.com/nlegoff/Mediavorus.git",
"url": "https://github.com/nlegoff/MediaVorus.git",
"reference": "f11cd2453d5acbc6ac52421dc4edd760433b1515"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nlegoff/Mediavorus/zipball/f11cd2453d5acbc6ac52421dc4edd760433b1515",
"url": "https://api.github.com/repos/nlegoff/MediaVorus/zipball/f11cd2453d5acbc6ac52421dc4edd760433b1515",
"reference": "f11cd2453d5acbc6ac52421dc4edd760433b1515",
"shasum": ""
},
@@ -2254,7 +2271,7 @@
],
"authors": [
{
"name": "Stephen Clay",
"name": "Steve Clay",
"email": "steve@mrclay.org",
"homepage": "http://www.mrclay.org/",
"role": "Developer"
@@ -2440,21 +2457,21 @@
"source": {
"type": "git",
"url": "https://github.com/romainneutron/Imagine-Silex-Service-Provider.git",
"reference": "0.1.2"
"reference": "a8a7862ae90419f2b23746cd8436c2310e4eb084"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/romainneutron/Imagine-Silex-Service-Provider/zipball/0.1.2",
"reference": "0.1.2",
"url": "https://api.github.com/repos/romainneutron/Imagine-Silex-Service-Provider/zipball/a8a7862ae90419f2b23746cd8436c2310e4eb084",
"reference": "a8a7862ae90419f2b23746cd8436c2310e4eb084",
"shasum": ""
},
"require": {
"imagine/imagine": "*",
"php": ">=5.3.3",
"silex/silex": ">=1.0,<2.0"
"silex/silex": "~1.0"
},
"require-dev": {
"symfony/browser-kit": ">=2.0,<3.0"
"symfony/browser-kit": "~2.0"
},
"type": "library",
"autoload": {
@@ -2860,9 +2877,9 @@
],
"authors": [
{
"name": "Johannes M. Schmitt",
"name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com",
"homepage": "http://jmsyst.com",
"homepage": "https://github.com/schmittjoh",
"role": "Developer of wrapped JMSSerializerBundle"
}
],
@@ -3011,9 +3028,9 @@
],
"authors": [
{
"name": "Johannes M. Schmitt",
"name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com",
"homepage": "http://jmsyst.com",
"homepage": "https://github.com/schmittjoh",
"role": "Developer of wrapped JMSSerializerBundle"
}
],
@@ -3114,17 +3131,17 @@
},
{
"name": "react/event-loop",
"version": "v0.3.3",
"version": "v0.3.4",
"target-dir": "React/EventLoop",
"source": {
"type": "git",
"url": "https://github.com/reactphp/event-loop.git",
"reference": "49208fa3a15c9eae4adf8351ee9caa4064fe550d"
"reference": "235cddfa999a392e7d63dc9bef2e042492608d9f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/reactphp/event-loop/zipball/49208fa3a15c9eae4adf8351ee9caa4064fe550d",
"reference": "49208fa3a15c9eae4adf8351ee9caa4064fe550d",
"url": "https://api.github.com/repos/reactphp/event-loop/zipball/235cddfa999a392e7d63dc9bef2e042492608d9f",
"reference": "235cddfa999a392e7d63dc9bef2e042492608d9f",
"shasum": ""
},
"require": {
@@ -3153,21 +3170,21 @@
"keywords": [
"event-loop"
],
"time": "2013-07-08 22:38:22"
"time": "2013-07-21 02:23:09"
},
{
"name": "react/socket",
"version": "v0.3.2",
"version": "v0.3.4",
"target-dir": "React/Socket",
"source": {
"type": "git",
"url": "https://github.com/reactphp/socket.git",
"reference": "9cc32838d25a934ce950d2662cce2ff1b9e9f8aa"
"reference": "19bc0c4309243717396022ffb2e59be1cc784327"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/reactphp/socket/zipball/9cc32838d25a934ce950d2662cce2ff1b9e9f8aa",
"reference": "9cc32838d25a934ce950d2662cce2ff1b9e9f8aa",
"url": "https://api.github.com/repos/reactphp/socket/zipball/19bc0c4309243717396022ffb2e59be1cc784327",
"reference": "19bc0c4309243717396022ffb2e59be1cc784327",
"shasum": ""
},
"require": {
@@ -3195,21 +3212,21 @@
"keywords": [
"Socket"
],
"time": "2013-04-26 20:23:10"
"time": "2014-02-17 22:32:00"
},
{
"name": "react/stream",
"version": "v0.3.3",
"version": "v0.3.4",
"target-dir": "React/Stream",
"source": {
"type": "git",
"url": "https://github.com/reactphp/stream.git",
"reference": "b72900ab00513b591fb101faecad38f9c8eab8da"
"reference": "feef56628afe3fa861f0da5f92c909e029efceac"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/reactphp/stream/zipball/b72900ab00513b591fb101faecad38f9c8eab8da",
"reference": "b72900ab00513b591fb101faecad38f9c8eab8da",
"url": "https://api.github.com/repos/reactphp/stream/zipball/feef56628afe3fa861f0da5f92c909e029efceac",
"reference": "feef56628afe3fa861f0da5f92c909e029efceac",
"shasum": ""
},
"require": {
@@ -3240,7 +3257,7 @@
"pipe",
"stream"
],
"time": "2013-07-09 00:44:12"
"time": "2014-02-16 19:48:52"
},
{
"name": "react/zmq",
@@ -3340,7 +3357,8 @@
},
{
"name": "Ben Ramsey",
"homepage": "http://benramsey.com"
"homepage": "http://benramsey.com",
"role": "Developer"
}
],
"description": "A PHP 5.3+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
@@ -3358,12 +3376,12 @@
"source": {
"type": "git",
"url": "https://github.com/silexphp/Silex.git",
"reference": "33da608a5c87bef962f2b1d19470b5a0bbb6aa83"
"reference": "67639888035a3e586bfdb652c15c38f22e870d89"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/silexphp/Silex/zipball/33da608a5c87bef962f2b1d19470b5a0bbb6aa83",
"reference": "33da608a5c87bef962f2b1d19470b5a0bbb6aa83",
"url": "https://api.github.com/repos/silexphp/Silex/zipball/67639888035a3e586bfdb652c15c38f22e870d89",
"reference": "67639888035a3e586bfdb652c15c38f22e870d89",
"shasum": ""
},
"require": {
@@ -3436,7 +3454,7 @@
"keywords": [
"microframework"
],
"time": "2014-02-05 06:19:00"
"time": "2014-04-15 20:52:04"
},
{
"name": "silex/web-profiler",
@@ -3445,12 +3463,12 @@
"source": {
"type": "git",
"url": "https://github.com/silexphp/Silex-WebProfiler.git",
"reference": "2d153ae71c8445cb90535fbdd82b92e39d9f67e0"
"reference": "8c62046a16a7b8f229aff9147f842956a1e48a14"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/silexphp/Silex-WebProfiler/zipball/2d153ae71c8445cb90535fbdd82b92e39d9f67e0",
"reference": "2d153ae71c8445cb90535fbdd82b92e39d9f67e0",
"url": "https://api.github.com/repos/silexphp/Silex-WebProfiler/zipball/8c62046a16a7b8f229aff9147f842956a1e48a14",
"reference": "8c62046a16a7b8f229aff9147f842956a1e48a14",
"shasum": ""
},
"require": {
@@ -3476,12 +3494,14 @@
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
"email": "fabien@symfony.com",
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
}
],
"description": "A WebProfiler for Silex",
"homepage": "http://silex.sensiolabs.org/",
"time": "2014-01-30 06:11:24"
"time": "2014-06-04 21:14:30"
},
{
"name": "sorien/silex-dbal-profiler",
@@ -3567,7 +3587,7 @@
},
{
"name": "Phraseanet Team",
"email": "support@alchemy.fr",
"email": "info@alchemy.fr",
"homepage": "http://www.phraseanet.com/"
}
],
@@ -3614,7 +3634,9 @@
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
"email": "fabien@symfony.com",
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
},
{
"name": "Chris Corbyn"
@@ -3630,20 +3652,21 @@
},
{
"name": "symfony/icu",
"version": "v1.2.0",
"version": "v1.2.2",
"target-dir": "Symfony/Component/Icu",
"source": {
"type": "git",
"url": "https://github.com/symfony/Icu.git",
"reference": "7299cd3d8d6602103d1ebff5d0a9917b7bc6de72"
"reference": "d4d85d6055b87f394d941b45ddd3a9173e1e3d2a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Icu/zipball/7299cd3d8d6602103d1ebff5d0a9917b7bc6de72",
"reference": "7299cd3d8d6602103d1ebff5d0a9917b7bc6de72",
"url": "https://api.github.com/repos/symfony/Icu/zipball/d4d85d6055b87f394d941b45ddd3a9173e1e3d2a",
"reference": "d4d85d6055b87f394d941b45ddd3a9173e1e3d2a",
"shasum": ""
},
"require": {
"ext-intl": "*",
"lib-icu": ">=4.4",
"php": ">=5.3.3",
"symfony/intl": "~2.3"
@@ -3674,7 +3697,7 @@
"icu",
"intl"
],
"time": "2013-06-03 18:32:58"
"time": "2014-07-25 09:58:17"
},
{
"name": "symfony/symfony",
@@ -3868,7 +3891,9 @@
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
"email": "fabien@symfony.com",
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
}
],
"description": "Common additional features for Twig that do not directly belong in core",
@@ -3987,7 +4012,7 @@
},
{
"name": "willdurand/negotiation",
"version": "dev-master",
"version": "1.3.3",
"source": {
"type": "git",
"url": "https://github.com/willdurand/Negotiation.git",
@@ -4084,12 +4109,12 @@
"source": {
"type": "git",
"url": "https://github.com/Behat/Behat.git",
"reference": "a12154aae8a09248637fbca8ef3b2ef2ac71f2aa"
"reference": "e585f8a90b366a9a719b2998b9f8ab643735eda7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Behat/Behat/zipball/a12154aae8a09248637fbca8ef3b2ef2ac71f2aa",
"reference": "a12154aae8a09248637fbca8ef3b2ef2ac71f2aa",
"url": "https://api.github.com/repos/Behat/Behat/zipball/e585f8a90b366a9a719b2998b9f8ab643735eda7",
"reference": "e585f8a90b366a9a719b2998b9f8ab643735eda7",
"shasum": ""
},
"require": {
@@ -4138,7 +4163,7 @@
"Behat",
"Symfony2"
],
"time": "2014-02-12 17:03:46"
"time": "2014-04-26 16:56:17"
},
{
"name": "behat/gherkin",
@@ -4146,12 +4171,12 @@
"source": {
"type": "git",
"url": "https://github.com/Behat/Gherkin.git",
"reference": "2b33963da5525400573560c173ab5c9c057e1852"
"reference": "c32e15d92e1a2ce399a1a1c5be7afd965176e86c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Behat/Gherkin/zipball/2b33963da5525400573560c173ab5c9c057e1852",
"reference": "2b33963da5525400573560c173ab5c9c057e1852",
"url": "https://api.github.com/repos/Behat/Gherkin/zipball/c32e15d92e1a2ce399a1a1c5be7afd965176e86c",
"reference": "c32e15d92e1a2ce399a1a1c5be7afd965176e86c",
"shasum": ""
},
"require": {
@@ -4199,7 +4224,7 @@
"Symfony2",
"parser"
],
"time": "2013-10-15 11:22:17"
"time": "2014-06-06 00:48:18"
},
{
"name": "behat/mink",
@@ -4207,17 +4232,17 @@
"source": {
"type": "git",
"url": "https://github.com/Behat/Mink.git",
"reference": "v1.5.0"
"reference": "0769e6d9726c140a54dbf827a438c0f9912749fe"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Behat/Mink/zipball/v1.5.0",
"reference": "v1.5.0",
"url": "https://api.github.com/repos/Behat/Mink/zipball/0769e6d9726c140a54dbf827a438c0f9912749fe",
"reference": "0769e6d9726c140a54dbf827a438c0f9912749fe",
"shasum": ""
},
"require": {
"php": ">=5.3.1",
"symfony/css-selector": ">=2.0,<3.0"
"symfony/css-selector": "~2.0"
},
"suggest": {
"behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)",
@@ -4422,17 +4447,17 @@
"source": {
"type": "git",
"url": "https://github.com/Behat/MinkSelenium2Driver.git",
"reference": "v1.1.1"
"reference": "bcf1b537de37db6db0822d9e7bd97e600fd7a476"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Behat/MinkSelenium2Driver/zipball/v1.1.1",
"reference": "v1.1.1",
"url": "https://api.github.com/repos/Behat/MinkSelenium2Driver/zipball/bcf1b537de37db6db0822d9e7bd97e600fd7a476",
"reference": "bcf1b537de37db6db0822d9e7bd97e600fd7a476",
"shasum": ""
},
"require": {
"behat/mink": ">=1.5,<1.6",
"instaclick/php-webdriver": ">=1.0.12.0,<1.1",
"behat/mink": "~1.5.0",
"instaclick/php-webdriver": "~1.0.12",
"php": ">=5.3.1"
},
"type": "mink-driver",
@@ -4577,7 +4602,7 @@
{
"name": "Anthon Pang",
"email": "apang@softwaredevelopment.ca",
"role": "Fork Maintainer"
"role": "developer"
}
],
"description": "PHP WebDriver for Selenium 2",
@@ -4592,16 +4617,16 @@
},
{
"name": "phpunit/php-code-coverage",
"version": "1.2.15",
"version": "1.2.17",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "6ba4ed2895d538a039d5d5866edc4ec0424c7852"
"reference": "6ef2bf3a1c47eca07ea95f0d8a902a6340390b34"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6ba4ed2895d538a039d5d5866edc4ec0424c7852",
"reference": "6ba4ed2895d538a039d5d5866edc4ec0424c7852",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6ef2bf3a1c47eca07ea95f0d8a902a6340390b34",
"reference": "6ef2bf3a1c47eca07ea95f0d8a902a6340390b34",
"shasum": ""
},
"require": {
@@ -4649,7 +4674,7 @@
"testing",
"xunit"
],
"time": "2014-02-03 07:44:47"
"time": "2014-03-28 10:53:45"
},
{
"name": "phpunit/php-file-iterator",
@@ -4786,16 +4811,16 @@
},
{
"name": "phpunit/php-token-stream",
"version": "1.2.1",
"version": "1.2.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
"reference": "5220af2a7929aa35cf663d97c89ad3d50cf5fa3e"
"reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/5220af2a7929aa35cf663d97c89ad3d50cf5fa3e",
"reference": "5220af2a7929aa35cf663d97c89ad3d50cf5fa3e",
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/ad4e1e23ae01b483c16f600ff1bebec184588e32",
"reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32",
"shasum": ""
},
"require": {
@@ -4832,7 +4857,7 @@
"keywords": [
"tokenizer"
],
"time": "2013-09-13 04:58:23"
"time": "2014-03-03 05:10:30"
},
{
"name": "phpunit/phpunit",
@@ -4996,7 +5021,5 @@
"platform": {
"php": ">=5.4"
},
"platform-dev": [
]
"platform-dev": []
}