Merge branch '3.7'

CONTRIBUTORS

@@ -1,7 +1,8 @@
 #version 3.7
 
  - Pieter Demonie (Dutch localization)
- - Laurent OUDOT / TEHTRI-Security (Security flaw)
+ - Laurent Oudot / TEHTRI-Security (Security flaw)
+ - Hubert Lecorche
 
 #version 3.6
  

builder.php

@@ -60,7 +60,6 @@ $finder = new Finder();
 $finder
     ->directories()
     ->name('test')
-    ->name('Test')
     ->name('tests')
     ->name('Tests')
     ->name('test-suite')

composer.json

@@ -14,8 +14,8 @@
         "doctrine/orm": "2.2.2",
         "gedmo/doctrine-extensions": "2.2.*",
         "grom/silex-service-provider": "dev-master",
-        "mediavorus/mediavorus": "dev-master",
+        "mediavorus/mediavorus": "0.2.x-dev",
-        "media-alchemyst/media-alchemyst": "dev-master",
+        "media-alchemyst/media-alchemyst": "0.2.x-dev",
         "monolog/monolog": "1.0.*",
         "neutron/silex-badfaith-provider": "dev-master",
         "neutron/silex-filesystem-provider": "dev-master",

composer.lock

@@ -1,5 +1,5 @@
 {
-    "hash": "2b34a4340174fc534085a984bdb4163c",
+    "hash": "a670b100c70cc2d3beac275230c03ccf",
     "packages": [
         {
             "name": "BadFaith/BadFaith",
@@ -12,7 +12,7 @@
             "require": {
                 "php": ">=5.3.0"
             },
-            "time": "1343419801",
+            "time": "2012-07-27 20:10:01",
             "type": "library",
             "installation-source": "source",
             "autoload": {
@@ -39,7 +39,7 @@
                 "reference": "89993abd6a02b42e0b765114c34c26c4056762fa",
                 "shasum": ""
             },
-            "time": "1334339011",
+            "time": "2012-04-13 17:43:31",
             "type": "library",
             "installation-source": "source",
             "autoload": {
@@ -54,12 +54,12 @@
             "source": {
                 "type": "git",
                 "url": "git://github.com/alchemy-fr/Ghostscript-PHP.git",
-                "reference": "dfb0fa60e94cbb29558d2567223ff75207169608"
+                "reference": "731a477710d8a9d093574b5ee1876fabfb02b5ee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/alchemy-fr/Ghostscript-PHP/zipball/dfb0fa60e94cbb29558d2567223ff75207169608",
+                "url": "https://github.com/alchemy-fr/Ghostscript-PHP/archive/731a477710d8a9d093574b5ee1876fabfb02b5ee.zip",
-                "reference": "dfb0fa60e94cbb29558d2567223ff75207169608",
+                "reference": "731a477710d8a9d093574b5ee1876fabfb02b5ee",
                 "shasum": ""
             },
             "require": {
@@ -72,8 +72,13 @@
                 "sami/sami": "dev-master",
                 "silex/silex": "dev-master"
             },
-            "time": "1351093185",
+            "time": "2012-11-27 10:34:30",
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.2.x-dev"
+                }
+            },
             "installation-source": "source",
             "autoload": {
                 "psr-0": {
@@ -115,7 +120,7 @@
                 "reference": "5f949209461e8f4c31e8476155188923aafa2ae5",
                 "shasum": ""
             },
-            "time": "1333122427",
+            "time": "2012-03-30 15:47:07",
             "type": "library",
             "installation-source": "source",
             "autoload": {
@@ -132,7 +137,7 @@
                 "url": "https://github.com/alchemy-fr/PHPMailer_v5.1",
                 "reference": "baabbdc1e68947f19c86e0e9e02d40d6fb1283e4"
             },
-            "time": "1352458275",
+            "time": "2012-11-09 10:51:15",
             "type": "library",
             "installation-source": "source",
             "autoload": {
@@ -155,7 +160,7 @@
                 "reference": "a11e98742adf877497017fece69f603af578f329",
                 "shasum": ""
             },
-            "time": "1351162376",
+            "time": "2012-10-25 10:52:56",
             "type": "library",
             "installation-source": "source",
             "autoload": {
@@ -163,6 +168,7 @@
                     "Dailymotion.php"
                 ]
             },
+            "notification-url": "https://packagist.org/downloads/",
             "description": "Dailymotion PHP SDK",
             "homepage": "http://dailymotion.com",
             "keywords": [
@@ -193,7 +199,7 @@
                 "fabpot/php-cs-fixer": "dev-master",
                 "sami/sami": "dev-master"
             },
-            "time": "1338509340",
+            "time": "2012-06-01 00:09:00",
             "type": "library",
             "installation-source": "source",
             "autoload": {
@@ -398,12 +404,12 @@
             "source": {
                 "type": "git",
                 "url": "git://github.com/l3pp4rd/DoctrineExtensions.git",
-                "reference": "v2.2.3"
+                "reference": "7a4bd0a7ef51058fcb5d5609988c1f530e200d1b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/l3pp4rd/DoctrineExtensions/zipball/v2.2.3",
+                "url": "https://github.com/l3pp4rd/DoctrineExtensions/archive/7a4bd0a7ef51058fcb5d5609988c1f530e200d1b.zip",
-                "reference": "v2.2.3",
+                "reference": "7a4bd0a7ef51058fcb5d5609988c1f530e200d1b",
                 "shasum": ""
             },
             "require": {
@@ -414,7 +420,7 @@
                 "doctrine/orm": ">=2.1",
                 "doctrine/mongodb-odm": "*"
             },
-            "time": "1339767845",
+            "time": "2012-11-15 16:25:16",
             "type": "library",
             "installation-source": "source",
             "autoload": {
@@ -422,13 +428,14 @@
                     "Gedmo": "lib/"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
             "authors": [
                 {
                     "name": "Gediminas Morkevicius",
-                    "email": "gediminas.morkevicius@gmail"
+                    "email": "gediminas.morkevicius@gmail.com"
                 }
             ],
             "description": "Doctrine2 behavioral extensions",
@@ -457,7 +464,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/GromNaN/SilexServiceProvider/zipball/1d37fa54aaecfacb68fde4c60392da0c1ca6300d",
+                "url": "https://github.com/GromNaN/SilexServiceProvider/archive/1d37fa54aaecfacb68fde4c60392da0c1ca6300d.zip",
                 "reference": "1d37fa54aaecfacb68fde4c60392da0c1ca6300d",
                 "shasum": ""
             },
@@ -466,7 +473,7 @@
                 "knplabs/knp-snappy": "dev-master",
                 "imagine/imagine": "*"
             },
-            "time": "1338686843",
+            "time": "2012-06-03 01:27:23",
             "type": "library",
             "installation-source": "source",
             "autoload": {
@@ -474,6 +481,7 @@
                     "Grom\\Silex": "src"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -495,16 +503,16 @@
         },
         {
             "name": "imagine/Imagine",
-            "version": "dev-develop",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/avalanche123/Imagine",
-                "reference": "2da3004b1201649598377c1aa5b24f9788abe83f"
+                "reference": "v0.4.1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/avalanche123/Imagine/zipball/2da3004b1201649598377c1aa5b24f9788abe83f",
+                "url": "https://github.com/avalanche123/Imagine/archive/v0.4.1.zip",
-                "reference": "2da3004b1201649598377c1aa5b24f9788abe83f",
+                "reference": "v0.4.1",
                 "shasum": ""
             },
             "require": {
@@ -513,7 +521,7 @@
             "require-dev": {
                 "sami/sami": "dev-master"
             },
-            "time": "1350920158",
+            "time": "2012-12-13 18:31:18",
             "type": "library",
             "installation-source": "source",
             "autoload": {
@@ -521,6 +529,7 @@
                     "Imagine": "lib/"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -560,7 +569,7 @@
             "suggest": {
                 "symfony/process": "Process Component of Symfony2."
             },
-            "time": "1352281681",
+            "time": "2012-11-07 09:48:01",
             "type": "library",
             "installation-source": "source",
             "autoload": {
@@ -568,6 +577,7 @@
                     "Knp\\Snappy": "src/"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -597,39 +607,45 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/alchemy-fr/Media-Alchemyst",
-                "reference": "8f2c693906d14aa9a8f9896556ab501dd07498d5"
+                "reference": "7e38949ab34f9670c3e6406ed865ccc18b34c362"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/alchemy-fr/Media-Alchemyst/archive/8f2c693906d14aa9a8f9896556ab501dd07498d5.zip",
+                "url": "https://github.com/alchemy-fr/Media-Alchemyst/archive/7e38949ab34f9670c3e6406ed865ccc18b34c362.zip",
-                "reference": "8f2c693906d14aa9a8f9896556ab501dd07498d5",
+                "reference": "7e38949ab34f9670c3e6406ed865ccc18b34c362",
                 "shasum": ""
             },
             "require": {
-                "mediavorus/mediavorus": "dev-master",
                 "swftools/swftools": "dev-master",
-                "php-ffmpeg/php-ffmpeg": "dev-master",
                 "php-unoconv/php-unoconv": "dev-master",
-                "imagine/imagine": "dev-develop",
                 "php-mp4box/php-mp4box": "dev-master",
                 "php": ">=5.3.3",
-                "pimple/pimple": "*",
-                "monolog/monolog": "1.0.*",
                 "symfony/console": ">=2.0,<=2.2",
-                "alchemy/ghostscript": "dev-master"
+                "pimple/pimple": "1.*",
+                "mediavorus/mediavorus": "0.2.*",
+                "monolog/monolog": "1.*",
+                "alchemy/ghostscript": "0.2.*",
+                "imagine/imagine": ">=0.4",
+                "php-ffmpeg/php-ffmpeg": "0.2.*"
             },
             "require-dev": {
                 "grom/silex-service-provider": "dev-master",
                 "phpexiftool/phpexiftool": "dev-master"
             },
-            "time": "1351081006",
+            "time": "2012-12-17 12:10:42",
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.2.x-dev"
+                }
+            },
             "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "MediaAlchemyst": "src"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -661,34 +677,40 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/romainneutron/MediaVorus",
-                "reference": "6741811aa4cb88c62f5300f3264c06c02bd5d0c9"
+                "reference": "000bb25ab0c33080c08190910618714e28aa4c84"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/romainneutron/MediaVorus/zipball/6741811aa4cb88c62f5300f3264c06c02bd5d0c9",
+                "url": "https://github.com/romainneutron/MediaVorus/archive/000bb25ab0c33080c08190910618714e28aa4c84.zip",
-                "reference": "6741811aa4cb88c62f5300f3264c06c02bd5d0c9",
+                "reference": "000bb25ab0c33080c08190910618714e28aa4c84",
                 "shasum": ""
             },
             "require": {
                 "phpexiftool/phpexiftool": "dev-master",
-                "symfony/http-foundation": ">2.0",
                 "php-ffmpeg/php-ffmpeg": "dev-master",
                 "php": ">=5.3.0",
                 "monolog/monolog": "1.0.*",
-                "symfony/console": ">2.0"
+                "symfony/http-foundation": ">2.0,<=2.2",
+                "symfony/console": ">2.0,<=2.2"
             },
             "require-dev": {
                 "fabpot/php-cs-fixer": "*",
-                "silex/silex": "dev-master"
+                "silex/silex": "1.0.*-dev"
             },
-            "time": "1347368981",
+            "time": "2012-12-14 09:20:49",
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.2.x-dev"
+                }
+            },
             "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "MediaVorus": "src"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -770,7 +792,7 @@
             "require-dev": {
                 "fabpot/php-cs-fixer": "master"
             },
