Inspection of "Merge pull request #14015 from nextcloud/fix/no_ne..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 733515...0bb55f )

by Morris

created 2019-02-05 09:23 UTC

Status

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

@@ -27,57 +27,57 @@
 block discarded – undo
 
 class Application extends \OCP\AppFramework\App {
 
-	public function __construct() {
-		parent::__construct('workflowengine');
+    public function __construct() {
+        parent::__construct('workflowengine');
 
-		$this->getContainer()->registerAlias('FlowOperationsController', FlowOperations::class);
-		$this->getContainer()->registerAlias('RequestTimeController', RequestTime::class);
-	}
+        $this->getContainer()->registerAlias('FlowOperationsController', FlowOperations::class);
+        $this->getContainer()->registerAlias('RequestTimeController', RequestTime::class);
+    }
 
-	/**
-	 * Register all hooks and listeners
-	 */
-	public function registerHooksAndListeners() {
-		$dispatcher = $this->getContainer()->getServer()->getEventDispatcher();
-		$dispatcher->addListener(
-			'OCP\WorkflowEngine::loadAdditionalSettingScripts',
-			function() {
-				if (!function_exists('style')) {
-					// This is hacky, but we need to load the template class
-					class_exists(Template::class, true);
-				}
+    /**
+     * Register all hooks and listeners
+     */
+    public function registerHooksAndListeners() {
+        $dispatcher = $this->getContainer()->getServer()->getEventDispatcher();
+        $dispatcher->addListener(
+            'OCP\WorkflowEngine::loadAdditionalSettingScripts',
+            function() {
+                if (!function_exists('style')) {
+                    // This is hacky, but we need to load the template class
+                    class_exists(Template::class, true);
+                }
 
-				style('workflowengine', [
-					'admin',
-				]);
+                style('workflowengine', [
+                    'admin',
+                ]);
 
-				script('core', [
-					'files/fileinfo',
-					'files/client',
-					'systemtags/systemtags',
-					'systemtags/systemtagmodel',
-					'systemtags/systemtagscollection',
-				]);
+                script('core', [
+                    'files/fileinfo',
+                    'files/client',
+                    'systemtags/systemtags',
+                    'systemtags/systemtagmodel',
+                    'systemtags/systemtagscollection',
+                ]);
 
-				vendor_script('jsTimezoneDetect/jstz');
+                vendor_script('jsTimezoneDetect/jstz');
 
-				script('workflowengine', [
-					'admin',
-					'templates',
+                script('workflowengine', [
+                    'admin',
+                    'templates',
 
-					// Check plugins
-					'filemimetypeplugin',
-					'filenameplugin',
-					'filesizeplugin',
-					'filesystemtagsplugin',
-					'requestremoteaddressplugin',
-					'requesttimeplugin',
-					'requesturlplugin',
-					'requestuseragentplugin',
-					'usergroupmembershipplugin',
-				]);
-			},
-			-100
-		);
-	}
+                    // Check plugins
+                    'filemimetypeplugin',
+                    'filenameplugin',
+                    'filesizeplugin',
+                    'filesystemtagsplugin',
+                    'requestremoteaddressplugin',
+                    'requesttimeplugin',
+                    'requesturlplugin',
+                    'requestuseragentplugin',
+                    'usergroupmembershipplugin',
+                ]);
+            },
+            -100
+        );
+    }
 }

Please login to merge, or discard this patch.

apps/comments/lib/AppInfo/Application.php 1 patch

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

