diff --git a/composer.json b/composer.json index 007ebd5c94..a0635917f1 100644 --- a/composer.json +++ b/composer.json @@ -1,49 +1,49 @@ { - "name": "phraseanet/phraseanet", - "description": "Phraseanet", - "require": { - "php": ">=5.3.3", - "twig/twig": "1.8.*", - "twig/extensions": "master", - "doctrine/orm": "2.2.2", - "gedmo/doctrine-extensions": "2.2.*", - "swiftmailer/swiftmailer": "4.1.*", - "doctrine/data-fixtures": "dev-master", - "monolog/monolog": "1.0.*", - "symfony/symfony": "2.1.*", - "phpexiftool/phpexiftool": "dev-master", - "dailymotion/sdk": "*", - "mediavorus/mediavorus": "dev-master", - "media-alchemyst/media-alchemyst": "dev-master", - "php-xpdf/php-xpdf": "dev-master", - "data-uri/data-uri": "dev-master", - "silex/silex": "1.0.*", - "alchemy/oauth2php": "master", - "alchemy/phlickr": "master", - "alchemy/phpmailer": "master", - "tcpdf/tcpdf": ">5.9", - "zend/gdata": ">1.11" - }, - "require-dev": { - "fabpot/php-cs-fixer": "dev-master" - }, - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/alchemy-fr/oauth2-php" - }, - { - "type": "vcs", - "url": "https://github.com/alchemy-fr/Phlickr" - }, - { - "type": "vcs", - "url": "https://github.com/alchemy-fr/PHPMailer_v5.1" - } - ], - "autoload": { - "psr-0": { - "Alchemy": "lib" + "name": "phraseanet/phraseanet", + "description": "Phraseanet", + "require": { + "php": ">=5.3.3", + "twig/twig": "1.8.*", + "twig/extensions": "master", + "doctrine/orm": "2.2.2", + "gedmo/doctrine-extensions": "2.2.*", + "swiftmailer/swiftmailer": "4.1.*", + "doctrine/data-fixtures": "dev-master", + "monolog/monolog": "1.0.*", + "symfony/symfony": "2.1.*", + "phpexiftool/phpexiftool": "dev-master", + "dailymotion/sdk": "*", + "mediavorus/mediavorus": "dev-master", + "media-alchemyst/media-alchemyst": "dev-master", + "php-xpdf/php-xpdf": "dev-master", + "data-uri/data-uri": "dev-master", + "silex/silex": "1.0.*", + "alchemy/oauth2php": "master", + "alchemy/phlickr": "master", + "alchemy/phpmailer": "master", + "tcpdf/tcpdf": ">5.9", + "zend/gdata": ">1.11" + }, + "require-dev": { + "fabpot/php-cs-fixer": "dev-master" + }, + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/alchemy-fr/oauth2-php" + }, + { + "type": "vcs", + "url": "https://github.com/alchemy-fr/Phlickr" + }, + { + "type": "vcs", + "url": "https://github.com/alchemy-fr/PHPMailer_v5.1" + } + ], + "autoload": { + "psr-0": { + "Alchemy": "lib" + } } - } } diff --git a/composer.lock b/composer.lock index 3951d26695..aaa9048f9d 100644 --- a/composer.lock +++ b/composer.lock @@ -51,12 +51,12 @@ { "package": "imagine/Imagine", "version": "dev-develop", - "source-reference": "2637e79e489d728ff59f76fc5ad4748b029702c7" + "source-reference": "d5025548b57a5f52a2992405670c5d9f9e8f3ec0" }, { "package": "media-alchemyst/media-alchemyst", "version": "dev-master", - "source-reference": "6070dd85661e699956175d033ae3cb5c580565a4" + "source-reference": "0328c5159a2ef33c36dabdeb20fdaaecf4cbdbad" }, { "package": "mediavorus/mediavorus", @@ -97,11 +97,6 @@ "version": "dev-master", "source-reference": "d456c37df4ee53d06383a5b85f072dcb49a97566" }, - { - "package": "pimple/pimple", - "version": "dev-master", - "source-reference": "v1.0.0" - }, { "package": "pimple/pimple", "version": "dev-master", @@ -110,9 +105,9 @@ "alias-version": "1.0.9999999.9999999-dev" }, { - "package": "silex/silex", + "package": "pimple/pimple", "version": "dev-master", - "source-reference": "6dcb25872210c50292516683ba541c1b29624afd" + "source-reference": "v1.0.0" }, { "package": "silex/silex", @@ -121,6 +116,11 @@ "alias-pretty-version": "1.0.x-dev", "alias-version": "1.0.9999999.9999999-dev" }, + { + "package": "silex/silex", + "version": "dev-master", + "source-reference": "6dcb25872210c50292516683ba541c1b29624afd" + }, { "package": "swftools/swftools", "version": "dev-master", @@ -163,12 +163,12 @@ { "package": "twig/twig", "version": "dev-master", - "source-reference": "0fa26d642994630b2ec19c090149fa56ce84c789" + "source-reference": "573a36097146b319e5fb36546a0377c7440bbfe3" }, { "package": "twig/twig", "version": "dev-master", - "source-reference": "0fa26d642994630b2ec19c090149fa56ce84c789", + "source-reference": "573a36097146b319e5fb36546a0377c7440bbfe3", "alias-pretty-version": "1.8.x-dev", "alias-version": "1.8.9999999.9999999-dev" }, @@ -178,13 +178,7 @@ "source-reference": "827dc8696f1e5b70a4c507355877cdbab60fb3fa" } ], - "packages-dev": [ - { - "package": "fabpot/php-cs-fixer", - "version": "dev-master", - "source-reference": "0c24e56efdaddd63b9f7e74a259952003e37e73f" - } - ], + "packages-dev": null, "aliases": [ ],