-            "time": "1352408071",
+            "time": "2012-11-08 20:54:31",
             "type": "library",
             "installation-source": "source",
             "autoload": {
@@ -778,6 +800,7 @@
                     "Neutron": "src"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -812,7 +835,7 @@
                 "silex/silex": ">=1.0",
                 "symfony/filesystem": ">=2.0"
             },
-            "time": "1352408828",
+            "time": "2012-11-08 21:07:08",
             "type": "library",
             "installation-source": "source",
             "autoload": {
@@ -820,6 +843,7 @@
                     "Neutron": "src"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -843,12 +867,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/alchemy-fr/PHP-FFmpeg",
-                "reference": "60b2aeff24f2d9a68bee89789dc567c6c1352c00"
+                "reference": "014112a16f31b74e584b1ae7540f4b72960ebd9e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/alchemy-fr/PHP-FFmpeg/archive/60b2aeff24f2d9a68bee89789dc567c6c1352c00.zip",
+                "url": "https://github.com/alchemy-fr/PHP-FFmpeg/archive/014112a16f31b74e584b1ae7540f4b72960ebd9e.zip",
-                "reference": "60b2aeff24f2d9a68bee89789dc567c6c1352c00",
+                "reference": "014112a16f31b74e584b1ae7540f4b72960ebd9e",
                 "shasum": ""
             },
             "require": {
@@ -859,12 +883,13 @@
             "require-dev": {
                 "fabpot/php-cs-fixer": "master",
                 "sami/sami": "dev-master",
-                "silex/silex": "dev-master"
+                "silex/silex": "dev-master",
+                "phpunit/phpunit": "3.7.*"
             },
             "suggest": {
                 "php-ffmpeg/extras": "A compilation of common audio & video drivers for PHP-FFMpeg"
             },
-            "time": "1351638519",
+            "time": "2012-12-16 15:58:49",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -877,6 +902,7 @@
                     "FFMpeg": "src"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -927,7 +953,7 @@
                 "fabpot/php-cs-fixer": "dev-master",
                 "silex/silex": "dev-master"
             },
