Merge remote-tracking branch 'upstream/master' into 20150306-elastic-indexer

Conflicts:
	bin/console
	bower.json
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Border/Manager.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Core/PhraseaEvents.php
	lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
	lib/classes/caption/field.php
	lib/classes/record/Interface.php
	templates/web/prod/index.html.twig
	www/skins/prod/000000/prodcolor.css
This commit is contained in:
Nicolas Le Goff
2015-03-06 14:35:29 +01:00
committed by Mathieu Darse
1078 changed files with 7964 additions and 16363 deletions

419
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": "73cfb65537610dfd0edc9cf6485c4ebb",
"hash": "f5e0457425e2c151f1a6b27e0bad160d",
"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"
},
{
@@ -272,16 +282,16 @@
},
{
"name": "alchemy/phlickr",
"version": "0.2.8",
"version": "0.2.9",
"source": {
"type": "git",
"url": "https://github.com/alchemy-fr/Phlickr.git",
"reference": "26b7764fd45c15062cb1b21c9389aff919e8c2bd"
"reference": "f9af93e27e9235db43e61ce2f9588d8ce9859b68"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/alchemy-fr/Phlickr/zipball/26b7764fd45c15062cb1b21c9389aff919e8c2bd",
"reference": "26b7764fd45c15062cb1b21c9389aff919e8c2bd",
"url": "https://api.github.com/repos/alchemy-fr/Phlickr/zipball/f9af93e27e9235db43e61ce2f9588d8ce9859b68",
"reference": "f9af93e27e9235db43e61ce2f9588d8ce9859b68",
"shasum": ""
},
"type": "library",
@@ -291,7 +301,7 @@
}
},
"notification-url": "https://packagist.org/downloads/",
"time": "2014-07-07 14:01:51"
"time": "2014-12-15 14:27:57"
},
{
"name": "alchemy/task-manager",
@@ -469,16 +479,16 @@
},
{
"name": "dailymotion/sdk",
"version": "1.6",
"version": "1.6.2",
"source": {
"type": "git",
"url": "https://github.com/dailymotion/dailymotion-sdk-php.git",
"reference": "670ce8c536077a17ac31096d4c61372c35caa713"
"reference": "96b291b755e97906f54cafa60be4990ece624e83"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/dailymotion/dailymotion-sdk-php/zipball/670ce8c536077a17ac31096d4c61372c35caa713",
"reference": "670ce8c536077a17ac31096d4c61372c35caa713",
"url": "https://api.github.com/repos/dailymotion/dailymotion-sdk-php/zipball/96b291b755e97906f54cafa60be4990ece624e83",
"reference": "96b291b755e97906f54cafa60be4990ece624e83",
"shasum": ""
},
"type": "library",
@@ -498,7 +508,7 @@
"dailymotion",
"sdk"
],
"time": "2014-09-11 15:14:39"
"time": "2014-11-03 16:53:45"
},
{
"name": "data-uri/data-uri",
@@ -545,6 +555,68 @@
],
"time": "2014-08-22 15:01:57"
},
{
"name": "dflydev/doctrine-orm-service-provider",
"version": "v1.0.6",
"source": {
"type": "git",
"url": "https://github.com/dflydev/dflydev-doctrine-orm-service-provider.git",
"reference": "a55b92ac5111b8cb2aca19623f10301bab373718"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/dflydev/dflydev-doctrine-orm-service-provider/zipball/a55b92ac5111b8cb2aca19623f10301bab373718",
"reference": "a55b92ac5111b8cb2aca19623f10301bab373718",
"shasum": ""
},
"require": {
"doctrine/orm": "~2.3",
"php": ">=5.3.3",
"pimple/pimple": "1.*@dev"
},
"require-dev": {
"cilex/cilex": "1.*@dev",
"cilex/console-service-provider": "@dev",
"silex/silex": "1.*@dev"
},
"suggest": {
"dflydev/psr0-resource-locator-service-provider": "1.0.*@dev"
},
"type": "library",
"autoload": {
"psr-0": {
"Dflydev\\Cilex\\Provider\\DoctrineOrm": "src",
"Dflydev\\Pimple\\Provider\\DoctrineOrm": "src",
"Dflydev\\Silex\\Provider\\DoctrineOrm": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Dragonfly Development Inc.",
"email": "info@dflydev.com",
"homepage": "http://dflydev.com"
},
{
"name": "Beau Simensen",
"email": "beau@dflydev.com",
"homepage": "http://beausimensen.com"
}
],
"description": "Doctrine ORM Service Provider",
"homepage": "http://dflydev.com/projects/doctrine-orm-service-provider/",
"keywords": [
"cilex",
"doctrine",
"orm",
"pimple",
"silex"
],
"time": "2014-07-24 19:35:45"
},
{
"name": "doctrine/annotations",
"version": "v1.2.1",
@@ -737,7 +809,7 @@
{
"name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com",
"homepage": "http://jmsyst.com",
"homepage": "https://github.com/schmittjoh",
"role": "Developer of wrapped JMSSerializerBundle"
}
],
@@ -830,16 +902,16 @@
},
{
"name": "doctrine/dbal",
"version": "v2.4.2",
"version": "v2.4.4",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
"reference": "fec965d330c958e175c39e61c3f6751955af32d0"
"reference": "a370e5b95e509a7809d11f3d280acfc9310d464b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/fec965d330c958e175c39e61c3f6751955af32d0",
"reference": "fec965d330c958e175c39e61c3f6751955af32d0",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/a370e5b95e509a7809d11f3d280acfc9310d464b",
"reference": "a370e5b95e509a7809d11f3d280acfc9310d464b",
"shasum": ""
},
"require": {
@@ -851,7 +923,7 @@
"symfony/console": "~2.0"
},
"suggest": {
"symfony/console": "Allows use of the command line interface"
"symfony/console": "For helpful console commands such as SQL execution and import of files."
},
"type": "library",
"autoload": {
@@ -864,17 +936,6 @@
"MIT"
],
"authors": [
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com",
"homepage": "http://www.jwage.com/",
"role": "Creator"
},
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com",
"homepage": "http://www.instaclick.com"
},
{
"name": "Roman Borschel",
"email": "roman@code-factory.org"
@@ -882,6 +943,14 @@
{
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de"
},
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com"
},
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com"
}
],
"description": "Database Abstraction Layer",
@@ -892,7 +961,7 @@
"persistence",
"queryobject"
],
"time": "2014-01-01 16:43:57"
"time": "2015-01-12 21:57:01"
},
{
"name": "doctrine/inflector",
@@ -925,7 +994,8 @@
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com",
"homepage": "http://www.jwage.com/"
"homepage": "http://www.jwage.com/",
"role": "Creator"
},
{
"name": "Guilherme Blanco",
@@ -943,7 +1013,7 @@
{
"name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com",
"homepage": "http://jmsyst.com",
"homepage": "https://github.com/schmittjoh",
"role": "Developer of wrapped JMSSerializerBundle"
}
],
@@ -997,7 +1067,7 @@
{
"name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com",
"homepage": "http://jmsyst.com",
"homepage": "https://github.com/schmittjoh",
"role": "Developer of wrapped JMSSerializerBundle"
}
],
@@ -1015,12 +1085,12 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/migrations.git",
"reference": "4256449c5e2603a6b6ee5a78c7c4521d4d4430b8"
"reference": "f4fe9d9cc21a711d89d91d29c4a4e7945289cdd0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/migrations/zipball/4256449c5e2603a6b6ee5a78c7c4521d4d4430b8",
"reference": "4256449c5e2603a6b6ee5a78c7c4521d4d4430b8",
"url": "https://api.github.com/repos/doctrine/migrations/zipball/f4fe9d9cc21a711d89d91d29c4a4e7945289cdd0",
"reference": "f4fe9d9cc21a711d89d91d29c4a4e7945289cdd0",
"shasum": ""
},
"require": {
@@ -1067,20 +1137,20 @@
"database",
"migrations"
],
"time": "2014-07-09 07:58:02"
"time": "2014-10-30 14:49:25"
},
{
"name": "doctrine/orm",
"version": "v2.4.6",
"version": "v2.4.7",
"source": {
"type": "git",
"url": "https://github.com/doctrine/doctrine2.git",
"reference": "bebacf79d8d4dae9168f0f9bc6811e6c2cb6a4d9"
"reference": "2bc4ff3cab2ae297bcd05f2e619d42e6a7ca9e68"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/doctrine2/zipball/bebacf79d8d4dae9168f0f9bc6811e6c2cb6a4d9",
"reference": "bebacf79d8d4dae9168f0f9bc6811e6c2cb6a4d9",
"url": "https://api.github.com/repos/doctrine/doctrine2/zipball/2bc4ff3cab2ae297bcd05f2e619d42e6a7ca9e68",
"reference": "2bc4ff3cab2ae297bcd05f2e619d42e6a7ca9e68",
"shasum": ""
},
"require": {
@@ -1140,7 +1210,7 @@
"database",
"orm"
],
"time": "2014-10-06 13:22:50"
"time": "2014-12-16 13:45:01"
},
{
"name": "elasticsearch/elasticsearch",
@@ -1204,13 +1274,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": {
@@ -1237,7 +1307,7 @@
"keywords": [
"event-dispatcher"
],
"time": "2012-05-30 08:01:08"
"time": "2012-05-30 15:01:08"
},
{
"name": "facebook/php-sdk",
@@ -1290,12 +1360,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": ""
},
@@ -1363,20 +1433,20 @@
"tree",
"uploadable"
],
"time": "2013-08-18 07:18:44"
"time": "2014-01-12 16:34:06"
},
{
"name": "goodby/csv",
"version": "1.1.0",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/goodby/csv.git",
"reference": "da672802985d196cae767da29b11618a676496b0"
"reference": "b289ca3e3f6ad3c76b7d8c3bef3effd0232ca13a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/goodby/csv/zipball/da672802985d196cae767da29b11618a676496b0",
"reference": "da672802985d196cae767da29b11618a676496b0",
"url": "https://api.github.com/repos/goodby/csv/zipball/b289ca3e3f6ad3c76b7d8c3bef3effd0232ca13a",
"reference": "b289ca3e3f6ad3c76b7d8c3bef3effd0232ca13a",
"shasum": ""
},
"require": {
@@ -1420,7 +1490,7 @@
"export",
"import"
],
"time": "2014-01-12 16:34:06"
"time": "2015-02-02 12:29:23"
},
{
"name": "guzzle/guzzle",
@@ -1988,16 +2058,16 @@
},
{
"name": "imagine/imagine",
"version": "dev-0.6.1-flatten-layer",
"version": "dev-alchemy-0.6.2",
"source": {
"type": "git",
"url": "https://github.com/alchemy-fr/Imagine.git",
"reference": "e75d9495677b40e0868836e3510667178b2bd90a"
"reference": "6605d13e3b24f335fe80099c193546671158c041"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/alchemy-fr/Imagine/zipball/e75d9495677b40e0868836e3510667178b2bd90a",
"reference": "e75d9495677b40e0868836e3510667178b2bd90a",
"url": "https://api.github.com/repos/alchemy-fr/Imagine/zipball/6605d13e3b24f335fe80099c193546671158c041",
"reference": "6605d13e3b24f335fe80099c193546671158c041",
"shasum": ""
},
"require": {
@@ -2041,9 +2111,9 @@
"image processing"
],
"support": {
"source": "https://github.com/alchemy-fr/Imagine/tree/0.6.1-flatten-layer"
"source": "https://github.com/alchemy-fr/Imagine/tree/alchemy-0.6.2"
},
"time": "2014-10-08 16:23:33"
"time": "2015-01-13 18:12:26"
},
{
"name": "ircmaxell/random-lib",
@@ -2350,9 +2420,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"
}
],
@@ -2438,16 +2508,16 @@
},
{
"name": "media-alchemyst/media-alchemyst",
"version": "0.4.6",
"version": "0.4.8",
"source": {
"type": "git",
"url": "https://github.com/alchemy-fr/Media-Alchemyst.git",
"reference": "0145a40c01b67268a29ee3863e1ce7be4ad60ac8"
"reference": "cf1fdacbaf0d54440fa7b61c750234d0befde0c8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/0145a40c01b67268a29ee3863e1ce7be4ad60ac8",
"reference": "0145a40c01b67268a29ee3863e1ce7be4ad60ac8",
"url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/cf1fdacbaf0d54440fa7b61c750234d0befde0c8",
"reference": "cf1fdacbaf0d54440fa7b61c750234d0befde0c8",
"shasum": ""
},
"require": {
@@ -2507,7 +2577,7 @@
"video",
"video processing"
],
"time": "2014-09-10 09:44:33"
"time": "2015-02-03 16:25:38"
},
{
"name": "mediavorus/mediavorus",
@@ -2567,16 +2637,16 @@
},
{
"name": "monolog/monolog",
"version": "1.11.0",
"version": "1.13.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
"reference": "ec3961874c43840e96da3a8a1ed20d8c73d7e5aa"
"reference": "c41c218e239b50446fd883acb1ecfd4b770caeae"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/ec3961874c43840e96da3a8a1ed20d8c73d7e5aa",
"reference": "ec3961874c43840e96da3a8a1ed20d8c73d7e5aa",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/c41c218e239b50446fd883acb1ecfd4b770caeae",
"reference": "c41c218e239b50446fd883acb1ecfd4b770caeae",
"shasum": ""
},
"require": {
@@ -2590,9 +2660,10 @@
"aws/aws-sdk-php": "~2.4, >2.4.8",
"doctrine/couchdb": "~1.0@dev",
"graylog2/gelf-php": "~1.0",
"phpunit/phpunit": "~3.7.0",
"phpunit/phpunit": "~4.0",
"raven/raven": "~0.5",
"ruflin/elastica": "0.90.*",
"swiftmailer/swiftmailer": "~5.3",
"videlalvaro/php-amqplib": "~2.4"
},
"suggest": {
@@ -2609,7 +2680,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.11.x-dev"
"dev-master": "1.13.x-dev"
}
},
"autoload": {
@@ -2635,7 +2706,7 @@
"logging",
"psr-3"
],
"time": "2014-09-30 13:30:58"
"time": "2015-03-05 01:12:12"
},
{
"name": "mrclay/minify",
@@ -2667,7 +2738,7 @@
],
"authors": [
{
"name": "Stephen Clay",
"name": "Steve Clay",
"email": "steve@mrclay.org",
"homepage": "http://www.mrclay.org/",
"role": "Developer"
@@ -2853,21 +2924,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": {
@@ -3381,7 +3452,7 @@
"metadata"
],
"support": {
"source": "https://github.com/alchemy-fr/PHPExiftool/tree/0.4.1-mwg-metadata-copy"
"source": "https://github.com/alchemy-fr/PHPExiftool/tree/dev"
},
"time": "2014-10-08 16:09:02"
},
@@ -3419,9 +3490,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"
}
],
@@ -3697,16 +3768,16 @@
},
{
"name": "rhumsaa/uuid",
"version": "2.7.3",
"version": "2.8.0",
"source": {
"type": "git",
"url": "https://github.com/ramsey/uuid.git",
"reference": "b976326ca5977d7333f34e3c828ae7c22a49a65a"
"reference": "cca98c652cac412c9c2f109c69e5532f313435fc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ramsey/uuid/zipball/b976326ca5977d7333f34e3c828ae7c22a49a65a",
"reference": "b976326ca5977d7333f34e3c828ae7c22a49a65a",
"url": "https://api.github.com/repos/ramsey/uuid/zipball/cca98c652cac412c9c2f109c69e5532f313435fc",
"reference": "cca98c652cac412c9c2f109c69e5532f313435fc",
"shasum": ""
},
"require": {
@@ -3730,7 +3801,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.7.x-dev"
"dev-master": "2.8.x-dev"
}
},
"autoload": {
@@ -3759,7 +3830,81 @@
"identifier",
"uuid"
],
"time": "2014-08-27 22:39:41"
"time": "2014-11-09 18:42:56"
},
{
"name": "roave/security-advisories",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git",
"reference": "a1d7d327e9b8017b5a848ccb6a1433f25975f65b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/a1d7d327e9b8017b5a848ccb6a1433f25975f65b",
"reference": "a1d7d327e9b8017b5a848ccb6a1433f25975f65b",
"shasum": ""
},
"conflict": {
"contao/core": ">=2.11.0,<2.11.16|>=3.0.0,<3.1.0|>=3.1.0,<3.2.0|>=3.2.0,<3.2.7|>=2.11.0,<2.11.17|>=3.0.0,<3.1.0|>=3.1.0,<3.2.0|>=3.2.0,<3.2.9|>=2.11.0,<3.0.0|>=3.0.0,<3.1.0|>=3.1.0,<3.2.0|>=3.2.0,<3.2.19|>=3.3.0,<3.4.0|>=3.4.0,<3.4.4",
"doctrine/dbal": ">=2.0.0,<2.0.8|>=2.1.0,<2.1.2",
"doctrine/doctrine-module": "<=0.7.1|<=0.7.1",
"doctrine/orm": ">=2.0.0,<2.0.3",
"dompdf/dompdf": ">=0.6.0,<0.6.1",
"friendsofsymfony/rest-bundle": ">=1.2.0,<1.2.2",
"friendsofsymfony/user-bundle": ">=1.2.0,<1.2.1|>=1.2.0,<1.2.4|>=1.2.0,<1.3.0|>=1.3.0,<1.3.5|>=1.2.0,<1.2.5|>=1.3.0,<1.3.3",
"illuminate/auth": ">=4.0.0,<4.0.99|>=4.1.0,<4.1.26",
"illuminate/database": ">=4.0.0,<4.0.99|>=4.1.0,<4.1.29",
"laravel/framework": ">=4.0.0,<4.0.99|>=4.1.0,<4.1.26|>=4.0.0,<4.0.99|>=4.1.0,<4.1.29",
"monolog/monolog": ">=1.8.0,<1.12.0",
"sabre/dav": ">=1.6.0,<1.6.9|>=1.7.0,<1.7.7|>=1.8.0,<1.8.5",
"socalnick/scn-social-auth": "<1.15.2",
"swiftmailer/swiftmailer": ">=4.0.0,<4.99.99|>=5.0.0,<5.2.1",
"symfony/dependency-injection": ">=2.0.0,<2.0.17",
"symfony/framework-bundle": ">=2.0.0,<2.1.0|>=2.1.0,<2.2.0|>=2.2.0,<2.3.0|>=2.3.0,<2.3.18|>=2.4.0,<2.4.8|>=2.5.0,<2.5.2",
"symfony/http-foundation": ">=2.0.0,<2.0.19|>=2.1.0,<2.1.4|>=2.0.0,<2.0.19|>=2.0.0,<2.0.24|>=2.1.0,<2.1.12|>=2.2.0,<2.2.5|>=2.3.0,<2.3.3|>=2.0.0,<2.1.0|>=2.1.0,<2.2.0|>=2.2.0,<2.3.0|>=2.3.0,<2.3.19|>=2.4.0,<2.4.9|>=2.5.0,<2.5.4|>=2.0.0,<2.1.0|>=2.1.0,<2.2.0|>=2.2.0,<2.3.0|>=2.3.0,<2.3.19|>=2.4.0,<2.4.9|>=2.5.0,<2.5.4",
"symfony/http-kernel": ">=2.0.0,<2.1.0|>=2.1.0,<2.2.0|>=2.2.0,<2.3.0|>=2.3.0,<2.3.19|>=2.4.0,<2.4.9|>=2.5.0,<2.5.4",
"symfony/routing": ">=2.0.0,<2.0.17|>=2.0.0,<2.0.19",
"symfony/security": ">=2.0.0,<2.0.19|>=2.0.0,<2.0.25|>=2.1.0,<2.1.13|>=2.2.0,<2.2.9|>=2.3.0,<2.3.6",
"symfony/serializer": ">=2.0.0,<2.0.11",
"symfony/symfony": ">=2.0.0,<2.0.6|>=2.0.0,<2.0.11|>=2.0.0,<2.0.17|>=2.0.0,<2.0.19|>=2.1.0,<2.1.4|>=2.0.0,<2.0.19|>=2.0.0,<2.0.20|>=2.1.0,<2.1.5|>=2.0.0,<2.0.22|>=2.0.0,<2.0.22|>=2.1.0,<2.1.7|>=2.0.0,<2.0.24|>=2.1.0,<2.1.12|>=2.2.0,<2.2.5|>=2.3.0,<2.3.3|>=2.0.0,<2.0.24|>=2.1.0,<2.1.12|>=2.2.0,<2.2.5|>=2.3.0,<2.3.3|>=2.0.0,<2.0.25|>=2.1.0,<2.1.13|>=2.2.0,<2.2.9|>=2.3.0,<2.3.6|>=2.0.0,<2.1.0|>=2.1.0,<2.2.0|>=2.2.0,<2.3.0|>=2.3.0,<2.3.19|>=2.4.0,<2.4.9|>=2.5.0,<2.5.4|>=2.0.0,<2.1.0|>=2.1.0,<2.2.0|>=2.2.0,<2.3.0|>=2.3.0,<2.3.19|>=2.4.0,<2.4.9|>=2.5.0,<2.5.4|>=2.0.0,<2.1.0|>=2.1.0,<2.2.0|>=2.2.0,<2.3.0|>=2.3.0,<2.3.19|>=2.4.0,<2.4.9|>=2.5.0,<2.5.4|>=2.0.0,<2.1.0|>=2.1.0,<2.2.0|>=2.2.0,<2.3.0|>=2.3.0,<2.3.19|>=2.4.0,<2.4.9|>=2.5.0,<2.5.4|>=2.0.0,<2.1.0|>=2.1.0,<2.2.0|>=2.2.0,<2.3.0|>=2.3.0,<2.3.19|>=2.4.0,<2.4.9|>=2.5.0,<2.5.4",
"symfony/translation": ">=2.0.0,<2.0.17",
"symfony/validator": ">=2.0.0,<2.0.17|>=2.0.0,<2.0.24|>=2.1.0,<2.1.12|>=2.2.0,<2.2.5|>=2.3.0,<2.3.3",
"symfony/web-profiler-bundle": ">=2.0.0,<2.1.0|>=2.1.0,<2.2.0|>=2.2.0,<2.3.0|>=2.3.0,<2.3.19|>=2.4.0,<2.4.9|>=2.5.0,<2.5.4",
"symfony/yaml": ">=2.0.0,<2.0.22|>=2.0.0,<2.0.22|>=2.1.0,<2.1.7",
"thelia/backoffice-default-template": ">=2.1.0,<2.1.2",
"thelia/thelia": ">=2.1.0,<2.1.2",
"twig/twig": ">=1.0.0,<1.12.3",
"willdurand/js-translation-bundle": "<2.1.1",
"yiisoft/yii": ">=1.1.14,<1.1.15",
"zendframework/zend-db": ">=2.0.0,<2.0.99|>=2.1.0,<2.1.99|>=2.2.0,<2.2.10|>=2.3.0,<2.3.5",
"zendframework/zend-form": ">=2.0.0,<2.2.7|>=2.3.0,<2.3.1",
"zendframework/zend-json": ">=2.1.0,<2.1.6|>=2.2.0,<2.2.6",
"zendframework/zend-navigation": ">=2.0.0,<2.2.7|>=2.3.0,<2.3.1",
"zendframework/zend-session": ">=2.0.0,<2.0.99|>=2.1.0,<2.1.99|>=2.2.0,<2.2.9|>=2.3.0,<2.3.4",
"zendframework/zend-view": ">=2.0.0,<2.2.7|>=2.3.0,<2.3.1",
"zendframework/zend-xmlrpc": ">=2.1.0,<2.1.6|>=2.2.0,<2.2.6",
"zendframework/zendframework": ">=2.0.0,<2.0.1|>=2.0.0,<2.0.5|>=2.0.0,<2.0.8|>=2.1.0,<2.1.4|>=2.0.0,<2.0.8|>=2.1.0,<2.1.4|>=2.0.0,<2.0.8|>=2.1.0,<2.1.4|>=2.2.0,<2.2.5|>=2.1.0,<2.1.6|>=2.2.0,<2.2.6|>=2.0.0,<2.2.7|>=2.3.0,<2.3.1|>=2.0.0,<2.0.99|>=2.1.0,<2.1.99|>=2.2.0,<2.2.8|>=2.3.0,<2.3.3|>=2.0.0,<2.0.99|>=2.1.0,<2.1.99|>=2.2.0,<2.2.8|>=2.3.0,<2.3.3|>=2.0.0,<2.0.99|>=2.1.0,<2.1.99|>=2.2.0,<2.2.9|>=2.3.0,<2.3.4|>=2.0.0,<2.0.99|>=2.1.0,<2.1.99|>=2.2.0,<2.2.10|>=2.3.0,<2.3.5",
"zendframework/zendframework1": ">=1.7.0,<1.7.5|>=1.7.0,<1.7.6|>=1.9.0,<1.9.7|>=1.7.0,<1.7.9|>=1.8.0,<1.8.5|>=1.9.0,<1.9.7|>=1.7.0,<1.7.9|>=1.8.0,<1.8.5|>=1.9.0,<1.9.7|>=1.8.0,<1.8.5|>=1.9.0,<1.9.7|>=1.7.0,<1.7.9|>=1.8.0,<1.8.5|>=1.9.0,<1.9.7|>=1.7.0,<1.7.9|>=1.8.0,<1.8.5|>=1.9.0,<1.9.7|>=1.9.0,<1.9.8|>=1.10.0,<1.10.3|>=1.0.0,<1.11.4|>=1.10.0,<1.10.9|>=1.11.0,<1.11.6|>=1.0.0,<1.11.13|>=1.0.0,<1.11.13|>=1.11.0,<1.11.15|>=1.12.0,<1.12.1|>=1.12.0,<1.12.4|>=1.12.0,<1.12.4|>=1.12.0,<1.12.7|>=1.12.0,<1.12.9|>=1.12.0,<1.12.9",
"zendframework/zendopenid": ">=2.0.0,<2.0.2",
"zf-commons/zfc-user": "<1.2.2",
"zfr/zfr-oauth2-server-module": "<0.1.2"
},
"type": "metapackage",
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Marco Pivetta",
"email": "ocramius@gmail.com",
"role": "maintainer"
}
],
"description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it",
"time": "2015-03-02 13:02:36"
},
{
"name": "silex/silex",
@@ -3978,7 +4123,7 @@
},
{
"name": "Phraseanet Team",
"email": "support@alchemy.fr",
"email": "info@alchemy.fr",
"homepage": "http://www.phraseanet.com/"
}
],
@@ -3992,25 +4137,28 @@
},
{
"name": "swiftmailer/swiftmailer",
"version": "v4.3.1",
"version": "v5.3.1",
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
"reference": "ae540bed1079c07aa12e9e62d9d8d4fc49bbdff2"
"reference": "c5f963e7f9d6f6438fda4f22d5cc2db296ec621a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/ae540bed1079c07aa12e9e62d9d8d4fc49bbdff2",
"reference": "ae540bed1079c07aa12e9e62d9d8d4fc49bbdff2",
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/c5f963e7f9d6f6438fda4f22d5cc2db296ec621a",
"reference": "c5f963e7f9d6f6438fda4f22d5cc2db296ec621a",
"shasum": ""
},
"require": {
"php": ">=5.2.4"
"php": ">=5.3.3"
},
"require-dev": {
"mockery/mockery": "~0.9.1"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.3-dev"
"dev-master": "5.3-dev"
}
},
"autoload": {
@@ -4020,15 +4168,15 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"LGPL"
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
"name": "Chris Corbyn"
},
{
"name": "Chris Corbyn"
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
}
],
"description": "Swiftmailer, free feature-rich PHP mailer",
@@ -4037,7 +4185,7 @@
"mail",
"mailer"
],
"time": "2013-04-11 10:22:09"
"time": "2014-12-05 14:17:14"
},
{
"name": "symfony/icu",
@@ -4245,25 +4393,31 @@
},
{
"name": "twig/extensions",
"version": "v1.1.0",
"version": "v1.2.0",
"source": {
"type": "git",
"url": "https://github.com/fabpot/Twig-extensions.git",
"reference": "c0ab818595338dd5569369bfce2552d02cec5d50"
"url": "https://github.com/twigphp/Twig-extensions.git",
"reference": "8cf4b9fe04077bd54fc73f4fde83347040c3b8cd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fabpot/Twig-extensions/zipball/c0ab818595338dd5569369bfce2552d02cec5d50",
"reference": "c0ab818595338dd5569369bfce2552d02cec5d50",
"url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/8cf4b9fe04077bd54fc73f4fde83347040c3b8cd",
"reference": "8cf4b9fe04077bd54fc73f4fde83347040c3b8cd",
"shasum": ""
},
"require": {
"twig/twig": "~1.12"
},
"require-dev": {
"symfony/translation": "~2.3"
},
"suggest": {
"symfony/translation": "Allow the time_diff output to be translated"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1.x-dev"
"dev-master": "1.2.x-dev"
}
},
"autoload": {
@@ -4278,30 +4432,28 @@
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com",
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
"email": "fabien@symfony.com"
}
],
"description": "Common additional features for Twig that do not directly belong in core",
"homepage": "https://github.com/fabpot/Twig-extensions",
"homepage": "http://twig.sensiolabs.org/doc/extensions/index.html",
"keywords": [
"i18n",
"text"
],
"time": "2014-07-05 10:01:35"
"time": "2014-10-30 14:30:03"
},
{
"name": "twig/twig",
"version": "v1.16.0",
"version": "v1.16.2",
"source": {
"type": "git",
"url": "https://github.com/fabpot/Twig.git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "8ce37115802e257a984a82d38254884085060024"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fabpot/Twig/zipball/8ce37115802e257a984a82d38254884085060024",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/8ce37115802e257a984a82d38254884085060024",
"reference": "8ce37115802e257a984a82d38254884085060024",
"shasum": ""
},
@@ -4346,7 +4498,7 @@
"keywords": [
"templating"
],
"time": "2014-07-05 12:19:05"
"time": "2014-10-17 12:53:44"
},
{
"name": "vierbergenlars/php-semver",
@@ -5176,16 +5328,16 @@
},
{
"name": "instaclick/php-webdriver",
"version": "1.4.0",
"version": "1.4.1",
"source": {
"type": "git",
"url": "https://github.com/instaclick/php-webdriver.git",
"reference": "3cf130283b054b50119f887e11b9b5a648d785a9"
"reference": "a57b2bcd9467e217134a2248b261b8b3a90ccea0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/3cf130283b054b50119f887e11b9b5a648d785a9",
"reference": "3cf130283b054b50119f887e11b9b5a648d785a9",
"url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/a57b2bcd9467e217134a2248b261b8b3a90ccea0",
"reference": "a57b2bcd9467e217134a2248b261b8b3a90ccea0",
"shasum": ""
},
"require": {
@@ -5219,7 +5371,7 @@
{
"name": "Anthon Pang",
"email": "apang@softwaredevelopment.ca",
"role": "developer"
"role": "Fork Maintainer"
}
],
"description": "PHP WebDriver for Selenium 2",
@@ -5230,7 +5382,7 @@
"webdriver",
"webtest"
],
"time": "2014-05-08 04:19:19"
"time": "2014-05-12 21:03:05"
},
{
"name": "phpunit/php-code-coverage",
@@ -5478,16 +5630,16 @@
},
{
"name": "phpunit/phpunit",
"version": "3.7.37",
"version": "3.7.38",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "ae6cefd7cc84586a5ef27e04bae11ee940ec63dc"
"reference": "38709dc22d519a3d1be46849868aa2ddf822bcf6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ae6cefd7cc84586a5ef27e04bae11ee940ec63dc",
"reference": "ae6cefd7cc84586a5ef27e04bae11ee940ec63dc",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/38709dc22d519a3d1be46849868aa2ddf822bcf6",
"reference": "38709dc22d519a3d1be46849868aa2ddf822bcf6",
"shasum": ""
},
"require": {
@@ -5547,7 +5699,7 @@
"testing",
"xunit"
],
"time": "2014-04-30 12:24:19"
"time": "2014-10-17 09:04:17"
},
{
"name": "phpunit/phpunit-mock-objects",
@@ -5601,9 +5753,9 @@
],
"aliases": [
{
"alias": "0.6.1",
"alias_normalized": "0.6.1.0",
"version": "dev-0.6.1-flatten-layer",
"alias": "0.6.2",
"alias_normalized": "0.6.2.0",
"version": "dev-alchemy-0.6.2",
"package": "imagine/imagine"
},
{
@@ -5617,16 +5769,19 @@
"stability-flags": {
"alchemy/task-manager": 20,
"alchemy/zippy": 20,
"goodby/csv": 20,
"imagine/imagine": 20,
"neutron/process-manager": 20,
"phpexiftool/phpexiftool": 20,
"silex/silex": 20,
"silex/web-profiler": 20,
"doctrine/migrations": 20,
"roave/security-advisories": 20,
"behat/behat": 20,
"behat/gherkin": 20
},
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
"php": ">=5.4"
},