@@ -35,63 +35,63 @@
 block discarded – undo
 
 class Application extends App {
 
-	public function __construct (array $urlParams = array()) {
-		parent::__construct('comments', $urlParams);
-		$container = $this->getContainer();
+    public function __construct (array $urlParams = array()) {
+        parent::__construct('comments', $urlParams);
+        $container = $this->getContainer();
 
-		$container->registerAlias('NotificationsController', Notifications::class);
+        $container->registerAlias('NotificationsController', Notifications::class);
 
-		$jsSettingsHelper = new JSSettingsHelper($container->getServer());
-		Util::connectHook('\OCP\Config', 'js', $jsSettingsHelper, 'extend');
-	}
+        $jsSettingsHelper = new JSSettingsHelper($container->getServer());
+        Util::connectHook('\OCP\Config', 'js', $jsSettingsHelper, 'extend');
+    }
 
-	public function register() {
-		$server = $this->getContainer()->getServer();
+    public function register() {
+        $server = $this->getContainer()->getServer();
 
-		$dispatcher = $server->getEventDispatcher();
-		$this->registerSidebarScripts($dispatcher);
-		$this->registerDavEntity($dispatcher);
-		$this->registerNotifier();
-		$this->registerCommentsEventHandler();
+        $dispatcher = $server->getEventDispatcher();
+        $this->registerSidebarScripts($dispatcher);
+        $this->registerDavEntity($dispatcher);
+        $this->registerNotifier();
+        $this->registerCommentsEventHandler();
 
-		$server->getSearch()->registerProvider(Provider::class, ['apps' => ['files']]);
-	}
+        $server->getSearch()->registerProvider(Provider::class, ['apps' => ['files']]);
+    }
 
-	protected function registerSidebarScripts(EventDispatcherInterface $dispatcher) {
-		$dispatcher->addListener(
-			'OCA\Files::loadAdditionalScripts',
-			function() {
-				Util::addScript('comments', 'merged');
-				Util::addStyle('comments', 'autocomplete');
-				Util::addStyle('comments', 'comments');
-			}
-		);
-	}
+    protected function registerSidebarScripts(EventDispatcherInterface $dispatcher) {
+        $dispatcher->addListener(
+            'OCA\Files::loadAdditionalScripts',
+            function() {
+                Util::addScript('comments', 'merged');
+                Util::addStyle('comments', 'autocomplete');
+                Util::addStyle('comments', 'comments');
+            }
+        );
+    }
 
-	protected function registerDavEntity(EventDispatcherInterface $dispatcher) {
-		$dispatcher->addListener(CommentsEntityEvent::EVENT_ENTITY, function(CommentsEntityEvent $event) {
-			$event->addEntityCollection('files', function($name) {
-				$nodes = \OC::$server->getUserFolder()->getById((int)$name);
-				return !empty($nodes);
-			});
-		});
-	}
+    protected function registerDavEntity(EventDispatcherInterface $dispatcher) {
+        $dispatcher->addListener(CommentsEntityEvent::EVENT_ENTITY, function(CommentsEntityEvent $event) {
+            $event->addEntityCollection('files', function($name) {
+                $nodes = \OC::$server->getUserFolder()->getById((int)$name);
+                return !empty($nodes);
+            });
+        });
+    }
 
-	protected function registerNotifier() {
-		$this->getContainer()->getServer()->getNotificationManager()->registerNotifier(
-			function() {
-				return $this->getContainer()->query(Notifier::class);
-			},
-			function () {
-				$l = $this->getContainer()->getServer()->getL10NFactory()->get('comments');
-				return ['id' => 'comments', 'name' => $l->t('Comments')];
-			}
-		);
-	}
+    protected function registerNotifier() {
+        $this->getContainer()->getServer()->getNotificationManager()->registerNotifier(
+            function() {
+                return $this->getContainer()->query(Notifier::class);
+            },
+            function () {
+                $l = $this->getContainer()->getServer()->getL10NFactory()->get('comments');
+                return ['id' => 'comments', 'name' => $l->t('Comments')];
+            }
+        );
+    }
 
-	protected function registerCommentsEventHandler() {
-		$this->getContainer()->getServer()->getCommentsManager()->registerEventHandler(function () {
-			return $this->getContainer()->query(EventHandler::class);
-		});
-	}
+    protected function registerCommentsEventHandler() {
+        $this->getContainer()->getServer()->getCommentsManager()->registerEventHandler(function () {
+            return $this->getContainer()->query(EventHandler::class);
+        });
+    }
 }

Please login to merge, or discard this patch.

apps/systemtags/templates/admin.php 1 patch

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

