Inspection of "Move storagestats endpoint to proper controller" - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#8800)

by Roeland

created 2018-03-13 11:45 UTC

Status

Indentation +51 added lines, -51 removed lines patch added patch discarded remove patch

@@ -31,63 +31,63 @@
 block discarded – undo
 
 $application = new Application();
 $application->registerRoutes(
-	$this,
-	[
-		'routes' => [
-			[
-				'name' => 'API#getThumbnail',
-				'url' => '/api/v1/thumbnail/{x}/{y}/{file}',
-				'verb' => 'GET',
-				'requirements' => ['file' => '.+']
-			],
-			[
-				'name' => 'API#updateFileTags',
-				'url' => '/api/v1/files/{path}',
-				'verb' => 'POST',
-				'requirements' => ['path' => '.+'],
-			],
-			[
-				'name' => 'API#getRecentFiles',
-				'url' => '/api/v1/recent/',
-				'verb' => 'GET'
-			],
-			[
-				'name' => 'API#updateFileSorting',
-				'url' => '/api/v1/sorting',
-				'verb' => 'POST'
-			],
-			[
-				'name' => 'API#showHiddenFiles',
-				'url' => '/api/v1/showhidden',
-				'verb' => 'POST'
-			],
-			[
-				'name' => 'view#index',
-				'url' => '/',
-				'verb' => 'GET',
-			],
-			[
-				'name' => 'settings#setMaxUploadSize',
-				'url' => '/settings/maxUpload',
-				'verb' => 'POST',
-			],
-			[
-				'name' => 'ajax#getStorageStats',
-				'url' => '/ajax/getstoragestats.php',
-				'verb' => 'GET',
-			],
-		]
-	]
+    $this,
+    [
+        'routes' => [
+            [
+                'name' => 'API#getThumbnail',
+                'url' => '/api/v1/thumbnail/{x}/{y}/{file}',
+                'verb' => 'GET',
+                'requirements' => ['file' => '.+']
+            ],
+            [
+                'name' => 'API#updateFileTags',
+                'url' => '/api/v1/files/{path}',
+                'verb' => 'POST',
+                'requirements' => ['path' => '.+'],
+            ],
+            [
+                'name' => 'API#getRecentFiles',
+                'url' => '/api/v1/recent/',
+                'verb' => 'GET'
+            ],
+            [
+                'name' => 'API#updateFileSorting',
+                'url' => '/api/v1/sorting',
+                'verb' => 'POST'
+            ],
+            [
+                'name' => 'API#showHiddenFiles',
+                'url' => '/api/v1/showhidden',
+                'verb' => 'POST'
+            ],
+            [
+                'name' => 'view#index',
+                'url' => '/',
+                'verb' => 'GET',
+            ],
+            [
+                'name' => 'settings#setMaxUploadSize',
+                'url' => '/settings/maxUpload',
+                'verb' => 'POST',
+            ],
+            [
+                'name' => 'ajax#getStorageStats',
+                'url' => '/ajax/getstoragestats.php',
+                'verb' => 'GET',
+            ],
+        ]
+    ]
 );
 
 /** @var $this \OC\Route\Router */
 
 $this->create('files_ajax_download', 'ajax/download.php')
-	->actionInclude('files/ajax/download.php');
+    ->actionInclude('files/ajax/download.php');
 $this->create('files_ajax_list', 'ajax/list.php')
-	->actionInclude('files/ajax/list.php');
+    ->actionInclude('files/ajax/list.php');
 
 $this->create('download', 'download{file}')
-	->requirements(['file' => '.*'])
-	->actionInclude('files/download.php');
+    ->requirements(['file' => '.*'])
+    ->actionInclude('files/download.php');
 

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@
 block discarded – undo
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *

Please login to merge, or discard this patch.

apps/files/lib/Controller/AjaxController.php 2 patches

Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

@@ -31,26 +31,26 @@
 block discarded – undo
 
 class AjaxController extends Controller {
 
-	public function __construct(string $appName, IRequest $request) {
-		parent::__construct($appName, $request);
-	}
+    public function __construct(string $appName, IRequest $request) {
+        parent::__construct($appName, $request);
+    }
 
-	/**
-	 * @NoAdminRequired
-	 */
-	public function getStorageStats(string $dir = '/'): JSONResponse {
-		try {
-			return new JSONResponse([
-				'status' => 'success',
-				'data' => Helper::buildFileStorageStatistics($dir),
-			]);
-		} catch (NotFoundException $e) {
-			return new JSONResponse([
-				'status' => 'error',
-				'data' => [
-					'message' => 'Folder not found'
-				],
-			]);
-		}
-	}
+    /**
+     * @NoAdminRequired
+     */
+    public function getStorageStats(string $dir = '/'): JSONResponse {
+        try {
+            return new JSONResponse([
+                'status' => 'success',
+                'data' => Helper::buildFileStorageStatistics($dir),
+            ]);
+        } catch (NotFoundException $e) {
+            return new JSONResponse([
+                'status' => 'error',
+                'data' => [
+                    'message' => 'Folder not found'
+                ],
+            ]);
+        }
+    }
 }

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@
 block discarded – undo
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2018, Roeland Jago Douma <[email protected]>
  *

