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

Update to the latest silex API

Browse Source
This commit is contained in:
Romain Neutron
2012-06-19 16:46:50 +02:00
parent 4bc55c0611
commit 4c7463cf29
30 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Alchemy/Phrasea/Controller/Admin/Description.php
View File

@@ -28,8 +28,7 @@ class Description implements ControllerProviderInterface
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = $app['controllers_factory'];
$controllers = new ControllerCollection();
$controllers->get('/metadatas/search/', function(Application $app, Request $request) { $controllers->get('/metadatas/search/', function(Application $app, Request $request) {

2
lib/Alchemy/Phrasea/Controller/Admin/Fields.php
View File

@@ -29,7 +29,7 @@ class Fields implements ControllerProviderInterface
{ {
$appbox = \appbox::get_instance($app['Core']); $appbox = \appbox::get_instance($app['Core']);
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
$controllers->get('/checkmulti/', function() use ($app, $appbox) { $controllers->get('/checkmulti/', function() use ($app, $appbox) {
$request = $app['request']; $request = $app['request'];

2
lib/Alchemy/Phrasea/Controller/Admin/Publications.php
View File

@@ -30,7 +30,7 @@ class Publications implements ControllerProviderInterface
$appbox = \appbox::get_instance($app['Core']); $appbox = \appbox::get_instance($app['Core']);
$session = $appbox->get_session(); $session = $appbox->get_session();
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
$controllers->get('/list/', function() use ($app, $appbox) { $controllers->get('/list/', function() use ($app, $appbox) {
$user = \User_Adapter::getInstance($appbox->get_session()->get_usr_id(), $appbox); $user = \User_Adapter::getInstance($appbox->get_session()->get_usr_id(), $appbox);

3
lib/Alchemy/Phrasea/Controller/Admin/Root.php
View File

@@ -32,8 +32,7 @@ class Root implements ControllerProviderInterface
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = $app['controllers_factory'];
$controllers = new ControllerCollection();
$controllers->get('/', function(Application $app, Request $request) { $controllers->get('/', function(Application $app, Request $request) {

2
lib/Alchemy/Phrasea/Controller/Admin/Subdefs.php
View File

@@ -29,7 +29,7 @@ class Subdefs implements ControllerProviderInterface
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
$controllers->get('/{sbas_id}/', function(Application $app, $sbas_id) { $controllers->get('/{sbas_id}/', function(Application $app, $sbas_id) {
$databox = \databox::get_instance((int) $sbas_id); $databox = \databox::get_instance((int) $sbas_id);

2
lib/Alchemy/Phrasea/Controller/Admin/Users.php
View File

@@ -31,7 +31,7 @@ class Users implements ControllerProviderInterface
{ {
$appbox = \appbox::get_instance($app['Core']); $appbox = \appbox::get_instance($app['Core']);
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
$controllers->post('/rights/', function(Application $app) { $controllers->post('/rights/', function(Application $app) {
$rights = new UserHelper\Edit($app['Core'], $app['request']); $rights = new UserHelper\Edit($app['Core'], $app['request']);

2
lib/Alchemy/Phrasea/Controller/Prod/Basket.php
View File

@@ -32,7 +32,7 @@ class Basket implements ControllerProviderInterface
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
/** /**
* This route is used to create a Basket * This route is used to create a Basket

2
lib/Alchemy/Phrasea/Controller/Prod/Bridge.php
View File

@@ -28,7 +28,7 @@ class Bridge implements ControllerProviderInterface
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
$appbox = \appbox::get_instance($app['Core']); $appbox = \appbox::get_instance($app['Core']);
/* @var $twig \Twig_Environment */ /* @var $twig \Twig_Environment */
$twig = $app['Core']->getTwig(); $twig = $app['Core']->getTwig();

2
lib/Alchemy/Phrasea/Controller/Prod/Edit.php
View File

@@ -28,7 +28,7 @@ class Edit implements ControllerProviderInterface
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
$controllers->post('/', function(Application $app, Request $request) { $controllers->post('/', function(Application $app, Request $request) {
$handler = new RecordHelper\Edit($app['Core'], $request); $handler = new RecordHelper\Edit($app['Core'], $request);

2
lib/Alchemy/Phrasea/Controller/Prod/Feed.php
View File

@@ -28,7 +28,7 @@ class Feed implements ControllerProviderInterface
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
/* @var $twig \Twig_Environment */ /* @var $twig \Twig_Environment */
$twig = $app['Core']->getTwig(); $twig = $app['Core']->getTwig();
$appbox = \appbox::get_instance($app['Core']); $appbox = \appbox::get_instance($app['Core']);

2
lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
View File

@@ -38,7 +38,7 @@ class Lazaret implements ControllerProviderInterface
*/ */
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
/** /**
* Lazaret Elements route * Lazaret Elements route

2
lib/Alchemy/Phrasea/Controller/Prod/MoveCollection.php
View File

@@ -27,7 +27,7 @@ class MoveCollection implements ControllerProviderInterface
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
$controllers->post('/', function(Application $app, Request $request) { $controllers->post('/', function(Application $app, Request $request) {
$request = $app['request']; $request = $app['request'];

2
lib/Alchemy/Phrasea/Controller/Prod/MustacheLoader.php
View File

@@ -27,7 +27,7 @@ class MustacheLoader implements ControllerProviderInterface
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
$controllers->get('/', function(Application $app, Request $request) { $controllers->get('/', function(Application $app, Request $request) {
$template_name = $request->get('template'); $template_name = $request->get('template');

2
lib/Alchemy/Phrasea/Controller/Prod/Printer.php
View File

@@ -28,7 +28,7 @@ class Printer implements ControllerProviderInterface
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
$controllers->post('/', function(Application $app) { $controllers->post('/', function(Application $app) {
$printer = new RecordHelper\Printer($app['Core'], $app['request']); $printer = new RecordHelper\Printer($app['Core'], $app['request']);

2
lib/Alchemy/Phrasea/Controller/Prod/Push.php
View File

@@ -94,7 +94,7 @@ class Push implements ControllerProviderInterface
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
$userFormatter = $this->getUserFormatter(); $userFormatter = $this->getUserFormatter();

2
lib/Alchemy/Phrasea/Controller/Prod/Query.php
View File

@@ -29,7 +29,7 @@ class Query implements ControllerProviderInterface
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
$controllers->match('/', function(Application $app, Request $request) { $controllers->match('/', function(Application $app, Request $request) {

2
lib/Alchemy/Phrasea/Controller/Prod/Root.php
View File

@@ -32,7 +32,7 @@ class Root implements ControllerProviderInterface
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
$controllers->get('/', function(Application $app) { $controllers->get('/', function(Application $app) {

2
lib/Alchemy/Phrasea/Controller/Prod/Story.php
View File

@@ -33,7 +33,7 @@ class Story implements ControllerProviderInterface
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
$controllers->get('/create/', function(Application $app) { $controllers->get('/create/', function(Application $app) {
/* @var $twig \Twig_Environment */ /* @var $twig \Twig_Environment */

2
lib/Alchemy/Phrasea/Controller/Prod/TOU.php
View File

@@ -27,7 +27,7 @@ class TOU implements ControllerProviderInterface
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
$controllers->post('/deny/{sbas_id}/', function(Application $app, Request $request, $sbas_id) { $controllers->post('/deny/{sbas_id}/', function(Application $app, Request $request, $sbas_id) {
$ret = array('success' => false, 'message' => ''); $ret = array('success' => false, 'message' => '');

2
lib/Alchemy/Phrasea/Controller/Prod/Tools.php
View File

@@ -30,7 +30,7 @@ class Tools implements ControllerProviderInterface
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
$controllers->get('/', function(Application $app, Request $request) { $controllers->get('/', function(Application $app, Request $request) {
$helper = new Helper\Record\Tools($app['Core'], $request); $helper = new Helper\Record\Tools($app['Core'], $request);

2
lib/Alchemy/Phrasea/Controller/Prod/Tooltip.php
View File

@@ -27,7 +27,7 @@ class Tooltip implements ControllerProviderInterface
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
$app['appbox'] = \appbox::get_instance($app['Core']); $app['appbox'] = \appbox::get_instance($app['Core']);
$controllers->post('/basket/{basket_id}/' $controllers->post('/basket/{basket_id}/'

2
lib/Alchemy/Phrasea/Controller/Prod/Upload.php
View File

@@ -39,7 +39,7 @@ class Upload implements ControllerProviderInterface
*/ */
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
/** /**
* Upload form route * Upload form route

2
lib/Alchemy/Phrasea/Controller/Prod/UserPreferences.php
View File

@@ -32,7 +32,7 @@ class UserPreferences implements ControllerProviderInterface
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
$controllers->post('/save/', function(Application $app, Request $request) { $controllers->post('/save/', function(Application $app, Request $request) {
$ret = array('success' => false, 'message' => _('Error while saving preference')); $ret = array('success' => false, 'message' => _('Error while saving preference'));

2
lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php
View File

@@ -31,7 +31,7 @@ class UsrLists implements ControllerProviderInterface
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
/** /**
* Get all lists * Get all lists

2
lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php
View File

@@ -32,7 +32,7 @@ class WorkZone implements ControllerProviderInterface
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
$controllers->get('/', function(Application $app) { $controllers->get('/', function(Application $app) {
$params = array( $params = array(

2
lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
View File

@@ -29,7 +29,7 @@ class RSSFeeds implements ControllerProviderInterface
{ {
$appbox = \appbox::get_instance($app['Core']); $appbox = \appbox::get_instance($app['Core']);
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
$display_feed = function($feed, $format, $page, $user = null) { $display_feed = function($feed, $format, $page, $user = null) {
$total = $feed->get_count_total_entries(); $total = $feed->get_count_total_entries();

2
lib/Alchemy/Phrasea/Controller/Setup/Installer.php
View File

@@ -27,7 +27,7 @@ class Installer implements ControllerProviderInterface
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
$controllers->get('/', function() use ($app) { $controllers->get('/', function() use ($app) {
$request = $app['request']; $request = $app['request'];

2
lib/Alchemy/Phrasea/Controller/Setup/Upgrader.php
View File

@@ -26,7 +26,7 @@ class Upgrader implements ControllerProviderInterface
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
$controllers->get('/', function() use ($app) { $controllers->get('/', function() use ($app) {
require_once __DIR__ . '/../../../../bootstrap.php'; require_once __DIR__ . '/../../../../bootstrap.php';

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

@@ -27,7 +27,7 @@ class ConnectionTest implements ControllerProviderInterface
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
$controllers->get('/mysql/', function() use ($app) { $controllers->get('/mysql/', function() use ($app) {
require_once __DIR__ . '/../../../../classes/connection/pdo.class.php'; require_once __DIR__ . '/../../../../classes/connection/pdo.class.php';

2
lib/Alchemy/Phrasea/Controller/Utils/PathFileTest.php
View File

@@ -27,7 +27,7 @@ class PathFileTest implements ControllerProviderInterface
public function connect(Application $app) public function connect(Application $app)
{ {
$controllers = new ControllerCollection(); $controllers = $app['controllers_factory'];
$controllers->get('/path/', function() use ($app) { $controllers->get('/path/', function() use ($app) {
$path = $app['request']->get('path'); $path = $app['request']->get('path');