adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6988 from ravage84/2.6-windows

Browse source 
Capitalize Windows, the OS
This commit is contained in:
José Lorenzo Rodríguez 2015-07-09 16:06:18 +02:00
commit 77ee00e8db
9 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Console/Command/ServerShell.php
View file

@ -91,7 +91,7 @@ class ServerShell extends AppShell {
$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);
}

2
lib/Cake/Console/ConsoleOutput.php
View file

@ -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.
*/

2
lib/Cake/Test/Case/Console/ShellTest.php
View file

@ -668,7 +668,7 @@ class ShellTest extends CakeTestCase {
* @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';

4
lib/Cake/Test/Case/Utility/CakeTimeTest.php
View file

@ -1075,12 +1075,12 @@ class CakeTimeTest extends CakeTestCase {
}
/**
* 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);

2
lib/Cake/Test/Case/Utility/FolderTest.php
View file

@ -192,7 +192,7 @@ class FolderTest extends CakeTestCase {
* @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);

6
lib/Cake/Utility/CakeTime.php
View file

@ -123,12 +123,12 @@ class CakeTime {
/**
* 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 @@ class CakeTime {
/**
* 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

4
lib/Cake/Utility/Folder.php
View file

@ -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 @@ class Folder {
* 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) {

2
lib/Cake/Utility/Validation.php
View file

@ -455,7 +455,7 @@ class Validation {
* 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

4
lib/Cake/View/Helper/TimeHelper.php
View file

@ -126,12 +126,12 @@ class TimeHelper extends AppHelper {
/**
* 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
*/