Please login to merge, or discard this patch.

apps/files/composer/composer/autoload_classmap.php 1 patch

Spacing +28 added lines, -28 removed lines patch added patch discarded remove patch

@@ -6,32 +6,32 @@
 block discarded – undo
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\Files\\Activity\\FavoriteProvider' => $baseDir . '/../lib/Activity/FavoriteProvider.php',
-    'OCA\\Files\\Activity\\Filter\\Favorites' => $baseDir . '/../lib/Activity/Filter/Favorites.php',
-    'OCA\\Files\\Activity\\Filter\\FileChanges' => $baseDir . '/../lib/Activity/Filter/FileChanges.php',
-    'OCA\\Files\\Activity\\Helper' => $baseDir . '/../lib/Activity/Helper.php',
-    'OCA\\Files\\Activity\\Provider' => $baseDir . '/../lib/Activity/Provider.php',
-    'OCA\\Files\\Activity\\Settings\\FavoriteAction' => $baseDir . '/../lib/Activity/Settings/FavoriteAction.php',
-    'OCA\\Files\\Activity\\Settings\\FileChanged' => $baseDir . '/../lib/Activity/Settings/FileChanged.php',
-    'OCA\\Files\\Activity\\Settings\\FileCreated' => $baseDir . '/../lib/Activity/Settings/FileCreated.php',
-    'OCA\\Files\\Activity\\Settings\\FileDeleted' => $baseDir . '/../lib/Activity/Settings/FileDeleted.php',
-    'OCA\\Files\\Activity\\Settings\\FileFavorite' => $baseDir . '/../lib/Activity/Settings/FileFavorite.php',
-    'OCA\\Files\\Activity\\Settings\\FileRestored' => $baseDir . '/../lib/Activity/Settings/FileRestored.php',
-    'OCA\\Files\\App' => $baseDir . '/../lib/App.php',
-    'OCA\\Files\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => $baseDir . '/../lib/BackgroundJob/CleanupFileLocks.php',
-    'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => $baseDir . '/../lib/BackgroundJob/DeleteOrphanedItems.php',
-    'OCA\\Files\\BackgroundJob\\ScanFiles' => $baseDir . '/../lib/BackgroundJob/ScanFiles.php',
-    'OCA\\Files\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
-    'OCA\\Files\\Command\\DeleteOrphanedFiles' => $baseDir . '/../lib/Command/DeleteOrphanedFiles.php',
-    'OCA\\Files\\Command\\Scan' => $baseDir . '/../lib/Command/Scan.php',
-    'OCA\\Files\\Command\\ScanAppData' => $baseDir . '/../lib/Command/ScanAppData.php',
-    'OCA\\Files\\Command\\TransferOwnership' => $baseDir . '/../lib/Command/TransferOwnership.php',
-    'OCA\\Files\\Controller\\AjaxController' => $baseDir . '/../lib/Controller/AjaxController.php',
-    'OCA\\Files\\Controller\\ApiController' => $baseDir . '/../lib/Controller/ApiController.php',
-    'OCA\\Files\\Controller\\SettingsController' => $baseDir . '/../lib/Controller/SettingsController.php',
-    'OCA\\Files\\Controller\\ViewController' => $baseDir . '/../lib/Controller/ViewController.php',
-    'OCA\\Files\\Helper' => $baseDir . '/../lib/Helper.php',
-    'OCA\\Files\\Service\\TagService' => $baseDir . '/../lib/Service/TagService.php',
-    'OCA\\Files\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
+    'OCA\\Files\\Activity\\FavoriteProvider' => $baseDir.'/../lib/Activity/FavoriteProvider.php',
+    'OCA\\Files\\Activity\\Filter\\Favorites' => $baseDir.'/../lib/Activity/Filter/Favorites.php',
+    'OCA\\Files\\Activity\\Filter\\FileChanges' => $baseDir.'/../lib/Activity/Filter/FileChanges.php',
+    'OCA\\Files\\Activity\\Helper' => $baseDir.'/../lib/Activity/Helper.php',
+    'OCA\\Files\\Activity\\Provider' => $baseDir.'/../lib/Activity/Provider.php',
+    'OCA\\Files\\Activity\\Settings\\FavoriteAction' => $baseDir.'/../lib/Activity/Settings/FavoriteAction.php',
+    'OCA\\Files\\Activity\\Settings\\FileChanged' => $baseDir.'/../lib/Activity/Settings/FileChanged.php',
+    'OCA\\Files\\Activity\\Settings\\FileCreated' => $baseDir.'/../lib/Activity/Settings/FileCreated.php',
+    'OCA\\Files\\Activity\\Settings\\FileDeleted' => $baseDir.'/../lib/Activity/Settings/FileDeleted.php',
+    'OCA\\Files\\Activity\\Settings\\FileFavorite' => $baseDir.'/../lib/Activity/Settings/FileFavorite.php',
+    'OCA\\Files\\Activity\\Settings\\FileRestored' => $baseDir.'/../lib/Activity/Settings/FileRestored.php',
+    'OCA\\Files\\App' => $baseDir.'/../lib/App.php',
+    'OCA\\Files\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => $baseDir.'/../lib/BackgroundJob/CleanupFileLocks.php',
+    'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => $baseDir.'/../lib/BackgroundJob/DeleteOrphanedItems.php',
+    'OCA\\Files\\BackgroundJob\\ScanFiles' => $baseDir.'/../lib/BackgroundJob/ScanFiles.php',
+    'OCA\\Files\\Capabilities' => $baseDir.'/../lib/Capabilities.php',
+    'OCA\\Files\\Command\\DeleteOrphanedFiles' => $baseDir.'/../lib/Command/DeleteOrphanedFiles.php',
+    'OCA\\Files\\Command\\Scan' => $baseDir.'/../lib/Command/Scan.php',
+    'OCA\\Files\\Command\\ScanAppData' => $baseDir.'/../lib/Command/ScanAppData.php',
+    'OCA\\Files\\Command\\TransferOwnership' => $baseDir.'/../lib/Command/TransferOwnership.php',
+    'OCA\\Files\\Controller\\AjaxController' => $baseDir.'/../lib/Controller/AjaxController.php',
+    'OCA\\Files\\Controller\\ApiController' => $baseDir.'/../lib/Controller/ApiController.php',
+    'OCA\\Files\\Controller\\SettingsController' => $baseDir.'/../lib/Controller/SettingsController.php',
+    'OCA\\Files\\Controller\\ViewController' => $baseDir.'/../lib/Controller/ViewController.php',
+    'OCA\\Files\\Helper' => $baseDir.'/../lib/Helper.php',
+    'OCA\\Files\\Service\\TagService' => $baseDir.'/../lib/Service/TagService.php',
+    'OCA\\Files\\Settings\\Admin' => $baseDir.'/../lib/Settings/Admin.php',
 );