@@ -20,9 +20,9 @@
 block discarded – undo
  */
 
 script('core', [
-	'systemtags/systemtags',
-	'systemtags/systemtagmodel',
-	'systemtags/systemtagscollection',
+    'systemtags/systemtags',
+    'systemtags/systemtagmodel',
+    'systemtags/systemtagscollection',
 ]);
 
 script('systemtags', 'admin');

Please login to merge, or discard this patch.

apps/systemtags/appinfo/app.php 1 patch

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

@@ -30,21 +30,21 @@  discard block
 block discarded – undo
 
 $eventDispatcher = \OC::$server->getEventDispatcher();
 $eventDispatcher->addListener(
-	'OCA\Files::loadAdditionalScripts',
-	function() {
-		// FIXME: no public API for these ?
-		\OCP\Util::addScript('systemtags/merged');
-		\OCP\Util::addScript('systemtags', 'merged');
-		\OCP\Util::addStyle('systemtags');
-		\OCP\Util::addStyle('systemtags', 'systemtagsfilelist');
-	}
+    'OCA\Files::loadAdditionalScripts',
+    function() {
+        // FIXME: no public API for these ?
+        \OCP\Util::addScript('systemtags/merged');
+        \OCP\Util::addScript('systemtags', 'merged');
+        \OCP\Util::addStyle('systemtags');
+        \OCP\Util::addStyle('systemtags', 'systemtagsfilelist');
+    }
 );
 
 $managerListener = function(ManagerEvent $event) {
-	$application = new \OCP\AppFramework\App('systemtags');
-	/** @var \OCA\SystemTags\Activity\Listener $listener */
-	$listener = $application->getContainer()->query(Listener::class);
-	$listener->event($event);
+    $application = new \OCP\AppFramework\App('systemtags');
+    /** @var \OCA\SystemTags\Activity\Listener $listener */
+    $listener = $application->getContainer()->query(Listener::class);
+    $listener->event($event);
 };
 
 $eventDispatcher->addListener(ManagerEvent::EVENT_CREATE, $managerListener);
@@ -52,23 +52,23 @@  discard block
 block discarded – undo
 $eventDispatcher->addListener(ManagerEvent::EVENT_UPDATE, $managerListener);
 
 $mapperListener = function(MapperEvent $event) {
-	$application = new \OCP\AppFramework\App('systemtags');
-	/** @var \OCA\SystemTags\Activity\Listener $listener */
-	$listener = $application->getContainer()->query(Listener::class);
-	$listener->mapperEvent($event);
+    $application = new \OCP\AppFramework\App('systemtags');
+    /** @var \OCA\SystemTags\Activity\Listener $listener */
+    $listener = $application->getContainer()->query(Listener::class);
+    $listener->mapperEvent($event);
 };
 
 $eventDispatcher->addListener(MapperEvent::EVENT_ASSIGN, $mapperListener);
 $eventDispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener);
 
 \OCA\Files\App::getNavigationManager()->add(function () {
-	$l = \OC::$server->getL10N('systemtags');
-	return [
-		'id' => 'systemtagsfilter',
-		'appname' => 'systemtags',
-		'script' => 'list.php',
-		'order' => 25,
-		'name' => $l->t('Tags'),
-	];
+    $l = \OC::$server->getL10N('systemtags');
+    return [
+        'id' => 'systemtagsfilter',
+        'appname' => 'systemtags',
+        'script' => 'list.php',
+        'order' => 25,
+        'name' => $l->t('Tags'),
+    ];
 });
 

Please login to merge, or discard this patch.

		@@ -27,57 +27,57 @@
		block discarded – undo
