Inspection of "Merge pull request #22799 from nextcloud/bugfix/no..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( e0e7f1...c1ff01 )

by Morris

created 2020-09-14 12:44 UTC

Status

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

@@ -45,94 +45,94 @@
 block discarded – undo
 use Sabre\DAV\Exception\ServiceUnavailable;
 
 class ExceptionLoggerPlugin extends \Sabre\DAV\ServerPlugin {
-	protected $nonFatalExceptions = [
-		NotAuthenticated::class => true,
-		// If tokenauth can throw this exception (which is basically as
-		// NotAuthenticated. So not fatal.
-		PasswordLoginForbidden::class => true,
-		// basically a NotAuthenticated
-		InvalidSyncToken::class => true,
-		// the sync client uses this to find out whether files exist,
-		// so it is not always an error, log it as debug
-		NotFound::class => true,
-		// the sync client messed up their request
-		// (e.g. propfind for tags with string instead of int)
-		// so it is not always an error, log it as debug
-		BadRequest::class => true,
-		// this one mostly happens when the same file is uploaded at
-		// exactly the same time from two clients, only one client
-		// wins, the second one gets "Precondition failed"
-		PreconditionFailed::class => true,
-		// forbidden can be expected when trying to upload to
-		// read-only folders for example
-		Forbidden::class => true,
-		// Happens when an external storage or federated share is temporarily
-		// not available
-		StorageNotAvailableException::class => true,
-		// happens if some a client uses the wrong method for a given URL
-		// the error message itself is visible on the client side anyways
-		NotImplemented::class => true,
-		// happens when the parent directory is not present (for example when a
-		// move is done to a non-existent directory)
-		Conflict::class => true,
-		// happens when a certain method is not allowed to be called
-		// for example creating a folder that already exists
-		MethodNotAllowed::class => true,
-		// A locked file is perfectly valid and can happen in various cases
-		FileLocked::class => true,
-		// An invalid range is requested
-		RequestedRangeNotSatisfiable::class => true,
-	];
+    protected $nonFatalExceptions = [
+        NotAuthenticated::class => true,
+        // If tokenauth can throw this exception (which is basically as
+        // NotAuthenticated. So not fatal.
+        PasswordLoginForbidden::class => true,
+        // basically a NotAuthenticated
+        InvalidSyncToken::class => true,
+        // the sync client uses this to find out whether files exist,
+        // so it is not always an error, log it as debug
+        NotFound::class => true,
+        // the sync client messed up their request
+        // (e.g. propfind for tags with string instead of int)
+        // so it is not always an error, log it as debug
+        BadRequest::class => true,
+        // this one mostly happens when the same file is uploaded at
+        // exactly the same time from two clients, only one client
+        // wins, the second one gets "Precondition failed"
+        PreconditionFailed::class => true,
+        // forbidden can be expected when trying to upload to
+        // read-only folders for example
+        Forbidden::class => true,
+        // Happens when an external storage or federated share is temporarily
+        // not available
+        StorageNotAvailableException::class => true,
+        // happens if some a client uses the wrong method for a given URL
+        // the error message itself is visible on the client side anyways
+        NotImplemented::class => true,
+        // happens when the parent directory is not present (for example when a
+        // move is done to a non-existent directory)
+        Conflict::class => true,
+        // happens when a certain method is not allowed to be called
+        // for example creating a folder that already exists
+        MethodNotAllowed::class => true,
+        // A locked file is perfectly valid and can happen in various cases
+        FileLocked::class => true,
+        // An invalid range is requested
+        RequestedRangeNotSatisfiable::class => true,
+    ];
 
-	/** @var string */
-	private $appName;
+    /** @var string */
+    private $appName;
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	/**
-	 * @param string $loggerAppName app name to use when logging
-	 * @param ILogger $logger
-	 */
-	public function __construct($loggerAppName, $logger) {
-		$this->appName = $loggerAppName;
-		$this->logger = $logger;
-	}
+    /**
+     * @param string $loggerAppName app name to use when logging
+     * @param ILogger $logger
+     */
+    public function __construct($loggerAppName, $logger) {
+        $this->appName = $loggerAppName;
+        $this->logger = $logger;
+    }
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by \Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$server->on('exception', [$this, 'logException'], 10);
-	}
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by \Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param \Sabre\DAV\Server $server
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $server->on('exception', [$this, 'logException'], 10);
+    }
 
