Auto-fix CS

src/Controller/Component/UrlComponent.php

@@ -98,7 +98,7 @@ class UrlComponent extends Component {
 	public function defaults() {
 		return [
 			'prefix' => false,
-			'plugin' => false
+			'plugin' => false,
 		];
 	}
 

src/Model/Behavior/BitmaskedBehavior.php

@@ -44,7 +44,7 @@ class BitmaskedBehavior extends Behavior {
 		'on' => 'beforeMarshal', // or beforeRules or beforeSave
 		'defaultValue' => null, // NULL = auto (use empty string to trigger "notEmpty" rule for "default NOT NULL" db fields)
 		'implementedFinders' => [
-			'bits' => 'findBitmasked'
+			'bits' => 'findBitmasked',
 		],
 	];
 

src/Model/Behavior/JsonableBehavior.php

@@ -67,8 +67,8 @@ class JsonableBehavior extends Behavior {
 		'decodeParams' => [ // params for json_decode
 			'assoc' => true, // useful when working with multidimensional arrays
 			'depth' => 512,
-			'options' => 0
-		]
+			'options' => 0,
+		],
 	];
 
 	/**

src/Model/Behavior/PasswordableBehavior.php

@@ -67,14 +67,14 @@ class PasswordableBehavior extends Behavior {
 				'message' => ['valErrBetweenCharacters {0} {1}', PWD_MIN_LENGTH, PWD_MAX_LENGTH],
 				'last' => true,
 				//'provider' => 'table'
-			]
+			],
 		],
 		'formFieldRepeat' => [
 			'validateIdentical' => [
 				'rule' => ['validateIdentical', ['compare' => 'formField']],
 				'message' => 'valErrPwdNotMatch',
 				'last' => true,
-				'provider' => 'table'
+				'provider' => 'table',
 			],
 		],
 		'formFieldCurrent' => [
@@ -87,8 +87,8 @@ class PasswordableBehavior extends Behavior {
 				'rule' => 'validateCurrentPwd',
 				'message' => 'valErrCurrentPwdIncorrect',
 				'last' => true,
-				'provider' => 'table'
-			]
+				'provider' => 'table',
+			],
 		],
 	];
 
@@ -191,7 +191,7 @@ class PasswordableBehavior extends Behavior {
 					'rule' => ['validateNotSame', ['compare' => $formFieldCurrent]],
 					'message' => __d('tools', 'valErrPwdSameAsBefore'),
 					'last' => true,
-					'provider' => 'table'
+					'provider' => 'table',
 				]);
 			}
 		} elseif (!count($validator->field($formFieldCurrent))) {
@@ -202,7 +202,7 @@ class PasswordableBehavior extends Behavior {
 					'message' => __d('tools', 'valErrPwdSameAsBefore'),
 					//'allowEmpty' => !$this->_config['require'],
 					'last' => true,
-					'provider' => 'table'
+					'provider' => 'table',
 				]);
 				$validator->allowEmpty($formField, !$this->_config['require']);
 			}

src/Model/Behavior/ToggleBehavior.php

@@ -30,7 +30,7 @@ class ToggleBehavior extends Behavior {
 		'on' => 'afterSave', // afterSave (without transactions) or beforeSave (with transactions)
 		'scopeFields' => [],
 		'scope' => [],
-		'findOrder' => null // null = autodetect modified/created
+		'findOrder' => null, // null = autodetect modified/created
 	];
 
 	/**

src/Model/Table/TokensTable.php

@@ -65,10 +65,10 @@ class TokensTable extends Table {
 			'maxLength' => [
 				'rule' => ['maxLength', 255],
 				'message' => ['valErrMaxCharacters {0}', 255],
-				'allowEmpty' => true
+				'allowEmpty' => true,
 			],
 		],
-		'used' => ['numeric']
+		'used' => ['numeric'],
 	];
 
 	/**

src/Shell/InflectShell.php

@@ -24,7 +24,7 @@ class InflectShell extends Shell {
 	public $validMethods = [
 		'pluralize', 'singularize', 'camelize',
 		'underscore', 'humanize', 'tableize',
-		'classify', 'variable', 'dasherize', 'slug'
+		'classify', 'variable', 'dasherize', 'slug',
 	];
 
 	/**
@@ -35,7 +35,7 @@ class InflectShell extends Shell {
 	public $validCommands = [
 		'pluralize', 'singularize', 'camelize',
 		'underscore', 'humanize', 'tableize',
-		'classify', 'variable', 'dasherize', 'slug', 'all', 'quit'
+		'classify', 'variable', 'dasherize', 'slug', 'all', 'quit',
 	];
 
 	/**
@@ -219,7 +219,7 @@ class InflectShell extends Shell {
 			'pluralize' => 'Pluralized form            ',
 			'tableize' => 'table_names form           ',
 			'underscore' => 'under_scored_form          ',
-			'variable' => 'variableForm               '
+			'variable' => 'variableForm               ',
 		];
 		return $messages[$function];
 	}

src/Utility/L10n.php

@@ -107,7 +107,7 @@ class L10n {
 		/* Welsh - bibliographic */ 'wel' => 'cy',
 		/* Xhosa */ 'xho' => 'xh',
 		/* Yiddish */ 'yid' => 'yi',
