Rename Controller to ControllerProvider

lib/Alchemy/Phrasea/Application.php

@@ -11,63 +11,63 @@
 
 namespace Alchemy\Phrasea;
 
-use Alchemy\Phrasea\Controller\Lightbox;
-use Alchemy\Phrasea\Controller\Datafiles;
-use Alchemy\Phrasea\Controller\Permalink;
-use Alchemy\Phrasea\Controller\Admin\Collection;
-use Alchemy\Phrasea\Controller\Admin\ConnectedUsers;
-use Alchemy\Phrasea\Controller\Admin\Dashboard;
-use Alchemy\Phrasea\Controller\Admin\Databox;
-use Alchemy\Phrasea\Controller\Admin\Databoxes;
-use Alchemy\Phrasea\Controller\Admin\Fields;
-use Alchemy\Phrasea\Controller\Admin\Publications;
-use Alchemy\Phrasea\Controller\Admin\Root as AdminRoot;
-use Alchemy\Phrasea\Controller\Admin\Setup;
-use Alchemy\Phrasea\Controller\Admin\SearchEngine;
-use Alchemy\Phrasea\Controller\Admin\Subdefs;
-use Alchemy\Phrasea\Controller\Admin\TaskManager;
-use Alchemy\Phrasea\Controller\Admin\Users;
-use Alchemy\Phrasea\Controller\Client\Root as ClientRoot;
-use Alchemy\Phrasea\Controller\Minifier;
-use Alchemy\Phrasea\Controller\Prod\BasketController;
-use Alchemy\Phrasea\Controller\Prod\Bridge;
-use Alchemy\Phrasea\Controller\Prod\Download;
-use Alchemy\Phrasea\Controller\Prod\DoDownload;
-use Alchemy\Phrasea\Controller\Prod\Edit;
-use Alchemy\Phrasea\Controller\Prod\Export;
-use Alchemy\Phrasea\Controller\Prod\Feed;
-use Alchemy\Phrasea\Controller\Prod\Language;
-use Alchemy\Phrasea\Controller\Prod\Lazaret;
-use Alchemy\Phrasea\Controller\Prod\MoveCollection;
-use Alchemy\Phrasea\Controller\Prod\Order;
-use Alchemy\Phrasea\Controller\Prod\Printer;
-use Alchemy\Phrasea\Controller\Prod\Push;
-use Alchemy\Phrasea\Controller\Prod\Query;
-use Alchemy\Phrasea\Controller\Prod\Property;
-use Alchemy\Phrasea\Controller\Prod\Records;
-use Alchemy\Phrasea\Controller\Prod\Root as Prod;
-use Alchemy\Phrasea\Controller\Prod\Share;
-use Alchemy\Phrasea\Controller\Prod\Story;
-use Alchemy\Phrasea\Controller\Prod\Tools;
-use Alchemy\Phrasea\Controller\Prod\Tooltip;
-use Alchemy\Phrasea\Controller\Prod\TOU;
-use Alchemy\Phrasea\Controller\Prod\Upload;
-use Alchemy\Phrasea\Controller\Prod\UsrLists;
-use Alchemy\Phrasea\Controller\Prod\WorkZone;
-use Alchemy\Phrasea\Controller\Report\Activity as ReportActivity;
-use Alchemy\Phrasea\Controller\Report\Informations as ReportInformations;
-use Alchemy\Phrasea\Controller\Report\Root as ReportRoot;
-use Alchemy\Phrasea\Controller\Root\Account;
-use Alchemy\Phrasea\Controller\Root\Developers;
-use Alchemy\Phrasea\Controller\Root\Login;
-use Alchemy\Phrasea\Controller\Root\Root;
-use Alchemy\Phrasea\Controller\Root\RSSFeeds;
-use Alchemy\Phrasea\Controller\Root\Session;
-use Alchemy\Phrasea\Controller\Setup as SetupController;
-use Alchemy\Phrasea\Controller\Thesaurus\Thesaurus;
-use Alchemy\Phrasea\Controller\Thesaurus\Xmlhttp as ThesaurusXMLHttp;
-use Alchemy\Phrasea\Controller\User\Notifications;
-use Alchemy\Phrasea\Controller\User\Preferences;
+use Alchemy\Phrasea\ControllerProvider\Lightbox;
+use Alchemy\Phrasea\ControllerProvider\Datafiles;
+use Alchemy\Phrasea\ControllerProvider\Permalink;
+use Alchemy\Phrasea\ControllerProvider\Admin\Collection;
+use Alchemy\Phrasea\ControllerProvider\Admin\ConnectedUsers;
+use Alchemy\Phrasea\ControllerProvider\Admin\Dashboard;
+use Alchemy\Phrasea\ControllerProvider\Admin\Databox;
+use Alchemy\Phrasea\ControllerProvider\Admin\Databoxes;
+use Alchemy\Phrasea\ControllerProvider\Admin\Fields;
+use Alchemy\Phrasea\ControllerProvider\Admin\Publications;
+use Alchemy\Phrasea\ControllerProvider\Admin\Root as AdminRoot;
+use Alchemy\Phrasea\ControllerProvider\Admin\Setup;
+use Alchemy\Phrasea\ControllerProvider\Admin\SearchEngine;
+use Alchemy\Phrasea\ControllerProvider\Admin\Subdefs;
+use Alchemy\Phrasea\ControllerProvider\Admin\TaskManager;
+use Alchemy\Phrasea\ControllerProvider\Admin\Users;
+use Alchemy\Phrasea\ControllerProvider\Client\Root as ClientRoot;
+use Alchemy\Phrasea\ControllerProvider\Minifier;
+use Alchemy\Phrasea\ControllerProvider\Prod\BasketController;
+use Alchemy\Phrasea\ControllerProvider\Prod\Bridge;
+use Alchemy\Phrasea\ControllerProvider\Prod\Download;
+use Alchemy\Phrasea\ControllerProvider\Prod\DoDownload;
+use Alchemy\Phrasea\ControllerProvider\Prod\Edit;
+use Alchemy\Phrasea\ControllerProvider\Prod\Export;
+use Alchemy\Phrasea\ControllerProvider\Prod\Feed;
+use Alchemy\Phrasea\ControllerProvider\Prod\Language;
+use Alchemy\Phrasea\ControllerProvider\Prod\Lazaret;
+use Alchemy\Phrasea\ControllerProvider\Prod\MoveCollection;
+use Alchemy\Phrasea\ControllerProvider\Prod\Order;
+use Alchemy\Phrasea\ControllerProvider\Prod\Printer;
+use Alchemy\Phrasea\ControllerProvider\Prod\Push;
+use Alchemy\Phrasea\ControllerProvider\Prod\Query;
+use Alchemy\Phrasea\ControllerProvider\Prod\Property;
+use Alchemy\Phrasea\ControllerProvider\Prod\Records;
+use Alchemy\Phrasea\ControllerProvider\Prod\Root as Prod;
+use Alchemy\Phrasea\ControllerProvider\Prod\Share;
+use Alchemy\Phrasea\ControllerProvider\Prod\Story;
+use Alchemy\Phrasea\ControllerProvider\Prod\Tools;
+use Alchemy\Phrasea\ControllerProvider\Prod\Tooltip;
+use Alchemy\Phrasea\ControllerProvider\Prod\TOU;
+use Alchemy\Phrasea\ControllerProvider\Prod\Upload;
+use Alchemy\Phrasea\ControllerProvider\Prod\UsrLists;
+use Alchemy\Phrasea\ControllerProvider\Prod\WorkZone;
+use Alchemy\Phrasea\ControllerProvider\Report\Activity as ReportActivity;
+use Alchemy\Phrasea\ControllerProvider\Report\Informations as ReportInformations;
+use Alchemy\Phrasea\ControllerProvider\Report\Root as ReportRoot;
+use Alchemy\Phrasea\ControllerProvider\Root\Account;
+use Alchemy\Phrasea\ControllerProvider\Root\Developers;
+use Alchemy\Phrasea\ControllerProvider\Root\Login;
+use Alchemy\Phrasea\ControllerProvider\Root\Root;
+use Alchemy\Phrasea\ControllerProvider\Root\RSSFeeds;
+use Alchemy\Phrasea\ControllerProvider\Root\Session;
+use Alchemy\Phrasea\ControllerProvider\Setup as SetupController;
+use Alchemy\Phrasea\ControllerProvider\Thesaurus\Thesaurus;
+use Alchemy\Phrasea\ControllerProvider\Thesaurus\Xmlhttp as ThesaurusXMLHttp;
+use Alchemy\Phrasea\ControllerProvider\User\Notifications;
+use Alchemy\Phrasea\ControllerProvider\User\Preferences;
 use Alchemy\Phrasea\Core\Event\Subscriber\BasketSubscriber;
 use Alchemy\Phrasea\Core\Event\Subscriber\BridgeSubscriber;
 use Alchemy\Phrasea\Core\Event\Subscriber\ExportSubscriber;