-	/**
-	 * Log exception
-	 *
-	 */
-	public function logException(\Throwable $ex) {
-		$exceptionClass = get_class($ex);
-		$level = ILogger::FATAL;
-		if (isset($this->nonFatalExceptions[$exceptionClass]) ||
-			(
-				$exceptionClass === ServiceUnavailable::class &&
-				$ex->getMessage() === 'System in maintenance mode.'
-			)
-		) {
-			$level = ILogger::DEBUG;
-		}
+    /**
+     * Log exception
+     *
+     */
+    public function logException(\Throwable $ex) {
+        $exceptionClass = get_class($ex);
+        $level = ILogger::FATAL;
+        if (isset($this->nonFatalExceptions[$exceptionClass]) ||
+            (
+                $exceptionClass === ServiceUnavailable::class &&
+                $ex->getMessage() === 'System in maintenance mode.'
+            )
+        ) {
+            $level = ILogger::DEBUG;
+        }
 
-		$this->logger->logException($ex, [
-			'app' => $this->appName,
-			'level' => $level,
-		]);
-	}
+        $this->logger->logException($ex, [
+            'app' => $this->appName,
+            'level' => $level,
+        ]);
+    }
 }

Please login to merge, or discard this patch.

		@@ -45,94 +45,94 @@
		block discarded – undo