Please login to merge, or discard this patch.

apps/files/composer/composer/autoload_static.php 1 patch

Spacing +35 added lines, -35 removed lines patch added patch discarded remove patch

@@ -6,54 +6,54 @@
 block discarded – undo
 
 class ComposerStaticInitFiles
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\Files\\' => 10,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\Files\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'OCA\\Files\\Activity\\FavoriteProvider' => __DIR__ . '/..' . '/../lib/Activity/FavoriteProvider.php',
-        'OCA\\Files\\Activity\\Filter\\Favorites' => __DIR__ . '/..' . '/../lib/Activity/Filter/Favorites.php',
-        'OCA\\Files\\Activity\\Filter\\FileChanges' => __DIR__ . '/..' . '/../lib/Activity/Filter/FileChanges.php',
-        'OCA\\Files\\Activity\\Helper' => __DIR__ . '/..' . '/../lib/Activity/Helper.php',
-        'OCA\\Files\\Activity\\Provider' => __DIR__ . '/..' . '/../lib/Activity/Provider.php',
-        'OCA\\Files\\Activity\\Settings\\FavoriteAction' => __DIR__ . '/..' . '/../lib/Activity/Settings/FavoriteAction.php',
-        'OCA\\Files\\Activity\\Settings\\FileChanged' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileChanged.php',
-        'OCA\\Files\\Activity\\Settings\\FileCreated' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileCreated.php',
-        'OCA\\Files\\Activity\\Settings\\FileDeleted' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileDeleted.php',
-        'OCA\\Files\\Activity\\Settings\\FileFavorite' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileFavorite.php',
-        'OCA\\Files\\Activity\\Settings\\FileRestored' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileRestored.php',
-        'OCA\\Files\\App' => __DIR__ . '/..' . '/../lib/App.php',
-        'OCA\\Files\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupFileLocks.php',
-        'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => __DIR__ . '/..' . '/../lib/BackgroundJob/DeleteOrphanedItems.php',
-        'OCA\\Files\\BackgroundJob\\ScanFiles' => __DIR__ . '/..' . '/../lib/BackgroundJob/ScanFiles.php',
-        'OCA\\Files\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
-        'OCA\\Files\\Command\\DeleteOrphanedFiles' => __DIR__ . '/..' . '/../lib/Command/DeleteOrphanedFiles.php',
-        'OCA\\Files\\Command\\Scan' => __DIR__ . '/..' . '/../lib/Command/Scan.php',
-        'OCA\\Files\\Command\\ScanAppData' => __DIR__ . '/..' . '/../lib/Command/ScanAppData.php',
-        'OCA\\Files\\Command\\TransferOwnership' => __DIR__ . '/..' . '/../lib/Command/TransferOwnership.php',
-        'OCA\\Files\\Controller\\AjaxController' => __DIR__ . '/..' . '/../lib/Controller/AjaxController.php',
-        'OCA\\Files\\Controller\\ApiController' => __DIR__ . '/..' . '/../lib/Controller/ApiController.php',
-        'OCA\\Files\\Controller\\SettingsController' => __DIR__ . '/..' . '/../lib/Controller/SettingsController.php',
-        'OCA\\Files\\Controller\\ViewController' => __DIR__ . '/..' . '/../lib/Controller/ViewController.php',
-        'OCA\\Files\\Helper' => __DIR__ . '/..' . '/../lib/Helper.php',
-        'OCA\\Files\\Service\\TagService' => __DIR__ . '/..' . '/../lib/Service/TagService.php',
-        'OCA\\Files\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
+    public static $classMap = array(
+        'OCA\\Files\\Activity\\FavoriteProvider' => __DIR__.'/..'.'/../lib/Activity/FavoriteProvider.php',
+        'OCA\\Files\\Activity\\Filter\\Favorites' => __DIR__.'/..'.'/../lib/Activity/Filter/Favorites.php',
+        'OCA\\Files\\Activity\\Filter\\FileChanges' => __DIR__.'/..'.'/../lib/Activity/Filter/FileChanges.php',
+        'OCA\\Files\\Activity\\Helper' => __DIR__.'/..'.'/../lib/Activity/Helper.php',
+        'OCA\\Files\\Activity\\Provider' => __DIR__.'/..'.'/../lib/Activity/Provider.php',
+        'OCA\\Files\\Activity\\Settings\\FavoriteAction' => __DIR__.'/..'.'/../lib/Activity/Settings/FavoriteAction.php',
+        'OCA\\Files\\Activity\\Settings\\FileChanged' => __DIR__.'/..'.'/../lib/Activity/Settings/FileChanged.php',
+        'OCA\\Files\\Activity\\Settings\\FileCreated' => __DIR__.'/..'.'/../lib/Activity/Settings/FileCreated.php',
+        'OCA\\Files\\Activity\\Settings\\FileDeleted' => __DIR__.'/..'.'/../lib/Activity/Settings/FileDeleted.php',
+        'OCA\\Files\\Activity\\Settings\\FileFavorite' => __DIR__.'/..'.'/../lib/Activity/Settings/FileFavorite.php',
+        'OCA\\Files\\Activity\\Settings\\FileRestored' => __DIR__.'/..'.'/../lib/Activity/Settings/FileRestored.php',
+        'OCA\\Files\\App' => __DIR__.'/..'.'/../lib/App.php',
+        'OCA\\Files\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => __DIR__.'/..'.'/../lib/BackgroundJob/CleanupFileLocks.php',
+        'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => __DIR__.'/..'.'/../lib/BackgroundJob/DeleteOrphanedItems.php',
+        'OCA\\Files\\BackgroundJob\\ScanFiles' => __DIR__.'/..'.'/../lib/BackgroundJob/ScanFiles.php',
+        'OCA\\Files\\Capabilities' => __DIR__.'/..'.'/../lib/Capabilities.php',
+        'OCA\\Files\\Command\\DeleteOrphanedFiles' => __DIR__.'/..'.'/../lib/Command/DeleteOrphanedFiles.php',
+        'OCA\\Files\\Command\\Scan' => __DIR__.'/..'.'/../lib/Command/Scan.php',
+        'OCA\\Files\\Command\\ScanAppData' => __DIR__.'/..'.'/../lib/Command/ScanAppData.php',
+        'OCA\\Files\\Command\\TransferOwnership' => __DIR__.'/..'.'/../lib/Command/TransferOwnership.php',
+        'OCA\\Files\\Controller\\AjaxController' => __DIR__.'/..'.'/../lib/Controller/AjaxController.php',
+        'OCA\\Files\\Controller\\ApiController' => __DIR__.'/..'.'/../lib/Controller/ApiController.php',
+        'OCA\\Files\\Controller\\SettingsController' => __DIR__.'/..'.'/../lib/Controller/SettingsController.php',
+        'OCA\\Files\\Controller\\ViewController' => __DIR__.'/..'.'/../lib/Controller/ViewController.php',
+        'OCA\\Files\\Helper' => __DIR__.'/..'.'/../lib/Helper.php',
+        'OCA\\Files\\Service\\TagService' => __DIR__.'/..'.'/../lib/Service/TagService.php',
+        'OCA\\Files\\Settings\\Admin' => __DIR__.'/..'.'/../lib/Settings/Admin.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitFiles::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitFiles::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitFiles::$classMap;

Please login to merge, or discard this patch.

		@@ -31,63 +31,63 @@
		block discarded – undo
31	31
32	32	$application = new Application();
33	33	$application->registerRoutes(
34		- $this,
35		- [
36		- 'routes' => [
37		- [
38		- 'name' => 'API#getThumbnail',
39		- 'url' => '/api/v1/thumbnail/{x}/{y}/{file}',
40		- 'verb' => 'GET',
41		- 'requirements' => ['file' => '.+']
42		- ],
43		- [
44		- 'name' => 'API#updateFileTags',
45		- 'url' => '/api/v1/files/{path}',
46		- 'verb' => 'POST',
47		- 'requirements' => ['path' => '.+'],
48		- ],
49		- [
50		- 'name' => 'API#getRecentFiles',
51		- 'url' => '/api/v1/recent/',
52		- 'verb' => 'GET'
53		- ],
54		- [
55		- 'name' => 'API#updateFileSorting',
56		- 'url' => '/api/v1/sorting',
57		- 'verb' => 'POST'
58		- ],
59		- [
60		- 'name' => 'API#showHiddenFiles',
61		- 'url' => '/api/v1/showhidden',
62		- 'verb' => 'POST'
63		- ],
64		- [
65		- 'name' => 'view#index',
66		- 'url' => '/',
67		- 'verb' => 'GET',
68		- ],
69		- [
70		- 'name' => 'settings#setMaxUploadSize',
71		- 'url' => '/settings/maxUpload',
72		- 'verb' => 'POST',
73		- ],
74		- [
75		- 'name' => 'ajax#getStorageStats',
76		- 'url' => '/ajax/getstoragestats.php',
77		- 'verb' => 'GET',
78		- ],
79		- ]
80		- ]
	34	+ $this,
	35	+ [
	36	+ 'routes' => [
	37	+ [
	38	+ 'name' => 'API#getThumbnail',
	39	+ 'url' => '/api/v1/thumbnail/{x}/{y}/{file}',
	40	+ 'verb' => 'GET',
	41	+ 'requirements' => ['file' => '.+']
	42	+ ],
	43	+ [
	44	+ 'name' => 'API#updateFileTags',
	45	+ 'url' => '/api/v1/files/{path}',
	46	+ 'verb' => 'POST',
	47	+ 'requirements' => ['path' => '.+'],
	48	+ ],
	49	+ [
	50	+ 'name' => 'API#getRecentFiles',
	51	+ 'url' => '/api/v1/recent/',
	52	+ 'verb' => 'GET'
	53	+ ],
	54	+ [
	55	+ 'name' => 'API#updateFileSorting',
	56	+ 'url' => '/api/v1/sorting',
	57	+ 'verb' => 'POST'
	58	+ ],
	59	+ [
	60	+ 'name' => 'API#showHiddenFiles',
	61	+ 'url' => '/api/v1/showhidden',
	62	+ 'verb' => 'POST'
	63	+ ],
	64	+ [
	65	+ 'name' => 'view#index',
	66	+ 'url' => '/',
	67	+ 'verb' => 'GET',
	68	+ ],
	69	+ [
	70	+ 'name' => 'settings#setMaxUploadSize',
	71	+ 'url' => '/settings/maxUpload',
	72	+ 'verb' => 'POST',
	73	+ ],
	74	+ [
	75	+ 'name' => 'ajax#getStorageStats',
	76	+ 'url' => '/ajax/getstoragestats.php',
	77	+ 'verb' => 'GET',
	78	+ ],
	79	+ ]
	80	+ ]
81	81	);
82	82
83	83	/** @var $this \OC\Route\Router */
84	84
85	85	$this->create('files_ajax_download', 'ajax/download.php')
86		- ->actionInclude('files/ajax/download.php');
	86	+ ->actionInclude('files/ajax/download.php');
87	87	$this->create('files_ajax_list', 'ajax/list.php')
88		- ->actionInclude('files/ajax/list.php');
	88	+ ->actionInclude('files/ajax/list.php');
89	89
90	90	$this->create('download', 'download{file}')
91		- ->requirements(['file' => '.*'])
92		- ->actionInclude('files/download.php');
	91	+ ->requirements(['file' => '.*'])
	92	+ ->actionInclude('files/download.php');
93	93

		@@ -1,5 +1,5 @@
		block discarded – undo
1	1	<?php
2		-declare(strict_types=1);
	2	+declare(strict_types = 1);
3	3	/**
4	4	* @copyright Copyright (c) 2016, ownCloud, Inc.
5	5	*

		@@ -31,26 +31,26 @@
		block discarded – undo
31	31
32	32	class AjaxController extends Controller {
33	33
34		- public function __construct(string $appName, IRequest $request) {
35		- parent::__construct($appName, $request);
36		- }
	34	+ public function __construct(string $appName, IRequest $request) {
	35	+ parent::__construct($appName, $request);
	36	+ }
37	37
38		- /**
39		- * @NoAdminRequired
40		- */
41		- public function getStorageStats(string $dir = '/'): JSONResponse {
42		- try {
43		- return new JSONResponse([
44		- 'status' => 'success',
45		- 'data' => Helper::buildFileStorageStatistics($dir),
46		- ]);
47		- } catch (NotFoundException $e) {
48		- return new JSONResponse([
49		- 'status' => 'error',
50		- 'data' => [
51		- 'message' => 'Folder not found'
52		- ],
53		- ]);
54		- }
55		- }
	38	+ /**
	39	+ * @NoAdminRequired
	40	+ */
	41	+ public function getStorageStats(string $dir = '/'): JSONResponse {
	42	+ try {
	43	+ return new JSONResponse([
	44	+ 'status' => 'success',
	45	+ 'data' => Helper::buildFileStorageStatistics($dir),
	46	+ ]);
	47	+ } catch (NotFoundException $e) {
	48	+ return new JSONResponse([
	49	+ 'status' => 'error',
	50	+ 'data' => [
	51	+ 'message' => 'Folder not found'
	52	+ ],
	53	+ ]);
	54	+ }
	55	+ }
56	56	}

		@@ -6,32 +6,32 @@
		block discarded – undo