lib/Alchemy/Phrasea/Application/Api.php

@@ -12,17 +12,17 @@
 namespace Alchemy\Phrasea\Application;
 
 use Alchemy\Phrasea\Application as PhraseaApplication;
-use Alchemy\Phrasea\Controller\Minifier;
-use Alchemy\Phrasea\Controller\Permalink;
-use Alchemy\Phrasea\Controller\Datafiles;
-use Alchemy\Phrasea\Core\Event\Subscriber\ApiCorsSubscriber;
-use Alchemy\Phrasea\Core\PhraseaEvents;
-use Alchemy\Phrasea\Controller\Api\Oauth2;
 use Alchemy\Phrasea\Controller\Api\Result;
-use Alchemy\Phrasea\Controller\Api\V1;
+use Alchemy\Phrasea\ControllerProvider\Api\Oauth2;
+use Alchemy\Phrasea\ControllerProvider\Api\V1;
+use Alchemy\Phrasea\ControllerProvider\Datafiles;
+use Alchemy\Phrasea\ControllerProvider\Minifier;
+use Alchemy\Phrasea\ControllerProvider\Permalink;
 use Alchemy\Phrasea\Core\Event\ApiResultEvent;
-use Alchemy\Phrasea\Core\Event\Subscriber\ApiOauth2ErrorsSubscriber;
+use Alchemy\Phrasea\Core\Event\Subscriber\ApiCorsSubscriber;
 use Alchemy\Phrasea\Core\Event\Subscriber\ApiExceptionHandlerSubscriber;
