mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 18:03:17 +00:00
Bump to Symfony 2.4 and Silex 1.1
This commit is contained in:
@@ -22,7 +22,7 @@
|
||||
"justinrainbow/json-schema" : "~1.3",
|
||||
"mediavorus/mediavorus" : "~0.4.0",
|
||||
"media-alchemyst/media-alchemyst" : "~0.3.1",
|
||||
"monolog/monolog" : "~1.3.0",
|
||||
"monolog/monolog" : "~1.3",
|
||||
"mrclay/minify" : "~2.1.6",
|
||||
"neutron/silex-imagine-provider" : "~0.1.0",
|
||||
"neutron/silex-filesystem-provider": "~1.0",
|
||||
@@ -31,10 +31,10 @@
|
||||
"neutron/temporary-filesystem" : "~2.1",
|
||||
"php-xpdf/php-xpdf" : "~0.2.1",
|
||||
"phpexiftool/phpexiftool" : "~0.3",
|
||||
"silex/silex" : "~1.0.0",
|
||||
"silex/silex" : "1.1.x-dev@dev",
|
||||
"silex/web-profiler" : "~1.0.0",
|
||||
"swiftmailer/swiftmailer" : "~4.3.0",
|
||||
"symfony/symfony" : "~2.3",
|
||||
"symfony/symfony" : "2.4.x-dev@dev",
|
||||
"tecnick.com/tcpdf" : "~6.0",
|
||||
"themattharris/tmhoauth" : "~0.7",
|
||||
"twig/twig" : "~1.12",
|
||||
@@ -45,6 +45,7 @@
|
||||
"doctrine/data-fixtures" : "1.0.x@dev",
|
||||
"phpunit/phpunit" : "~3.7",
|
||||
"behat/behat" : "~2.4",
|
||||
"behat/gherkin" : "dev-develop@dev",
|
||||
"behat/mink" : "~1.4",
|
||||
"behat/mink-extension" : "~1.0",
|
||||
"behat/mink-goutte-driver" : "~1.0",
|
||||
|
657
composer.lock
generated
657
composer.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -17,6 +17,8 @@ use Silex\ControllerProviderInterface;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||
use Symfony\Component\HttpKernel\Event\PostResponseEvent;
|
||||
use Symfony\Component\HttpKernel\KernelEvents;
|
||||
|
||||
class DoDownload implements ControllerProviderInterface
|
||||
{
|
||||
@@ -161,12 +163,12 @@ class DoDownload implements ControllerProviderInterface
|
||||
$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(
|
||||
$app,
|
||||
$list,
|
||||
$request->request->get('type'),
|
||||
(null !== $request->request->get('anonymous') ? true : false),
|
||||
$event->getRequest()->request->get('type'),
|
||||
(null !== $event->getRequest()->request->get('anonymous') ? true : false),
|
||||
(isset($list['email']) ? $list['email'] : '')
|
||||
);
|
||||
});
|
||||
|
Reference in New Issue
Block a user