Mark Scherer 9 年之前
父节点
当前提交
fb5f31aeb6
共有 91 个文件被更改,包括 155 次插入70 次删除
  1. 3 2
      src/Controller/Component/CommonComponent.php
  2. 1 0
      src/Controller/Component/FlashComponent.php
  3. 1 0
      src/Controller/Component/MobileComponent.php
  4. 1 0
      src/Controller/Controller.php
  5. 1 0
      src/Controller/ShuntRequestController.php
  6. 1 0
      src/Database/Type/ArrayType.php
  7. 1 0
      src/Database/Type/YearType.php
  8. 1 0
      src/Error/ErrorHandler.php
  9. 1 0
      src/HtmlDom/HtmlDom.php
  10. 1 0
      src/Mailer/Email.php
  11. 1 0
      src/Model/Behavior/BitmaskedBehavior.php
  12. 1 0
      src/Model/Behavior/ConfirmableBehavior.php
  13. 1 0
      src/Model/Behavior/JsonableBehavior.php
  14. 1 0
      src/Model/Behavior/NeighborBehavior.php
  15. 1 0
      src/Model/Behavior/PasswordableBehavior.php
  16. 1 0
      src/Model/Behavior/ResetBehavior.php
  17. 1 0
      src/Model/Behavior/SluggedBehavior.php
  18. 1 0
      src/Model/Behavior/StringBehavior.php
  19. 1 0
      src/Model/Entity/Entity.php
  20. 1 0
      src/Model/Table/TokensTable.php
  21. 23 22
      src/Shell/InflectShell.php
  22. 1 0
      src/TestSuite/ConsoleOutput.php
  23. 1 0
      src/TestSuite/IntegrationTestCase.php
  24. 1 0
      src/TestSuite/TestCase.php
  25. 1 0
      src/TestSuite/ToolsTestTrait.php
  26. 1 0
      src/Utility/L10n.php
  27. 6 5
      src/Utility/Mime.php
  28. 1 0
      src/Utility/Multibyte.php
  29. 1 0
      src/Utility/Number.php
  30. 5 4
      src/Utility/Random.php
  31. 4 3
      src/Utility/Text.php
  32. 22 21
      src/Utility/Time.php
  33. 5 4
      src/Utility/Utility.php
  34. 1 0
      src/View/Helper/AuthUserHelper.php
  35. 1 0
      src/View/Helper/CommonHelper.php
  36. 1 0
      src/View/Helper/CookieHelper.php
  37. 1 0
      src/View/Helper/FlashHelper.php
  38. 1 0
      src/View/Helper/FormHelper.php
  39. 3 2
      src/View/Helper/FormatHelper.php
  40. 1 0
      src/View/Helper/GravatarHelper.php
  41. 1 0
      src/View/Helper/HtmlHelper.php
  42. 2 1
      src/View/Helper/JsHelper.php
  43. 3 2
      src/View/Helper/ObfuscateHelper.php
  44. 1 0
      src/View/Helper/QrCodeHelper.php
  45. 1 0
      src/View/Helper/TextHelper.php
  46. 1 0
      src/View/Helper/TreeHelper.php
  47. 1 0
      src/View/Helper/UrlHelper.php
  48. 1 0
      tests/Fixture/AfterTreesFixture.php
  49. 1 0
      tests/Fixture/BitmaskedCommentsFixture.php
  50. 1 0
      tests/Fixture/JsonableCommentsFixture.php
  51. 1 0
      tests/Fixture/ResetCommentsFixture.php
  52. 1 0
      tests/Fixture/RolesFixture.php
  53. 1 0
      tests/Fixture/StoriesFixture.php
  54. 1 0
      tests/Fixture/StringCommentsFixture.php
  55. 1 0
      tests/Fixture/TokensFixture.php
  56. 1 0
      tests/Fixture/ToolsUsersFixture.php
  57. 1 0
      tests/TestApp/Controller/Component/AppleComponent.php
  58. 1 0
      tests/TestApp/Controller/Component/BananaComponent.php
  59. 1 0
      tests/TestApp/Controller/Component/TestComponent.php
  60. 1 0
      tests/TestCase/BootstrapTest.php
  61. 1 0
      tests/TestCase/Controller/Component/AuthUserComponentTest.php
  62. 1 0
      tests/TestCase/Controller/Component/CommonComponentTest.php
  63. 1 0
      tests/TestCase/Controller/Component/FlashComponentTest.php
  64. 1 0
      tests/TestCase/Controller/ControllerTest.php
  65. 0 1
      tests/TestCase/Model/Behavior/ConfirmableBehaviorTest.php
  66. 0 1
      tests/TestCase/Model/Behavior/NeighborBehaviorTest.php
  67. 0 1
      tests/TestCase/Model/Behavior/ResetBehaviorTest.php
  68. 1 0
      tests/TestCase/Model/Table/TokensTableTest.php
  69. 1 0
      tests/TestCase/Shell/InflectShellTest.php
  70. 1 0
      tests/TestCase/TestSuite/IntegrationTestCaseTest.php
  71. 1 0
      tests/TestCase/TestSuite/TestCaseTest.php
  72. 1 0
      tests/TestCase/TestSuite/ToolsTestTraitTest.php
  73. 1 0
      tests/TestCase/Utility/L10nTest.php
  74. 1 0
      tests/TestCase/Utility/LanguageTest.php
  75. 1 0
      tests/TestCase/Utility/MimeTest.php
  76. 1 0
      tests/TestCase/Utility/RandomTest.php
  77. 2 1
      tests/TestCase/Utility/TextTest.php
  78. 1 0
      tests/TestCase/Utility/UtilityTest.php
  79. 1 0
      tests/TestCase/View/Helper/AuthUserHelperTest.php
  80. 1 0
      tests/TestCase/View/Helper/CommonHelperTest.php
  81. 1 0
      tests/TestCase/View/Helper/FlashHelperTest.php
  82. 1 0
      tests/TestCase/View/Helper/FormHelperTest.php
  83. 1 0
      tests/TestCase/View/Helper/FormatHelperTest.php
  84. 1 0
      tests/TestCase/View/Helper/GravatarHelperTest.php
  85. 1 0
      tests/TestCase/View/Helper/HtmlHelperTest.php
  86. 1 0
      tests/TestCase/View/Helper/NumberHelperTest.php
  87. 1 0
      tests/TestCase/View/Helper/TextHelperTest.php
  88. 1 0
      tests/TestCase/View/Helper/TimeHelperTest.php
  89. 1 0
      tests/TestCase/View/Helper/TimelineHelperTest.php
  90. 1 0
      tests/TestCase/View/Helper/UrlHelperTest.php
  91. 1 0
      tests/config/routes.php