+use Alchemy\Phrasea\Core\Event\Subscriber\ApiOauth2ErrorsSubscriber;
+use Alchemy\Phrasea\Core\PhraseaEvents;
 use Alchemy\Phrasea\Core\Provider\JsonSchemaServiceProvider;
 use Monolog\Logger;
 use Monolog\Processor\WebProcessor;

lib/Alchemy/Phrasea/Controller/Api/Result.php

@@ -11,7 +11,7 @@
 
 namespace Alchemy\Phrasea\Controller\Api;
 
-use Silex\Application;
+use Alchemy\Phrasea\ControllerProvider\Api\V1;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;

lib/Alchemy/Phrasea/ControllerProvider/Admin/Collection.php

@@ -9,10 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Admin;
+namespace Alchemy\Phrasea\ControllerProvider\Admin;
 
 use Alchemy\Phrasea\Exception\RuntimeException;
 use Silex\Application;
+use Silex\ControllerCollection;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -25,11 +26,12 @@ class Collection implements ControllerProviderInterface
     {
         $app['controller.admin.collection'] = $this;
 
+        /** @var ControllerCollection $controllers */
         $controllers = $app['controllers_factory'];
 
         $app['firewall']->addMandatoryAuthentication($controllers);
 
-        $controllers->before(function (Request $request) use ($app) {
+        $controllers->before(function () use ($app) {
             $app['firewall']->requireAccessToModule('admin')
                 ->requireRightOnBase($app['request']->attributes->get('bas_id'), 'canadmin');
         });

lib/Alchemy/Phrasea/ControllerProvider/Admin/ConnectedUsers.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Admin;
+namespace Alchemy\Phrasea\ControllerProvider\Admin;
 
 use Alchemy\Geonames\Exception\ExceptionInterface as GeonamesExceptionInterface;
 use Silex\Application;

lib/Alchemy/Phrasea/ControllerProvider/Admin/Dashboard.php

@@ -9,8 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Admin;
+namespace Alchemy\Phrasea\ControllerProvider\Admin;
 
+use Alchemy\Phrasea\Controller\Admin\RedirectResponse;
 use Alchemy\Phrasea\Notification\Receiver;
 use Alchemy\Phrasea\Notification\Mail\MailTest;
 use Alchemy\Phrasea\Exception\InvalidArgumentException;

lib/Alchemy/Phrasea/ControllerProvider/Admin/Databox.php

@@ -9,8 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Admin;
+namespace Alchemy\Phrasea\ControllerProvider\Admin;
 
+use Alchemy\Phrasea\Controller\Admin\JsonResponse;
+use Alchemy\Phrasea\Controller\Admin\RedirectResponse;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\Request;

lib/Alchemy/Phrasea/ControllerProvider/Admin/Databoxes.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Admin;
+namespace Alchemy\Phrasea\ControllerProvider\Admin;
 
 use Doctrine\DBAL\DBALException;
 use Silex\Application;

lib/Alchemy/Phrasea/ControllerProvider/Admin/Fields.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Admin;
+namespace Alchemy\Phrasea\ControllerProvider\Admin;
 
 use Alchemy\Phrasea\Metadata\TagProvider;
 use Alchemy\Phrasea\Vocabulary\Controller as VocabularyController;

lib/Alchemy/Phrasea/ControllerProvider/Admin/Publications.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Admin;
+namespace Alchemy\Phrasea\ControllerProvider\Admin;
 
 use Alchemy\Phrasea\Application as PhraseaApplication;
 use Alchemy\Phrasea\Model\Entities\Feed;

lib/Alchemy/Phrasea/ControllerProvider/Admin/Root.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Admin;
+namespace Alchemy\Phrasea\ControllerProvider\Admin;
 
 use Alchemy\Phrasea\Exception\SessionNotFound;
 use Alchemy\Phrasea\Helper\DatabaseHelper;

lib/Alchemy/Phrasea/ControllerProvider/Admin/SearchEngine.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Admin;
+namespace Alchemy\Phrasea\ControllerProvider\Admin;
 
 use Alchemy\Phrasea\Application as PhraseaApplication;
 use Symfony\Component\HttpFoundation\Request;

lib/Alchemy/Phrasea/ControllerProvider/Admin/Setup.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Admin;
+namespace Alchemy\Phrasea\ControllerProvider\Admin;
 
 use Alchemy\Phrasea\Application;
 use Silex\Application as SilexApplication;

lib/Alchemy/Phrasea/ControllerProvider/Admin/Subdefs.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Admin;
+namespace Alchemy\Phrasea\ControllerProvider\Admin;
 
 use Silex\Application;
 use Silex\ControllerProviderInterface;

lib/Alchemy/Phrasea/ControllerProvider/Admin/TaskManager.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Admin;
+namespace Alchemy\Phrasea\ControllerProvider\Admin;
 
 use Alchemy\Phrasea\Exception\InvalidArgumentException;
 use Alchemy\Phrasea\Exception\RuntimeException;

lib/Alchemy/Phrasea/ControllerProvider/Admin/Users.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Admin;
+namespace Alchemy\Phrasea\ControllerProvider\Admin;
 
 use Alchemy\Phrasea\Core\Response\CSVFileResponse;
 use Alchemy\Phrasea\Helper\User as UserHelper;

lib/Alchemy/Phrasea/ControllerProvider/Api/Oauth2.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Api;
+namespace Alchemy\Phrasea\ControllerProvider\Api;
 
 use Alchemy\Phrasea\Authentication\Context;
 use Alchemy\Phrasea\Authentication\Exception\AccountLockedException;

lib/Alchemy/Phrasea/ControllerProvider/Api/V1.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Api;
+namespace Alchemy\Phrasea\ControllerProvider\Api;
 
 use Alchemy\Phrasea\Authentication\Context;
 use Alchemy\Phrasea\Border\Attribute\Status;
@@ -17,6 +17,16 @@ use Alchemy\Phrasea\Border\File;
 use Alchemy\Phrasea\Border\Manager as BorderManager;
 use Alchemy\Phrasea\Border\Manager;
 use Alchemy\Phrasea\Cache\Cache as CacheInterface;
+use Alchemy\Phrasea\Controller\Api\API_V1_exception_badrequest;
+use Alchemy\Phrasea\Controller\Api\API_V1_exception_forbidden;
+use Alchemy\Phrasea\Controller\Api\caption_field;
+use Alchemy\Phrasea\Controller\Api\caption_record;
+use Alchemy\Phrasea\Controller\Api\collection;
+use Alchemy\Phrasea\Controller\Api\media_Permalink_Adapter;
+use Alchemy\Phrasea\Controller\Api\media_subdef;
+use Alchemy\Phrasea\Controller\Api\Result;
+use Alchemy\Phrasea\Controller\Api\Symfony;
+use Alchemy\Phrasea\Controller\Api\type;
 use Alchemy\Phrasea\Core\Event\ApiOAuth2EndEvent;
 use Alchemy\Phrasea\Core\Event\ApiOAuth2StartEvent;
 use Alchemy\Phrasea\Core\Event\PreAuthenticate;
@@ -701,10 +711,10 @@ class V1 implements ControllerProviderInterface
 
         switch ($request->get('forceBehavior')) {
             case '0' :
-                $behavior = BorderManager::FORCE_RECORD;
+                $behavior = Manager::FORCE_RECORD;
                 break;
             case '1' :
-                $behavior = BorderManager::FORCE_LAZARET;
+                $behavior = Manager::FORCE_LAZARET;
                 break;
             case null:
                 $behavior = null;

lib/Alchemy/Phrasea/ControllerProvider/Client/Root.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Client;
+namespace Alchemy\Phrasea\ControllerProvider\Client;
 
 use Alchemy\Phrasea\Feed\Aggregate;
 use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;

lib/Alchemy/Phrasea/ControllerProvider/Datafiles.php

@@ -9,14 +9,15 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller;
+namespace Alchemy\Phrasea\ControllerProvider;
 
 use Alchemy\Phrasea\Application as PhraseaApplication;
+use Alchemy\Phrasea\Controller\AbstractDelivery;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class Datafiles extends AbstractDelivery implements ControllerProviderInterface
 {

lib/Alchemy/Phrasea/ControllerProvider/Lightbox.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller;
+namespace Alchemy\Phrasea\ControllerProvider;
 
 use Alchemy\Phrasea\Core\Event\ValidationEvent;
 use Alchemy\Phrasea\Core\PhraseaEvents;

lib/Alchemy/Phrasea/ControllerProvider/Minifier.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller;
+namespace Alchemy\Phrasea\ControllerProvider;
 
 use Silex\ControllerProviderInterface;
 use Silex\Application;

lib/Alchemy/Phrasea/ControllerProvider/Permalink.php

@@ -9,9 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller;
+namespace Alchemy\Phrasea\ControllerProvider;
 
 use Alchemy\Phrasea\Application as PhraseaApplication;
+use Alchemy\Phrasea\Controller\AbstractDelivery;
 use Alchemy\Phrasea\Model\Serializer\CaptionSerializer;
 use Silex\Application;
 use Silex\ControllerProviderInterface;

lib/Alchemy/Phrasea/ControllerProvider/Prod/BasketController.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
 use Alchemy\Phrasea\Controller\RecordsRequest;
 use Alchemy\Phrasea\Model\Entities\Basket as BasketEntity;

lib/Alchemy/Phrasea/ControllerProvider/Prod/Bridge.php

@@ -9,8 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
+use Alchemy\Phrasea\Controller\Prod\HttpException;
 use Alchemy\Phrasea\Helper\Record as RecordHelper;
 use Silex\Application;
 use Silex\ControllerProviderInterface;

lib/Alchemy/Phrasea/ControllerProvider/Prod/DoDownload.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
 use Alchemy\Phrasea\Http\DeliverDataInterface;
 use Alchemy\Phrasea\Model\Entities\Token;

lib/Alchemy/Phrasea/ControllerProvider/Prod/Download.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
 use Alchemy\Phrasea\Core\Event\ExportEvent;
 use Alchemy\Phrasea\Core\PhraseaEvents;

lib/Alchemy/Phrasea/ControllerProvider/Prod/Edit.php

@@ -9,8 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
+use Alchemy\Phrasea\Controller\Prod\record_adapter;
 use Alchemy\Phrasea\Core\Event\RecordEdit;
 use Alchemy\Phrasea\Core\PhraseaEvents;
 use Alchemy\Phrasea\Vocabulary\Controller as VocabularyController;

lib/Alchemy/Phrasea/ControllerProvider/Prod/Export.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
 use Alchemy\Phrasea\Core\Event\ExportFailureEvent;
 use Alchemy\Phrasea\Core\PhraseaEvents;

lib/Alchemy/Phrasea/ControllerProvider/Prod/Feed.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
 use Alchemy\Phrasea\Controller\RecordsRequest;
 use Alchemy\Phrasea\Core\Event\FeedEntryEvent;

lib/Alchemy/Phrasea/ControllerProvider/Prod/Language.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
 use Silex\Application;
 use Silex\ControllerProviderInterface;

lib/Alchemy/Phrasea/ControllerProvider/Prod/Lazaret.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
 use Alchemy\Phrasea\Model\Entities\LazaretFile;
 use Alchemy\Phrasea\Border;

lib/Alchemy/Phrasea/ControllerProvider/Prod/MoveCollection.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
 use Alchemy\Phrasea\Controller\RecordsRequest;
 use Silex\Application;

lib/Alchemy/Phrasea/ControllerProvider/Prod/Order.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
 use Alchemy\Phrasea\Controller\RecordsRequest;
 use Alchemy\Phrasea\Core\Event\OrderDeliveryEvent;

lib/Alchemy/Phrasea/ControllerProvider/Prod/Printer.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
 use Silex\Application;
 use Silex\ControllerProviderInterface;

lib/Alchemy/Phrasea/ControllerProvider/Prod/Property.php

@@ -9,8 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
+use Alchemy\Phrasea\Controller\Prod\type;
 use Alchemy\Phrasea\Controller\RecordsRequest;
 use Silex\Application;
 use Silex\ControllerProviderInterface;

lib/Alchemy/Phrasea/ControllerProvider/Prod/Push.php

@@ -9,8 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
+use Alchemy\Phrasea\Controller\Prod\record_adapter;
 use Alchemy\Phrasea\Core\Event\PushEvent;
 use Alchemy\Phrasea\Core\Event\ValidationEvent;
 use Alchemy\Phrasea\Core\PhraseaEvents;

lib/Alchemy/Phrasea/ControllerProvider/Prod/Query.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
 use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
 use Alchemy\Phrasea\SearchEngine\SearchEngineResult;
@@ -234,4 +234,4 @@ class Query implements ControllerProviderInterface
             ])
         ]);
     }
