Travis: Enforce phpcs line length + whitespace (#3488)

* Update Travis line length

* Also check whitespace in CSS files

* Fix line length ext.php

* More syntax, string templates

* Fix exclude-pattern

* Test JS files as well

10 files changed, 45 insertions, 80 deletions

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index ca8a9758a..3202b59f2 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -53,11 +53,9 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 			invalidateHttpCache();
 
 			if ($ok) {
-				Minz_Request::good(_t('feedback.conf.updated'),
-				                   array('c' => 'auth', 'a' => 'index'));
+				Minz_Request::good(_t('feedback.conf.updated'), [ 'c' => 'auth', 'a' => 'index' ]);
 			} else {
-				Minz_Request::bad(_t('feedback.conf.error'),
-				                  array('c' => 'auth', 'a' => 'index'));
+				Minz_Request::bad(_t('feedback.conf.error'), [ 'c' => 'auth', 'a' => 'index' ]);
 			}
 		}
 	}
@@ -160,13 +158,9 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 				Minz_Translate::init(FreshRSS_Context::$user_conf->language);
 
 				// All is good, go back to the index.
-				Minz_Request::good(_t('feedback.auth.login.success'),
-				                   array('c' => 'index', 'a' => 'index'));
+				Minz_Request::good(_t('feedback.auth.login.success'), [ 'c' => 'index', 'a' => 'index' ]);
 			} else {
-				Minz_Log::warning('Password mismatch for' .
-				                  ' user=' . $username .
-				                  ', nonce=' . $nonce .
-				                  ', c=' . $challenge);
+				Minz_Log::warning("Password mismatch for user={$username}, nonce={$nonce}, c={$challenge}");
 
 				header('HTTP/1.1 403 Forbidden');
 				Minz_Session::_param('POST_to_GET', true);	//Prevent infinite internal redirect
@@ -203,8 +197,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 
 				Minz_Translate::init(FreshRSS_Context::$user_conf->language);
 
-				Minz_Request::good(_t('feedback.auth.login.success'),
-				                   array('c' => 'index', 'a' => 'index'));
+				Minz_Request::good(_t('feedback.auth.login.success'), [ 'c' => 'index', 'a' => 'index' ]);
 			} else {
 				Minz_Log::warning('Unsafe password mismatch for user ' . $username);
 				Minz_Request::bad(
@@ -221,8 +214,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 	public function logoutAction() {
 		invalidateHttpCache();
 		FreshRSS_Auth::removeAccess();
-		Minz_Request::good(_t('feedback.auth.logout.success'),
-		                   array('c' => 'index', 'a' => 'index'));
+		Minz_Request::good(_t('feedback.auth.logout.success'), [ 'c' => 'index', 'a' => 'index' ]);
 	}
 
 	/**
diff --git a/app/Controllers/categoryController.php b/app/Controllers/categoryController.php
index 1d0359a39..3ec88460a 100644
--- a/app/Controllers/categoryController.php
+++ b/app/Controllers/categoryController.php
@@ -34,8 +34,7 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 		$this->view->categories = $catDAO->listCategories(false);
 
 		if (count($this->view->categories) >= $limits['max_categories']) {
-			Minz_Request::bad(_t('feedback.sub.category.over_max', $limits['max_categories']),
-			                  $url_redirect);
+			Minz_Request::bad(_t('feedback.sub.category.over_max', $limits['max_categories']), $url_redirect);
 		}
 
 		if (Minz_Request::isPost()) {
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index f658d1c44..b2c1b5109 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -63,8 +63,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			Minz_Translate::reset(FreshRSS_Context::$user_conf->language);
 			invalidateHttpCache();
 
-			Minz_Request::good(_t('feedback.conf.updated'),
-			                   array('c' => 'configure', 'a' => 'display'));
+			Minz_Request::good(_t('feedback.conf.updated'), [ 'c' => 'configure', 'a' => 'display' ]);
 		}
 
 		$this->view->themes = FreshRSS_Themes::get();
@@ -127,8 +126,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			FreshRSS_Context::$user_conf->save();
 			invalidateHttpCache();
 
-			Minz_Request::good(_t('feedback.conf.updated'),
-			                   array('c' => 'configure', 'a' => 'reading'));
+			Minz_Request::good(_t('feedback.conf.updated'), [ 'c' => 'configure', 'a' => 'reading' ]);
 		}
 
 		Minz_View::prependTitle(_t('conf.reading.title') . ' · ');
@@ -154,8 +152,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			FreshRSS_Context::$user_conf->save();
 			invalidateHttpCache();
 
-			Minz_Request::good(_t('feedback.conf.updated'),
-			                   array('c' => 'configure', 'a' => 'integration'));
+			Minz_Request::good(_t('feedback.conf.updated'), [ 'c' => 'configure', 'a' => 'integration' ]);
 		}
 
 		Minz_View::prependTitle(_t('conf.sharing.title') . ' · ');
@@ -236,8 +233,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			FreshRSS_Context::$user_conf->save();
 			invalidateHttpCache();
 
-			Minz_Request::good(_t('feedback.conf.updated'),
-			                   array('c' => 'configure', 'a' => 'archiving'));
+			Minz_Request::good(_t('feedback.conf.updated'), [ 'c' => 'configure', 'a' => 'archiving' ]);
 		}
 
 		$volatile = [
@@ -300,8 +296,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			FreshRSS_Context::$user_conf->queries = $queries;
 			FreshRSS_Context::$user_conf->save();
 
-			Minz_Request::good(_t('feedback.conf.updated'),
-			                   array('c' => 'configure', 'a' => 'queries'));
+			Minz_Request::good(_t('feedback.conf.updated'), [ 'c' => 'configure', 'a' => 'queries' ]);
 		} else {
 			$this->view->queries = array();
 			foreach (FreshRSS_Context::$user_conf->queries as $key => $query) {
@@ -369,8 +364,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			FreshRSS_Context::$user_conf->queries = $queries;
 			FreshRSS_Context::$user_conf->save();
 
-			Minz_Request::good(_t('feedback.conf.updated'),
-			                   array('c' => 'configure', 'a' => 'queries', 'params' => ['id' => $id]));
+			Minz_Request::good(_t('feedback.conf.updated'), [ 'c' => 'configure', 'a' => 'queries', 'params' => ['id' => $id] ]);
 		}
 
 		Minz_View::prependTitle(_t('conf.query.title') . ' · ' . $query->getName() . ' · ');
@@ -391,8 +385,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		FreshRSS_Context::$user_conf->queries = $queries;
 		FreshRSS_Context::$user_conf->save();
 
-		Minz_Request::good(_t('feedback.conf.updated'),
-			               array('c' => 'configure', 'a' => 'queries'));
+		Minz_Request::good(_t('feedback.conf.updated'), [ 'c' => 'configure', 'a' => 'queries' ]);
 	}
 
 	/**
@@ -419,8 +412,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 		FreshRSS_Context::$user_conf->queries = $queries;
 		FreshRSS_Context::$user_conf->save();
 
-		Minz_Request::good(_t('feedback.conf.query_created', $params['name']),
-		                   array('c' => 'configure', 'a' => 'queries'));
+		Minz_Request::good(_t('feedback.conf.query_created', $params['name']), [ 'c' => 'configure', 'a' => 'queries' ]);
 	}
 
 	/**
diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index 8ac45acc7..a932954a9 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -117,13 +117,11 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 			$ext = Minz_ExtensionManager::findExtension($ext_name);
 
 			if (is_null($ext)) {
-				Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name),
-				                  $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name), $url_redirect);
 			}
 
 			if ($ext->isEnabled()) {
-				Minz_Request::bad(_t('feedback.extensions.already_enabled', $ext_name),
-				                  $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.already_enabled', $ext_name), $url_redirect);
 			}
 
 			$conf = null;
@@ -132,8 +130,7 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 			} elseif ($ext->getType() === 'user') {
 				$conf = FreshRSS_Context::$user_conf;
 			} else {
-				Minz_Request::bad(_t('feedback.extensions.no_access', $ext_name),
-				                  $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.no_access', $ext_name), $url_redirect);
 			}
 
 			$res = $ext->install();
@@ -144,12 +141,10 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 				$conf->extensions_enabled = $ext_list;
 				$conf->save();
 
-				Minz_Request::good(_t('feedback.extensions.enable.ok', $ext_name),
-				                   $url_redirect);
+				Minz_Request::good(_t('feedback.extensions.enable.ok', $ext_name), $url_redirect);
 			} else {
 				Minz_Log::warning('Can not enable extension ' . $ext_name . ': ' . $res);
-				Minz_Request::bad(_t('feedback.extensions.enable.ko', $ext_name, _url('index', 'logs')),
-				                  $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.enable.ko', $ext_name, _url('index', 'logs')), $url_redirect);
 			}
 		}
 
@@ -173,13 +168,11 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 			$ext = Minz_ExtensionManager::findExtension($ext_name);
 
 			if (is_null($ext)) {
-				Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name),
-				                  $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name), $url_redirect);
 			}
 
 			if (!$ext->isEnabled()) {
-				Minz_Request::bad(_t('feedback.extensions.not_enabled', $ext_name),
-				                  $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.not_enabled', $ext_name), $url_redirect);
 			}
 
 			$conf = null;
@@ -188,8 +181,7 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 			} elseif ($ext->getType() === 'user') {
 				$conf = FreshRSS_Context::$user_conf;
 			} else {
-				Minz_Request::bad(_t('feedback.extensions.no_access', $ext_name),
-				                  $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.no_access', $ext_name), $url_redirect);
 			}
 
 			$res = $ext->uninstall();
@@ -204,12 +196,10 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 				$conf->extensions_enabled = $ext_list;
 				$conf->save();
 
-				Minz_Request::good(_t('feedback.extensions.disable.ok', $ext_name),
-				                   $url_redirect);
+				Minz_Request::good(_t('feedback.extensions.disable.ok', $ext_name), $url_redirect);
 			} else {
 				Minz_Log::warning('Can not unable extension ' . $ext_name . ': ' . $res);
-				Minz_Request::bad(_t('feedback.extensions.disable.ko', $ext_name, _url('index', 'logs')),
-				                  $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.disable.ko', $ext_name, _url('index', 'logs')), $url_redirect);
 			}
 		}
 
@@ -237,17 +227,14 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 			$ext = Minz_ExtensionManager::findExtension($ext_name);
 
 			if (is_null($ext)) {
-				Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name),
-				                  $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name), $url_redirect);
 			}
 
 			$res = recursive_unlink($ext->getPath());
 			if ($res) {
-				Minz_Request::good(_t('feedback.extensions.removed', $ext_name),
-				                   $url_redirect);
+				Minz_Request::good(_t('feedback.extensions.removed', $ext_name), $url_redirect);
 			} else {
-				Minz_Request::bad(_t('feedback.extensions.cannot_remove', $ext_name),
-				                  $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.cannot_remove', $ext_name), $url_redirect);
 			}
 		}
 
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 5737a8535..158015d2b 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -150,8 +150,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		$limits = FreshRSS_Context::$system_conf->limits;
 		$this->view->feeds = $feedDAO->listFeeds();
 		if (count($this->view->feeds) >= $limits['max_feeds']) {
-			Minz_Request::bad(_t('feedback.sub.feed.over_max', $limits['max_feeds']),
-			                  $url_redirect);
+			Minz_Request::bad(_t('feedback.sub.feed.over_max', $limits['max_feeds']), $url_redirect);
 		}
 
 		if (Minz_Request::isPost()) {
@@ -366,9 +365,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 						} else {	//This entry already exists but has been updated
 							//Minz_Log::debug('Entry with GUID `' . $entry->guid() . '` updated in feed ' . $feed->url(false) .
 								//', old hash ' . $existingHash . ', new hash ' . $entry->hash());
-							$mark_updated_article_unread = $feed->attributes('mark_updated_article_unread') !== null ? (
-									$feed->attributes('mark_updated_article_unread')
-								) : FreshRSS_Context::$user_conf->mark_updated_article_unread;
+							$mark_updated_article_unread = $feed->attributes('mark_updated_article_unread') !== null ?
+								$feed->attributes('mark_updated_article_unread') :
+								FreshRSS_Context::$user_conf->mark_updated_article_unread;
 							$needFeedCacheRefresh = $mark_updated_article_unread;
 							$entry->_isRead($mark_updated_article_unread ? false : null);	//Change is_read according to policy.
 
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index d23bb3689..3550ba0dd 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -157,8 +157,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 
 		if ($status_file !== 0) {
 			Minz_Log::warning('File cannot be uploaded. Error code: ' . $status_file);
-			Minz_Request::bad(_t('feedback.import_export.file_cannot_be_uploaded'),
-			                  array('c' => 'importExport', 'a' => 'index'));
+			Minz_Request::bad(_t('feedback.import_export.file_cannot_be_uploaded'), [ 'c' => 'importExport', 'a' => 'index' ]);
 		}
 
 		@set_time_limit(300);
diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php
index 40f0fc19a..4a79da27a 100755
--- a/app/Controllers/javascriptController.php
+++ b/app/Controllers/javascriptController.php
@@ -34,7 +34,8 @@ class FreshRSS_javascript_Controller extends Minz_ActionController {
 				$salt = FreshRSS_Context::$system_conf->salt;
 				$s = FreshRSS_Context::$user_conf->passwordHash;
 				if (strlen($s) >= 60) {
-					$this->view->salt1 = substr($s, 0, 29);	//CRYPT_BLOWFISH Salt: "$2a$", a two digit cost parameter, "$", and 22 characters from the alphabet "./0-9A-Za-z".
+					//CRYPT_BLOWFISH Salt: "$2a$", a two digit cost parameter, "$", and 22 characters from the alphabet "./0-9A-Za-z".
+					$this->view->salt1 = substr($s, 0, 29);
 					$this->view->nonce = sha1($salt . uniqid(mt_rand(), true));
 					Minz_Session::_param('nonce', $this->view->nonce);
 					return;	//Success
diff --git a/app/Controllers/tagController.php b/app/Controllers/tagController.php
index 217d95db1..4f3fe9bf9 100644
--- a/app/Controllers/tagController.php
+++ b/app/Controllers/tagController.php
@@ -34,12 +34,12 @@ class FreshRSS_tag_Controller extends Minz_ActionController {
 				$tagDAO = FreshRSS_Factory::createTagDao();
 				if ($id_tag == 0 && $name_tag != '' && $checked) {
 					if ($existing_tag = $tagDAO->searchByName($name_tag)) {
-					    // Use existing tag
-                        $tagDAO->tagEntry($existing_tag->id(), $id_entry, $checked);
-                    } else {
-                        //Create new tag
-                        $id_tag = $tagDAO->addTag(array('name' => $name_tag));
-                    }
+						// Use existing tag
+						$tagDAO->tagEntry($existing_tag->id(), $id_entry, $checked);
+					} else {
+						//Create new tag
+						$id_tag = $tagDAO->addTag(array('name' => $name_tag));
+					}
 				}
 				if ($id_tag != 0) {
 					$tagDAO->tagEntry($id_tag, $id_entry, $checked);
diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index c0c1ef1c8..45bf70f62 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -193,8 +193,7 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 				@file_put_contents(join_path(DATA_PATH, 'last_update.txt'), '');
 				Minz_Request::good(_t('feedback.update.finished'));
 			} else {
-				Minz_Request::bad(_t('feedback.update.error', $res),
-				                  array('c' => 'update', 'a' => 'index'));
+				Minz_Request::bad(_t('feedback.update.error', $res), [ 'c' => 'update', 'a' => 'index' ]);
 			}
 		} else {
 			$res = false;
@@ -220,8 +219,7 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 					'params' => array('post_conf' => true)
 				), true);
 			} else {
-				Minz_Request::bad(_t('feedback.update.error', $res),
-				                  array('c' => 'update', 'a' => 'index'));
+				Minz_Request::bad(_t('feedback.update.error', $res), [ 'c' => 'update', 'a' => 'index' ]);
 			}
 		}
 	}
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 06c9ebc04..ec5e348c2 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -71,8 +71,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 					Minz_Request::good(_t('feedback.profile.updated'), array('c' => 'index', 'a' => 'index'));
 				}
 			} else {
-				Minz_Request::bad(_t('feedback.user.updated.error', $username),
-				                  array('c' => 'user', 'a' => 'manage'));
+				Minz_Request::bad(_t('feedback.user.updated.error', $username), [ 'c' => 'user', 'a' => 'manage' ]);
 			}
 		}
 	}
@@ -140,8 +139,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 					Minz_Request::good(_t('feedback.profile.updated'), array('c' => 'index', 'a' => 'index'));
 				}
 			} else {
-				Minz_Request::bad(_t('feedback.profile.error'),
-				                  array('c' => 'user', 'a' => 'profile'));
+				Minz_Request::bad(_t('feedback.profile.error'), [ 'c' => 'user', 'a' => 'profile' ]);
 			}
 		}
 	}