fixes cs

src/Model/Behavior/BitmaskedBehavior.php

@@ -4,9 +4,8 @@ namespace Tools\Model\Behavior;
 use Cake\Event\Event;
 use Cake\ORM\Behavior;
 use Cake\ORM\Entity;
-use Cake\Utility\Inflector;
-use Cake\Core\Configure;
 use Cake\ORM\Query;
+use Cake\Utility\Inflector;
 use Cake\Utility\String;
 
 /**
@@ -58,7 +57,6 @@ class BitmaskedBehavior extends Behavior {
 
 		if (is_callable($config['bits'])) {
 			$config['bits'] = call_user_func($config['bits']);
-
 		} elseif (is_string($config['bits']) && method_exists($entity, $config['bits'])) {
 			$config['bits'] = $entity->{$config['bits']}();
 		} elseif (is_string($config['bits']) && method_exists($this->_table, $config['bits'])) {
@@ -151,7 +149,7 @@ class BitmaskedBehavior extends Behavior {
 		}
 		if ($res === 0) {
 			return $defaultValue; // Make sure notEmpty validation rule triggers
-		}
+}
 		return $res;
 	}
 

src/Model/Behavior/JsonableBehavior.php

@@ -2,13 +2,10 @@
 namespace Tools\Model\Behavior;
 
 use Cake\Event\Event;
-use Cake\ORM\Query;
 use Cake\ORM\Behavior;
-use Cake\Utility\Inflector;
-use Cake\Core\Configure;
-use Cake\Utility\String;
-use Cake\Utility\Hash;
 use Cake\ORM\Entity;
+use Cake\ORM\Query;
+use Cake\Utility\String;
 
 /**
  * A behavior that will json_encode (and json_decode) fields if they contain an array or specific pattern.

src/Model/Behavior/PasswordableBehavior.php

@@ -1,13 +1,12 @@
 <?php
 namespace Tools\Model\Behavior;
 
+use Cake\Auth\PasswordHasherFactory;
+use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\ORM\Behavior;
 use Cake\ORM\Entity;
 use Cake\ORM\Table;
-use Cake\Utility\Inflector;
-use Cake\Core\Configure;
-use Cake\Auth\PasswordHasherFactory;
 
 if (!defined('PWD_MIN_LENGTH')) {
 	define('PWD_MIN_LENGTH', 6);

src/Model/Behavior/ResetBehavior.php

@@ -1,11 +1,9 @@
 <?php
 namespace Tools\Model\Behavior;
 
-use Cake\Event\Event;
+use Cake\Core\Configure;
 use Cake\ORM\Behavior;
 use Cake\ORM\Entity;
-use Cake\ORM\Query;
-use Cake\Core\Configure;
 use Cake\ORM\Table;
 
 /**

src/Model/Behavior/SluggedBehavior.php

@@ -1,14 +1,14 @@
 <?php
 namespace Tools\Model\Behavior;
 
+use Cake\Core\Configure;
+use Cake\Error\Exception;
 use Cake\Event\Event;
 use Cake\ORM\Behavior;
 use Cake\ORM\Entity;
 use Cake\ORM\Query;
 use Cake\ORM\Table;
 use Cake\Utility\Inflector;
-use Cake\Core\Configure;
-use Cake\Error\Exception;
 
 /**
  * SluggedBehavior

src/Model/Entity/Entity.php

@@ -31,4 +31,4 @@ class Entity extends CakeEntity {
 		return $options;
 	}
 
-}
+}

src/Model/Table/Table.php

@@ -2,11 +2,11 @@
 
 namespace Tools\Model\Table;
 
+use Cake\Core\Configure;
 use Cake\ORM\Table as CakeTable;
-use Cake\Validation\Validator;
-use Cake\Validation\Validation;
 use Cake\Utility\Inflector;
-use Cake\Core\Configure;
+use Cake\Validation\Validation;
+use Cake\Validation\Validator;
 use Tools\Utility\Utility;
 
 class Table extends CakeTable {
@@ -214,10 +214,8 @@ class Table extends CakeTable {
 			foreach ($fields as $dependingField) {
 				if (isset($this->data[$this->alias][$dependingField])) { // add ONLY if some content is transfered (check on that first!)
 					$conditions[$this->alias . '.' . $dependingField] = $this->data[$this->alias][$dependingField];
-
 				} elseif (isset($this->data['Validation'][$dependingField])) { // add ONLY if some content is transfered (check on that first!
 					$conditions[$this->alias . '.' . $dependingField] = $this->data['Validation'][$dependingField];
-
 				} elseif (!empty($id)) {
 					// manual query! (only possible on edit)
 					$res = $this->find('first', array('fields' => array($this->alias . '.' . $dependingField), 'conditions' => array($this->alias . '.id' => $id)));

src/Network/Email/Email.php

@@ -1,12 +1,11 @@
 <?php
 namespace Tools\Network\Email;
 
+use Cake\Core\Configure;
 use Cake\Network\Email\Email as CakeEmail;
-use Tools\Utility\Utility;
-use Tools\Utility\Mime;
 use Cake\Utility\String;
 use InvalidArgumentException;
-use Cake\Core\Configure;
+use Tools\Utility\Mime;
 
 class Email extends CakeEmail {
 
@@ -454,10 +453,8 @@ class Email extends CakeEmail {
 			if (!empty($fileInfo['data'])) {
 				$data = $fileInfo['data'];
 				$data = chunk_split(base64_encode($data));
-
 			} elseif (!empty($fileInfo['file'])) {
 				$data = $this->_readFile($fileInfo['file']);
-
 			} else {
 				continue;
 			}
@@ -496,10 +493,8 @@ class Email extends CakeEmail {
 			if (!empty($fileInfo['data'])) {
 				$data = $fileInfo['data'];
 				$data = chunk_split(base64_encode($data));
-
 			} elseif (!empty($fileInfo['file'])) {
 				$data = $this->_readFile($fileInfo['file']);
-
 			} else {
 				continue;
 			}

src/Shell/InflectShell.php

@@ -3,7 +3,6 @@ namespace Tools\Shell;
 
 use Cake\Console\Shell;
 use Cake\Utility\Inflector;
-use Cake\Core\Plugin;
 
 /**
  * Inflect Shell

src/TestSuite/IntegrationTestCase.php

@@ -1,9 +1,8 @@
 <?php
 namespace Tools\TestSuite;
 
-use Cake\TestSuite\IntegrationTestCase as CakeIntegrationTestCase;
 use Cake\Routing\Router;
-use Tools\TestSuite\ToolsTestTrait;
+use Cake\TestSuite\IntegrationTestCase as CakeIntegrationTestCase;
 
 /**
  * Tools TestCase class

src/TestSuite/TestCase.php

@@ -2,7 +2,6 @@
 namespace Tools\TestSuite;
 
 use Cake\TestSuite\TestCase as CakeTestCase;
-use Tools\TestSuite\ToolsTestTrait;
 
 /**
  * Tools TestCase class

src/Utility/Language.php

@@ -80,10 +80,11 @@ class Language {
 		$a = explode('-', $a);
 		$b = explode('-', $b);
 		for ($i = 0, $n = min(count($a), count($b)); $i < $n; $i++) {
-			if ($a[$i] !== $b[$i])
+			if ($a[$i] !== $b[$i]) {
 				break;
+			}
 		}
 		return $i === 0 ? 0 : (float)$i / count($a);
 	}
 
-}
+}

src/Utility/Mime.php

@@ -793,7 +793,7 @@ class Mime extends Response {
 	public static function _detectMimeType($file) {
 		if (!function_exists('finfo_open')) {
 			//throw new InternalErrorException('finfo_open() required - please enable');
-		}
+}
 
 		// Treat non local files differently
 		$pattern = '~^https?://~i';

src/Utility/Number.php

@@ -1,8 +1,8 @@
 <?php
 namespace Tools\Utility;
 
-use Cake\I18n\Number as CakeNumber;
 use Cake\Core\Configure;
+use Cake\I18n\Number as CakeNumber;
 
 /**
  * Extend CakeNumber with a few important improvements:

src/Utility/Set.php

@@ -32,4 +32,4 @@ class Set {
 		return $array;
 	}
 
-}
+}

src/Utility/Text.php

@@ -1,8 +1,8 @@
 <?php
 namespace Tools\Utility;
 
-use Cake\Utility\String;
 use Cake\Core\Configure;
+use Cake\Utility\String;
 
 /**
  * Extend String.
@@ -160,13 +160,13 @@ class Text extends String {
 
 		$tags = array();
 		foreach ($typedTags as $tag) {
-		// If a user has escaped a term (to demonstrate that it is a group,
-		// or includes a comma or quote character), we remove the escape
-		// formatting so to save the term into the database as the user intends.
-		$tag = trim(str_replace('""', '"', preg_replace('/^"(.*)"$/', '\1', $tag)));
-		if ($tag) {
-			$tags[] = $tag;
-		}
+			// If a user has escaped a term (to demonstrate that it is a group,
+			// or includes a comma or quote character), we remove the escape
+			// formatting so to save the term into the database as the user intends.
+			$tag = trim(str_replace('""', '"', preg_replace('/^"(.*)"$/', '\1', $tag)));
+			if ($tag) {
+				$tags[] = $tag;
+			}
 		}
 
 		return $tags;
@@ -178,12 +178,12 @@ class Text extends String {
 	public function implodeTags($tags) {
 		$encodedTags = array();
 		foreach ($tags as $tag) {
-		// Commas and quotes in tag names are special cases, so encode them.
-		if (strpos($tag, ',') !== false || strpos($tag, '"') !== false) {
-			$tag = '"' . str_replace('"', '""', $tag) . '"';
-		}
+			// Commas and quotes in tag names are special cases, so encode them.
+			if (strpos($tag, ',') !== false || strpos($tag, '"') !== false) {
+				$tag = '"' . str_replace('"', '""', $tag) . '"';
+			}
 
-		$encodedTags[] = $tag;
+			$encodedTags[] = $tag;
 		}
 		return implode(', ', $encodedTags);
 	}
@@ -353,7 +353,6 @@ class Text extends String {
 
 				if ($digits < 128) {
 					$out .= chr($digits);
-
 				} elseif ($digits < 2048) {
 					$out .= chr(192 + (($digits - ($digits % 64)) / 64));
 					$out .= chr(128 + ($digits % 64));

src/Utility/Time.php

@@ -1,8 +1,8 @@
 <?php
 namespace Tools\Utility;
 
-use Cake\I18n\Time as CakeTime;
 use Cake\Core\Configure;
+use Cake\I18n\Time as CakeTime;
 
 /**
  * Extend CakeTime with a few important improvements:
@@ -199,15 +199,17 @@ class Time extends CakeTime {
 		if ($month == null && $day == null) {
 			$age = date('Y') - $year - 1;
 		} elseif ($day == null) {
-			if ($month >= date('m'))
+			if ($month >= date('m')) {
 				$age = date('Y') - $year - 1;
-			else
+			} else {
 				$age = date('Y') - $year;
+			}
 		} else {
-			if ($month > date('m') || ($month == date('m') && $day > date('d')))
+			if ($month > date('m') || ($month == date('m') && $day > date('d'))) {
 				$age = date('Y') - $year - 1;
-			else
+			} else {
 				$age = date('Y') - $year;
+			}
 		}
 		if ($age % $steps == 0) {
 			$lowerRange = $age - $steps + 1;
@@ -248,7 +250,7 @@ class Time extends CakeTime {
 		//$time = self::fromString($dateString);
 		if (!empty($dateString)) {
 			$date = explode(' ', $dateString);
-			list ($y, $m, $d) = explode('-', $date[0]);
+			list($y, $m, $d) = explode('-', $date[0]);
 			$t = mktime(0, 0, 0, $m, $d, $y);
 		} else {
 			$d = date('d');
@@ -589,7 +591,7 @@ class Time extends CakeTime {
 				'Sat'
 			)
 		);
-		$day = (int) $day;
+		$day = (int)$day;
 		//pr($day);
 		if ($offset) {
 			$day = ($day + $offset) % 7;
@@ -642,7 +644,7 @@ class Time extends CakeTime {
 				'Dec'
 			),
 		);
-		$month = (int) ($month - 1);
+		$month = (int)($month - 1);
 		if (!$abbr) {
 			return __d('tools', $months['long'][$month]);
 		}
@@ -1234,7 +1236,6 @@ class Time extends CakeTime {
 				}
 			}
 			$date = mktime(0, 0, 0, $pieces[1], $pieces[0], $year);
-
 		} elseif (strpos($date, '-') !== false) {
 			//$pieces = explode('-', $date);
 			$date = strtotime($date);

src/View/Helper/AuthUserHelper.php

@@ -1,7 +1,6 @@
 <?php
 namespace Tools\View\Helper;
 
-use Cake\Core\Configure;
 use Cake\View\Helper;
 use Tools\Auth\AuthUserTrait;
 

src/View/Helper/CommonHelper.php

@@ -2,8 +2,8 @@
 namespace Tools\View\Helper;
 
 use Cake\Core\Configure;
-use Cake\View\Helper;
 use Cake\Utility\Inflector;
+use Cake\View\Helper;
 
 /**
  * Common helper
@@ -67,7 +67,6 @@ class CommonHelper extends Helper {
 		if ($type === 'public') {
 			$this->privatePage = false;
 			$content['robots'] = array('index', 'follow', 'noarchive');
-
 		} else {
 			$this->privatePage = true;
 			$content['robots'] = array('noindex', 'nofollow', 'noarchive');

src/View/Helper/FlashHelper.php

@@ -2,8 +2,8 @@
 namespace Tools\View\Helper;
 
 use Cake\Core\Configure;
-use Cake\View\Helper;
 use Cake\Utility\Hash;
+use Cake\View\Helper;
 use Tools\Controller\Component\FlashComponent;
 
 /**

src/View/Helper/FormatHelper.php

@@ -2,10 +2,10 @@
 namespace Tools\View\Helper;
 
 use Cake\Core\Configure;
-use Cake\View\View;
+use Cake\Utility\Inflector;
 use Cake\View\Helper\TextHelper;
 use Cake\View\StringTemplate;
-use Cake\Utility\Inflector;
+use Cake\View\View;
 
 /**
  * Format helper with basic html snippets
@@ -32,7 +32,7 @@ class FormatHelper extends TextHelper {
 	);
 
 	public function __construct(View $View, array $config = array()) {
-  $config += $this->_defaults;
+		$config += $this->_defaults;
 
 		if ($config['fontIcons'] === true) {
 			$config['fontIcons'] = (array)Configure::read('Format.fontIcons');
@@ -107,7 +107,6 @@ class FormatHelper extends TextHelper {
 			}
 		}
 		if (empty($field)) {
-
 		}
 
 		$name = 'Record'; // Translation further down!

src/View/Helper/JsHelper.php

@@ -8,7 +8,6 @@
 namespace Tools\View\Helper;
 
 use Cake\View\Helper;
-use Cake\Core\Configure;
 use Tools\Utility\Multibyte;
 /**
  * Javascript Generator helper class for easy use of JavaScript.

src/View/Helper/NumberHelper.php

@@ -2,8 +2,8 @@
 
 namespace Tools\View\Helper;
 
-use Cake\View\Helper\NumberHelper as CakeNumberHelper;
 use Cake\Utility\Hash;
+use Cake\View\Helper\NumberHelper as CakeNumberHelper;
 
 /**
  * Ovewrite to allow usage of own Number class.

src/View/Helper/ObfuscateHelper.php

@@ -1,8 +1,6 @@
 <?php
 namespace Tools\View\Helper;
 
-use Cake\Core\Configure;
-use Cake\View\View;
 use Cake\View\Helper;
 
 /**
@@ -53,7 +51,9 @@ class ObfuscateHelper extends Helper {
 	 * @return string Save string with JS generated link around email (and non JS fallback)
 	 */
 	public function encodeEmailUrl($mail, $text = null, $params = array(), $attr = array()) {
-		if (empty($class)) { $class = 'email';}
+		if (empty($class)) {
+			$class = 'email';
+		}
 
 		$defaults = array(
 			'title' => __d('tools', 'for use in an external mail client'),
@@ -169,8 +169,8 @@ class ObfuscateHelper extends Helper {
 			if ($replacement !== null) {
 				$str = preg_replace("/({$delim})(" . str_replace('\*', '\w*?', preg_quote($badword, '/')) . ")({$delim})/i", "\\1{$replacement}\\3", $str);
 			} else {
-				$str = preg_replace_callback("/({$delim})(" . str_replace('\*', '\w*?', preg_quote($badword, '/')) . ")({$delim})/i", function($matches) {
-					return $matches[1] . str_repeat('#', strlen($matches[2])). $matches[3];
+				$str = preg_replace_callback("/({$delim})(" . str_replace('\*', '\w*?', preg_quote($badword, '/')) . ")({$delim})/i", function ($matches) {
+					return $matches[1] . str_repeat('#', strlen($matches[2])) . $matches[3];
 				}, $str);
 			}
 		}
@@ -178,4 +178,4 @@ class ObfuscateHelper extends Helper {
 		return trim($str);
 	}
 
-}
+}

src/View/Helper/TimeHelper.php

@@ -2,9 +2,9 @@
 
 namespace Tools\View\Helper;
 
+use Cake\Core\App;
 use Cake\View\Helper\TimeHelper as CakeTimeHelper;
 use Cake\View\View;
-use Cake\Core\App;
 
 /**
  * Wrapper for TimeHelper and TimeLib

src/View/Helper/TimelineHelper.php

@@ -2,9 +2,8 @@
 
 namespace Tools\View\Helper;
 
-use Cake\View\View;
 use Cake\View\Helper;
-use Cake\Utility\Hash;
+use Cake\View\View;
 
 /**
  * TimelineHelper for easy output of a timeline with multiple items.
@@ -36,7 +35,6 @@ class TimelineHelper extends Helper {
 
 	protected $_items = array();
 
-
 	/**
 	 * Apply settings and merge them with the defaults.
 	 *

src/View/Helper/TreeHelper.php

@@ -176,9 +176,9 @@ class TreeHelper extends Helper {
 				$result = $result->toArray();
 			}
 			if ($model && isset($result)) {
-				$row =& $result;
+				$row = & $result;
 			} else {
-				$row =& $result;
+				$row = & $result;
 			}
 
 			/* Close open items as appropriate */
@@ -458,7 +458,7 @@ class TreeHelper extends Helper {
 			if (!$splitDepth || $depth == $splitDepth) {
 				$_splitCounter++;
 				if ($type && ($_splitCounter % $_splitCount) === 0 && !$lastChild) {
-					unset ($this->_config['callback']);
+					unset($this->_config['callback']);
 					return '</' . $type . '><' . $type . '>';
 				}
 			}

src/View/RssView.php

@@ -2,15 +2,14 @@
 namespace Tools\View;
 
 use Cake\Core\Configure;
-use Cake\Routing\Router;
+use Cake\Event\EventManager;
+use Cake\I18n\Time;
 use Cake\Network\Request;
 use Cake\Network\Response;
-use Cake\View\View;
-use Cake\Utility\Xml;
-use Cake\I18n\Time;
+use Cake\Routing\Router;
 use Cake\Utility\Hash;
-use Cake\Event\EventManager;
-use App\Router\Routing;
+use Cake\Utility\Xml;
+use Cake\View\View;
 
 /**
  * A view class that is used for creating RSS feeds.
@@ -306,7 +305,6 @@ class RssView extends View {
 							$attrib['@type'] = 'application/rss+xml';
 						}
 						$val = $attrib;
-
 					} elseif (is_array($val) && isset($val['url'])) {
 						$val['url'] = Router::url($val['url'], true);
 						if ($bareKey === 'guid') {