-}
+}

lib/Alchemy/Phrasea/ControllerProvider/Prod/Records.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
 use Alchemy\Phrasea\Controller\RecordsRequest;
 use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;

lib/Alchemy/Phrasea/ControllerProvider/Prod/Root.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
 use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Exception\SessionNotFound;

lib/Alchemy/Phrasea/ControllerProvider/Prod/Share.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
 use Silex\Application;
 use Silex\ControllerProviderInterface;

lib/Alchemy/Phrasea/ControllerProvider/Prod/Story.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
 use Alchemy\Phrasea\Controller\Exception as ControllerException;
 use Alchemy\Phrasea\Controller\RecordsRequest;

lib/Alchemy/Phrasea/ControllerProvider/Prod/TOU.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
 use Silex\Application;
 use Silex\ControllerProviderInterface;

lib/Alchemy/Phrasea/ControllerProvider/Prod/Tools.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
 use Alchemy\Phrasea\Controller\RecordsRequest;
 use Alchemy\Phrasea\Exception\RuntimeException;

lib/Alchemy/Phrasea/ControllerProvider/Prod/Tooltip.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
 use Alchemy\Phrasea\Model\Entities\Basket;
 use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;

lib/Alchemy/Phrasea/ControllerProvider/Prod/Upload.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
 use Alchemy\Phrasea\Border\File;
 use Alchemy\Phrasea\Border\Attribute\Status;

