diff options
author | Roeland Jago Douma <roeland@famdouma.nl> | 2019-11-22 20:52:10 +0100 |
---|---|---|
committer | Roeland Jago Douma <roeland@famdouma.nl> | 2019-11-22 20:52:10 +0100 |
commit | 68748d4f85dd23238aaafb787b1c341f0f2f0419 (patch) | |
tree | 7aab3a925dda8dcd6ef4e8c6fe04063abbadd6af /apps/provisioning_api | |
parent | 21119633041d5ccae19975a58b0ae50ef5a8e33a (diff) | |
download | nextcloud-server-68748d4f85dd23238aaafb787b1c341f0f2f0419.tar.gz nextcloud-server-68748d4f85dd23238aaafb787b1c341f0f2f0419.zip |
Some php-cs fixes
* Order the imports
* No leading slash on imports
* Empty line before namespace
* One line per import
* Empty after imports
* Emmpty line at bottom of file
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/provisioning_api')
10 files changed, 17 insertions, 13 deletions
diff --git a/apps/provisioning_api/lib/AppInfo/Application.php b/apps/provisioning_api/lib/AppInfo/Application.php index d642d095d5d..317be717fce 100644 --- a/apps/provisioning_api/lib/AppInfo/Application.php +++ b/apps/provisioning_api/lib/AppInfo/Application.php @@ -22,12 +22,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OCA\Provisioning_API\AppInfo; use OC\AppFramework\Utility\SimpleContainer; use OC\AppFramework\Utility\TimeFactory; -use OCA\Settings\Mailer\NewUserMailHelper; use OCA\Provisioning_API\Middleware\ProvisioningApiMiddleware; +use OCA\Settings\Mailer\NewUserMailHelper; use OCP\AppFramework\App; use OCP\AppFramework\Utility\IControllerMethodReflector; use OCP\Defaults; diff --git a/apps/provisioning_api/lib/Controller/AUserData.php b/apps/provisioning_api/lib/Controller/AUserData.php index 780d4f7a761..8804dc21031 100644 --- a/apps/provisioning_api/lib/Controller/AUserData.php +++ b/apps/provisioning_api/lib/Controller/AUserData.php @@ -24,11 +24,11 @@ namespace OCA\Provisioning_API\Controller; use OC\Accounts\AccountManager; use OC\User\Backend; use OC\User\NoUserException; +use OC_Helper; use OCP\AppFramework\OCS\OCSException; use OCP\AppFramework\OCS\OCSNotFoundException; use OCP\AppFramework\OCSController; use OCP\Files\NotFoundException; -use OC_Helper; use OCP\IConfig; use OCP\IGroupManager; use OCP\IRequest; diff --git a/apps/provisioning_api/lib/Controller/AppsController.php b/apps/provisioning_api/lib/Controller/AppsController.php index 3ceb16c1b0d..63d08ebf57d 100644 --- a/apps/provisioning_api/lib/Controller/AppsController.php +++ b/apps/provisioning_api/lib/Controller/AppsController.php @@ -27,7 +27,7 @@ declare(strict_types=1); namespace OCA\Provisioning_API\Controller; -use \OC_App; +use OC_App; use OCP\App\AppPathNotFoundException; use OCP\App\IAppManager; use OCP\AppFramework\Http\DataResponse; diff --git a/apps/provisioning_api/lib/Controller/GroupsController.php b/apps/provisioning_api/lib/Controller/GroupsController.php index 72285f55192..b758c75ca21 100644 --- a/apps/provisioning_api/lib/Controller/GroupsController.php +++ b/apps/provisioning_api/lib/Controller/GroupsController.php @@ -31,16 +31,16 @@ namespace OCA\Provisioning_API\Controller; use OC\Accounts\AccountManager; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\OCS\OCSException; -use OCP\AppFramework\OCS\OCSNotFoundException; use OCP\AppFramework\OCS\OCSForbiddenException; +use OCP\AppFramework\OCS\OCSNotFoundException; use OCP\IConfig; use OCP\IGroup; use OCP\IGroupManager; use OCP\ILogger; use OCP\IRequest; +use OCP\IUser; use OCP\IUserManager; use OCP\IUserSession; -use OCP\IUser; class GroupsController extends AUserData { diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php index c69c7d62605..ced4f72178c 100644 --- a/apps/provisioning_api/lib/Controller/UsersController.php +++ b/apps/provisioning_api/lib/Controller/UsersController.php @@ -36,8 +36,8 @@ namespace OCA\Provisioning_API\Controller; use OC\Accounts\AccountManager; use OC\Authentication\Token\RemoteWipe; use OC\HintException; -use OCA\Settings\Mailer\NewUserMailHelper; use OCA\Provisioning_API\FederatedFileSharingFactory; +use OCA\Settings\Mailer\NewUserMailHelper; use OCP\App\IAppManager; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\OCS\OCSException; diff --git a/apps/provisioning_api/lib/Middleware/Exceptions/NotSubAdminException.php b/apps/provisioning_api/lib/Middleware/Exceptions/NotSubAdminException.php index 11ffb8b0903..f9f063b8834 100644 --- a/apps/provisioning_api/lib/Middleware/Exceptions/NotSubAdminException.php +++ b/apps/provisioning_api/lib/Middleware/Exceptions/NotSubAdminException.php @@ -21,6 +21,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OCA\Provisioning_API\Middleware\Exceptions; use OCP\AppFramework\Http; @@ -29,4 +30,4 @@ class NotSubAdminException extends \Exception { public function __construct() { parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN); } -}
\ No newline at end of file +} diff --git a/apps/provisioning_api/lib/Middleware/ProvisioningApiMiddleware.php b/apps/provisioning_api/lib/Middleware/ProvisioningApiMiddleware.php index c882ec10279..780f541184f 100644 --- a/apps/provisioning_api/lib/Middleware/ProvisioningApiMiddleware.php +++ b/apps/provisioning_api/lib/Middleware/ProvisioningApiMiddleware.php @@ -23,6 +23,7 @@ declare(strict_types=1); * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OCA\Provisioning_API\Middleware; use OCA\Provisioning_API\Middleware\Exceptions\NotSubAdminException; diff --git a/apps/provisioning_api/tests/Controller/UsersControllerTest.php b/apps/provisioning_api/tests/Controller/UsersControllerTest.php index d1b0754633d..e47db4fd51d 100644 --- a/apps/provisioning_api/tests/Controller/UsersControllerTest.php +++ b/apps/provisioning_api/tests/Controller/UsersControllerTest.php @@ -35,24 +35,24 @@ use Exception; use OC\Accounts\AccountManager; use OC\Authentication\Token\RemoteWipe; use OC\Group\Manager; +use OC\SubAdmin; use OCA\FederatedFileSharing\AppInfo\Application; use OCA\FederatedFileSharing\FederatedShareProvider; +use OCA\Provisioning_API\Controller\UsersController; use OCA\Provisioning_API\FederatedFileSharingFactory; -use OCP\App\IAppManager; -use OCP\Mail\IEMailTemplate; use OCA\Settings\Mailer\NewUserMailHelper; -use OC\SubAdmin; -use OCA\Provisioning_API\Controller\UsersController; +use OCP\App\IAppManager; use OCP\AppFramework\Http\DataResponse; use OCP\IConfig; use OCP\IGroup; -use OCP\ILogger; use OCP\IL10N; +use OCP\ILogger; use OCP\IRequest; use OCP\IUser; use OCP\IUserManager; use OCP\IUserSession; use OCP\L10N\IFactory; +use OCP\Mail\IEMailTemplate; use OCP\Security\ISecureRandom; use OCP\UserInterface; use PHPUnit\Framework\MockObject\MockObject; diff --git a/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php b/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php index 2d8b79842f2..5ebc43d2b1d 100644 --- a/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php +++ b/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OCA\Provisioning_API\Tests\Middleware; use OCA\Provisioning_API\Middleware\Exceptions\NotSubAdminException; diff --git a/apps/provisioning_api/tests/TestCase.php b/apps/provisioning_api/tests/TestCase.php index 1ff2c82a3be..7d65c5bc1bc 100644 --- a/apps/provisioning_api/tests/TestCase.php +++ b/apps/provisioning_api/tests/TestCase.php @@ -25,9 +25,9 @@ namespace OCA\Provisioning_API\Tests; +use OCP\IGroupManager; use OCP\IUser; use OCP\IUserManager; -use OCP\IGroupManager; abstract class TestCase extends \Test\TestCase { |