Fix #790 Update dependencies + Update travis

This commit is contained in:
Romain Neutron
2012-07-11 15:10:40 +02:00
parent 20c871136a
commit 729893d1a6
3 changed files with 80 additions and 56 deletions

View File

@@ -3,7 +3,7 @@ language: php
before_script: before_script:
- cp hudson/*.yml config/ - cp hudson/*.yml config/
- curl -s http://getcomposer.org/installer | php - curl -s http://getcomposer.org/installer | php
- php composer.phar install - php composer.phar install --dev
- sudo apt-get update - sudo apt-get update
- sudo apt-get install -y xpdf ffmpeg libavcodec-extra-53 openoffice.org-writer unoconv ghostscript gsfonts dcraw ufraw graphicsmagick libgraphicsmagick1-dev libfreetype6-dev libjpeg-dev libgif-dev libtiff-dev libdjvulibre-dev libwmf-dev libmagickcore-dev libmagickwand-dev libpng-dev gettext zlib1g-dev build-essential libfaac-dev libmp3lame0 libx264-dev libvpx-dev libtheora-dev libvorbis-dev gpac - sudo apt-get install -y xpdf ffmpeg libavcodec-extra-53 openoffice.org-writer unoconv ghostscript gsfonts dcraw ufraw graphicsmagick libgraphicsmagick1-dev libfreetype6-dev libjpeg-dev libgif-dev libtiff-dev libdjvulibre-dev libwmf-dev libmagickcore-dev libmagickwand-dev libpng-dev gettext zlib1g-dev build-essential libfaac-dev libmp3lame0 libx264-dev libvpx-dev libtheora-dev libvorbis-dev gpac
- mysql -e 'create database ab_test;create database db_test; create database ab_unitTests; create database db_unitTests;' - mysql -e 'create database ab_test;create database db_test; create database ab_unitTests; create database db_unitTests;'

View File

@@ -3,28 +3,29 @@
"description": "Phraseanet", "description": "Phraseanet",
"require": { "require": {
"php": ">=5.3.3", "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/oauth2php": "master",
"alchemy/phlickr": "master", "alchemy/phlickr": "master",
"alchemy/phpmailer": "master", "alchemy/phpmailer": "master",
"dailymotion/sdk": "*",
"data-uri/data-uri": "dev-master",
"doctrine/orm": "2.2.2",
"gedmo/doctrine-extensions": "2.2.*",
"mediavorus/mediavorus": "dev-master",
"media-alchemyst/media-alchemyst": "dev-master",
"monolog/monolog": "1.0.*",
"php-xpdf/php-xpdf": "dev-master",
"phpexiftool/phpexiftool": "dev-master",
"silex/silex": "1.0.*",
"swiftmailer/swiftmailer": "4.1.*",
"symfony/symfony": "2.1.*",
"tcpdf/tcpdf": ">5.9", "tcpdf/tcpdf": ">5.9",
"twig/twig": "1.8.*",
"twig/extensions": "master",
"zend/gdata": ">1.11" "zend/gdata": ">1.11"
}, },
"minimum-stability": "dev",
"require-dev": { "require-dev": {
"doctrine/data-fixtures": "dev-master",
"fabpot/php-cs-fixer": "dev-master" "fabpot/php-cs-fixer": "dev-master"
}, },
"repositories": [ "repositories": [

103
composer.lock generated
View File

@@ -1,40 +1,40 @@
{ {
"hash": "857b61866e493b8204708d3fd6ca090b", "hash": "709b865d18d952667bf199d09ceba844",
"packages": [ "packages": [
{ {
"package": "alchemy/Phlickr", "package": "alchemy/Phlickr",
"version": "dev-master", "version": "dev-master",
"source-reference": "89993abd6a02b42e0b765114c34c26c4056762fa" "source-reference": "89993abd6a02b42e0b765114c34c26c4056762fa",
"commit-date": "1334339011"
}, },
{ {
"package": "alchemy/oauth2php", "package": "alchemy/oauth2php",
"version": "dev-master", "version": "dev-master",
"source-reference": "5f949209461e8f4c31e8476155188923aafa2ae5" "source-reference": "5f949209461e8f4c31e8476155188923aafa2ae5",
"commit-date": "1333122427"
}, },
{ {
"package": "alchemy/phpmailer", "package": "alchemy/phpmailer",
"version": "dev-master", "version": "dev-master",
"source-reference": "3bdb8bc7a8f304c27900d7b2ddc00068c86c781f" "source-reference": "3bdb8bc7a8f304c27900d7b2ddc00068c86c781f",
"commit-date": "1333125389"
}, },
{ {
"package": "dailymotion/sdk", "package": "dailymotion/sdk",
"version": "dev-master", "version": "dev-master",
"source-reference": "553ae64f3a981f4d9b4ea2a4b8e51ebef2409bbf" "source-reference": "3a8e5d5f07523031138f47d9d7ecf439a1a7300d",
"commit-date": "1341934599"
}, },
{ {
"package": "data-uri/data-uri", "package": "data-uri/data-uri",
"version": "dev-master", "version": "dev-master",
"source-reference": "c29d1cca49d6ba38d532025db5bf0cd06031da06" "source-reference": "c29d1cca49d6ba38d532025db5bf0cd06031da06",
"commit-date": "1338509340"
}, },
{ {
"package": "doctrine/common", "package": "doctrine/common",
"version": "2.2.2" "version": "2.2.2"
}, },
{
"package": "doctrine/data-fixtures",
"version": "dev-master",
"source-reference": "64538135ef2b17a296e26f88a04c7ce2e4551459"
},
{ {
"package": "doctrine/dbal", "package": "doctrine/dbal",
"version": "2.2.2" "version": "2.2.2"
@@ -46,22 +46,26 @@
{ {
"package": "gedmo/doctrine-extensions", "package": "gedmo/doctrine-extensions",
"version": "2.2.x-dev", "version": "2.2.x-dev",
"source-reference": "v2.2.3" "source-reference": "v2.2.3",
"commit-date": "1339767845"
}, },
{ {
"package": "imagine/Imagine", "package": "imagine/Imagine",
"version": "dev-develop", "version": "dev-develop",
"source-reference": "ea555767c851236f31ee1e048b4cd51f448cab2e" "source-reference": "ea555767c851236f31ee1e048b4cd51f448cab2e",
"commit-date": "1339599310"
}, },
{ {
"package": "media-alchemyst/media-alchemyst", "package": "media-alchemyst/media-alchemyst",
"version": "dev-master", "version": "dev-master",
"source-reference": "dc3b327b3aa6efae61c910313449d73069cd0889" "source-reference": "8b81d5d5e46402cb61541598e0ddf8ca8f68f8c6",
"commit-date": "1342002821"
}, },
{ {
"package": "mediavorus/mediavorus", "package": "mediavorus/mediavorus",
"version": "dev-master", "version": "dev-master",
"source-reference": "28e3ce826a37126e901b5d80c3253090af74647a" "source-reference": "28e3ce826a37126e901b5d80c3253090af74647a",
"commit-date": "1339782829"
}, },
{ {
"package": "monolog/monolog", "package": "monolog/monolog",
@@ -70,32 +74,38 @@
{ {
"package": "php-ffmpeg/php-ffmpeg", "package": "php-ffmpeg/php-ffmpeg",
"version": "dev-master", "version": "dev-master",
"source-reference": "b6b8bd502131e0dd82f53517ccc84d3de2c09424" "source-reference": "b6b8bd502131e0dd82f53517ccc84d3de2c09424",
"commit-date": "1340268165"
}, },
{ {
"package": "php-mp4box/php-mp4box", "package": "php-mp4box/php-mp4box",
"version": "dev-master", "version": "dev-master",
"source-reference": "ed3ae359984793a699c540871acc1d68ca6589fe" "source-reference": "ed3ae359984793a699c540871acc1d68ca6589fe",
"commit-date": "1335481578"
}, },
{ {
"package": "php-unoconv/php-unoconv", "package": "php-unoconv/php-unoconv",
"version": "dev-master", "version": "dev-master",
"source-reference": "27f257203be01e3343128b902a06fb82363876b8" "source-reference": "27f257203be01e3343128b902a06fb82363876b8",
"commit-date": "1335481542"
}, },
{ {
"package": "php-xpdf/php-xpdf", "package": "php-xpdf/php-xpdf",
"version": "dev-master", "version": "dev-master",
"source-reference": "36e8feb0d7a59aab6b66c549ca25fe6bb4147c5f" "source-reference": "36e8feb0d7a59aab6b66c549ca25fe6bb4147c5f",
"commit-date": "1340123615"
}, },
{ {
"package": "phpexiftool/exiftool", "package": "phpexiftool/exiftool",
"version": "dev-master", "version": "dev-master",
"source-reference": "999e660215b25a12fd3409df9a31883b6c617570" "source-reference": "999e660215b25a12fd3409df9a31883b6c617570",
"commit-date": "1339513761"
}, },
{ {
"package": "phpexiftool/phpexiftool", "package": "phpexiftool/phpexiftool",
"version": "dev-master", "version": "dev-master",
"source-reference": "5dc6e9a21e4b0faf6809070bc4f1cc4fef06ead6" "source-reference": "5dc6e9a21e4b0faf6809070bc4f1cc4fef06ead6",
"commit-date": "1339680734"
}, },
{ {
"package": "pimple/pimple", "package": "pimple/pimple",
@@ -106,7 +116,8 @@
{ {
"package": "pimple/pimple", "package": "pimple/pimple",
"version": "dev-master", "version": "dev-master",
"source-reference": "d2cfa2f02f50abef65c238747c753a5f6786f6be" "source-reference": "d2cfa2f02f50abef65c238747c753a5f6786f6be",
"commit-date": "1341139100"
}, },
{ {
"package": "silex/silex", "package": "silex/silex",
@@ -117,12 +128,14 @@
{ {
"package": "silex/silex", "package": "silex/silex",
"version": "dev-master", "version": "dev-master",
"source-reference": "8cb0ba08839d6ca84fc76936eec1f8ced9a80546" "source-reference": "4679d476aee0a5981b13d4ac899a8ef72b8b060c",
"commit-date": "1341899486"
}, },
{ {
"package": "swftools/swftools", "package": "swftools/swftools",
"version": "dev-master", "version": "dev-master",
"source-reference": "72f339293ca74606814f41fd95f8c552257d8c3b" "source-reference": "72f339293ca74606814f41fd95f8c552257d8c3b",
"commit-date": "1339439296"
}, },
{ {
"package": "swiftmailer/swiftmailer", "package": "swiftmailer/swiftmailer",
@@ -137,47 +150,57 @@
{ {
"package": "symfony/symfony", "package": "symfony/symfony",
"version": "dev-master", "version": "dev-master",
"source-reference": "2f66ae3a0c30fcf0051ede0a3812f96f5ffa1335" "source-reference": "09d71ca9274e7b82a54566360684842885f61912",
"commit-date": "1341995849"
}, },
{ {
"package": "tcpdf/tcpdf", "package": "tcpdf/tcpdf",
"version": "dev-master", "version": "dev-master",
"source-reference": "8c874186166237b7909d6aa3d9aaae1ed6c4d245" "source-reference": "8c874186166237b7909d6aa3d9aaae1ed6c4d245",
"commit-date": "1337808087"
}, },
{ {
"package": "twig/extensions", "package": "twig/extensions",
"version": "dev-master", "version": "dev-master",
"source-reference": "feb6d3f10c411e2631997c0a905aa581c80305c1" "source-reference": "feb6d3f10c411e2631997c0a905aa581c80305c1",
"commit-date": "1337599699"
}, },
{ {
"package": "twig/twig", "package": "twig/twig",
"version": "dev-master", "version": "v1.8.3"
"alias-pretty-version": "1.8.x-dev",
"alias-version": "1.8.9999999.9999999-dev"
},
{
"package": "twig/twig",
"version": "dev-master",
"source-reference": "73da773aaad0f97f2e967ec8241b8adf7b1e03d2"
}, },
{ {
"package": "zend/gdata", "package": "zend/gdata",
"version": "dev-master", "version": "dev-master",
"source-reference": "827dc8696f1e5b70a4c507355877cdbab60fb3fa" "source-reference": "827dc8696f1e5b70a4c507355877cdbab60fb3fa",
"commit-date": "1336132669"
}
],
"packages-dev": [
{
"package": "doctrine/data-fixtures",
"version": "dev-master",
"source-reference": "779c3dfe446b6da893be87b908d6be28345d1e01",
"commit-date": "1341780535"
},
{
"package": "fabpot/php-cs-fixer",
"version": "dev-master",
"source-reference": "9b13373840537c91bf830b1b45e39b223e5dd438",
"commit-date": "1341582702"
} }
], ],
"packages-dev": null,
"aliases": [ "aliases": [
], ],
"minimum-stability": "dev", "minimum-stability": "dev",
"stability-flags": { "stability-flags": {
"doctrine/data-fixtures": 20, "data-uri/data-uri": 20,
"phpexiftool/phpexiftool": 20,
"mediavorus/mediavorus": 20, "mediavorus/mediavorus": 20,
"media-alchemyst/media-alchemyst": 20, "media-alchemyst/media-alchemyst": 20,
"php-xpdf/php-xpdf": 20, "php-xpdf/php-xpdf": 20,
"data-uri/data-uri": 20, "phpexiftool/phpexiftool": 20,
"doctrine/data-fixtures": 20,
"fabpot/php-cs-fixer": 20 "fabpot/php-cs-fixer": 20
} }
} }