nextcloud / server

lib/private/DB/AdapterPgSql.php

Indentation +9 added lines, -9 removed lines

@@ -25,14 +25,14 @@
 namespace OC\DB;
 
 class AdapterPgSql extends Adapter {
-	public function lastInsertId($table) {
-		return $this->conn->fetchColumn('SELECT lastval()');
-	}
+    public function lastInsertId($table) {
+        return $this->conn->fetchColumn('SELECT lastval()');
+    }
 
-	const UNIX_TIMESTAMP_REPLACEMENT = 'cast(extract(epoch from current_timestamp) as integer)';
-	public function fixupStatement($statement) {
-		$statement = str_replace( '`', '"', $statement );
-		$statement = str_ireplace( 'UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement );
-		return $statement;
-	}
+    const UNIX_TIMESTAMP_REPLACEMENT = 'cast(extract(epoch from current_timestamp) as integer)';
+    public function fixupStatement($statement) {
+        $statement = str_replace( '`', '"', $statement );
+        $statement = str_ireplace( 'UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement );
+        return $statement;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -31,8 +31,8 @@
 
 	const UNIX_TIMESTAMP_REPLACEMENT = 'cast(extract(epoch from current_timestamp) as integer)';
 	public function fixupStatement($statement) {
-		$statement = str_replace( '`', '"', $statement );
-		$statement = str_ireplace( 'UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement );
+		$statement = str_replace('`', '"', $statement);
+		$statement = str_ireplace('UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement);
 		return $statement;
 	}
 }

lib/private/App/DependencyAnalyzer.php

Braces +3 added lines, -2 removed lines

@@ -349,8 +349,9 @@
 	 * @return mixed
 	 */
 	private function getValue($element) {
-		if (isset($element['@value']))
-			return $element['@value'];
+		if (isset($element['@value'])) {
+					return $element['@value'];
+		}
 		return (string)$element;
 	}
 }

Indentation +291 added lines, -291 removed lines

@@ -31,319 +31,319 @@
 
 class DependencyAnalyzer {
 
-	/** @var Platform */
-	private $platform;
-	/** @var \OCP\IL10N */
-	private $l;
-	/** @var array */
-	private $appInfo;
+    /** @var Platform */
+    private $platform;
+    /** @var \OCP\IL10N */
+    private $l;
+    /** @var array */
+    private $appInfo;
 
-	/**
-	 * @param Platform $platform
-	 * @param \OCP\IL10N $l
-	 */
-	function __construct(Platform $platform, IL10N $l) {
-		$this->platform = $platform;
-		$this->l = $l;
-	}
+    /**
+     * @param Platform $platform
+     * @param \OCP\IL10N $l
+     */
+    function __construct(Platform $platform, IL10N $l) {
+        $this->platform = $platform;
+        $this->l = $l;
+    }
 
-	/**
-	 * @param array $app
-	 * @returns array of missing dependencies
-	 */
-	public function analyze(array $app) {
-		$this->appInfo = $app;
-		if (isset($app['dependencies'])) {
-			$dependencies = $app['dependencies'];
-		} else {
-			$dependencies = [];
-		}
+    /**
+     * @param array $app
+     * @returns array of missing dependencies
+     */
+    public function analyze(array $app) {
+        $this->appInfo = $app;
+        if (isset($app['dependencies'])) {
+            $dependencies = $app['dependencies'];
+        } else {
+            $dependencies = [];
+        }
 
-		return array_merge(
-			$this->analyzePhpVersion($dependencies),
-			$this->analyzeDatabases($dependencies),
-			$this->analyzeCommands($dependencies),
-			$this->analyzeLibraries($dependencies),
-			$this->analyzeOS($dependencies),
-			$this->analyzeOC($dependencies, $app)
-		);
-	}
+        return array_merge(
+            $this->analyzePhpVersion($dependencies),
+            $this->analyzeDatabases($dependencies),
+            $this->analyzeCommands($dependencies),
+            $this->analyzeLibraries($dependencies),
+            $this->analyzeOS($dependencies),
+            $this->analyzeOC($dependencies, $app)
+        );
+    }
 
-	/**
-	 * Truncates both versions to the lowest common version, e.g.
-	 * 5.1.2.3 and 5.1 will be turned into 5.1 and 5.1,
-	 * 5.2.6.5 and 5.1 will be turned into 5.2 and 5.1
-	 * @param string $first
-	 * @param string $second
-	 * @return string[] first element is the first version, second element is the
-	 * second version
-	 */
-	private function normalizeVersions($first, $second) {
-		$first = explode('.', $first);
-		$second = explode('.', $second);
+    /**
+     * Truncates both versions to the lowest common version, e.g.
+     * 5.1.2.3 and 5.1 will be turned into 5.1 and 5.1,
+     * 5.2.6.5 and 5.1 will be turned into 5.2 and 5.1
+     * @param string $first
+     * @param string $second
+     * @return string[] first element is the first version, second element is the
+     * second version
+     */
+    private function normalizeVersions($first, $second) {
+        $first = explode('.', $first);
+        $second = explode('.', $second);
 
-		// get both arrays to the same minimum size
-		$length = min(count($second), count($first));
-		$first = array_slice($first, 0, $length);
-		$second = array_slice($second, 0, $length);
+        // get both arrays to the same minimum size
+        $length = min(count($second), count($first));
+        $first = array_slice($first, 0, $length);
+        $second = array_slice($second, 0, $length);
 
-		return [implode('.', $first), implode('.', $second)];
-	}
+        return [implode('.', $first), implode('.', $second)];
+    }
 
-	/**
-	 * Parameters will be normalized and then passed into version_compare
-	 * in the same order they are specified in the method header
-	 * @param string $first
-	 * @param string $second
-	 * @param string $operator
-	 * @return bool result similar to version_compare
-	 */
-	private function compare($first, $second, $operator) {
-		// we can't normalize versions if one of the given parameters is not a
-		// version string but null. In case one parameter is null normalization
-		// will therefore be skipped
-		if ($first !== null && $second !== null) {
-			list($first, $second) = $this->normalizeVersions($first, $second);
-		}
+    /**
+     * Parameters will be normalized and then passed into version_compare
+     * in the same order they are specified in the method header
+     * @param string $first
+     * @param string $second
+     * @param string $operator
+     * @return bool result similar to version_compare
+     */
+    private function compare($first, $second, $operator) {
+        // we can't normalize versions if one of the given parameters is not a
+        // version string but null. In case one parameter is null normalization
+        // will therefore be skipped
+        if ($first !== null && $second !== null) {
+            list($first, $second) = $this->normalizeVersions($first, $second);
+        }
 
-		return version_compare($first, $second, $operator);
-	}
+        return version_compare($first, $second, $operator);
+    }
 
-	/**
-	 * Checks if a version is bigger than another version
-	 * @param string $first
-	 * @param string $second
-	 * @return bool true if the first version is bigger than the second
-	 */
-	private function compareBigger($first, $second) {
-		return $this->compare($first, $second, '>');
-	}
+    /**
+     * Checks if a version is bigger than another version
+     * @param string $first
+     * @param string $second
+     * @return bool true if the first version is bigger than the second
+     */
+    private function compareBigger($first, $second) {
+        return $this->compare($first, $second, '>');
+    }
 
-	/**
-	 * Checks if a version is smaller than another version
-	 * @param string $first
-	 * @param string $second
-	 * @return bool true if the first version is smaller than the second
-	 */
-	private function compareSmaller($first, $second) {
-		return $this->compare($first, $second, '<');
-	}
+    /**
+     * Checks if a version is smaller than another version
+     * @param string $first
+     * @param string $second
+     * @return bool true if the first version is smaller than the second
+     */
+    private function compareSmaller($first, $second) {
+        return $this->compare($first, $second, '<');
+    }
 
-	/**
-	 * @param array $dependencies
-	 * @return array
-	 */
-	private function analyzePhpVersion(array $dependencies) {
-		$missing = [];
-		if (isset($dependencies['php']['@attributes']['min-version'])) {
-			$minVersion = $dependencies['php']['@attributes']['min-version'];
-			if ($this->compareSmaller($this->platform->getPhpVersion(), $minVersion)) {
-				$missing[] = (string)$this->l->t('PHP %s or higher is required.', $minVersion);
-			}
-		}
-		if (isset($dependencies['php']['@attributes']['max-version'])) {
-			$maxVersion = $dependencies['php']['@attributes']['max-version'];
-			if ($this->compareBigger($this->platform->getPhpVersion(), $maxVersion)) {
-				$missing[] = (string)$this->l->t('PHP with a version lower than %s is required.', $maxVersion);
-			}
-		}
-		if (isset($dependencies['php']['@attributes']['min-int-size'])) {
-			$intSize = $dependencies['php']['@attributes']['min-int-size'];
-			if ($intSize > $this->platform->getIntSize()*8) {
-				$missing[] = (string)$this->l->t('%sbit or higher PHP required.', $intSize);
-			}
-		}
-		return $missing;
-	}
+    /**
+     * @param array $dependencies
+     * @return array
+     */
+    private function analyzePhpVersion(array $dependencies) {
+        $missing = [];
+        if (isset($dependencies['php']['@attributes']['min-version'])) {
+            $minVersion = $dependencies['php']['@attributes']['min-version'];
+            if ($this->compareSmaller($this->platform->getPhpVersion(), $minVersion)) {
+                $missing[] = (string)$this->l->t('PHP %s or higher is required.', $minVersion);
+            }
+        }
+        if (isset($dependencies['php']['@attributes']['max-version'])) {
+            $maxVersion = $dependencies['php']['@attributes']['max-version'];
+            if ($this->compareBigger($this->platform->getPhpVersion(), $maxVersion)) {
+                $missing[] = (string)$this->l->t('PHP with a version lower than %s is required.', $maxVersion);
+            }
+        }
+        if (isset($dependencies['php']['@attributes']['min-int-size'])) {
+            $intSize = $dependencies['php']['@attributes']['min-int-size'];
+            if ($intSize > $this->platform->getIntSize()*8) {
+                $missing[] = (string)$this->l->t('%sbit or higher PHP required.', $intSize);
+            }
+        }
+        return $missing;
+    }
 
-	/**
-	 * @param array $dependencies
-	 * @return array
-	 */
-	private function analyzeDatabases(array $dependencies) {
-		$missing = [];
-		if (!isset($dependencies['database'])) {
-			return $missing;
-		}
+    /**
+     * @param array $dependencies
+     * @return array
+     */
+    private function analyzeDatabases(array $dependencies) {
+        $missing = [];
+        if (!isset($dependencies['database'])) {
+            return $missing;
+        }
 
-		$supportedDatabases = $dependencies['database'];
-		if (empty($supportedDatabases)) {
-			return $missing;
-		}
-		if (!is_array($supportedDatabases)) {
-			$supportedDatabases = array($supportedDatabases);
-		}
-		$supportedDatabases = array_map(function ($db) {
-			return $this->getValue($db);
-		}, $supportedDatabases);
-		$currentDatabase = $this->platform->getDatabase();
-		if (!in_array($currentDatabase, $supportedDatabases)) {
-			$missing[] = (string)$this->l->t('Following databases are supported: %s', join(', ', $supportedDatabases));
-		}
-		return $missing;
-	}
+        $supportedDatabases = $dependencies['database'];
+        if (empty($supportedDatabases)) {
+            return $missing;
+        }
+        if (!is_array($supportedDatabases)) {
+            $supportedDatabases = array($supportedDatabases);
+        }
+        $supportedDatabases = array_map(function ($db) {
+            return $this->getValue($db);
+        }, $supportedDatabases);
+        $currentDatabase = $this->platform->getDatabase();
+        if (!in_array($currentDatabase, $supportedDatabases)) {
+            $missing[] = (string)$this->l->t('Following databases are supported: %s', join(', ', $supportedDatabases));
+        }
+        return $missing;
+    }
 
-	/**
-	 * @param array $dependencies
-	 * @return array
-	 */
-	private function analyzeCommands(array $dependencies) {
-		$missing = [];
-		if (!isset($dependencies['command'])) {
-			return $missing;
-		}
+    /**
+     * @param array $dependencies
+     * @return array
+     */
+    private function analyzeCommands(array $dependencies) {
+        $missing = [];
+        if (!isset($dependencies['command'])) {
+            return $missing;
+        }
 
-		$commands = $dependencies['command'];
-		if (!is_array($commands)) {
-			$commands = array($commands);
-		}
-		$os = $this->platform->getOS();
-		foreach ($commands as $command) {
-			if (isset($command['@attributes']['os']) && $command['@attributes']['os'] !== $os) {
-				continue;
-			}
-			$commandName = $this->getValue($command);
-			if (!$this->platform->isCommandKnown($commandName)) {
-				$missing[] = (string)$this->l->t('The command line tool %s could not be found', $commandName);
-			}
-		}
-		return $missing;
-	}
+        $commands = $dependencies['command'];
+        if (!is_array($commands)) {
+            $commands = array($commands);
+        }
+        $os = $this->platform->getOS();
+        foreach ($commands as $command) {
+            if (isset($command['@attributes']['os']) && $command['@attributes']['os'] !== $os) {
+                continue;
+            }
+            $commandName = $this->getValue($command);
+            if (!$this->platform->isCommandKnown($commandName)) {
+                $missing[] = (string)$this->l->t('The command line tool %s could not be found', $commandName);
+            }
+        }
+        return $missing;
+    }
 
-	/**
-	 * @param array $dependencies
-	 * @return array
-	 */
-	private function analyzeLibraries(array $dependencies) {
-		$missing = [];
-		if (!isset($dependencies['lib'])) {
-			return $missing;
-		}
+    /**
+     * @param array $dependencies
+     * @return array
+     */
+    private function analyzeLibraries(array $dependencies) {
+        $missing = [];
+        if (!isset($dependencies['lib'])) {
+            return $missing;
+        }
 
-		$libs = $dependencies['lib'];
-		if (!is_array($libs)) {
-			$libs = array($libs);
-		}
-		foreach ($libs as $lib) {
-			$libName = $this->getValue($lib);
-			$libVersion = $this->platform->getLibraryVersion($libName);
-			if (is_null($libVersion)) {
-				$missing[] = (string)$this->l->t('The library %s is not available.', $libName);
-				continue;
-			}
+        $libs = $dependencies['lib'];
+        if (!is_array($libs)) {
+            $libs = array($libs);
+        }
+        foreach ($libs as $lib) {
+            $libName = $this->getValue($lib);
+            $libVersion = $this->platform->getLibraryVersion($libName);
+            if (is_null($libVersion)) {
+                $missing[] = (string)$this->l->t('The library %s is not available.', $libName);
+                continue;
+            }
 
-			if (is_array($lib)) {
-				if (isset($lib['@attributes']['min-version'])) {
-					$minVersion = $lib['@attributes']['min-version'];
-					if ($this->compareSmaller($libVersion, $minVersion)) {
-						$missing[] = (string)$this->l->t('Library %s with a version higher than %s is required - available version %s.',
-							array($libName, $minVersion, $libVersion));
-					}
-				}
-				if (isset($lib['@attributes']['max-version'])) {
-					$maxVersion = $lib['@attributes']['max-version'];
-					if ($this->compareBigger($libVersion, $maxVersion)) {
-						$missing[] = (string)$this->l->t('Library %s with a version lower than %s is required - available version %s.',
-							array($libName, $maxVersion, $libVersion));
-					}
-				}
-			}
-		}
-		return $missing;
-	}
+            if (is_array($lib)) {
+                if (isset($lib['@attributes']['min-version'])) {
+                    $minVersion = $lib['@attributes']['min-version'];
+                    if ($this->compareSmaller($libVersion, $minVersion)) {
+                        $missing[] = (string)$this->l->t('Library %s with a version higher than %s is required - available version %s.',
+                            array($libName, $minVersion, $libVersion));
+                    }
+                }
+                if (isset($lib['@attributes']['max-version'])) {
+                    $maxVersion = $lib['@attributes']['max-version'];
+                    if ($this->compareBigger($libVersion, $maxVersion)) {
+                        $missing[] = (string)$this->l->t('Library %s with a version lower than %s is required - available version %s.',
+                            array($libName, $maxVersion, $libVersion));
+                    }
+                }
+            }
+        }
+        return $missing;
+    }
 
-	/**
-	 * @param array $dependencies
-	 * @return array
-	 */
-	private function analyzeOS(array $dependencies) {
-		$missing = [];
-		if (!isset($dependencies['os'])) {
-			return $missing;
-		}
+    /**
+     * @param array $dependencies
+     * @return array
+     */
+    private function analyzeOS(array $dependencies) {
+        $missing = [];
+        if (!isset($dependencies['os'])) {
+            return $missing;
+        }
 
-		$oss = $dependencies['os'];
-		if (empty($oss)) {
-			return $missing;
-		}
-		if (is_array($oss)) {
-			$oss = array_map(function ($os) {
-				return $this->getValue($os);
-			}, $oss);
-		} else {
-			$oss = array($oss);
-		}
-		$currentOS = $this->platform->getOS();
-		if (!in_array($currentOS, $oss)) {
-			$missing[] = (string)$this->l->t('Following platforms are supported: %s', join(', ', $oss));
-		}
-		return $missing;
-	}
+        $oss = $dependencies['os'];
+        if (empty($oss)) {
+            return $missing;
+        }
+        if (is_array($oss)) {
+            $oss = array_map(function ($os) {
+                return $this->getValue($os);
+            }, $oss);
+        } else {
+            $oss = array($oss);
+        }
+        $currentOS = $this->platform->getOS();
+        if (!in_array($currentOS, $oss)) {
+            $missing[] = (string)$this->l->t('Following platforms are supported: %s', join(', ', $oss));
+        }
+        return $missing;
+    }
 
-	/**
-	 * @param array $dependencies
-	 * @param array $appInfo
-	 * @return array
-	 */
-	private function analyzeOC(array $dependencies, array $appInfo) {
-		$missing = [];
-		$minVersion = null;
-		if (isset($dependencies['owncloud']['@attributes']['min-version'])) {
-			$minVersion = $dependencies['owncloud']['@attributes']['min-version'];
-		} elseif (isset($appInfo['requiremin'])) {
-			$minVersion = $appInfo['requiremin'];
-		} elseif (isset($appInfo['require'])) {
-			$minVersion = $appInfo['require'];
-		}
-		$maxVersion = null;
-		if (isset($dependencies['owncloud']['@attributes']['max-version'])) {
-			$maxVersion = $dependencies['owncloud']['@attributes']['max-version'];
-		} elseif (isset($appInfo['requiremax'])) {
-			$maxVersion = $appInfo['requiremax'];
-		}
+    /**
+     * @param array $dependencies
+     * @param array $appInfo
+     * @return array
+     */
+    private function analyzeOC(array $dependencies, array $appInfo) {
+        $missing = [];
+        $minVersion = null;
+        if (isset($dependencies['owncloud']['@attributes']['min-version'])) {
+            $minVersion = $dependencies['owncloud']['@attributes']['min-version'];
+        } elseif (isset($appInfo['requiremin'])) {
+            $minVersion = $appInfo['requiremin'];
+        } elseif (isset($appInfo['require'])) {
+            $minVersion = $appInfo['require'];
+        }
+        $maxVersion = null;
+        if (isset($dependencies['owncloud']['@attributes']['max-version'])) {
+            $maxVersion = $dependencies['owncloud']['@attributes']['max-version'];
+        } elseif (isset($appInfo['requiremax'])) {
+            $maxVersion = $appInfo['requiremax'];
+        }
 
-		if (!is_null($minVersion)) {
-			if ($this->compareSmaller($this->platform->getOcVersion(), $minVersion)) {
-				$missing[] = (string)$this->l->t('Server version %s or higher is required.', $this->toVisibleVersion($minVersion));
-			}
-		}
-		if (!is_null($maxVersion)) {
-			if ($this->compareBigger($this->platform->getOcVersion(), $maxVersion)) {
-				$missing[] = (string)$this->l->t('Server version %s or lower is required.', $this->toVisibleVersion($maxVersion));
-			}
-		}
-		return $missing;
-	}
+        if (!is_null($minVersion)) {
+            if ($this->compareSmaller($this->platform->getOcVersion(), $minVersion)) {
+                $missing[] = (string)$this->l->t('Server version %s or higher is required.', $this->toVisibleVersion($minVersion));
+            }
+        }
+        if (!is_null($maxVersion)) {
+            if ($this->compareBigger($this->platform->getOcVersion(), $maxVersion)) {
+                $missing[] = (string)$this->l->t('Server version %s or lower is required.', $this->toVisibleVersion($maxVersion));
+            }
+        }
+        return $missing;
+    }
 
-	/**
-	 * Map the internal version number to the Nextcloud version
-	 *
-	 * @param string $version
-	 * @return string
-	 */
-	protected function toVisibleVersion($version) {
-		switch ($version) {
-			case '9.1':
-				return '10';
-			case '9.2':
-				return '11';
-			default:
-				if (strpos($version, '9.1.') === 0) {
-					$version = '10.0.' . substr($version, 4);
-				} else if (strpos($version, '9.2.') === 0) {
-					$version = '11.0.' . substr($version, 4);
-				}
-				return $version;
-		}
-	}
+    /**
+     * Map the internal version number to the Nextcloud version
+     *
+     * @param string $version
+     * @return string
+     */
+    protected function toVisibleVersion($version) {
+        switch ($version) {
+            case '9.1':
+                return '10';
+            case '9.2':
+                return '11';
+            default:
+                if (strpos($version, '9.1.') === 0) {
+                    $version = '10.0.' . substr($version, 4);
+                } else if (strpos($version, '9.2.') === 0) {
+                    $version = '11.0.' . substr($version, 4);
+                }
+                return $version;
+        }
+    }
 
-	/**
-	 * @param $element
-	 * @return mixed
-	 */
-	private function getValue($element) {
-		if (isset($element['@value']))
-			return $element['@value'];
-		return (string)$element;
-	}
+    /**
+     * @param $element
+     * @return mixed
+     */
+    private function getValue($element) {
+        if (isset($element['@value']))
+            return $element['@value'];
+        return (string)$element;
+    }
 }

Spacing +17 added lines, -17 removed lines

@@ -138,19 +138,19 @@ 
 		if (isset($dependencies['php']['@attributes']['min-version'])) {
 			$minVersion = $dependencies['php']['@attributes']['min-version'];
 			if ($this->compareSmaller($this->platform->getPhpVersion(), $minVersion)) {
-				$missing[] = (string)$this->l->t('PHP %s or higher is required.', $minVersion);
+				$missing[] = (string) $this->l->t('PHP %s or higher is required.', $minVersion);
 			}
 		}
 		if (isset($dependencies['php']['@attributes']['max-version'])) {
 			$maxVersion = $dependencies['php']['@attributes']['max-version'];
 			if ($this->compareBigger($this->platform->getPhpVersion(), $maxVersion)) {
-				$missing[] = (string)$this->l->t('PHP with a version lower than %s is required.', $maxVersion);
+				$missing[] = (string) $this->l->t('PHP with a version lower than %s is required.', $maxVersion);
 			}
 		}
 		if (isset($dependencies['php']['@attributes']['min-int-size'])) {
 			$intSize = $dependencies['php']['@attributes']['min-int-size'];
-			if ($intSize > $this->platform->getIntSize()*8) {
-				$missing[] = (string)$this->l->t('%sbit or higher PHP required.', $intSize);
+			if ($intSize > $this->platform->getIntSize() * 8) {
+				$missing[] = (string) $this->l->t('%sbit or higher PHP required.', $intSize);
 			}
 		}
 		return $missing;
@@ -173,12 +173,12 @@ 
 		if (!is_array($supportedDatabases)) {
 			$supportedDatabases = array($supportedDatabases);
 		}
-		$supportedDatabases = array_map(function ($db) {
+		$supportedDatabases = array_map(function($db) {
 			return $this->getValue($db);
 		}, $supportedDatabases);
 		$currentDatabase = $this->platform->getDatabase();
 		if (!in_array($currentDatabase, $supportedDatabases)) {
-			$missing[] = (string)$this->l->t('Following databases are supported: %s', join(', ', $supportedDatabases));
+			$missing[] = (string) $this->l->t('Following databases are supported: %s', join(', ', $supportedDatabases));
 		}
 		return $missing;
 	}
@@ -204,7 +204,7 @@ 
 			}
 			$commandName = $this->getValue($command);
 			if (!$this->platform->isCommandKnown($commandName)) {
-				$missing[] = (string)$this->l->t('The command line tool %s could not be found', $commandName);
+				$missing[] = (string) $this->l->t('The command line tool %s could not be found', $commandName);
 			}
 		}
 		return $missing;
@@ -228,7 +228,7 @@ 
 			$libName = $this->getValue($lib);
 			$libVersion = $this->platform->getLibraryVersion($libName);
 			if (is_null($libVersion)) {
-				$missing[] = (string)$this->l->t('The library %s is not available.', $libName);
+				$missing[] = (string) $this->l->t('The library %s is not available.', $libName);
 				continue;
 			}
 
@@ -236,14 +236,14 @@ 
 				if (isset($lib['@attributes']['min-version'])) {
 					$minVersion = $lib['@attributes']['min-version'];
 					if ($this->compareSmaller($libVersion, $minVersion)) {
-						$missing[] = (string)$this->l->t('Library %s with a version higher than %s is required - available version %s.',
+						$missing[] = (string) $this->l->t('Library %s with a version higher than %s is required - available version %s.',
 							array($libName, $minVersion, $libVersion));
 					}
 				}
 				if (isset($lib['@attributes']['max-version'])) {
 					$maxVersion = $lib['@attributes']['max-version'];
 					if ($this->compareBigger($libVersion, $maxVersion)) {
-						$missing[] = (string)$this->l->t('Library %s with a version lower than %s is required - available version %s.',
+						$missing[] = (string) $this->l->t('Library %s with a version lower than %s is required - available version %s.',
 							array($libName, $maxVersion, $libVersion));
 					}
 				}
@@ -267,7 +267,7 @@ 
 			return $missing;
 		}
 		if (is_array($oss)) {
-			$oss = array_map(function ($os) {
+			$oss = array_map(function($os) {
 				return $this->getValue($os);
 			}, $oss);
 		} else {
@@ -275,7 +275,7 @@ 
 		}
 		$currentOS = $this->platform->getOS();
 		if (!in_array($currentOS, $oss)) {
-			$missing[] = (string)$this->l->t('Following platforms are supported: %s', join(', ', $oss));
+			$missing[] = (string) $this->l->t('Following platforms are supported: %s', join(', ', $oss));
 		}
 		return $missing;
 	}
@@ -304,12 +304,12 @@ 
 
 		if (!is_null($minVersion)) {
 			if ($this->compareSmaller($this->platform->getOcVersion(), $minVersion)) {
-				$missing[] = (string)$this->l->t('Server version %s or higher is required.', $this->toVisibleVersion($minVersion));
+				$missing[] = (string) $this->l->t('Server version %s or higher is required.', $this->toVisibleVersion($minVersion));
 			}
 		}
 		if (!is_null($maxVersion)) {
 			if ($this->compareBigger($this->platform->getOcVersion(), $maxVersion)) {
-				$missing[] = (string)$this->l->t('Server version %s or lower is required.', $this->toVisibleVersion($maxVersion));
+				$missing[] = (string) $this->l->t('Server version %s or lower is required.', $this->toVisibleVersion($maxVersion));
 			}
 		}
 		return $missing;
@@ -329,9 +329,9 @@ 
 				return '11';
 			default:
 				if (strpos($version, '9.1.') === 0) {
-					$version = '10.0.' . substr($version, 4);
+					$version = '10.0.'.substr($version, 4);
 				} else if (strpos($version, '9.2.') === 0) {
-					$version = '11.0.' . substr($version, 4);
+					$version = '11.0.'.substr($version, 4);
 				}
 				return $version;
 		}
@@ -344,6 +344,6 @@ 
 	private function getValue($element) {
 		if (isset($element['@value']))
 			return $element['@value'];
-		return (string)$element;
+		return (string) $element;
 	}
 }

lib/private/App/CodeChecker/AbstractCheck.php

Indentation +114 added lines, -114 removed lines

@@ -23,118 +23,118 @@
 namespace OC\App\CodeChecker;
 
 abstract class AbstractCheck implements ICheck {
-	/** @var ICheck */
-	protected $check;
-
-	/**
-	 * @param ICheck $check
-	 */
-	public function __construct(ICheck $check) {
-		$this->check = $check;
-	}
-
-	/**
-	 * @param int $errorCode
-	 * @param string $errorObject
-	 * @return string
-	 */
-	public function getDescription($errorCode, $errorObject) {
-		switch ($errorCode) {
-			case CodeChecker::STATIC_CALL_NOT_ALLOWED:
-				$functions = $this->getLocalFunctions();
-				$functions = array_change_key_case($functions, CASE_LOWER);
-				if (isset($functions[$errorObject])) {
-					return $this->getLocalDescription();
-				}
-			// no break;
-			case CodeChecker::CLASS_EXTENDS_NOT_ALLOWED:
-			case CodeChecker::CLASS_IMPLEMENTS_NOT_ALLOWED:
-			case CodeChecker::CLASS_NEW_NOT_ALLOWED:
-			case CodeChecker::CLASS_USE_NOT_ALLOWED:
-				$classes = $this->getLocalClasses();
-				$classes = array_change_key_case($classes, CASE_LOWER);
-				if (isset($classes[$errorObject])) {
-					return $this->getLocalDescription();
-				}
-			break;
-
-			case CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED:
-				$constants = $this->getLocalConstants();
-				$constants = array_change_key_case($constants, CASE_LOWER);
-				if (isset($constants[$errorObject])) {
-					return $this->getLocalDescription();
-				}
-			break;
-
-			case CodeChecker::CLASS_METHOD_CALL_NOT_ALLOWED:
-				$methods = $this->getLocalMethods();
-				$methods = array_change_key_case($methods, CASE_LOWER);
-				if (isset($methods[$errorObject])) {
-					return $this->getLocalDescription();
-				}
-			break;
-		}
-
-		return $this->check->getDescription($errorCode, $errorObject);
-	}
-
-	/**
-	 * @return string
-	 */
-	abstract protected function getLocalDescription();
-
-	/**
-	 * @return array
-	 */
-	abstract protected function getLocalClasses();
-
-	/**
-	 * @return array
-	 */
-	abstract protected function getLocalConstants();
-
-	/**
-	 * @return array
-	 */
-	abstract protected function getLocalFunctions();
-
-	/**
-	 * @return array
-	 */
-	abstract protected function getLocalMethods();
-
-	/**
-	 * @return array E.g.: `'ClassName' => 'oc version',`
-	 */
-	public function getClasses() {
-		return array_merge($this->getLocalClasses(), $this->check->getClasses());
-	}
-
-	/**
-	 * @return array E.g.: `'ClassName::CONSTANT_NAME' => 'oc version',`
-	 */
-	public function getConstants() {
-		return array_merge($this->getLocalConstants(), $this->check->getConstants());
-	}
-
-	/**
-	 * @return array E.g.: `'functionName' => 'oc version',`
-	 */
-	public function getFunctions() {
-		return array_merge($this->getLocalFunctions(), $this->check->getFunctions());
-	}
-
-	/**
-	 * @return array E.g.: `'ClassName::methodName' => 'oc version',`
-	 */
-	public function getMethods() {
-		return array_merge($this->getLocalMethods(), $this->check->getMethods());
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function checkStrongComparisons() {
-		return $this->check->checkStrongComparisons();
-	}
+    /** @var ICheck */
+    protected $check;
+
+    /**
+     * @param ICheck $check
+     */
+    public function __construct(ICheck $check) {
+        $this->check = $check;
+    }
+
+    /**
+     * @param int $errorCode
+     * @param string $errorObject
+     * @return string
+     */
+    public function getDescription($errorCode, $errorObject) {
+        switch ($errorCode) {
+            case CodeChecker::STATIC_CALL_NOT_ALLOWED:
+                $functions = $this->getLocalFunctions();
+                $functions = array_change_key_case($functions, CASE_LOWER);
+                if (isset($functions[$errorObject])) {
+                    return $this->getLocalDescription();
+                }
+            // no break;
+            case CodeChecker::CLASS_EXTENDS_NOT_ALLOWED:
+            case CodeChecker::CLASS_IMPLEMENTS_NOT_ALLOWED:
+            case CodeChecker::CLASS_NEW_NOT_ALLOWED:
+            case CodeChecker::CLASS_USE_NOT_ALLOWED:
+                $classes = $this->getLocalClasses();
+                $classes = array_change_key_case($classes, CASE_LOWER);
+                if (isset($classes[$errorObject])) {
+                    return $this->getLocalDescription();
+                }
+            break;
+
+            case CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED:
+                $constants = $this->getLocalConstants();
+                $constants = array_change_key_case($constants, CASE_LOWER);
+                if (isset($constants[$errorObject])) {
+                    return $this->getLocalDescription();
+                }
+            break;
+
+            case CodeChecker::CLASS_METHOD_CALL_NOT_ALLOWED:
+                $methods = $this->getLocalMethods();
+                $methods = array_change_key_case($methods, CASE_LOWER);
+                if (isset($methods[$errorObject])) {
+                    return $this->getLocalDescription();
+                }
+            break;
+        }
+
+        return $this->check->getDescription($errorCode, $errorObject);
+    }
+
+    /**
+     * @return string
+     */
+    abstract protected function getLocalDescription();
+
+    /**
+     * @return array
+     */
+    abstract protected function getLocalClasses();
+
+    /**
+     * @return array
+     */
+    abstract protected function getLocalConstants();
+
+    /**
+     * @return array
+     */
+    abstract protected function getLocalFunctions();
+
+    /**
+     * @return array
+     */
+    abstract protected function getLocalMethods();
+
+    /**
+     * @return array E.g.: `'ClassName' => 'oc version',`
+     */
+    public function getClasses() {
+        return array_merge($this->getLocalClasses(), $this->check->getClasses());
+    }
+
+    /**
+     * @return array E.g.: `'ClassName::CONSTANT_NAME' => 'oc version',`
+     */
+    public function getConstants() {
+        return array_merge($this->getLocalConstants(), $this->check->getConstants());
+    }
+
+    /**
+     * @return array E.g.: `'functionName' => 'oc version',`
+     */
+    public function getFunctions() {
+        return array_merge($this->getLocalFunctions(), $this->check->getFunctions());
+    }
+
+    /**
+     * @return array E.g.: `'ClassName::methodName' => 'oc version',`
+     */
+    public function getMethods() {
+        return array_merge($this->getLocalMethods(), $this->check->getMethods());
+    }
+
+    /**
+     * @return bool
+     */
+    public function checkStrongComparisons() {
+        return $this->check->checkStrongComparisons();
+    }
 }

lib/private/App/CodeChecker/EmptyCheck.php

Indentation +38 added lines, -38 removed lines

@@ -22,47 +22,47 @@
 namespace OC\App\CodeChecker;
 
 class EmptyCheck implements ICheck {
-	/**
-	 * @param int $errorCode
-	 * @param string $errorObject
-	 * @return string
-	 */
-	public function getDescription($errorCode, $errorObject) {
-		return '';
-	}
+    /**
+     * @param int $errorCode
+     * @param string $errorObject
+     * @return string
+     */
+    public function getDescription($errorCode, $errorObject) {
+        return '';
+    }
 
-	/**
-	 * @return array E.g.: `'ClassName' => 'oc version',`
-	 */
-	public function getClasses() {
-		return [];
-	}
+    /**
+     * @return array E.g.: `'ClassName' => 'oc version',`
+     */
+    public function getClasses() {
+        return [];
+    }
 
-	/**
-	 * @return array E.g.: `'ClassName::CONSTANT_NAME' => 'oc version',`
-	 */
-	public function getConstants() {
-		return [];
-	}
+    /**
+     * @return array E.g.: `'ClassName::CONSTANT_NAME' => 'oc version',`
+     */
+    public function getConstants() {
+        return [];
+    }
 
-	/**
-	 * @return array E.g.: `'functionName' => 'oc version',`
-	 */
-	public function getFunctions() {
-		return [];
-	}
+    /**
+     * @return array E.g.: `'functionName' => 'oc version',`
+     */
+    public function getFunctions() {
+        return [];
+    }
 
-	/**
-	 * @return array E.g.: `'ClassName::methodName' => 'oc version',`
-	 */
-	public function getMethods() {
-		return [];
-	}
+    /**
+     * @return array E.g.: `'ClassName::methodName' => 'oc version',`
+     */
+    public function getMethods() {
+        return [];
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function checkStrongComparisons() {
-		return false;
-	}
+    /**
+     * @return bool
+     */
+    public function checkStrongComparisons() {
+        return false;
+    }
 }

lib/private/App/CodeChecker/PrivateCheck.php

Indentation +55 added lines, -55 removed lines

@@ -23,63 +23,63 @@
 namespace OC\App\CodeChecker;
 
 class PrivateCheck extends AbstractCheck implements ICheck {
-	/**
-	 * @return string
-	 */
-	protected function getLocalDescription() {
-		return 'private';
-	}
+    /**
+     * @return string
+     */
+    protected function getLocalDescription() {
+        return 'private';
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getLocalClasses() {
-		return [
-			// classes replaced by the public api
-			'OC_API' => '6.0.0',
-			'OC_App' => '6.0.0',
-			'OC_AppConfig' => '6.0.0',
-			'OC_Avatar' => '6.0.0',
-			'OC_BackgroundJob' => '6.0.0',
-			'OC_Config' => '6.0.0',
-			'OC_DB' => '6.0.0',
-			'OC_Files' => '6.0.0',
-			'OC_Helper' => '6.0.0',
-			'OC_Hook' => '6.0.0',
-			'OC_Image' => '6.0.0',
-			'OC_JSON' => '6.0.0',
-			'OC_L10N' => '6.0.0',
-			'OC_Log' => '6.0.0',
-			'OC_Mail' => '6.0.0',
-			'OC_Preferences' => '6.0.0',
-			'OC_Search_Provider' => '6.0.0',
-			'OC_Search_Result' => '6.0.0',
-			'OC_Request' => '6.0.0',
-			'OC_Response' => '6.0.0',
-			'OC_Template' => '6.0.0',
-			'OC_User' => '6.0.0',
-			'OC_Util' => '6.0.0',
-		];
-	}
+    /**
+     * @return array
+     */
+    public function getLocalClasses() {
+        return [
+            // classes replaced by the public api
+            'OC_API' => '6.0.0',
+            'OC_App' => '6.0.0',
+            'OC_AppConfig' => '6.0.0',
+            'OC_Avatar' => '6.0.0',
+            'OC_BackgroundJob' => '6.0.0',
+            'OC_Config' => '6.0.0',
+            'OC_DB' => '6.0.0',
+            'OC_Files' => '6.0.0',
+            'OC_Helper' => '6.0.0',
+            'OC_Hook' => '6.0.0',
+            'OC_Image' => '6.0.0',
+            'OC_JSON' => '6.0.0',
+            'OC_L10N' => '6.0.0',
+            'OC_Log' => '6.0.0',
+            'OC_Mail' => '6.0.0',
+            'OC_Preferences' => '6.0.0',
+            'OC_Search_Provider' => '6.0.0',
+            'OC_Search_Result' => '6.0.0',
+            'OC_Request' => '6.0.0',
+            'OC_Response' => '6.0.0',
+            'OC_Template' => '6.0.0',
+            'OC_User' => '6.0.0',
+            'OC_Util' => '6.0.0',
+        ];
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getLocalConstants() {
-		return [];
-	}
+    /**
+     * @return array
+     */
+    public function getLocalConstants() {
+        return [];
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getLocalFunctions() {
-		return [];
-	}
+    /**
+     * @return array
+     */
+    public function getLocalFunctions() {
+        return [];
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getLocalMethods() {
-		return [];
-	}
+    /**
+     * @return array
+     */
+    public function getLocalMethods() {
+        return [];
+    }
 }

lib/private/App/CodeChecker/StrongComparisonCheck.php

Indentation +46 added lines, -46 removed lines

@@ -23,57 +23,57 @@
 namespace OC\App\CodeChecker;
 
 class StrongComparisonCheck implements ICheck {
-	/** @var ICheck */
-	protected $check;
+    /** @var ICheck */
+    protected $check;
 
-	/**
-	 * @param ICheck $check
-	 */
-	public function __construct(ICheck $check) {
-		$this->check = $check;
-	}
+    /**
+     * @param ICheck $check
+     */
+    public function __construct(ICheck $check) {
+        $this->check = $check;
+    }
 
-	/**
-	 * @param int $errorCode
-	 * @param string $errorObject
-	 * @return string
-	 */
-	public function getDescription($errorCode, $errorObject) {
-		return $this->check->getDescription($errorCode, $errorObject);
-	}
+    /**
+     * @param int $errorCode
+     * @param string $errorObject
+     * @return string
+     */
+    public function getDescription($errorCode, $errorObject) {
+        return $this->check->getDescription($errorCode, $errorObject);
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getClasses() {
-		return $this->check->getClasses();
-	}
+    /**
+     * @return array
+     */
+    public function getClasses() {
+        return $this->check->getClasses();
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getConstants() {
-		return $this->check->getConstants();
-	}
+    /**
+     * @return array
+     */
+    public function getConstants() {
+        return $this->check->getConstants();
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getFunctions() {
-		return $this->check->getFunctions();
-	}
+    /**
+     * @return array
+     */
+    public function getFunctions() {
+        return $this->check->getFunctions();
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getMethods() {
-		return $this->check->getMethods();
-	}
+    /**
+     * @return array
+     */
+    public function getMethods() {
+        return $this->check->getMethods();
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function checkStrongComparisons() {
-		return true;
-	}
+    /**
+     * @return bool
+     */
+    public function checkStrongComparisons() {
+        return true;
+    }
 }

lib/private/App/CodeChecker/CodeChecker.php

Indentation +91 added lines, -91 removed lines

@@ -38,95 +38,95 @@
 
 class CodeChecker extends BasicEmitter {
 
-	const CLASS_EXTENDS_NOT_ALLOWED = 1000;
-	const CLASS_IMPLEMENTS_NOT_ALLOWED = 1001;
-	const STATIC_CALL_NOT_ALLOWED = 1002;
-	const CLASS_CONST_FETCH_NOT_ALLOWED = 1003;
-	const CLASS_NEW_NOT_ALLOWED =  1004;
-	const OP_OPERATOR_USAGE_DISCOURAGED =  1005;
-	const CLASS_USE_NOT_ALLOWED =  1006;
-	const CLASS_METHOD_CALL_NOT_ALLOWED =  1007;
-
-	/** @var Parser */
-	private $parser;
-
-	/** @var ICheck */
-	protected $checkList;
-
-	public function __construct(ICheck $checkList) {
-		$this->checkList = $checkList;
-		$this->parser = new Parser(new Lexer);
-	}
-
-	/**
-	 * @param string $appId
-	 * @return array
-	 */
-	public function analyse($appId) {
-		$appPath = \OC_App::getAppPath($appId);
-		if ($appPath === false) {
-			throw new \RuntimeException("No app with given id <$appId> known.");
-		}
-
-		return $this->analyseFolder($appId, $appPath);
-	}
-
-	/**
-	 * @param string $appId
-	 * @param string $folder
-	 * @return array
-	 */
-	public function analyseFolder($appId, $folder) {
-		$errors = [];
-
-		$excludedDirectories = ['vendor', '3rdparty', '.git', 'l10n', 'tests', 'test'];
-		if ($appId === 'password_policy') {
-			$excludedDirectories[] = 'lists';
-		}
-
-		$excludes = array_map(function($item) use ($folder) {
-			return $folder . '/' . $item;
-		}, $excludedDirectories);
-
-		$iterator = new RecursiveDirectoryIterator($folder, RecursiveDirectoryIterator::SKIP_DOTS);
-		$iterator = new RecursiveCallbackFilterIterator($iterator, function($item) use ($folder, $excludes){
-			/** @var SplFileInfo $item */
-			foreach($excludes as $exclude) {
-				if (substr($item->getPath(), 0, strlen($exclude)) === $exclude) {
-					return false;
-				}
-			}
-			return true;
-		});
-		$iterator = new RecursiveIteratorIterator($iterator);
-		$iterator = new RegexIterator($iterator, '/^.+\.php$/i');
-
-		foreach ($iterator as $file) {
-			/** @var SplFileInfo $file */
-			$this->emit('CodeChecker', 'analyseFileBegin', [$file->getPathname()]);
-			$fileErrors = $this->analyseFile($file);
-			$this->emit('CodeChecker', 'analyseFileFinished', [$file->getPathname(), $fileErrors]);
-			$errors = array_merge($fileErrors, $errors);
-		}
-
-		return $errors;
-	}
-
-
-	/**
-	 * @param string $file
-	 * @return array
-	 */
-	public function analyseFile($file) {
-		$code = file_get_contents($file);
-		$statements = $this->parser->parse($code);
-
-		$visitor = new NodeVisitor($this->checkList);
-		$traverser = new NodeTraverser;
-		$traverser->addVisitor($visitor);
-
-		$traverser->traverse($statements);
-
-		return $visitor->errors;
-	}
+    const CLASS_EXTENDS_NOT_ALLOWED = 1000;
+    const CLASS_IMPLEMENTS_NOT_ALLOWED = 1001;
+    const STATIC_CALL_NOT_ALLOWED = 1002;
+    const CLASS_CONST_FETCH_NOT_ALLOWED = 1003;
+    const CLASS_NEW_NOT_ALLOWED =  1004;
+    const OP_OPERATOR_USAGE_DISCOURAGED =  1005;
+    const CLASS_USE_NOT_ALLOWED =  1006;
+    const CLASS_METHOD_CALL_NOT_ALLOWED =  1007;
+
+    /** @var Parser */
+    private $parser;
+
+    /** @var ICheck */
+    protected $checkList;
+
+    public function __construct(ICheck $checkList) {
+        $this->checkList = $checkList;
+        $this->parser = new Parser(new Lexer);
+    }
+
+    /**
+     * @param string $appId
+     * @return array
+     */
+    public function analyse($appId) {
+        $appPath = \OC_App::getAppPath($appId);
+        if ($appPath === false) {
+            throw new \RuntimeException("No app with given id <$appId> known.");
+        }
+
+        return $this->analyseFolder($appId, $appPath);
+    }
+
+    /**
+     * @param string $appId
+     * @param string $folder
+     * @return array
+     */
+    public function analyseFolder($appId, $folder) {
+        $errors = [];
+
+        $excludedDirectories = ['vendor', '3rdparty', '.git', 'l10n', 'tests', 'test'];
+        if ($appId === 'password_policy') {
+            $excludedDirectories[] = 'lists';
+        }
+
+        $excludes = array_map(function($item) use ($folder) {
+            return $folder . '/' . $item;
+        }, $excludedDirectories);
+
+        $iterator = new RecursiveDirectoryIterator($folder, RecursiveDirectoryIterator::SKIP_DOTS);
+        $iterator = new RecursiveCallbackFilterIterator($iterator, function($item) use ($folder, $excludes){
+            /** @var SplFileInfo $item */
+            foreach($excludes as $exclude) {
+                if (substr($item->getPath(), 0, strlen($exclude)) === $exclude) {
+                    return false;
+                }
+            }
+            return true;
+        });
+        $iterator = new RecursiveIteratorIterator($iterator);
+        $iterator = new RegexIterator($iterator, '/^.+\.php$/i');
+
+        foreach ($iterator as $file) {
+            /** @var SplFileInfo $file */
+            $this->emit('CodeChecker', 'analyseFileBegin', [$file->getPathname()]);
+            $fileErrors = $this->analyseFile($file);
+            $this->emit('CodeChecker', 'analyseFileFinished', [$file->getPathname(), $fileErrors]);
+            $errors = array_merge($fileErrors, $errors);
+        }
+
+        return $errors;
+    }
+
+
+    /**
+     * @param string $file
+     * @return array
+     */
+    public function analyseFile($file) {
+        $code = file_get_contents($file);
+        $statements = $this->parser->parse($code);
+
+        $visitor = new NodeVisitor($this->checkList);
+        $traverser = new NodeTraverser;
+        $traverser->addVisitor($visitor);
+
+        $traverser->traverse($statements);
+
+        return $visitor->errors;
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -42,10 +42,10 @@ 
 	const CLASS_IMPLEMENTS_NOT_ALLOWED = 1001;
 	const STATIC_CALL_NOT_ALLOWED = 1002;
 	const CLASS_CONST_FETCH_NOT_ALLOWED = 1003;
-	const CLASS_NEW_NOT_ALLOWED =  1004;
-	const OP_OPERATOR_USAGE_DISCOURAGED =  1005;
-	const CLASS_USE_NOT_ALLOWED =  1006;
-	const CLASS_METHOD_CALL_NOT_ALLOWED =  1007;
+	const CLASS_NEW_NOT_ALLOWED = 1004;
+	const OP_OPERATOR_USAGE_DISCOURAGED = 1005;
+	const CLASS_USE_NOT_ALLOWED = 1006;
+	const CLASS_METHOD_CALL_NOT_ALLOWED = 1007;
 
 	/** @var Parser */
 	private $parser;
@@ -85,13 +85,13 @@ 
 		}
 
 		$excludes = array_map(function($item) use ($folder) {
-			return $folder . '/' . $item;
+			return $folder.'/'.$item;
 		}, $excludedDirectories);
 
 		$iterator = new RecursiveDirectoryIterator($folder, RecursiveDirectoryIterator::SKIP_DOTS);
 		$iterator = new RecursiveCallbackFilterIterator($iterator, function($item) use ($folder, $excludes){
 			/** @var SplFileInfo $item */
-			foreach($excludes as $exclude) {
+			foreach ($excludes as $exclude) {
 				if (substr($item->getPath(), 0, strlen($exclude)) === $exclude) {
 					return false;
 				}

lib/private/App/CodeChecker/InfoChecker.php

Spacing +8 added lines, -8 removed lines

@@ -78,7 +78,7 @@ 
 
 		$errors = [];
 
-		$info = $this->infoParser->parse($appPath . '/appinfo/info.xml');
+		$info = $this->infoParser->parse($appPath.'/appinfo/info.xml');
 
 		if (isset($info['dependencies']['owncloud']['@attributes']['min-version']) && (isset($info['requiremin']) || isset($info['require']))) {
 			$this->emit('InfoChecker', 'duplicateRequirement', ['min']);
@@ -107,7 +107,7 @@ 
 		}
 
 		foreach ($info as $key => $value) {
-			if(is_array($value)) {
+			if (is_array($value)) {
 				$value = json_encode($value);
 			}
 			if (in_array($key, $this->mandatoryFields)) {
@@ -122,7 +122,7 @@ 
 
 			if (in_array($key, $this->deprecatedFields)) {
 				// skip empty arrays - empty arrays for remote and public are always added
-				if($value === '[]' && in_array($key, ['public', 'remote', 'info'])) {
+				if ($value === '[]' && in_array($key, ['public', 'remote', 'info'])) {
 					continue;
 				}
 				$this->emit('InfoChecker', 'deprecatedFieldFound', [$key, $value]);
@@ -133,7 +133,7 @@ 
 		}
 
 		foreach ($this->mandatoryFields as $key) {
-			if(!isset($info[$key])) {
+			if (!isset($info[$key])) {
 				$this->emit('InfoChecker', 'mandatoryFieldMissing', [$key]);
 				$errors[] = [
 					'type' => 'mandatoryFieldMissing',
@@ -142,17 +142,17 @@ 
 			}
 		}
 
-		$versionFile = $appPath . '/appinfo/version';
+		$versionFile = $appPath.'/appinfo/version';
 		if (is_file($versionFile)) {
 			$version = trim(file_get_contents($versionFile));
 			if (isset($info['version'])) {
-				if($info['version'] !== $version) {
+				if ($info['version'] !== $version) {
 					$this->emit('InfoChecker', 'differentVersions',
 						[$version, $info['version']]);
 					$errors[] = [
 						'type' => 'differentVersions',
-						'message' => 'appinfo/version: ' . $version .
-							' - appinfo/info.xml: ' . $info['version'],
+						'message' => 'appinfo/version: '.$version.
+							' - appinfo/info.xml: '.$info['version'],
 					];
 				} else {
 					$this->emit('InfoChecker', 'sameVersions', [$versionFile]);

Indentation +130 added lines, -130 removed lines

@@ -28,134 +28,134 @@
 
 class InfoChecker extends BasicEmitter {
 
-	/** @var InfoParser */
-	private $infoParser;
-
-	private $mandatoryFields = [
-		'author',
-		'description',
-		'id',
-		'licence',
-		'name',
-	];
-	private $optionalFields = [
-		'bugs',
-		'category',
-		'default_enable',
-		'dependencies', // TODO: Mandatory as of ownCloud 11
-		'documentation',
-		'namespace',
-		'ocsid',
-		'public',
-		'remote',
-		'repository',
-		'types',
-		'version',
-		'website',
-	];
-	private $deprecatedFields = [
-		'info',
-		'require',
-		'requiremax',
-		'requiremin',
-		'shipped',
-		'standalone',
-	];
-
-	public function __construct(InfoParser $infoParser) {
-		$this->infoParser = $infoParser;
-	}
-
-	/**
-	 * @param string $appId
-	 * @return array
-	 */
-	public function analyse($appId) {
-		$appPath = \OC_App::getAppPath($appId);
-		if ($appPath === false) {
-			throw new \RuntimeException("No app with given id <$appId> known.");
-		}
-
-		$errors = [];
-
-		$info = $this->infoParser->parse($appPath . '/appinfo/info.xml');
-
-		if (isset($info['dependencies']['owncloud']['@attributes']['min-version']) && (isset($info['requiremin']) || isset($info['require']))) {
-			$this->emit('InfoChecker', 'duplicateRequirement', ['min']);
-			$errors[] = [
-				'type' => 'duplicateRequirement',
-				'field' => 'min',
-			];
-		} else if (!isset($info['dependencies']['owncloud']['@attributes']['min-version'])) {
-			$this->emit('InfoChecker', 'missingRequirement', ['min']);
-		}
-
-		if (isset($info['dependencies']['owncloud']['@attributes']['max-version']) && isset($info['requiremax'])) {
-			$this->emit('InfoChecker', 'duplicateRequirement', ['max']);
-			$errors[] = [
-				'type' => 'duplicateRequirement',
-				'field' => 'max',
-			];
-		} else if (!isset($info['dependencies']['owncloud']['@attributes']['max-version'])) {
-			$this->emit('InfoChecker', 'missingRequirement', ['max']);
-		}
-
-		foreach ($info as $key => $value) {
-			if(is_array($value)) {
-				$value = json_encode($value);
-			}
-			if (in_array($key, $this->mandatoryFields)) {
-				$this->emit('InfoChecker', 'mandatoryFieldFound', [$key, $value]);
-				continue;
-			}
-
-			if (in_array($key, $this->optionalFields)) {
-				$this->emit('InfoChecker', 'optionalFieldFound', [$key, $value]);
-				continue;
-			}
-
-			if (in_array($key, $this->deprecatedFields)) {
-				// skip empty arrays - empty arrays for remote and public are always added
-				if($value === '[]' && in_array($key, ['public', 'remote', 'info'])) {
-					continue;
-				}
-				$this->emit('InfoChecker', 'deprecatedFieldFound', [$key, $value]);
-				continue;
-			}
-
-			$this->emit('InfoChecker', 'unusedFieldFound', [$key, $value]);
-		}
-
-		foreach ($this->mandatoryFields as $key) {
-			if(!isset($info[$key])) {
-				$this->emit('InfoChecker', 'mandatoryFieldMissing', [$key]);
-				$errors[] = [
-					'type' => 'mandatoryFieldMissing',
-					'field' => $key,
-				];
-			}
-		}
-
-		$versionFile = $appPath . '/appinfo/version';
-		if (is_file($versionFile)) {
-			$version = trim(file_get_contents($versionFile));
-			if (isset($info['version'])) {
-				if($info['version'] !== $version) {
-					$this->emit('InfoChecker', 'differentVersions',
-						[$version, $info['version']]);
-					$errors[] = [
-						'type' => 'differentVersions',
-						'message' => 'appinfo/version: ' . $version .
-							' - appinfo/info.xml: ' . $info['version'],
-					];
-				} else {
-					$this->emit('InfoChecker', 'sameVersions', [$versionFile]);
-				}
-			} else {
-				$this->emit('InfoChecker', 'migrateVersion', [$version]);
-			}
-		}
-
-		return $errors;
-	}
+    /** @var InfoParser */
+    private $infoParser;
+
+    private $mandatoryFields = [
+        'author',
+        'description',
+        'id',
+        'licence',
+        'name',
+    ];
+    private $optionalFields = [
+        'bugs',
+        'category',
+        'default_enable',
+        'dependencies', // TODO: Mandatory as of ownCloud 11
+        'documentation',
+        'namespace',
+        'ocsid',
+        'public',
+        'remote',
+        'repository',
+        'types',
+        'version',
+        'website',
+    ];
+    private $deprecatedFields = [
+        'info',
+        'require',
+        'requiremax',
+        'requiremin',
+        'shipped',
+        'standalone',
+    ];
+
+    public function __construct(InfoParser $infoParser) {
+        $this->infoParser = $infoParser;
+    }
+
+    /**
+     * @param string $appId
+     * @return array
+     */
+    public function analyse($appId) {
+        $appPath = \OC_App::getAppPath($appId);
+        if ($appPath === false) {
+            throw new \RuntimeException("No app with given id <$appId> known.");
+        }
+
+        $errors = [];
+
+        $info = $this->infoParser->parse($appPath . '/appinfo/info.xml');
+
+        if (isset($info['dependencies']['owncloud']['@attributes']['min-version']) && (isset($info['requiremin']) || isset($info['require']))) {
+            $this->emit('InfoChecker', 'duplicateRequirement', ['min']);
+            $errors[] = [
+                'type' => 'duplicateRequirement',
+                'field' => 'min',
+            ];
+        } else if (!isset($info['dependencies']['owncloud']['@attributes']['min-version'])) {
+            $this->emit('InfoChecker', 'missingRequirement', ['min']);
+        }
+
+        if (isset($info['dependencies']['owncloud']['@attributes']['max-version']) && isset($info['requiremax'])) {
+            $this->emit('InfoChecker', 'duplicateRequirement', ['max']);
+            $errors[] = [
+                'type' => 'duplicateRequirement',
+                'field' => 'max',
+            ];
+        } else if (!isset($info['dependencies']['owncloud']['@attributes']['max-version'])) {
+            $this->emit('InfoChecker', 'missingRequirement', ['max']);
+        }
+
+        foreach ($info as $key => $value) {
+            if(is_array($value)) {
+                $value = json_encode($value);
+            }
+            if (in_array($key, $this->mandatoryFields)) {
+                $this->emit('InfoChecker', 'mandatoryFieldFound', [$key, $value]);
+                continue;
+            }
+
+            if (in_array($key, $this->optionalFields)) {
+                $this->emit('InfoChecker', 'optionalFieldFound', [$key, $value]);
+                continue;
+            }
+
+            if (in_array($key, $this->deprecatedFields)) {
+                // skip empty arrays - empty arrays for remote and public are always added
+                if($value === '[]' && in_array($key, ['public', 'remote', 'info'])) {
+                    continue;
+                }
+                $this->emit('InfoChecker', 'deprecatedFieldFound', [$key, $value]);
+                continue;
+            }
+
+            $this->emit('InfoChecker', 'unusedFieldFound', [$key, $value]);
+        }
+
+        foreach ($this->mandatoryFields as $key) {
+            if(!isset($info[$key])) {
+                $this->emit('InfoChecker', 'mandatoryFieldMissing', [$key]);
+                $errors[] = [
+                    'type' => 'mandatoryFieldMissing',
+                    'field' => $key,
+                ];
+            }
+        }
+
+        $versionFile = $appPath . '/appinfo/version';
+        if (is_file($versionFile)) {
+            $version = trim(file_get_contents($versionFile));
+            if (isset($info['version'])) {
+                if($info['version'] !== $version) {
+                    $this->emit('InfoChecker', 'differentVersions',
+                        [$version, $info['version']]);
+                    $errors[] = [
+                        'type' => 'differentVersions',
+                        'message' => 'appinfo/version: ' . $version .
+                            ' - appinfo/info.xml: ' . $info['version'],
+                    ];
+                } else {
+                    $this->emit('InfoChecker', 'sameVersions', [$versionFile]);
+                }
+            } else {
+                $this->emit('InfoChecker', 'migrateVersion', [$version]);
+            }
+        }
+
+        return $errors;
+    }
 }

lib/private/App/CodeChecker/ICheck.php

Indentation +26 added lines, -26 removed lines

@@ -22,35 +22,35 @@
 namespace OC\App\CodeChecker;
 
 interface ICheck {
-	/**
-	 * @param int $errorCode
-	 * @param string $errorObject
-	 * @return string
-	 */
-	public function getDescription($errorCode, $errorObject);
+    /**
+     * @param int $errorCode
+     * @param string $errorObject
+     * @return string
+     */
+    public function getDescription($errorCode, $errorObject);
 
-	/**
-	 * @return array E.g.: `'ClassName' => 'oc version',`
-	 */
-	public function getClasses();
+    /**
+     * @return array E.g.: `'ClassName' => 'oc version',`
+     */
+    public function getClasses();
 
-	/**
-	 * @return array E.g.: `'ClassName::CONSTANT_NAME' => 'oc version',`
-	 */
-	public function getConstants();
+    /**
+     * @return array E.g.: `'ClassName::CONSTANT_NAME' => 'oc version',`
+     */
+    public function getConstants();
 
-	/**
-	 * @return array E.g.: `'functionName' => 'oc version',`
-	 */
-	public function getFunctions();
+    /**
+     * @return array E.g.: `'functionName' => 'oc version',`
+     */
+    public function getFunctions();
 
-	/**
-	 * @return array E.g.: `'ClassName::methodName' => 'oc version',`
-	 */
-	public function getMethods();
+    /**
+     * @return array E.g.: `'ClassName::methodName' => 'oc version',`
+     */
+    public function getMethods();
 
-	/**
-	 * @return bool
-	 */
-	public function checkStrongComparisons();
+    /**
+     * @return bool
+     */
+    public function checkStrongComparisons();
 }