From 069357c54e8becc7273848c8599cdc27601d8aec Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Thu, 8 Nov 2018 23:49:46 -0800
Subject: [PATCH 1/2] Change org name in spite of phpcbf

---
 system/Email/Email.php                      | 504 +++++++++++---------
 tests/system/Router/RouteCollectionTest.php | 238 ++++-----
 tests/system/Router/RouterTest.php          |  95 ++--
 3 files changed, 452 insertions(+), 385 deletions(-)

diff --git a/system/Email/Email.php b/system/Email/Email.php
index 7723bdc61487..ce3587eef839 100644
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@@ -27,13 +27,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
- * @package   CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
- * @license   http://opensource.org/licenses/MIT	MIT License
- * @link      https://codeigniter.com
- * @since     Version 1.0.0
+ * @package    CodeIgniter
+ * @author     EllisLab Dev Team
+ * @copyright  Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
+ * @copyright  Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license    http://opensource.org/licenses/MIT    MIT License
+ * @link       https://codeigniter.com
+ * @since      Version 1.0.0
  * @filesource
  */
 
@@ -109,21 +109,21 @@ class Email
 	/**
 	 * SMTP Server port
 	 *
-	 * @var int
+	 * @var integer
 	 */
 	public $SMTPPort = 25;
 
 	/**
 	 * SMTP connection timeout in seconds
 	 *
-	 * @var int
+	 * @var integer
 	 */
 	public $SMTPTimeout = 5;
 
 	/**
 	 * SMTP persistent connection
 	 *
-	 * @var bool
+	 * @var boolean
 	 */
 	public $SMTPKeepAlive = false;
 
@@ -137,7 +137,7 @@ class Email
 	/**
 	 * Whether to apply word-wrapping to the message body.
 	 *
-	 * @var bool
+	 * @var boolean
 	 */
 	public $wordWrap = true;
 
@@ -145,7 +145,7 @@ class Email
 	 * Number of characters to wrap at.
 	 *
 	 * @see Email::$wordWrap
-	 * @var int
+	 * @var integer
 	 */
 	public $wrapChars = 76;
 
@@ -173,14 +173,14 @@ class Email
 	/**
 	 * Whether to validate e-mail addresses.
 	 *
-	 * @var bool
+	 * @var boolean
 	 */
 	public $validate = true;
 
 	/**
 	 * X-Priority header value.
 	 *
-	 * @var int 1-5
+	 * @var integer 1-5
 	 */
 	public $priority = 3;            // Default priority (1 - 5)
 
@@ -189,7 +189,7 @@ class Email
 	 * Use "\r\n" to comply with RFC 822.
 	 *
 	 * @link http://www.ietf.org/rfc/rfc822.txt
-	 * @var string "\r\n" or "\n"
+	 * @var  string "\r\n" or "\n"
 	 */
 	public $newline = "\n";            // Default newline. "\r\n" or "\n" (Use "\r\n" to comply with RFC 822)
 
@@ -203,14 +203,14 @@ class Email
 	 * that seems to work for all environments.
 	 *
 	 * @link http://www.ietf.org/rfc/rfc822.txt
-	 * @var string
+	 * @var  string
 	 */
 	public $CRLF = "\n";
 
 	/**
 	 * Whether to use Delivery Status Notification.
 	 *
-	 * @var bool
+	 * @var boolean
 	 */
 	public $DSN = false;
 
@@ -218,14 +218,14 @@ class Email
 	 * Whether to send multipart alternatives.
 	 * Yahoo! doesn't seem to like these.
 	 *
-	 * @var bool
+	 * @var boolean
 	 */
 	public $sendMultipart = true;
 
 	/**
 	 * Whether to send messages to BCC recipients in batches.
 	 *
-	 * @var bool
+	 * @var boolean
 	 */
 	public $BCCBatchMode = false;
 
@@ -233,7 +233,7 @@ class Email
 	 * BCC Batch max number size.
 	 *
 	 * @see Email::$BCCBatchMode
-	 * @var int
+	 * @var integer
 	 */
 	public $BCCBatchSize = 200;
 
@@ -284,14 +284,14 @@ class Email
 	/**
 	 * Whether to perform SMTP authentication
 	 *
-	 * @var bool
+	 * @var boolean
 	 */
 	protected $SMTPAuth = false;
 
 	/**
 	 * Whether to send a Reply-To header
 	 *
-	 * @var bool
+	 * @var boolean
 	 */
 	protected $replyToFlag = false;
 
@@ -344,7 +344,11 @@ class Email
 	 * @see Email::$protocol
 	 * @var array
 	 */
-	protected $protocols = ['mail', 'sendmail', 'smtp'];
+	protected $protocols = [
+		'mail',
+		'sendmail',
+		'smtp',
+	];
 
 	/**
 	 * Base charsets
@@ -354,7 +358,10 @@ class Email
 	 *
 	 * @var array
 	 */
-	protected $baseCharsets = ['us-ascii', 'iso-2022-'];
+	protected $baseCharsets = [
+		'us-ascii',
+		'iso-2022-',
+	];
 
 	/**
 	 * Bit depths
@@ -364,7 +371,10 @@ class Email
 	 * @see Email::$encoding
 	 * @var array
 	 */
-	protected $bitDepths = ['7bit', '8bit'];
+	protected $bitDepths = [
+		'7bit',
+		'8bit',
+	];
 
 	/**
 	 * $priority translations
@@ -384,12 +394,13 @@ class Email
 	/**
 	 * mbstring.func_overload flag
 	 *
-	 * @var bool
+	 * @var boolean
 	 */
 	protected static $func_overload;
 
 	/**
 	 * Logger instance to record error messages and awarnings.
+	 *
 	 * @var \PSR\Log\LoggerInterface
 	 */
 	protected $logger;
@@ -434,7 +445,7 @@ public function initialize($config)
 		{
 			if (property_exists($this, $key) && isset($config[$key]))
 			{
-				$method = 'set'.ucfirst($key);
+				$method = 'set' . ucfirst($key);
 
 				if (method_exists($this, $method))
 				{
@@ -458,7 +469,7 @@ public function initialize($config)
 	/**
 	 * Initialize the Email Data
 	 *
-	 * @param bool $clearAttachments
+	 * @param boolean $clearAttachments
 	 *
 	 * @return Email
 	 */
@@ -519,7 +530,7 @@ public function setFrom($from, $name = '', $returnPath = null)
 			if (! preg_match('/[\200-\377]/', $name))
 			{
 				// add slashes for non-printing characters, slashes, and double quotes, and surround it in double quotes
-				$name = '"'.addcslashes($name, "\0..\37\177'\"\\").'"';
+				$name = '"' . addcslashes($name, "\0..\37\177'\"\\") . '"';
 			}
 			else
 			{
@@ -527,10 +538,10 @@ public function setFrom($from, $name = '', $returnPath = null)
 			}
 		}
 
-		$this->setHeader('From', $name.' <'.$from.'>');
+		$this->setHeader('From', $name . ' <' . $from . '>');
 
 		isset($returnPath) || $returnPath = $from;
-		$this->setHeader('Return-Path', '<'.$returnPath.'>');
+		$this->setHeader('Return-Path', '<' . $returnPath . '>');
 
 		return $this;
 	}
@@ -563,7 +574,7 @@ public function setReplyTo($replyto, $name = '')
 			if (! preg_match('/[\200-\377]/', $name))
 			{
 				// add slashes for non-printing characters, slashes, and double quotes, and surround it in double quotes
-				$name = '"'.addcslashes($name, "\0..\37\177'\"\\").'"';
+				$name = '"' . addcslashes($name, "\0..\37\177'\"\\") . '"';
 			}
 			else
 			{
@@ -571,7 +582,7 @@ public function setReplyTo($replyto, $name = '')
 			}
 		}
 
-		$this->setHeader('Reply-To', $name.' <'.$replyto.'>');
+		$this->setHeader('Reply-To', $name . ' <' . $replyto . '>');
 		$this->replyToFlag = true;
 
 		return $this;
@@ -734,8 +745,8 @@ public function attach($file, $disposition = '', $newname = null, $mime = '')
 				return false;
 			}
 
-			$fileContent  = stream_get_contents($fp);
-			$mime         = $this->mimeTypes(pathinfo($file, PATHINFO_EXTENSION));
+			$fileContent = stream_get_contents($fp);
+			$mime        = $this->mimeTypes(pathinfo($file, PATHINFO_EXTENSION));
 			fclose($fp);
 		}
 		else
@@ -743,14 +754,17 @@ public function attach($file, $disposition = '', $newname = null, $mime = '')
 			$fileContent =& $file; // buffered file
 		}
 
-		$this->attachments[] = [
-			'name'        => [$file, $newname],
-			'disposition' => empty($disposition) ? 'attachment' : $disposition,
-			// Can also be 'inline'  Not sure if it matters
-			'type'        => $mime,
-			'content'     => chunk_split(base64_encode($fileContent)),
-			'multipart'   => 'mixed',
-		];
+		//        $this->attachments[] = [
+		//        'name'        => [
+		//        $file,
+		//        $newname,
+		//        ],
+		//        'disposition' => empty($disposition) ? 'attachment' : $disposition,
+		//        // Can also be 'inline'  Not sure if it matters
+		//        'type'        => $mime,
+		//        'content'     => chunk_split(base64_encode($fileContent)),
+		//        'multipart'   => 'mixed',
+		//        ];
 
 		return $this;
 	}
@@ -773,7 +787,7 @@ public function setAttachmentCID($filename)
 			if ($this->attachments[$i]['name'][0] === $filename)
 			{
 				$this->attachments[$i]['multipart'] = 'related';
-				$this->attachments[$i]['cid']       = uniqid(basename($this->attachments[$i]['name'][0]).'@', true);
+				$this->attachments[$i]['cid']       = uniqid(basename($this->attachments[$i]['name'][0]) . '@', true);
 
 				return $this->attachments[$i]['cid'];
 			}
@@ -813,8 +827,8 @@ protected function stringToArray($email)
 		if (! is_array($email))
 		{
 			return (strpos($email, ',') !== false)
-				? preg_split('/[\s,]/', $email, -1, PREG_SPLIT_NO_EMPTY)
-				: (array)trim($email);
+			? preg_split('/[\s,]/', $email, -1, PREG_SPLIT_NO_EMPTY)
+			: (array)trim($email);
 		}
 
 		return $email;
@@ -857,7 +871,7 @@ public function setMailType($type = 'text')
 	/**
 	 * Set Wordwrap
 	 *
-	 * @param bool $wordWrap
+	 * @param boolean $wordWrap
 	 *
 	 * @return Email
 	 */
@@ -889,7 +903,7 @@ public function setProtocol($protocol = 'mail')
 	/**
 	 * Set Priority
 	 *
-	 * @param int $n
+	 * @param integer $n
 	 *
 	 * @return Email
 	 */
@@ -943,7 +957,7 @@ protected function getMessageID()
 	{
 		$from = str_replace(['>', '<'], '', $this->headers['Return-Path']);
 
-		return '<'.uniqid('', true).strstr($from, '@').'>';
+		return '<' . uniqid('', true) . strstr($from, '@') . '>';
 	}
 
 	//--------------------------------------------------------------------
@@ -955,7 +969,7 @@ protected function getMessageID()
 	 */
 	protected function getProtocol()
 	{
-		$this->protocol = strtolower($this->protocol);
+		$this->protocol                                                      = strtolower($this->protocol);
 		in_array($this->protocol, $this->protocols, true) || $this->protocol = 'mail';
 
 		return $this->protocol;
@@ -1018,7 +1032,7 @@ protected function setDate()
 		$timezone = date('Z');
 		$operator = ($timezone[0] === '-') ? '-' : '+';
 		$timezone = abs($timezone);
-		$timezone = floor($timezone/3600)*100+($timezone%3600)/60;
+		$timezone = floor($timezone / 3600) * 100 + ($timezone % 3600) / 60;
 
 		return sprintf('%s %s%04d', date('D, j M Y H:i:s'), $operator, $timezone);
 	}
@@ -1032,7 +1046,7 @@ protected function setDate()
 	 */
 	protected function getMimeMessage()
 	{
-		return 'This is a multi-part message in MIME format.'.$this->newline.'Your email application may not support this format.';
+		return 'This is a multi-part message in MIME format.' . $this->newline . 'Your email application may not support this format.';
 	}
 
 	//--------------------------------------------------------------------
@@ -1042,7 +1056,7 @@ protected function getMimeMessage()
 	 *
 	 * @param string $email
 	 *