6	6	$baseDir = $vendorDir;
7	7
8	8	return array(
9		- 'OCA\\Files\\Activity\\FavoriteProvider' => $baseDir . '/../lib/Activity/FavoriteProvider.php',
10		- 'OCA\\Files\\Activity\\Filter\\Favorites' => $baseDir . '/../lib/Activity/Filter/Favorites.php',
11		- 'OCA\\Files\\Activity\\Filter\\FileChanges' => $baseDir . '/../lib/Activity/Filter/FileChanges.php',
12		- 'OCA\\Files\\Activity\\Helper' => $baseDir . '/../lib/Activity/Helper.php',
13		- 'OCA\\Files\\Activity\\Provider' => $baseDir . '/../lib/Activity/Provider.php',
14		- 'OCA\\Files\\Activity\\Settings\\FavoriteAction' => $baseDir . '/../lib/Activity/Settings/FavoriteAction.php',
15		- 'OCA\\Files\\Activity\\Settings\\FileChanged' => $baseDir . '/../lib/Activity/Settings/FileChanged.php',
16		- 'OCA\\Files\\Activity\\Settings\\FileCreated' => $baseDir . '/../lib/Activity/Settings/FileCreated.php',
17		- 'OCA\\Files\\Activity\\Settings\\FileDeleted' => $baseDir . '/../lib/Activity/Settings/FileDeleted.php',
18		- 'OCA\\Files\\Activity\\Settings\\FileFavorite' => $baseDir . '/../lib/Activity/Settings/FileFavorite.php',
19		- 'OCA\\Files\\Activity\\Settings\\FileRestored' => $baseDir . '/../lib/Activity/Settings/FileRestored.php',
20		- 'OCA\\Files\\App' => $baseDir . '/../lib/App.php',
21		- 'OCA\\Files\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
22		- 'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => $baseDir . '/../lib/BackgroundJob/CleanupFileLocks.php',
23		- 'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => $baseDir . '/../lib/BackgroundJob/DeleteOrphanedItems.php',
24		- 'OCA\\Files\\BackgroundJob\\ScanFiles' => $baseDir . '/../lib/BackgroundJob/ScanFiles.php',
25		- 'OCA\\Files\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
26		- 'OCA\\Files\\Command\\DeleteOrphanedFiles' => $baseDir . '/../lib/Command/DeleteOrphanedFiles.php',
27		- 'OCA\\Files\\Command\\Scan' => $baseDir . '/../lib/Command/Scan.php',
28		- 'OCA\\Files\\Command\\ScanAppData' => $baseDir . '/../lib/Command/ScanAppData.php',
29		- 'OCA\\Files\\Command\\TransferOwnership' => $baseDir . '/../lib/Command/TransferOwnership.php',
30		- 'OCA\\Files\\Controller\\AjaxController' => $baseDir . '/../lib/Controller/AjaxController.php',
31		- 'OCA\\Files\\Controller\\ApiController' => $baseDir . '/../lib/Controller/ApiController.php',
32		- 'OCA\\Files\\Controller\\SettingsController' => $baseDir . '/../lib/Controller/SettingsController.php',
33		- 'OCA\\Files\\Controller\\ViewController' => $baseDir . '/../lib/Controller/ViewController.php',
34		- 'OCA\\Files\\Helper' => $baseDir . '/../lib/Helper.php',
35		- 'OCA\\Files\\Service\\TagService' => $baseDir . '/../lib/Service/TagService.php',
36		- 'OCA\\Files\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
	9	+ 'OCA\\Files\\Activity\\FavoriteProvider' => $baseDir.'/../lib/Activity/FavoriteProvider.php',
	10	+ 'OCA\\Files\\Activity\\Filter\\Favorites' => $baseDir.'/../lib/Activity/Filter/Favorites.php',
	11	+ 'OCA\\Files\\Activity\\Filter\\FileChanges' => $baseDir.'/../lib/Activity/Filter/FileChanges.php',
	12	+ 'OCA\\Files\\Activity\\Helper' => $baseDir.'/../lib/Activity/Helper.php',
	13	+ 'OCA\\Files\\Activity\\Provider' => $baseDir.'/../lib/Activity/Provider.php',
	14	+ 'OCA\\Files\\Activity\\Settings\\FavoriteAction' => $baseDir.'/../lib/Activity/Settings/FavoriteAction.php',
	15	+ 'OCA\\Files\\Activity\\Settings\\FileChanged' => $baseDir.'/../lib/Activity/Settings/FileChanged.php',
	16	+ 'OCA\\Files\\Activity\\Settings\\FileCreated' => $baseDir.'/../lib/Activity/Settings/FileCreated.php',
	17	+ 'OCA\\Files\\Activity\\Settings\\FileDeleted' => $baseDir.'/../lib/Activity/Settings/FileDeleted.php',
	18	+ 'OCA\\Files\\Activity\\Settings\\FileFavorite' => $baseDir.'/../lib/Activity/Settings/FileFavorite.php',
	19	+ 'OCA\\Files\\Activity\\Settings\\FileRestored' => $baseDir.'/../lib/Activity/Settings/FileRestored.php',
	20	+ 'OCA\\Files\\App' => $baseDir.'/../lib/App.php',
	21	+ 'OCA\\Files\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
	22	+ 'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => $baseDir.'/../lib/BackgroundJob/CleanupFileLocks.php',
	23	+ 'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => $baseDir.'/../lib/BackgroundJob/DeleteOrphanedItems.php',
	24	+ 'OCA\\Files\\BackgroundJob\\ScanFiles' => $baseDir.'/../lib/BackgroundJob/ScanFiles.php',
	25	+ 'OCA\\Files\\Capabilities' => $baseDir.'/../lib/Capabilities.php',
	26	+ 'OCA\\Files\\Command\\DeleteOrphanedFiles' => $baseDir.'/../lib/Command/DeleteOrphanedFiles.php',
	27	+ 'OCA\\Files\\Command\\Scan' => $baseDir.'/../lib/Command/Scan.php',
	28	+ 'OCA\\Files\\Command\\ScanAppData' => $baseDir.'/../lib/Command/ScanAppData.php',
	29	+ 'OCA\\Files\\Command\\TransferOwnership' => $baseDir.'/../lib/Command/TransferOwnership.php',
	30	+ 'OCA\\Files\\Controller\\AjaxController' => $baseDir.'/../lib/Controller/AjaxController.php',
	31	+ 'OCA\\Files\\Controller\\ApiController' => $baseDir.'/../lib/Controller/ApiController.php',
	32	+ 'OCA\\Files\\Controller\\SettingsController' => $baseDir.'/../lib/Controller/SettingsController.php',
	33	+ 'OCA\\Files\\Controller\\ViewController' => $baseDir.'/../lib/Controller/ViewController.php',
	34	+ 'OCA\\Files\\Helper' => $baseDir.'/../lib/Helper.php',
	35	+ 'OCA\\Files\\Service\\TagService' => $baseDir.'/../lib/Service/TagService.php',
	36	+ 'OCA\\Files\\Settings\\Admin' => $baseDir.'/../lib/Settings/Admin.php',
37	37	);

		@@ -6,54 +6,54 @@
		block discarded – undo