27	27
28	28	class Application extends \OCP\AppFramework\App {
29	29
30		- public function __construct() {
31		- parent::__construct('workflowengine');
	30	+ public function __construct() {
	31	+ parent::__construct('workflowengine');
32	32
33		- $this->getContainer()->registerAlias('FlowOperationsController', FlowOperations::class);
34		- $this->getContainer()->registerAlias('RequestTimeController', RequestTime::class);
35		- }
	33	+ $this->getContainer()->registerAlias('FlowOperationsController', FlowOperations::class);
	34	+ $this->getContainer()->registerAlias('RequestTimeController', RequestTime::class);
	35	+ }
36	36
37		- /**
38		- * Register all hooks and listeners
39		- */
40		- public function registerHooksAndListeners() {
41		- $dispatcher = $this->getContainer()->getServer()->getEventDispatcher();
42		- $dispatcher->addListener(
43		- 'OCP\WorkflowEngine::loadAdditionalSettingScripts',
44		- function() {
45		- if (!function_exists('style')) {
46		- // This is hacky, but we need to load the template class
47		- class_exists(Template::class, true);
48		- }
	37	+ /**
	38	+ * Register all hooks and listeners
	39	+ */
	40	+ public function registerHooksAndListeners() {
	41	+ $dispatcher = $this->getContainer()->getServer()->getEventDispatcher();
	42	+ $dispatcher->addListener(
	43	+ 'OCP\WorkflowEngine::loadAdditionalSettingScripts',
	44	+ function() {
	45	+ if (!function_exists('style')) {
	46	+ // This is hacky, but we need to load the template class
	47	+ class_exists(Template::class, true);
	48	+ }
49	49
50		- style('workflowengine', [
51		- 'admin',
52		- ]);
	50	+ style('workflowengine', [
	51	+ 'admin',
	52	+ ]);
53	53
54		- script('core', [
55		- 'files/fileinfo',
56		- 'files/client',
57		- 'systemtags/systemtags',
58		- 'systemtags/systemtagmodel',
59		- 'systemtags/systemtagscollection',
60		- ]);
	54	+ script('core', [
	55	+ 'files/fileinfo',
	56	+ 'files/client',
	57	+ 'systemtags/systemtags',
	58	+ 'systemtags/systemtagmodel',
	59	+ 'systemtags/systemtagscollection',
	60	+ ]);
61	61
62		- vendor_script('jsTimezoneDetect/jstz');
	62	+ vendor_script('jsTimezoneDetect/jstz');
63	63
64		- script('workflowengine', [
65		- 'admin',
66		- 'templates',
	64	+ script('workflowengine', [
	65	+ 'admin',
	66	+ 'templates',
67	67
68		- // Check plugins
69		- 'filemimetypeplugin',
70		- 'filenameplugin',
71		- 'filesizeplugin',
72		- 'filesystemtagsplugin',
73		- 'requestremoteaddressplugin',
74		- 'requesttimeplugin',
75		- 'requesturlplugin',
76		- 'requestuseragentplugin',
77		- 'usergroupmembershipplugin',
78		- ]);
79		- },
80		- -100
81		- );
82		- }
	68	+ // Check plugins
	69	+ 'filemimetypeplugin',
	70	+ 'filenameplugin',
	71	+ 'filesizeplugin',
	72	+ 'filesystemtagsplugin',
	73	+ 'requestremoteaddressplugin',
	74	+ 'requesttimeplugin',
	75	+ 'requesturlplugin',
	76	+ 'requestuseragentplugin',
	77	+ 'usergroupmembershipplugin',
	78	+ ]);
	79	+ },
	80	+ -100
	81	+ );
	82	+ }
83	83	}

		@@ -35,63 +35,63 @@
		block discarded – undo