-            "time": "1349804408",
+            "time": "2012-10-09 17:40:08",
             "type": "library",
             "installation-source": "source",
             "autoload": {
@@ -935,6 +961,7 @@
                     "MP4Box": "src"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -962,7 +989,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/alchemy-fr/PHP-Unoconv/zipball/dd49df9be9ab649af37674f07393037727077124",
+                "url": "https://github.com/alchemy-fr/PHP-Unoconv/archive/dd49df9be9ab649af37674f07393037727077124.zip",
                 "reference": "dd49df9be9ab649af37674f07393037727077124",
                 "shasum": ""
             },
@@ -975,7 +1002,7 @@
                 "silex/silex": "dev-master",
                 "fabpot/php-cs-fixer": "dev-master"
             },
-            "time": "1349713000",
+            "time": "2012-10-08 16:16:40",
             "type": "library",
             "installation-source": "source",
             "autoload": {
@@ -983,6 +1010,7 @@
                     "Unoconv": "src"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -1024,7 +1052,7 @@
                 "sami/sami": "dev-master",
                 "silex/silex": "dev-master"
             },
-            "time": "1349703734",
+            "time": "2012-10-08 13:42:14",
             "type": "library",
             "installation-source": "source",
             "autoload": {
@@ -1032,6 +1060,7 @@
                     "XPDF": "src"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -1070,9 +1099,10 @@
             "require": {
                 "phpexiftool/phpexiftool": "*"
             },
-            "time": "1346256086",
+            "time": "2012-08-29 16:01:26",
             "type": "library",
             "installation-source": "source",
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "Perl Licensing"
             ],
@@ -1099,7 +1129,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/romainneutron/PHPExiftool/zipball/c72f9a88a74c1967fb14de62f342048c8311cb9b",
+                "url": "https://github.com/romainneutron/PHPExiftool/archive/c72f9a88a74c1967fb14de62f342048c8311cb9b.zip",
                 "reference": "c72f9a88a74c1967fb14de62f342048c8311cb9b",
                 "shasum": ""
             },
@@ -1118,7 +1148,7 @@
                 "sami/sami": "dev-master",
                 "silex/silex": "dev-master"
             },
-            "time": "1346681208",
+            "time": "2012-09-03 14:06:48",
             "type": "library",
             "installation-source": "source",
             "autoload": {
@@ -1126,6 +1156,7 @@
                     "PHPExiftool": "lib"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -1148,18 +1179,18 @@
             "source": {
                 "type": "git",
                 "url": "git://github.com/fabpot/Pimple.git",
-                "reference": "b9f27b8dc18c08f00627dec02359b46a24791dc3"
+                "reference": "v1.0.1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/fabpot/Pimple/zipball/b9f27b8dc18c08f00627dec02359b46a24791dc3",
+                "url": "https://github.com/fabpot/Pimple/archive/v1.0.1.zip",
-                "reference": "b9f27b8dc18c08f00627dec02359b46a24791dc3",
+                "reference": "v1.0.1",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
             },
-            "time": "1347278988",
+            "time": "2012-11-11 08:32:34",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1172,6 +1203,7 @@
                     "Pimple": "lib/"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -1194,12 +1226,12 @@
             "source": {
                 "type": "git",
                 "url": "git://github.com/fabpot/Silex.git",
-                "reference": "960f097be06f24d7d112deaa68fa904796435b85"
+                "reference": "c2dff3ca9e8ee4e5c9652a366c39eb3b3c91ca53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/fabpot/Silex/archive/960f097be06f24d7d112deaa68fa904796435b85.zip",
+                "url": "https://github.com/fabpot/Silex/archive/c2dff3ca9e8ee4e5c9652a366c39eb3b3c91ca53.zip",
-                "reference": "960f097be06f24d7d112deaa68fa904796435b85",
+                "reference": "c2dff3ca9e8ee4e5c9652a366c39eb3b3c91ca53",
                 "shasum": ""
             },
             "require": {
@@ -1234,7 +1266,7 @@
                 "symfony/css-selector": ">=2.1,<2.3-dev",
                 "symfony/dom-crawler": ">=2.1,<2.3-dev"
             },
-            "time": "1352464470",
+            "time": "2012-12-14 13:15:04",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1247,6 +1279,7 @@
                     "Silex": "src/"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -1277,7 +1310,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/alchemy-fr/PHPSwftools/zipball/9b79c0fb1f43a2e84c26e908d54b1ed98091510c",
+                "url": "https://github.com/alchemy-fr/PHPSwftools/archive/9b79c0fb1f43a2e84c26e908d54b1ed98091510c.zip",
                 "reference": "9b79c0fb1f43a2e84c26e908d54b1ed98091510c",
                 "shasum": ""
             },
