Skip to content
Permalink
Browse files

Capitalize Windows, the OS

  • Loading branch information...
ravage84 committed Jul 9, 2015
1 parent b4b10e7 commit 4a131bdcbfd0bc04c6ec863debfdb9b54121f2c8
@@ -91,7 +91,7 @@ public function startup() {
$this->_documentRoot = $this->params['document_root'];
}
// for windows
// for Windows
if (substr($this->_documentRoot, -1, 1) === DIRECTORY_SEPARATOR) {
$this->_documentRoot = substr($this->_documentRoot, 0, strlen($this->_documentRoot) - 1);
}
@@ -154,7 +154,7 @@ class ConsoleOutput {
* Construct the output object.
*
* Checks for a pretty console environment. Ansicon allows pretty consoles
* on windows, and is supported.
* on Windows, and is supported.
*
* @param string $stream The identifier of the stream to write output to.
*/
@@ -668,7 +668,7 @@ public function testCreateFileInteractive() {
* @return void
*/
public function testCreateFileNoPermissions() {
$this->skipIf(DIRECTORY_SEPARATOR === '\\', 'Cant perform operations using permissions on windows.');
$this->skipIf(DIRECTORY_SEPARATOR === '\\', 'Cant perform operations using permissions on Windows.');
$path = TMP . 'shell_test';
$file = $path . DS . 'no_perms';
@@ -1075,12 +1075,12 @@ public function testConvertSpecifiers() {
}
/**
* test convert %e on windows.
* test convert %e on Windows.
*
* @return void
*/
public function testConvertPercentE() {
$this->skipIf(DIRECTORY_SEPARATOR !== '\\', 'Cannot run windows tests on non-windows OS.');
$this->skipIf(DIRECTORY_SEPARATOR !== '\\', 'Cannot run Windows tests on non-Windows OS.');
$time = strtotime('Thu Jan 14 11:43:39 2010');
$result = $this->Time->convertSpecifiers('%e', $time);
@@ -192,7 +192,7 @@ public function testCreateRelative() {
* @return void
*/
public function testRecursiveCreateFailure() {
$this->skipIf(DIRECTORY_SEPARATOR === '\\', 'Cant perform operations using permissions on windows.');
$this->skipIf(DIRECTORY_SEPARATOR === '\\', 'Cant perform operations using permissions on Windows.');
$path = TMP . 'tests' . DS . 'one';
mkdir($path);
@@ -123,12 +123,12 @@ public function __get($name) {
/**
* Converts a string representing the format for the function strftime and returns a
* windows safe and i18n aware format.
* Windows safe and i18n aware format.
*
* @param string $format Format with specifiers for strftime function.
* Accepts the special specifier %S which mimics the modifier S for date()
* @param string $time UNIX timestamp
* @return string windows safe and date() function compatible format for strftime
* @return string Windows safe and date() function compatible format for strftime
* @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::convertSpecifiers
*/
public static function convertSpecifiers($format, $time = null) {
@@ -141,7 +141,7 @@ public static function convertSpecifiers($format, $time = null) {
/**
* Auxiliary function to translate a matched specifier element from a regular expression into
* a windows safe and i18n aware specifier
* a Windows safe and i18n aware specifier
*
* @param array $specifier match from regular expression
* @return string converted element
@@ -64,7 +64,7 @@ class Folder {
public $sort = false;
/**
* Mode to be used on create. Does nothing on windows platforms.
* Mode to be used on create. Does nothing on Windows platforms.
*
* @var int
* http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::$mode
@@ -263,7 +263,7 @@ protected function _findRecursive($pattern, $sort = false) {
* Returns true if given $path is a Windows path.
*
* @param string $path Path to check
* @return bool true if windows path, false otherwise
* @return bool true if Windows path, false otherwise
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::isWindowsPath
*/
public static function isWindowsPath($path) {
@@ -455,7 +455,7 @@ public static function decimal($check, $places = null, $regex = null) {
* Validates for an email address.
*
* Only uses getmxrr() checking for deep validation if PHP 5.3.0+ is used, or
* any PHP version on a non-windows distribution
* any PHP version on a non-Windows distribution
*
* @param string $check Value to check
* @param bool $deep Perform a deeper validation (if true), by also checking availability of host
@@ -126,12 +126,12 @@ public function __call($method, $params) {
/**
* Converts a string representing the format for the function strftime and returns a
* windows safe and i18n aware format.
* Windows safe and i18n aware format.
*
* @param string $format Format with specifiers for strftime function.
* Accepts the special specifier %S which mimics the modifier S for date()
* @param string $time UNIX timestamp
* @return string windows safe and date() function compatible format for strftime
* @return string Windows safe and date() function compatible format for strftime
* @see CakeTime::convertSpecifiers()
* @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
*/

0 comments on commit 4a131bd

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.