35	35
36	36	class Application extends App {
37	37
38		- public function __construct (array $urlParams = array()) {
39		- parent::__construct('comments', $urlParams);
40		- $container = $this->getContainer();
	38	+ public function __construct (array $urlParams = array()) {
	39	+ parent::__construct('comments', $urlParams);
	40	+ $container = $this->getContainer();
41	41
42		- $container->registerAlias('NotificationsController', Notifications::class);
	42	+ $container->registerAlias('NotificationsController', Notifications::class);
43	43
44		- $jsSettingsHelper = new JSSettingsHelper($container->getServer());
45		- Util::connectHook('\OCP\Config', 'js', $jsSettingsHelper, 'extend');
46		- }
	44	+ $jsSettingsHelper = new JSSettingsHelper($container->getServer());
	45	+ Util::connectHook('\OCP\Config', 'js', $jsSettingsHelper, 'extend');
	46	+ }
47	47
48		- public function register() {
49		- $server = $this->getContainer()->getServer();
	48	+ public function register() {
	49	+ $server = $this->getContainer()->getServer();
50	50
51		- $dispatcher = $server->getEventDispatcher();
52		- $this->registerSidebarScripts($dispatcher);
53		- $this->registerDavEntity($dispatcher);
54		- $this->registerNotifier();
55		- $this->registerCommentsEventHandler();
	51	+ $dispatcher = $server->getEventDispatcher();
	52	+ $this->registerSidebarScripts($dispatcher);
	53	+ $this->registerDavEntity($dispatcher);
	54	+ $this->registerNotifier();
	55	+ $this->registerCommentsEventHandler();
56	56
57		- $server->getSearch()->registerProvider(Provider::class, ['apps' => ['files']]);
58		- }
	57	+ $server->getSearch()->registerProvider(Provider::class, ['apps' => ['files']]);
	58	+ }
59	59
60		- protected function registerSidebarScripts(EventDispatcherInterface $dispatcher) {
61		- $dispatcher->addListener(
62		- 'OCA\Files::loadAdditionalScripts',
63		- function() {
64		- Util::addScript('comments', 'merged');
65		- Util::addStyle('comments', 'autocomplete');
66		- Util::addStyle('comments', 'comments');
67		- }
68		- );
69		- }
	60	+ protected function registerSidebarScripts(EventDispatcherInterface $dispatcher) {
	61	+ $dispatcher->addListener(
	62	+ 'OCA\Files::loadAdditionalScripts',
	63	+ function() {
	64	+ Util::addScript('comments', 'merged');
	65	+ Util::addStyle('comments', 'autocomplete');
	66	+ Util::addStyle('comments', 'comments');
	67	+ }
	68	+ );
	69	+ }
70	70
71		- protected function registerDavEntity(EventDispatcherInterface $dispatcher) {
72		- $dispatcher->addListener(CommentsEntityEvent::EVENT_ENTITY, function(CommentsEntityEvent $event) {
73		- $event->addEntityCollection('files', function($name) {
74		- $nodes = \OC::$server->getUserFolder()->getById((int)$name);
75		- return !empty($nodes);
76		- });
77		- });
78		- }
	71	+ protected function registerDavEntity(EventDispatcherInterface $dispatcher) {
	72	+ $dispatcher->addListener(CommentsEntityEvent::EVENT_ENTITY, function(CommentsEntityEvent $event) {
	73	+ $event->addEntityCollection('files', function($name) {
	74	+ $nodes = \OC::$server->getUserFolder()->getById((int)$name);
	75	+ return !empty($nodes);
	76	+ });
	77	+ });
	78	+ }
79	79
80		- protected function registerNotifier() {
81		- $this->getContainer()->getServer()->getNotificationManager()->registerNotifier(
82		- function() {
83		- return $this->getContainer()->query(Notifier::class);
84		- },
85		- function () {
86		- $l = $this->getContainer()->getServer()->getL10NFactory()->get('comments');
87		- return ['id' => 'comments', 'name' => $l->t('Comments')];
88		- }
89		- );
90		- }
	80	+ protected function registerNotifier() {
	81	+ $this->getContainer()->getServer()->getNotificationManager()->registerNotifier(
	82	+ function() {
	83	+ return $this->getContainer()->query(Notifier::class);
	84	+ },
	85	+ function () {
	86	+ $l = $this->getContainer()->getServer()->getL10NFactory()->get('comments');
	87	+ return ['id' => 'comments', 'name' => $l->t('Comments')];
	88	+ }
	89	+ );
	90	+ }
91	91
92		- protected function registerCommentsEventHandler() {
93		- $this->getContainer()->getServer()->getCommentsManager()->registerEventHandler(function () {
94		- return $this->getContainer()->query(EventHandler::class);
95		- });
96		- }
	92	+ protected function registerCommentsEventHandler() {
	93	+ $this->getContainer()->getServer()->getCommentsManager()->registerEventHandler(function () {
	94	+ return $this->getContainer()->query(EventHandler::class);
	95	+ });
	96	+ }
97	97	}

		@@ -20,9 +20,9 @@
		block discarded – undo