-	 * @return bool
+	 * @return boolean
 	 */
 	public function validateEmail($email)
 	{
@@ -1073,14 +1087,16 @@ public function validateEmail($email)
 	 *
 	 * @param string $email
 	 *
-	 * @return bool
+	 * @return boolean
 	 */
 	public function isValidEmail($email)
 	{
 		if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && $atpos = strpos($email, '@'))
 		{
-			$email = self::substr($email, 0, ++$atpos).idn_to_ascii(self::substr($email, $atpos), 0,
-					INTL_IDNA_VARIANT_UTS46);
+			$email = self::substr($email, 0, ++$atpos) . idn_to_ascii(
+				self::substr($email, $atpos), 0,
+				INTL_IDNA_VARIANT_UTS46
+			);
 		}
 
 		return (bool)filter_var($email, FILTER_VALIDATE_EMAIL);
@@ -1129,8 +1145,8 @@ protected function getAltMessage()
 		if (! empty($this->altMessage))
 		{
 			return ($this->wordWrap)
-				? $this->wordWrap($this->altMessage, 76)
-				: $this->altMessage;
+			? $this->wordWrap($this->altMessage, 76)
+			: $this->altMessage;
 		}
 
 		$body = preg_match('/\<body.*?\>(.*)\<\/body\>/si', $this->body, $match) ? $match[1] : $this->body;
@@ -1145,8 +1161,8 @@ protected function getAltMessage()
 		$body = preg_replace('| +|', ' ', $body);
 
 		return ($this->wordWrap)
-			? $this->wordWrap($body, 76)
-			: $body;
+		? $this->wordWrap($body, 76)
+		: $body;
 	}
 
 	//--------------------------------------------------------------------
@@ -1154,8 +1170,8 @@ protected function getAltMessage()
 	/**
 	 * Word Wrap
 	 *
-	 * @param string   $str
-	 * @param int|null $charlim Line-length limit
+	 * @param string       $str
+	 * @param integer|null $charlim Line-length limit
 	 *
 	 * @return string
 	 */
@@ -1184,7 +1200,7 @@ public function wordWrap($str, $charlim = null)
 			for ($i = 0, $c = count($matches[0]); $i < $c; $i++)
 			{
 				$unwrap[] = $matches[1][$i];
-				$str      = str_replace($matches[0][$i], '{{unwrapped'.$i.'}}', $str);
+				$str      = str_replace($matches[0][$i], '{{unwrapped' . $i . '}}', $str);
 			}
 		}
 
@@ -1201,7 +1217,7 @@ public function wordWrap($str, $charlim = null)
 			// If so we'll join it to the output and continue
 			if (self::strlen($line) <= $charlim)
 			{
-				$output .= $line.$this->newline;
+				$output .= $line . $this->newline;
 				continue;
 			}
 
@@ -1215,18 +1231,19 @@ public function wordWrap($str, $charlim = null)
 				}
 
 				// Trim the word down
-				$temp .= self::substr($line, 0, $charlim-1);
-				$line = self::substr($line, $charlim-1);
-			} while (self::strlen($line) > $charlim);
+				$temp .= self::substr($line, 0, $charlim - 1);
+				$line  = self::substr($line, $charlim - 1);
+			}
+			while (self::strlen($line) > $charlim);
 
 			// If $temp contains data it means we had to split up an over-length
 			// word into smaller chunks so we'll add it back to our current line
 			if ($temp !== '')
 			{
-				$output .= $temp.$this->newline;
+				$output .= $temp . $this->newline;
 			}
 
-			$output .= $line.$this->newline;
+			$output .= $line . $this->newline;
 		}
 
 		// Put our markers back
@@ -1234,7 +1251,7 @@ public function wordWrap($str, $charlim = null)
 		{
 			foreach ($unwrap as $key => $val)
 			{
-				$output = str_replace('{{unwrapped'.$key.'}}', $val, $output);
+				$output = str_replace('{{unwrapped' . $key . '}}', $val, $output);
 			}
 		}
 
@@ -1281,7 +1298,7 @@ protected function writeHeaders()
 
 			if ($val !== '')
 			{
-				$this->headerStr .= $key.': '.$val.$this->newline;
+				$this->headerStr .= $key . ': ' . $val . $this->newline;
 			}
 		}
 
@@ -1312,84 +1329,84 @@ protected function buildMessage()
 		{
 			case 'plain':
 
-				$hdr .= 'Content-Type: text/plain; charset='.$this->charset.$this->newline
-				        .'Content-Transfer-Encoding: '.$this->getEncoding();
+				$hdr .= 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+				. 'Content-Transfer-Encoding: ' . $this->getEncoding();
 
 				if ($this->getProtocol() === 'mail')
 				{
-					$this->headerStr .= $hdr;
-					$this->finalBody = $this->body;
+					  $this->headerStr .= $hdr;
+					  $this->finalBody  = $this->body;
 				}
 				else
 				{
-					$this->finalBody = $hdr.$this->newline.$this->newline.$this->body;
+					  $this->finalBody = $hdr . $this->newline . $this->newline . $this->body;
 				}
 
-				return;
+			return;
 
 			case 'html':
 
 				if ($this->sendMultipart === false)
 				{
-					$hdr .= 'Content-Type: text/html; charset='.$this->charset.$this->newline
-					        .'Content-Transfer-Encoding: quoted-printable';
+					  $hdr .= 'Content-Type: text/html; charset=' . $this->charset . $this->newline
+					. 'Content-Transfer-Encoding: quoted-printable';
 				}
 				else
 				{
-					$boundary = uniqid('B_ALT_', true);
-					$hdr      .= 'Content-Type: multipart/alternative; boundary="'.$boundary.'"';
+					  $boundary = uniqid('B_ALT_', true);
+					  $hdr     .= 'Content-Type: multipart/alternative; boundary="' . $boundary . '"';
 
-					$body .= $this->getMimeMessage().$this->newline.$this->newline
-					         .'--'.$boundary.$this->newline
+					  $body .= $this->getMimeMessage() . $this->newline . $this->newline
+					 . '--' . $boundary . $this->newline
 
-					         .'Content-Type: text/plain; charset='.$this->charset.$this->newline
-					         .'Content-Transfer-Encoding: '.$this->getEncoding().$this->newline.$this->newline
-					         .$this->getAltMessage().$this->newline.$this->newline
-					         .'--'.$boundary.$this->newline
+					 . 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+					 . 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline . $this->newline
+					 . $this->getAltMessage() . $this->newline . $this->newline
+					 . '--' . $boundary . $this->newline
 
-					         .'Content-Type: text/html; charset='.$this->charset.$this->newline
-					         .'Content-Transfer-Encoding: quoted-printable'.$this->newline.$this->newline;
+					 . 'Content-Type: text/html; charset=' . $this->charset . $this->newline
+					 . 'Content-Transfer-Encoding: quoted-printable' . $this->newline . $this->newline;
 				}
 
-				$this->finalBody = $body.$this->prepQuotedPrintable($this->body).$this->newline.$this->newline;
+				$this->finalBody = $body . $this->prepQuotedPrintable($this->body) . $this->newline . $this->newline;
 
 				if ($this->getProtocol() === 'mail')
 				{
-					$this->headerStr .= $hdr;
+					  $this->headerStr .= $hdr;
 				}
 				else
 				{
-					$this->finalBody = $hdr.$this->newline.$this->newline.$this->finalBody;
+					  $this->finalBody = $hdr . $this->newline . $this->newline . $this->finalBody;
 				}
 
 				if ($this->sendMultipart !== false)
 				{
-					$this->finalBody .= '--'.$boundary.'--';
+					  $this->finalBody .= '--' . $boundary . '--';
 				}
 
-				return;
+			return;
 
 			case 'plain-attach':
 
 				$boundary = uniqid('B_ATC_', true);
-				$hdr      .= 'Content-Type: multipart/mixed; boundary="'.$boundary.'"';
+				$hdr     .= 'Content-Type: multipart/mixed; boundary="' . $boundary . '"';
 
 				if ($this->getProtocol() === 'mail')
 				{
-					$this->headerStr .= $hdr;
+					  $this->headerStr .= $hdr;
 				}
 
-				$body .= $this->getMimeMessage().$this->newline
-				         .$this->newline
-				         .'--'.$boundary.$this->newline
-				         .'Content-Type: text/plain; charset='.$this->charset.$this->newline
-				         .'Content-Transfer-Encoding: '.$this->getEncoding().$this->newline
-				         .$this->newline
-				         .$this->body.$this->newline.$this->newline;
+				$body .= $this->getMimeMessage() . $this->newline
+				. $this->newline
+				. '--' . $boundary . $this->newline
+				. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+				. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline
+				. $this->newline
+				. $this->body . $this->newline . $this->newline;
 
 				$this->appendAttachments($body, $boundary);
 
-				break;
+			break;
 			case 'html-attach':
 
 				$alt_boundary  = uniqid('B_ALT_', true);
@@ -1397,19 +1414,19 @@ protected function buildMessage()
 
 				if ($this->attachmentsHaveMultipart('mixed'))
 				{
-					$atc_boundary  = uniqid('B_ATC_', true);
-					$hdr           .= 'Content-Type: multipart/mixed; boundary="'.$atc_boundary.'"';
-					$last_boundary = $atc_boundary;
+					  $atc_boundary  = uniqid('B_ATC_', true);
+					  $hdr          .= 'Content-Type: multipart/mixed; boundary="' . $atc_boundary . '"';
+					  $last_boundary = $atc_boundary;
 				}
 
 				if ($this->attachmentsHaveMultipart('related'))
 				{
-					$rel_boundary        = uniqid('B_REL_', true);
-					$rel_boundary_header = 'Content-Type: multipart/related; boundary="'.$rel_boundary.'"';
+					  $rel_boundary        = uniqid('B_REL_', true);
+					  $rel_boundary_header = 'Content-Type: multipart/related; boundary="' . $rel_boundary . '"';
 
 					if (isset($last_boundary))
 					{
-						$body .= '--'.$last_boundary.$this->newline.$rel_boundary_header;
+						$body .= '--' . $last_boundary . $this->newline . $rel_boundary_header;
 					}
 					else
 					{
@@ -1421,46 +1438,46 @@ protected function buildMessage()
 
 				if ($this->getProtocol() === 'mail')
 				{
-					$this->headerStr .= $hdr;
+					  $this->headerStr .= $hdr;
 				}
 
-				self::strlen($body) && $body .= $this->newline.$this->newline;
-				$body .= $this->getMimeMessage().$this->newline.$this->newline
-				         .'--'.$last_boundary.$this->newline
+				self::strlen($body) && $body .= $this->newline . $this->newline;
+				$body                        .= $this->getMimeMessage() . $this->newline . $this->newline
+				. '--' . $last_boundary . $this->newline
 
-				         .'Content-Type: multipart/alternative; boundary="'.$alt_boundary.'"'.$this->newline.$this->newline
-				         .'--'.$alt_boundary.$this->newline
+				. 'Content-Type: multipart/alternative; boundary="' . $alt_boundary . '"' . $this->newline . $this->newline
+				. '--' . $alt_boundary . $this->newline
 
-				         .'Content-Type: text/plain; charset='.$this->charset.$this->newline
-				         .'Content-Transfer-Encoding: '.$this->getEncoding().$this->newline.$this->newline
-				         .$this->getAltMessage().$this->newline.$this->newline
-				         .'--'.$alt_boundary.$this->newline
+				. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+				. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline . $this->newline
+				. $this->getAltMessage() . $this->newline . $this->newline
+				. '--' . $alt_boundary . $this->newline
 
-				         .'Content-Type: text/html; charset='.$this->charset.$this->newline
-				         .'Content-Transfer-Encoding: quoted-printable'.$this->newline.$this->newline
+				. 'Content-Type: text/html; charset=' . $this->charset . $this->newline
+				. 'Content-Transfer-Encoding: quoted-printable' . $this->newline . $this->newline
 
-				         .$this->prepQuotedPrintable($this->body).$this->newline.$this->newline
-				         .'--'.$alt_boundary.'--'.$this->newline.$this->newline;
+				. $this->prepQuotedPrintable($this->body) . $this->newline . $this->newline
+				. '--' . $alt_boundary . '--' . $this->newline . $this->newline;
 
 				if (! empty($rel_boundary))
 				{
-					$body .= $this->newline.$this->newline;
-					$this->appendAttachments($body, $rel_boundary, 'related');
+					  $body .= $this->newline . $this->newline;
+					  $this->appendAttachments($body, $rel_boundary, 'related');
 				}
 
 				// multipart/mixed attachments
 				if (! empty($atc_boundary))
 				{
-					$body .= $this->newline.$this->newline;
-					$this->appendAttachments($body, $atc_boundary, 'mixed');
+					  $body .= $this->newline . $this->newline;
+					  $this->appendAttachments($body, $atc_boundary, 'mixed');
 				}
 
-				break;
+			break;
 		}
 
 		$this->finalBody = ($this->getProtocol() === 'mail')
-			? $body
-			: $hdr.$this->newline.$this->newline.$body;
+		? $body
+		: $hdr . $this->newline . $this->newline . $body;
 	}
 
 	//--------------------------------------------------------------------
@@ -1499,22 +1516,22 @@ protected function appendAttachments(&$body, $boundary, $multipart = null)
 			}
 
 			$name = isset($this->attachments[$i]['name'][1])
