hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 02:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump to Symfony 2.4 and Silex 1.1

Browse Source
This commit is contained in:
Romain Neutron
2013-08-22 14:18:39 +02:00
parent 4266766221
commit a2bbdc88d4
3 changed files with 341 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
composer.json
View File

@@ -22,7 +22,7 @@
"justinrainbow/json-schema" : "~1.3", "justinrainbow/json-schema" : "~1.3",
"mediavorus/mediavorus" : "~0.4.0", "mediavorus/mediavorus" : "~0.4.0",
"media-alchemyst/media-alchemyst" : "~0.3.1", "media-alchemyst/media-alchemyst" : "~0.3.1",
"monolog/monolog" : "~1.3.0", "monolog/monolog" : "~1.3",
"mrclay/minify" : "~2.1.6", "mrclay/minify" : "~2.1.6",
"neutron/silex-imagine-provider" : "~0.1.0", "neutron/silex-imagine-provider" : "~0.1.0",
"neutron/silex-filesystem-provider": "~1.0", "neutron/silex-filesystem-provider": "~1.0",
@@ -31,10 +31,10 @@
"neutron/temporary-filesystem" : "~2.1", "neutron/temporary-filesystem" : "~2.1",
"php-xpdf/php-xpdf" : "~0.2.1", "php-xpdf/php-xpdf" : "~0.2.1",
"phpexiftool/phpexiftool" : "~0.3", "phpexiftool/phpexiftool" : "~0.3",
"silex/silex" : "~1.0.0", "silex/silex" : "1.1.x-dev@dev",
"silex/web-profiler" : "~1.0.0", "silex/web-profiler" : "~1.0.0",
"swiftmailer/swiftmailer" : "~4.3.0", "swiftmailer/swiftmailer" : "~4.3.0",
"symfony/symfony" : "~2.3", "symfony/symfony" : "2.4.x-dev@dev",
"tecnick.com/tcpdf" : "~6.0", "tecnick.com/tcpdf" : "~6.0",
"themattharris/tmhoauth" : "~0.7", "themattharris/tmhoauth" : "~0.7",
"twig/twig" : "~1.12", "twig/twig" : "~1.12",
@@ -45,6 +45,7 @@
"doctrine/data-fixtures" : "1.0.x@dev", "doctrine/data-fixtures" : "1.0.x@dev",
"phpunit/phpunit" : "~3.7", "phpunit/phpunit" : "~3.7",
"behat/behat" : "~2.4", "behat/behat" : "~2.4",
"behat/gherkin" : "dev-develop@dev",
"behat/mink" : "~1.4", "behat/mink" : "~1.4",
"behat/mink-extension" : "~1.0", "behat/mink-extension" : "~1.0",
"behat/mink-goutte-driver" : "~1.0", "behat/mink-goutte-driver" : "~1.0",

657
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

8
lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
View File

@@ -17,6 +17,8 @@ use Silex\ControllerProviderInterface;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpKernel\Event\PostResponseEvent;
use Symfony\Component\HttpKernel\KernelEvents;
class DoDownload implements ControllerProviderInterface class DoDownload implements ControllerProviderInterface
{ {
@@ -161,12 +163,12 @@ class DoDownload implements ControllerProviderInterface
$app->abort(404, 'Download file not found'); $app->abort(404, 'Download file not found');
} }
$app->finish(function ($request, $response) use ($list, $app) { $app['dispatcher']->addListener(KernelEvents::TERMINATE, function (PostResponseEvent $event) use ($list, $app) {
\set_export::log_download( \set_export::log_download(
$app, $app,
$list, $list,
$request->request->get('type'), $event->getRequest()->request->get('type'),
(null !== $request->request->get('anonymous') ? true : false), (null !== $event->getRequest()->request->get('anonymous') ? true : false),
(isset($list['email']) ? $list['email'] : '') (isset($list['email']) ? $list['email'] : '')
); );
}); });