hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix latest merge

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-06-24 14:56:09 +02:00
parent 4b033353bf
commit 5e2dd0216a
14 changed files with 203 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "0100d89768804d2f4b902a41e75b64d1",
"hash": "ec7feed650089f0abf08f741e3ee9768",
"packages": [
{
"name": "alchemy-fr/tcpdf-clone",
@@ -1075,16 +1075,16 @@
},
{
"name": "doctrine/orm",
"version": "2.4.x-dev",
"version": "v2.4.3",
"source": {
"type": "git",
"url": "https://github.com/doctrine/doctrine2.git",
"reference": "84f8ef5ca46f02f3001af47ba25fc917c776a247"
"reference": "8a13376d42b5ea467727ffe730aa0e14ca3c5e29"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/doctrine2/zipball/84f8ef5ca46f02f3001af47ba25fc917c776a247",
"reference": "84f8ef5ca46f02f3001af47ba25fc917c776a247",
"url": "https://api.github.com/repos/doctrine/doctrine2/zipball/8a13376d42b5ea467727ffe730aa0e14ca3c5e29",
"reference": "8a13376d42b5ea467727ffe730aa0e14ca3c5e29",
"shasum": ""
},
"require": {
@@ -1147,7 +1147,7 @@
"database",
"orm"
],
"time": "2014-06-10 11:49:09"
"time": "2014-06-10 11:49:08"
},
{
"name": "elasticsearch/elasticsearch",
@@ -4784,39 +4784,38 @@
},
{
"name": "phpunit/phpunit",
"version": "3.7.31",
"version": "3.7.37",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "d24e9877331039582497052cc3c4d9f465b88210"
"reference": "ae6cefd7cc84586a5ef27e04bae11ee940ec63dc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d24e9877331039582497052cc3c4d9f465b88210",
"reference": "d24e9877331039582497052cc3c4d9f465b88210",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ae6cefd7cc84586a5ef27e04bae11ee940ec63dc",
"reference": "ae6cefd7cc84586a5ef27e04bae11ee940ec63dc",
"shasum": ""
},
"require": {
"ext-ctype": "*",
"ext-dom": "*",
"ext-json": "*",
"ext-pcre": "*",
"ext-reflection": "*",
"ext-spl": "*",
"php": ">=5.3.3",
"phpunit/php-code-coverage": "~1.2.1",
"phpunit/php-file-iterator": ">=1.3.1",
"phpunit/php-text-template": ">=1.1.1",
"phpunit/php-timer": ">=1.0.4",
"phpunit/phpunit-mock-objects": "~1.2.0",
"phpunit/php-code-coverage": "~1.2",
"phpunit/php-file-iterator": "~1.3",
"phpunit/php-text-template": "~1.1",
"phpunit/php-timer": "~1.0",
"phpunit/phpunit-mock-objects": "~1.2",
"symfony/yaml": "~2.0"
},
"require-dev": {
"pear-pear/pear": "1.9.4"
"pear-pear.php.net/pear": "1.9.4"
},
"suggest": {
"ext-json": "*",
"ext-simplexml": "*",
"ext-tokenizer": "*",
"phpunit/php-invoker": ">=1.1.0,<1.2.0"
"phpunit/php-invoker": "~1.1"
},
"bin": [
"composer/bin/phpunit"
@@ -4854,7 +4853,7 @@
"testing",
"xunit"
],
"time": "2014-02-03 07:46:27"
"time": "2014-04-30 12:24:19"
},
{
"name": "phpunit/phpunit-mock-objects",
@@ -4920,7 +4919,7 @@
"package": "php-ffmpeg/php-ffmpeg"
}
],
"minimum-stability": "dev",
"minimum-stability": "stable",
"stability-flags": {
"alchemy/task-manager": 20,
"alchemy/zippy": 20,