@@ -1291,7 +1324,7 @@
                 "sami/sami": "dev-master",
                 "silex/silex": "dev-master"
             },
-            "time": "1349705213",
+            "time": "2012-10-08 14:06:53",
             "type": "library",
             "installation-source": "source",
             "autoload": {
@@ -1299,6 +1332,7 @@
                     "SwfTools": "src"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -1376,12 +1410,12 @@
             "source": {
                 "type": "git",
                 "url": "git://github.com/symfony/symfony.git",
-                "reference": "ae61d354c929cfb3865e3ea275dac1e1b6cd02ca"
+                "reference": "ab64da5671ec161ab73aba07fc011bc8de56ae41"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/symfony/archive/ae61d354c929cfb3865e3ea275dac1e1b6cd02ca.zip",
+                "url": "https://github.com/symfony/symfony/archive/ab64da5671ec161ab73aba07fc011bc8de56ae41.zip",
-                "reference": "ae61d354c929cfb3865e3ea275dac1e1b6cd02ca",
+                "reference": "ab64da5671ec161ab73aba07fc011bc8de56ae41",
                 "shasum": ""
             },
             "require": {
@@ -1430,13 +1464,8 @@
                 "propel/propel1": "dev-master",
                 "monolog/monolog": "1.*"
             },
-            "time": "1352469629",
+            "time": "2012-12-15 17:28:15",
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.1-dev"
-                }
-            },
             "installation-source": "source",
             "autoload": {
                 "psr-0": {
@@ -1444,6 +1473,7 @@
                     "SessionHandlerInterface": "src/Symfony/Component/HttpFoundation/Resources/stubs"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -1474,7 +1504,7 @@
             "require": {
                 "php": ">=5.3.0"
             },
-            "time": "1348597020",
+            "time": "2012-09-25 18:17:00",
             "type": "library",
             "installation-source": "source",
             "autoload": {
@@ -1524,18 +1554,18 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/fabpot/Twig-extensions",
-                "reference": "dcdff02fbac1282e6b8f4d0558cc7e9580105688"
+                "reference": "d1990ffaca93302709d1306d50ae153adb169f49"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/fabpot/Twig-extensions/zipball/dcdff02fbac1282e6b8f4d0558cc7e9580105688",
+                "url": "https://github.com/fabpot/Twig-extensions/archive/d1990ffaca93302709d1306d50ae153adb169f49.zip",
-                "reference": "dcdff02fbac1282e6b8f4d0558cc7e9580105688",
+                "reference": "d1990ffaca93302709d1306d50ae153adb169f49",
                 "shasum": ""
             },
             "require": {
                 "twig/twig": "1.*"
             },
-            "time": "1349889206",
+            "time": "2012-12-15 09:26:10",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1548,6 +1578,7 @@
                     "Twig_Extensions_": "lib/"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -1571,22 +1602,22 @@
             "source": {
                 "type": "git",
                 "url": "git://github.com/fabpot/Twig.git",
-                "reference": "1a10ea2fbb2291142b4ee03665591c0762315204"
+                "reference": "6c01c14fd8f42348a032148ebecb6e034e9e18bd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/fabpot/Twig/archive/1a10ea2fbb2291142b4ee03665591c0762315204.zip",
+                "url": "https://github.com/fabpot/Twig/archive/6c01c14fd8f42348a032148ebecb6e034e9e18bd.zip",
-                "reference": "1a10ea2fbb2291142b4ee03665591c0762315204",
+                "reference": "6c01c14fd8f42348a032148ebecb6e034e9e18bd",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.2.4"
             },
-            "time": "1352366711",
+            "time": "2012-12-16 07:55:06",
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.11-dev"
+                    "dev-master": "1.12-dev"
                 }
             },
             "installation-source": "source",
@@ -1595,6 +1626,7 @@
                     "Twig_": "lib/"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3"
             ],
@@ -1631,7 +1663,7 @@
             "require": {
                 "php": ">5.2.4"
             },
-            "time": "1336132669",
+            "time": "2012-05-04 11:57:49",
             "type": "library",
             "installation-source": "source",
             "autoload": {
@@ -1663,18 +1695,27 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/data-fixtures.git",
-                "reference": "a95d7839a7794c7c9b22d64e859ee70658d977fe"
+                "reference": "84cd1ca060e06bf5eb7066adb334adea4bf29fe7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/doctrine/data-fixtures/archive/a95d7839a7794c7c9b22d64e859ee70658d977fe.zip",
+                "url": "https://github.com/doctrine/data-fixtures/archive/84cd1ca060e06bf5eb7066adb334adea4bf29fe7.zip",
-                "reference": "a95d7839a7794c7c9b22d64e859ee70658d977fe",
+                "reference": "84cd1ca060e06bf5eb7066adb334adea4bf29fe7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.2"
+                "php": ">=5.3.2",
+                "doctrine/common": ">=2.2,<2.5-dev"
             },