+ 3 - 2
src/Controller/Component/CommonComponent.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Controller\Component;
 
 use Cake\Core\Configure;
@@ -257,8 +258,8 @@ class CommonComponent extends Component {
 	 */
 	public function forceCache($seconds = HOUR) {
 		$this->Controller->response->header('Cache-Control', 'public, max-age=' . $seconds);
-		$this->Controller->response->header('Last-modified', gmdate("D, j M Y H:i:s", time()) . " GMT");
-		$this->Controller->response->header('Expires', gmdate("D, j M Y H:i:s", time() + $seconds) . " GMT");
+		$this->Controller->response->header('Last-modified', gmdate('D, j M Y H:i:s', time()) . ' GMT');
+		$this->Controller->response->header('Expires', gmdate('D, j M Y H:i:s', time() + $seconds) . ' GMT');
 	}
 
 	/**

+ 1 - 0
src/Controller/Component/FlashComponent.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Controller\Component;
 
 use Cake\Core\Configure;

+ 1 - 0
src/Controller/Component/MobileComponent.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Controller\Component;
 
 use Cake\Controller\Controller;

+ 1 - 0
src/Controller/Controller.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Controller;
 
 use Cake\Core\Configure;

+ 1 - 0
src/Controller/ShuntRequestController.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Controller;
 
 use App\Controller\AppController;

+ 1 - 0
src/Database/Type/ArrayType.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Database\Type;
 
 use Cake\Database\Driver;

+ 1 - 0
src/Database/Type/YearType.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Database\Type;
 
 use Cake\Database\Driver;

+ 1 - 0
src/Error/ErrorHandler.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Error;
 
 use Cake\Core\Configure;

+ 1 - 0
src/HtmlDom/HtmlDom.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\HtmlDom;
 
 use Yangqi\Htmldom\Htmldom as BaseHtmlDom;

+ 1 - 0
src/Mailer/Email.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Mailer;
 
 use Cake\Core\Configure;

+ 1 - 0
src/Model/Behavior/BitmaskedBehavior.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Model\Behavior;
 
 use Cake\Event\Event;

+ 1 - 0
src/Model/Behavior/ConfirmableBehavior.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Model\Behavior;
 
 use ArrayObject;

+ 1 - 0
src/Model/Behavior/JsonableBehavior.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Model\Behavior;
 
 use Cake\Database\Type;

+ 1 - 0
src/Model/Behavior/NeighborBehavior.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Model\Behavior;
 
 use Cake\ORM\Behavior;

+ 1 - 0
src/Model/Behavior/PasswordableBehavior.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Model\Behavior;
 
 use ArrayObject;

+ 1 - 0
src/Model/Behavior/ResetBehavior.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Model\Behavior;
 
 use Cake\Core\Configure;

+ 1 - 0
src/Model/Behavior/SluggedBehavior.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Model\Behavior;
 
 use Cake\Core\Configure;

+ 1 - 0
src/Model/Behavior/StringBehavior.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Model\Behavior;
 
 use Cake\Database\Type;

+ 1 - 0
src/Model/Entity/Entity.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Model\Entity;
 
 use Cake\ORM\Entity as CakeEntity;

+ 1 - 0
src/Model/Table/TokensTable.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Model\Table;
 
 use Cake\Utility\Hash;

+ 23 - 22
src/Shell/InflectShell.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Shell;
 
 use Cake\Console\Shell;
@@ -74,24 +75,24 @@ class InflectShell extends Shell {
 
 		$command = null;
 		while (empty($command)) {
-			$this->out("Please type the number or name of the inflection method you would like to use");
+			$this->out('Please type the number or name of the inflection method you would like to use');
 			$this->hr();
-			$this->out("[1] Pluralize");
-			$this->out("[2] Singularize");
-			$this->out("[3] Camelize");
-			$this->out("[4] Underscore");
-			$this->out("[5] Humanize");
-			$this->out("[6] Tableize");
-			$this->out("[7] Classify");
-			$this->out("[8] Variable");
-			$this->out("[9] Dasherize");
-			$this->out("[10] Slug");
-			$this->out("[q] Quit");
-			$temp = $this->in("What command would you like to perform?", null, 'q');
+			$this->out('[1] Pluralize');
+			$this->out('[2] Singularize');
+			$this->out('[3] Camelize');
+			$this->out('[4] Underscore');
+			$this->out('[5] Humanize');
+			$this->out('[6] Tableize');
+			$this->out('[7] Classify');
+			$this->out('[8] Variable');
+			$this->out('[9] Dasherize');
+			$this->out('[10] Slug');
+			$this->out('[q] Quit');
+			$temp = $this->in('What command would you like to perform?', null, 'q');
 			if (in_array(strtolower($temp), $validCommands)) {
 				$command = strtolower($temp);
 			} else {
-				$this->out("Try again.");
+				$this->out('Try again.');
 			}
 		}
 
@@ -129,7 +130,7 @@ class InflectShell extends Shell {
 			case 'q':
 			case 'quit':
 			default:
-				$this->out("Exit");
+				$this->out('Exit');
 				$this->_stop();
 				return null;
 		}
@@ -144,11 +145,11 @@ class InflectShell extends Shell {
 	protected function _getWords() {
 		$words = null;
 		while (empty($words)) {
-			$temp = $this->in("What word(s) would you like to inflect?");
+			$temp = $this->in('What word(s) would you like to inflect?');
 			if (!empty($temp)) {
 				$words = $temp;
 			} else {
-				$this->out("Try again.");
+				$this->out('Try again.');
 			}
 		}
 		return $words;
@@ -175,7 +176,7 @@ class InflectShell extends Shell {
 			while (count($arguments) > 0) {
 				$words .= array_pop($arguments);
 				if (count($arguments) > 0) {
-					$words .= " ";
+					$words .= ' ';
 				}
 			}
 		}
@@ -232,10 +233,10 @@ class InflectShell extends Shell {
 		$this->out('');
 		$this->out('This shell uses the Inflector class to inflect any word(s) you wish');
 		$this->hr();
-		$this->out("Usage: cake inflect");
-		$this->out("       cake inflect methodName");
-		$this->out("       cake inflect methodName word");
-		$this->out("       cake inflect methodName words to inflect");
+		$this->out('Usage: cake inflect');
+		$this->out('       cake inflect methodName');
+		$this->out('       cake inflect methodName word');
+		$this->out('       cake inflect methodName words to inflect');
 		$this->out('');
 	}
 

+ 1 - 0
src/TestSuite/ConsoleOutput.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\TestSuite;
 
 use Cake\Console\ConsoleOutput as CakeConsoleOutput;

+ 1 - 0
src/TestSuite/IntegrationTestCase.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\TestSuite;
 
 use Cake\Routing\Router;

+ 1 - 0
src/TestSuite/TestCase.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\TestSuite;
 
 use Cake\TestSuite\TestCase as CakeTestCase;

+ 1 - 0
src/TestSuite/ToolsTestTrait.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\TestSuite;
 
 /**

+ 1 - 0
src/Utility/L10n.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Utility;
 
 /**

+ 6 - 5
src/Utility/Mime.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Utility;
 
 use Cake\Network\Response;
@@ -771,8 +772,8 @@ class Mime extends Response {
 		// If FINFO functions are not available then try to retrieve MIME type from pre-defined MIMEs
 		// If MIME type doesn't exist, then try (as a last resort) to use the (deprecated) mime_content_type function
 		// If all else fails, just return application/octet-stream
-		if (!function_exists("finfo_open")) {
-			if (function_exists("mime_content_type")) {
+		if (!function_exists('finfo_open')) {
+			if (function_exists('mime_content_type')) {
 				$type = mime_content_type($file);
 				if (!empty($type)) {
 					return $type;
@@ -783,7 +784,7 @@ class Mime extends Response {
 			if ($mimeType) {
 				return $mimeType;
 			}
-			return "application/octet-stream";
+			return 'application/octet-stream';
 		}
 		return $this->_detectMimeType($file);
 	}
@@ -833,7 +834,7 @@ class Mime extends Response {
 		if ($mimeType) {
 			return $mimeType;
 		}
-		return "application/octet-stream";
+		return 'application/octet-stream';
 	}
 
 	/**
@@ -844,7 +845,7 @@ class Mime extends Response {
 	 * @return string
 	 */
 	public static function getEncoding($file = null, $default = 'utf-8') {
-		if (!function_exists("finfo_open")) {
+		if (!function_exists('finfo_open')) {
 			return $default;
 		}
 		$finfo = finfo_open(FILEINFO_MIME_ENCODING);

+ 1 - 0
src/Utility/Multibyte.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Utility;
 
 /**

+ 1 - 0
src/Utility/Number.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Utility;
 
 use Cake\Core\Configure;

+ 5 - 4
src/Utility/Random.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Utility;
 
 /**
@@ -132,7 +133,7 @@ class Random {
 
 		$dobDay = static::int(1, $maxDays);
 
-		$dob = sprintf("%4d-%02d-%02d", $dobYear, $dobMonth, $dobDay);
+		$dob = sprintf('%4d-%02d-%02d', $dobYear, $dobMonth, $dobDay);
 		return $dob;
 	}
 
@@ -146,9 +147,9 @@ class Random {
 	public static function pronounceablePwd($length = 10) {
 		srand((double)microtime() * 1000000);
 		$password = '';
-		$vowels = ["a", "e", "i", "o", "u"];
-		$cons = ["b", "c", "d", "g", "h", "j", "k", "l", "m", "n", "p", "r", "s", "t", "u", "v", "w", "tr",
-							"cr", "br", "fr", "th", "dr", "ch", "ph", "wr", "st", "sp", "sw", "pr", "sl", "cl"];
+		$vowels = ['a', 'e', 'i', 'o', 'u'];
+		$cons = ['b', 'c', 'd', 'g', 'h', 'j', 'k', 'l', 'm', 'n', 'p', 'r', 's', 't', 'u', 'v', 'w', 'tr',
+							'cr', 'br', 'fr', 'th', 'dr', 'ch', 'ph', 'wr', 'st', 'sp', 'sw', 'pr', 'sl', 'cl'];
 		for ($i = 0; $i < $length; $i++) {
 			$password .= $cons[mt_rand(0, 31)] . $vowels[mt_rand(0, 4)];
 		}

+ 4 - 3
src/Utility/Text.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Utility;
 
 use Cake\Core\Configure;
@@ -382,8 +383,8 @@ class Text extends CakeText {
 		}
 
 		if ($all) {
-			$str = str_replace(["&amp;", "&lt;", "&gt;", "&quot;", "&apos;", "&#45;"],
-				["&", "<", ">", "\"", "'", "-"], $str);
+			$str = str_replace(['&amp;', '&lt;', '&gt;', '&quot;', '&apos;', '&#45;'],
+				['&', '<', '>', '"', "'", '-'], $str);
 		}
 
 		return $str;
@@ -405,7 +406,7 @@ class Text extends CakeText {
 	 * @return string
 	 */
 	public function reduce_double_slashes($str) {
-		return preg_replace("#([^:])//+#", "\\1/", $str);
+		return preg_replace('#([^:])//+#', '\\1/', $str);
 	}
 
 }

+ 22 - 21
src/Utility/Time.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Utility;
 
 use Cake\Core\Configure;
@@ -51,11 +52,11 @@ class Time extends CakeTime {
 	public function hasDaylightSavingTime($timezone = null) {
 		$timezone = $this->safeCreateDateTimeZone($timezone);
 		// a date outside of DST
-		$offset = $timezone->getOffset(new Time('@' . mktime(0, 0, 0, 2, 1, date('Y'))));
+		$offset = $timezone->getOffset(new self('@' . mktime(0, 0, 0, 2, 1, date('Y'))));
 		$offset = $offset / HOUR;
 
 		// a date inside of DST
-		$offset2 = $timezone->getOffset(new Time('@' . mktime(0, 0, 0, 8, 1, date('Y'))));
+		$offset2 = $timezone->getOffset(new self('@' . mktime(0, 0, 0, 8, 1, date('Y'))));
 		$offset2 = $offset2 / HOUR;
 
 		return abs($offset2 - $offset) > 0;
@@ -74,7 +75,7 @@ class Time extends CakeTime {
 			$timezone = $this->getTimezone();
 		}
 
-		$offset = $timezone->getOffset(new Time('@' . time()));
+		$offset = $timezone->getOffset(new self('@' . time()));
 		$offset = $offset / HOUR;
 		return $offset;
 	}
@@ -149,12 +150,12 @@ class Time extends CakeTime {
 
 		$startDate = $start;
 		if (!is_object($start)) {
-			$startDate = new Time($start);
+			$startDate = new self($start);
 		}
 
 		$endDate = $end;
 		if (!is_object($end)) {
-			$endDate = new Time($end);
+			$endDate = new self($end);
 		}
 
 		if ($startDate > $endDate) {
@@ -382,7 +383,7 @@ class Time extends CakeTime {
 	 */
 	public function incrementDate($startDate, $years = 0, $months = 0, $days = 0, $timezone = null) {
 		if (!is_object($startDate)) {
-			$startDate = new Time($startDate);
+			$startDate = new self($startDate);
 			if ($timezone) {
 				$startDate->setTimezone($this->safeCreateDateTimeZone($timezone));
 			}
@@ -399,7 +400,7 @@ class Time extends CakeTime {
 		// Increment date by given month/year increments:
 		$incrementedDateString = "$safeDateString $months month $years year";
 		$newTimeStamp = strtotime($incrementedDateString) + $days * DAY;
-		$newDate = Time::createFromFormat('U', $newTimeStamp);
+		$newDate = self::createFromFormat('U', $newTimeStamp);
 		return $newDate;
 	}
 
@@ -416,7 +417,7 @@ class Time extends CakeTime {
 			$secondAge = $firstAge;
 		}
 		//TODO: other relative time then today should work as well
-		$Date = new Time($relativeTime !== null ? $relativeTime : 'now');
+		$Date = new self($relativeTime !== null ? $relativeTime : 'now');
 
 		$max = mktime(23, 23, 59, $Date->format('m'), $Date->format('d'), $Date->format('Y') - $firstAge);
 		$min = mktime(0, 0, 1, $Date->format('m'), $Date->format('d') + 1, $Date->format('Y') - $secondAge - 1);
@@ -466,7 +467,7 @@ class Time extends CakeTime {
 		if ($options['timezone']) {
 			$options['timezone'] = static::safeCreateDateTimeZone($options['timezone']);
 		}
-		$date = new Time($dateString, $options['timezone']);
+		$date = new self($dateString, $options['timezone']);
 		$date = $date->format('U');
 
 		if ($date === null || $date === false || $date <= 0) {
@@ -544,7 +545,7 @@ class Time extends CakeTime {
 		}
 
 		if (!is_object($dateString)) {
-			$date = new Time($dateString, $options['timezone']);
+			$date = new self($dateString, $options['timezone']);
 		} else {
 			$date = $dateString;
 		}
@@ -927,7 +928,7 @@ class Time extends CakeTime {
 	 */
 	public static function relLengthOfTime($dateString, $format = null, $options = []) {
 		if ($dateString !== null) {
-			$date = new Time($dateString);
+			$date = new self($dateString);
 			$date = $date->format('U');
 			$sec = time() - $date;
 			$type = ($sec > 0) ? -1 : (($sec < 0) ? 1 : 0);
@@ -971,7 +972,7 @@ class Time extends CakeTime {
 	 * @return string Formatted date
 	 */
 	public static function convertDate($oldDateString, $newDateFormatString, $timezone = null) {
-		$Date = new Time($oldDateString, $timezone);
+		$Date = new self($oldDateString, $timezone);
 		return $Date->format($newDateFormatString);
 	}
 
@@ -983,7 +984,7 @@ class Time extends CakeTime {
 	 * @return bool True if datetime string was day before yesterday
 	 */
 	public static function wasDayBeforeYesterday($dateString, $timezone = null) {
-		$date = new Time($dateString, $timezone);
+		$date = new self($dateString, $timezone);
 		$date = $date->format('U');
 		return date(FORMAT_DB_DATE, $date) === date(FORMAT_DB_DATE, time() - 2 * DAY);
 	}
@@ -996,7 +997,7 @@ class Time extends CakeTime {
 	 * @return bool True if datetime string is day after tomorrow
 	 */
 	public static function isDayAfterTomorrow($dateString, $timezone = null) {
-		$date = new Time($dateString, $timezone);
+		$date = new self($dateString, $timezone);
 		$date = $date->format('U');
 		return date(FORMAT_DB_DATE, $date) === date(FORMAT_DB_DATE, time() + 2 * DAY);
 	}
@@ -1009,7 +1010,7 @@ class Time extends CakeTime {
 	 * @return bool True if datetime is not today AND is in the future
 	 */
 	public static function isNotTodayAndInTheFuture($dateString, $timezone = null) {
-		$date = new Time($dateString, $timezone);
+		$date = new self($dateString, $timezone);
 		$date = $date->format('U');
 		return date(FORMAT_DB_DATE, $date) > date(FORMAT_DB_DATE, time());
 	}
@@ -1022,7 +1023,7 @@ class Time extends CakeTime {
 	 * @return bool True if datetime is not today AND is in the future
 	 */
 	public static function isInTheFuture($dateString, $timezone = null) {
-		$date = new Time($dateString, $timezone);
+		$date = new self($dateString, $timezone);
 		$date = $date->format('U');
 		return date(FORMAT_DB_DATETIME, $date) > date(FORMAT_DB_DATETIME, time());
 	}
@@ -1053,7 +1054,7 @@ class Time extends CakeTime {
 		}
 
 		if ($format) {
-			$res = Time::createFromFormat($format, $date);
+			$res = self::createFromFormat($format, $date);
 			$res = $res->format(FORMAT_DB_DATE) . ' ' . ($type === 'end' ? '23:59:59' : '00:00:00');
 			return $res;
 		}
@@ -1136,9 +1137,9 @@ class Time extends CakeTime {
 	 * @return string Partial SQL string.
 	 */
 	public static function daysAsSql($begin, $end, $fieldName, $timezone = null) {
-		$begin = new Time($begin, $timezone);
+		$begin = new self($begin, $timezone);
 		$begin = $begin->format('U');
-		$end = new Time($end, $timezone);
+		$end = new self($end, $timezone);
 		$end = $end->format('U');
 		$begin = date('Y-m-d', $begin) . ' 00:00:00';
 		$end = date('Y-m-d', $end) . ' 23:59:59';
@@ -1287,8 +1288,8 @@ class Time extends CakeTime {
 	 */
 	public static function duration($duration, $format = '%h:%I:%S') {
 		if (!$duration instanceof \DateInterval) {
-			$d1 = new Time();
-			$d2 = new Time();
+			$d1 = new self();
+			$d2 = new self();
 			$d2->add(new \DateInterval('PT' . $duration . 'S'));
 
 			$duration = $d2->diff($d1);

+ 5 - 4
src/Utility/Utility.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Utility;
 
 use Cake\Routing\Router;
@@ -397,7 +398,7 @@ class Utility {
 		$ret = true;
 		foreach ($array as $key => $val) {
 			if (is_array($val)) {
-				$ret = $ret & Utility::logicalAnd($val);
+				$ret = $ret & self::logicalAnd($val);
 			} else {
 				$ret = $ret & $val;
 			}
@@ -736,10 +737,10 @@ class Utility {
 				$newLine = "\n";
 			}
 
-			if ($token === "{" || $token === "[") {
+			if ($token === '{' || $token === '[') {
 				$indent++;
 				$result .= $token . $newLine;
-			} elseif ($token === "}" || $token === "]") {
+			} elseif ($token === '}' || $token === ']') {
 				$indent--;
 
 				if ($indent >= 0) {
@@ -751,7 +752,7 @@ class Utility {
 				} else {
 					$result .= $newLine . $token;
 				}
-			} elseif ($token === ",") {
+			} elseif ($token === ',') {
 				$result .= $token . $newLine;
 			} else {
 				$result .= $prefix . $token;

+ 1 - 0
src/View/Helper/AuthUserHelper.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\View\Helper;
 
 use Cake\View\Helper;

+ 1 - 0
src/View/Helper/CommonHelper.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\View\Helper;
 
 use Cake\Core\Configure;

+ 1 - 0
src/View/Helper/CookieHelper.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\View\Helper;
 
 use Cake\View\Helper;

+ 1 - 0
src/View/Helper/FlashHelper.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\View\Helper;
 
 use Cake\Core\Configure;

+ 1 - 0
src/View/Helper/FormHelper.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\View\Helper;
 
 use Cake\Core\Configure;

+ 3 - 2
src/View/Helper/FormatHelper.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\View\Helper;
 
 use Cake\Core\Configure;
@@ -553,7 +554,7 @@ class FormatHelper extends Helper {
 	 * @return string
 	 */
 	public function tab2space($text, $spaces = 4) {
-		$spaces = str_repeat(" ", $spaces);
+		$spaces = str_repeat(' ', $spaces);
 		$text = preg_split("/\r\n|\r|\n/", trim($text));
 		$wordLengths = [];
 		$wArray = [];
@@ -582,7 +583,7 @@ class FormatHelper extends Helper {
 					$wArray[$i][$ii] = str_pad($wArray[$i][$ii], $wordLengths[$ii]);
 				}
 			}
-			$text .= str_replace("\t", $spaces, implode("", $wArray[$i])) . "\n";
+			$text .= str_replace("\t", $spaces, implode('', $wArray[$i])) . "\n";
 		}
 
 		return $text;

+ 1 - 0
src/View/Helper/GravatarHelper.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\View\Helper;
 
 use Cake\Validation\Validation;

+ 1 - 0
src/View/Helper/HtmlHelper.php

@@ -12,6 +12,7 @@
  * @since         0.9.1
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
+
 namespace Tools\View\Helper;
 
 use Cake\Core\Configure;

+ 2 - 1
src/View/Helper/JsHelper.php

@@ -5,6 +5,7 @@
  * This is deprecated and only here to easy migration from 2.x applications
  * that rely on the JsHelper buffer functionality.
  */
+
 namespace Tools\View\Helper;
 
 use Cake\View\Helper;
@@ -101,7 +102,7 @@ class JsHelper extends Helper {
 			case (is_int($val)):
 				break;
 			case (is_float($val)):
-				$val = sprintf("%.11f", $val);
+				$val = sprintf('%.11f', $val);
 				break;
 			default:
 				$val = $this->escape($val);

+ 3 - 2
src/View/Helper/ObfuscateHelper.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\View\Helper;
 
 use Cake\View\Helper;
@@ -117,10 +118,10 @@ class ObfuscateHelper extends Helper {
 					$encmail .= mb_substr($text, $i, 1);
 					break;
 				case 1: // Decimal
-					$encmail .= "&#" . ord(mb_substr($text, $i, 1)) . ';';
+					$encmail .= '&#' . ord(mb_substr($text, $i, 1)) . ';';
 					break;
 				case 2: // Hexadecimal
-					$encmail .= "&#x" . dechex(ord(mb_substr($text, $i, 1))) . ';';
+					$encmail .= '&#x' . dechex(ord(mb_substr($text, $i, 1))) . ';';
 					break;
 			}
 		}

+ 1 - 0
src/View/Helper/QrCodeHelper.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\View\Helper;
 
 use Cake\Core\Configure;

+ 1 - 0
src/View/Helper/TextHelper.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\View\Helper;
 
 use Cake\Utility\Hash;

+ 1 - 0
src/View/Helper/TreeHelper.php

@@ -7,6 +7,7 @@
  * @copyright Copyright (c) 2008, Andy Dawson
  * @license http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 namespace Tools\View\Helper;
 
 use Cake\Core\Configure;

+ 1 - 0
src/View/Helper/UrlHelper.php

@@ -12,6 +12,7 @@
  * @since         0.9.1
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
+
 namespace Tools\View\Helper;
 
 use Cake\Core\Configure;

+ 1 - 0
tests/Fixture/AfterTreesFixture.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Test\Fixture;
 
 use Cake\TestSuite\Fixture\TestFixture;

+ 1 - 0
tests/Fixture/BitmaskedCommentsFixture.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Test\Fixture;
 
 use Cake\TestSuite\Fixture\TestFixture;

+ 1 - 0
tests/Fixture/JsonableCommentsFixture.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Test\Fixture;
 
 use Cake\TestSuite\Fixture\TestFixture;

+ 1 - 0
tests/Fixture/ResetCommentsFixture.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Test\Fixture;
 
 use Cake\TestSuite\Fixture\TestFixture;

+ 1 - 0
tests/Fixture/RolesFixture.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Test\Fixture;
 
 use Cake\TestSuite\Fixture\TestFixture;

+ 1 - 0
tests/Fixture/StoriesFixture.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Test\Fixture;
 
 use Cake\TestSuite\Fixture\TestFixture;

+ 1 - 0
tests/Fixture/StringCommentsFixture.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Test\Fixture;
 
 use Cake\TestSuite\Fixture\TestFixture;

+ 1 - 0
tests/Fixture/TokensFixture.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Test\Fixture;
 
 use Cake\TestSuite\Fixture\TestFixture;

+ 1 - 0
tests/Fixture/ToolsUsersFixture.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Test\Fixture;
 
 use Cake\TestSuite\Fixture\TestFixture;

+ 1 - 0
tests/TestApp/Controller/Component/AppleComponent.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TestApp\Controller\Component;
 
 use Cake\Controller\Controller;

+ 1 - 0
tests/TestApp/Controller/Component/BananaComponent.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TestApp\Controller\Component;
 
 use Cake\Controller\Controller;

+ 1 - 0
tests/TestApp/Controller/Component/TestComponent.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TestApp\Controller\Component;
 
 use Cake\Event\Event;

+ 1 - 0
tests/TestCase/BootstrapTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Test\TestCase;
 
 use Cake\Controller\Controller;

+ 1 - 0
tests/TestCase/Controller/Component/AuthUserComponentTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Test\TestCase\Controller\Component;
 
 use Cake\Controller\ComponentRegistry;

+ 1 - 0
tests/TestCase/Controller/Component/CommonComponentTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Test\TestCase\Controller\Component;
 
 use Cake\Controller\ComponentRegistry;

+ 1 - 0
tests/TestCase/Controller/Component/FlashComponentTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Test\TestCase\Controller\Component;
 
 use Cake\Controller\ComponentRegistry;

+ 1 - 0
tests/TestCase/Controller/ControllerTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Test\TestCase\Controller;
 
 use Cake\Controller\ComponentRegistry;

+ 0 - 1
tests/TestCase/Model/Behavior/ConfirmableBehaviorTest.php

@@ -4,7 +4,6 @@ namespace Tools\Test\TestCase\Model\Behavior;
 
 use Cake\ORM\TableRegistry;
 use Tools\Model\Behavior\ConfirmableBehavior;
-//use Cake\Core\Configure;
 use Tools\TestSuite\TestCase;
 
 class ConfirmableBehaviorTest extends TestCase {

+ 0 - 1
tests/TestCase/Model/Behavior/NeighborBehaviorTest.php

@@ -4,7 +4,6 @@ namespace Tools\Model\Behavior;
 
 use Cake\Core\Configure;
 use Cake\ORM\TableRegistry;
-//use App\Model\AppModel;
 use Tools\Model\Behavior\NeighborBehavior;
 use Tools\Model\Table\Table;
 use Tools\TestSuite\TestCase;

+ 0 - 1
tests/TestCase/Model/Behavior/ResetBehaviorTest.php

@@ -4,7 +4,6 @@ namespace Tools\Model\Behavior;
 
 use Cake\Core\Configure;
 use Cake\ORM\TableRegistry;
-//use App\Model\AppModel;
 use Tools\Model\Behavior\ResetBehavior;
 use Tools\Model\Table\Table;
 use Tools\TestSuite\TestCase;

+ 1 - 0
tests/TestCase/Model/Table/TokensTableTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Test\Model\Table;
 
 use Cake\ORM\TableRegistry;

+ 1 - 0
tests/TestCase/Shell/InflectShellTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Test\TestCase\Shell;
 
 use Cake\Console\ConsoleIo;

+ 1 - 0
tests/TestCase/TestSuite/IntegrationTestCaseTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\TestCase\TestSuite;
 
 use Tools\TestSuite\IntegrationTestCase;

+ 1 - 0
tests/TestCase/TestSuite/TestCaseTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\TestCase\TestSuite;
 
 use Tools\TestSuite\TestCase;

+ 1 - 0
tests/TestCase/TestSuite/ToolsTestTraitTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\TestCase\TestSuite;
 
 use Tools\TestSuite\TestCase;

+ 1 - 0
tests/TestCase/Utility/L10nTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Test\Utility;
 
 use Tools\TestSuite\TestCase;

+ 1 - 0
tests/TestCase/Utility/LanguageTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\TestCase\Utility;
 
 use Tools\TestSuite\TestCase;

+ 1 - 0
tests/TestCase/Utility/MimeTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\TestCase\Utility;
 
 use Cake\Core\Plugin;

+ 1 - 0
tests/TestCase/Utility/RandomTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\TestCase\Utility;
 
 use Tools\TestSuite\TestCase;

+ 2 - 1
tests/TestCase/Utility/TextTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\TestCase\Utility;
 
 use Tools\TestSuite\TestCase;
@@ -39,7 +40,7 @@ some random data
 and another line
 and a   third
 TXT;
-		$result = $this->Text->readWithPattern($data, "%s %s %s");
+		$result = $this->Text->readWithPattern($data, '%s %s %s');
 
 		$this->assertSame(3, count($result));
 		$this->assertSame(['and', 'a', 'third'], $result[2]);

+ 1 - 0
tests/TestCase/Utility/UtilityTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\TestCase\Utility;
 
 use Cake\Core\Configure;

+ 1 - 0
tests/TestCase/View/Helper/AuthUserHelperTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Test\TestCase\View\Helper;
 
 use Cake\Core\Configure;

+ 1 - 0
tests/TestCase/View/Helper/CommonHelperTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\TestCase\View\Helper;
 
 use Cake\Core\Configure;

+ 1 - 0
tests/TestCase/View/Helper/FlashHelperTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\TestCase\View\Helper;
 
 use Cake\Core\Configure;

+ 1 - 0
tests/TestCase/View/Helper/FormHelperTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\TestCase\View\Helper;
 
 use Cake\Core\Configure;

+ 1 - 0
tests/TestCase/View/Helper/FormatHelperTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\TestCase\View\Helper;
 
 use Cake\Core\Configure;

+ 1 - 0
tests/TestCase/View/Helper/GravatarHelperTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\TestCase\View\Helper;
 
 use Cake\Core\Configure;

+ 1 - 0
tests/TestCase/View/Helper/HtmlHelperTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\TestCase\View\Helper;
 
 use Cake\Core\Configure;

+ 1 - 0
tests/TestCase/View/Helper/NumberHelperTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\TestCase\View\Helper;
 
 use Cake\Core\Configure;

+ 1 - 0
tests/TestCase/View/Helper/TextHelperTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\TestCase\View\Helper;
 
 use Cake\Core\Configure;

+ 1 - 0
tests/TestCase/View/Helper/TimeHelperTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\TestCase\View\Helper;
 
 use Cake\Core\Configure;

+ 1 - 0
tests/TestCase/View/Helper/TimelineHelperTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\TestCase\View\Helper;
 
 use Cake\Core\Configure;

+ 1 - 0
tests/TestCase/View/Helper/UrlHelperTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\TestCase\View\Helper;
 
 use Cake\Core\Configure;

+ 1 - 0
tests/config/routes.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tools\Test\App\Config;
 
 use Cake\Routing\Router;