lib/Alchemy/Phrasea/ControllerProvider/Prod/UsrLists.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
 use Alchemy\Phrasea\Model\Entities\UsrList;
 use Alchemy\Phrasea\Model\Entities\UsrListEntry;

lib/Alchemy/Phrasea/ControllerProvider/Prod/WorkZone.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Prod;
+namespace Alchemy\Phrasea\ControllerProvider\Prod;
 
 use Alchemy\Phrasea\Model\Entities\Basket;
 use Alchemy\Phrasea\Model\Entities\StoryWZ;

lib/Alchemy/Phrasea/ControllerProvider/Report/Activity.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Report;
+namespace Alchemy\Phrasea\ControllerProvider\Report;
 
 use Alchemy\Phrasea\Core\Response\CSVFileResponse;
 use Goodby\CSV\Export\Standard\Collection\CallbackCollection;

lib/Alchemy/Phrasea/ControllerProvider/Report/Informations.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Report;
+namespace Alchemy\Phrasea\ControllerProvider\Report;
 
 use Alchemy\Phrasea\Core\Response\CSVFileResponse;
 use Goodby\CSV\Export\Standard\Collection\CallbackCollection;

lib/Alchemy/Phrasea/ControllerProvider/Report/Root.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Report;
+namespace Alchemy\Phrasea\ControllerProvider\Report;
 
 use Alchemy\Phrasea\Core\Response\CSVFileResponse;
 use Goodby\CSV\Export\Standard\Collection\CallbackCollection;

