Fix PSR-1 violations, add Travis command

.travis.yml

@@ -34,6 +34,7 @@ before_script:
 script:
   # PHP_CodeSniffer
   - php phpcs.phar --report=emacs --extensions=php --standard=qa-tests/phpcs/ruleset.xml .
+  - php phpcs.phar --report=emacs --extensions=php --standard=qa-tests/phpcs/ruleset-strict.xml qa-src/
   # PHPUnit
   - php phpunit.phar --bootstrap qa-tests/autoload.php qa-tests
 

qa-include/app/emails.php

@@ -70,6 +70,7 @@ function qa_send_notification($userid, $email, $handle, $subject, $body, $subs,
 	return $sender->sendMessage($subject, $body, $subs, $html);
 }
 
+
 /**
  * Send the email based on the $params array - the following keys are required (some can be empty): fromemail,
  * fromname, toemail, toname, subject, body, html

qa-src/Controllers/User/UserMessages.php

@@ -21,13 +21,13 @@ namespace Q2A\Controllers\User;
 use Q2A\Http\Exceptions\PageNotFoundException;
 use Q2A\Middleware\Auth\InternalUsersOnly;
 
-require_once QA_INCLUDE_DIR . 'db/selects.php';
-require_once QA_INCLUDE_DIR . 'app/messages.php';
-
 class UserMessages extends \Q2A\Controllers\BaseController
 {
 	public function __construct()
 	{
+		require_once QA_INCLUDE_DIR . 'db/selects.php';
+		require_once QA_INCLUDE_DIR . 'app/messages.php';
+
 		parent::__construct();
 
 		$this->addMiddleware(new InternalUsersOnly());

qa-src/Controllers/User/UserPosts.php

@@ -20,16 +20,19 @@ namespace Q2A\Controllers\User;
 
 use Q2A\Http\Exceptions\PageNotFoundException;
 
-require_once QA_INCLUDE_DIR . 'db/users.php';
-require_once QA_INCLUDE_DIR . 'db/selects.php';
-require_once QA_INCLUDE_DIR . 'app/users.php';
-require_once QA_INCLUDE_DIR . 'app/format.php';
-
 class UserPosts extends \Q2A\Controllers\BaseController
 {
 	protected $userid;
 	protected $userhtml;
 
+	public function __construct()
+	{
+		require_once QA_INCLUDE_DIR . 'db/users.php';
+		require_once QA_INCLUDE_DIR . 'db/selects.php';
+		require_once QA_INCLUDE_DIR . 'app/users.php';
+		require_once QA_INCLUDE_DIR . 'app/format.php';
+	}
+
 	/**
 	 * @param string $handle
 	 *

qa-src/Controllers/User/UserProfile.php

@@ -20,16 +20,19 @@ namespace Q2A\Controllers\User;
 
 use Q2A\Http\Exceptions\PageNotFoundException;
 
-require_once QA_INCLUDE_DIR . 'db/users.php';
-require_once QA_INCLUDE_DIR . 'db/selects.php';
-require_once QA_INCLUDE_DIR . 'app/users.php';
-require_once QA_INCLUDE_DIR . 'app/format.php';
-
 class UserProfile extends \Q2A\Controllers\BaseController
 {
 	private $userid;
 	private $userhtml;
 
+	public function __construct()
+	{
+		require_once QA_INCLUDE_DIR . 'db/users.php';
+		require_once QA_INCLUDE_DIR . 'db/selects.php';
+		require_once QA_INCLUDE_DIR . 'app/users.php';
+		require_once QA_INCLUDE_DIR . 'app/format.php';
+	}
+
 	public function index()
 	{
 		$handle = qa_get_logged_in_handle();

qa-src/Controllers/User/UsersList.php

@@ -22,15 +22,15 @@ use Q2A\Auth\NoPermissionException;
 use Q2A\Middleware\Auth\InternalUsersOnly;
 use Q2A\Middleware\Auth\MinimumUserLevel;
 
-require_once QA_INCLUDE_DIR . 'db/users.php';
-require_once QA_INCLUDE_DIR . 'db/selects.php';
-require_once QA_INCLUDE_DIR . 'app/users.php';
-require_once QA_INCLUDE_DIR . 'app/format.php';
-
 class UsersList extends \Q2A\Controllers\BaseController
 {
 	public function __construct()
 	{
+		require_once QA_INCLUDE_DIR . 'db/users.php';
+		require_once QA_INCLUDE_DIR . 'db/selects.php';
+		require_once QA_INCLUDE_DIR . 'app/users.php';
+		require_once QA_INCLUDE_DIR . 'app/format.php';
+
 		parent::__construct();
 
 		$this->addMiddleware(new InternalUsersOnly(), array('newest', 'special', 'blocked'));

qa-src/Exceptions/ExceptionHandler.php

@@ -21,12 +21,11 @@ namespace Q2A\Exceptions;
 use Exception;
 use Q2A\Http\Exceptions\PageNotFoundException;
 
-require_once QA_INCLUDE_DIR . 'app/format.php';
-
 class ExceptionHandler
 {
 	public function __construct()
 	{
+		require_once QA_INCLUDE_DIR . 'app/format.php';
 	}
 
 	public function handle(Exception $exception)

qa-src/Notifications/Email.php

@@ -31,11 +31,11 @@ class Email
 
 	private function __construct($email, $handle)
 	{
-		$this->email = $email;
-		$this->handle = $handle;
-
 		require_once QA_INCLUDE_DIR . 'db/selects.php';		//required for qa_db_select_with_pending()
 		require_once QA_INCLUDE_DIR . 'app/options.php';	//required for qa_opt()
+
+		$this->email = $email;
+		$this->handle = $handle;
 	}
 
 	/**

qa-src/Recalc/AbstractStep.php

@@ -18,8 +18,6 @@
 
 namespace Q2A\Recalc;
 
-require_once QA_INCLUDE_DIR . 'app/format.php';        //required for qa_number_format()
-
 abstract class AbstractStep
 {
 	protected $state;
@@ -27,6 +25,8 @@ abstract class AbstractStep
 
 	public function __construct(State $state)
 	{
+		require_once QA_INCLUDE_DIR . 'app/format.php'; // for qa_format_number()
+
 		$this->state = $state;
 	}
 

qa-src/Recalc/RecalcMain.php

@@ -54,16 +54,6 @@
 
 namespace Q2A\Recalc;
 
-require_once QA_INCLUDE_DIR . 'db/recalc.php';
-require_once QA_INCLUDE_DIR . 'db/post-create.php';
-require_once QA_INCLUDE_DIR . 'db/points.php';
-require_once QA_INCLUDE_DIR . 'db/selects.php';
-require_once QA_INCLUDE_DIR . 'db/admin.php';
-require_once QA_INCLUDE_DIR . 'db/users.php';
-require_once QA_INCLUDE_DIR . 'app/options.php';
-require_once QA_INCLUDE_DIR . 'app/post-create.php';
-require_once QA_INCLUDE_DIR . 'app/post-update.php';
-
 class RecalcMain
 {
 	protected $state;
@@ -73,6 +63,16 @@ class RecalcMain
 	 */
 	public function __construct($state)
 	{
+		require_once QA_INCLUDE_DIR . 'db/recalc.php';
+		require_once QA_INCLUDE_DIR . 'db/post-create.php';
+		require_once QA_INCLUDE_DIR . 'db/points.php';
+		require_once QA_INCLUDE_DIR . 'db/selects.php';
+		require_once QA_INCLUDE_DIR . 'db/admin.php';
+		require_once QA_INCLUDE_DIR . 'db/users.php';
+		require_once QA_INCLUDE_DIR . 'app/options.php';
+		require_once QA_INCLUDE_DIR . 'app/post-create.php';
+		require_once QA_INCLUDE_DIR . 'app/post-update.php';
+
 		$this->state = new \Q2A\Recalc\State($state);
 	}
 

qa-src/Recalc/RefillEventsRefill.php

@@ -18,13 +18,17 @@
 
 namespace Q2A\Recalc;
 
-require_once QA_INCLUDE_DIR . 'app/events.php';
-require_once QA_INCLUDE_DIR . 'app/updates.php';
-require_once QA_INCLUDE_DIR . 'util/sort.php';
-
-
 class RefillEventsRefill extends AbstractStep
 {
+	public function __construct(State $state)
+	{
+		require_once QA_INCLUDE_DIR . 'app/events.php';
+		require_once QA_INCLUDE_DIR . 'app/updates.php';
+		require_once QA_INCLUDE_DIR . 'util/sort.php';
+
+		parent::__construct($state);
+	}
+
 	public function doStep()
 	{
 		$questionids = qa_db_qs_get_for_event_refilling($this->state->next, 1);