Move ApplicationState from Utils to Services package.

pydio · Sep 24, 2016 · 84cc262 · 84cc262
1 parent 4709f18
commit 84cc262
Show file tree

Hide file tree

Showing 70 changed files with 67 additions and 79 deletions.
diff --git a/core/src/core/src/lib/pclzip.lib.php b/core/src/core/src/lib/pclzip.lib.php
@@ -26,7 +26,7 @@
 // --------------------------------------------------------------------------------
 
   // ----- Constants
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\Utils\Utils;
 
 if (!defined('PCLZIP_READ_BLOCK_SIZE')) {

diff --git a/core/src/core/src/pydio/Core/Controller/XMLWriter.php b/core/src/core/src/pydio/Core/Controller/XMLWriter.php
@@ -24,7 +24,7 @@
 use Pydio\Access\Core\IAjxpWrapperProvider;
 use Pydio\Core\Model\ContextInterface;
 use Pydio\Core\Services\LocaleService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\Utils\Vars\InputFilter;
 use Pydio\Core\Utils\Vars\StatHelper;
 use Pydio\Core\Utils\Vars\StringHelper;

diff --git a/core/src/core/src/pydio/Core/Http/Cli/AuthCliMiddleware.php b/core/src/core/src/pydio/Core/Http/Cli/AuthCliMiddleware.php
@@ -34,7 +34,7 @@
 use Pydio\Core\Services\ConfService;
 use Pydio\Core\Services\RolesService;
 use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\Utils\Crypto;
 use Pydio\Core\Utils\TextEncoder;
 use Pydio\Log\Core\Logger;

diff --git a/core/src/core/src/pydio/Core/Http/Message/RegistryMessage.php b/core/src/core/src/pydio/Core/Http/Message/RegistryMessage.php
@@ -23,7 +23,7 @@
 use Pydio\Core\Controller\XMLWriter;
 use Pydio\Core\Http\Response\JSONSerializableResponseChunk;
 use Pydio\Core\Http\Response\XMLDocSerializableResponseChunk;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 
 defined('AJXP_EXEC') or die('Access not allowed');
 

diff --git a/core/src/core/src/pydio/Core/Http/Middleware/SessionMiddleware.php b/core/src/core/src/pydio/Core/Http/Middleware/SessionMiddleware.php
@@ -23,7 +23,7 @@
 use Pydio\Core\Http\Server;
 use Pydio\Core\Model\ContextInterface;
 use Pydio\Core\Services\SessionService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 
 defined('AJXP_EXEC') or die('Access not allowed');
 

diff --git a/core/src/core/src/pydio/Core/Http/Response/FileReaderResponse.php b/core/src/core/src/pydio/Core/Http/Response/FileReaderResponse.php
@@ -26,7 +26,7 @@
 use Pydio\Core\Services\ApiKeysService;
 use Pydio\Core\Services\AuthService;
 use Pydio\Core\Services\ConfService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\Utils\FileHelper;
 use Pydio\Core\Utils\Vars\PathUtils;
 use Pydio\Core\Utils\Vars\StatHelper;

diff --git a/core/src/core/src/pydio/Core/Http/Rest/RestApiServer.php b/core/src/core/src/pydio/Core/Http/Rest/RestApiServer.php
@@ -22,8 +22,7 @@
 namespace Pydio\Core\Http\Rest;
 
 use Pydio\Core\Http\Server;
-use Pydio\Core\Services\ConfService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 
 defined('AJXP_EXEC') or die('Access not allowed');
 

diff --git a/core/src/core/src/pydio/Core/Http/Rest/RestAuthMiddleware.php b/core/src/core/src/pydio/Core/Http/Rest/RestAuthMiddleware.php
@@ -35,7 +35,7 @@
 
 use Pydio\Core\Services\RolesService;
 use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Log\Core\Logger;
 
 defined('AJXP_EXEC') or die('Access not allowed');

diff --git a/core/src/core/src/pydio/Core/Http/Wopi/AuthMiddleware.php b/core/src/core/src/pydio/Core/Http/Wopi/AuthMiddleware.php
@@ -34,7 +34,7 @@
 
 use Pydio\Core\Services\RolesService;
 use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Log\Core\Logger;
 
 defined('AJXP_EXEC') or die('Access not allowed');

diff --git a/core/src/core/src/pydio/Core/Http/Wopi/Server.php b/core/src/core/src/pydio/Core/Http/Wopi/Server.php
@@ -22,8 +22,7 @@
 namespace Pydio\Core\Http\Wopi;
 
 use Pydio\Core\Http\Server as HttpServer;
-use Pydio\Core\Services\ConfService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 
 defined('AJXP_EXEC') or die('Access not allowed');
 

diff --git a/core/src/core/src/pydio/Core/PluginFramework/PluginsService.php b/core/src/core/src/pydio/Core/PluginFramework/PluginsService.php
@@ -37,9 +37,8 @@
 use Pydio\Core\Model\RepositoryInterface;
 use Pydio\Core\Services\CacheService;
 
-use Pydio\Core\Services\ConfService;
 use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\Utils\FileHelper;
 use Pydio\Log\Core\Logger;
 use Pydio\Access\Meta\Core\AbstractMetaSource;

diff --git a/core/src/core/src/pydio/Core/Serializer/RepositoryXML.php b/core/src/core/src/pydio/Core/Serializer/RepositoryXML.php
@@ -26,7 +26,7 @@
 use Pydio\Core\Model\UserInterface;
 use Pydio\Core\PluginFramework\PluginsService;
 use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\Utils\Vars\StringHelper;
 
 defined('AJXP_EXEC') or die('Access not allowed');

diff --git a/core/src/core/src/pydio/Core/Serializer/UserXML.php b/core/src/core/src/pydio/Core/Serializer/UserXML.php
@@ -24,7 +24,7 @@
 use Pydio\Core\PluginFramework\PluginsService;
 use Pydio\Core\Services\ConfService;
 use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 
 defined('AJXP_EXEC') or die('Access not allowed');
 

diff --git a/...src/pydio/Core/Utils/ApplicationState.php → .../pydio/Core/Services/ApplicationState.php b/...src/pydio/Core/Utils/ApplicationState.php → .../pydio/Core/Services/ApplicationState.php
@@ -18,10 +18,9 @@
  *
  * The latest code can be found at <https://pydio.com/>.
  */
-namespace Pydio\Core\Utils;
+namespace Pydio\Core\Services;
 
 use Pydio\Core\Model\RepositoryInterface;
-use Pydio\Core\Services\ConfService;
 use Pydio\Core\Utils\Vars\PathUtils;
 use Pydio\Log\Core\Logger;
 

diff --git a/core/src/core/src/pydio/Core/Services/AuthService.php b/core/src/core/src/pydio/Core/Services/AuthService.php
@@ -24,7 +24,6 @@
 use Pydio\Core\Exception\LoginException;
 use Pydio\Core\Model\Context;
 use Pydio\Core\Model\UserInterface;
-use Pydio\Core\Utils\ApplicationState;
 use Pydio\Core\Utils\Http\BruteForceHelper;
 use Pydio\Core\Utils\Http\CookiesHelper;
 use Pydio\Core\Utils\Vars\InputFilter;

diff --git a/core/src/core/src/pydio/Core/Services/ConfService.php b/core/src/core/src/pydio/Core/Services/ConfService.php
@@ -29,7 +29,6 @@
 
 use Pydio\Core\Model\ContextInterface;
 use Pydio\Core\PluginFramework\CoreInstanceProvider;
-use Pydio\Core\Utils\ApplicationState;
 use Pydio\Core\Utils\Vars\VarsFilter;
 use Pydio\Core\PluginFramework\Plugin;
 use Pydio\Core\PluginFramework\PluginsService;

diff --git a/core/src/core/src/pydio/Core/Services/SessionService.php b/core/src/core/src/pydio/Core/Services/SessionService.php
@@ -24,7 +24,6 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Pydio\Core\Model\RepositoryInterface;
 use Pydio\Core\Model\UserInterface;
-use Pydio\Core\Utils\ApplicationState;
 
 defined('AJXP_EXEC') or die('Access not allowed');
 

diff --git a/core/src/core/src/pydio/Core/Utils/Http/BruteForceHelper.php b/core/src/core/src/pydio/Core/Utils/Http/BruteForceHelper.php
@@ -22,7 +22,7 @@
 
 
 use Pydio\Core\Services\ConfService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Log\Core\Logger;
 
 defined('AJXP_EXEC') or die('Access not allowed');

diff --git a/core/src/core/src/pydio/Core/Utils/Vars/OptionsHelper.php b/core/src/core/src/pydio/Core/Utils/Vars/OptionsHelper.php
@@ -23,7 +23,7 @@
 use Pydio\Core\Model\Context;
 use Pydio\Core\Model\ContextInterface;
 use Pydio\Core\Services\ConfService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\Utils\Crypto;
 
 defined('AJXP_EXEC') or die('Access not allowed');

diff --git a/core/src/plugins/access.fs/FsAccessDriver.php b/core/src/plugins/access.fs/FsAccessDriver.php
@@ -49,7 +49,7 @@
 use Pydio\Core\Exception\PydioException;
 use Pydio\Core\Services\LocaleService;
 use Pydio\Core\Services\SessionService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\Utils\Vars\InputFilter;
 use Pydio\Core\Utils\Vars\PathUtils;
 use Pydio\Core\Utils\Vars\StatHelper;

diff --git a/core/src/plugins/access.fs/FsAccessWrapper.php b/core/src/plugins/access.fs/FsAccessWrapper.php
@@ -29,7 +29,7 @@
 
 use Pydio\Core\Services\ConfService;
 use Pydio\Core\Exception\PydioException;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\Utils\Vars\InputFilter;
 use Pydio\Core\Utils\Vars\PathUtils;
 use Pydio\Core\Utils\Vars\UrlUtils;

diff --git a/core/src/plugins/access.ftp/FtpAccessWrapper.php b/core/src/plugins/access.ftp/FtpAccessWrapper.php
@@ -30,7 +30,7 @@
 
 use Pydio\Core\Exception\PydioException;
 use Pydio\Core\Services\SessionService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\Utils\FileHelper;
 use Pydio\Core\Utils\Vars\InputFilter;
 use Pydio\Core\Utils\Vars\PathUtils;

diff --git a/core/src/plugins/access.inbox/InboxAccessDriver.php b/core/src/plugins/access.inbox/InboxAccessDriver.php
@@ -29,7 +29,7 @@
 use Pydio\Core\Controller\Controller;
 use Pydio\Core\Services\LocaleService;
 use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\Utils\Vars\StatHelper;
 
 defined('AJXP_EXEC') or die('Access not allowed');

diff --git a/core/src/plugins/access.inbox/InboxAccessWrapper.php b/core/src/plugins/access.inbox/InboxAccessWrapper.php
@@ -25,7 +25,7 @@
 use Pydio\Access\Core\Model\AJXP_Node;
 use Pydio\Access\Core\IAjxpWrapper;
 
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 
 defined('AJXP_EXEC') or die('Access not allowed');
 

diff --git a/core/src/plugins/access.s3/S3AccessWrapper.php b/core/src/plugins/access.s3/S3AccessWrapper.php
@@ -26,7 +26,7 @@
 use Pydio\Access\Driver\StreamProvider\FS\FsAccessWrapper;
 use Pydio\Core\Model\ContextInterface;
 use Pydio\Core\Services\ConfService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\Utils\FileHelper;
 use Pydio\Log\Core\Logger;
 

diff --git a/core/src/plugins/access.sftp/SFTPAccessWrapper.php b/core/src/plugins/access.sftp/SFTPAccessWrapper.php
@@ -28,7 +28,7 @@
 use Pydio\Auth\Core\MemorySafe;
 use Pydio\Core\Model\ContextInterface;
 
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\Utils\Vars\InputFilter;
 use Pydio\Log\Core\Logger;
 

diff --git a/core/src/plugins/access.sftp_psl/SftpPSLAccessWrapper.php b/core/src/plugins/access.sftp_psl/SftpPSLAccessWrapper.php
@@ -29,7 +29,7 @@
 use Pydio\Auth\Core\MemorySafe;
 
 use Pydio\Core\Exception\PydioException;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\Utils\Vars\InputFilter;
 use Pydio\Core\Utils\Vars\UrlUtils;
 use Pydio\Log\Core\Logger;

diff --git a/core/src/plugins/access.smb/SMBAccessWrapper.php b/core/src/plugins/access.smb/SMBAccessWrapper.php
@@ -26,7 +26,7 @@
 use Pydio\Auth\Core\MemorySafe;
 
 
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\Utils\Vars\VarsFilter;
 use Pydio\Log\Core\Logger;
 

diff --git a/core/src/plugins/access.swift/SwiftAccessWrapper.php b/core/src/plugins/access.swift/SwiftAccessWrapper.php
@@ -24,7 +24,7 @@
 use Pydio\Access\Core\Model\AJXP_Node;
 use Pydio\Access\Driver\StreamProvider\FS\FsAccessWrapper;
 
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\Utils\FileHelper;
 use Pydio\Log\Core\Logger;
 

diff --git a/core/src/plugins/action.compression/PluginCompression.php b/core/src/plugins/action.compression/PluginCompression.php
@@ -31,7 +31,7 @@
 use Pydio\Core\Controller\Controller;
 use Pydio\Core\Exception\PydioException;
 use Pydio\Core\Services\LocaleService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\Utils\Vars\InputFilter;
 use Pydio\Core\Utils\Vars\PathUtils;
 

diff --git a/core/src/plugins/action.powerfs/PowerFSController.php b/core/src/plugins/action.powerfs/PowerFSController.php
@@ -27,7 +27,7 @@
 
 use Pydio\Core\Controller\Controller;
 use Pydio\Core\Services\LocaleService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\Utils\Vars\InputFilter;
 use Pydio\Core\PluginFramework\Plugin;
 use Pydio\Core\PluginFramework\PluginsService;

diff --git a/core/src/plugins/action.share/src/Http/MinisiteAuthMiddleware.php b/core/src/plugins/action.share/src/Http/MinisiteAuthMiddleware.php
@@ -28,7 +28,7 @@
 use Pydio\Core\Services\AuthService;
 use Pydio\Core\Services\SessionService;
 use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 
 defined('AJXP_EXEC') or die('Access not allowed');
 

diff --git a/core/src/plugins/action.share/src/Http/MinisiteServer.php b/core/src/plugins/action.share/src/Http/MinisiteServer.php
@@ -24,7 +24,7 @@
 use Pydio\Core\Http\Server;
 use Pydio\Core\Model\Context;
 use Pydio\Core\Services\ConfService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Share\View\MinisiteRenderer;
 use Zend\Diactoros\Response;
 

diff --git a/core/src/plugins/action.share/src/Model/CompositeShare.php b/core/src/plugins/action.share/src/Model/CompositeShare.php
@@ -29,7 +29,7 @@
 
 use Pydio\Core\Services\RepositoryService;
 use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Share\Store\ShareRightsManager;
 use Pydio\Share\View\PublicAccessManager;
 

diff --git a/core/src/plugins/action.share/src/Model/ShareLink.php b/core/src/plugins/action.share/src/Model/ShareLink.php
@@ -23,7 +23,7 @@
 
 use Pydio\Core\Services\LocaleService;
 use Pydio\Core\Services\RepositoryService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\Utils\Vars\InputFilter;
 use Pydio\Share\Store\ShareStore;
 use Pydio\Share\View\PublicAccessManager;

diff --git a/core/src/plugins/action.share/src/ShareCenter.php b/core/src/plugins/action.share/src/ShareCenter.php
@@ -45,7 +45,7 @@
 use Pydio\Core\Services\RepositoryService;
 use Pydio\Core\Services\SessionService;
 use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\Utils\Vars\InputFilter;
 use Pydio\Core\Controller\XMLWriter;
 use Pydio\Core\PluginFramework\Plugin;

diff --git a/core/src/plugins/action.share/src/View/MinisiteRenderer.php b/core/src/plugins/action.share/src/View/MinisiteRenderer.php
@@ -31,7 +31,7 @@
 use Pydio\Core\Services\ConfService;
 use Pydio\Core\Controller\Controller;
 use Pydio\Core\Services\RepositoryService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\Utils\Http\UserAgent;
 use Pydio\Core\Controller\XMLWriter;
 use Pydio\Core\Controller\HTMLWriter;

diff --git a/core/src/plugins/action.share/src/View/PublicAccessManager.php b/core/src/plugins/action.share/src/View/PublicAccessManager.php
@@ -22,7 +22,7 @@
 
 use Pydio\Core\Services\ConfService;
 use Pydio\Core\Services\LocaleService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 
 defined('AJXP_EXEC') or die('Access not allowed');
 

diff --git a/core/src/plugins/action.updater/UpdateController.php b/core/src/plugins/action.updater/UpdateController.php
@@ -26,7 +26,7 @@
 use Pydio\Core\Model\ContextInterface;
 use Pydio\Core\Services\LocaleService;
 use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\PluginFramework\Plugin;
 
 defined('AJXP_EXEC') or die('Access not allowed');

diff --git a/core/src/plugins/authfront.cas/CasAuthFrontend.php b/core/src/plugins/authfront.cas/CasAuthFrontend.php
@@ -30,9 +30,8 @@
 use Pydio\Core\Services\ConfService;
 use Pydio\Conf\Sql\SqlConfDriver;
 use Pydio\Core\Services\RolesService;
-use Pydio\Core\Services\SessionService;
 use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\Utils\DBHelper;
 use Pydio\Log\Core\Logger;
 

diff --git a/core/src/plugins/authfront.session_login/SessionLoginFrontend.php b/core/src/plugins/authfront.session_login/SessionLoginFrontend.php
@@ -20,7 +20,6 @@
  */
 namespace Pydio\Auth\Frontend;
 
-use __PHP_Incomplete_Class;
 use Exception;
 use Pydio\Core\Model\Context;
 use Pydio\Core\Model\UserInterface;
@@ -29,10 +28,9 @@
 use Pydio\Core\Services\ConfService;
 use Pydio\Core\Services\SessionService;
 use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\Utils\Http\BruteForceHelper;
 use Pydio\Core\Utils\Http\CookiesHelper;
-use Pydio\Core\Utils\Vars\InputFilter;
 use Pydio\Core\Controller\XMLWriter;
 use Pydio\Core\Utils\Http\CaptchaProvider;
 

diff --git a/core/src/plugins/boot.conf/BootConfLoader.php b/core/src/plugins/boot.conf/BootConfLoader.php
@@ -37,7 +37,7 @@
 use Pydio\Core\Services\LocaleService;
 use Pydio\Core\Services\RolesService;
 use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
 use Pydio\Core\Utils\FileHelper;
 use Pydio\Core\Utils\Vars\InputFilter;
 use Pydio\Core\Utils\Vars\OptionsHelper;