lib/Alchemy/Phrasea/ControllerProvider/Root/Account.php

@@ -9,10 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Root;
+namespace Alchemy\Phrasea\ControllerProvider\Root;
 
 use Alchemy\Geonames\Exception\ExceptionInterface as GeonamesExceptionInterface;
 use Alchemy\Phrasea\Application as PhraseaApplication;
+use Alchemy\Phrasea\ControllerProvider\Root\Login;
 use Alchemy\Phrasea\Exception\InvalidArgumentException;
 use Alchemy\Phrasea\Model\Entities\FtpCredential;
 use Alchemy\Phrasea\Model\Entities\ApiApplication;

lib/Alchemy/Phrasea/ControllerProvider/Root/Developers.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Root;
+namespace Alchemy\Phrasea\ControllerProvider\Root;
 
 use Alchemy\Phrasea\Exception\InvalidArgumentException;
 use Alchemy\Phrasea\Model\Entities\ApiApplication;

lib/Alchemy/Phrasea/ControllerProvider/Root/Login.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Root;
+namespace Alchemy\Phrasea\ControllerProvider\Root;
 
 use Alchemy\Phrasea\Application as PhraseaApplication;
 use Alchemy\Phrasea\Authentication\Exception\NotAuthenticatedException;

lib/Alchemy/Phrasea/ControllerProvider/Root/RSSFeeds.php