-            "time": "1351735543",
+            "require-dev": {
+                "doctrine/orm": ">=2.2,<2.5-dev"
+            },
+            "suggest": {
+                "doctrine/orm": "For loading ORM fixtures",
+                "doctrine/mongodb-odm": "For loading MongoDB ODM fixtures",
+                "doctrine/phpcr-odm": "For loading PHPCR ODM fixtures"
+            },
+            "time": "2012-12-03 09:46:47",
             "type": "library",
             "installation-source": "source",
             "autoload": {
@@ -1682,6 +1723,7 @@
                     "Doctrine\\Common\\DataFixtures": "lib/"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -1704,12 +1746,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/fabpot/PHP-CS-Fixer.git",
-                "reference": "24df86b1a29a9f6151e495615123308542bcfb05"
+                "reference": "v0.1.0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/fabpot/PHP-CS-Fixer/zipball/24df86b1a29a9f6151e495615123308542bcfb05",
+                "url": "https://github.com/fabpot/PHP-CS-Fixer/archive/v0.1.0.zip",
-                "reference": "24df86b1a29a9f6151e495615123308542bcfb05",
+                "reference": "v0.1.0",
                 "shasum": ""
             },
             "require": {
@@ -1718,11 +1760,16 @@
                 "symfony/finder": "2.1.*",
                 "php": ">=5.3.3"
             },
-            "time": "1349504510",
+            "time": "2012-11-20 07:00:21",
             "bin": [
                 "php-cs-fixer"
             ],
             "type": "application",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.1.x-dev"