-		/* Zulu */ 'zul' => 'zu'
+		/* Zulu */ 'zul' => 'zu',
 	];
 
 	/**
@@ -258,7 +258,7 @@ class L10n {
 		'zh-hk' => ['language' => 'Chinese (Hong Kong)', 'locale' => 'zh_hk', 'localeFallback' => 'zho', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		'zh-sg' => ['language' => 'Chinese (Singapore)', 'locale' => 'zh_sg', 'localeFallback' => 'zho', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		'zh-tw' => ['language' => 'Chinese (Taiwan)', 'locale' => 'zh_tw', 'localeFallback' => 'zho', 'charset' => 'utf-8', 'direction' => 'ltr'],
-		'zu' => ['language' => 'Zulu', 'locale' => 'zul', 'localeFallback' => 'zul', 'charset' => 'utf-8', 'direction' => 'ltr']
+		'zu' => ['language' => 'Zulu', 'locale' => 'zul', 'localeFallback' => 'zul', 'charset' => 'utf-8', 'direction' => 'ltr'],
 	];
 
 	/**

src/Utility/Mime.php

@@ -695,7 +695,7 @@ class Mime extends Response {
 		'ppt' => 'application/vnd.ms-powerpoint',
 		'odt' => 'application/vnd.oasis.opendocument.text',
 		'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
-		'swf' => ['application/x-shockwave-flash', 'application/x-shockwave-flash2-preview', 'application/futuresplash', 'image/vnd.rn-realflash']
+		'swf' => ['application/x-shockwave-flash', 'application/x-shockwave-flash2-preview', 'application/futuresplash', 'image/vnd.rn-realflash'],
 	];
 
 	/**

src/Utility/Number.php

@@ -143,7 +143,7 @@ class Number extends CakeNumber {
 	 */
 	public static function format($number, array $options = []) {
 		$defaults = [
-			'positive' => '+', 'signed' => false
+			'positive' => '+', 'signed' => false,
 		];
 		$options += $defaults;
 		$sign = '';
@@ -168,7 +168,7 @@ class Number extends CakeNumber {
 	 */
 	public static function currency($number, $currency = null, array $options = []) {
 		$defaults = [
-			'positive' => '+', 'signed' => false
+			'positive' => '+', 'signed' => false,
 		];
 		$options += $defaults;
 		$sign = '';

src/Utility/Text.php

@@ -326,7 +326,7 @@ class Text extends CakeText {
 	 */
 	public static function maxWords($value, $words = 100, array $options = []) {
 		$defaults = [
-			'ellipsis' => '...'
+			'ellipsis' => '...',
 		];
 		if (!empty($options['html']) && Configure::read('App.encoding') === 'UTF-8') {
 			$defaults['ellipsis'] = "\xe2\x80\xa6";

src/Utility/Time.php

@@ -564,7 +564,7 @@ class Time extends CakeTime {
 				'Wednesday',
 				'Thursday',
 				'Friday',
-				'Saturday'
+				'Saturday',
 			],
 			'short' => [
 				'Sun',
@@ -573,8 +573,8 @@ class Time extends CakeTime {
 				'Wed',
 				'Thu',
 				'Fri',
-				'Sat'
-			]
+				'Sat',
+			],
 		];
 		$day = (int)$day;
 		if ($offset) {
@@ -610,7 +610,7 @@ class Time extends CakeTime {
 				'September',
 				'October',
 				'November',
-				'December'
+				'December',
 			],
 			'short' => [
 				'Jan',
@@ -624,7 +624,7 @@ class Time extends CakeTime {
 				'Sep',
 				'Oct',
 				'Nov',
-				'Dec'
+				'Dec',
 			],
 		];
 		$month = (int)($month - 1);
@@ -781,7 +781,7 @@ class Time extends CakeTime {
 				'd' => 'd',
 				'h' => 'h',
 				'i' => 'm',
-				's' => 's'
+				's' => 's',
 			];
 			$p = $s;
 		} else {

src/Utility/Utility.php

@@ -66,7 +66,7 @@ class Utility {
 	 */
 	public static function tokenize($data, $separator = ',', $options = []) {
 		$defaults = [
-			'clean' => true
+			'clean' => true,
 		];
 		$options += $defaults;
 		if (empty($data)) {
@@ -312,7 +312,7 @@ class Utility {
 				'header' => "Accept: text/html\r\n" .
 					"Connection: Close\r\n" .
 					"User-Agent: Mozilla/5.0 (Windows NT 6.2; WOW64)\r\n",
-			]
+			],
 		];
 		stream_context_get_default($defaults);
 
@@ -542,7 +542,7 @@ class Utility {
 			array_shift($keys);
 			foreach ($keys as $k) {
 				$child = [
-					$k => $child
+					$k => $child,
 				];
 			}
 			$result = Hash::merge($result, $child);

src/View/Helper/FormHelper.php

@@ -19,7 +19,7 @@ class FormHelper extends CakeFormHelper {
 	 * @var array
 	 */
 	protected $_defaultConfigExt = [
-		'novalidate' => false
+		'novalidate' => false,
 	];
 
 	/**

src/View/Helper/FormatHelper.php

@@ -48,7 +48,7 @@ class FormatHelper extends Helper {
 		'contra' => 'fa fa-thumbs-down',
 		'male' => 'fa fa-mars',
 		'female' => 'fa fa-venus',
-		'config' => 'fa fa-cogs'
+		'config' => 'fa fa-cogs',
 		//'genderless' => 'fa fa-genderless'
 	];
 
@@ -62,7 +62,7 @@ class FormatHelper extends Helper {
 		'autoPrefix' => true, // For custom icons "prev" becomes "fa-prev" when iconNamespace is "fa"
 		'templates' => [
 			'icon' => '<i class="{{class}}"{{attributes}}></i>',
-			'ok' => '<span class="ok-{{type}}" style="color:{{color}}"{{attributes}}>{{content}}</span>'
+			'ok' => '<span class="ok-{{type}}" style="color:{{color}}"{{attributes}}>{{content}}</span>',
 		],
 		'slugger' => null,
 	];
@@ -206,7 +206,7 @@ class FormatHelper extends Helper {
 	 */
 	public function fontIcon($icon, array $options = [], array $attributes = []) {
 		$defaults = [
-			'namespace' => $this->_config['iconNamespace']
+			'namespace' => $this->_config['iconNamespace'],
 		];
 		$options += $defaults;
 		$icon = (array)$icon;
@@ -377,7 +377,7 @@ class FormatHelper extends Helper {
 
 		$attributes += [
 			'data-placement' => 'bottom',
-			'data-toggle' => 'tooltip'
+			'data-toggle' => 'tooltip',
 		];
 		$formatOptions = $attributes + [
 			'escape' => $options['escape'],
@@ -564,7 +564,7 @@ class FormatHelper extends Helper {
 
 		$options = [
 			'type' => $type,
-			'color' => $color
+			'color' => $color,
 		];
 		$options['content'] = $content;
 		$options['attributes'] = $this->template->formatAttributes($attributes);
@@ -642,7 +642,7 @@ class FormatHelper extends Helper {
 			'null' => '&nbsp;',
 			'recursive' => false,
 			'heading' => true,
-			'escape' => true
+			'escape' => true,
 		];
 		$options += $defaults;
 
@@ -656,7 +656,7 @@ class FormatHelper extends Helper {
 		}
 
 		$attributes += [
-			'class' => 'table'
+			'class' => 'table',
 		];
 
 		$attributes = $this->template->formatAttributes($attributes);

src/View/Helper/GravatarHelper.php

@@ -25,7 +25,7 @@ class GravatarHelper extends Helper {
 	 */
 	protected $_url = [
 		'http' => 'http://www.gravatar.com/avatar/',
-		'https' => 'https://secure.gravatar.com/avatar/'
+		'https' => 'https://secure.gravatar.com/avatar/',
 	];
 
 	/**

src/View/Helper/HtmlHelper.php

@@ -43,7 +43,7 @@ class HtmlHelper extends CoreHtmlHelper {
 
 		return $this->formatTemplate('image', [
 			'url' => $text,
-			'attrs' => $this->templater()->formatAttributes($options, ['block', 'link'])
+			'attrs' => $this->templater()->formatAttributes($options, ['block', 'link']),
 		]);
 	}
 

src/View/Helper/ObfuscateHelper.php

@@ -60,7 +60,7 @@ class ObfuscateHelper extends Helper {
 		$defaults = [
 			'title' => __d('tools', 'for use in an external mail client'),
 			'class' => 'email',
-			'escape' => false
+			'escape' => false,
 		];
 
 		if (empty($text)) {

src/View/Helper/TimeHelper.php

@@ -28,7 +28,7 @@ class TimeHelper extends CakeTimeHelper {
 	 * @var array
 	 */
 	protected $_defaultConfig = [
-		'engine' => 'Tools\Utility\Time'
+		'engine' => 'Tools\Utility\Time',
 	];
 
 	/**
@@ -50,7 +50,7 @@ class TimeHelper extends CakeTimeHelper {
 	 */
 	public function __construct(View $View, array $config = []) {
 		$defaults = [
-			'outputTimezone' => Configure::read('App.defaultOutputTimezone')
+			'outputTimezone' => Configure::read('App.defaultOutputTimezone'),
 		];
 		$config += $defaults;
 

src/View/Helper/TimelineHelper.php

@@ -238,7 +238,7 @@ JS;
 	 */
 	protected function _buffer($script, array $options = []) {
 		$defaults = [
-			'block' => true
+			'block' => true,
 		];
 		$options += $defaults;
 

src/View/Helper/TypographyHelper.php

@@ -241,7 +241,7 @@ class TypographyHelper extends Helper {
 
 			// Similarly, there might be cases where a closing </block> will follow
 			// a closing </p> tag, so we'll correct it by adding a newline in between
-			'#</p></#'			=> "</p>\n</"
+			'#</p></#'			=> "</p>\n</",
 			];
 
 		// Do we need to reduce empty lines?
@@ -340,7 +340,7 @@ class TypographyHelper extends Helper {
 			'/(\W)  /'						=> '$1&nbsp; ',
 
 			// ampersands, if not a character entity
-			'/&(?!#?[a-zA-Z0-9]{2,};)/'		=> '&amp;'
+			'/&(?!#?[a-zA-Z0-9]{2,};)/'		=> '&amp;',
 		];
 		if ($locale && !empty($locales[$locale])) {
 			foreach ($table as $key => $val) {

src/View/Helper/UrlHelper.php

@@ -86,7 +86,7 @@ class UrlHelper extends CoreUrlHelper {
 	public function defaults() {
 		return [
 			'prefix' => false,
-			'plugin' => false
+			'plugin' => false,
 		];
 	}
 

tests/Fixture/AfterTreesFixture.php

@@ -20,7 +20,7 @@ class AfterTreesFixture extends TestFixture {
 		'lft' => ['type' => 'integer'],
 		'rght' => ['type' => 'integer'],
 		'name' => ['type' => 'string', 'length' => 255, 'null' => false],
-		'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]]
+		'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
 	];
 
 	/**
@@ -35,7 +35,7 @@ class AfterTreesFixture extends TestFixture {
 		['parent_id' => null, 'lft' => 7, 'rght' => 12, 'name' => 'Four'],
 		['parent_id' => null, 'lft' => 8, 'rght' => 9, 'name' => 'Five'],
 		['parent_id' => null, 'lft' => 10, 'rght' => 11, 'name' => 'Six'],
-		['parent_id' => null, 'lft' => 13, 'rght' => 14, 'name' => 'Seven']
+		['parent_id' => null, 'lft' => 13, 'rght' => 14, 'name' => 'Seven'],
 	];
 
 }

tests/Fixture/BitmaskedCommentsFixture.php

@@ -22,7 +22,7 @@ class BitmaskedCommentsFixture extends TestFixture {
 		'status' => ['type' => 'integer', 'null' => false, 'length' => 2, 'default' => '0'],
 		'created' => 'datetime',
 		'updated' => 'datetime',
-		'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]]
+		'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
 	];
 
 	/**
@@ -37,7 +37,7 @@ class BitmaskedCommentsFixture extends TestFixture {
 		['article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article', 'status' => '3', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'],
 		['article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article', 'status' => '4', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31'],
 		['article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Article', 'status' => '5', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31'],
-		['article_id' => 2, 'user_id' => 3, 'comment' => 'Comment With All Bits set', 'status' => '15', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31']
+		['article_id' => 2, 'user_id' => 3, 'comment' => 'Comment With All Bits set', 'status' => '15', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31'],
 	];
 
 }

tests/Fixture/JsonableCommentsFixture.php

@@ -15,7 +15,7 @@ class JsonableCommentsFixture extends TestFixture {
 		'url' => ['type' => 'string', 'length' => 255, 'null' => false],
 		'title' => ['type' => 'string', 'length' => 255, 'null' => false],
 		'details' => ['type' => 'string', 'length' => 255, 'null' => false],
-		'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]]
+		'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
 	];
 
 	/**

tests/Fixture/MultiColumnUsersFixture.php

@@ -18,7 +18,7 @@ class MultiColumnUsersFixture extends TestFixture {
 		'token' => ['type' => 'string', 'null' => false],
 		'created' => 'datetime',
 		'updated' => 'datetime',
-		'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]]
+		'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
 	];
 
 	/**
@@ -32,7 +32,7 @@ class MultiColumnUsersFixture extends TestFixture {
 			'email' => 'mariano@example.com',
 			'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
 			'token' => '12345', 'created' => '2007-03-17 01:16:23',
-			'updated' => '2007-03-17 01:18:31'
+			'updated' => '2007-03-17 01:18:31',
 		],
 		[
 			'user_name' => 'nate',
@@ -40,7 +40,7 @@ class MultiColumnUsersFixture extends TestFixture {
 			'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
 			'token' => '23456',
 			'created' => '2007-03-17 01:18:23',
-			'updated' => '2007-03-17 01:20:31'
+			'updated' => '2007-03-17 01:20:31',
 		],
 		[
 			'user_name' => 'larry',
@@ -48,7 +48,7 @@ class MultiColumnUsersFixture extends TestFixture {
 			'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
 			'token' => '34567',
 			'created' => '2007-03-17 01:20:23',
-			'updated' => '2007-03-17 01:22:31'
+			'updated' => '2007-03-17 01:22:31',
 		],
 		[
 			'user_name' => 'garrett',
@@ -56,7 +56,7 @@ class MultiColumnUsersFixture extends TestFixture {
 			'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
 			'token' => '45678',
 			'created' => '2007-03-17 01:22:23',
-			'updated' => '2007-03-17 01:24:31'
+			'updated' => '2007-03-17 01:24:31',
 		],
 		[
 			'user_name' => 'chartjes',
@@ -64,8 +64,8 @@ class MultiColumnUsersFixture extends TestFixture {
 			'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
 			'token' => '56789',
 			'created' => '2007-03-17 01:22:23',
-			'updated' => '2007-03-17 01:24:31'
-		]
+			'updated' => '2007-03-17 01:24:31',
+		],
 	];
 
 }

tests/Fixture/ResetCommentsFixture.php

@@ -22,7 +22,7 @@ class ResetCommentsFixture extends TestFixture {
 		'published' => ['type' => 'string', 'length' => 1, 'default' => 'N'],
 		'created' => 'datetime',
 		'updated' => 'datetime',
-		'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]]
+		'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
 	];
 
 	/**
@@ -36,7 +36,7 @@ class ResetCommentsFixture extends TestFixture {
 		['article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31'],
 		['article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article', 'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'],
 		['article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31'],
-		['article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31']
+		['article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31'],
 	];
 
 }

tests/Fixture/RolesFixture.php

@@ -23,7 +23,7 @@ class RolesFixture extends TestFixture {
 		'modified' => ['type' => 'datetime', 'null' => true, 'default' => null, 'collate' => null, 'comment' => ''],
 		'sort' => ['type' => 'integer', 'null' => false, 'default' => '0', 'length' => 10, 'collate' => null, 'comment' => ''],
 		'active' => ['type' => 'boolean', 'null' => false, 'default' => false, 'collate' => null, 'comment' => ''],
-		'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]]
+		'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
 	];
 
 	/**
@@ -39,7 +39,7 @@ class RolesFixture extends TestFixture {
 			'created' => '2010-01-07 03:36:33',
 			'modified' => '2010-01-07 03:36:33',
 			'sort' => '7',
-			'active' => 1
+			'active' => 1,
 		],
 		[
 			'name' => 'Admin',
@@ -48,7 +48,7 @@ class RolesFixture extends TestFixture {
 			'created' => '2010-01-07 03:36:33',
 			'modified' => '2010-01-07 03:36:33',
 			'sort' => '6',
-			'active' => 1
+			'active' => 1,
 		],
 		[
 			'name' => 'User',
@@ -57,7 +57,7 @@ class RolesFixture extends TestFixture {
 			'created' => '2010-01-07 03:36:33',
 			'modified' => '2010-01-07 03:36:33',
 			'sort' => '1',
-			'active' => 1
+			'active' => 1,
 		],
 		[
 			'name' => 'Partner',
@@ -66,7 +66,7 @@ class RolesFixture extends TestFixture {
 			'created' => '2010-01-07 03:36:33',
 			'modified' => '2010-01-07 03:36:33',
 			'sort' => '0',
-			'active' => 1
+			'active' => 1,
 		],
 	];
 

tests/Fixture/SluggedArticlesFixture.php

@@ -18,7 +18,7 @@ class SluggedArticlesFixture extends TestFixture {
 		'long_title' => ['type' => 'string', 'null' => false, 'default' => ''],
 		'long_slug' => ['type' => 'string', 'null' => false, 'default' => ''],
 		'section' => ['type' => 'integer', 'null' => true],
-		'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]]
+		'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
 	];
 
 	/**

tests/Fixture/StoriesFixture.php

@@ -22,7 +22,7 @@ class StoriesFixture extends TestFixture {
 		'modified' => ['type' => 'datetime', 'null' => true, 'default' => null, 'collate' => null, 'comment' => ''],
 		'sort' => ['type' => 'integer', 'null' => false, 'default' => '0', 'length' => 10, 'collate' => null, 'comment' => ''],
 		'active' => ['type' => 'boolean', 'null' => false, 'default' => false, 'collate' => null, 'comment' => ''],
-		'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]]
+		'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
 	];
 
 	/**
@@ -38,7 +38,7 @@ class StoriesFixture extends TestFixture {
 			'created' => '2010-01-07 03:36:32',
 			'modified' => '2010-01-07 03:36:33',
 			'sort' => '2',
-			'active' => 1
+			'active' => 1,
 		],
 		[
 			'id' => '2',
@@ -47,7 +47,7 @@ class StoriesFixture extends TestFixture {
 			'created' => '2010-01-07 03:36:33',
 			'modified' => '2010-01-07 03:36:33',
 			'sort' => '3',
-			'active' => 1
+			'active' => 1,
 		],
 		[
 			'id' => '3',
@@ -56,7 +56,7 @@ class StoriesFixture extends TestFixture {
 			'created' => '2010-01-07 03:36:31',
 			'modified' => '2010-01-07 03:36:33',
 			'sort' => '4',
-			'active' => 1
+			'active' => 1,
 		],
 		[
 			'id' => '4',
@@ -65,7 +65,7 @@ class StoriesFixture extends TestFixture {
 			'created' => '2010-01-07 03:36:34',
 			'modified' => '2010-01-07 03:36:33',
 			'sort' => '1',
-			'active' => 1
+			'active' => 1,
 		],
 	];
 

tests/Fixture/StringCommentsFixture.php

@@ -14,7 +14,7 @@ class StringCommentsFixture extends TestFixture {
 		'comment' => ['type' => 'string', 'length' => 255, 'null' => false],
 		'url' => ['type' => 'string', 'length' => 255, 'null' => false],
 		'title' => ['type' => 'string', 'length' => 255, 'null' => false],
-		'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]]
+		'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
 	];
 
 	/**

tests/Fixture/TokensFixture.php

@@ -23,7 +23,7 @@ class TokensFixture extends TestFixture {
 		'used' => ['type' => 'integer', 'null' => false, 'default' => '0', 'collate' => null, 'comment' => ''],
 		'created' => ['type' => 'datetime', 'null' => true, 'default' => null, 'collate' => null, 'comment' => ''],
 		'modified' => ['type' => 'datetime', 'null' => true, 'default' => null, 'collate' => null, 'comment' => ''],
-		'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]]
+		'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
 	];
 
 	/**
@@ -39,7 +39,7 @@ class TokensFixture extends TestFixture {
 			'content' => 'i:1;',
 			'used' => 0,
 			'created' => '2011-08-02 18:00:41',
-			'modified' => '2011-08-02 18:00:41'
+			'modified' => '2011-08-02 18:00:41',
 		],
 		[
 			'user_id' => '2',
@@ -48,7 +48,7 @@ class TokensFixture extends TestFixture {
 			'content' => 'i:2;',
 			'used' => 0,
 			'created' => '2011-08-02 18:00:41',
-			'modified' => '2011-08-02 18:00:41'
+			'modified' => '2011-08-02 18:00:41',
 		],
 		[
 			'user_id' => '1',
@@ -57,7 +57,7 @@ class TokensFixture extends TestFixture {
 			'content' => 'a:3:{s:10:"controller";s:4:"test";s:6:"action";s:3:"foo";i:0;s:3:"bar";}',
 			'used' => 1,
 			'created' => '2011-08-02 18:00:41',
-			'modified' => '2011-08-02 18:00:41'
+			'modified' => '2011-08-02 18:00:41',
 		],
 		[
 			'user_id' => '2',
@@ -66,7 +66,7 @@ class TokensFixture extends TestFixture {
 			'content' => 's:13:"/test/foo/bar";',
 			'used' => 1,
 			'created' => '2011-08-02 18:00:41',
-			'modified' => '2011-08-02 18:00:41'
+			'modified' => '2011-08-02 18:00:41',
 		],
 		[
 			'user_id' => '1',
@@ -75,7 +75,7 @@ class TokensFixture extends TestFixture {
 			'content' => 'i:1;',
 			'used' => 0,
 			'created' => '2011-08-02 18:01:16',
-			'modified' => '2011-08-02 18:01:16'
+			'modified' => '2011-08-02 18:01:16',
 		],
 		[
 			'user_id' => '2',
@@ -84,7 +84,7 @@ class TokensFixture extends TestFixture {
 			'content' => 'i:2;',
 			'used' => 0,
 			'created' => '2011-08-02 18:01:16',
-			'modified' => '2011-08-02 18:01:16'
+			'modified' => '2011-08-02 18:01:16',
 		],
 		[
 			'user_id' => '1',
@@ -93,7 +93,7 @@ class TokensFixture extends TestFixture {
 			'content' => 'a:3:{s:10:"controller";s:4:"test";s:6:"action";s:3:"foo";i:0;s:3:"bar";}',
 			'used' => 1,
 			'created' => '2011-08-02 18:01:16',
-			'modified' => '2011-08-02 18:01:16'
+			'modified' => '2011-08-02 18:01:16',
 		],
 		[
 			'user_id' => '2',
@@ -102,7 +102,7 @@ class TokensFixture extends TestFixture {
 			'content' => 's:13:"/test/foo/bar";',
 			'used' => 1,
 			'created' => '2011-08-02 18:01:16',
-			'modified' => '2011-08-02 18:01:16'
+			'modified' => '2011-08-02 18:01:16',
 		],
 		[
 			'user_id' => '1',
@@ -111,7 +111,7 @@ class TokensFixture extends TestFixture {
 			'content' => 'i:1;',
 			'used' => 0,
 			'created' => '2011-08-02 18:01:54',
-			'modified' => '2011-08-02 18:01:54'
+			'modified' => '2011-08-02 18:01:54',
 		],
 		[
 			'user_id' => '2',
@@ -120,7 +120,7 @@ class TokensFixture extends TestFixture {
 			'content' => 'i:2;',
 			'used' => 0,
 			'created' => '2011-08-02 18:01:54',
-			'modified' => '2011-08-02 18:01:54'
+			'modified' => '2011-08-02 18:01:54',
 		],
 	];
 

tests/Fixture/ToolsUsersFixture.php

@@ -19,7 +19,7 @@ class ToolsUsersFixture extends TestFixture {
 		'name' => ['type' => 'string', 'null' => true],
 		'password' => ['type' => 'string', 'null' => true],
 		'role_id' => ['type' => 'integer', 'null' => true],
-		'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]]
+		'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
 	];
 
 	/**
@@ -31,7 +31,7 @@ class ToolsUsersFixture extends TestFixture {
 		['role_id' => 1, 'password' => '123456', 'name' => 'User 1'],
 		['role_id' => 2, 'password' => '123456', 'name' => 'User 2'],
 		['role_id' => 1, 'password' => '123456', 'name' => 'User 3'],
-		['role_id' => 3, 'password' => '123456', 'name' => 'User 4']
+		['role_id' => 3, 'password' => '123456', 'name' => 'User 4'],
 	];
 
 }

tests/TestCase/Auth/MultiColumnAuthenticateTest.php

@@ -13,7 +13,7 @@ class MultiColumnAuthenticateTest extends TestCase {
 	 * @var array
 	 */
 	public $fixtures = [
-		'plugin.Tools.MultiColumnUsers'
+		'plugin.Tools.MultiColumnUsers',
 	];
 
 	/**
@@ -41,7 +41,7 @@ class MultiColumnAuthenticateTest extends TestCase {
 		$this->auth = new MultiColumnAuthenticate($this->registry, [
 			'fields' => ['username' => 'user_name', 'password' => 'password'],
 			'userModel' => 'MultiColumnUsers',
-			'columns' => ['user_name', 'email']
+			'columns' => ['user_name', 'email'],
 		]);
 
 		$password = password_hash('password', PASSWORD_DEFAULT);
@@ -62,7 +62,7 @@ class MultiColumnAuthenticateTest extends TestCase {
 			'email' => 'mariano@example.com',
 			'token' => '12345',
 			'created' => new Time('2007-03-17 01:16:23'),
-			'updated' => new Time('2007-03-17 01:18:31')
+			'updated' => new Time('2007-03-17 01:18:31'),
 		];
 
 		$request = $request->withData('user_name', 'mariano')->withData('password', 'password');

tests/TestCase/BootstrapTest.php

@@ -28,22 +28,22 @@ class BootstrapTest extends TestCase {
 			[
 				'auto',
 				'au',
-				true
+				true,
 			],
 			[
 				'auto',
 				'ut',
-				false
+				false,
 			],
 			[
 				'Auto',
 				'au',
-				true
+				true,
 			],
 			[
 				'auto',
 				'Ut',
-				false
+				false,
 			],
 		];
 
@@ -66,22 +66,22 @@ class BootstrapTest extends TestCase {
 			[
 				'auto',
 				'to',
-				true
+				true,
 			],
 			[
 				'auto',
 				'ut',
-				false
+				false,
 			],
 			[
 				'auto',
 				'To',
-				true
+				true,
 			],
 			[
 				'auto',
 				'Ut',
-				false
+				false,
 			],
 		];
 
@@ -104,22 +104,22 @@ class BootstrapTest extends TestCase {
 			[
 				'auto',
 				'to',
-				true
+				true,
 			],
 			[
 				'auto',
 				'ut',
-				true
+				true,
 			],
 			[
 				'auto',
 				'To',
-				true
+				true,
 			],
 			[
 				'auto',
 				'ot',
-				false
+				false,
 			],
 		];
 

tests/TestCase/Controller/Component/CommonComponentTest.php

@@ -293,12 +293,12 @@ class CommonComponentTest extends TestCase {
 		$request = $request->withQueryParams([
 			'a' => [
 				'b' => [
-					' c '
-				]
+					' c ',
+				],
 			],
 			' d ',
 			' e',
-			'f '
+			'f ',
 		]);
 		$this->Controller->setRequest($request);
 		$this->Controller->Common->startup(new Event('Test'));
@@ -306,12 +306,12 @@ class CommonComponentTest extends TestCase {
 		$expected = [
 			'a' => [
 				'b' => [
-					'c'
-				]
+					'c',
+				],
 			],
 			'd',
 			'e',
-			'f'
+			'f',
 		];
 		$this->assertSame($expected, $query);
 	}
@@ -325,12 +325,12 @@ class CommonComponentTest extends TestCase {
 		$request = $request->withParam('pass', [
 			'a' => [
 				'b' => [
-					' c '
-				]
+					' c ',
+				],
 			],
 			' d ',
 			' e',
-			'f '
+			'f ',
 		]);
 		$this->Controller->setRequest($request);
 		$this->Controller->Common->startup(new Event('Test'));
@@ -338,12 +338,12 @@ class CommonComponentTest extends TestCase {
 		$expected = [
 			'a' => [
 				'b' => [
-					'c'
-				]
+					'c',
+				],
 			],
 			'd',
 			'e',
-			'f'
+			'f',
 		];
 		$this->assertSame($expected, $pass);
 	}
@@ -357,12 +357,12 @@ class CommonComponentTest extends TestCase {
 		$request = $request->withData('data', [
 			'a' => [
 				'b' => [
-					' c '
-				]
+					' c ',
+				],
 			],
 			' d ',
 			' e',
-			'f '
+			'f ',
 		]);
 		$this->Controller->setRequest($request);
 		$this->Controller->Common->startup(new Event('Test'));
@@ -370,12 +370,12 @@ class CommonComponentTest extends TestCase {
 		$expected = [
 			'a' => [
 				'b' => [
-					'c'
-				]
+					'c',
+				],
 			],
 			'd',
 			'e',
-			'f'
+			'f',
 		];
 		$this->assertSame($expected, $pass);
 	}

tests/TestCase/Controller/Component/MobileComponentTest.php

@@ -18,7 +18,7 @@ class MobileComponentTest extends TestCase {
 	 * @var array
 	 */
 	public $fixtures = [
-		'core.Sessions'
+		'core.Sessions',
 	];
 
 	/**

tests/TestCase/Controller/Component/UrlComponentTest.php

@@ -50,7 +50,7 @@ class UrlComponentTest extends TestCase {
 		$is = $this->Controller->Url->defaults();
 		$expected = [
 			'prefix' => false,
-			'plugin' => false
+			'plugin' => false,
 		];
 		$this->assertSame($expected, $is);
 	}
@@ -92,7 +92,7 @@ class UrlComponentTest extends TestCase {
 		$expected = [
 			'controller' => 'foobar',
 			'action' => 'test',
-			'?' => ['x' => 'y']
+			'?' => ['x' => 'y'],
 		];
 		$this->assertSame($expected, $result);
 	}

tests/TestCase/Controller/ControllerTest.php

@@ -13,7 +13,7 @@ class ControllerTest extends TestCase {
 	 * @var array
 	 */
 	public $fixtures = [
-		'plugin.Tools.ToolsUsers'
+		'plugin.Tools.ToolsUsers',
 	];
 
 	/**

tests/TestCase/Controller/ShuntRequestControllerTest.php

@@ -41,7 +41,7 @@ class ShuntRequestControllerTest extends TestCase {
 		Configure::write('Config.allowedLanguages', [
 			'de' => [
 				'locale' => 'de_DE',
-				'name' => 'Deutsch'
+				'name' => 'Deutsch',
 			],
 		]);
 

tests/TestCase/Form/ContactFormTest.php

@@ -13,7 +13,7 @@ class ContactFormTest extends TestCase {
 		'core.Posts',
 		'core.Authors',
 		'plugin.Tools.ToolsUsers',
-		'plugin.Tools.Roles'
+		'plugin.Tools.Roles',
 	];
 
 	/**
@@ -42,7 +42,7 @@ class ContactFormTest extends TestCase {
 			'name' => 'Foo',
 			'email' => 'foo',
 			'subject' => '',
-			'body' => 'Some message'
+			'body' => 'Some message',
 		];
 		$result = $this->Form->validate($requestData);
 		$this->assertFalse($result);
@@ -54,7 +54,7 @@ class ContactFormTest extends TestCase {
 			'name' => 'Foo',
 			'email' => 'foo@example.org',
 			'subject' => 'Yeah',
-			'body' => 'Some message'
+			'body' => 'Some message',
 		];
 		$result = $this->Form->validate($requestData);
 		$this->assertTrue($result);
@@ -70,7 +70,7 @@ class ContactFormTest extends TestCase {
 			'name' => 'Foo',
 			'email' => 'foo@example.org',
 			'subject' => 'Yeah',
-			'body' => 'Some message'
+			'body' => 'Some message',
 		];
 		$result = $this->Form->execute($requestData);
 		$this->assertTrue($result);

tests/TestCase/Mailer/EmailTest.php

@@ -30,7 +30,7 @@ class EmailTest extends TestCase {
 		$this->Email = new TestEmail();
 
 		TransportFactory::setConfig('debug', [
-			'className' => 'Debug'
+			'className' => 'Debug',
 		]);
 
 		Configure::delete('Config.xMailer');
@@ -106,7 +106,7 @@ class EmailTest extends TestCase {
 			'hotel.png' => [
 				'file' => $file,
 				'mimetype' => 'image/png',
-			]
+			],
 		];
 		$this->assertEquals($expected, $res);
 
@@ -192,7 +192,7 @@ class EmailTest extends TestCase {
 			'hotel.png' => [
 				//'data' => $content,
 				'mimetype' => 'image/png',
-			]
+			],
 		];
 		$this->assertEquals($expected, $res);
 
@@ -230,7 +230,7 @@ class EmailTest extends TestCase {
 		$expected = [
 			'file' => $file,
 			'mimetype' => 'image/png',
-			'contentId' => $cid
+			'contentId' => $cid,
 		];
 		$this->assertSame($expected, $image);
 	}

tests/TestCase/Model/Behavior/AfterSaveBehaviorTest.php

@@ -11,7 +11,7 @@ class AfterSaveBehaviorTest extends TestCase {
 	 * @var array
 	 */
 	public $fixtures = [
-		'core.Articles'
+		'core.Articles',
 	];
 
 	/**

tests/TestCase/Model/Behavior/BitmaskedBehaviorTest.php

@@ -12,7 +12,7 @@ class BitmaskedBehaviorTest extends TestCase {
 	 * @var array
 	 */
 	public $fixtures = [
-		'plugin.Tools.BitmaskedComments'
+		'plugin.Tools.BitmaskedComments',
 	];
 
 	/**
@@ -98,7 +98,7 @@ class BitmaskedBehaviorTest extends TestCase {
 	public function testFindBitmaskedContain() {
 		$options = [
 			'bits' => [],
-			'type' => 'contain'
+			'type' => 'contain',
 		];
 		$res = $this->Comments->find('bits', $options)->toArray();
 		$this->assertCount(1, $res);
@@ -106,7 +106,7 @@ class BitmaskedBehaviorTest extends TestCase {
 
 		$options = [
 			'bits' => [BitmaskedComment::STATUS_APPROVED],
-			'type' => 'contain'
+			'type' => 'contain',
 		];
 		$res = $this->Comments->find('bits', $options)->toArray();
 		$this->assertCount(3, $res);

tests/TestCase/Model/Behavior/ConfirmableBehaviorTest.php

@@ -16,7 +16,7 @@ class ConfirmableBehaviorTest extends TestCase {
 	 * @var array
 	 */
 	public $fixtures = [
-		'plugin.Tools.SluggedArticles'
+		'plugin.Tools.SluggedArticles',
 	];
 
 	/**
@@ -39,7 +39,7 @@ class ConfirmableBehaviorTest extends TestCase {
 
 		$data = [
 			'name' => 'FooBar',
-			'confirm' => '0'
+			'confirm' => '0',
 		];
 		$animal = $this->Articles->patchEntity($animal, $data);
 		$this->assertNotEmpty($animal->getErrors());
@@ -47,7 +47,7 @@ class ConfirmableBehaviorTest extends TestCase {
 
 		$data = [
 			'name' => 'FooBar',
-			'confirm' => '1'
+			'confirm' => '1',
 		];
 		$animal = $this->Articles->patchEntity($animal, $data);
 		$this->assertEmpty($animal->getErrors());
@@ -77,7 +77,7 @@ class ConfirmableBehaviorTest extends TestCase {
 
 		$data = [
 			'name' => 'FooBar',
-			'confirm' => '0'
+			'confirm' => '0',
 		];
 		$animal = $this->Articles->patchEntity($animal, $data);
 		$this->assertNotEmpty($animal->getErrors());
@@ -86,7 +86,7 @@ class ConfirmableBehaviorTest extends TestCase {
 
 		$data = [
 			'name' => 'FooBar',
-			'confirm' => '1'
+			'confirm' => '1',
 		];
 		$animal = $this->Articles->patchEntity($animal, $data);
 		$this->assertEmpty($animal->getErrors());
@@ -101,7 +101,7 @@ class ConfirmableBehaviorTest extends TestCase {
 
 		$animal = $this->Articles->newEntity();
 		$data = [
-			'name' => 'FooBar'
+			'name' => 'FooBar',
 		];
 		$animal = $this->Articles->patchEntity($animal, $data);
 		$this->assertSame(['confirm' => ['_required' => 'This field is required']], $animal->getErrors());

tests/TestCase/Model/Behavior/JsonableBehaviorTest.php

@@ -12,7 +12,7 @@ class JsonableBehaviorTest extends TestCase {
 	 * @var array
 	 */
 	public $fixtures = [
-		'plugin.Tools.JsonableComments'
+		'plugin.Tools.JsonableComments',
 	];
 
 	/**
@@ -376,8 +376,8 @@ class JsonableBehaviorTest extends TestCase {
 			'output' => 'array',
 			'fields' => ['details'],
 			'encodeParams' => [
-				'options' => 0
-			]
+				'options' => 0,
+			],
 		]);
 
 		$data = [

tests/TestCase/Model/Behavior/NeighborBehaviorTest.php

@@ -17,7 +17,7 @@ class NeighborBehaviorTest extends TestCase {
 	 * @var array
 	 */
 	public $fixtures = [
-		'plugin.Tools.Stories'
+		'plugin.Tools.Stories',
 	];
 
 	/**

tests/TestCase/Model/Behavior/PasswordableBehaviorTest.php

@@ -16,7 +16,7 @@ class PasswordableBehaviorTest extends TestCase {
 	 */
 	public $fixtures = [
 		'plugin.Tools.ToolsUsers',
-		'plugin.Tools.Roles'
+		'plugin.Tools.Roles',
 	];
 
 	/**
@@ -71,7 +71,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$user = $this->Users->newEntity();
 		$data = [
 			'pwd' => '1234ab',
-			'pwd_repeat' => '123456'
+			'pwd_repeat' => '123456',
 		];
 		$this->Users->patchEntity($user, $data);
 		$is = $this->Users->save($user);
@@ -81,7 +81,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$user = $this->Users->newEntity();
 		$data = [
 			'pwd' => '123456',
-			'pwd_repeat' => '123456'
+			'pwd_repeat' => '123456',
 		];
 		$this->Users->patchEntity($user, $data);
 		$is = $this->Users->save($user);
@@ -115,7 +115,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$user = $this->Users->newEntity();
 		$data = [
 			'pwd' => '',
-			'pwd_repeat' => ''
+			'pwd_repeat' => '',
 		];
 		$this->Users->patchEntity($user, $data);
 		$is = $this->Users->save($user);
@@ -134,7 +134,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$data = [
 			'name' => 'foo', // we need at least one field besides the password on CREATE
 			'pwd' => '',
-			'pwd_repeat' => ''
+			'pwd_repeat' => '',
 		];
 		$this->Users->patchEntity($user, $data);
 		$is = $this->Users->save($user);
@@ -151,7 +151,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$data = [
 			'id' => $id,
 			'pwd' => '',
-			'pwd_repeat' => ''
+			'pwd_repeat' => '',
 		];
 		$this->Users->patchEntity($user, $data);
 		$is = $this->Users->save($user);
@@ -213,7 +213,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$user = $this->Users->newEntity();
 		$data = [
 			'passw' => '123456',
-			'passw_repeat' => '123456'
+			'passw_repeat' => '123456',
 		];
 		$this->Users->patchEntity($user, $data);
 		//debug($this->Users->data);
@@ -231,7 +231,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$data = [
 			'name' => 'admin',
 			'password' => $this->hasher->hash('somepwd'),
-			'role_id' => '1'
+			'role_id' => '1',
 		];
 		$this->Users->patchEntity($user, $data);
 		$result = $this->Users->save($user);
@@ -250,7 +250,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$data = [
 			'passw_current' => 'something',
 			'passw' => 'somepwd',
-			'passw_repeat' => 'somepwd'
+			'passw_repeat' => 'somepwd',
 		];
 		$this->Users->patchEntity($user, $data);
 		$is = $this->Users->save($user);
@@ -260,7 +260,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$data = [
 			'passw_current' => 'somepwd',
 			'passw' => 'newpwd',
-			'passw_repeat' => 'newpwd'
+			'passw_repeat' => 'newpwd',
 		];
 		$this->Users->patchEntity($user, $data);
 		$is = $this->Users->save($user);
@@ -277,12 +277,12 @@ class PasswordableBehaviorTest extends TestCase {
 			'formField' => 'passw',
 			'formFieldRepeat' => 'passw_repeat',
 			'allowSame' => false,
-			'current' => false
+			'current' => false,
 		]);
 		$user = $this->Users->newEntity();
 		$data = [
 			'passw' => 'somepwd',
-			'passw_repeat' => 'somepwd'
+			'passw_repeat' => 'somepwd',
 		];
 		$this->Users->patchEntity($user, $data);
 		$is = $this->Users->save($user);
@@ -293,7 +293,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$user = clone($userCopy);
 		$data = [
 			'passw' => 'somepwd',
-			'passw_repeat' => 'somepwd'
+			'passw_repeat' => 'somepwd',
 		];
 		$this->Users->patchEntity($user, $data);
 		$is = $this->Users->save($user);
@@ -302,7 +302,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$user = clone($userCopy);
 		$data = [
 			'passw' => 'newpwd',
-			'passw_repeat' => 'newpwd'
+			'passw_repeat' => 'newpwd',
 		];
 		$this->Users->patchEntity($user, $data);
 		$is = $this->Users->save($user);
@@ -318,12 +318,12 @@ class PasswordableBehaviorTest extends TestCase {
 		$this->Users->addBehavior('Tools.Passwordable', [
 			'formField' => 'passw',
 			'formFieldRepeat' => 'passw_repeat',
-			'require' => false
+			'require' => false,
 		]);
 		$user = $this->Users->newEntity();
 		$data = [
 			'passw' => 'somepwd',
-			'passw_repeat' => 'somepwd'
+			'passw_repeat' => 'somepwd',
 		];
 		$this->Users->patchEntity($user, $data);
 		$is = $this->Users->save($user);
@@ -333,7 +333,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$user = clone($userCopy);
 		$data = [
 			'passw' => '',
-			'passw_repeat' => ''
+			'passw_repeat' => '',
 		];
 		$this->Users->patchEntity($user, $data);
 		$is = $this->Users->save($user);
@@ -343,7 +343,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$user = clone($userCopy);
 		$data = [
 			'passw' => 'somepwd2',
-			'passw_repeat' => ''
+			'passw_repeat' => '',
 		];
 		$this->Users->patchEntity($user, $data);
 		$is = $this->Users->save($user);
@@ -352,7 +352,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$user = clone($userCopy);
 		$data = [
 			'passw' => 'somepwd2',
-			'passw_repeat' => 'somepwd2'
+			'passw_repeat' => 'somepwd2',
 		];
 		$this->Users->patchEntity($user, $data);
 		$is = $this->Users->save($user);
@@ -391,7 +391,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$data = [
 			'pwd_current' => 'somepwdx',
 			'pwd' => '123456',
-			'pwd_repeat' => '123456'
+			'pwd_repeat' => '123456',
 		];
 		$user = $this->Users->patchEntity($user, $data);
 		$is = $this->Users->save($user);
@@ -402,7 +402,7 @@ class PasswordableBehaviorTest extends TestCase {
 			'name' => 'Yeah',
 			'pwd_current' => 'somepwd',
 			'pwd' => '123456',
-			'pwd_repeat' => '123456'
+			'pwd_repeat' => '123456',
 		];
 		$user->setAccess('*', false); // Mark all properties as protected
 		$user->setAccess(['id'], true); // Allow id to be accessible by default
@@ -428,7 +428,7 @@ class PasswordableBehaviorTest extends TestCase {
 			'name' => 'Yeah',
 			'pwd_current' => '123', // Obviously wrong
 			'pwd' => 'some', // Too short
-			'pwd_repeat' => 'somex' // Don't match
+			'pwd_repeat' => 'somex', // Don't match
 		];
 		$user->setAccess('*', false); // Mark all properties as protected
 		$user->setAccess(['id', 'name'], true);
@@ -478,7 +478,7 @@ class PasswordableBehaviorTest extends TestCase {
 			'name' => 'Yeah',
 			'pwd_current' => '',
 			'pwd' => '123456',
-			'pwd_repeat' => '123456'
+			'pwd_repeat' => '123456',
 		];
 		$this->Users->patchEntity($user, $data);
 		$is = $this->Users->save($user);
@@ -489,7 +489,7 @@ class PasswordableBehaviorTest extends TestCase {
 			'name' => 'Yeah',
 			'pwd_current' => 'somepwd',
 			'pwd' => '123456',
-			'pwd_repeat' => '123456'
+			'pwd_repeat' => '123456',
 		];
 		$user->setAccess('*', false); // Mark all properties as protected
 		$user->setAccess(['id'], true); // Allow id to be accessible by default
@@ -516,7 +516,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$user = $this->Users->newEntity();
 		$data = [
 			'pwd' => 'somepwd',
-			'pwd_repeat' => 'somepwd'
+			'pwd_repeat' => 'somepwd',
 		];
 		$user->setAccess('*', false); // Mark all properties as protected
 		$user->setAccess(['id'], true);
@@ -534,13 +534,13 @@ class PasswordableBehaviorTest extends TestCase {
 			'formFieldRepeat' => 'pwd_repeat',
 			'current' => false,
 			'passwordHasher' => 'Complex',
-			'forceFieldList' => true
+			'forceFieldList' => true,
 		]);
 		$user = $this->Users->newEntity();
 		$data = [
 			'name' => 'x',
 			'pwd' => 'somepwd',
-			'pwd_repeat' => 'somepwd'
+			'pwd_repeat' => 'somepwd',
 		];
 		$user->setAccess('*', false); // Mark all properties as protected
 		$user->setAccess(['id'], true);
@@ -569,7 +569,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$user = $this->Users->newEntity();
 		$data = [
 			'pwd' => 'somepwd',
-			'pwd_repeat' => 'somepwd'
+			'pwd_repeat' => 'somepwd',
 		];
 		$this->Users->patchEntity($user, $data);
 		$result = $this->Users->save($user);
@@ -595,7 +595,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$data = [
 			'pwd_current' => 'somepwdx',
 			'pwd' => '123456',
-			'pwd_repeat' => '123456'
+			'pwd_repeat' => '123456',
 		];
 		$this->Users->patchEntity($user, $data);
 		$result = $this->Users->save($user);
@@ -606,7 +606,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$data = [
 			'pwd_current' => 'somepwd',
 			'pwd' => '123456',
-			'pwd_repeat' => '123456'
+			'pwd_repeat' => '123456',
 		];
 		$this->Users->patchEntity($user, $data);
 		$result = $this->Users->save($user);
@@ -623,7 +623,7 @@ class PasswordableBehaviorTest extends TestCase {
 			'allowSame' => false,
 			'current' => false,
 			'authType' => 'Blowfish',
-			'passwordHasher' => 'Default'
+			'passwordHasher' => 'Default',
 		]);
 
 		$hash = password_hash('foobar', PASSWORD_BCRYPT);
@@ -656,7 +656,7 @@ class PasswordableBehaviorTest extends TestCase {
 			'allowSame' => false,
 			'current' => false,
 			'authType' => 'Blowfish',
-			'passwordHasher' => 'Default'
+			'passwordHasher' => 'Default',
 		]);
 
 		$hash = password_hash('foobar', PASSWORD_BCRYPT);
@@ -680,7 +680,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$user = $this->Users->newEntity();
 		$data = [
 			'pwd' => '123',
-			'pwd_repeat' => '123'
+			'pwd_repeat' => '123',
 		];
 		$this->Users->patchEntity($user, $data);
 		$result = $this->Users->save($user);
@@ -689,7 +689,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$user = $this->Users->newEntity();
 		$data = [
 			'pwd' => '12345678',
-			'pwd_repeat' => '12345678'
+			'pwd_repeat' => '12345678',
 		];
 		$this->Users->patchEntity($user, $data);
 		$result = $this->Users->save($user);
@@ -719,7 +719,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$hash = $user['password'];
 
 		$data = [
-			'pwd' => '1234'
+			'pwd' => '1234',
 		];
 		$this->Users->patchEntity($user, $data, ['validate' => false]);
 		$result2 = $this->Users->save($user);
@@ -744,7 +744,7 @@ class PasswordableBehaviorTest extends TestCase {
 				'rule' => ['custom', '#^[a-z]+$#'], // Just a test example, never use this regexp!
 				'message' => 'Foo Bar Ext',
 				'last' => true,
-			]
+			],
 		];
 		$this->Users->addBehavior('Tools.Passwordable', [
 			'customValidation' => $rules]);
@@ -752,7 +752,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$user = $this->Users->newEntity();
 		$data = [
 			'pwd' => '%123456',
-			'pwd_repeat' => '%123456'
+			'pwd_repeat' => '%123456',
 		];
 		$this->Users->patchEntity($user, $data);
 
@@ -766,7 +766,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$user = $this->Users->newEntity();
 		$data = [
 			'pwd' => 'abc123',
-			'pwd_repeat' => 'abc123'
+			'pwd_repeat' => 'abc123',
 		];
 		$this->Users->patchEntity($user, $data);
 		$is = $this->Users->save($user);
@@ -779,7 +779,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$user = $this->Users->newEntity();
 		$data = [
 			'pwd' => 'abcdef',
-			'pwd_repeat' => 'abcdef'
+			'pwd_repeat' => 'abcdef',
 		];
 		$this->Users->patchEntity($user, $data);
 		$is = $this->Users->save($user);

tests/TestCase/Model/Behavior/ResetBehaviorTest.php

@@ -22,7 +22,7 @@ class ResetBehaviorTest extends TestCase {
 	 * @var array
 	 */
 	public $fixtures = [
-		'plugin.Tools.ResetComments'
+		'plugin.Tools.ResetComments',
 	];
 
 	/**

tests/TestCase/Model/Behavior/SluggedBehaviorTest.php

@@ -20,7 +20,7 @@ class SluggedBehaviorTest extends TestCase {
 	 * @var array
 	 */
 	public $fixtures = [
-		'plugin.Tools.SluggedArticles'
+		'plugin.Tools.SluggedArticles',
 	];
 
 	/**
@@ -289,11 +289,11 @@ class SluggedBehaviorTest extends TestCase {
 		$result = $this->articles->find('all', [
 			'conditions' => ['title LIKE' => 'Andy Daw%'],
 			'fields' => ['title', 'slug'],
-			'order' => 'title'
+			'order' => 'title',
 		])->combine('title', 'slug')->toArray();
 		$expected = [
 			'Andy Dawsom' => 'bar',
-			'Andy Dawson' => 'foo'
+			'Andy Dawson' => 'foo',
 		];
 		$this->assertEquals($expected, $result);
 
@@ -304,11 +304,11 @@ class SluggedBehaviorTest extends TestCase {
 		$result = $this->articles->find('all', [
 			'conditions' => ['title LIKE' => 'Andy Daw%'],
 			'fields' => ['title', 'slug'],
-			'order' => 'title'
+			'order' => 'title',
 		])->combine('title', 'slug')->toArray();
 		$expected = [
 			'Andy Dawsom' => 'Andy-Dawsom',
-			'Andy Dawson' => 'Andy-Dawson'
+			'Andy Dawson' => 'Andy-Dawson',
 		];
 		$this->assertEquals($expected, $result);
 	}
@@ -351,7 +351,7 @@ class SluggedBehaviorTest extends TestCase {
 		$result = $this->articles->find('all', [
 			'conditions' => ['title LIKE' => 'Andy Daw%'],
 			'fields' => ['title', 'slug'],
-			'order' => 'title'
+			'order' => 'title',
 		])->combine('title', 'slug')->toArray();
 		$expected = [
 			'Andy Dawson' => 'Andy-Dawso',
@@ -364,7 +364,7 @@ class SluggedBehaviorTest extends TestCase {
 			'Andy Dawso7' => 'Andy-Daw-7',
 			'Andy Dawso8' => 'Andy-Daw-8',
 			'Andy Dawso9' => 'Andy-Daw-9',
-			'Andy Dawso0' => 'Andy-Da-10'
+			'Andy Dawso0' => 'Andy-Da-10',
 		];
 		$this->assertEquals($expected, $result);
 	}
@@ -631,7 +631,7 @@ class SluggedBehaviorTest extends TestCase {
 		$this->articles->addBehavior('Tools.Slugged', [
 			'label' => [
 				'title',
-				'special'
+				'special',
 			],
 		]);
 
@@ -733,7 +733,7 @@ class SluggedBehaviorTest extends TestCase {
 		}
 
 		$data = [
-			$field => $title
+			$field => $title,
 		] + $data;
 		return new Entity($data, $options);
 	}

tests/TestCase/Model/Behavior/StringBehaviorTest.php

@@ -11,7 +11,7 @@ class StringBehaviorTest extends TestCase {
 	 * @var array
 	 */
 	public $fixtures = [
-		'plugin.Tools.StringComments'
+		'plugin.Tools.StringComments',
 	];
 
 	/**
@@ -73,7 +73,7 @@ class StringBehaviorTest extends TestCase {
 		$data = [
 			'title' => 'some Name',
 			'comment' => 'blabla',
-			'url' => ''
+			'url' => '',
 		];
 		$entity = $this->Comments->newEntity($data);
 		$res = $this->Comments->save($entity);

tests/TestCase/Model/Behavior/ToggleBehaviorTest.php

@@ -11,7 +11,7 @@ class ToggleBehaviorTest extends TestCase {
 	 * @var array
 	 */
 	public $fixtures = [
-		'plugin.Tools.ToggleAddresses'
+		'plugin.Tools.ToggleAddresses',
 	];
 
 	/**

tests/TestCase/Model/Behavior/TypeMapBehaviorTest.php

@@ -21,7 +21,7 @@ class TypeMapBehaviorTest extends TestCase {
 	 * @var array
 	 */
 	public $fixtures = [
-		'plugin.Tools.Data'
+		'plugin.Tools.Data',
 	];
 
 	/**

tests/TestCase/Model/Behavior/TypographicBehaviorTest.php

@@ -16,7 +16,7 @@ class TypographicBehaviorTest extends TestCase {
 	 * @var array
 	 */
 	public $fixtures = [
-		'core.Articles'
+		'core.Articles',
 	];
 
 	/**
@@ -59,7 +59,7 @@ class TypographicBehaviorTest extends TestCase {
 		foreach ($strings as $was => $expected) {
 			$data = [
 				'title' => 'some «cool» title',
-				'body' => $was
+				'body' => $was,
 			];
 			$entity = $this->Model->newEntity($data);
 			$this->assertEmpty($entity->getErrors());
@@ -85,7 +85,7 @@ class TypographicBehaviorTest extends TestCase {
 		foreach ($strings as $was => $expected) {
 			$data = [
 				'title' => 'some «cool» title',
-				'body' => $was
+				'body' => $was,
 			];
 			$entity = $this->Model->newEntity($data);
 			$this->assertEmpty($entity->getErrors());

tests/TestCase/Model/Entity/EntityTest.php

@@ -12,7 +12,7 @@ class EntityTest extends TestCase {
 	 */
 	public $fixtures = [
 		'plugin.Tools.ToolsUsers',
-		'plugin.Tools.Roles'
+		'plugin.Tools.Roles',
 	];
 
 	/**

tests/TestCase/Model/Table/TableTest.php

@@ -17,7 +17,7 @@ class TableTest extends TestCase {
 		'core.Posts',
 		'core.Authors',
 		'plugin.Tools.ToolsUsers',
-		'plugin.Tools.Roles'
+		'plugin.Tools.Roles',
 	];
 
 	/**
@@ -167,7 +167,7 @@ class TableTest extends TestCase {
 			'Asterix',
 			'Gandalf',
 			'Harry Potter',
-			'Obelix'
+			'Obelix',
 		];
 		$this->assertSame($expected, array_values($result));
 	}
@@ -479,13 +479,13 @@ class TableTest extends TestCase {
 			'validateUnique' => [
 				'rule' => 'validateUniqueExt',
 				'message' => 'valErrRecordTitleExists',
-				'provider' => 'table'
+				'provider' => 'table',
 			],
 		]);
 		$data = [
 			'title' => 'abc',
 			'author_id' => 1,
-			'published' => 'N'
+			'published' => 'N',
 		];
 		$post = $this->Posts->newEntity($data);
 		$this->assertEmpty($post->getErrors());
@@ -500,13 +500,13 @@ class TableTest extends TestCase {
 			'validateUnique' => [
 				'rule' => ['validateUniqueExt', ['scope' => ['published']]],
 				'message' => 'valErrRecordTitleExists',
-				'provider' => 'table'
+				'provider' => 'table',
 			],
 		]);
 		$data = [
 			'title' => 'abc',
 			'author_id' => 1,
-			'published' => 'Y'
+			'published' => 'Y',
 		];
 		$post = $this->Posts->newEntity($data);
 		$this->assertEmpty($post->getErrors());

tests/TestCase/Model/Table/TokensTableTest.php

@@ -16,7 +16,7 @@ class TokensTableTest extends TestCase {
 	 * @var array
 	 */
 	public $fixtures = [
-		'plugin.Tools.Tokens'
+		'plugin.Tools.Tokens',
 	];
 
 	/**
@@ -71,7 +71,7 @@ class TokensTableTest extends TestCase {
 		$data = [
 			'created' => date(FORMAT_DB_DATETIME, time() - 3 * MONTH),
 			'type' => 'y',
-			'key' => 'x'
+			'key' => 'x',
 		];
 		$entity = $this->Tokens->newEntity($data, ['validate' => false]);
 		$this->Tokens->save($entity);

tests/TestCase/Utility/L10nTest.php

@@ -366,7 +366,7 @@ class L10nTest extends TestCase {
 
 		$result = $localize->catalog(['af']);
 		$expected = [
-			'af' => ['language' => 'Afrikaans', 'locale' => 'afr', 'localeFallback' => 'afr', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'af' => ['language' => 'Afrikaans', 'locale' => 'afr', 'localeFallback' => 'afr', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
@@ -389,43 +389,43 @@ class L10nTest extends TestCase {
 			'ar-sa' => ['language' => 'Arabic (Saudi Arabia)', 'locale' => 'ar_sa', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'],
 			'ar-sy' => ['language' => 'Arabic (Syria)', 'locale' => 'ar_sy', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'],
 			'ar-tn' => ['language' => 'Arabic (Tunisia)', 'locale' => 'ar_tn', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'],
-			'ar-ye' => ['language' => 'Arabic (Yemen)', 'locale' => 'ar_ye', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl']
+			'ar-ye' => ['language' => 'Arabic (Yemen)', 'locale' => 'ar_ye', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['be']);
 		$expected = [
-			'be' => ['language' => 'Byelorussian', 'locale' => 'bel', 'localeFallback' => 'bel', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'be' => ['language' => 'Byelorussian', 'locale' => 'bel', 'localeFallback' => 'bel', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['bg']);
 		$expected = [
-			'bg' => ['language' => 'Bulgarian', 'locale' => 'bul', 'localeFallback' => 'bul', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'bg' => ['language' => 'Bulgarian', 'locale' => 'bul', 'localeFallback' => 'bul', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['bs']);
 		$expected = [
-			'bs' => ['language' => 'Bosnian', 'locale' => 'bos', 'localeFallback' => 'bos', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'bs' => ['language' => 'Bosnian', 'locale' => 'bos', 'localeFallback' => 'bos', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['ca']);
 		$expected = [
-			'ca' => ['language' => 'Catalan', 'locale' => 'cat', 'localeFallback' => 'cat', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'ca' => ['language' => 'Catalan', 'locale' => 'cat', 'localeFallback' => 'cat', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['cs']);
 		$expected = [
-			'cs' => ['language' => 'Czech', 'locale' => 'ces', 'localeFallback' => 'ces', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'cs' => ['language' => 'Czech', 'locale' => 'ces', 'localeFallback' => 'ces', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['da']);
 		$expected = [
-			'da' => ['language' => 'Danish', 'locale' => 'dan', 'localeFallback' => 'dan', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'da' => ['language' => 'Danish', 'locale' => 'dan', 'localeFallback' => 'dan', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
@@ -436,13 +436,13 @@ class L10nTest extends TestCase {
 			'de-ch' => ['language' => 'German (Swiss)', 'locale' => 'de_ch', 'localeFallback' => 'deu', 'charset' => 'utf-8', 'direction' => 'ltr'],
 			'de-de' => ['language' => 'German (Germany)', 'locale' => 'de_de', 'localeFallback' => 'deu', 'charset' => 'utf-8', 'direction' => 'ltr'],
 			'de-li' => ['language' => 'German (Liechtenstein)', 'locale' => 'de_li', 'localeFallback' => 'deu', 'charset' => 'utf-8', 'direction' => 'ltr'],
-			'de-lu' => ['language' => 'German (Luxembourg)', 'locale' => 'de_lu', 'localeFallback' => 'deu', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'de-lu' => ['language' => 'German (Luxembourg)', 'locale' => 'de_lu', 'localeFallback' => 'deu', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['el']);
 		$expected = [
-			'el' => ['language' => 'Greek', 'locale' => 'ell', 'localeFallback' => 'ell', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'el' => ['language' => 'Greek', 'locale' => 'ell', 'localeFallback' => 'ell', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
@@ -458,7 +458,7 @@ class L10nTest extends TestCase {
 			'en-nz' => ['language' => 'English (New Zealand)', 'locale' => 'en_nz', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'],
 			'en-tt' => ['language' => 'English (Trinidad)', 'locale' => 'en_tt', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'],
 			'en-us' => ['language' => 'English (United States)', 'locale' => 'en_us', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'],
-			'en-za' => ['language' => 'English (South Africa)', 'locale' => 'en_za', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'en-za' => ['language' => 'English (South Africa)', 'locale' => 'en_za', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
@@ -484,37 +484,37 @@ class L10nTest extends TestCase {
 			'es-py' => ['language' => 'Spanish (Paraguay)', 'locale' => 'es_py', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'],
 			'es-sv' => ['language' => 'Spanish (El Salvador)', 'locale' => 'es_sv', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'],
 			'es-uy' => ['language' => 'Spanish (Uruguay)', 'locale' => 'es_uy', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'],
-			'es-ve' => ['language' => 'Spanish (Venezuela)', 'locale' => 'es_ve', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'es-ve' => ['language' => 'Spanish (Venezuela)', 'locale' => 'es_ve', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['et']);
 		$expected = [
-			'et' => ['language' => 'Estonian', 'locale' => 'est', 'localeFallback' => 'est', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'et' => ['language' => 'Estonian', 'locale' => 'est', 'localeFallback' => 'est', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['eu']);
 		$expected = [
-			'eu' => ['language' => 'Basque', 'locale' => 'eus', 'localeFallback' => 'eus', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'eu' => ['language' => 'Basque', 'locale' => 'eus', 'localeFallback' => 'eus', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['fa']);
 		$expected = [
-			'fa' => ['language' => 'Farsi', 'locale' => 'fas', 'localeFallback' => 'fas', 'charset' => 'utf-8', 'direction' => 'rtl']
+			'fa' => ['language' => 'Farsi', 'locale' => 'fas', 'localeFallback' => 'fas', 'charset' => 'utf-8', 'direction' => 'rtl'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['fi']);
 		$expected = [
-			'fi' => ['language' => 'Finnish', 'locale' => 'fin', 'localeFallback' => 'fin', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'fi' => ['language' => 'Finnish', 'locale' => 'fin', 'localeFallback' => 'fin', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['fo']);
 		$expected = [
-			'fo' => ['language' => 'Faeroese', 'locale' => 'fao', 'localeFallback' => 'fao', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'fo' => ['language' => 'Faeroese', 'locale' => 'fao', 'localeFallback' => 'fao', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
@@ -525,56 +525,56 @@ class L10nTest extends TestCase {
 			'fr-ca' => ['language' => 'French (Canadian)', 'locale' => 'fr_ca', 'localeFallback' => 'fra', 'charset' => 'utf-8', 'direction' => 'ltr'],
 			'fr-ch' => ['language' => 'French (Swiss)', 'locale' => 'fr_ch', 'localeFallback' => 'fra', 'charset' => 'utf-8', 'direction' => 'ltr'],
 			'fr-fr' => ['language' => 'French (France)', 'locale' => 'fr_fr', 'localeFallback' => 'fra', 'charset' => 'utf-8', 'direction' => 'ltr'],
-			'fr-lu' => ['language' => 'French (Luxembourg)', 'locale' => 'fr_lu', 'localeFallback' => 'fra', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'fr-lu' => ['language' => 'French (Luxembourg)', 'locale' => 'fr_lu', 'localeFallback' => 'fra', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['ga']);
 		$expected = [
-			'ga' => ['language' => 'Irish', 'locale' => 'gle', 'localeFallback' => 'gle', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'ga' => ['language' => 'Irish', 'locale' => 'gle', 'localeFallback' => 'gle', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['gd', 'gd-ie']);
 		$expected = [
 			'gd' => ['language' => 'Gaelic (Scots)', 'locale' => 'gla', 'localeFallback' => 'gla', 'charset' => 'utf-8', 'direction' => 'ltr'],
-			'gd-ie' => ['language' => 'Gaelic (Irish)', 'locale' => 'gd_ie', 'localeFallback' => 'gla', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'gd-ie' => ['language' => 'Gaelic (Irish)', 'locale' => 'gd_ie', 'localeFallback' => 'gla', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['gl']);
 		$expected = [
-			'gl' => ['language' => 'Galician', 'locale' => 'glg', 'localeFallback' => 'glg', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'gl' => ['language' => 'Galician', 'locale' => 'glg', 'localeFallback' => 'glg', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['he']);
 		$expected = [
-			'he' => ['language' => 'Hebrew', 'locale' => 'heb', 'localeFallback' => 'heb', 'charset' => 'utf-8', 'direction' => 'rtl']
+			'he' => ['language' => 'Hebrew', 'locale' => 'heb', 'localeFallback' => 'heb', 'charset' => 'utf-8', 'direction' => 'rtl'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['hi']);
 		$expected = [
-			'hi' => ['language' => 'Hindi', 'locale' => 'hin', 'localeFallback' => 'hin', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'hi' => ['language' => 'Hindi', 'locale' => 'hin', 'localeFallback' => 'hin', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['hr']);
 		$expected = [
-			'hr' => ['language' => 'Croatian', 'locale' => 'hrv', 'localeFallback' => 'hrv', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'hr' => ['language' => 'Croatian', 'locale' => 'hrv', 'localeFallback' => 'hrv', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['hu']);
 		$expected = [
-			'hu' => ['language' => 'Hungarian', 'locale' => 'hun', 'localeFallback' => 'hun', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'hu' => ['language' => 'Hungarian', 'locale' => 'hun', 'localeFallback' => 'hun', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['hy']);
 		$expected = [
-			'hy' => ['language' => 'Armenian - Armenia', 'locale' => 'hye', 'localeFallback' => 'hye', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'hy' => ['language' => 'Armenian - Armenia', 'locale' => 'hye', 'localeFallback' => 'hye', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
@@ -586,26 +586,26 @@ class L10nTest extends TestCase {
 
 		$result = $localize->catalog(['is']);
 		$expected = [
-			'is' => ['language' => 'Icelandic', 'locale' => 'isl', 'localeFallback' => 'isl', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'is' => ['language' => 'Icelandic', 'locale' => 'isl', 'localeFallback' => 'isl', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['it', 'it-ch']);
 		$expected = [
 			'it' => ['language' => 'Italian', 'locale' => 'ita', 'localeFallback' => 'ita', 'charset' => 'utf-8', 'direction' => 'ltr'],
-			'it-ch' => ['language' => 'Italian (Swiss) ', 'locale' => 'it_ch', 'localeFallback' => 'ita', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'it-ch' => ['language' => 'Italian (Swiss) ', 'locale' => 'it_ch', 'localeFallback' => 'ita', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['ja']);
 		$expected = [
-			'ja' => ['language' => 'Japanese', 'locale' => 'jpn', 'localeFallback' => 'jpn', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'ja' => ['language' => 'Japanese', 'locale' => 'jpn', 'localeFallback' => 'jpn', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['kk']);
 		$expected = [
-			'kk' => ['language' => 'Kazakh', 'locale' => 'kaz', 'localeFallback' => 'kaz', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'kk' => ['language' => 'Kazakh', 'locale' => 'kaz', 'localeFallback' => 'kaz', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
@@ -613,7 +613,7 @@ class L10nTest extends TestCase {
 		$expected = [
 			'ko' => ['language' => 'Korean', 'locale' => 'kor', 'localeFallback' => 'kor', 'charset' => 'kr', 'direction' => 'ltr'],
 			'ko-kp' => ['language' => 'Korea (North)', 'locale' => 'ko_kp', 'localeFallback' => 'kor', 'charset' => 'kr', 'direction' => 'ltr'],
-			'ko-kr' => ['language' => 'Korea (South)', 'locale' => 'ko_kr', 'localeFallback' => 'kor', 'charset' => 'kr', 'direction' => 'ltr']
+			'ko-kr' => ['language' => 'Korea (South)', 'locale' => 'ko_kr', 'localeFallback' => 'kor', 'charset' => 'kr', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
@@ -621,45 +621,45 @@ class L10nTest extends TestCase {
 		$expected = [
 			'koi8-r' => ['language' => 'Russian', 'locale' => 'koi8_r', 'localeFallback' => 'rus', 'charset' => 'koi8-r', 'direction' => 'ltr'],
 			'ru' => ['language' => 'Russian', 'locale' => 'rus', 'localeFallback' => 'rus', 'charset' => 'utf-8', 'direction' => 'ltr'],
-			'ru-mo' => ['language' => 'Russian (Moldavia)', 'locale' => 'ru_mo', 'localeFallback' => 'rus', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'ru-mo' => ['language' => 'Russian (Moldavia)', 'locale' => 'ru_mo', 'localeFallback' => 'rus', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['lt']);
 		$expected = [
-			'lt' => ['language' => 'Lithuanian', 'locale' => 'lit', 'localeFallback' => 'lit', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'lt' => ['language' => 'Lithuanian', 'locale' => 'lit', 'localeFallback' => 'lit', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['lv']);
 		$expected = [
-			'lv' => ['language' => 'Latvian', 'locale' => 'lav', 'localeFallback' => 'lav', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'lv' => ['language' => 'Latvian', 'locale' => 'lav', 'localeFallback' => 'lav', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['mk', 'mk-mk']);
 		$expected = [
 			'mk' => ['language' => 'FYRO Macedonian', 'locale' => 'mkd', 'localeFallback' => 'mkd', 'charset' => 'utf-8', 'direction' => 'ltr'],
-			'mk-mk' => ['language' => 'Macedonian', 'locale' => 'mk_mk', 'localeFallback' => 'mkd', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'mk-mk' => ['language' => 'Macedonian', 'locale' => 'mk_mk', 'localeFallback' => 'mkd', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['ms']);
 		$expected = [
-			'ms' => ['language' => 'Malaysian', 'locale' => 'msa', 'localeFallback' => 'msa', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'ms' => ['language' => 'Malaysian', 'locale' => 'msa', 'localeFallback' => 'msa', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['mt']);
 		$expected = [
-			'mt' => ['language' => 'Maltese', 'locale' => 'mlt', 'localeFallback' => 'mlt', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'mt' => ['language' => 'Maltese', 'locale' => 'mlt', 'localeFallback' => 'mlt', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['nl', 'nl-be']);
 		$expected = [
 			'nl' => ['language' => 'Dutch (Standard)', 'locale' => 'nld', 'localeFallback' => 'nld', 'charset' => 'utf-8', 'direction' => 'ltr'],
-			'nl-be' => ['language' => 'Dutch (Belgium)', 'locale' => 'nl_be', 'localeFallback' => 'nld', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'nl-be' => ['language' => 'Dutch (Belgium)', 'locale' => 'nl_be', 'localeFallback' => 'nld', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
@@ -677,150 +677,150 @@ class L10nTest extends TestCase {
 
 		$result = $localize->catalog(['nb']);
 		$expected = [
-			'nb' => ['language' => 'Norwegian Bokmal', 'locale' => 'nob', 'localeFallback' => 'nor', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'nb' => ['language' => 'Norwegian Bokmal', 'locale' => 'nob', 'localeFallback' => 'nor', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['nn', 'no']);
 		$expected = [
 			'nn' => ['language' => 'Norwegian Nynorsk', 'locale' => 'nno', 'localeFallback' => 'nor', 'charset' => 'utf-8', 'direction' => 'ltr'],
-			'no' => ['language' => 'Norwegian', 'locale' => 'nor', 'localeFallback' => 'nor', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'no' => ['language' => 'Norwegian', 'locale' => 'nor', 'localeFallback' => 'nor', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['pl']);
 		$expected = [
-			'pl' => ['language' => 'Polish', 'locale' => 'pol', 'localeFallback' => 'pol', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'pl' => ['language' => 'Polish', 'locale' => 'pol', 'localeFallback' => 'pol', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['pt', 'pt-br']);
 		$expected = [
 			'pt' => ['language' => 'Portuguese (Portugal)', 'locale' => 'por', 'localeFallback' => 'por', 'charset' => 'utf-8', 'direction' => 'ltr'],
-			'pt-br' => ['language' => 'Portuguese (Brazil)', 'locale' => 'pt_br', 'localeFallback' => 'por', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'pt-br' => ['language' => 'Portuguese (Brazil)', 'locale' => 'pt_br', 'localeFallback' => 'por', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['rm']);
 		$expected = [
-			'rm' => ['language' => 'Rhaeto-Romanic', 'locale' => 'roh', 'localeFallback' => 'roh', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'rm' => ['language' => 'Rhaeto-Romanic', 'locale' => 'roh', 'localeFallback' => 'roh', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['ro', 'ro-mo']);
 		$expected = [
 			'ro' => ['language' => 'Romanian', 'locale' => 'ron', 'localeFallback' => 'ron', 'charset' => 'utf-8', 'direction' => 'ltr'],
-			'ro-mo' => ['language' => 'Romanian (Moldavia)', 'locale' => 'ro_mo', 'localeFallback' => 'ron', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'ro-mo' => ['language' => 'Romanian (Moldavia)', 'locale' => 'ro_mo', 'localeFallback' => 'ron', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['sb']);
 		$expected = [
-			'sb' => ['language' => 'Sorbian', 'locale' => 'wen', 'localeFallback' => 'wen', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'sb' => ['language' => 'Sorbian', 'locale' => 'wen', 'localeFallback' => 'wen', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['sk']);
 		$expected = [
-			'sk' => ['language' => 'Slovak', 'locale' => 'slk', 'localeFallback' => 'slk', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'sk' => ['language' => 'Slovak', 'locale' => 'slk', 'localeFallback' => 'slk', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['sl']);
 		$expected = [
-			'sl' => ['language' => 'Slovenian', 'locale' => 'slv', 'localeFallback' => 'slv', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'sl' => ['language' => 'Slovenian', 'locale' => 'slv', 'localeFallback' => 'slv', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['sq']);
 		$expected = [
-			'sq' => ['language' => 'Albanian', 'locale' => 'sqi', 'localeFallback' => 'sqi', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'sq' => ['language' => 'Albanian', 'locale' => 'sqi', 'localeFallback' => 'sqi', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['sr']);
 		$expected = [
-			'sr' => ['language' => 'Serbian', 'locale' => 'srp', 'localeFallback' => 'srp', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'sr' => ['language' => 'Serbian', 'locale' => 'srp', 'localeFallback' => 'srp', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['sv', 'sv-fi']);
 		$expected = [
 			'sv' => ['language' => 'Swedish', 'locale' => 'swe', 'localeFallback' => 'swe', 'charset' => 'utf-8', 'direction' => 'ltr'],
-			'sv-fi' => ['language' => 'Swedish (Finland)', 'locale' => 'sv_fi', 'localeFallback' => 'swe', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'sv-fi' => ['language' => 'Swedish (Finland)', 'locale' => 'sv_fi', 'localeFallback' => 'swe', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['se']);
 		$expected = [
-			'se' => ['language' => 'Sami', 'locale' => 'sme', 'localeFallback' => 'sme', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'se' => ['language' => 'Sami', 'locale' => 'sme', 'localeFallback' => 'sme', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['th']);
 		$expected = [
-			'th' => ['language' => 'Thai', 'locale' => 'tha', 'localeFallback' => 'tha', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'th' => ['language' => 'Thai', 'locale' => 'tha', 'localeFallback' => 'tha', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['tn']);
 		$expected = [
-			'tn' => ['language' => 'Tswana', 'locale' => 'tsn', 'localeFallback' => 'tsn', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'tn' => ['language' => 'Tswana', 'locale' => 'tsn', 'localeFallback' => 'tsn', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['tr']);
 		$expected = [
-			'tr' => ['language' => 'Turkish', 'locale' => 'tur', 'localeFallback' => 'tur', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'tr' => ['language' => 'Turkish', 'locale' => 'tur', 'localeFallback' => 'tur', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['ts']);
 		$expected = [
-			'ts' => ['language' => 'Tsonga', 'locale' => 'tso', 'localeFallback' => 'tso', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'ts' => ['language' => 'Tsonga', 'locale' => 'tso', 'localeFallback' => 'tso', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['uk']);
 		$expected = [
-			'uk' => ['language' => 'Ukrainian', 'locale' => 'ukr', 'localeFallback' => 'ukr', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'uk' => ['language' => 'Ukrainian', 'locale' => 'ukr', 'localeFallback' => 'ukr', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['ur']);
 		$expected = [
-			'ur' => ['language' => 'Urdu', 'locale' => 'urd', 'localeFallback' => 'urd', 'charset' => 'utf-8', 'direction' => 'rtl']
+			'ur' => ['language' => 'Urdu', 'locale' => 'urd', 'localeFallback' => 'urd', 'charset' => 'utf-8', 'direction' => 'rtl'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['ve']);
 		$expected = [
-			've' => ['language' => 'Venda', 'locale' => 'ven', 'localeFallback' => 'ven', 'charset' => 'utf-8', 'direction' => 'ltr']
+			've' => ['language' => 'Venda', 'locale' => 'ven', 'localeFallback' => 'ven', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['vi']);
 		$expected = [
-			'vi' => ['language' => 'Vietnamese', 'locale' => 'vie', 'localeFallback' => 'vie', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'vi' => ['language' => 'Vietnamese', 'locale' => 'vie', 'localeFallback' => 'vie', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['cy']);
 		$expected = [
 			'cy' => ['language' => 'Welsh', 'locale' => 'cym', 'localeFallback' => 'cym', 'charset' => 'utf-8',
-			'direction' => 'ltr']
+			'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['xh']);
 		$expected = [
-			'xh' => ['language' => 'Xhosa', 'locale' => 'xho', 'localeFallback' => 'xho', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'xh' => ['language' => 'Xhosa', 'locale' => 'xho', 'localeFallback' => 'xho', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['yi']);
 		$expected = [
-			'yi' => ['language' => 'Yiddish', 'locale' => 'yid', 'localeFallback' => 'yid', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'yi' => ['language' => 'Yiddish', 'locale' => 'yid', 'localeFallback' => 'yid', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
@@ -830,13 +830,13 @@ class L10nTest extends TestCase {
 			'zh-cn' => ['language' => 'Chinese (PRC)', 'locale' => 'zh_cn', 'localeFallback' => 'zho', 'charset' => 'GB2312', 'direction' => 'ltr'],
 			'zh-hk' => ['language' => 'Chinese (Hong Kong)', 'locale' => 'zh_hk', 'localeFallback' => 'zho', 'charset' => 'utf-8', 'direction' => 'ltr'],
 			'zh-sg' => ['language' => 'Chinese (Singapore)', 'locale' => 'zh_sg', 'localeFallback' => 'zho', 'charset' => 'utf-8', 'direction' => 'ltr'],
-			'zh-tw' => ['language' => 'Chinese (Taiwan)', 'locale' => 'zh_tw', 'localeFallback' => 'zho', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'zh-tw' => ['language' => 'Chinese (Taiwan)', 'locale' => 'zh_tw', 'localeFallback' => 'zho', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
 		$result = $localize->catalog(['zu']);
 		$expected = [
-			'zu' => ['language' => 'Zulu', 'locale' => 'zul', 'localeFallback' => 'zul', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'zu' => ['language' => 'Zulu', 'locale' => 'zul', 'localeFallback' => 'zul', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
@@ -846,7 +846,7 @@ class L10nTest extends TestCase {
 			'es-do' => ['language' => 'Spanish (Dominican Republic)', 'locale' => 'es_do', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'],
 			'ar-lb' => ['language' => 'Arabic (Lebanon)', 'locale' => 'ar_lb', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'],
 			'zh-hk' => ['language' => 'Chinese (Hong Kong)', 'locale' => 'zh_hk', 'localeFallback' => 'zho', 'charset' => 'utf-8', 'direction' => 'ltr'],
-			'pt-br' => ['language' => 'Portuguese (Brazil)', 'locale' => 'pt_br', 'localeFallback' => 'por', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'pt-br' => ['language' => 'Portuguese (Brazil)', 'locale' => 'pt_br', 'localeFallback' => 'por', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 
@@ -857,7 +857,7 @@ class L10nTest extends TestCase {
 			'zho' => ['language' => 'Chinese', 'locale' => 'zho', 'localeFallback' => 'zho', 'charset' => 'utf-8', 'direction' => 'ltr'],
 			'rum' => ['language' => 'Romanian', 'locale' => 'ron', 'localeFallback' => 'ron', 'charset' => 'utf-8', 'direction' => 'ltr'],
 			'zul' => ['language' => 'Zulu', 'locale' => 'zul', 'localeFallback' => 'zul', 'charset' => 'utf-8', 'direction' => 'ltr'],
-			'yid' => ['language' => 'Yiddish', 'locale' => 'yid', 'localeFallback' => 'yid', 'charset' => 'utf-8', 'direction' => 'ltr']
+			'yid' => ['language' => 'Yiddish', 'locale' => 'yid', 'localeFallback' => 'yid', 'charset' => 'utf-8', 'direction' => 'ltr'],
 		];
 		$this->assertEquals($expected, $result);
 	}

tests/TestCase/Utility/LanguageTest.php

@@ -36,17 +36,17 @@ class LanguageTest extends TestCase {
 		$res = Language::parseLanguageList();
 		$expected = [
 			'1.0' => [
-				'de-de'
+				'de-de',
 			],
 			'0.8' => [
-				'de'
+				'de',
 			],
 			'0.6' => [
-				'en-us'
+				'en-us',
 			],
 			'0.4' => [
-				'en'
-			]
+				'en',
+			],
 		];
 		$this->assertSame($expected, $res);
 
@@ -63,7 +63,7 @@ class LanguageTest extends TestCase {
 		$expected = [
 			'1.0' => [
 				'fi-FI',
-				'de-DE'
+				'de-DE',
 			],
 		];
 		$this->assertSame($expected, $res);
@@ -72,7 +72,7 @@ class LanguageTest extends TestCase {
 		$expected = [
 			'1.0' => [
 				'fi-FI',
-				'de-DE'
+				'de-DE',
 			],
 		];
 		$this->assertSame($expected, $res);
@@ -120,39 +120,39 @@ class LanguageTest extends TestCase {
 		$res = Language::findMatches(['de', 'en']);
 		$expected = [
 			'1.0' => [
-				'de-de'
+				'de-de',
 			],
 			'0.8' => [
-				'de'
+				'de',
 			],
 			'0.6' => [
-				'en-us'
+				'en-us',
 			],
 			'0.4' => [
-				'en'
-			]
+				'en',
+			],
 		];
 		$this->assertSame($expected, $res);
 
 		$res = Language::findMatches(['DE']);
 		$expected = [
 			'1.0' => [
-				'de-de'
+				'de-de',
 			],
 			'0.8' => [
-				'de'
-			]
+				'de',
+			],
 		];
 		$this->assertSame($expected, $res);
 
 		$res = Language::findMatches(['cs', 'en']);
 		$expected = [
 			'0.6' => [
-				'en-us'
+				'en-us',
 			],
 			'0.4' => [
-				'en'
-			]
+				'en',
+			],
 		];
 		$this->assertSame($expected, $res);
 	}

tests/TestCase/Utility/MimeTest.php

@@ -151,7 +151,7 @@ class MimeTest extends TestCase {
 		$diff = [
 			'coreonly' => [],
 			'pluginonly' => [],
-			'modified' => []
+			'modified' => [],
 		];
 		foreach ($core as $key => $value) {
 			if (!isset($plugin[$key])) {

tests/TestCase/Utility/NumberTest.php

@@ -142,7 +142,7 @@ class NumberTest extends TestCase {
 			'3.4' => 0,
 			'6' => 10,
 			'-3.12' => 0,
-			'-10' => -10
+			'-10' => -10,
 		];
 		foreach ($values as $was => $expected) {
 			$is = Number::roundTo($was, 10);
@@ -155,7 +155,7 @@ class NumberTest extends TestCase {
 			'3.4' => 3.4,
 			'6.131' => 6.1,
 			'-3.17' => -3.2,
-			'-10.99' => -11.0
+			'-10.99' => -11.0,
 		];
 		foreach ($values2 as $was => $expected) {
 			$is = Number::roundTo($was, 0.1);
@@ -174,7 +174,7 @@ class NumberTest extends TestCase {
 			'3.4' => 10.0,
 			'6' => 10.0,
 			'-3.12' => -0.0,
-			'-10' => -10.0
+			'-10' => -10.0,
 		];
 		foreach ($values as $was => $expected) {
 			$is = Number::roundUpTo($was, 10);
@@ -187,7 +187,7 @@ class NumberTest extends TestCase {
 			'3.4' => 5.0,
 			'6.131' => 10.0,
 			'-3.17' => -0.0,
-			'-10.99' => -10.0
+			'-10.99' => -10.0,
 		];
 		foreach ($values as $was => $expected) {
 			$is = Number::roundUpTo($was, 5);
@@ -206,7 +206,7 @@ class NumberTest extends TestCase {
 			'3.4' => 0.0,
 			'6' => 0.0,
 			'-3.12' => -10.0,
-			'-10' => -10.0
+			'-10' => -10.0,
 		];
 		foreach ($values as $was => $expected) {
 			$is = Number::roundDownTo($was, 10);
@@ -219,7 +219,7 @@ class NumberTest extends TestCase {
 			'3.4' => 3.0,
 			'6.131' => 6.0,
 			'-3.17' => -6.0,
-			'-10.99' => -12.0
+			'-10.99' => -12.0,
 		];
 		foreach ($values as $was => $expected) {
 			$is = Number::roundDownTo($was, 3);
@@ -237,7 +237,7 @@ class NumberTest extends TestCase {
 			'10' => -1,
 			'0.1' => 1,
 			'1' => 0,
-			'0.001' => 3
+			'0.001' => 3,
 		];
 		foreach ($values as $was => $expected) {
 			$is = Number::getDecimalPlaces($was, 10);

tests/TestCase/Utility/TimeTest.php

@@ -296,7 +296,7 @@ class TimeTest extends TestCase {
 		//$this->out($this->_header(__FUNCTION__), true);
 		$values = [
 			['2010-02-23 11:11:11', '2010-02-23 11:12:01', 50],
-			['2010-02-23 11:11:11', '2010-02-24 11:12:01', DAY + 50]
+			['2010-02-23 11:11:11', '2010-02-24 11:12:01', DAY + 50],
 		];
 
 		foreach ($values as $v) {
@@ -411,7 +411,7 @@ class TimeTest extends TestCase {
 		$values = [
 			[20, 20, ['min' => '1990-07-07', 'max' => '1991-07-06']],
 			[10, 30, ['min' => '1980-07-07', 'max' => '2001-07-06']],
-			[11, 12, ['min' => '1998-07-07', 'max' => '2000-07-06']]
+			[11, 12, ['min' => '1998-07-07', 'max' => '2000-07-06']],
 		];
 
 		foreach ($values as $v) {
@@ -956,7 +956,7 @@ class TimeTest extends TestCase {
 			7220 => '2:00:20',
 			5400 => '1:30:00',
 			3660 => '1:01:00',
-			43202 => '12:00:02'
+			43202 => '12:00:02',
 		];
 
 		// positive
@@ -976,7 +976,7 @@ class TimeTest extends TestCase {
 		$tests = [
 			7220 => '2:00', # 02:00:20 => rounded to 2:00:00
 			7441 => '2:04',
-			43202 => '12:00'
+			43202 => '12:00',
 		];
 
 		// positive

tests/TestCase/Utility/UtilityTest.php

@@ -139,7 +139,7 @@ class UtilityTest extends TestCase {
 			$string,
 			'D',
 			'81245',
-			'München'
+			'München',
 		];
 		$this->assertSame($expected, $matches);
 
@@ -180,8 +180,8 @@ class UtilityTest extends TestCase {
 				$string,
 				'D',
 				'81245',
-				'München'
-			]
+				'München',
+			],
 		];
 		$this->assertSame($expected, $matches);
 
@@ -343,7 +343,7 @@ class UtilityTest extends TestCase {
 			'bol' => true,
 			'bl' => 'true',
 			'flt' => 3.14,
-			'fl' => '3.14'
+			'fl' => '3.14',
 		];
 		$expected = [
 			'f some',
@@ -354,7 +354,7 @@ class UtilityTest extends TestCase {
 			'bol' => true,
 			'bl' => 'true',
 			'flt' => 3.14,
-			'fl' => '3.14'
+			'fl' => '3.14',
 		];
 
 		$res = Utility::trimDeep($is);
@@ -369,12 +369,12 @@ class UtilityTest extends TestCase {
 		$is = [
 			'f some',
 			'e 49r ' => 'rf r ',
-			'er' => [['ee' => ['rr ' => ' tt ', 'empty' => null]]]
+			'er' => [['ee' => ['rr ' => ' tt ', 'empty' => null]]],
 		];
 		$expected = [
 			'f some',
 			'e 49r ' => 'rf r',
-			'er' => [['ee' => ['rr ' => 'tt', 'empty' => '']]]
+			'er' => [['ee' => ['rr ' => 'tt', 'empty' => '']]],
 		];
 
 		$res = Utility::trimDeep($is, true);
@@ -390,12 +390,12 @@ class UtilityTest extends TestCase {
 		$is = [
 			'f some',
 			'e 49r ' => 'rf r ',
-			'er' => [['ee' => ['rr ' => ' tt ']]]
+			'er' => [['ee' => ['rr ' => ' tt ']]],
 		];
 		$expected = [
 			'f some',
 			'e 49r ' => 'rf r',
-			'er' => [['ee' => ['rr ' => 'tt']]]
+			'er' => [['ee' => ['rr ' => 'tt']]],
 		];
 
 		$result = Utility::deep('trim', $is);
@@ -470,18 +470,18 @@ class UtilityTest extends TestCase {
 			'Some.Even.Deeper.Nested.Value',
 			'Empty.',
 			'0.1.2',
-			'.EmptyString'
+			'.EmptyString',
 		];
 		$result = Utility::expandList($is);
 
 		$expected = [
 			'Some' => [
 				'Deep' => ['Value1', 'Value2'],
-				'Even' => ['Deeper' => ['Nested' => ['Value']]]
+				'Even' => ['Deeper' => ['Nested' => ['Value']]],
 			],
 			'Empty' => [''],
 			'0' => ['1' => ['2']],
-			'' => ['EmptyString']
+			'' => ['EmptyString'],
 		];
 		$this->assertSame($expected, $result);
 	}
@@ -505,7 +505,7 @@ class UtilityTest extends TestCase {
 		$is = [
 			'Some',
 			'Thing',
-			'.EmptyString'
+			'.EmptyString',
 		];
 		$result = Utility::expandList($is, '.', '');
 
@@ -522,12 +522,12 @@ class UtilityTest extends TestCase {
 		$is = [
 			'Some' => [
 				'Deep' => ['Value1', 'Value2'],
-				'Even' => ['Deeper' => ['Nested' => ['Value']]]
+				'Even' => ['Deeper' => ['Nested' => ['Value']]],
 			],
 			'Empty' => [''],
 			'0' => ['1' => ['2']],
 			//'ValueOnly',
-			'' => ['EmptyString']
+			'' => ['EmptyString'],
 		];
 		$result = Utility::flattenList($is);
 
@@ -538,7 +538,7 @@ class UtilityTest extends TestCase {
 			'Empty.',
 			'0.1.2',
 			//'1.ValueOnly'
-			'.EmptyString'
+			'.EmptyString',
 		];
 		$this->assertSame($expected, $result);
 
@@ -546,7 +546,7 @@ class UtilityTest extends TestCase {
 		$is = [
 			'Some' => [
 				'Deep' => [true],
-				'Even' => ['Deeper' => ['Nested' => [false, true]]]
+				'Even' => ['Deeper' => ['Nested' => [false, true]]],
 			],
 			'Integer' => ['Value' => [-3]],
 		];
@@ -570,7 +570,7 @@ class UtilityTest extends TestCase {
 			'a' => ['a' => 'A'],
 			'b' => ['b' => 'B', 'c' => 'C'],
 			'c' => [],
-			'd' => [[['z' => 'Z'], 'y' => 'Y']]
+			'd' => [[['z' => 'Z'], 'y' => 'Y']],
 		];
 
 		$result = Utility::arrayFlatten($strings);
@@ -579,7 +579,7 @@ class UtilityTest extends TestCase {
 			'b' => 'B',
 			'c' => 'C',
 			'z' => 'Z',
-			'y' => 'Y'
+			'y' => 'Y',
 		];
 		$this->assertSame($expected, $result);
 	}

tests/TestCase/View/Helper/FormatHelperTest.php

@@ -17,7 +17,7 @@ class FormatHelperTest extends TestCase {
 	 * @var array
 	 */
 	public $fixtures = [
-		'core.Sessions'
+		'core.Sessions',
 	];
 
 	/**
@@ -44,7 +44,7 @@ class FormatHelperTest extends TestCase {
 		$data = [
 			[],
 			['class' => 'disabledLink', 'title' => false],
-			['class' => 'helloClass', 'title' => 'helloTitle']
+			['class' => 'helloClass', 'title' => 'helloTitle'],
 		];
 		foreach ($data as $key => $value) {
 			$res = $this->Format->disabledLink($content, $value);
@@ -60,7 +60,7 @@ class FormatHelperTest extends TestCase {
 		$content = 'xyz';
 		$data = [
 			true,
-			false
+			false,
 		];
 		foreach ($data as $key => $value) {
 			$res = $this->Format->warning($content . ' ' . (int)$value, $value);
@@ -164,7 +164,7 @@ class FormatHelperTest extends TestCase {
 		$content = 'xyz';
 		$data = [
 			true => '<span class="ok-yes" style="color:green">xyz 1</span>',
-			false => '<span class="ok-no" style="color:red">xyz 0</span>'
+			false => '<span class="ok-no" style="color:red">xyz 0</span>',
 		];
 		foreach ($data as $value => $expected) {
 			$result = $this->Format->ok($content . ' ' . (int)$value, $value);
@@ -234,7 +234,7 @@ class FormatHelperTest extends TestCase {
 			'page' => 1,
 			'pageCount' => 3,
 			'count' => 25,
-			'limit' => 10
+			'limit' => 10,
 		];
 		$result = $this->Format->absolutePaginateCount($paginator, 2);
 		$this->assertEquals(2, $result);
@@ -416,11 +416,11 @@ TEXT;
 		];
 
 		$options = [
-			'heading' => false
+			'heading' => false,
 		];
 		$attributes = [
 			'class' => 'foo',
-			'data-x' => 'y'
+			'data-x' => 'y',
 		];
 
 		$is = $this->Format->array2table($array, $options, $attributes);

tests/TestCase/View/Helper/NumberHelperTest.php

@@ -31,7 +31,7 @@ class NumberHelperTest extends TestCase {
 
 		Configure::write('Localization', [
 			'decimals' => ',',
-			'thousands' => '.'
+			'thousands' => '.',
 		]);
 		Number::config('de_DE');
 		$this->Number = new NumberHelper(new View(null));

tests/TestCase/View/Helper/QrCodeHelperTest.php

@@ -69,7 +69,7 @@ class QrCodeHelperTest extends TestCase {
 			'name' => 'My name',
 			'nickname' => 'Nick',
 			'note' => 'Note',
-			'birthday' => '2015-01-03'
+			'birthday' => '2015-01-03',
 		];
 		$is = $this->QrCode->formatCard($data);
 
@@ -131,7 +131,7 @@ class QrCodeHelperTest extends TestCase {
 			'address' => 'Bluetenweg 11, 85375, Neufahrn, Deutschland',
 			'email' => 'test@test.de',
 			'note' => 'someNote;someOtherNote :)',
-			'url' => 'http://www.some_url.de'
+			'url' => 'http://www.some_url.de',
 		]);
 		$is = $this->QrCode->image($string);
 		$this->assertTrue(!empty($is));

tests/TestCase/View/Helper/TextHelperTest.php

@@ -83,7 +83,7 @@ class TextHelperTest extends TestCase {
 
 		$texts = [
 			'text http://www.cakephp.org/bla/bla some more text' => '',
-			'This is a test text with URL http://www.cakephp.org\tand some more text' => 'This is a test text with URL http://www.cakephp.org\tand some more text'
+			'This is a test text with URL http://www.cakephp.org\tand some more text' => 'This is a test text with URL http://www.cakephp.org\tand some more text',
 		];
 
 		foreach ($texts as $text => $expected) {

tests/TestCase/View/Helper/TimelineHelperTest.php

@@ -46,7 +46,7 @@ class TimelineHelperTest extends TestCase {
 			[
 				'start' => null,
 				'content' => '',
-			]
+			],
 		];
 		$this->Timeline->addItems($data);
 		$items = $this->Timeline->items();

tests/TestCase/View/Helper/TreeHelperTest.php

@@ -15,7 +15,7 @@ class TreeHelperTest extends TestCase {
 	 * @var array
 	 */
 	public $fixtures = [
-		'plugin.Tools.AfterTrees'
+		'plugin.Tools.AfterTrees',
 	];
 
 	/**

tests/TestCase/View/Widget/DatalistWidgetTest.php

@@ -45,13 +45,13 @@ class DatalistWidgetTest extends TestCase {
 		$data = [
 			'id' => 'BirdName',
 			'name' => 'Birds[name]',
-			'options' => []
+			'options' => [],
 		];
 		$result = $select->render($data, $this->context);
 		$expected = [
 			'input' => ['type' => 'text', 'list' => 'datalist-BirdName', 'id' => 'BirdName', 'name' => 'Birds[name]', 'autocomplete' => 'off'],
 			'datalist' => ['id' => 'datalist-BirdName'],
-			'/datalist'
+			'/datalist',
 		];
 		$this->assertHtml($expected, $result);
 	}
@@ -66,7 +66,7 @@ class DatalistWidgetTest extends TestCase {
 		$data = [
 			'id' => 'BirdName',
 			'name' => 'Birds[name]',
-			'options' => ['a' => 'Albatross', 'b' => 'Budgie']
+			'options' => ['a' => 'Albatross', 'b' => 'Budgie'],
 		];
 		$result = $select->render($data, $this->context);
 		$expected = [
@@ -74,7 +74,7 @@ class DatalistWidgetTest extends TestCase {
 			'datalist' => ['id' => 'datalist-BirdName'],
 			['option' => ['data-value' => 'a']], 'Albatross', '/option',
 			['option' => ['data-value' => 'b']], 'Budgie', '/option',
-			'/datalist'
+			'/datalist',
 		];
 		$this->assertHtml($expected, $result);
 	}
@@ -97,7 +97,7 @@ class DatalistWidgetTest extends TestCase {
 			'datalist' => ['id' => 'datalist-Birds-name'],
 			['option' => ['data-value' => 'a']], 'Albatross', '/option',
 			['option' => ['data-value' => 'b']], 'Budgie', '/option',
-			'/datalist'
+			'/datalist',
 		];
 		$this->assertHtml($expected, $result);
 	}
@@ -117,7 +117,7 @@ class DatalistWidgetTest extends TestCase {
 				'1x' => 'one x',
 				'2' => 'two',
 				'2x' => 'two x',
-			]
+			],
 		];
 		$result = $select->render($data, $this->context);
 		$expected = [
@@ -127,7 +127,7 @@ class DatalistWidgetTest extends TestCase {
 			['option' => ['data-value' => '1x']], 'one x', '/option',
 			['option' => ['data-value' => '2']], 'two', '/option',
 			['option' => ['data-value' => '2x']], 'two x', '/option',
-			'/datalist'
+			'/datalist',
 		];
 		$this->assertHtml($expected, $result);
 
@@ -140,7 +140,7 @@ class DatalistWidgetTest extends TestCase {
 			['option' => ['data-value' => '1x']], 'one x', '/option',
 			['option' => ['data-value' => '2', 'selected' => 'selected']], 'two', '/option',
 			['option' => ['data-value' => '2x']], 'two x', '/option',
-			'/datalist'
+			'/datalist',
 		];
 		$this->assertHtml($expected, $result);
 	}
@@ -162,8 +162,8 @@ class DatalistWidgetTest extends TestCase {
 				'Bird' => [
 					'budgie' => 'Budgie',
 					'eagle' => 'Eagle',
-				]
-			]
+				],
+			],
 		];
 		$result = $select->render($data, $this->context);
 		$expected = [
@@ -185,7 +185,7 @@ class DatalistWidgetTest extends TestCase {
 			'Eagle',
 			'/option',
 			'/optgroup',
-			'/datalist'
+			'/datalist',
 		];
 		$this->assertHtml($expected, $result);
 	}
@@ -203,7 +203,7 @@ class DatalistWidgetTest extends TestCase {
 				'>XSS<' => [
 					'1' => 'One>',
 				],
-			]
+			],
 		];
 		$result = $select->render($data, $this->context);
 		$expected = [
@@ -214,7 +214,7 @@ class DatalistWidgetTest extends TestCase {
 			'One&gt;',
 			'/option',
 			'/optgroup',
-			'/datalist'
+			'/datalist',
 		];
 		$this->assertHtml($expected, $result);
 
@@ -228,7 +228,7 @@ class DatalistWidgetTest extends TestCase {
 			'One>',
 			'/option',
 			'/optgroup',
-			'/datalist'
+			'/datalist',
 		];
 		$this->assertHtml($expected, $result);
 	}

tests/bootstrap.php

@@ -40,7 +40,7 @@ Cake\Core\Configure::write('Config', [
 		'adminName' => 'Mark']);
 Cake\Mailer\Email::setConfig('default', ['transport' => 'Debug']);
 Cake\Mailer\TransportFactory::setConfig('Debug', [
-		'className' => 'Debug'
+		'className' => 'Debug',
 ]);
 
 mb_internal_encoding('UTF-8');
@@ -53,22 +53,22 @@ $Tmp->create(TMP . 'cache/views', 0770);
 $cache = [
 	'default' => [
 		'engine' => 'File',
-		'path' => CACHE
+		'path' => CACHE,
 	],
 	'_cake_core_' => [
 		'className' => 'File',
 		'prefix' => 'crud_myapp_cake_core_',
 		'path' => CACHE . 'persistent/',
 		'serialize' => true,
-		'duration' => '+10 seconds'
+		'duration' => '+10 seconds',
 	],
 	'_cake_model_' => [
 		'className' => 'File',
 		'prefix' => 'crud_my_app_cake_model_',
 		'path' => CACHE . 'models/',
 		'serialize' => 'File',
-		'duration' => '+10 seconds'
-	]
+		'duration' => '+10 seconds',
+	],
 ];
 
 Cake\Cache\Cache::setConfig($cache);

tests/test_app/Model/Table/BitmaskedCommentsTable.php

@@ -13,9 +13,9 @@ class BitmaskedCommentsTable extends Table {
 		'status' => [
 			'notBlank' => [
 				'rule' => 'notBlank',
-				'last' => true
-			]
-		]
+				'last' => true,
+			],
+		],
 	];
 
 }