@@ -9,9 +9,8 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Root;
+namespace Alchemy\Phrasea\ControllerProvider\Root;
 
-use Alchemy\Phrasea\Model\Entities\Feed;
 use Alchemy\Phrasea\Feed\Aggregate;
 use Silex\Application;
 use Silex\ControllerProviderInterface;

lib/Alchemy/Phrasea/ControllerProvider/Root/Root.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Root;
+namespace Alchemy\Phrasea\ControllerProvider\Root;
 
 use Silex\Application;
 use Silex\ControllerProviderInterface;

lib/Alchemy/Phrasea/ControllerProvider/Root/Session.php

@@ -9,8 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Root;
+namespace Alchemy\Phrasea\ControllerProvider\Root;
 
+use Alchemy\Phrasea\Controller\Root\RedirectResponse;
 use Alchemy\Phrasea\Model\Entities\SessionModule;
 use Silex\Application;
 use Silex\ControllerProviderInterface;

lib/Alchemy/Phrasea/ControllerProvider/Setup.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller;
+namespace Alchemy\Phrasea\ControllerProvider;
 
 use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Helper\DatabaseHelper;

lib/Alchemy/Phrasea/ControllerProvider/Thesaurus/Thesaurus.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Thesaurus;
+namespace Alchemy\Phrasea\ControllerProvider\Thesaurus;
 
 use Doctrine\DBAL\Driver\Connection;
 use Silex\Application;