+                }
+            },
             "installation-source": "source",
             "autoload": {
                 "psr-0": {

lib/Alchemy/Phrasea/Command/Upgrade/Step35.php

@@ -177,14 +177,14 @@ class Step35 implements DatasUpgraderInterface
         foreach ($datas as $meta_struct_id => $values) {
             if (is_array($values)) {
                 foreach ($values as $value) {
-                    $metadatas[$meta_struct_id] = array(
+                    $metadatas[] = array(
                         'meta_struct_id' => $meta_struct_id
                         , 'meta_id'        => null
                         , 'value'          => $value
                     );
                 }
             } else {
-                $metadatas[$meta_struct_id] = array(
+                $metadatas[] = array(
                     'meta_struct_id' => $meta_struct_id
                     , 'meta_id'        => null
                     , 'value'          => $values
@@ -206,9 +206,9 @@ class Step35 implements DatasUpgraderInterface
     {
         static $stmt;
 
-        if ( ! $stmt) {
+        if (!isset($stmt[$databox->get_sbas_id()])) {
             $sql = 'UPDATE record SET originalname = :originalname WHERE record_id = :record_id';
-            $stmt = $databox->get_connection()->prepare($sql);
+            $stmt[$databox->get_sbas_id()] = $databox->get_connection()->prepare($sql);
         }
 
         $original = '';
@@ -223,7 +223,7 @@ class Step35 implements DatasUpgraderInterface
             }
         }
 
-        $stmt->execute(array(':originalname' => $original, ':record_id'    => $record['record_id']));
+        $stmt[$databox->get_sbas_id()]->execute(array(':originalname' => $original, ':record_id'    => $record['record_id']));
     }
 
     /**

lib/Alchemy/Phrasea/Command/UpgradeDBDatas.php

@@ -106,7 +106,7 @@ EOF
             throw new \Exception('No upgrade available');
         }
 
-        $time = 0;
+        $time = 30;
 
         foreach ($this->upgrades as $version) {
             $time += $version->getTimeEstimation();

lib/Alchemy/Phrasea/Controller/AbstractDelivery.php

@@ -60,14 +60,20 @@ abstract class AbstractDelivery implements ControllerProviderInterface
             $response->setLastModified($file->get_modification_date());
         }
 
-        if ($file->getDataboxSubdef()->get_class() == \databox_subdef::CLASS_THUMBNAIL) {
+        if (false === $record->is_grouping() && $subdef !== 'document') {
-            // default expiration is 5 days
+            try {
-            $expiration = 60 * 60 * 24 * 5;
+                if ($file->getDataboxSubdef()->get_class() == \databox_subdef::CLASS_THUMBNAIL) {
+                    // default expiration is 5 days
+                    $expiration = 60 * 60 * 24 * 5;
 
-            $response->setExpires(new \DateTime(sprintf('+%d seconds', $expiration)));
+                    $response->setExpires(new \DateTime(sprintf('+%d seconds', $expiration)));
 
-            $response->setMaxAge($expiration);
+                    $response->setMaxAge($expiration);
-            $response->setSharedMaxAge($expiration);
+                    $response->setSharedMaxAge($expiration);
+                }
+            } catch (\Exception $e) {
+
+            }
         }
 
         $response->headers->addCacheControlDirective('must-revalidate', true);

lib/Alchemy/Phrasea/Helper/Prod.php

@@ -33,7 +33,7 @@ class Prod extends Helper
             return $search_datas;
         }
 
-        $searchSet = $this->app['phraseanet.user']->getPrefs('search');
+        $searchSet = json_decode($user->getPrefs('search'), true);
 
         foreach ($this->app['phraseanet.user']->ACL()->get_granted_sbas() as $databox) {
             $sbas_id = $databox->get_sbas_id();
@@ -46,9 +46,8 @@ class Prod extends Helper
             );
 
             foreach ($this->app['phraseanet.user']->ACL()->get_granted_base(array(), array($databox->get_sbas_id())) as $coll) {
-                $selected = ($searchSet &&
+                $selected = (isset($searchSet['bases']) &&
-                    isset($searchSet->bases) &&
+                    isset($searchSet['bases'][$sbas_id])) ? (in_array($coll->get_base_id(), $searchSet['bases'][$sbas_id])) : true;
-                    isset($searchSet->bases->$sbas_id)) ? (in_array($coll->get_base_id(), $searchSet->bases->$sbas_id)) : true;
                 $bases[$sbas_id]['collections'][] =
                     array(
                         'selected' => $selected,

lib/Alchemy/Phrasea/Media/Subdef/Video.php

@@ -30,7 +30,7 @@ class Video extends Audio
     {
         parent::__construct();
 
-        $this->registerOption(new OptionType\Range(_('GOP size'), self::OPTION_GOPSIZE, 1, 200, 25));
+        $this->registerOption(new OptionType\Range(_('GOP size'), self::OPTION_GOPSIZE, 1, 300, 10));
         $this->registerOption(new OptionType\Range(_('Dimension'), self::OPTION_SIZE, 64, 2000, 600, 16));
         $this->registerOption(new OptionType\Range(_('Frame Rate'), self::OPTION_FRAMERATE, 1, 200, 20));
         $this->registerOption(new OptionType\Enum(_('Video Codec'), self::OPTION_VCODEC, array('libx264', 'libvpx', 'libtheora'), 'libx264'));

lib/classes/Browser.class.php

@@ -789,12 +789,15 @@ class Browser
     protected function checkBrowserChrome()
     {
         if (stripos($this->_agent, 'Chrome') !== false) {
-            $aresult = explode('/', stristr($this->_agent, 'Chrome'));
+            if (preg_match('/chrome\/([\.0-9]+) (mobile)?/i', $this->_agent, $matches)) {
-            $aversion = explode(' ', $aresult[1]);
+                $this->setVersion($matches[1]);
-            $this->setVersion($aversion[0]);
+                $this->setBrowser(self::BROWSER_CHROME);
-            $this->setBrowser(self::BROWSER_CHROME);
+                if (isset($matches[2])) {
+                    $this->setMobile(true);
+                }
 
-            return true;
+                return true;
+            }
         }
 
         return false;

lib/classes/User/Adapter.class.php

@@ -32,6 +32,7 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
     public static $locales = array(
         'ar_SA' => 'العربية'
         , 'de_DE' => 'Deutsch'
+        , 'nl_NL' => 'Dutch'
         , 'en_GB' => 'English'
         , 'es_ES' => 'Español'
         , 'fr_FR' => 'Français'

lib/classes/appbox.class.php

@@ -408,9 +408,9 @@ class appbox extends base
         $upgrader->add_steps_complete(1);
 
         if (version_compare($from_version, '3.1') < 0) {
-            $upgrader->addRecommendation(_('Your install requires data migration, please execute the following command'), 'bin/upgrader --from=3.1');
+            $upgrader->addRecommendation(_('Your install requires data migration, please execute the following command'), 'bin/setup system:upgrade-datas --from=3.1');
         } elseif (version_compare($from_version, '3.5') < 0) {
-            $upgrader->addRecommendation(_('Your install requires data migration, please execute the following command'), 'bin/upgrader --from=3.5');
+            $upgrader->addRecommendation(_('Your install requires data migration, please execute the following command'), 'bin/setup system:upgrade-datas --from=3.5');
         }
 
         if (version_compare($from_version, '3.7') < 0) {

lib/classes/databox/subdef.class.php

@@ -304,7 +304,19 @@ class databox_subdef
      */
     protected function buildAudioSubdef(SimpleXMLElement $sd)
     {
-        return new Audio();
+        $audio = new Audio();
+
+        if ($sd->acodec) {
+            $audio->setOptionValue(Audio::OPTION_ACODEC, (string) $sd->acodec);
+        }
+        if ($sd->bitrate) {
+            $audio->setOptionValue(Audio::OPTION_BITRATE, (int) $sd->bitrate);
+        }
+        if ($sd->audiosamplerate) {
+            $audio->setOptionValue(Audio::OPTION_AUDIOSAMPLERATE, (int) $sd->audiosamplerate);
+        }
+
+        return $audio;
     }
 
     /**
@@ -363,6 +375,12 @@ class databox_subdef
         if ($sd->bitrate) {
             $video->setOptionValue(Video::OPTION_BITRATE, (int) $sd->bitrate);
         }
+        if ($sd->audiosamplerate) {
+            $video->setOptionValue(Video::OPTION_AUDIOSAMPLERATE, (int) $sd->audiosamplerate);
+        }
+        if ($sd->GOPsize) {
+            $video->setOptionValue(Video::OPTION_GOPSIZE, (int) $sd->GOPsize);
+        }
 
         return $video;
     }

lib/classes/set/export.class.php

@@ -12,6 +12,7 @@
 use Alchemy\Phrasea\Application;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
+use Symfony\Component\HttpFoundation\Response;
 
 /**
  *
@@ -406,8 +407,6 @@ class set_export extends set_abstract
 
         $includeBusinessFields = !!$includeBusinessFields;
 
-        $unicode = new unicode();
-
         $files = array();
 
         $n_files = 0;
@@ -452,7 +451,7 @@ class set_export extends set_abstract
             if ($rename_title) {
                 $title = strip_tags($download_element->get_title(null, null, true));
 
-                $files[$id]['export_name'] = $unicode->remove_nonazAZ09($title, true);
+                $files[$id]['export_name'] = $this->app['unicode']->remove_nonazAZ09($title, true);
                 $rename_done = true;
             } else {
                 $files[$id]["export_name"] = $infos['filename'];
@@ -610,8 +609,8 @@ class set_export extends set_abstract
             $file_names[] = mb_strtolower($name);
             $files[$id]["export_name"] = $name;
 
-            $files[$id]["export_name"] = $unicode->remove_nonazAZ09($files[$id]["export_name"]);
+            $files[$id]["export_name"] = $this->app['unicode']->remove_nonazAZ09($files[$id]["export_name"]);
-            $files[$id]["original_name"] = $unicode->remove_nonazAZ09($files[$id]["original_name"]);
+            $files[$id]["original_name"] = $this->app['unicode']->remove_nonazAZ09($files[$id]["original_name"]);
 
             $i = 0;
             $name = utf8_decode($files[$id]["export_name"]);
@@ -712,8 +711,6 @@ class set_export extends set_abstract
 
         random::updateToken($app, $token, serialize($list));
 
-        $unicode = new \unicode();
-
         $toRemove = array();
 
         foreach ($files as $record) {
@@ -726,7 +723,7 @@ class set_export extends set_abstract
                             . $obj["ajout"]
                             . '.' . $obj["exportExt"];
 
-                        $name = $unicode->remove_diacritics($name);
+                        $name = $app['unicode']->remove_diacritics($name);
 
                         $zip->addFile($path, $name);
 
@@ -744,7 +741,6 @@ class set_export extends set_abstract
         $zip->close();
 
         $list['complete'] = true;
-        $unicode = null;
 
         random::updateToken($app, $token, serialize($list));
 
@@ -764,10 +760,10 @@ class set_export extends set_abstract
      */
     public static function stream_file(\registry $registry, $file, $exportname, $mime, $disposition = 'inline')
     {
-        $response = new Symfony\Component\HttpFoundation\Response();
+        $response = new Response();
 
         $disposition = $disposition === 'attachment' ? ResponseHeaderBag::DISPOSITION_ATTACHMENT : ResponseHeaderBag::DISPOSITION_INLINE;
-        $headerDisposition = $response->headers->makeDisposition($disposition, $exportname);
+        $headerDisposition = $response->headers->makeDisposition($disposition, $exportname, $this->app['unicode']->remove_nonazAZ09($exportname));
 
         if (is_file($file)) {
             if ($registry->get('GV_modxsendfile')) {

lib/conf.d/data_templates/en-simple.xml

@@ -311,7 +311,7 @@
         <Province src="IPTC:Province-State" />
         <Country src="IPTC:Country-PrimaryLocationName" />
         <OriginalRef src="IPTC:OriginalTransmissionReference" />
-        <Headline src="IPTC:Headline" report="1" />
+        <Headline src="IPTC:Headline" report="1" thumbtitle="1" />
         <Credit src="IPTC:Credit" report="1" />
         <Source src="IPTC:Source" />
         <Caption src="IPTC:Caption-Abstract" />

lib/conf.d/data_templates/fr-simple.xml

@@ -311,7 +311,7 @@
         <Province src="IPTC:Province-State" />
         <Pays src="IPTC:Country-PrimaryLocationName" />
         <ReferencesOriginales src="IPTC:OriginalTransmissionReference" />
-        <Titre src="IPTC:Headline" report="1" />
+        <Titre src="IPTC:Headline" report="1" thumbtitle="1" />
         <Credit src="IPTC:Credit" report="1" />
         <Source src="IPTC:Source" />
         <Legende src="IPTC:Caption-Abstract" />

templates/web/admin/databox/doc_structure.html.twig

@@ -17,6 +17,7 @@
     <option value="1" {% if title == '1' %}selected="selected"{% endif %}>{% trans 'Tous' %}</option>
     <option value="0" {% if title == '0' %}selected="selected"{% endif %}>{% trans 'Aucun' %}</option>
     <option value="fr" {% if title == 'fr' %}selected="selected"{% endif %}>{% trans 'Francais' %}</option>
+    <option value="nl" {% if title == 'nl' %}selected="selected"{% endif %}>{% trans 'Dutch' %}</option>
     <option value="de" {% if title == 'de' %}selected="selected"{% endif %}>{% trans 'Allemand' %}</option>
     <option value="en" {% if title == 'en' %}selected="selected"{% endif %}>{% trans 'Anglais' %}</option>
     <option value="ar" {% if title == 'ar' %}selected="selected"{% endif %}>{% trans 'Arabe' %}</option>
@@ -253,44 +254,46 @@
                     }
                 });
 
+                var current_field_label = $('#current_field_label');
+
                 $("#field_chooser").autocomplete({
                     source: "/admin/description/metadatas/search/",
                     minLength: 2,
                     select: function( event, ui ) {
-                        $('#current_field_label').val(ui.item.value);
+                        current_field_label.val(ui.item.value);
                     }
                 });
 
                 var buttons = {};
                 var dialog = $('#field_changer');
                 buttons['{% trans 'boutton::annuler' %}'] = function(){
-                    $('#field_changer').dialog('close');
+                    dialog.dialog('close');
                 };
 
                 $('#tag_remover').bind('click', function(){
-                    $('#current_field_label').val('');
+                    current_field_label.val('');
                 });
 
                 buttons['{% trans 'boutton::valider' %}'] = function(){
                     var field_id = $('input[name="field_id"]', dialog).val();
-                    $('#field_changer').dialog('close');
 
-                    $('#display_value_'+field_id).empty().append($('#current_field_label').val());
+                    $('#display_value_'+field_id).empty().append(current_field_label.val());
-                    $('input[name="src_'+field_id+'"]', container).val($('#current_field_label').val());
+                    $('input[name="src_'+field_id+'"]', container).val(current_field_label.val());
                     $('input[name="src_'+field_id+'"]', container).trigger('change');
                     $('.metafield_'+field_id, container).removeAttr('disabled');
+                    dialog.dialog('close');
                 };
-                $('#field_changer').dialog({
+                dialog.dialog({
                     modal:true,
                     buttons : buttons,
-                    draggable:false,
+                    draggable:true,
                     resizable:false
                 }).dialog('close');
 
                 $('a.field_change', container).bind('click', function(){
                     $('#field_chooser').val('');
                     var field_id = $('input',this).val();
-                    $('#current_field_label').val( $('input[name="src_'+field_id+'"]', container).val());
+                    current_field_label.val( $('input[name="src_'+field_id+'"]', container).val());
                     $('input[name="field_id"]', dialog).val(field_id);
                     dialog.dialog().dialog('open');
 

templates/web/common/dialog_export.html.twig

@@ -515,6 +515,7 @@
                     size : 'Alert',
                     closeOnEscape : true,
                     closeButton:true,
+                    title : '{% trans "Warning !" %}'
                 }, 2);
 
                 alert.setContent("{{ alert_message|e }}");
@@ -557,6 +558,7 @@
                     size : 'Alert',
                     closeOnEscape : true,
                     closeButton:true,
+                    title : '{% trans "Warning !" %}'
                 }, 2);
 
                 alert.setContent("{{ alert_message|e }}");
@@ -573,6 +575,7 @@
                     size : 'Alert',
                     closeOnEscape : true,
                     closeButton:true,
+                    title : '{% trans "Warning !" %}'
                 }, 2);
 
                 alert.setContent("{{ alert_message|e }}");
@@ -676,7 +679,15 @@
 
                         $('#order .order_button_loader').css('visibility','hidden');
 
-                        if( data.success )
+                        var options = {
+                          size : 'Alert',
+                          closeButton: true,
+                          title : '{% trans "Warning !" %}'
+                        };
+
+                        p4.Dialog.Create(options, 2).setContent(data.message);
+
+                        if(!data.error)
                         {
                             humane.info(data.msg);
                             dialog.Close();
@@ -719,6 +730,7 @@
                                 size : 'Alert',
                                 closeOnEscape : true,
                                 closeButton:true,
+                                title : '{% trans "Warning !" %}'
                             }, 2);
 
                             alert.setContent(data.message);
@@ -738,14 +750,14 @@
                     , options
                     , function(data){
                         $('#ftp .tryftp_button_loader').css('visibility','hidden');
-                        var msg;
-                        var alert = p4.Dialog.Create({
-                            size : 'Alert',
-                            closeOnEscape : true,
-                            closeButton:true,
-                        }, 2);
 
-                        alert.setContent(data.message);
+                        var options = {
+                          size : 'Alert',
+                          closeButton: true,
+                          title : '{% trans "Warning !" %}'
+                        };
+
+                        p4.Dialog.Create(options, 2).setContent(data);
 
                         $this.removeAttr('disabled');
 

templates/web/prod/TOU.html.twig

@@ -3,7 +3,7 @@
 {% block tou %}
         {% for name, TOU in TOUs %}
             <h1 style="text-align:center;font-weight:bold;font-size:16px;">{{ name }}</h1>
-            {{ TOU }}
+            {{ TOU | raw }}
             {% if loop.last == false %}
                 <hr/>
             {% endif %}

templates/web/prod/results/record.html.twig

@@ -66,9 +66,9 @@
                 </div>
             </div>
             <div style="height: 25px; position:relative; text-align:left;">
-                <table class="bottom" style="width:100%; table-layout:auto;">
+                <table class="bottom" style="width:100%; table-layout:fixed;">
                 <tr>
-                    <td style="text-align:left;">
+                    <td style="text-align:left;text-overflow:ellipsis;overflow:hidden;">
                     {{record.get_collection_logo(app)|raw}}
                     </td>
                     {% set l_width = 30 %}

tests/Alchemy/Phrasea/Application/ApiAbstract.inc

@@ -729,7 +729,7 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract
             foreach ($content['response']['termsOfUse'] as $terms) {
                 $this->assertTrue(is_array($terms), 'Une bloc cgu est un objet');
                 $this->assertArrayHasKey('locale', $terms);
-                $this->assertTrue(in_array($terms['locale'], array('fr_FR', 'en_GB', 'ar_SA', 'de_DE', 'es_ES')));
+                $this->assertTrue(in_array($terms['locale'], array('fr_FR', 'nl_NL', 'en_GB', 'ar_SA', 'de_DE', 'es_ES')));
                 $this->assertArrayHasKey('terms', $terms);
             }
         }

tests/Alchemy/Phrasea/Application/OverviewTest.php

@@ -2,8 +2,8 @@
 
 require_once __DIR__ . '/../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
 
-use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
-use \Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class ApplicationOverviewTest extends PhraseanetWebTestCaseAuthenticatedAbstract
 {
@@ -91,6 +91,29 @@ class ApplicationOverviewTest extends PhraseanetWebTestCaseAuthenticatedAbstract
         $this->get_a_permalink();
     }
 
+    public function testGetAStorythumbnail()
+    {
+        $story = \record_adapter::createStory(self::$collection);
+
+        $media = $this->getMockBuilder('MediaVorus\Media\Media')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $symfoFile = new UploadedFile(__DIR__ . '/../../../testfiles/cestlafete.jpg', 'cestlafete.jpg');
+
+        $media->expects($this->any())
+            ->method('getFile')
+            ->will($this->returnValue($symfoFile));
+
+        $story->substitute_subdef('thumbnail', $media);
+
+        $this->client->request('GET', '/datafiles/' . $story->get_sbas_id() . '/' . $story->get_record_id() . '/preview/');
+        $response = $this->client->getResponse();
+
+        $this->assertEquals(200, $response->getStatusCode());
+    }
+
+
     protected function get_a_permalink()
     {
         $token = self::$DI['record_1']->get_preview()->get_permalink()->get_token();

vendors.php

@@ -23,7 +23,7 @@ if ( ! file_exists($composer)) {
     system('curl -s http://getcomposer.org/installer | php');
     system('chmod +x ' . $composer);
 
-    if ($argv[1] == '--no-dev') {
+    if (isset($argv[1]) && $argv[1] == '--no-dev') {
         system($composer . ' install');
     } else {
         system($composer . ' install --dev');
@@ -36,7 +36,7 @@ if ( ! is_executable($composer)) {
 
 system($composer . ' self-update');
 
-if ($argv[1] == '--no-dev') {
+if (isset($argv[1]) && $argv[1] == '--no-dev') {
     system($composer . ' install');
 } else {
     system($composer . ' install --dev');