6	6
7	7	class ComposerStaticInitFiles
8	8	{
9		- public static $prefixLengthsPsr4 = array (
	9	+ public static $prefixLengthsPsr4 = array(
10	10	'O' =>
11		- array (
	11	+ array(
12	12	'OCA\\Files\\' => 10,
13	13	),
14	14	);
15	15
16		- public static $prefixDirsPsr4 = array (
	16	+ public static $prefixDirsPsr4 = array(
17	17	'OCA\\Files\\' =>
18		- array (
19		- 0 => __DIR__ . '/..' . '/../lib',
	18	+ array(
	19	+ 0 => __DIR__.'/..'.'/../lib',
20	20	),
21	21	);
22	22
23		- public static $classMap = array (
24		- 'OCA\\Files\\Activity\\FavoriteProvider' => __DIR__ . '/..' . '/../lib/Activity/FavoriteProvider.php',
25		- 'OCA\\Files\\Activity\\Filter\\Favorites' => __DIR__ . '/..' . '/../lib/Activity/Filter/Favorites.php',
26		- 'OCA\\Files\\Activity\\Filter\\FileChanges' => __DIR__ . '/..' . '/../lib/Activity/Filter/FileChanges.php',
27		- 'OCA\\Files\\Activity\\Helper' => __DIR__ . '/..' . '/../lib/Activity/Helper.php',
28		- 'OCA\\Files\\Activity\\Provider' => __DIR__ . '/..' . '/../lib/Activity/Provider.php',
29		- 'OCA\\Files\\Activity\\Settings\\FavoriteAction' => __DIR__ . '/..' . '/../lib/Activity/Settings/FavoriteAction.php',
30		- 'OCA\\Files\\Activity\\Settings\\FileChanged' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileChanged.php',
31		- 'OCA\\Files\\Activity\\Settings\\FileCreated' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileCreated.php',
32		- 'OCA\\Files\\Activity\\Settings\\FileDeleted' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileDeleted.php',
33		- 'OCA\\Files\\Activity\\Settings\\FileFavorite' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileFavorite.php',
34		- 'OCA\\Files\\Activity\\Settings\\FileRestored' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileRestored.php',
35		- 'OCA\\Files\\App' => __DIR__ . '/..' . '/../lib/App.php',
36		- 'OCA\\Files\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
37		- 'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupFileLocks.php',
38		- 'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => __DIR__ . '/..' . '/../lib/BackgroundJob/DeleteOrphanedItems.php',
39		- 'OCA\\Files\\BackgroundJob\\ScanFiles' => __DIR__ . '/..' . '/../lib/BackgroundJob/ScanFiles.php',
40		- 'OCA\\Files\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
41		- 'OCA\\Files\\Command\\DeleteOrphanedFiles' => __DIR__ . '/..' . '/../lib/Command/DeleteOrphanedFiles.php',
42		- 'OCA\\Files\\Command\\Scan' => __DIR__ . '/..' . '/../lib/Command/Scan.php',
43		- 'OCA\\Files\\Command\\ScanAppData' => __DIR__ . '/..' . '/../lib/Command/ScanAppData.php',
44		- 'OCA\\Files\\Command\\TransferOwnership' => __DIR__ . '/..' . '/../lib/Command/TransferOwnership.php',
45		- 'OCA\\Files\\Controller\\AjaxController' => __DIR__ . '/..' . '/../lib/Controller/AjaxController.php',
46		- 'OCA\\Files\\Controller\\ApiController' => __DIR__ . '/..' . '/../lib/Controller/ApiController.php',
47		- 'OCA\\Files\\Controller\\SettingsController' => __DIR__ . '/..' . '/../lib/Controller/SettingsController.php',
48		- 'OCA\\Files\\Controller\\ViewController' => __DIR__ . '/..' . '/../lib/Controller/ViewController.php',
49		- 'OCA\\Files\\Helper' => __DIR__ . '/..' . '/../lib/Helper.php',
50		- 'OCA\\Files\\Service\\TagService' => __DIR__ . '/..' . '/../lib/Service/TagService.php',
51		- 'OCA\\Files\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
	23	+ public static $classMap = array(
	24	+ 'OCA\\Files\\Activity\\FavoriteProvider' => __DIR__.'/..'.'/../lib/Activity/FavoriteProvider.php',
	25	+ 'OCA\\Files\\Activity\\Filter\\Favorites' => __DIR__.'/..'.'/../lib/Activity/Filter/Favorites.php',
	26	+ 'OCA\\Files\\Activity\\Filter\\FileChanges' => __DIR__.'/..'.'/../lib/Activity/Filter/FileChanges.php',
	27	+ 'OCA\\Files\\Activity\\Helper' => __DIR__.'/..'.'/../lib/Activity/Helper.php',
	28	+ 'OCA\\Files\\Activity\\Provider' => __DIR__.'/..'.'/../lib/Activity/Provider.php',
	29	+ 'OCA\\Files\\Activity\\Settings\\FavoriteAction' => __DIR__.'/..'.'/../lib/Activity/Settings/FavoriteAction.php',
	30	+ 'OCA\\Files\\Activity\\Settings\\FileChanged' => __DIR__.'/..'.'/../lib/Activity/Settings/FileChanged.php',
	31	+ 'OCA\\Files\\Activity\\Settings\\FileCreated' => __DIR__.'/..'.'/../lib/Activity/Settings/FileCreated.php',
	32	+ 'OCA\\Files\\Activity\\Settings\\FileDeleted' => __DIR__.'/..'.'/../lib/Activity/Settings/FileDeleted.php',
	33	+ 'OCA\\Files\\Activity\\Settings\\FileFavorite' => __DIR__.'/..'.'/../lib/Activity/Settings/FileFavorite.php',
	34	+ 'OCA\\Files\\Activity\\Settings\\FileRestored' => __DIR__.'/..'.'/../lib/Activity/Settings/FileRestored.php',
	35	+ 'OCA\\Files\\App' => __DIR__.'/..'.'/../lib/App.php',
	36	+ 'OCA\\Files\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
	37	+ 'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => __DIR__.'/..'.'/../lib/BackgroundJob/CleanupFileLocks.php',
	38	+ 'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => __DIR__.'/..'.'/../lib/BackgroundJob/DeleteOrphanedItems.php',
	39	+ 'OCA\\Files\\BackgroundJob\\ScanFiles' => __DIR__.'/..'.'/../lib/BackgroundJob/ScanFiles.php',
	40	+ 'OCA\\Files\\Capabilities' => __DIR__.'/..'.'/../lib/Capabilities.php',
	41	+ 'OCA\\Files\\Command\\DeleteOrphanedFiles' => __DIR__.'/..'.'/../lib/Command/DeleteOrphanedFiles.php',
	42	+ 'OCA\\Files\\Command\\Scan' => __DIR__.'/..'.'/../lib/Command/Scan.php',
	43	+ 'OCA\\Files\\Command\\ScanAppData' => __DIR__.'/..'.'/../lib/Command/ScanAppData.php',
	44	+ 'OCA\\Files\\Command\\TransferOwnership' => __DIR__.'/..'.'/../lib/Command/TransferOwnership.php',
	45	+ 'OCA\\Files\\Controller\\AjaxController' => __DIR__.'/..'.'/../lib/Controller/AjaxController.php',
	46	+ 'OCA\\Files\\Controller\\ApiController' => __DIR__.'/..'.'/../lib/Controller/ApiController.php',
	47	+ 'OCA\\Files\\Controller\\SettingsController' => __DIR__.'/..'.'/../lib/Controller/SettingsController.php',
	48	+ 'OCA\\Files\\Controller\\ViewController' => __DIR__.'/..'.'/../lib/Controller/ViewController.php',
	49	+ 'OCA\\Files\\Helper' => __DIR__.'/..'.'/../lib/Helper.php',
	50	+ 'OCA\\Files\\Service\\TagService' => __DIR__.'/..'.'/../lib/Service/TagService.php',
	51	+ 'OCA\\Files\\Settings\\Admin' => __DIR__.'/..'.'/../lib/Settings/Admin.php',
52	52	);
53	53
54	54	public static function getInitializer(ClassLoader $loader)
55	55	{
56		- return \Closure::bind(function () use ($loader) {
	56	+ return \Closure::bind(function() use ($loader) {
57	57	$loader->prefixLengthsPsr4 = ComposerStaticInitFiles::$prefixLengthsPsr4;
58	58	$loader->prefixDirsPsr4 = ComposerStaticInitFiles::$prefixDirsPsr4;
59	59	$loader->classMap = ComposerStaticInitFiles::$classMap;

nextcloud / server

Pull Request — master (#8800)

Status

Category

Indentation +51 added lines, -51 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +28 added lines, -28 removed lines patch added patch discarded remove patch

Spacing +35 added lines, -35 removed lines patch added patch discarded remove patch