-				? $this->attachments[$i]['name'][1]
-				: basename($this->attachments[$i]['name'][0]);
+			? $this->attachments[$i]['name'][1]
+			: basename($this->attachments[$i]['name'][0]);
 
-			$body .= '--'.$boundary.$this->newline
-			         .'Content-Type: '.$this->attachments[$i]['type'].'; name="'.$name.'"'.$this->newline
-			         .'Content-Disposition: '.$this->attachments[$i]['disposition'].';'.$this->newline
-			         .'Content-Transfer-Encoding: base64'.$this->newline
-			         .(empty($this->attachments[$i]['cid']) ? ''
-					: 'Content-ID: <'.$this->attachments[$i]['cid'].'>'.$this->newline)
-			         .$this->newline
-			         .$this->attachments[$i]['content'].$this->newline;
+			$body .= '--' . $boundary . $this->newline
+			. 'Content-Type: ' . $this->attachments[$i]['type'] . '; name="' . $name . '"' . $this->newline
+			. 'Content-Disposition: ' . $this->attachments[$i]['disposition'] . ';' . $this->newline
+			. 'Content-Transfer-Encoding: base64' . $this->newline
+			. (empty($this->attachments[$i]['cid']) ? ''
+			: 'Content-ID: <' . $this->attachments[$i]['cid'] . '>' . $this->newline)
+			. $this->newline
+			. $this->attachments[$i]['content'] . $this->newline;
 		}
 
 		// $name won't be set if no attachments were appended,
 		// and therefore a boundary wouldn't be necessary
-		empty($name) || $body .= '--'.$boundary.'--';
+		empty($name) || $body .= '--' . $boundary . '--';
 	}
 
 	//--------------------------------------------------------------------
@@ -1535,7 +1552,7 @@ protected function prepQuotedPrintable($str)
 		// used literally, without encoding, as described in RFC 2049.
 		// http://www.ietf.org/rfc/rfc2049.txt
 		static $ascii_safe_chars = [
-			// ' (  )   +   ,   -   .   /   :   =   ?
+		// ' (  )   +   ,   -   .   /   :   =   ?
 			39,
 			40,
 			41,
@@ -1547,7 +1564,7 @@ protected function prepQuotedPrintable($str)
 			58,
 			61,
 			63,
-			// numbers
+		// numbers
 			48,
 			49,
 			50,
@@ -1558,7 +1575,7 @@ protected function prepQuotedPrintable($str)
 			55,
 			56,
 			57,
-			// upper-case letters
+		// upper-case letters
 			65,
 			66,
 			67,
@@ -1585,7 +1602,7 @@ protected function prepQuotedPrintable($str)
 			88,
 			89,
 			90,
-			// lower-case letters
+		// lower-case letters
 			97,
 			98,
 			99,
@@ -1656,9 +1673,9 @@ protected function prepQuotedPrintable($str)
 				// Convert spaces and tabs but only if it's the end of the line
 				if ($ascii === 32 || $ascii === 9)
 				{
-					if ($i === ($length-1))
+					if ($i === ($length - 1))
 					{
-						$char = $escape.sprintf('%02s', dechex($ascii));
+						$char = $escape . sprintf('%02s', dechex($ascii));
 					}
 				}
 				// DO NOT move this below the $ascii_safe_chars line!
@@ -1667,19 +1684,19 @@ protected function prepQuotedPrintable($str)
 				// as they are the encoding delimiter!
 				elseif ($ascii === 61)
 				{
-					$char = $escape.strtoupper(sprintf('%02s', dechex($ascii)));  // =3D
+					$char = $escape . strtoupper(sprintf('%02s', dechex($ascii)));  // =3D
 				}
 				elseif (! in_array($ascii, $ascii_safe_chars, true))
 				{
-					$char = $escape.strtoupper(sprintf('%02s', dechex($ascii)));
+					$char = $escape . strtoupper(sprintf('%02s', dechex($ascii)));
 				}
 
 				// If we're at the character limit, add the line to the output,
 				// reset our temp variable, and keep on chuggin'
-				if ((self::strlen($temp)+self::strlen($char)) >= 76)
+				if ((self::strlen($temp) + self::strlen($char)) >= 76)
 				{
-					$output .= $temp.$escape.$this->CRLF;
-					$temp   = '';
+					$output .= $temp . $escape . $this->CRLF;
+					$temp    = '';
 				}
 
 				// Add the character to our temporary line
@@ -1687,11 +1704,11 @@ protected function prepQuotedPrintable($str)
 			}
 
 			// Add our completed line to the output
-			$output .= $temp.$this->CRLF;
+			$output .= $temp . $this->CRLF;
 		}
 
 		// get rid of extra CRLF tacked onto the end
-		return self::substr($output, 0, self::strlen($this->CRLF)*-1);
+		return self::substr($output, 0, self::strlen($this->CRLF) * -1);
 	}
 
 	//--------------------------------------------------------------------
@@ -1718,27 +1735,28 @@ protected function prepQEncoding($str)
 			//       re-add it! -- Narf
 			if (extension_loaded('iconv'))
 			{
-				$output = @iconv_mime_encode('', $str,
+				$output = @iconv_mime_encode(
+					'', $str,
 					[
 						'scheme'           => 'Q',
 						'line-length'      => 76,
 						'input-charset'    => $this->charset,
 						'output-charset'   => $this->charset,
 						'line-break-chars' => $this->CRLF,
-					]
-				);
+					]);
 
 				// There are reports that iconv_mime_encode() might fail and return FALSE
 				if ($output !== false)
 				{
-					// iconv_mime_encode() will always put a header field name.
-					// We've passed it an empty one, but it still prepends our
-					// encoded string with ': ', so we need to strip it.
-					return self::substr($output, 2);
+						  // iconv_mime_encode() will always put a header field name.
+						  // We've passed it an empty one, but it still prepends our
+						  // encoded string with ': ', so we need to strip it.
+						  return self::substr($output, 2);
 				}
 
 				$chars = iconv_strlen($str, 'UTF-8');
-			} elseif (extension_loaded('mbstring'))
+			}
+			elseif (extension_loaded('mbstring'))
 			{
 				$chars = mb_strlen($str, 'UTF-8');
 			}
@@ -1747,21 +1765,22 @@ protected function prepQEncoding($str)
 		// We might already have this set for UTF-8
 		isset($chars) || $chars = self::strlen($str);
 
-		$output = '=?'.$this->charset.'?Q?';
+		$output = '=?' . $this->charset . '?Q?';
 		for ($i = 0, $length = self::strlen($output); $i < $chars; $i++)
 		{
 			$chr = ($this->charset === 'UTF-8' && ICONV_ENABLED === true)
-				? '='.implode('=', str_split(strtoupper(bin2hex(iconv_substr($str, $i, 1, $this->charset))), 2))
-				: '='.strtoupper(bin2hex($str[$i]));
+			? '=' . implode('=', str_split(strtoupper(bin2hex(iconv_substr($str, $i, 1, $this->charset))), 2))
+			: '=' . strtoupper(bin2hex($str[$i]));
 
 			// RFC 2045 sets a limit of 76 characters per line.
 			// We'll append ?= to the end of each line though.
-			if ($length+($l = self::strlen($chr)) > 74)
+			if ($length + ($l = self::strlen($chr)) > 74)
 			{
-				$output .= '?='.$this->CRLF // EOL
-				           .' =?'.$this->charset.'?Q?'.$chr; // New line
-				$length = 6+self::strlen($this->charset)+$l; // Reset the length for the new line
-			} else
+				$output .= '?=' . $this->CRLF // EOL
+				  . ' =?' . $this->charset . '?Q?' . $chr; // New line
+				$length  = 6 + self::strlen($this->charset) + $l; // Reset the length for the new line
+			}
+			else
 			{
 				$output .= $chr;
 				$length += $l;
@@ -1769,7 +1788,7 @@ protected function prepQEncoding($str)
 		}
 
 		// End the header
-		return $output.'?=';
+		return $output . '?=';
 	}
 
 	//--------------------------------------------------------------------