45	45	use Sabre\DAV\Exception\ServiceUnavailable;
46	46
47	47	class ExceptionLoggerPlugin extends \Sabre\DAV\ServerPlugin {
48		- protected $nonFatalExceptions = [
49		- NotAuthenticated::class => true,
50		- // If tokenauth can throw this exception (which is basically as
51		- // NotAuthenticated. So not fatal.
52		- PasswordLoginForbidden::class => true,
53		- // basically a NotAuthenticated
54		- InvalidSyncToken::class => true,
55		- // the sync client uses this to find out whether files exist,
56		- // so it is not always an error, log it as debug
57		- NotFound::class => true,
58		- // the sync client messed up their request
59		- // (e.g. propfind for tags with string instead of int)
60		- // so it is not always an error, log it as debug
61		- BadRequest::class => true,
62		- // this one mostly happens when the same file is uploaded at
63		- // exactly the same time from two clients, only one client
64		- // wins, the second one gets "Precondition failed"
65		- PreconditionFailed::class => true,
66		- // forbidden can be expected when trying to upload to
67		- // read-only folders for example
68		- Forbidden::class => true,
69		- // Happens when an external storage or federated share is temporarily
70		- // not available
71		- StorageNotAvailableException::class => true,
72		- // happens if some a client uses the wrong method for a given URL
73		- // the error message itself is visible on the client side anyways
74		- NotImplemented::class => true,
75		- // happens when the parent directory is not present (for example when a
76		- // move is done to a non-existent directory)
77		- Conflict::class => true,
78		- // happens when a certain method is not allowed to be called
79		- // for example creating a folder that already exists
80		- MethodNotAllowed::class => true,
81		- // A locked file is perfectly valid and can happen in various cases
82		- FileLocked::class => true,
83		- // An invalid range is requested
84		- RequestedRangeNotSatisfiable::class => true,
85		- ];
	48	+ protected $nonFatalExceptions = [
	49	+ NotAuthenticated::class => true,
	50	+ // If tokenauth can throw this exception (which is basically as
	51	+ // NotAuthenticated. So not fatal.
	52	+ PasswordLoginForbidden::class => true,
	53	+ // basically a NotAuthenticated
	54	+ InvalidSyncToken::class => true,
	55	+ // the sync client uses this to find out whether files exist,
	56	+ // so it is not always an error, log it as debug
	57	+ NotFound::class => true,
	58	+ // the sync client messed up their request
	59	+ // (e.g. propfind for tags with string instead of int)
	60	+ // so it is not always an error, log it as debug
	61	+ BadRequest::class => true,
	62	+ // this one mostly happens when the same file is uploaded at
	63	+ // exactly the same time from two clients, only one client
	64	+ // wins, the second one gets "Precondition failed"
	65	+ PreconditionFailed::class => true,
	66	+ // forbidden can be expected when trying to upload to
	67	+ // read-only folders for example
	68	+ Forbidden::class => true,
	69	+ // Happens when an external storage or federated share is temporarily
	70	+ // not available
	71	+ StorageNotAvailableException::class => true,
	72	+ // happens if some a client uses the wrong method for a given URL
	73	+ // the error message itself is visible on the client side anyways
	74	+ NotImplemented::class => true,
	75	+ // happens when the parent directory is not present (for example when a
	76	+ // move is done to a non-existent directory)
	77	+ Conflict::class => true,
	78	+ // happens when a certain method is not allowed to be called
	79	+ // for example creating a folder that already exists
	80	+ MethodNotAllowed::class => true,
	81	+ // A locked file is perfectly valid and can happen in various cases
	82	+ FileLocked::class => true,
	83	+ // An invalid range is requested
	84	+ RequestedRangeNotSatisfiable::class => true,
	85	+ ];
86	86
87		- /** @var string */
88		- private $appName;
	87	+ /** @var string */
	88	+ private $appName;
89	89
90		- /** @var ILogger */
91		- private $logger;
	90	+ /** @var ILogger */
	91	+ private $logger;
92	92
93		- /**
94		- * @param string $loggerAppName app name to use when logging
95		- * @param ILogger $logger
96		- */
97		- public function __construct($loggerAppName, $logger) {
98		- $this->appName = $loggerAppName;
99		- $this->logger = $logger;
100		- }
	93	+ /**
	94	+ * @param string $loggerAppName app name to use when logging
	95	+ * @param ILogger $logger
	96	+ */
	97	+ public function __construct($loggerAppName, $logger) {
	98	+ $this->appName = $loggerAppName;
	99	+ $this->logger = $logger;
	100	+ }
101	101
102		- /**
103		- * This initializes the plugin.
104		- *
105		- * This function is called by \Sabre\DAV\Server, after
106		- * addPlugin is called.
107		- *
108		- * This method should set up the required event subscriptions.
109		- *
110		- * @param \Sabre\DAV\Server $server
111		- * @return void
112		- */
113		- public function initialize(\Sabre\DAV\Server $server) {
114		- $server->on('exception', [$this, 'logException'], 10);
115		- }
	102	+ /**
	103	+ * This initializes the plugin.
	104	+ *
	105	+ * This function is called by \Sabre\DAV\Server, after
	106	+ * addPlugin is called.
	107	+ *
	108	+ * This method should set up the required event subscriptions.
	109	+ *
	110	+ * @param \Sabre\DAV\Server $server
	111	+ * @return void
	112	+ */
	113	+ public function initialize(\Sabre\DAV\Server $server) {
	114	+ $server->on('exception', [$this, 'logException'], 10);
	115	+ }
116	116
117		- /**
118		- * Log exception
119		- *
120		- */
121		- public function logException(\Throwable $ex) {
122		- $exceptionClass = get_class($ex);
123		- $level = ILogger::FATAL;
124		- if (isset($this->nonFatalExceptions[$exceptionClass]) \|\|
125		- (
126		- $exceptionClass === ServiceUnavailable::class &&
127		- $ex->getMessage() === 'System in maintenance mode.'
128		- )
129		- ) {
130		- $level = ILogger::DEBUG;
131		- }
	117	+ /**
	118	+ * Log exception
	119	+ *
	120	+ */
	121	+ public function logException(\Throwable $ex) {
	122	+ $exceptionClass = get_class($ex);
	123	+ $level = ILogger::FATAL;
	124	+ if (isset($this->nonFatalExceptions[$exceptionClass]) \|\|
	125	+ (
	126	+ $exceptionClass === ServiceUnavailable::class &&
	127	+ $ex->getMessage() === 'System in maintenance mode.'
	128	+ )
	129	+ ) {
	130	+ $level = ILogger::DEBUG;
	131	+ }
132	132
133		- $this->logger->logException($ex, [
134		- 'app' => $this->appName,
135		- 'level' => $level,
136		- ]);
137		- }
	133	+ $this->logger->logException($ex, [
	134	+ 'app' => $this->appName,
	135	+ 'level' => $level,
	136	+ ]);
	137	+ }
138	138	}

nextcloud / server

Push — master ( e0e7f1...c1ff01 )

Status

Category

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