lib/Alchemy/Phrasea/ControllerProvider/Thesaurus/Xmlhttp.php

@@ -9,8 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\Thesaurus;
+namespace Alchemy\Phrasea\ControllerProvider\Thesaurus;
 
+use Alchemy\Phrasea\Controller\Thesaurus\caption_field;
+use Alchemy\Phrasea\Controller\Thesaurus\caption_Field_Value;
+use Alchemy\Phrasea\Controller\Thesaurus\databox;
 use Alchemy\Phrasea\Model\Entities\User;
 use Silex\Application;
 use Silex\ControllerProviderInterface;

lib/Alchemy/Phrasea/ControllerProvider/User/Notifications.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\User;
+namespace Alchemy\Phrasea\ControllerProvider\User;
 
 use Silex\Application;
 use Silex\ControllerProviderInterface;

lib/Alchemy/Phrasea/ControllerProvider/User/Preferences.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Controller\User;
+namespace Alchemy\Phrasea\ControllerProvider\User;
 
 use Silex\Application;
 use Silex\ControllerProviderInterface;

lib/Alchemy/Phrasea/Model/Manipulator/ApiAccountManipulator.php

@@ -11,8 +11,7 @@
 
 namespace Alchemy\Phrasea\Model\Manipulator;
 
-use Alchemy\Phrasea\Application;
-use Alchemy\Phrasea\Controller\Api\V1;
+use Alchemy\Phrasea\ControllerProvider\Api\V1;
 use Alchemy\Phrasea\Model\Entities\ApiAccount;
 use Alchemy\Phrasea\Model\Entities\ApiApplication;
 use Alchemy\Phrasea\Model\Entities\User;

tests/Alchemy/Tests/Phrasea/Controller/Admin/ConnectedUserTest.php

@@ -2,7 +2,7 @@
 
 namespace Alchemy\Tests\Phrasea\Controller\Admin;
 
-use Alchemy\Phrasea\Controller\Admin\ConnectedUsers;
+use Alchemy\Phrasea\ControllerProvider\Admin\ConnectedUsers;
 
 class ConnectedUserTest extends \PhraseanetAuthenticatedWebTestCase
 {

tests/Alchemy/Tests/Phrasea/Controller/Api/ApiTestCase.php

@@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Controller\Api;
 
 use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Border\File;
-use Alchemy\Phrasea\Controller\Api\V1;
+use Alchemy\Phrasea\ControllerProvider\Api\V1;
 use Alchemy\Phrasea\Core\PhraseaEvents;
 use Alchemy\Phrasea\Authentication\Context;
 use Alchemy\Phrasea\Model\Entities\LazaretSession;

tests/Alchemy/Tests/Phrasea/Controller/Api/ResultTest.php

@@ -3,7 +3,7 @@
 namespace Alchemy\Tests\Phrasea\Controller\Api;
 
 use Alchemy\Phrasea\Controller\Api\Result;
-use Alchemy\Phrasea\Controller\Api\V1;
+use Alchemy\Phrasea\ControllerProvider\Api\V1;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Yaml\Parser;
 

tests/Alchemy/Tests/Phrasea/Controller/Prod/ShareTest.php

@@ -2,7 +2,7 @@
 
 namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
-use Alchemy\Phrasea\Controller\Prod\Share;
+use Alchemy\Phrasea\ControllerProvider\Prod\Share;
 
 class ShareTest extends \PhraseanetAuthenticatedWebTestCase
 {

tests/Alchemy/Tests/Phrasea/Model/Manipulator/ApiAccountManipulatorTest.php

@@ -2,7 +2,7 @@
 
 namespace Alchemy\Tests\Phrasea\Model\Manipulator;
 
-use Alchemy\Phrasea\Controller\Api\V1;
+use Alchemy\Phrasea\ControllerProvider\Api\V1;
 use Alchemy\Phrasea\Model\Manipulator\ApiAccountManipulator;
 
 class ApiAccountManipulatorTest extends \PhraseanetTestCase