diff --git a/composer.json b/composer.json index 73dab4b9fb..39d11dbc2a 100644 --- a/composer.json +++ b/composer.json @@ -1,67 +1,65 @@ { - "name": "phraseanet/phraseanet", - "description": "Phraseanet", + "name" : "phraseanet/phraseanet", + "description" : "Phraseanet", + "license" : "GPL-3.0", "config": { - "bin-dir": "bin/" + "bin-dir" : "bin/" }, "require": { - "php": ">=5.3.3", - "alchemy/oauth2php": "master", - "alchemy/phlickr": "master", - "dailymotion/sdk": "*", - "data-uri/data-uri": "dev-master", - "doctrine/orm": "2.2.2", - "gedmo/doctrine-extensions": "2.2.*", - "grom/silex-service-provider": "dev-master", - "mediavorus/mediavorus": "0.2.x-dev", - "media-alchemyst/media-alchemyst": "0.2.x-dev", - "monolog/monolog": "1.0.*", - "neutron/silex-badfaith-provider": "dev-master", + "php" : ">=5.3.3", + "alchemy/oauth2php" : "dev-master", + "alchemy/phlickr" : "dev-master", + "badfaith/badfaith" : "dev-master", + "dailymotion/sdk" : "dev-master", + "data-uri/data-uri" : "dev-master", + "doctrine/orm" : "~2.3.0", + "gedmo/doctrine-extensions" : "~2.3.0", + "grom/silex-service-provider" : "dev-master", + "knplabs/knp-snappy" : "dev-master", + "mediavorus/mediavorus" : "~0.3.0", + "media-alchemyst/media-alchemyst" : "~0.2.0", + "monolog/monolog" : "~1.3.0", + "neutron/silex-badfaith-provider" : "dev-master", "neutron/silex-filesystem-provider": "dev-master", - "neutron/sphinxsearch-api": ">=2.0.6", - "php-xpdf/php-xpdf": "dev-master", - "phpexiftool/phpexiftool": "dev-master", - "silex/silex": "1.0.*", - "swiftmailer/swiftmailer": "4.1.*", - "symfony/symfony": ">=2.1", - "tecnick.com/tcpdf": "dev-master", - "twig/twig": ">=1.9", - "twig/extensions": "master", - "zend/gdata": ">1.11" + "neutron/sphinxsearch-api" : "~2.0.6", + "php-xpdf/php-xpdf" : "~0.1.1", + "phpexiftool/phpexiftool" : "~0.1.0", + "phpexiftool/exiftool" : "dev-master", + "silex/silex" : "1.0.x-dev@dev", + "swiftmailer/swiftmailer" : "~4.3.0", + "symfony/symfony" : "~2.1.7", + "tecnick.com/tcpdf" : "dev-master", + "twig/twig" : "~1.12", + "twig/extensions" : "1.0.x-dev@dev", + "zend/gdata" : "~1.12.1" }, - "minimum-stability": "dev", "require-dev": { - "doctrine/data-fixtures": "dev-master", - "fabpot/php-cs-fixer": "dev-master" + "doctrine/data-fixtures" : "dev-master" }, "repositories": [ { - "type": "git", - "url": "https://github.com/winmillwill/BadFaith" + "type" : "git", + "url" : "https://github.com/winmillwill/BadFaith" }, { - "type": "git", - "url": "https://github.com/alchemy-fr/oauth2-php" + "type" : "git", + "url" : "https://github.com/alchemy-fr/oauth2-php" }, { - "type": "git", - "url": "https://github.com/alchemy-fr/Phlickr" - }, - { - "type": "git", - "url": "https://github.com/alchemy-fr/PHPMailer_v5.1" + "type" : "git", + "url" : "https://github.com/alchemy-fr/Phlickr" } ], "autoload": { "psr-0": { - "": "lib/classes", - "Alchemy": "lib", - "Doctrine": "lib", - "Entities": "lib/Doctrine", - "Types": "lib/Doctrine", - "Repositories": "lib/Doctrine", - "Proxies": "lib/Doctrine", - "PhraseaFixture": "lib/conf.d" + "" : "lib/classes", + "Alchemy" : "lib", + "Doctrine" : "lib", + "Entities" : "lib/Doctrine", + "Types" : "lib/Doctrine", + "Repositories" : "lib/Doctrine", + "Proxies" : "lib/Doctrine", + "PhraseaFixture" : "lib/conf.d" } }, "include-path": ["vendor/zend/gdata/library"] diff --git a/composer.lock b/composer.lock index d59dd13917..18be77f604 100644 --- a/composer.lock +++ b/composer.lock @@ -1,5 +1,5 @@ { - "hash": "a43275d20ef27e4ce02871d21e4b02be", + "hash": "c16362614b85420352973bbc06e3e451", "packages": [ { "name": "BadFaith/BadFaith", @@ -32,12 +32,6 @@ "url": "https://github.com/alchemy-fr/Phlickr", "reference": "89993abd6a02b42e0b765114c34c26c4056762fa" }, - "dist": { - "type": "zip", - "url": "https://github.com/alchemy-fr/Phlickr/zipball/89993abd6a02b42e0b765114c34c26c4056762fa", - "reference": "89993abd6a02b42e0b765114c34c26c4056762fa", - "shasum": "" - }, "time": "2012-04-13 17:43:31", "type": "library", "autoload": { @@ -48,29 +42,28 @@ }, { "name": "alchemy/ghostscript", - "version": "dev-master", + "version": "0.2.0", "source": { "type": "git", "url": "git://github.com/alchemy-fr/Ghostscript-PHP.git", - "reference": "731a477710d8a9d093574b5ee1876fabfb02b5ee" + "reference": "0.2.0" }, "dist": { "type": "zip", - "url": "https://github.com/alchemy-fr/Ghostscript-PHP/archive/731a477710d8a9d093574b5ee1876fabfb02b5ee.zip", - "reference": "731a477710d8a9d093574b5ee1876fabfb02b5ee", + "url": "https://api.github.com/repos/alchemy-fr/Ghostscript-PHP/zipball/0.2.0", + "reference": "0.2.0", "shasum": "" }, "require": { "php": ">=5.3.3", - "symfony/process": ">=2.0,<=2.2", - "monolog/monolog": "1.*" + "symfony/process": ">=2.0,<3.0", + "monolog/monolog": ">=1.0,<2.0" }, "require-dev": { - "fabpot/php-cs-fixer": "master", "sami/sami": "dev-master", - "silex/silex": "dev-master" + "silex/silex": "1.0.x-dev@dev" }, - "time": "2012-11-27 10:34:30", + "time": "2013-02-01 08:51:59", "type": "library", "extra": { "branch-alias": { @@ -82,6 +75,7 @@ "Ghostscript": "src" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -111,12 +105,6 @@ "url": "https://github.com/alchemy-fr/oauth2-php", "reference": "5f949209461e8f4c31e8476155188923aafa2ae5" }, - "dist": { - "type": "zip", - "url": "https://github.com/alchemy-fr/oauth2-php/zipball/5f949209461e8f4c31e8476155188923aafa2ae5", - "reference": "5f949209461e8f4c31e8476155188923aafa2ae5", - "shasum": "" - }, "time": "2012-03-30 15:47:07", "type": "library", "autoload": { @@ -135,7 +123,7 @@ }, "dist": { "type": "zip", - "url": "https://github.com/dailymotion/dailymotion-sdk-php/archive/a11e98742adf877497017fece69f603af578f329.zip", + "url": "https://api.github.com/repos/dailymotion/dailymotion-sdk-php/zipball/a11e98742adf877497017fece69f603af578f329", "reference": "a11e98742adf877497017fece69f603af578f329", "shasum": "" }, @@ -146,6 +134,7 @@ "Dailymotion.php" ] }, + "notification-url": "https://packagist.org/downloads/", "description": "Dailymotion PHP SDK", "homepage": "http://dailymotion.com", "keywords": [ @@ -164,7 +153,7 @@ }, "dist": { "type": "zip", - "url": "https://github.com/alchemy-fr/PHP-dataURI/zipball/c29d1cca49d6ba38d532025db5bf0cd06031da06", + "url": "https://github.com/alchemy-fr/PHP-dataURI/archive/c29d1cca49d6ba38d532025db5bf0cd06031da06.zip", "reference": "c29d1cca49d6ba38d532025db5bf0cd06031da06", "shasum": "" }, @@ -183,6 +172,7 @@ "DataURI": "src" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -258,30 +248,36 @@ }, { "name": "doctrine/common", - "version": "2.2.3", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/doctrine/common", - "reference": "2.2.3" + "reference": "2.3.0" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/common/zipball/2.2.3", - "reference": "2.2.3", + "url": "https://github.com/doctrine/common/zipball/2.3.0", + "reference": "2.3.0", "shasum": "" }, "require": { "php": ">=5.3.2" }, - "time": "2012-08-29 01:04:14", + "time": "2012-09-19 22:55:18", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, "autoload": { "psr-0": { "Doctrine\\Common": "lib/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL" + "MIT" ], "authors": [ { @@ -303,9 +299,9 @@ "email": "kontakt@beberlei.de" }, { - "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" } ], @@ -321,31 +317,37 @@ }, { "name": "doctrine/dbal", - "version": "2.2.2", + "version": "2.3.2", "source": { "type": "git", "url": "https://github.com/doctrine/dbal", - "reference": "2.2.2" + "reference": "2.3.2" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/dbal/zipball/2.2.2", - "reference": "2.2.2", + "url": "https://github.com/doctrine/dbal/archive/2.3.2.zip", + "reference": "2.3.2", "shasum": "" }, "require": { "php": ">=5.3.2", - "doctrine/common": ">=2.2.0,<=2.2.99" + "doctrine/common": "2.3.*" }, - "time": "2012-04-13 00:56:12", + "time": "2013-01-07 20:03:43", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, "autoload": { "psr-0": { "Doctrine\\DBAL": "lib/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL" + "MIT" ], "authors": [ { @@ -378,33 +380,46 @@ }, { "name": "doctrine/orm", - "version": "2.2.2", + "version": "2.3.2", "source": { "type": "git", "url": "git://github.com/doctrine/doctrine2.git", - "reference": "2.2.2" + "reference": "2.3.2" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/doctrine2/zipball/2.2.2", - "reference": "2.2.2", + "url": "https://github.com/doctrine/doctrine2/archive/2.3.2.zip", + "reference": "2.3.2", "shasum": "" }, "require": { "php": ">=5.3.2", "ext-pdo": "*", - "doctrine/common": ">=2.2.0,<2.2.99", - "doctrine/dbal": ">=2.2.1,<2.2.99" + "doctrine/dbal": "2.3.*", + "symfony/console": "2.*" }, - "time": "2012-04-13 01:02:34", + "suggest": { + "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" + }, + "time": "2013-01-07 20:05:04", + "bin": [ + "bin/doctrine", + "bin/doctrine.php" + ], "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, "autoload": { "psr-0": { "Doctrine\\ORM": "lib/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL" + "MIT" ], "authors": [ { @@ -435,33 +450,47 @@ }, { "name": "gedmo/doctrine-extensions", - "version": "2.2.x-dev", + "version": "v2.3.3", "source": { "type": "git", "url": "git://github.com/l3pp4rd/DoctrineExtensions.git", - "reference": "7a4bd0a7ef51058fcb5d5609988c1f530e200d1b" + "reference": "v2.3.3" }, "dist": { "type": "zip", - "url": "https://github.com/l3pp4rd/DoctrineExtensions/archive/7a4bd0a7ef51058fcb5d5609988c1f530e200d1b.zip", - "reference": "7a4bd0a7ef51058fcb5d5609988c1f530e200d1b", + "url": "https://github.com/l3pp4rd/DoctrineExtensions/archive/v2.3.3.zip", + "reference": "v2.3.3", "shasum": "" }, "require": { "php": ">=5.3.2", - "doctrine/common": ">=2.1" + "doctrine/common": ">=2.2,<2.5-dev" + }, + "require-dev": { + "doctrine/mongodb": ">=1.0.0-BETA1", + "doctrine/mongodb-odm": ">=1.0.0-BETA6", + "doctrine/orm": ">=2.2", + "doctrine/dbal": ">=2.2" }, "suggest": { - "doctrine/orm": ">=2.1", - "doctrine/mongodb-odm": "*" + "doctrine/mongodb": ">=1.0.0-BETA1", + "doctrine/mongodb-odm": ">=1.0.0-BETA6", + "doctrine/orm": ">=2.2", + "doctrine/dbal": ">=2.2" }, - "time": "2012-11-15 16:25:16", + "time": "2012-12-18 21:02:17", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, "autoload": { "psr-0": { "Gedmo": "lib/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -513,6 +542,7 @@ "Grom\\Silex": "src" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -534,7 +564,7 @@ }, { "name": "imagine/Imagine", - "version": "dev-master", + "version": "v0.4.1", "source": { "type": "git", "url": "https://github.com/avalanche123/Imagine", @@ -559,6 +589,7 @@ "Imagine": "lib/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -605,6 +636,7 @@ "Knp\\Snappy": "src/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -630,42 +662,40 @@ }, { "name": "media-alchemyst/media-alchemyst", - "version": "dev-master", + "version": "0.2.2", "source": { "type": "git", "url": "https://github.com/alchemy-fr/Media-Alchemyst", - "reference": "44c4dd6dcb0fa9145677ccaa41f4d8bf4aa20692" + "reference": "0.2.2" }, "dist": { "type": "zip", - "url": "https://github.com/alchemy-fr/Media-Alchemyst/archive/44c4dd6dcb0fa9145677ccaa41f4d8bf4aa20692.zip", - "reference": "44c4dd6dcb0fa9145677ccaa41f4d8bf4aa20692", + "url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/0.2.2", + "reference": "0.2.2", "shasum": "" }, "require": { - "swftools/swftools": "dev-master", - "php-unoconv/php-unoconv": "dev-master", - "php-mp4box/php-mp4box": "dev-master", "php": ">=5.3.3", - "pimple/pimple": "1.*", - "monolog/monolog": "1.*", - "alchemy/ghostscript": "0.2.*", - "imagine/imagine": ">=0.4", - "php-ffmpeg/php-ffmpeg": "0.2.*", - "mediavorus/mediavorus": ">=0.2, <=0.3", - "symfony/console": ">=2.0,<=2.2.x-dev" + "pimple/pimple": ">=1.0,<2.0", + "mediavorus/mediavorus": ">=0.2,<1.0", + "phpexiftool/exiftool": "dev-master@dev", + "swftools/swftools": ">=0.1,<0.2", + "alchemy/ghostscript": ">=0.2,<0.3", + "php-ffmpeg/php-ffmpeg": ">=0.2,<0.3", + "php-unoconv/php-unoconv": ">=0.1,<0.2", + "php-mp4box/php-mp4box": ">=0.1,<0.2", + "imagine/imagine": ">=0.4,<1.0", + "monolog/monolog": ">=1.0,<2.0", + "symfony/console": ">=2.0,<3.0" }, "require-dev": { + "phpexiftool/phpexiftool": ">=0.1,<0.2", "grom/silex-service-provider": "dev-master", - "phpexiftool/phpexiftool": "dev-master" + "silex/silex": "1.0.x-dev@dev", + "knplabs/knp-snappy": "dev-master" }, - "time": "2013-01-14 12:54:21", + "time": "2013-02-01 09:01:09", "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.2.x-dev" - } - }, "autoload": { "psr-0": { "MediaAlchemyst": "src" @@ -699,42 +729,43 @@ }, { "name": "mediavorus/mediavorus", - "version": "dev-master", + "version": "0.3.1", "source": { "type": "git", "url": "https://github.com/romainneutron/MediaVorus", - "reference": "7d59243fe92d9cd6be744908019128e7fd9ae046" + "reference": "0.3.1" }, "dist": { "type": "zip", - "url": "https://github.com/romainneutron/MediaVorus/archive/7d59243fe92d9cd6be744908019128e7fd9ae046.zip", - "reference": "7d59243fe92d9cd6be744908019128e7fd9ae046", + "url": "https://api.github.com/repos/romainneutron/MediaVorus/zipball/0.3.1", + "reference": "0.3.1", "shasum": "" }, "require": { - "phpexiftool/phpexiftool": "dev-master", - "php-ffmpeg/php-ffmpeg": "dev-master", "php": ">=5.3.0", - "symfony/http-foundation": ">2.0,<=2.2", - "symfony/console": ">2.0,<=2.2", - "monolog/monolog": "1.*", - "doctrine/collections": ">=1.0,<2.0" + "doctrine/collections": ">=1.0,<2.0", + "symfony/http-foundation": ">=2.0,<3.0", + "symfony/console": ">=2.0,<3.0", + "phpexiftool/phpexiftool": ">=0.1,<0.2", + "phpexiftool/exiftool": "dev-master@dev", + "php-ffmpeg/php-ffmpeg": ">=0.2,<1.0", + "monolog/monolog": ">=1.0,<2.0" }, "require-dev": { - "fabpot/php-cs-fixer": "*", - "silex/silex": "1.0.*-dev", - "symfony/yaml": "*", - "jms/serializer": "1.0.x-dev" + "fabpot/php-cs-fixer": "dev-master@dev", + "silex/silex": "1.0.x-dev@dev", + "symfony/yaml": ">=2.0,<3.0", + "jms/serializer": "1.0.x-dev@dev" }, "suggest": { "jms/serializer": "To serialize Medias", "symfony/yaml": "To serialize Medias in Yaml format" }, - "time": "2013-01-14 13:16:28", + "time": "2013-01-31 10:28:20", "type": "library", "extra": { "branch-alias": { - "dev-master": "0.2.x-dev" + "dev-master": "0.3.x-dev" } }, "autoload": { @@ -760,28 +791,47 @@ }, { "name": "monolog/monolog", - "version": "1.0.2", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog", - "reference": "1.0.2" + "reference": "1.3.1" }, "dist": { "type": "zip", - "url": "https://github.com/Seldaek/monolog/zipball/1.0.2", - "reference": "1.0.2", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1.3.1", + "reference": "1.3.1", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=5.3.0", + "psr/log": ">=1.0,<2.0" }, - "time": "2011-10-24 02:39:02", + "require-dev": { + "mlehner/gelf-php": "1.0.*", + "raven/raven": "0.3.*", + "doctrine/couchdb": "dev-master" + }, + "suggest": { + "mlehner/gelf-php": "Allow sending log messages to a GrayLog2 server", + "raven/raven": "Allow sending log messages to a Sentry server", + "doctrine/couchdb": "Allow sending log messages to a CouchDB server", + "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", + "ext-mongo": "Allow sending log messages to a MongoDB server" + }, + "time": "2013-01-11 10:23:20", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, "autoload": { "psr-0": { "Monolog": "src/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -793,11 +843,12 @@ "role": "Developer" } ], - "description": "Logging for PHP 5.3", + "description": "Sends your logs to files, sockets, inboxes, databases and various web services", "homepage": "http://github.com/Seldaek/monolog", "keywords": [ "log", - "logging" + "logging", + "psr-3" ] }, { @@ -872,6 +923,7 @@ "Neutron": "src" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -891,21 +943,22 @@ }, { "name": "neutron/sphinxsearch-api", - "version": "dev-master", + "version": "2.0.6", "source": { "type": "git", "url": "https://github.com/romainneutron/Sphinx-Search-API-PHP-Client", - "reference": "3e30e2ee40f685d4033f52122fb191cf19a4d3fa" + "reference": "2.0.6" }, "dist": { "type": "zip", - "url": "https://github.com/romainneutron/Sphinx-Search-API-PHP-Client/archive/3e30e2ee40f685d4033f52122fb191cf19a4d3fa.zip", - "reference": "3e30e2ee40f685d4033f52122fb191cf19a4d3fa", + "url": "https://github.com/romainneutron/Sphinx-Search-API-PHP-Client/zipball/2.0.6", + "reference": "2.0.6", "shasum": "" }, "require": { "php": ">=4" }, + "time": "2012-10-23 02:05:12", "type": "library", "autoload": { "classmap": [ @@ -928,21 +981,20 @@ "api", "Sphinx Search", "search-engine" - ], - "time": "2012-10-23 09:05:12" + ] }, { "name": "php-ffmpeg/php-ffmpeg", - "version": "dev-master", + "version": "0.2.0", "source": { "type": "git", "url": "https://github.com/alchemy-fr/PHP-FFmpeg", - "reference": "d7bb7bd091c47ae512ab86206607e2febce7ce49" + "reference": "0.2.0" }, "dist": { "type": "zip", - "url": "https://github.com/alchemy-fr/PHP-FFmpeg/archive/d7bb7bd091c47ae512ab86206607e2febce7ce49.zip", - "reference": "d7bb7bd091c47ae512ab86206607e2febce7ce49", + "url": "https://github.com/alchemy-fr/PHP-FFmpeg/archive/0.2.0.zip", + "reference": "0.2.0", "shasum": "" }, "require": { @@ -959,7 +1011,7 @@ "suggest": { "php-ffmpeg/extras": "A compilation of common audio & video drivers for PHP-FFMpeg" }, - "time": "2012-12-27 23:01:03", + "time": "2012-12-13 12:05:15", "type": "library", "extra": { "branch-alias": { @@ -1001,16 +1053,16 @@ }, { "name": "php-mp4box/php-mp4box", - "version": "dev-master", + "version": "0.1.0", "source": { "type": "git", "url": "git://github.com/alchemy-fr/PHP-MP4Box.git", - "reference": "2e8db20b7ebc53818b3e23c99f4e23c6e2bfc1c4" + "reference": "0.1.0" }, "dist": { "type": "zip", - "url": "https://github.com/alchemy-fr/PHP-MP4Box/archive/2e8db20b7ebc53818b3e23c99f4e23c6e2bfc1c4.zip", - "reference": "2e8db20b7ebc53818b3e23c99f4e23c6e2bfc1c4", + "url": "https://github.com/alchemy-fr/PHP-MP4Box/archive/0.1.0.zip", + "reference": "0.1.0", "shasum": "" }, "require": { @@ -1022,7 +1074,7 @@ "fabpot/php-cs-fixer": "dev-master", "silex/silex": "dev-master" }, - "time": "2012-12-21 16:56:54", + "time": "2012-12-21 16:44:13", "type": "library", "autoload": { "psr-0": { @@ -1049,7 +1101,7 @@ }, { "name": "php-unoconv/php-unoconv", - "version": "dev-master", + "version": "0.1.0", "source": { "type": "git", "url": "https://github.com/alchemy-fr/PHP-Unoconv", @@ -1097,35 +1149,35 @@ }, { "name": "php-xpdf/php-xpdf", - "version": "dev-master", + "version": "0.1.1", "source": { "type": "git", "url": "https://github.com/alchemy-fr/PHP-XPDF", - "reference": "ed46b2681bf621307a12782a8c7f9c1271cdf095" + "reference": "0.1.1" }, "dist": { "type": "zip", - "url": "https://github.com/alchemy-fr/PHP-XPDF/archive/ed46b2681bf621307a12782a8c7f9c1271cdf095.zip", - "reference": "ed46b2681bf621307a12782a8c7f9c1271cdf095", + "url": "https://api.github.com/repos/alchemy-fr/PHP-XPDF/zipball/0.1.1", + "reference": "0.1.1", "shasum": "" }, "require": { - "php": ">=5.3.2", - "symfony/process": ">2.0", - "monolog/monolog": "1.0.*" + "php": ">=5.3.3", + "symfony/process": ">=2.0,<3.0", + "monolog/monolog": ">=1.0,<2.0" }, "require-dev": { - "fabpot/php-cs-fixer": "dev-master", - "sami/sami": "dev-master", - "silex/silex": "dev-master" + "sami/sami": "dev-master@dev", + "silex/silex": "1.0.x@dev" }, - "time": "2012-10-08 13:42:14", + "time": "2013-01-31 11:08:08", "type": "library", "autoload": { "psr-0": { "XPDF": "src" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1153,18 +1205,18 @@ "source": { "type": "git", "url": "https://github.com/alchemy-fr/exiftool", - "reference": "6f833c5fcd94de99a240e9e3f549280051677269" + "reference": "9.15" }, "dist": { "type": "zip", - "url": "https://github.com/alchemy-fr/exiftool/archive/6f833c5fcd94de99a240e9e3f549280051677269.zip", - "reference": "6f833c5fcd94de99a240e9e3f549280051677269", + "url": "https://api.github.com/repos/alchemy-fr/exiftool/zipball/9.15", + "reference": "9.15", "shasum": "" }, "require": { "phpexiftool/phpexiftool": "*" }, - "time": "2013-01-03 11:16:06", + "time": "2013-01-30 18:48:32", "type": "library", "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1185,16 +1237,16 @@ }, { "name": "phpexiftool/phpexiftool", - "version": "dev-master", + "version": "0.1.0", "source": { "type": "git", "url": "https://github.com/romainneutron/PHPExiftool", - "reference": "a953aa842a555ece591603971751d90fee8620de" + "reference": "0.1.0" }, "dist": { "type": "zip", - "url": "https://github.com/romainneutron/PHPExiftool/archive/a953aa842a555ece591603971751d90fee8620de.zip", - "reference": "a953aa842a555ece591603971751d90fee8620de", + "url": "https://api.github.com/repos/romainneutron/PHPExiftool/zipball/0.1.0", + "reference": "0.1.0", "shasum": "" }, "require": { @@ -1205,15 +1257,15 @@ "symfony/process": ">=2.0,<=2.2.x-dev" }, "require-dev": { - "fabpot/php-cs-fixer": "*", - "sami/sami": "*", - "silex/silex": "*", "symfony/css-selector": ">=2.0,<=2.2.x-dev", "symfony/finder": ">=2.0,<=2.2.x-dev", "symfony/console": ">=2.0,<=2.2.x-dev", - "symfony/dom-crawler": ">=2.0,<=2.2.x-dev" + "symfony/dom-crawler": ">=2.0,<=2.2.x-dev", + "fabpot/php-cs-fixer": "*", + "sami/sami": "*", + "silex/silex": "*" }, - "time": "2013-01-03 11:53:47", + "time": "2013-01-30 16:44:06", "type": "library", "autoload": { "psr-0": { @@ -1239,22 +1291,22 @@ }, { "name": "pimple/pimple", - "version": "dev-master", + "version": "v1.0.1", "source": { "type": "git", "url": "git://github.com/fabpot/Pimple.git", - "reference": "d58cec632dfdd3305d6b4f2563a5cf2a75b4d978" + "reference": "v1.0.1" }, "dist": { "type": "zip", - "url": "https://github.com/fabpot/Pimple/archive/d58cec632dfdd3305d6b4f2563a5cf2a75b4d978.zip", - "reference": "d58cec632dfdd3305d6b4f2563a5cf2a75b4d978", + "url": "https://github.com/fabpot/Pimple/archive/v1.0.1.zip", + "reference": "v1.0.1", "shasum": "" }, "require": { "php": ">=5.3.0" }, - "time": "2013-01-07 10:39:26", + "time": "2012-11-11 08:32:34", "type": "library", "extra": { "branch-alias": { @@ -1283,18 +1335,56 @@ "container" ] }, + { + "name": "psr/log", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log", + "reference": "1.0.0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/php-fig/log/archive/1.0.0.zip", + "reference": "1.0.0", + "shasum": "" + }, + "time": "2012-12-21 11:40:51", + "type": "library", + "autoload": { + "psr-0": { + "Psr\\Log\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "keywords": [ + "log", + "psr", + "psr-3" + ] + }, { "name": "silex/silex", "version": "dev-master", "source": { "type": "git", "url": "git://github.com/fabpot/Silex.git", - "reference": "7c05e116b2875d90ecdc608db347ccbf7bb9a705" + "reference": "a23c221e609a17dfc2923066e1680149b7678cf9" }, "dist": { "type": "zip", - "url": "https://github.com/fabpot/Silex/archive/7c05e116b2875d90ecdc608db347ccbf7bb9a705.zip", - "reference": "7c05e116b2875d90ecdc608db347ccbf7bb9a705", + "url": "https://github.com/fabpot/Silex/archive/a23c221e609a17dfc2923066e1680149b7678cf9.zip", + "reference": "a23c221e609a17dfc2923066e1680149b7678cf9", "shasum": "" }, "require": { @@ -1330,7 +1420,7 @@ "symfony/css-selector": ">=2.1,<2.3-dev", "symfony/dom-crawler": ">=2.1,<2.3-dev" }, - "time": "2013-01-21 15:15:34", + "time": "2013-01-25 06:59:19", "type": "library", "extra": { "branch-alias": { @@ -1365,7 +1455,7 @@ }, { "name": "swftools/swftools", - "version": "dev-master", + "version": "0.1.0", "source": { "type": "git", "url": "https://github.com/alchemy-fr/PHPSwftools", @@ -1419,26 +1509,26 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v4.1.8", + "version": "v4.3.0", "source": { "type": "git", "url": "git://github.com/swiftmailer/swiftmailer.git", - "reference": "v4.1.8" + "reference": "v4.3.0" }, "dist": { "type": "zip", - "url": "https://github.com/swiftmailer/swiftmailer/zipball/v4.1.8", - "reference": "v4.1.8", + "url": "https://github.com/swiftmailer/swiftmailer/archive/v4.3.0.zip", + "reference": "v4.3.0", "shasum": "" }, "require": { "php": ">=5.2.4" }, - "time": "2012-06-17 13:55:34", + "time": "2013-01-08 15:50:34", "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.3-dev" } }, "autoload": { @@ -1446,6 +1536,7 @@ "lib/swift_required.php" ] }, + "notification-url": "https://packagist.org/downloads/", "license": [ "LGPL" ], @@ -1467,16 +1558,16 @@ }, { "name": "symfony/symfony", - "version": "2.1.x-dev", + "version": "v2.1.7", "source": { "type": "git", "url": "git://github.com/symfony/symfony.git", - "reference": "bdc7e91865b4633b01e79ff91aadb58efccfa981" + "reference": "v2.1.7" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/symfony/archive/bdc7e91865b4633b01e79ff91aadb58efccfa981.zip", - "reference": "bdc7e91865b4633b01e79ff91aadb58efccfa981", + "url": "https://github.com/symfony/symfony/archive/v2.1.7.zip", + "reference": "v2.1.7", "shasum": "" }, "require": { @@ -1525,7 +1616,7 @@ "propel/propel1": "dev-master", "monolog/monolog": ">=1.0,<1.3-dev" }, - "time": "2013-01-22 07:14:57", + "time": "2013-01-17 21:21:51", "type": "library", "autoload": { "psr-0": { @@ -1559,12 +1650,12 @@ "source": { "type": "git", "url": "git://git.code.sf.net/p/tcpdf/code", - "reference": "ce2f309281230fc5955875dff7e90c8a6f3517c7" + "reference": "a3bcc0957faf1e3786de13f1a4d3d307766526b0" }, "require": { "php": ">=5.3.0" }, - "time": "2012-12-16 12:23:34", + "time": "2013-01-30 17:13:12", "type": "library", "autoload": { "classmap": [ @@ -1657,22 +1748,22 @@ }, { "name": "twig/twig", - "version": "dev-master", + "version": "v1.12.1", "source": { "type": "git", "url": "git://github.com/fabpot/Twig.git", - "reference": "93c6a8dedc46c73ccdd61342de3d5e761e4412f6" + "reference": "v1.12.1" }, "dist": { "type": "zip", - "url": "https://github.com/fabpot/Twig/archive/93c6a8dedc46c73ccdd61342de3d5e761e4412f6.zip", - "reference": "93c6a8dedc46c73ccdd61342de3d5e761e4412f6", + "url": "https://github.com/fabpot/Twig/archive/v1.12.1.zip", + "reference": "v1.12.1", "shasum": "" }, "require": { "php": ">=5.2.4" }, - "time": "2013-01-18 09:58:04", + "time": "2013-01-15 20:03:52", "type": "library", "extra": { "branch-alias": { @@ -1706,28 +1797,29 @@ }, { "name": "zend/gdata", - "version": "dev-master", + "version": "1.12.1", "source": { "type": "git", "url": "https://github.com/alchemy-fr/gdata", - "reference": "827dc8696f1e5b70a4c507355877cdbab60fb3fa" + "reference": "1.12.1" }, "dist": { "type": "zip", - "url": "https://github.com/alchemy-fr/gdata/zipball/827dc8696f1e5b70a4c507355877cdbab60fb3fa", - "reference": "827dc8696f1e5b70a4c507355877cdbab60fb3fa", + "url": "https://api.github.com/repos/alchemy-fr/gdata/zipball/1.12.1", + "reference": "1.12.1", "shasum": "" }, "require": { "php": ">5.2.4" }, - "time": "2012-05-04 11:57:49", + "time": "2013-01-30 15:31:21", "type": "library", "autoload": { "psr-0": { "Zend_": "library" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "New BSD" ], @@ -1756,7 +1848,7 @@ }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/data-fixtures/archive/50e7e644984f17038224f6fcd02c2b7c20147980.zip", + "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/50e7e644984f17038224f6fcd02c2b7c20147980", "reference": "50e7e644984f17038224f6fcd02c2b7c20147980", "shasum": "" }, @@ -1800,70 +1892,26 @@ "keywords": [ "database" ] - }, - { - "name": "fabpot/php-cs-fixer", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/fabpot/PHP-CS-Fixer.git", - "reference": "2377b9ea383ac7939e563c3dd6ee2be9ee2d3183" - }, - "dist": { - "type": "zip", - "url": "https://github.com/fabpot/PHP-CS-Fixer/archive/2377b9ea383ac7939e563c3dd6ee2be9ee2d3183.zip", - "reference": "2377b9ea383ac7939e563c3dd6ee2be9ee2d3183", - "shasum": "" - }, - "require": { - "symfony/console": "2.1.*", - "symfony/filesystem": "2.1.*", - "symfony/finder": "2.1.*", - "php": ">=5.3.3" - }, - "time": "2013-01-04 16:55:35", - "bin": [ - "php-cs-fixer" - ], - "type": "application", - "extra": { - "branch-alias": { - "dev-master": "0.1.x-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\CS": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "A script to automatically fix Symfony Coding Standard" } ], "aliases": [ ], - "minimum-stability": "dev", + "minimum-stability": "stable", "stability-flags": { + "alchemy/oauth2php": 20, + "alchemy/phlickr": 20, + "badfaith/badfaith": 20, + "dailymotion/sdk": 20, "data-uri/data-uri": 20, "grom/silex-service-provider": 20, - "mediavorus/mediavorus": 20, - "media-alchemyst/media-alchemyst": 20, + "knplabs/knp-snappy": 20, "neutron/silex-badfaith-provider": 20, "neutron/silex-filesystem-provider": 20, - "php-xpdf/php-xpdf": 20, - "phpexiftool/phpexiftool": 20, + "phpexiftool/exiftool": 20, + "silex/silex": 20, "tecnick.com/tcpdf": 20, - "doctrine/data-fixtures": 20, - "fabpot/php-cs-fixer": 20 + "twig/extensions": 20, + "doctrine/data-fixtures": 20 } } diff --git a/lib/Doctrine/Proxies/__CG__EntitiesBasket.php b/lib/Doctrine/Proxies/__CG__EntitiesBasket.php index d137f67657..691e2acda6 100644 --- a/lib/Doctrine/Proxies/__CG__EntitiesBasket.php +++ b/lib/Doctrine/Proxies/__CG__EntitiesBasket.php @@ -228,7 +228,7 @@ class Basket extends \Entities\Basket implements \Doctrine\ORM\Proxy\Proxy if ($original === null) { throw new \Doctrine\ORM\EntityNotFoundException(); } - foreach ($class->reflFields AS $field => $reflProperty) { + foreach ($class->reflFields as $field => $reflProperty) { $reflProperty->setValue($this, $reflProperty->getValue($original)); } unset($this->_entityPersister, $this->_identifier); diff --git a/lib/Doctrine/Proxies/__CG__EntitiesLazaretSession.php b/lib/Doctrine/Proxies/__CG__EntitiesLazaretSession.php index 4846393d50..c7a692e785 100644 --- a/lib/Doctrine/Proxies/__CG__EntitiesLazaretSession.php +++ b/lib/Doctrine/Proxies/__CG__EntitiesLazaretSession.php @@ -126,7 +126,7 @@ class LazaretSession extends \Entities\LazaretSession implements \Doctrine\ORM\P if ($original === null) { throw new \Doctrine\ORM\EntityNotFoundException(); } - foreach ($class->reflFields AS $field => $reflProperty) { + foreach ($class->reflFields as $field => $reflProperty) { $reflProperty->setValue($this, $reflProperty->getValue($original)); } unset($this->_entityPersister, $this->_identifier); diff --git a/lib/Doctrine/Proxies/__CG__EntitiesUsrList.php b/lib/Doctrine/Proxies/__CG__EntitiesUsrList.php index 00ad0c32ac..7f65170c92 100644 --- a/lib/Doctrine/Proxies/__CG__EntitiesUsrList.php +++ b/lib/Doctrine/Proxies/__CG__EntitiesUsrList.php @@ -144,7 +144,7 @@ class UsrList extends \Entities\UsrList implements \Doctrine\ORM\Proxy\Proxy if ($original === null) { throw new \Doctrine\ORM\EntityNotFoundException(); } - foreach ($class->reflFields AS $field => $reflProperty) { + foreach ($class->reflFields as $field => $reflProperty) { $reflProperty->setValue($this, $reflProperty->getValue($original)); } unset($this->_entityPersister, $this->_identifier); diff --git a/lib/Doctrine/Proxies/__CG__EntitiesUsrListOwner.php b/lib/Doctrine/Proxies/__CG__EntitiesUsrListOwner.php index 0385084e42..735837d3a4 100644 --- a/lib/Doctrine/Proxies/__CG__EntitiesUsrListOwner.php +++ b/lib/Doctrine/Proxies/__CG__EntitiesUsrListOwner.php @@ -138,7 +138,7 @@ class UsrListOwner extends \Entities\UsrListOwner implements \Doctrine\ORM\Proxy if ($original === null) { throw new \Doctrine\ORM\EntityNotFoundException(); } - foreach ($class->reflFields AS $field => $reflProperty) { + foreach ($class->reflFields as $field => $reflProperty) { $reflProperty->setValue($this, $reflProperty->getValue($original)); } unset($this->_entityPersister, $this->_identifier); diff --git a/tests/classes/PhraseanetPHPUnitAbstract.php b/tests/classes/PhraseanetPHPUnitAbstract.php index dd8ef6b594..c4883f65b6 100644 --- a/tests/classes/PhraseanetPHPUnitAbstract.php +++ b/tests/classes/PhraseanetPHPUnitAbstract.php @@ -500,15 +500,6 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase $loader->addFixture($validationSession); $this->insertFixtureInDatabase($loader); - - //add current user as participant - $validationParticipant = new PhraseaFixture\ValidationParticipant\LoadParticipantWithSession(); - $validationParticipant->setSession($validationSession->validationSession); - $validationParticipant->setUser($currentUser); - - $loader = new Loader(); - $loader->addFixture($validationParticipant); - $this->insertFixtureInDatabase($loader); } catch (\Exception $e) { $this->fail('Fail load one WorkingZone : ' . $e->getMessage()); }