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

Code cleanup

Browse Source
This commit is contained in:
Romain Neutron
2012-07-18 19:11:15 +02:00
parent 5d99aa0b03
commit 431e1278b0
13 changed files with 489 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Alchemy/Phrasea/Controller/Utils/ConnectionTest.php
View File

@@ -11,11 +11,8 @@
namespace Alchemy\Phrasea\Controller\Utils;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Silex\Application;
use Silex\ControllerProviderInterface;
use Silex\ControllerCollection;
/**
*
@@ -29,7 +26,7 @@ class ConnectionTest implements ControllerProviderInterface
{
$controllers = $app['controllers_factory'];
$controllers->get('/mysql/', function() use ($app) {
$controllers->get('/mysql/', function(Application $app) {
require_once __DIR__ . '/../../../../classes/connection/pdo.class.php';
$request = $app['request'];
@@ -75,8 +72,6 @@ class ConnectionTest implements ControllerProviderInterface
}
}
$Serializer = $app['phraseanet.core']['Serializer'];
$datas = array(
'connection' => $connection_ok
, 'database' => $db_ok
@@ -85,14 +80,9 @@ class ConnectionTest implements ControllerProviderInterface
, 'is_databox' => $is_databox
);
return new Response(
$Serializer->serialize($datas, 'json')
, 200
, array('content-type' => 'application/json')
);
return $app->json($app['phraseanet.core']['Serializer']->serialize($datas, 'json'));
});
return $controllers;
}
}