[CI] PHPCS: check for opening brace on same line (#4122)

* [CI] PHPCS: check for opening brace on same line

* make fix-all

* Minor comments

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>

3 files changed, 23 insertions, 21 deletions

diff --git a/lib/Minz/Migrator.php b/lib/Minz/Migrator.php
index 637bfc3fa..4d58a9bd3 100644
--- a/lib/Minz/Migrator.php
+++ b/lib/Minz/Migrator.php
@@ -126,8 +126,7 @@ class Minz_Migrator
 	 * @throws BadFunctionCallException if a callback isn't callable (i.e.
 	 *                                  cannot call a migrate method).
 	 */
-	public function __construct($directory = null)
-	{
+	public function __construct($directory = null) {
 		$this->applied_versions = [];
 
 		if (!is_dir($directory)) {
@@ -166,8 +165,7 @@ class Minz_Migrator
 	 *
 	 * @throws BadFunctionCallException if the callback isn't callable.
 	 */
-	public function addMigration($version, $callback)
-	{
+	public function addMigration($version, $callback) {
 		if (!is_callable($callback)) {
 			throw new BadFunctionCallException("{$version} migration cannot be called.");
 		}
@@ -182,8 +180,7 @@ class Minz_Migrator
 	 *
 	 * @return array
 	 */
-	public function migrations()
-	{
+	public function migrations() {
 		$migrations = $this->migrations;
 		uksort($migrations, 'strnatcmp');
 		return $migrations;
@@ -196,8 +193,7 @@ class Minz_Migrator
 	 *
 	 * @throws DomainException if there is no migrations corresponding to a version
 	 */
-	public function setAppliedVersions($versions)
-	{
+	public function setAppliedVersions($versions) {
 		foreach ($versions as $version) {
 			$version = trim($version);
 			if (!isset($this->migrations[$version])) {
@@ -210,8 +206,7 @@ class Minz_Migrator
 	/**
 	 * @return string[]
 	 */
-	public function appliedVersions()
-	{
+	public function appliedVersions() {
 		$versions = $this->applied_versions;
 		usort($versions, 'strnatcmp');
 		return $versions;
@@ -224,8 +219,7 @@ class Minz_Migrator
 	 *
 	 * @return string[]
 	 */
-	public function versions()
-	{
+	public function versions() {
 		$migrations = $this->migrations();
 		return array_keys($migrations);
 	}
@@ -235,8 +229,7 @@ class Minz_Migrator
 	 *                 otherwise. If no migrations are registered, it always
 	 *                 returns true.
 	 */
-	public function upToDate()
-	{
+	public function upToDate() {
 		// Counting versions is enough since we cannot apply a version which
 		// doesn't exist (see setAppliedVersions method).
 		return count($this->versions()) === count($this->applied_versions);
@@ -256,8 +249,7 @@ class Minz_Migrator
 	 *               exception was raised in a migration, its result is set to
 	 *               the exception message.
 	 */
-	public function migrate()
-	{
+	public function migrate() {
 		$result = [];
 		foreach ($this->migrations() as $version => $callback) {
 			if (in_array($version, $this->applied_versions)) {
diff --git a/lib/Minz/Pdo.php b/lib/Minz/Pdo.php
index 9c754be86..08436393e 100644
--- a/lib/Minz/Pdo.php
+++ b/lib/Minz/Pdo.php
@@ -14,8 +14,12 @@ abstract class Minz_Pdo extends PDO {
 	abstract public function dbType();
 
 	private $prefix = '';
-	public function prefix() { return $this->prefix; }
-	public function setPrefix($prefix) { $this->prefix = $prefix; }
+	public function prefix() {
+		return $this->prefix;
+	}
+	public function setPrefix($prefix) {
+		$this->prefix = $prefix;
+	}
 
 	private function autoPrefix($sql) {
 		return str_replace('`_', '`' . $this->prefix, $sql);
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index e347073a4..3ba154209 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -115,19 +115,25 @@ if (function_exists('mb_convert_encoding')) {
 	 * @param string $text
 	 * @return string
 	 */
-	function safe_utf8($text) { return mb_convert_encoding($text, 'UTF-8', 'UTF-8'); }
+	function safe_utf8($text) {
+		return mb_convert_encoding($text, 'UTF-8', 'UTF-8');
+	}
 } elseif (function_exists('iconv')) {
 	/**
 	 * @param string $text
 	 * @return string
 	 */
-	function safe_utf8($text) { return iconv('UTF-8', 'UTF-8//IGNORE', $text); }
+	function safe_utf8($text) {
+		return iconv('UTF-8', 'UTF-8//IGNORE', $text);
+	}
 } else {
 	/**
 	 * @param string $text
 	 * @return string
 	 */
-	function safe_utf8($text) { return $text; }
+	function safe_utf8($text) {
+		return $text;
+	}
 }
 
 /**