20	20	*/
21	21
22	22	script('core', [
23		- 'systemtags/systemtags',
24		- 'systemtags/systemtagmodel',
25		- 'systemtags/systemtagscollection',
	23	+ 'systemtags/systemtags',
	24	+ 'systemtags/systemtagmodel',
	25	+ 'systemtags/systemtagscollection',
26	26	]);
27	27
28	28	script('systemtags', 'admin');

		@@ -30,21 +30,21 @@ discard block
		block discarded – undo
30	30
31	31	$eventDispatcher = \OC::$server->getEventDispatcher();
32	32	$eventDispatcher->addListener(
33		- 'OCA\Files::loadAdditionalScripts',
34		- function() {
35		- // FIXME: no public API for these ?
36		- \OCP\Util::addScript('systemtags/merged');
37		- \OCP\Util::addScript('systemtags', 'merged');
38		- \OCP\Util::addStyle('systemtags');
39		- \OCP\Util::addStyle('systemtags', 'systemtagsfilelist');
40		- }
	33	+ 'OCA\Files::loadAdditionalScripts',
	34	+ function() {
	35	+ // FIXME: no public API for these ?
	36	+ \OCP\Util::addScript('systemtags/merged');
	37	+ \OCP\Util::addScript('systemtags', 'merged');
	38	+ \OCP\Util::addStyle('systemtags');
	39	+ \OCP\Util::addStyle('systemtags', 'systemtagsfilelist');
	40	+ }
41	41	);
42	42
43	43	$managerListener = function(ManagerEvent $event) {
44		- $application = new \OCP\AppFramework\App('systemtags');
45		- /** @var \OCA\SystemTags\Activity\Listener $listener */
46		- $listener = $application->getContainer()->query(Listener::class);
47		- $listener->event($event);
	44	+ $application = new \OCP\AppFramework\App('systemtags');
	45	+ /** @var \OCA\SystemTags\Activity\Listener $listener */
	46	+ $listener = $application->getContainer()->query(Listener::class);
	47	+ $listener->event($event);
48	48	};
49	49
50	50	$eventDispatcher->addListener(ManagerEvent::EVENT_CREATE, $managerListener);
		@@ -52,23 +52,23 @@ discard block
		block discarded – undo
52	52	$eventDispatcher->addListener(ManagerEvent::EVENT_UPDATE, $managerListener);
53	53
54	54	$mapperListener = function(MapperEvent $event) {
55		- $application = new \OCP\AppFramework\App('systemtags');
56		- /** @var \OCA\SystemTags\Activity\Listener $listener */
57		- $listener = $application->getContainer()->query(Listener::class);
58		- $listener->mapperEvent($event);
	55	+ $application = new \OCP\AppFramework\App('systemtags');
	56	+ /** @var \OCA\SystemTags\Activity\Listener $listener */
	57	+ $listener = $application->getContainer()->query(Listener::class);
	58	+ $listener->mapperEvent($event);
59	59	};
60	60
61	61	$eventDispatcher->addListener(MapperEvent::EVENT_ASSIGN, $mapperListener);
62	62	$eventDispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener);
63	63
64	64	\OCA\Files\App::getNavigationManager()->add(function () {
65		- $l = \OC::$server->getL10N('systemtags');
66		- return [
67		- 'id' => 'systemtagsfilter',
68		- 'appname' => 'systemtags',
69		- 'script' => 'list.php',
70		- 'order' => 25,
71		- 'name' => $l->t('Tags'),
72		- ];
	65	+ $l = \OC::$server->getL10N('systemtags');
	66	+ return [
	67	+ 'id' => 'systemtagsfilter',
	68	+ 'appname' => 'systemtags',
	69	+ 'script' => 'list.php',
	70	+ 'order' => 25,
	71	+ 'name' => $l->t('Tags'),
	72	+ ];
73	73	});
74	74

nextcloud / server

Push — master ( 733515...0bb55f )

Status

Category

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

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

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

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