@@ -1777,9 +1796,9 @@ protected function prepQEncoding($str)
 	/**
 	 * Send Email
 	 *
-	 * @param bool $autoClear
+	 * @param boolean $autoClear
 	 *
-	 * @return bool
+	 * @return boolean
 	 */
 	public function send($autoClear = true)
 	{
@@ -1801,9 +1820,10 @@ public function send($autoClear = true)
 		}
 
 		if (empty($this->recipients) && ! isset($this->headers['To'])
-		    && empty($this->BCCArray)
-		    && ! isset($this->headers['Bcc'])
-		    && ! isset($this->headers['Cc']))
+			&& empty($this->BCCArray)
+			&& ! isset($this->headers['Bcc'])
+			&& ! isset($this->headers['Cc'])
+		)
 		{
 			$this->setErrorMessage(lang('Email.noRecipients'));
 
@@ -1842,7 +1862,7 @@ public function send($autoClear = true)
 	 */
 	public function batchBCCSend()
 	{
-		$float = $this->BCCBatchSize-1;
+		$float = $this->BCCBatchSize - 1;
 		$set   = '';
 		$chunk = [];
 
@@ -1850,17 +1870,17 @@ public function batchBCCSend()
 		{
 			if (isset($this->BCCArray[$i]))
 			{
-				$set .= ', '.$this->BCCArray[$i];
+				$set .= ', ' . $this->BCCArray[$i];
 			}
 
 			if ($i === $float)
 			{
 				$chunk[] = self::substr($set, 1);
-				$float   += $this->BCCBatchSize;
+				$float  += $this->BCCBatchSize;
 				$set     = '';
 			}
 
-			if ($i === $c-1)
+			if ($i === $c - 1)
 			{
 				$chunk[] = self::substr($set, 1);
 			}
@@ -1893,8 +1913,13 @@ public function batchBCCSend()
 	 */
 	protected function unwrapSpecials()
 	{
-		$this->finalBody = preg_replace_callback('/\{unwrap\}(.*?)\{\/unwrap\}/si', [$this, 'removeNLCallback'],
-			$this->finalBody);
+		$this->finalBody = preg_replace_callback(
+			'/\{unwrap\}(.*?)\{\/unwrap\}/si', [
+				$this,
+				'removeNLCallback',
+			],
+			$this->finalBody
+		);
 	}
 
 	//--------------------------------------------------------------------
@@ -1921,26 +1946,27 @@ protected function removeNLCallback($matches)
 	/**
 	 * Spool mail to the mail server
 	 *
-	 * @return bool
+	 * @return boolean
 	 */
 	protected function spoolEmail()
 	{
 		$this->unwrapSpecials();
 
 		$protocol = $this->getProtocol();
-		$method   = 'sendWith'.ucfirst($protocol);
+		$method   = 'sendWith' . ucfirst($protocol);
 		try
 		{
 			$success = $this->$method();
-		} catch(\ErrorException $e)
+		}
+		catch (\ErrorException $e)
 		{
 			$success = false;
-			$this->logger->error('Email: '.$method.' throwed '.$e->getMessage());
+			$this->logger->error('Email: ' . $method . ' throwed ' . $e->getMessage());
 		}
 
 		if (! $success)
 		{
-			$this->setErrorMessage(lang('Email.sendFailure'.($protocol === 'mail' ? 'PHPMail' : ucfirst($protocol))));
+			$this->setErrorMessage(lang('Email.sendFailure' . ($protocol === 'mail' ? 'PHPMail' : ucfirst($protocol))));
 			return false;
 		}
 
@@ -1957,26 +1983,28 @@ protected function spoolEmail()
 	 * Applies stricter, shell-safe validation to email addresses.
 	 * Introduced to prevent RCE via sendmail's -f option.
 	 *
-	 * @see        https://github.com/bcit-ci/CodeIgniter/issues/4963
-	 * @see        https://gist.github.com/Zenexer/40d02da5e07f151adeaeeaa11af9ab36
-	 * @license    https://creativecommons.org/publicdomain/zero/1.0/	CC0 1.0, Public Domain
+	 * @see     https://github.com/codeigniter4/CodeIgniter/issues/4963
+	 * @see     https://gist.github.com/Zenexer/40d02da5e07f151adeaeeaa11af9ab36
+	 * @license https://creativecommons.org/publicdomain/zero/1.0/    CC0 1.0, Public Domain
 	 *
 	 * Credits for the base concept go to Paul Buonopane <paul@namepros.com>
 	 *
 	 * @param string &$email
 	 *
-	 * @return bool
+	 * @return boolean
 	 */
 	protected function validateEmailForShell(&$email)
 	{
 		if (function_exists('idn_to_ascii') && $atpos = strpos($email, '@'))
 		{
-			$email = self::substr($email, 0, ++$atpos).idn_to_ascii(self::substr($email, $atpos), 0,
-					INTL_IDNA_VARIANT_UTS46);
+			$email = self::substr($email, 0, ++$atpos) . idn_to_ascii(
+				self::substr($email, $atpos), 0,
+				INTL_IDNA_VARIANT_UTS46
+			);
 		}
 
 		return (filter_var($email, FILTER_VALIDATE_EMAIL) === $email
-		        && preg_match('#\A[a-z0-9._+-]+@[a-z0-9.-]{1,253}\z#i', $email));
+		&& preg_match('#\A[a-z0-9._+-]+@[a-z0-9.-]{1,253}\z#i', $email));
 	}
 
 	//--------------------------------------------------------------------
@@ -1984,7 +2012,7 @@ protected function validateEmailForShell(&$email)
 	/**
 	 * Send using mail()
 	 *
-	 * @return bool
+	 * @return boolean
 	 */
 	protected function sendWithMail()
 	{
@@ -2004,7 +2032,7 @@ protected function sendWithMail()
 
 		// most documentation of sendmail using the "-f" flag lacks a space after it, however
 		// we've encountered servers that seem to require it to be in place.
-		return mail($this->recipients, $this->subject, $this->finalBody, $this->headerStr, '-f '.$from);
+		return mail($this->recipients, $this->subject, $this->finalBody, $this->headerStr, '-f ' . $from);
 	}
 
 	//--------------------------------------------------------------------
@@ -2012,7 +2040,7 @@ protected function sendWithMail()
 	/**
 	 * Send using Sendmail
 	 *
-	 * @return bool
+	 * @return boolean
 	 */
 	protected function sendWithSendmail()
 	{
@@ -2021,7 +2049,7 @@ protected function sendWithSendmail()
 		$from = $this->cleanEmail($this->headers['From']);
 		if ($this->validateEmailForShell($from))
 		{
-			$from = '-f '.$from;
+			$from = '-f ' . $from;
 		}
 		else
 		{
@@ -2029,7 +2057,7 @@ protected function sendWithSendmail()
 		}
 
 		// is popen() enabled?
-		if (! function_usable('popen') || false === ($fp = @popen($this->mailPath.' -oi '.$from.' -t', 'w')))
+		if (! function_usable('popen') || false === ($fp = @popen($this->mailPath . ' -oi ' . $from . ' -t', 'w')))
 		{
 			// server probably has popen disabled, so nothing we can do to get a verbose error.
 			return false;
@@ -2056,7 +2084,7 @@ protected function sendWithSendmail()
 	/**
 	 * Send using SMTP
 	 *
-	 * @return bool
+	 * @return boolean
 	 */
 	protected function sendWithSmtp()
 	{
@@ -2117,7 +2145,7 @@ protected function sendWithSmtp()
 		}
 
 		// perform dot transformation on any lines that begin with a dot
-		$this->sendData($this->headerStr.preg_replace('/^\./m', '..$1', $this->finalBody));
+		$this->sendData($this->headerStr . preg_replace('/^\./m', '..$1', $this->finalBody));
 
 		$this->sendData('.');
 		$reply = $this->getSMTPData();
@@ -2164,7 +2192,7 @@ protected function SMTPConnect()
 		$ssl = ($this->SMTPCrypto === 'ssl') ? 'ssl://' : '';
 
 		$this->SMTPConnect = fsockopen(
-			$ssl.$this->SMTPHost,
+			$ssl . $this->SMTPHost,
 			$this->SMTPPort,
 			$errno,
 			$errstr,
@@ -2173,7 +2201,7 @@ protected function SMTPConnect()
 
 		if (! is_resource($this->SMTPConnect))
 		{
-			$this->setErrorMessage(lang('Email.SMTPError', [$errno.' '.$errstr]));
+			$this->setErrorMessage(lang('Email.SMTPError', [$errno . ' ' . $errstr]));
 
 			return false;
 		}
@@ -2207,7 +2235,7 @@ protected function SMTPConnect()
 	 * @param string $cmd
 	 * @param string $data
 	 *
-	 * @return bool
+	 * @return boolean
 	 */
 	protected function sendCommand($cmd, $data = '')
 	{
@@ -2216,51 +2244,51 @@ protected function sendCommand($cmd, $data = '')
 			case 'hello':
 				if ($this->SMTPAuth || $this->getEncoding() === '8bit')
 				{
-					$this->sendData('EHLO '.$this->getHostname());
+					  $this->sendData('EHLO ' . $this->getHostname());
 				}
 				else
 				{
-					$this->sendData('HELO '.$this->getHostname());
+					  $this->sendData('HELO ' . $this->getHostname());
 				}
 
 				$resp = 250;
-				break;
+			break;
 			case 'starttls':
 				$this->sendData('STARTTLS');
 				$resp = 220;
-				break;
+			break;
 			case 'from':
-				$this->sendData('MAIL FROM:<'.$data.'>');
+				$this->sendData('MAIL FROM:<' . $data . '>');
 				$resp = 250;
-				break;
+			break;
 			case 'to':
 				if ($this->DSN)
 				{
-					$this->sendData('RCPT TO:<'.$data.'> NOTIFY=SUCCESS,DELAY,FAILURE ORCPT=rfc822;'.$data);
+					  $this->sendData('RCPT TO:<' . $data . '> NOTIFY=SUCCESS,DELAY,FAILURE ORCPT=rfc822;' . $data);
 				}
 				else
 				{
-					$this->sendData('RCPT TO:<'.$data.'>');
+					  $this->sendData('RCPT TO:<' . $data . '>');
 				}
 				$resp = 250;
-				break;
+			break;
 			case 'data':
 				$this->sendData('DATA');
 				$resp = 354;
-				break;
+			break;
 			case 'reset':
 				$this->sendData('RSET');
 				$resp = 250;
-				break;
+			break;
 			case 'quit':
 				$this->sendData('QUIT');
 				$resp = 221;
-				break;
+			break;
 		}
 
 		$reply = $this->getSMTPData();
 
-		$this->debugMessage[] = '<pre>'.$cmd.': '.$reply.'</pre>';
+		$this->debugMessage[] = '<pre>' . $cmd . ': ' . $reply . '</pre>';
 
 		if ((int)self::substr($reply, 0, 3) !== $resp)
 		{
@@ -2282,7 +2310,7 @@ protected function sendCommand($cmd, $data = '')
 	/**
 	 * SMTP Authenticate
 	 *
-	 * @return bool
+	 * @return boolean
 	 */
 	protected function SMTPAuthenticate()
 	{
@@ -2347,7 +2375,7 @@ protected function SMTPAuthenticate()
 	 *
 	 * @param string $data
 	 *
-	 * @return bool
+	 * @return boolean
 	 */
 	protected function sendData($data)
 	{
@@ -2365,7 +2393,7 @@ protected function sendData($data)
 				{
 					$timestamp = time();
 				}
-				elseif ($timestamp < (time()-$this->SMTPTimeout))
+				elseif ($timestamp < (time() - $this->SMTPTimeout))
 				{
 					$result = false;
 					break;
@@ -2435,7 +2463,7 @@ protected function getHostname()
 			return $_SERVER['SERVER_NAME'];
 		}
 
-		return isset($_SERVER['SERVER_ADDR']) ? '['.$_SERVER['SERVER_ADDR'].']' : '[127.0.0.1]';
+		return isset($_SERVER['SERVER_ADDR']) ? '[' . $_SERVER['SERVER_ADDR'] . ']' : '[127.0.0.1]';
 	}
 
 	//--------------------------------------------------------------------
@@ -2453,14 +2481,14 @@ public function printDebugger($include = ['headers', 'subject', 'body'])
 		$msg = implode('', $this->debugMessage);
 
 		// Determine which parts of our raw data needs to be printed
-		$raw_data = '';
+		$raw_data                      = '';
 		is_array($include) || $include = [$include];
 
-		in_array('headers', $include, true) && $raw_data = htmlspecialchars($this->headerStr)."\n";
-		in_array('subject', $include, true) && $raw_data .= htmlspecialchars($this->subject)."\n";
-		in_array('body', $include, true) && $raw_data .= htmlspecialchars($this->finalBody);
+		in_array('headers', $include, true) && $raw_data  = htmlspecialchars($this->headerStr) . "\n";
+		in_array('subject', $include, true) && $raw_data .= htmlspecialchars($this->subject) . "\n";
+		in_array('body', $include, true) && $raw_data    .= htmlspecialchars($this->finalBody);
 
-		return $msg.($raw_data === '' ? '' : '<pre>'.$raw_data.'</pre>');
+		return $msg . ($raw_data === '' ? '' : '<pre>' . $raw_data . '</pre>');
 	}
 
 	//--------------------------------------------------------------------
@@ -2472,7 +2500,7 @@ public function printDebugger($include = ['headers', 'subject', 'body'])
 	 */
 	protected function setErrorMessage($msg)
 	{
-		$this->debugMessage[] = $msg.'<br />';
+		$this->debugMessage[] = $msg . '<br />';
 	}
 
 	//--------------------------------------------------------------------
@@ -2489,8 +2517,8 @@ protected function mimeTypes($ext = '')
 		$mime = Mimes::guessTypeFromExtension(strtolower($ext));
 
 		return ! empty($mime)
-			? $mime
-			: 'application/x-unknown-content-type';
+		? $mime
+		: 'application/x-unknown-content-type';
 	}
 
 	//--------------------------------------------------------------------
@@ -2510,13 +2538,13 @@ public function __destruct()
 	 *
 	 * @param string $str
 	 *
-	 * @return int
+	 * @return integer
 	 */
 	protected static function strlen($str)
 	{
 		return (self::$func_overload)
-			? mb_strlen($str, '8bit')
-			: strlen($str);
+		? mb_strlen($str, '8bit')
+		: strlen($str);
 	}
 
 	//--------------------------------------------------------------------
@@ -2524,9 +2552,9 @@ protected static function strlen($str)
 	/**
 	 * Byte-safe substr()
 	 *
-	 * @param string   $str
-	 * @param int      $start
-	 * @param int|null $length
+	 * @param string       $str
+	 * @param integer      $start
+	 * @param integer|null $length
 	 *
 	 * @return string
 	 */
@@ -2538,7 +2566,7 @@ protected static function substr($str, $start, $length = null)
 		}
 
 		return isset($length)
-			? substr($str, $start, $length)
-			: substr($str, $start);
+		? substr($str, $start, $length)
+		: substr($str, $start);
 	}
 }
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index f82824276cfb..18b43c6947ab 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -1,4 +1,5 @@
-<?php namespace CodeIgniter\Router;
+<?php
+namespace CodeIgniter\Router;
 
 use Tests\Support\Autoloader\MockFileLocator;
 use CodeIgniter\Router\Exceptions\RouterException;
@@ -8,21 +9,22 @@
  */
 class RouteCollectionTest extends \CIUnitTestCase
 {
+
 	public function tearDown()
 	{
 	}
 
 	//--------------------------------------------------------------------
 
-	protected function getCollector(array $config=[], array $files=[], $moduleConfig = null)
+	protected function getCollector(array $config = [], array $files = [], $moduleConfig = null)
 	{
 		$defaults = [
-			'Config'        => APPPATH.'Config',
-			'App'           => APPPATH,
+			'Config' => APPPATH . 'Config',
+			'App'    => APPPATH,
 		];
 		$config   = array_merge($config, $defaults);
 
-		$autoload = new \Config\Autoload();
+		$autoload       = new \Config\Autoload();
 		$autoload->psr4 = $config;
 
 		$loader = new MockFileLocator($autoload);
@@ -30,7 +32,7 @@ protected function getCollector(array $config=[], array $files=[], $moduleConfig
 
 		if ($moduleConfig === null)
 		{
-			$moduleConfig = new \Config\Modules();
+			$moduleConfig          = new \Config\Modules();
 			$moduleConfig->enabled = false;
 		}
 
@@ -107,22 +109,22 @@ public function testAddWorksWithCurrentHTTPMethods()
 
 	//--------------------------------------------------------------------
 
-    public function testAddWithLeadingSlash()
-    {
-        $routes = $this->getCollector();
+	public function testAddWithLeadingSlash()
+	{
+		$routes = $this->getCollector();
 
-        $routes->add('/home', 'controller');
+		$routes->add('/home', 'controller');
 
-        $expects = [
-            'home' => '\controller',
-        ];
+		$expects = [
+			'home' => '\controller',
+		];
 
-        $routes = $routes->getRoutes();
+		$routes = $routes->getRoutes();
 
-        $this->assertEquals($expects, $routes);
-    }
+		$this->assertEquals($expects, $routes);
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 	public function testMatchIgnoresInvalidHTTPMethods()
 	{
@@ -255,13 +257,14 @@ public function testGroupingWorks()
 	{
 		$routes = $this->getCollector();
 
-		$routes->group('admin', function($routes)
-		{
-			$routes->add('users/list', '\Users::list');
-		});
+		$routes->group(
+			'admin', function ($routes) {
+				$routes->add('users/list', '\Users::list');
+			}
+		);
 
 		$expected = [
-			'admin/users/list' => '\Users::list'
+			'admin/users/list' => '\Users::list',
 		];
 
 		$this->assertEquals($expected, $routes->getRoutes());
@@ -273,13 +276,14 @@ public function testGroupGetsSanitized()
 	{
 		$routes = $this->getCollector();
 
-		$routes->group('<script>admin', function($routes)
-		{
-			$routes->add('users/list', '\Users::list');
-		});
+		$routes->group(
+			'<script>admin', function ($routes) {
+				$routes->add('users/list', '\Users::list');
+			}
+		);
 
 		$expected = [
-				'admin/users/list' => '\Users::list'
+			'admin/users/list' => '\Users::list',
 		];
 
 		$this->assertEquals($expected, $routes->getRoutes());
@@ -291,13 +295,14 @@ public function testGroupSetsOptions()
 	{
 		$routes = $this->getCollector();
 
-		$routes->group('admin', ['namespace' => 'Admin'], function($routes)
-		{
-			$routes->add('users/list', 'Users::list');
-		});
+		$routes->group(
+			'admin', ['namespace' => 'Admin'], function ($routes) {
+				$routes->add('users/list', 'Users::list');
+			}
+		);
 
 		$expected = [
-			'admin/users/list' => '\Admin\Users::list'
+			'admin/users/list' => '\Admin\Users::list',
 		];
 
 		$this->assertEquals($expected, $routes->getRoutes());
@@ -315,7 +320,7 @@ public function testHostnameOption()
 		$routes->add('foo', 'bar', ['hostname' => 'foobar.com']);
 
 		$expected = [
-			'from' => '\to'
+			'from' => '\to',
 		];
 
 		$this->assertEquals($expected, $routes->getRoutes());
@@ -323,60 +328,58 @@ public function testHostnameOption()
 
 	//--------------------------------------------------------------------
 
-
-
 	public function testResourcesScaffoldsCorrectly()
 	{
 		$_SERVER['REQUEST_METHOD'] = 'GET';
-		$routes = $this->getCollector();
+		$routes                    = $this->getCollector();
 
 		$routes->resource('photos');
 
 		$expected = [
-			'photos' => '\Photos::index',
-			'photos/new' => '\Photos::new',
+			'photos'           => '\Photos::index',
+			'photos/new'       => '\Photos::new',
 			'photos/(.*)/edit' => '\Photos::edit/$1',
-			'photos/(.*)' => '\Photos::show/$1'
+			'photos/(.*)'      => '\Photos::show/$1',
 		];
 
 		$this->assertEquals($expected, $routes->getRoutes());
 
 		$_SERVER['REQUEST_METHOD'] = 'POST';
-		$routes = $this->getCollector();
+		$routes                    = $this->getCollector();
 		$routes->resource('photos');
 
 		$expected = [
-				'photos' => '\Photos::create'
+			'photos' => '\Photos::create',
 		];
 
 		$this->assertEquals($expected, $routes->getRoutes());
 
 		$_SERVER['REQUEST_METHOD'] = 'PUT';
-		$routes = $this->getCollector();
+		$routes                    = $this->getCollector();
 		$routes->resource('photos');
 
 		$expected = [
-				'photos/(.*)' => '\Photos::update/$1'
+			'photos/(.*)' => '\Photos::update/$1',
 		];
 
 		$this->assertEquals($expected, $routes->getRoutes());
 
 		$_SERVER['REQUEST_METHOD'] = 'PATCH';
-		$routes = $this->getCollector();
+		$routes                    = $this->getCollector();
 		$routes->resource('photos');
 
 		$expected = [
-				'photos/(.*)' => '\Photos::update/$1'
+			'photos/(.*)' => '\Photos::update/$1',
 		];
 
 		$this->assertEquals($expected, $routes->getRoutes());
 
 		$_SERVER['REQUEST_METHOD'] = 'DELETE';
-		$routes = $this->getCollector();
+		$routes                    = $this->getCollector();
 		$routes->resource('photos');
 
 		$expected = [
-				'photos/(.*)' => '\Photos::delete/$1'
+			'photos/(.*)' => '\Photos::delete/$1',
 		];
 
 		$this->assertEquals($expected, $routes->getRoutes());
@@ -387,15 +390,15 @@ public function testResourcesScaffoldsCorrectly()
 	public function testResourcesWithCustomController()
 	{
 		$_SERVER['REQUEST_METHOD'] = 'GET';
-		$routes = $this->getCollector();
+		$routes                    = $this->getCollector();
 
 		$routes->resource('photos', ['controller' => '<script>gallery']);
 
 		$expected = [
-				'photos' => '\Gallery::index',
-				'photos/new' => '\Gallery::new',
-				'photos/(.*)/edit' => '\Gallery::edit/$1',
-				'photos/(.*)' => '\Gallery::show/$1'
+			'photos'           => '\Gallery::index',
+			'photos/new'       => '\Gallery::new',
+			'photos/(.*)/edit' => '\Gallery::edit/$1',
+			'photos/(.*)'      => '\Gallery::show/$1',
 		];
 
 		$this->assertEquals($expected, $routes->getRoutes());
@@ -406,15 +409,15 @@ public function testResourcesWithCustomController()
 	public function testResourcesWithCustomPlaceholder()
 	{
 		$_SERVER['REQUEST_METHOD'] = 'GET';
-		$routes = $this->getCollector();
+		$routes                    = $this->getCollector();
 
 		$routes->resource('photos', ['placeholder' => ':num']);
 
 		$expected = [
-				'photos' => '\Photos::index',
-				'photos/new' => '\Photos::new',
-				'photos/([0-9]+)/edit' => '\Photos::edit/$1',
-				'photos/([0-9]+)' => '\Photos::show/$1'
+			'photos'               => '\Photos::index',
+			'photos/new'           => '\Photos::new',
+			'photos/([0-9]+)/edit' => '\Photos::edit/$1',
+			'photos/([0-9]+)'      => '\Photos::show/$1',
 		];
 
 		$this->assertEquals($expected, $routes->getRoutes());
@@ -425,12 +428,12 @@ public function testResourcesWithCustomPlaceholder()
 	public function testResourcesWithOnly()
 	{
 		$_SERVER['REQUEST_METHOD'] = 'GET';
-		$routes = $this->getCollector();
+		$routes                    = $this->getCollector();
 
 		$routes->resource('photos', ['only' => 'index']);
 
 		$expected = [
-			'photos' => '\Photos::index'
+			'photos' => '\Photos::index',
 		];
 
 		$this->assertEquals($expected, $routes->getRoutes());
@@ -441,13 +444,13 @@ public function testResourcesWithOnly()
 	public function testResourcesWithExcept()
 	{
 		$_SERVER['REQUEST_METHOD'] = 'GET';
-		$routes = $this->getCollector();
+		$routes                    = $this->getCollector();
 
 		$routes->resource('photos', ['except' => 'edit,new']);
 
 		$expected = [
-			'photos' => '\Photos::index',
-			'photos/(.*)' => '\Photos::show/$1'
+			'photos'      => '\Photos::index',
+			'photos/(.*)' => '\Photos::show/$1',
 		];
 
 		$this->assertEquals($expected, $routes->getRoutes());
@@ -458,7 +461,7 @@ public function testResourcesWithExcept()
 	public function testMatchSupportsMultipleMethods()
 	{
 		$_SERVER['REQUEST_METHOD'] = 'GET';
-		$routes = $this->getCollector();
+		$routes                    = $this->getCollector();
 
 		$expected = ['here' => '\there'];
 
@@ -466,7 +469,7 @@ public function testMatchSupportsMultipleMethods()
 		$this->assertEquals($expected, $routes->getRoutes());
 
 		$_SERVER['REQUEST_METHOD'] = 'POST';
-		$routes = $this->getCollector();
+		$routes                    = $this->getCollector();
 		$routes->match(['get', 'post'], 'here', 'there');
 		$this->assertEquals($expected, $routes->getRoutes());
 	}
@@ -476,7 +479,7 @@ public function testMatchSupportsMultipleMethods()
 	public function testGet()
 	{
 		$_SERVER['REQUEST_METHOD'] = 'GET';
-		$routes = $this->getCollector();
+		$routes                    = $this->getCollector();
 
 		$expected = ['here' => '\there'];
 
@@ -489,7 +492,7 @@ public function testGet()
 	public function testPost()
 	{
 		$_SERVER['REQUEST_METHOD'] = 'POST';
-		$routes = $this->getCollector();
+		$routes                    = $this->getCollector();
 
 		$expected = ['here' => '\there'];
 
@@ -502,7 +505,7 @@ public function testPost()
 	public function testGetDoesntAllowOtherMethods()
 	{
 		$_SERVER['REQUEST_METHOD'] = 'GET';
-		$routes = $this->getCollector();
+		$routes                    = $this->getCollector();
 
 		$expected = ['here' => '\there'];
 
@@ -516,7 +519,7 @@ public function testGetDoesntAllowOtherMethods()
 	public function testPut()
 	{
 		$_SERVER['REQUEST_METHOD'] = 'PUT';
-		$routes = $this->getCollector();
+		$routes                    = $this->getCollector();
 
 		$expected = ['here' => '\there'];
 
@@ -529,7 +532,7 @@ public function testPut()
 	public function testDelete()
 	{
 		$_SERVER['REQUEST_METHOD'] = 'DELETE';
-		$routes = $this->getCollector();
+		$routes                    = $this->getCollector();
 
 		$expected = ['here' => '\there'];
 
@@ -542,7 +545,7 @@ public function testDelete()
 	public function testHead()
 	{
 		$_SERVER['REQUEST_METHOD'] = 'HEAD';
-		$routes = $this->getCollector();
+		$routes                    = $this->getCollector();
 
 		$expected = ['here' => '\there'];
 
@@ -555,7 +558,7 @@ public function testHead()
 	public function testPatch()
 	{
 		$_SERVER['REQUEST_METHOD'] = 'PATCH';
-		$routes = $this->getCollector();
+		$routes                    = $this->getCollector();
 
 		$expected = ['here' => '\there'];
 
@@ -568,7 +571,7 @@ public function testPatch()
 	public function testOptions()
 	{
 		$_SERVER['REQUEST_METHOD'] = 'OPTIONS';
-		$routes = $this->getCollector();
+		$routes                    = $this->getCollector();
 
 		$expected = ['here' => '\there'];
 
@@ -595,19 +598,21 @@ public function testEnvironmentRestricts()
 		// ENVIRONMENT should be 'testing'
 
 		$_SERVER['REQUEST_METHOD'] = 'GET';
-		$routes = $this->getCollector();
+		$routes                    = $this->getCollector();
 
 		$expected = ['here' => '\there'];
 
-		$routes->environment('testing', function($routes)
-		{
-			$routes->get('here', 'there');
-		});
+		$routes->environment(
+			'testing', function ($routes) {
+				$routes->get('here', 'there');
+			}
+		);
 
-		$routes->environment('badenvironment', function($routes)
-		{
-			$routes->get('from', 'to');
-		});
+		$routes->environment(
+			'badenvironment', function ($routes) {
+				$routes->get('from', 'to');
+			}
+		);
 
 		$this->assertEquals($expected, $routes->getRoutes());
 	}
@@ -686,15 +691,21 @@ public function testNamedRoutesFillInParams()
 	//--------------------------------------------------------------------
 
 	/**
-	 * @see https://github.com/bcit-ci/CodeIgniter4/issues/642
+	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/642
 	 */
 	public function testNamedRoutesWithSameURIDifferentMethods()
 	{
 		$routes = $this->getCollector();
 
 		$routes->get('user/insert', 'myController::goto/$1/$2', ['as' => 'namedRoute1']);
-		$routes->post('user/insert', function() {}, ['as' => 'namedRoute2']);
-		$routes->put('user/insert', function() {}, ['as' => 'namedRoute3']);
+		$routes->post(
+			'user/insert', function () {
+			}, ['as' => 'namedRoute2']
+		);
+		$routes->put(
+			'user/insert', function () {
+			}, ['as' => 'namedRoute3']
+		);
 
 		$match1 = $routes->reverseRoute('namedRoute1');
 		$match2 = $routes->reverseRoute('namedRoute2');
@@ -718,7 +729,6 @@ public function testReverseRouteMatching()
 		$this->assertEquals('/test/1/2', $match);
 	}
 
-
 	public function testAddRedirect()
 	{
 		$routes = $this->getCollector();
@@ -726,7 +736,7 @@ public function testAddRedirect()
 		$routes->addRedirect('users', 'Users::index', 307);
 
 		$expected = [
-			'users' => '\Users::index'
+			'users' => '\Users::index',
 		];
 
 		$this->assertEquals($expected, $routes->getRoutes());
@@ -737,7 +747,7 @@ public function testAddRedirect()
 	//--------------------------------------------------------------------
 
 	/**
-	 * @see https://github.com/bcit-ci/CodeIgniter4/issues/497
+	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/497
 	 */
 	public function testWithSubdomain()
 	{
@@ -748,7 +758,7 @@ public function testWithSubdomain()
 		$routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'adm']);
 
 		$expects = [
-			'objects/([a-zA-Z0-9]+)' => '\Admin::objectsList/$1'
+			'objects/([a-zA-Z0-9]+)' => '\Admin::objectsList/$1',
 		];
 
 		$this->assertEquals($expects, $routes->getRoutes());
@@ -757,13 +767,16 @@ public function testWithSubdomain()
 	//--------------------------------------------------------------------
 
 	/**
-	 * @see https://github.com/bcit-ci/CodeIgniter4/issues/568
+	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/568
 	 */
 	public function testReverseRoutingWithClosure()
 	{
 		$routes = $this->getCollector();
 
-		$routes->add('login', function() {});
+		$routes->add(
+			'login', function () {
+			}
+		);
 
 		$match = $routes->reverseRoute('login');
 
@@ -775,10 +788,10 @@ public function testReverseRoutingWithClosure()
 	public function testWillDiscoverLocal()
 	{
 		$config = [
-			'SampleSpace' => TESTPATH .'_support'
+			'SampleSpace' => TESTPATH . '_support',
 		];
 
-		$moduleConfig = new \Config\Modules();
+		$moduleConfig          = new \Config\Modules();
 		$moduleConfig->enabled = true;
 
 		$routes = $this->getCollector($config, [], $moduleConfig);
@@ -794,10 +807,10 @@ public function testWillDiscoverLocal()
 	public function testDiscoverLocalAllowsConfigToOverridePackages()
 	{
 		$config = [
-			'SampleSpace' => TESTPATH .'_support'
+			'SampleSpace' => TESTPATH . '_support',
 		];
 
-		$moduleConfig = new \Config\Modules();
+		$moduleConfig          = new \Config\Modules();
 		$moduleConfig->enabled = true;
 
 		$routes = $this->getCollector($config, [], $moduleConfig);
@@ -816,7 +829,15 @@ public function testRoutesOptions()
 	{
 		$routes = $this->getCollector();
 
-		$routes->add('administrator', function() {}, ['as' => 'admin', 'foo' => 'baz']);
+		// options need to be declared separately, to not confuse PHPCBF
+		$options = [
+			'as'  => 'admin',
+			'foo' => 'baz',
+		];
+		$routes->add(
+			'administrator', function () {
+			}, $options
+		);
 
 		$options = $routes->getRoutesOptions('administrator');
 
@@ -826,30 +847,33 @@ public function testRoutesOptions()
 	public function testRouteGroupWithFilterSimple()
 	{
 		$_SERVER['REQUEST_METHOD'] = 'GET';
-		$routes = $this->getCollector();
+		$routes                    = $this->getCollector();
 
-		$routes->group('admin', ['filter' => 'role'], function($routes)
-		{
-			$routes->add('users', '\Users::list');
-		});
+		$routes->group(
+			'admin', ['filter' => 'role'], function ($routes) {
+				$routes->add('users', '\Users::list');
+			}
+		);
 
 		$this->assertTrue($routes->isFiltered('admin/users'));
-               $this->assertFalse($routes->isFiltered('admin/franky'));
-               $this->assertEquals('role', $routes->getFilterForRoute('admin/users'));
+		$this->assertFalse($routes->isFiltered('admin/franky'));
+		$this->assertEquals('role', $routes->getFilterForRoute('admin/users'));
 	}
 
 	public function testRouteGroupWithFilterWithParams()
 	{
 		$_SERVER['REQUEST_METHOD'] = 'GET';
-		$routes = $this->getCollector();
+		$routes                    = $this->getCollector();
 
-		$routes->group('admin', ['filter' => 'role:admin,manager'], function($routes)
-		{
-			$routes->add('users', '\Users::list');
-		});
+		$routes->group(
+			'admin', ['filter' => 'role:admin,manager'], function ($routes) {
+				$routes->add('users', '\Users::list');
+			}
+		);
 
 		$this->assertTrue($routes->isFiltered('admin/users'));
 		$this->assertFalse($routes->isFiltered('admin/franky'));
 		$this->assertEquals('role:admin,manager', $routes->getFilterForRoute('admin/users'));
 	}
+
 }
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index b34f35fe9e05..6a6bd201d497 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -1,4 +1,5 @@
-<?php namespace CodeIgniter\Router;
+<?php
+namespace CodeIgniter\Router;
 
 use Tests\Support\Autoloader\MockFileLocator;
 
@@ -12,6 +13,7 @@ class RouterTest extends \CIUnitTestCase
 
 	/**
 	 * vfsStream root directory
+	 *
 	 * @var
 	 */
 	protected $root;
@@ -20,22 +22,24 @@ public function setUp()
 	{
 		parent::setUp();
 
-		$moduleConfig = new \Config\Modules;
+		$moduleConfig          = new \Config\Modules;
 		$moduleConfig->enabled = false;
-		$this->collection = new RouteCollection(new MockFileLocator(new \Config\Autoload()), $moduleConfig);
+		$this->collection      = new RouteCollection(new MockFileLocator(new \Config\Autoload()), $moduleConfig);
 
 		$routes = [
-			'users'                        => 'Users::index',
-			'posts'                        => 'Blog::posts',
-			'pages'                        => 'App\Pages::list_all',
-			'posts/(:num)'                 => 'Blog::show/$1',
-			'posts/(:num)/edit'            => 'Blog::edit/$1',
-			'books/(:num)/(:alpha)/(:num)' => 'Blog::show/$3/$1',
-			'closure/(:num)/(:alpha)'      => function ($num, $str) { return $num.'-'.$str; },
-			'{locale}/pages'			   => 'App\Pages::list_all',
-			'Admin/Admins'		   		   => 'App\Admin\Admins::list_all',
-            '/some/slash'                  => 'App\Slash::index',
-			'objects/(:segment)/sort/(:segment)/([A-Z]{3,7})'   => 'AdminList::objectsSortCreate/$1/$2/$3'
+			'users'                                           => 'Users::index',
+			'posts'                                           => 'Blog::posts',
+			'pages'                                           => 'App\Pages::list_all',
+			'posts/(:num)'                                    => 'Blog::show/$1',
+			'posts/(:num)/edit'                               => 'Blog::edit/$1',
+			'books/(:num)/(:alpha)/(:num)'                    => 'Blog::show/$3/$1',
+			'closure/(:num)/(:alpha)'                         => function ($num, $str) {
+				return $num . '-' . $str;
+			},
+			'{locale}/pages'                                  => 'App\Pages::list_all',
+			'Admin/Admins'                                    => 'App\Admin\Admins::list_all',
+			'/some/slash'                                     => 'App\Slash::index',
+			'objects/(:segment)/sort/(:segment)/([A-Z]{3,7})' => 'AdminList::objectsSortCreate/$1/$2/$3',
 		];
 
 		$this->collection->map($routes);
@@ -134,7 +138,7 @@ public function testURIMapsParamsToBackReferencesWithUnused()
 	//--------------------------------------------------------------------
 
 	/**
-	 * @see https://github.com/bcit-ci/CodeIgniter4/issues/672
+	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/672
 	 */
 	public function testURIMapsParamsWithMany()
 	{
@@ -166,7 +170,7 @@ public function testClosures()
 
 	public function testAutoRouteFindsControllerWithFileAndMethod()
 	{
-	    $router = new Router($this->collection);
+		$router = new Router($this->collection);
 
 		$router->autoRoute('myController/someMethod');
 
@@ -192,11 +196,11 @@ public function testAutoRouteFindsControllerWithSubfolder()
 	{
 		$router = new Router($this->collection);
 
-		mkdir(APPPATH.'Controllers/Subfolder');
+		mkdir(APPPATH . 'Controllers/Subfolder');
 
 		$router->autoRoute('subfolder/myController/someMethod');
 
-		rmdir(APPPATH.'Controllers/Subfolder');
+		rmdir(APPPATH . 'Controllers/Subfolder');
 
 		$this->assertEquals('MyController', $router->controllerName());
 		$this->assertEquals('someMethod', $router->methodName());
@@ -206,7 +210,7 @@ public function testAutoRouteFindsControllerWithSubfolder()
 
 	public function testDetectsLocales()
 	{
-	    $router = new Router($this->collection);
+		$router = new Router($this->collection);
 
 		$router->handle('fr/pages');
 
@@ -228,35 +232,45 @@ public function testRouteResource()
 
 	//--------------------------------------------------------------------
 
-    public function testRouteWithLeadingSlash()
-    {
-        $router = new Router($this->collection);
-
-        $router->handle('some/slash');
+	public function testRouteWithLeadingSlash()
+	{
+		$router = new Router($this->collection);
 
-        $this->assertEquals('\App\Slash', $router->controllerName());
-        $this->assertEquals('index', $router->methodName());
-    }
+		$router->handle('some/slash');
 
-    //--------------------------------------------------------------------
+		$this->assertEquals('\App\Slash', $router->controllerName());
+		$this->assertEquals('index', $router->methodName());
+	}
 
-    public function testMatchedRouteOptions()
-    {
-    	$this->collection->add('foo', function() {}, ['as' => 'login', 'foo' => 'baz']);
-    	$this->collection->add('baz', function() {}, ['as' => 'admin', 'foo' => 'bar']);
+	//--------------------------------------------------------------------
+	// options need to be declared separately, to not confuse PHPCBF
+	public function testMatchedRouteOptions()
+	{
+		$optionsFoo = [
+			'as'  => 'login',
+			'foo' => 'baz',
+		];
+		$this->collection->add('foo', function () {
+		}, $optionsFoo);
+		$optionsBaz = [
+			'as'  => 'admin',
+			'foo' => 'bar',
+		];
+		$this->collection->add('baz', function () {
+		}, $optionsBaz);
 
-    	$router = new Router($this->collection);
+		$router = new Router($this->collection);
 
-    	$router->handle('foo');
+		$router->handle('foo');
 
-    	$this->assertEquals($router->getMatchedRouteOptions(), ['as' => 'login', 'foo' => 'baz']);
-    }
+		$this->assertEquals($router->getMatchedRouteOptions(), ['as' => 'login', 'foo' => 'baz']);
+	}
 
 	public function testRouteWorksWithFilters()
 	{
 		$collection = $this->collection;
 
-		$collection->group('foo', ['filter' => 'test'], function($routes) {
+		$collection->group('foo', ['filter' => 'test'], function ($routes) {
 			$routes->add('bar', 'TestController::foobar');
 		});
 
@@ -272,7 +286,7 @@ public function testRouteWorksWithFilters()
 	//--------------------------------------------------------------------
 
 	/**
-	 * @see https://github.com/bcit-ci/CodeIgniter4/issues/1240
+	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1240
 	 */
 	public function testMatchesCorrectlyWithMixedVerbs()
 	{
@@ -301,10 +315,11 @@ public function testMatchesCorrectlyWithMixedVerbs()
 		$this->assertEquals('\Pages', $router->controllerName());
 		$this->assertEquals('view', $router->methodName());
 	}
+
 	//--------------------------------------------------------------------
 
 	/**
-	 * @see https://github.com/bcit-ci/CodeIgniter4/issues/1354
+	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1354
 	 */
 	public function testRouteOrder()
 	{
@@ -318,6 +333,6 @@ public function testRouteOrder()
 		$router->handle('auth');
 		$this->assertEquals('\Main', $router->controllerName());
 		$this->assertEquals('auth_post', $router->methodName());
-
 	}
+
 }

From 1dc9b529a8227a2a9dd09361a87a12244d738f59 Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Thu, 8 Nov 2018 23:51:27 -0800
Subject: [PATCH 2/2] Change org name in spite of phpcbf

---
 system/Email/Email.php | 305 ++++++++++++++++++-----------------------
 1 file changed, 137 insertions(+), 168 deletions(-)

diff --git a/system/Email/Email.php b/system/Email/Email.php
index ce3587eef839..bd87e77bc148 100644
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@@ -1,4 +1,5 @@
-<?php namespace CodeIgniter\Email;
+<?php
+namespace CodeIgniter\Email;
 
 /**
  * CodeIgniter
@@ -53,7 +54,9 @@
  */
 class Email
 {
+
 	use LoggerAwareTrait;
+
 	/**
 	 * @var string
 	 */
@@ -751,20 +754,22 @@ public function attach($file, $disposition = '', $newname = null, $mime = '')
 		}
 		else
 		{
-			$fileContent =& $file; // buffered file
+			$fileContent = & $file; // buffered file
 		}
 
-		//        $this->attachments[] = [
-		//        'name'        => [
-		//        $file,
-		//        $newname,
-		//        ],
-		//        'disposition' => empty($disposition) ? 'attachment' : $disposition,
-		//        // Can also be 'inline'  Not sure if it matters
-		//        'type'        => $mime,
-		//        'content'     => chunk_split(base64_encode($fileContent)),
-		//        'multipart'   => 'mixed',
-		//        ];
+		// declare names on their own, to make phpcbf happy
+		$names               = [
+			$file,
+			$newname,
+		];
+		$this->attachments[] = [
+			'name'        => $names,
+			'disposition' => empty($disposition) ? 'attachment' : $disposition,
+			// Can also be 'inline'  Not sure if it matters
+			'type'        => $mime,
+			'content'     => chunk_split(base64_encode($fileContent)),
+			'multipart'   => 'mixed',
+		];
 
 		return $this;
 	}
@@ -782,7 +787,7 @@ public function attach($file, $disposition = '', $newname = null, $mime = '')
 	 */
 	public function setAttachmentCID($filename)
 	{
-		for ($i = 0, $c = count($this->attachments); $i < $c; $i++)
+		for ($i = 0, $c = count($this->attachments); $i < $c; $i ++)
 		{
 			if ($this->attachments[$i]['name'][0] === $filename)
 			{
@@ -826,9 +831,7 @@ protected function stringToArray($email)
 	{
 		if (! is_array($email))
 		{
-			return (strpos($email, ',') !== false)
-			? preg_split('/[\s,]/', $email, -1, PREG_SPLIT_NO_EMPTY)
-			: (array)trim($email);
+			return (strpos($email, ',') !== false) ? preg_split('/[\s,]/', $email, -1, PREG_SPLIT_NO_EMPTY) : (array) trim($email);
 		}
 
 		return $email;
@@ -845,7 +848,7 @@ protected function stringToArray($email)
 	 */
 	public function setAltMessage($str)
 	{
-		$this->altMessage = (string)$str;
+		$this->altMessage = (string) $str;
 
 		return $this;
 	}
@@ -877,7 +880,7 @@ public function setMailType($type = 'text')
 	 */
 	public function setWordWrap($wordWrap = true)
 	{
-		$this->wordWrap = (bool)$wordWrap;
+		$this->wordWrap = (bool) $wordWrap;
 
 		return $this;
 	}
@@ -909,7 +912,7 @@ public function setProtocol($protocol = 'mail')
 	 */
 	public function setPriority($n = 3)
 	{
-		$this->priority = preg_match('/^[1-5]$/', $n) ? (int)$n : 3;
+		$this->priority = preg_match('/^[1-5]$/', $n) ? (int) $n : 3;
 
 		return $this;
 	}
@@ -1093,13 +1096,12 @@ public function isValidEmail($email)
 	{
 		if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && $atpos = strpos($email, '@'))
 		{
-			$email = self::substr($email, 0, ++$atpos) . idn_to_ascii(
-				self::substr($email, $atpos), 0,
-				INTL_IDNA_VARIANT_UTS46
+			$email = self::substr($email, 0, ++ $atpos) . idn_to_ascii(
+							self::substr($email, $atpos), 0, INTL_IDNA_VARIANT_UTS46
 			);
 		}
 
-		return (bool)filter_var($email, FILTER_VALIDATE_EMAIL);
+		return (bool) filter_var($email, FILTER_VALIDATE_EMAIL);
 	}
 
 	//--------------------------------------------------------------------
@@ -1144,15 +1146,13 @@ protected function getAltMessage()
 	{
 		if (! empty($this->altMessage))
 		{
-			return ($this->wordWrap)
-			? $this->wordWrap($this->altMessage, 76)
-			: $this->altMessage;
+			return ($this->wordWrap) ? $this->wordWrap($this->altMessage, 76) : $this->altMessage;
 		}
 
 		$body = preg_match('/\<body.*?\>(.*)\<\/body\>/si', $this->body, $match) ? $match[1] : $this->body;
 		$body = str_replace("\t", '', preg_replace('#<!--(.*)--\>#', '', trim(strip_tags($body))));
 
-		for ($i = 20; $i >= 3; $i--)
+		for ($i = 20; $i >= 3; $i --)
 		{
 			$body = str_replace(str_repeat("\n", $i), "\n\n", $body);
 		}
@@ -1160,9 +1160,7 @@ protected function getAltMessage()
 		// Reduce multiple spaces
 		$body = preg_replace('| +|', ' ', $body);
 
-		return ($this->wordWrap)
-		? $this->wordWrap($body, 76)
-		: $body;
+		return ($this->wordWrap) ? $this->wordWrap($body, 76) : $body;
 	}
 
 	//--------------------------------------------------------------------
@@ -1197,7 +1195,7 @@ public function wordWrap($str, $charlim = null)
 		$unwrap = [];
 		if (preg_match_all('|\{unwrap\}(.+?)\{/unwrap\}|s', $str, $matches))
 		{
-			for ($i = 0, $c = count($matches[0]); $i < $c; $i++)
+			for ($i = 0, $c = count($matches[0]); $i < $c; $i ++)
 			{
 				$unwrap[] = $matches[1][$i];
 				$str      = str_replace($matches[0][$i], '{{unwrapped' . $i . '}}', $str);
@@ -1330,61 +1328,59 @@ protected function buildMessage()
 			case 'plain':
 
 				$hdr .= 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
-				. 'Content-Transfer-Encoding: ' . $this->getEncoding();
+						. 'Content-Transfer-Encoding: ' . $this->getEncoding();
 
 				if ($this->getProtocol() === 'mail')
 				{
-					  $this->headerStr .= $hdr;
-					  $this->finalBody  = $this->body;
+					$this->headerStr .= $hdr;
+					$this->finalBody  = $this->body;
 				}
 				else
 				{
-					  $this->finalBody = $hdr . $this->newline . $this->newline . $this->body;
+					$this->finalBody = $hdr . $this->newline . $this->newline . $this->body;
 				}
 
-			return;
+				return;
 
 			case 'html':
 
 				if ($this->sendMultipart === false)
 				{
-					  $hdr .= 'Content-Type: text/html; charset=' . $this->charset . $this->newline
-					. 'Content-Transfer-Encoding: quoted-printable';
+					$hdr .= 'Content-Type: text/html; charset=' . $this->charset . $this->newline
+							. 'Content-Transfer-Encoding: quoted-printable';
 				}
 				else
 				{
-					  $boundary = uniqid('B_ALT_', true);
-					  $hdr     .= 'Content-Type: multipart/alternative; boundary="' . $boundary . '"';
-
-					  $body .= $this->getMimeMessage() . $this->newline . $this->newline
-					 . '--' . $boundary . $this->newline
-
-					 . 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
-					 . 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline . $this->newline
-					 . $this->getAltMessage() . $this->newline . $this->newline
-					 . '--' . $boundary . $this->newline
-
-					 . 'Content-Type: text/html; charset=' . $this->charset . $this->newline
-					 . 'Content-Transfer-Encoding: quoted-printable' . $this->newline . $this->newline;
+					$boundary = uniqid('B_ALT_', true);
+					$hdr     .= 'Content-Type: multipart/alternative; boundary="' . $boundary . '"';
+
+					$body .= $this->getMimeMessage() . $this->newline . $this->newline
+							. '--' . $boundary . $this->newline
+							. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+							. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline . $this->newline
+							. $this->getAltMessage() . $this->newline . $this->newline
+							. '--' . $boundary . $this->newline
+							. 'Content-Type: text/html; charset=' . $this->charset . $this->newline
+							. 'Content-Transfer-Encoding: quoted-printable' . $this->newline . $this->newline;
 				}
 
 				$this->finalBody = $body . $this->prepQuotedPrintable($this->body) . $this->newline . $this->newline;
 
 				if ($this->getProtocol() === 'mail')
 				{
-					  $this->headerStr .= $hdr;
+					$this->headerStr .= $hdr;
 				}
 				else
 				{
-					  $this->finalBody = $hdr . $this->newline . $this->newline . $this->finalBody;
+					$this->finalBody = $hdr . $this->newline . $this->newline . $this->finalBody;
 				}
 
 				if ($this->sendMultipart !== false)
 				{
-					  $this->finalBody .= '--' . $boundary . '--';
+					$this->finalBody .= '--' . $boundary . '--';
 				}
 
-			return;
+				return;
 
 			case 'plain-attach':
 
@@ -1393,20 +1389,20 @@ protected function buildMessage()
 
 				if ($this->getProtocol() === 'mail')
 				{
-					  $this->headerStr .= $hdr;
+					$this->headerStr .= $hdr;
 				}
 
 				$body .= $this->getMimeMessage() . $this->newline
-				. $this->newline
-				. '--' . $boundary . $this->newline
-				. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
-				. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline
-				. $this->newline
-				. $this->body . $this->newline . $this->newline;
+						. $this->newline
+						. '--' . $boundary . $this->newline
+						. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+						. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline
+						. $this->newline
+						. $this->body . $this->newline . $this->newline;
 
 				$this->appendAttachments($body, $boundary);
 
-			break;
+				break;
 			case 'html-attach':
 
 				$alt_boundary  = uniqid('B_ALT_', true);
@@ -1414,15 +1410,15 @@ protected function buildMessage()
 
 				if ($this->attachmentsHaveMultipart('mixed'))
 				{
-					  $atc_boundary  = uniqid('B_ATC_', true);
-					  $hdr          .= 'Content-Type: multipart/mixed; boundary="' . $atc_boundary . '"';
-					  $last_boundary = $atc_boundary;
+					$atc_boundary  = uniqid('B_ATC_', true);
+					$hdr          .= 'Content-Type: multipart/mixed; boundary="' . $atc_boundary . '"';
+					$last_boundary = $atc_boundary;
 				}
 
 				if ($this->attachmentsHaveMultipart('related'))
 				{
-					  $rel_boundary        = uniqid('B_REL_', true);
-					  $rel_boundary_header = 'Content-Type: multipart/related; boundary="' . $rel_boundary . '"';
+					$rel_boundary        = uniqid('B_REL_', true);
+					$rel_boundary_header = 'Content-Type: multipart/related; boundary="' . $rel_boundary . '"';
 
 					if (isset($last_boundary))
 					{
@@ -1438,46 +1434,40 @@ protected function buildMessage()
 
 				if ($this->getProtocol() === 'mail')
 				{
-					  $this->headerStr .= $hdr;
+					$this->headerStr .= $hdr;
 				}
 
 				self::strlen($body) && $body .= $this->newline . $this->newline;
 				$body                        .= $this->getMimeMessage() . $this->newline . $this->newline
-				. '--' . $last_boundary . $this->newline
-
-				. 'Content-Type: multipart/alternative; boundary="' . $alt_boundary . '"' . $this->newline . $this->newline
-				. '--' . $alt_boundary . $this->newline
-
-				. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
-				. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline . $this->newline
-				. $this->getAltMessage() . $this->newline . $this->newline
-				. '--' . $alt_boundary . $this->newline
-
-				. 'Content-Type: text/html; charset=' . $this->charset . $this->newline
-				. 'Content-Transfer-Encoding: quoted-printable' . $this->newline . $this->newline
-
-				. $this->prepQuotedPrintable($this->body) . $this->newline . $this->newline
-				. '--' . $alt_boundary . '--' . $this->newline . $this->newline;
+						. '--' . $last_boundary . $this->newline
+						. 'Content-Type: multipart/alternative; boundary="' . $alt_boundary . '"' . $this->newline . $this->newline
+						. '--' . $alt_boundary . $this->newline
+						. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+						. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline . $this->newline
+						. $this->getAltMessage() . $this->newline . $this->newline
+						. '--' . $alt_boundary . $this->newline
+						. 'Content-Type: text/html; charset=' . $this->charset . $this->newline
+						. 'Content-Transfer-Encoding: quoted-printable' . $this->newline . $this->newline
+						. $this->prepQuotedPrintable($this->body) . $this->newline . $this->newline
+						. '--' . $alt_boundary . '--' . $this->newline . $this->newline;
 
 				if (! empty($rel_boundary))
 				{
-					  $body .= $this->newline . $this->newline;
-					  $this->appendAttachments($body, $rel_boundary, 'related');
+					$body .= $this->newline . $this->newline;
+					$this->appendAttachments($body, $rel_boundary, 'related');
 				}
 
 				// multipart/mixed attachments
 				if (! empty($atc_boundary))
 				{
-					  $body .= $this->newline . $this->newline;
-					  $this->appendAttachments($body, $atc_boundary, 'mixed');
+					$body .= $this->newline . $this->newline;
+					$this->appendAttachments($body, $atc_boundary, 'mixed');
 				}
 
-			break;
+				break;
 		}
 
-		$this->finalBody = ($this->getProtocol() === 'mail')
-		? $body
-		: $hdr . $this->newline . $this->newline . $body;
+		$this->finalBody = ($this->getProtocol() === 'mail') ? $body : $hdr . $this->newline . $this->newline . $body;
 	}
 
 	//--------------------------------------------------------------------
@@ -1508,25 +1498,22 @@ protected function attachmentsHaveMultipart($type)
 	 */
 	protected function appendAttachments(&$body, $boundary, $multipart = null)
 	{
-		for ($i = 0, $c = count($this->attachments); $i < $c; $i++)
+		for ($i = 0, $c = count($this->attachments); $i < $c; $i ++)
 		{
 			if (isset($multipart) && $this->attachments[$i]['multipart'] !== $multipart)
 			{
 				continue;
 			}
 
-			$name = isset($this->attachments[$i]['name'][1])
-			? $this->attachments[$i]['name'][1]
-			: basename($this->attachments[$i]['name'][0]);
+			$name = isset($this->attachments[$i]['name'][1]) ? $this->attachments[$i]['name'][1] : basename($this->attachments[$i]['name'][0]);
 
 			$body .= '--' . $boundary . $this->newline
-			. 'Content-Type: ' . $this->attachments[$i]['type'] . '; name="' . $name . '"' . $this->newline
-			. 'Content-Disposition: ' . $this->attachments[$i]['disposition'] . ';' . $this->newline
-			. 'Content-Transfer-Encoding: base64' . $this->newline
-			. (empty($this->attachments[$i]['cid']) ? ''
-			: 'Content-ID: <' . $this->attachments[$i]['cid'] . '>' . $this->newline)
-			. $this->newline
-			. $this->attachments[$i]['content'] . $this->newline;
+					. 'Content-Type: ' . $this->attachments[$i]['type'] . '; name="' . $name . '"' . $this->newline
+					. 'Content-Disposition: ' . $this->attachments[$i]['disposition'] . ';' . $this->newline
+					. 'Content-Transfer-Encoding: base64' . $this->newline
+					. (empty($this->attachments[$i]['cid']) ? '' : 'Content-ID: <' . $this->attachments[$i]['cid'] . '>' . $this->newline)
+					. $this->newline
+					. $this->attachments[$i]['content'] . $this->newline;
 		}
 
 		// $name won't be set if no attachments were appended,
@@ -1552,7 +1539,7 @@ protected function prepQuotedPrintable($str)
 		// used literally, without encoding, as described in RFC 2049.
 		// http://www.ietf.org/rfc/rfc2049.txt
 		static $ascii_safe_chars = [
-		// ' (  )   +   ,   -   .   /   :   =   ?
+			// ' (  )   +   ,   -   .   /   :   =   ?
 			39,
 			40,
 			41,
@@ -1564,7 +1551,7 @@ protected function prepQuotedPrintable($str)
 			58,
 			61,
 			63,
-		// numbers
+			// numbers
 			48,
 			49,
 			50,
@@ -1575,7 +1562,7 @@ protected function prepQuotedPrintable($str)
 			55,
 			56,
 			57,
-		// upper-case letters
+			// upper-case letters
 			65,
 			66,
 			67,
@@ -1602,7 +1589,7 @@ protected function prepQuotedPrintable($str)
 			88,
 			89,
 			90,
-		// lower-case letters
+			// lower-case letters
 			97,
 			98,
 			99,
@@ -1664,7 +1651,7 @@ protected function prepQuotedPrintable($str)
 			// Loop through each character in the line to add soft-wrap
 			// characters at the end of a line " =\r\n" and add the newly
 			// processed line(s) to the output (see comment on $crlf class property)
-			for ($i = 0; $i < $length; $i++)
+			for ($i = 0; $i < $length; $i ++)
 			{
 				// Grab the next character
 				$char  = $line[$i];
@@ -1736,22 +1723,21 @@ protected function prepQEncoding($str)
 			if (extension_loaded('iconv'))
 			{
 				$output = @iconv_mime_encode(
-					'', $str,
-					[
-						'scheme'           => 'Q',
-						'line-length'      => 76,
-						'input-charset'    => $this->charset,
-						'output-charset'   => $this->charset,
-						'line-break-chars' => $this->CRLF,
-					]);
+								'', $str, [
+									'scheme'           => 'Q',
+									'line-length'      => 76,
+									'input-charset'    => $this->charset,
+									'output-charset'   => $this->charset,
+									'line-break-chars' => $this->CRLF,
+								]);
 
 				// There are reports that iconv_mime_encode() might fail and return FALSE
 				if ($output !== false)
 				{
-						  // iconv_mime_encode() will always put a header field name.
-						  // We've passed it an empty one, but it still prepends our
-						  // encoded string with ': ', so we need to strip it.
-						  return self::substr($output, 2);
+					// iconv_mime_encode() will always put a header field name.
+					// We've passed it an empty one, but it still prepends our
+					// encoded string with ': ', so we need to strip it.
+					return self::substr($output, 2);
 				}
 
 				$chars = iconv_strlen($str, 'UTF-8');
@@ -1766,18 +1752,16 @@ protected function prepQEncoding($str)
 		isset($chars) || $chars = self::strlen($str);
 
 		$output = '=?' . $this->charset . '?Q?';
-		for ($i = 0, $length = self::strlen($output); $i < $chars; $i++)
+		for ($i = 0, $length = self::strlen($output); $i < $chars; $i ++)
 		{
-			$chr = ($this->charset === 'UTF-8' && ICONV_ENABLED === true)
-			? '=' . implode('=', str_split(strtoupper(bin2hex(iconv_substr($str, $i, 1, $this->charset))), 2))
-			: '=' . strtoupper(bin2hex($str[$i]));
+			$chr = ($this->charset === 'UTF-8' && ICONV_ENABLED === true) ? '=' . implode('=', str_split(strtoupper(bin2hex(iconv_substr($str, $i, 1, $this->charset))), 2)) : '=' . strtoupper(bin2hex($str[$i]));
 
 			// RFC 2045 sets a limit of 76 characters per line.
 			// We'll append ?= to the end of each line though.
 			if ($length + ($l = self::strlen($chr)) > 74)
 			{
 				$output .= '?=' . $this->CRLF // EOL
-				  . ' =?' . $this->charset . '?Q?' . $chr; // New line
+						. ' =?' . $this->charset . '?Q?' . $chr; // New line
 				$length  = 6 + self::strlen($this->charset) + $l; // Reset the length for the new line
 			}
 			else
@@ -1819,10 +1803,7 @@ public function send($autoClear = true)
 			$this->setReplyTo($this->headers['From']);
 		}
 
-		if (empty($this->recipients) && ! isset($this->headers['To'])
-			&& empty($this->BCCArray)
-			&& ! isset($this->headers['Bcc'])
-			&& ! isset($this->headers['Cc'])
+		if (empty($this->recipients) && ! isset($this->headers['To']) && empty($this->BCCArray) && ! isset($this->headers['Bcc']) && ! isset($this->headers['Cc'])
 		)
 		{
 			$this->setErrorMessage(lang('Email.noRecipients'));
@@ -1866,7 +1847,7 @@ public function batchBCCSend()
 		$set   = '';
 		$chunk = [];
 
-		for ($i = 0, $c = count($this->BCCArray); $i < $c; $i++)
+		for ($i = 0, $c = count($this->BCCArray); $i < $c; $i ++)
 		{
 			if (isset($this->BCCArray[$i]))
 			{
@@ -1886,7 +1867,7 @@ public function batchBCCSend()
 			}
 		}
 
-		for ($i = 0, $c = count($chunk); $i < $c; $i++)
+		for ($i = 0, $c = count($chunk); $i < $c; $i ++)
 		{
 			unset($this->headers['Bcc']);
 
@@ -1914,11 +1895,10 @@ public function batchBCCSend()
 	protected function unwrapSpecials()
 	{
 		$this->finalBody = preg_replace_callback(
-			'/\{unwrap\}(.*?)\{\/unwrap\}/si', [
-				$this,
-				'removeNLCallback',
-			],
-			$this->finalBody
+				'/\{unwrap\}(.*?)\{\/unwrap\}/si', [
+					$this,
+					'removeNLCallback',
+				], $this->finalBody
 		);
 	}
 
@@ -1997,14 +1977,12 @@ protected function validateEmailForShell(&$email)
 	{
 		if (function_exists('idn_to_ascii') && $atpos = strpos($email, '@'))
 		{
-			$email = self::substr($email, 0, ++$atpos) . idn_to_ascii(
-				self::substr($email, $atpos), 0,
-				INTL_IDNA_VARIANT_UTS46
+			$email = self::substr($email, 0, ++ $atpos) . idn_to_ascii(
+							self::substr($email, $atpos), 0, INTL_IDNA_VARIANT_UTS46
 			);
 		}
 
-		return (filter_var($email, FILTER_VALIDATE_EMAIL) === $email
-		&& preg_match('#\A[a-z0-9._+-]+@[a-z0-9.-]{1,253}\z#i', $email));
+		return (filter_var($email, FILTER_VALIDATE_EMAIL) === $email && preg_match('#\A[a-z0-9._+-]+@[a-z0-9.-]{1,253}\z#i', $email));
 	}
 
 	//--------------------------------------------------------------------
@@ -2192,11 +2170,7 @@ protected function SMTPConnect()
 		$ssl = ($this->SMTPCrypto === 'ssl') ? 'ssl://' : '';
 
 		$this->SMTPConnect = fsockopen(
-			$ssl . $this->SMTPHost,
-			$this->SMTPPort,
-			$errno,
-			$errstr,
-			$this->SMTPTimeout
+				$ssl . $this->SMTPHost, $this->SMTPPort, $errno, $errstr, $this->SMTPTimeout
 		);
 
 		if (! is_resource($this->SMTPConnect))
@@ -2244,53 +2218,53 @@ protected function sendCommand($cmd, $data = '')
 			case 'hello':
 				if ($this->SMTPAuth || $this->getEncoding() === '8bit')
 				{
-					  $this->sendData('EHLO ' . $this->getHostname());
+					$this->sendData('EHLO ' . $this->getHostname());
 				}
 				else
 				{
-					  $this->sendData('HELO ' . $this->getHostname());
+					$this->sendData('HELO ' . $this->getHostname());
 				}
 
 				$resp = 250;
-			break;
+				break;
 			case 'starttls':
 				$this->sendData('STARTTLS');
 				$resp = 220;
-			break;
+				break;
 			case 'from':
 				$this->sendData('MAIL FROM:<' . $data . '>');
 				$resp = 250;
-			break;
+				break;
 			case 'to':
 				if ($this->DSN)
 				{
-					  $this->sendData('RCPT TO:<' . $data . '> NOTIFY=SUCCESS,DELAY,FAILURE ORCPT=rfc822;' . $data);
+					$this->sendData('RCPT TO:<' . $data . '> NOTIFY=SUCCESS,DELAY,FAILURE ORCPT=rfc822;' . $data);
 				}
 				else
 				{
-					  $this->sendData('RCPT TO:<' . $data . '>');
+					$this->sendData('RCPT TO:<' . $data . '>');
 				}
 				$resp = 250;
-			break;
+				break;
 			case 'data':
 				$this->sendData('DATA');
 				$resp = 354;
-			break;
+				break;
 			case 'reset':
 				$this->sendData('RSET');
 				$resp = 250;
-			break;
+				break;
 			case 'quit':
 				$this->sendData('QUIT');
 				$resp = 221;
-			break;
+				break;
 		}
 
 		$reply = $this->getSMTPData();
 
 		$this->debugMessage[] = '<pre>' . $cmd . ': ' . $reply . '</pre>';
 
-		if ((int)self::substr($reply, 0, 3) !== $resp)
+		if ((int) self::substr($reply, 0, 3) !== $resp)
 		{
 			$this->setErrorMessage(lang('Email.SMTPError', [$reply]));
 
@@ -2516,9 +2490,7 @@ protected function mimeTypes($ext = '')
 	{
 		$mime = Mimes::guessTypeFromExtension(strtolower($ext));
 
-		return ! empty($mime)
-		? $mime
-		: 'application/x-unknown-content-type';
+		return ! empty($mime) ? $mime : 'application/x-unknown-content-type';
 	}
 
 	//--------------------------------------------------------------------
@@ -2542,9 +2514,7 @@ public function __destruct()
 	 */
 	protected static function strlen($str)
 	{
-		return (self::$func_overload)
-		? mb_strlen($str, '8bit')
-		: strlen($str);
+		return (self::$func_overload) ? mb_strlen($str, '8bit') : strlen($str);
 	}
 
 	//--------------------------------------------------------------------
@@ -2565,8 +2535,7 @@ protected static function substr($str, $start, $length = null)
 			return mb_substr($str, $start, $length, '8bit');
 		}
 
-		return isset($length)
-		? substr($str, $start, $length)
-		: substr($str, $start);
+		return isset($length) ? substr($str, $start, $length) : substr($str, $start);
 	}
+
 }