=')):
@@ -67,11 +65,11 @@ endif;
$settings = Cache::settings();
if (!empty($settings)):
echo '';
- echo __d('cake_dev', 'The %s is being used for core caching. To change the config edit APP/Config/core.php ', '' . $settings['engine'] . 'Engine');
+ echo __d('cake_dev', 'The %s is being used for core caching. To change the config edit %s', ''. $settings['engine'] . 'Engine', 'APP/Config/core.php');
echo '';
else:
echo '';
- echo __d('cake_dev', 'Your cache is NOT working. Please check the settings in APP/Config/core.php');
+ echo __d('cake_dev', 'Your cache is NOT working. Please check the settings in %s', 'APP/Config/core.php');
echo '';
endif;
?>
@@ -88,7 +86,7 @@ endif;
echo '';
echo __d('cake_dev', 'Your database configuration file is NOT present.');
echo '
';
- echo __d('cake_dev', 'Rename APP/Config/database.php.default to APP/Config/database.php');
+ echo __d('cake_dev', 'Rename %s to %s', 'APP/Config/database.php.default', 'APP/Config/database.php');
echo '';
endif;
?>
@@ -155,9 +153,10 @@ if (isset($filePresent)):
-To change its layout, edit: APP/View/Layouts/default.ctp.
-You can also add some CSS styles for your pages at: APP/webroot/css.');
+echo __d('cake_dev', 'To change the content of this page, edit: %s.
+To change its layout, edit: %s.
+You can also add some CSS styles for your pages at: %s.',
+ 'APP/View/Pages/home.ctp', 'APP/View/Layouts/default.ctp', 'APP/webroot/css');
?>
@@ -206,11 +205,11 @@ You can also add some CSS styles for your pages at: APP/webroot/css.');
-
- -
+
- CakePHP
-
- -
+
-
-
diff --git a/lib/Cake/Console/Templates/skel/View/Pages/home.ctp b/lib/Cake/Console/Templates/skel/View/Pages/home.ctp
index 6374131f6..d6b365a62 100644
--- a/lib/Cake/Console/Templates/skel/View/Pages/home.ctp
+++ b/lib/Cake/Console/Templates/skel/View/Pages/home.ctp
@@ -23,11 +23,17 @@ if (Configure::read('debug') > 0):
Debugger::checkSecurityKeys();
endif;
?>
+
1) Help me configure it
2) I don't / can't use URL rewriting
+
=')):
@@ -93,12 +99,12 @@ if (isset($filePresent)):
} catch (Exception $connectionError) {
$connected = false;
$errorMsg = $connectionError->getMessage();
- if (method_exists($connectionError, 'getAttributes')) {
+ if (method_exists($connectionError, 'getAttributes')):
$attributes = $connectionError->getAttributes();
- if (isset($errorMsg['message'])) {
+ if (isset($errorMsg['message'])):
$errorMsg .= '
' . $attributes['message'];
- }
- }
+ endif;
+ endif;
}
?>
@@ -119,13 +125,13 @@ if (isset($filePresent)):
';
echo __d('cake_dev', 'PCRE has not been compiled with Unicode support.');
echo '
';
- echo __d('cake_dev', 'Recompile PCRE with Unicode support by adding %s when configuring', '--enable-unicode-properties');
+ echo __d('cake_dev', 'Recompile PCRE with Unicode support by adding --enable-unicode-properties when configuring');
echo '
';
- }
+ endif;
?>
diff --git a/lib/Cake/Controller/Component/RequestHandlerComponent.php b/lib/Cake/Controller/Component/RequestHandlerComponent.php
index fd90a6d9e..da8c2243f 100644
--- a/lib/Cake/Controller/Component/RequestHandlerComponent.php
+++ b/lib/Cake/Controller/Component/RequestHandlerComponent.php
@@ -518,6 +518,9 @@ class RequestHandlerComponent extends Component {
}
list($contentType) = explode(';', env('CONTENT_TYPE'));
+ if ($contentType === '') {
+ list($contentType) = explode(';', CakeRequest::header('CONTENT_TYPE'));
+ }
if (!$type) {
return $this->mapType($contentType);
}
diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php
index f414f2d65..670b71a6d 100644
--- a/lib/Cake/Model/Model.php
+++ b/lib/Cake/Model/Model.php
@@ -3499,25 +3499,23 @@ class Model extends Object implements CakeEventListener {
* @return boolean true on delete
*/
protected function _clearCache($type = null) {
- if ($type === null) {
- if (Configure::read('Cache.check') === true) {
- $assoc[] = strtolower(Inflector::pluralize($this->alias));
- $assoc[] = strtolower(Inflector::underscore(Inflector::pluralize($this->alias)));
- foreach ($this->_associations as $key => $association) {
- foreach ($this->$association as $key => $className) {
- $check = strtolower(Inflector::pluralize($className['className']));
- if (!in_array($check, $assoc)) {
- $assoc[] = strtolower(Inflector::pluralize($className['className']));
- $assoc[] = strtolower(Inflector::underscore(Inflector::pluralize($className['className'])));
- }
- }
- }
- clearCache($assoc);
- return true;
- }
- } else {
- //Will use for query cache deleting
+ if ($type !== null || Configure::read('Cache.check') !== true) {
+ return;
}
+ $assoc[] = strtolower(Inflector::pluralize($this->alias));
+ $assoc[] = Inflector::underscore(Inflector::pluralize($this->alias));
+ foreach ($this->_associations as $association) {
+ foreach ($this->$association as $className) {
+ $pluralized = strtolower(Inflector::pluralize($className['className']));
+ if (!in_array($pluralized, $assoc)) {
+ $assoc[] = $pluralized;
+ $assoc[] = Inflector::underscore(Inflector::pluralize($className['className']));
+ }
+ }
+ }
+ $assoc = array_unique($assoc);
+ clearCache($assoc);
+ return true;
}
/**
diff --git a/lib/Cake/Network/CakeRequest.php b/lib/Cake/Network/CakeRequest.php
index 574985754..1a14cbc08 100644
--- a/lib/Cake/Network/CakeRequest.php
+++ b/lib/Cake/Network/CakeRequest.php
@@ -788,7 +788,10 @@ class CakeRequest implements ArrayAccess {
}
/**
- * Parse Accept* headers with qualifier options
+ * Parse Accept* headers with qualifier options.
+ *
+ * Only qualifiers will be extracted, any other accept extensions will be
+ * discarded as they are not frequently used.
*
* @param string $header
* @return array
@@ -797,14 +800,21 @@ class CakeRequest implements ArrayAccess {
$accept = array();
$header = explode(',', $header);
foreach (array_filter($header) as $value) {
- $prefPos = strpos($value, ';');
- if ($prefPos !== false) {
- $prefValue = substr($value, strpos($value, '=') + 1);
- $value = trim(substr($value, 0, $prefPos));
- } else {
- $prefValue = '1.0';
- $value = trim($value);
+ $prefValue = '1.0';
+ $value = trim($value);
+
+ $semiPos = strpos($value, ';');
+ if ($semiPos !== false) {
+ $params = explode(';', $value);
+ $value = trim($params[0]);
+ foreach ($params as $param) {
+ $qPos = strpos($param, 'q=');
+ if ($qPos !== false) {
+ $prefValue = substr($param, $qPos + 2);
+ }
+ }
}
+
if (!isset($accept[$prefValue])) {
$accept[$prefValue] = array();
}
diff --git a/lib/Cake/Network/CakeResponse.php b/lib/Cake/Network/CakeResponse.php
index 3db176327..f6a0ed2e5 100644
--- a/lib/Cake/Network/CakeResponse.php
+++ b/lib/Cake/Network/CakeResponse.php
@@ -250,9 +250,9 @@ class CakeResponse {
'f4b' => 'audio/mp4',
'gif' => 'image/gif',
'ief' => 'image/ief',
- 'jpe' => 'image/jpeg',
- 'jpeg' => 'image/jpeg',
'jpg' => 'image/jpeg',
+ 'jpeg' => 'image/jpeg',
+ 'jpe' => 'image/jpeg',
'pbm' => 'image/x-portable-bitmap',
'pgm' => 'image/x-portable-graymap',
'png' => 'image/png',
diff --git a/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php b/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
index 63ced76f3..96631e335 100644
--- a/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
+++ b/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
@@ -279,6 +279,19 @@ class RequestHandlerComponentTest extends CakeTestCase {
$this->assertNull($this->RequestHandler->ext);
}
+/**
+ * Test that the headers sent by firefox are not treated as XML requests.
+ *
+ * @return void
+ */
+ public function testInititalizeFirefoxHeaderNotXml() {
+ $_SERVER['HTTP_ACCEPT'] = 'text/html,application/xhtml+xml,application/xml;image/png,image/jpeg,image/*;q=0.9,*/*;q=0.8';
+ Router::parseExtensions('xml', 'json');
+
+ $this->RequestHandler->initialize($this->Controller);
+ $this->assertNull($this->RequestHandler->ext);
+ }
+
/**
* Test that a type mismatch doesn't incorrectly set the ext
*
@@ -603,6 +616,16 @@ class RequestHandlerComponentTest extends CakeTestCase {
$result = $this->RequestHandler->requestedWith(array('rss', 'atom'));
$this->assertFalse($result);
+ $_SERVER['REQUEST_METHOD'] = 'POST';
+ unset($_SERVER['CONTENT_TYPE']);
+ $_SERVER['HTTP_CONTENT_TYPE'] = 'application/json';
+
+ $result = $this->RequestHandler->requestedWith(array('json', 'xml'));
+ $this->assertEquals('json', $result);
+
+ $result = $this->RequestHandler->requestedWith(array('rss', 'atom'));
+ $this->assertFalse($result);
+
$_SERVER['HTTP_ACCEPT'] = 'text/xml,application/xml,application/xhtml+xml,text/html,text/plain,image/png,*/*';
$this->assertTrue($this->RequestHandler->isXml());
$this->assertFalse($this->RequestHandler->isAtom());
diff --git a/lib/Cake/Test/Case/Event/CakeEventManagerTest.php b/lib/Cake/Test/Case/Event/CakeEventManagerTest.php
index 8f5e684d8..79461305e 100644
--- a/lib/Cake/Test/Case/Event/CakeEventManagerTest.php
+++ b/lib/Cake/Test/Case/Event/CakeEventManagerTest.php
@@ -68,7 +68,7 @@ class CakeEventTestListener {
*
* @package Cake.Test.Case.Event
*/
-class CustomTestEventListerner extends CakeEventTestListener implements CakeEventListener {
+class CustomTestEventListener extends CakeEventTestListener implements CakeEventListener {
public function implementedEvents() {
return array(
@@ -325,7 +325,7 @@ class CakeEventManagerTest extends CakeTestCase {
*/
public function testAttachSubscriber() {
$manager = new CakeEventManager;
- $listener = $this->getMock('CustomTestEventListerner', array('secondListenerFunction'));
+ $listener = $this->getMock('CustomTestEventListener', array('secondListenerFunction'));
$manager->attach($listener);
$event = new CakeEvent('fake.event');
@@ -339,7 +339,7 @@ class CakeEventManagerTest extends CakeTestCase {
$manager->dispatch($event);
$manager = new CakeEventManager;
- $listener = $this->getMock('CustomTestEventListerner', array('listenerFunction', 'thirdListenerFunction'));
+ $listener = $this->getMock('CustomTestEventListener', array('listenerFunction', 'thirdListenerFunction'));
$manager->attach($listener);
$event = new CakeEvent('multiple.handlers');
$listener->expects($this->once())->method('listenerFunction')->with($event);
@@ -354,7 +354,7 @@ class CakeEventManagerTest extends CakeTestCase {
*/
public function testDetachSubscriber() {
$manager = new CakeEventManager;
- $listener = $this->getMock('CustomTestEventListerner', array('secondListenerFunction'));
+ $listener = $this->getMock('CustomTestEventListener', array('secondListenerFunction'));
$manager->attach($listener);
$expected = array(
array('callable' => array($listener, 'secondListenerFunction'), 'passParams' => true)
diff --git a/lib/Cake/Test/Case/Network/CakeRequestTest.php b/lib/Cake/Test/Case/Network/CakeRequestTest.php
index fe45ed922..c1760d293 100644
--- a/lib/Cake/Test/Case/Network/CakeRequestTest.php
+++ b/lib/Cake/Test/Case/Network/CakeRequestTest.php
@@ -1164,6 +1164,41 @@ class CakeRequestTest extends CakeTestCase {
$this->assertEquals($expected, $result);
}
+/**
+ * Test parsing accept ignores index param
+ *
+ * @return void
+ */
+ public function testParseAcceptIgnoreAcceptExtensions() {
+ $_SERVER['HTTP_ACCEPT'] = 'application/json;level=1, text/plain, */*';
+
+ $request = new CakeRequest('/', false);
+ $result = $request->parseAccept();
+ $expected = array(
+ '1.0' => array('application/json', 'text/plain', '*/*'),
+ );
+ $this->assertEquals($expected, $result);
+ }
+
+/**
+ * Test that parsing accept headers with invalid syntax works.
+ *
+ * The header used is missing a q value for application/xml.
+ *
+ * @return void
+ */
+ public function testParseAcceptInvalidSyntax() {
+ $_SERVER['HTTP_ACCEPT'] = 'text/html,application/xhtml+xml,application/xml;image/png,image/jpeg,image/*;q=0.9,*/*;q=0.8';
+ $request = new CakeRequest('/', false);
+ $result = $request->parseAccept();
+ $expected = array(
+ '1.0' => array('text/html', 'application/xhtml+xml', 'application/xml', 'image/jpeg'),
+ '0.9' => array('image/*'),
+ '0.8' => array('*/*'),
+ );
+ $this->assertEquals($expected, $result);
+ }
+
/**
* Test baseUrl and webroot with ModRewrite
*
diff --git a/lib/Cake/Test/Case/Utility/StringTest.php b/lib/Cake/Test/Case/Utility/StringTest.php
index efe89f033..1d54775ca 100644
--- a/lib/Cake/Test/Case/Utility/StringTest.php
+++ b/lib/Cake/Test/Case/Utility/StringTest.php
@@ -314,6 +314,67 @@ class StringTest extends CakeTestCase {
$this->assertEquals($expected, $result);
}
+/**
+ * test that wordWrap() works the same as built-in wordwrap function
+ *
+ * @dataProvider wordWrapProvider
+ * @return void
+ */
+ public function testWordWrap($text, $width, $break = "\n", $cut = false) {
+ $result = String::wordWrap($text, $width, $break, $cut);
+ $expected = wordwrap($text, $width, $break, $cut);
+ $this->assertTextEquals($expected, $result, 'Text not wrapped same as built-in function.');
+ }
+
+/**
+ * data provider for testWordWrap method
+ *
+ * @return array
+ */
+ public function wordWrapProvider() {
+ return array(
+ array(
+ 'The quick brown fox jumped over the lazy dog.',
+ 33
+ ),
+ array(
+ 'A very long woooooooooooord.',
+ 8
+ ),
+ array(
+ 'A very long woooooooooooord. Right.',
+ 8
+ ),
+ );
+ }
+
+/**
+ * test that wordWrap() properly handle unicode strings.
+ *
+ * @return void
+ */
+ public function testWordWrapUnicodeAware() {
+ $text = 'Но вим омниюм факёльиси элыктрам, мюнырэ лэгыры векж ыт. Выльёт квюандо нюмквуам ты кюм. Зыд эю рыбюм.';
+ $result = String::wordWrap($text, 33, "\n", true);
+ $expected = <<assertTextEquals($expected, $result, 'Text not wrapped.');
+
+ $text = 'Но вим омниюм факёльиси элыктрам, мюнырэ лэгыры векж ыт. Выльёт квюандо нюмквуам ты кюм. Зыд эю рыбюм.';
+ $result = String::wordWrap($text, 33, "\n");
+ $expected = <<assertTextEquals($expected, $result, 'Text not wrapped.');
+ }
+
/**
* test wrap method.
*
@@ -337,6 +398,16 @@ TEXT;
'the song that never' . "\n" .
' ends.';
$this->assertTextEquals($expected, $result, 'Text not wrapped.');
+
+ $text = 'Но вим омниюм факёльиси элыктрам, мюнырэ лэгыры векж ыт. Выльёт квюандо нюмквуам ты кюм. Зыд эю рыбюм.';
+ $result = String::wrap($text, 33);
+ $expected = <<assertTextEquals($expected, $result, 'Text not wrapped.');
}
/**
diff --git a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php
index 0959c9ce6..3543f03cb 100644
--- a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php
+++ b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php
@@ -8184,6 +8184,22 @@ class FormHelperTest extends CakeTestCase {
'/div'
);
$this->assertTags($result, $expected);
+
+ $result = $this->Form->input('Contact.iamrequiredalways', array('type' => 'file'));
+ $expected = array(
+ 'div' => array('class' => 'input file required'),
+ 'label' => array('for' => 'ContactIamrequiredalways'),
+ 'Iamrequiredalways',
+ '/label',
+ 'input' => array(
+ 'type' => 'file',
+ 'name' => 'data[Contact][iamrequiredalways]',
+ 'id' => 'ContactIamrequiredalways',
+ 'required' => 'required'
+ ),
+ '/div'
+ );
+ $this->assertTags($result, $expected);
}
/**
diff --git a/lib/Cake/Utility/File.php b/lib/Cake/Utility/File.php
index 4d9ec45cf..9c1be6afe 100644
--- a/lib/Cake/Utility/File.php
+++ b/lib/Cake/Utility/File.php
@@ -28,7 +28,7 @@ App::uses('Folder', 'Utility');
class File {
/**
- * Folder object of the File
+ * Folder object of the file
*
* @var Folder
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::$Folder
@@ -36,7 +36,7 @@ class File {
public $Folder = null;
/**
- * Filename
+ * File name
*
* @var string
* http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::$name
@@ -103,7 +103,7 @@ class File {
}
/**
- * Creates the File.
+ * Creates the file.
*
* @return boolean Success
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::create
@@ -144,7 +144,7 @@ class File {
}
/**
- * Return the contents of this File as a string.
+ * Return the contents of this file as a string.
*
* @param string $bytes where to start
* @param string $mode A `fread` compatible mode.
@@ -200,8 +200,8 @@ class File {
}
/**
- * Prepares a ascii string for writing. Converts line endings to the
- * correct terminator for the current platform. If windows "\r\n" will be used
+ * Prepares a ASCII string for writing. Converts line endings to the
+ * correct terminator for the current platform. If Windows, "\r\n" will be used,
* all other platforms will use "\n"
*
* @param string $data Data to prepare for writing.
@@ -218,11 +218,11 @@ class File {
}
/**
- * Write given data to this File.
+ * Write given data to this file.
*
* @param string $data Data to write to this File.
* @param string $mode Mode of writing. {@link http://php.net/fwrite See fwrite()}.
- * @param string $force force the file to open
+ * @param string $force Force the file to open
* @return boolean Success
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::write
*/
@@ -246,10 +246,10 @@ class File {
}
/**
- * Append given data string to this File.
+ * Append given data string to this file.
*
* @param string $data Data to write
- * @param string $force force the file to open
+ * @param string $force Force the file to open
* @return boolean Success
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::append
*/
@@ -271,7 +271,7 @@ class File {
}
/**
- * Deletes the File.
+ * Deletes the file.
*
* @return boolean Success
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::delete
@@ -288,7 +288,7 @@ class File {
}
/**
- * Returns the File info as an array with the following keys:
+ * Returns the file info as an array with the following keys:
*
* - dirname
* - basename
@@ -317,9 +317,9 @@ class File {
}
/**
- * Returns the File extension.
+ * Returns the file extension.
*
- * @return string The File extension
+ * @return string The file extension
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::ext
*/
public function ext() {
@@ -333,9 +333,9 @@ class File {
}
/**
- * Returns the File name without extension.
+ * Returns the file name without extension.
*
- * @return string The File name without extension.
+ * @return string The file name without extension.
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::name
*/
public function name() {
@@ -351,11 +351,11 @@ class File {
}
/**
- * makes filename safe for saving
+ * Makes file name safe for saving
*
* @param string $name The name of the file to make safe if different from $this->name
* @param string $ext The name of the extension to make safe if different from $this->ext
- * @return string $ext the extension of the file
+ * @return string $ext The extension of the file
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::safe
*/
public function safe($name = null, $ext = null) {
@@ -372,7 +372,7 @@ class File {
* Get md5 Checksum of file with previous check of Filesize
*
* @param integer|boolean $maxsize in MB or true to force
- * @return string md5 Checksum {@link http://php.net/md5_file See md5_file()}
+ * @return string|false md5 Checksum {@link http://php.net/md5_file See md5_file()}, or false in case of an error
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::md5
*/
public function md5($maxsize = 5) {
@@ -389,9 +389,9 @@ class File {
}
/**
- * Returns the full path of the File.
+ * Returns the full path of the file.
*
- * @return string Full path to file
+ * @return string Full path to the file
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::pwd
*/
public function pwd() {
@@ -402,9 +402,9 @@ class File {
}
/**
- * Returns true if the File exists.
+ * Returns true if the file exists.
*
- * @return boolean true if it exists, false otherwise
+ * @return boolean True if it exists, false otherwise
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::exists
*/
public function exists() {
@@ -413,9 +413,9 @@ class File {
}
/**
- * Returns the "chmod" (permissions) of the File.
+ * Returns the "chmod" (permissions) of the file.
*
- * @return string Permissions for the file
+ * @return string|false Permissions for the file, or false in case of an error
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::perms
*/
public function perms() {
@@ -426,9 +426,9 @@ class File {
}
/**
- * Returns the Filesize
+ * Returns the file size
*
- * @return integer size of the file in bytes, or false in case of an error
+ * @return integer|false Size of the file in bytes, or false in case of an error
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::size
*/
public function size() {
@@ -439,9 +439,9 @@ class File {
}
/**
- * Returns true if the File is writable.
+ * Returns true if the file is writable.
*
- * @return boolean true if its writable, false otherwise
+ * @return boolean True if it's writable, false otherwise
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::writable
*/
public function writable() {
@@ -451,7 +451,7 @@ class File {
/**
* Returns true if the File is executable.
*
- * @return boolean true if its executable, false otherwise
+ * @return boolean True if it's executable, false otherwise
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::executable
*/
public function executable() {
@@ -459,9 +459,9 @@ class File {
}
/**
- * Returns true if the File is readable.
+ * Returns true if the file is readable.
*
- * @return boolean true if file is readable, false otherwise
+ * @return boolean True if file is readable, false otherwise
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::readable
*/
public function readable() {
@@ -469,9 +469,9 @@ class File {
}
/**
- * Returns the File's owner.
+ * Returns the file's owner.
*
- * @return integer the Fileowner
+ * @return integer|false The file owner, or false in case of an error
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::owner
*/
public function owner() {
@@ -482,9 +482,9 @@ class File {
}
/**
- * Returns the File's group.
+ * Returns the file's group.
*
- * @return integer the Filegroup
+ * @return integer|false The file group, or false in case of an error
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::group
*/
public function group() {
@@ -497,7 +497,7 @@ class File {
/**
* Returns last access time.
*
- * @return integer timestamp Timestamp of last access time
+ * @return integer|false Timestamp of last access time, or false in case of an error
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::lastAccess
*/
public function lastAccess() {
@@ -510,7 +510,7 @@ class File {
/**
* Returns last modified time.
*
- * @return integer timestamp Timestamp of last modification
+ * @return integer|false Timestamp of last modification, or false in case of an error
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::lastChange
*/
public function lastChange() {
@@ -533,7 +533,7 @@ class File {
/**
* Copy the File to $dest
*
- * @param string $dest destination for the copy
+ * @param string $dest Destination for the copy
* @param boolean $overwrite Overwrite $dest if exists
* @return boolean Success
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::copy
@@ -573,7 +573,7 @@ class File {
/**
* Clear PHP's internal stat cache
*
- * For 5.3 onwards its possible to clear cache for just a single file. Passing true
+ * For 5.3 onwards it's possible to clear cache for just a single file. Passing true
* will clear all the stat cache.
*
* @param boolean $all Clear all cache or not
diff --git a/lib/Cake/Utility/String.php b/lib/Cake/Utility/String.php
index e8313aead..bba242a99 100644
--- a/lib/Cake/Utility/String.php
+++ b/lib/Cake/Utility/String.php
@@ -319,12 +319,12 @@ class String {
*
* ### Options
*
- * - `width` The width to wrap to. Defaults to 72
+ * - `width` The width to wrap to. Defaults to 72.
* - `wordWrap` Only wrap on words breaks (spaces) Defaults to true.
* - `indent` String to indent with. Defaults to null.
* - `indentAt` 0 based index to start indenting at. Defaults to 0.
*
- * @param string $text Text the text to format.
+ * @param string $text The text to format.
* @param array|integer $options Array of options to use, or an integer to wrap the text to.
* @return string Formatted text.
*/
@@ -334,7 +334,7 @@ class String {
}
$options += array('width' => 72, 'wordWrap' => true, 'indent' => null, 'indentAt' => 0);
if ($options['wordWrap']) {
- $wrapped = wordwrap($text, $options['width'], "\n");
+ $wrapped = self::wordWrap($text, $options['width'], "\n");
} else {
$wrapped = trim(chunk_split($text, $options['width'] - 1, "\n"));
}
@@ -348,6 +348,55 @@ class String {
return $wrapped;
}
+/**
+ * Unicode aware version of wordwrap.
+ *
+ * @param string $text The text to format.
+ * @param integer $width The width to wrap to. Defaults to 72.
+ * @param string $break The line is broken using the optional break parameter. Defaults to '\n'.
+ * @param boolean $cut If the cut is set to true, the string is always wrapped at the specified width.
+ * @return string Formatted text.
+ */
+ public static function wordWrap($text, $width = 72, $break = "\n", $cut = false) {
+ if ($cut) {
+ $parts = array();
+ while (mb_strlen($text) > 0) {
+ $part = mb_substr($text, 0, $width);
+ $parts[] = trim($part);
+ $text = trim(mb_substr($text, mb_strlen($part)));
+ }
+ return implode($break, $parts);
+ }
+
+ $parts = array();
+ while (mb_strlen($text) > 0) {
+ if ($width >= mb_strlen($text)) {
+ $parts[] = trim($text);
+ break;
+ }
+
+ $part = mb_substr($text, 0, $width);
+ $nextChar = mb_substr($text, $width, 1);
+ if ($nextChar !== ' ') {
+ $breakAt = mb_strrpos($part, ' ');
+ if ($breakAt === false) {
+ $breakAt = mb_strpos($text, ' ', $width);
+ }
+ if ($breakAt === false) {
+ $parts[] = trim($text);
+ break;
+ }
+ $part = mb_substr($text, 0, $breakAt);
+ }
+
+ $part = trim($part);
+ $parts[] = $part;
+ $text = trim(mb_substr($text, mb_strlen($part)));
+ }
+
+ return implode($break, $parts);
+ }
+
/**
* Highlights a given phrase in a text. You can specify any expression in highlighter that
* may include the \1 expression to include the $phrase found.
diff --git a/lib/Cake/View/Helper/FormHelper.php b/lib/Cake/View/Helper/FormHelper.php
index 377728b8f..295a622bd 100644
--- a/lib/Cake/View/Helper/FormHelper.php
+++ b/lib/Cake/View/Helper/FormHelper.php
@@ -1625,17 +1625,16 @@ class FormHelper extends AppHelper {
* @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::hidden
*/
public function hidden($fieldName, $options = array()) {
- $secure = true;
+ $options += array('required' => false, 'secure' => true);
+
+ $secure = $options['secure'];
+ unset($options['secure']);
- if (isset($options['secure'])) {
- $secure = $options['secure'];
- unset($options['secure']);
- }
$options = $this->_initInputField($fieldName, array_merge(
$options, array('secure' => self::SECURE_SKIP)
));
- if ($secure && $secure !== self::SECURE_SKIP) {
+ if ($secure === true) {
$this->_secure(true, null, '' . $options['value']);
}
@@ -2012,12 +2011,8 @@ class FormHelper extends AppHelper {
$tag = 'selectstart';
}
- if ($tag !== 'checkboxmultiplestart' &&
- !isset($attributes['required']) &&
- empty($attributes['disabled']) &&
- $this->_introspectModel($this->model(), 'validates', $this->field())
- ) {
- $attributes['required'] = true;
+ if ($tag === 'checkboxmultiplestart') {
+ unset($attributes['required']);
}
if (!empty($tag) || isset($template)) {
@@ -2847,15 +2842,21 @@ class FormHelper extends AppHelper {
if ($this->tagIsInvalid() !== false) {
$result = $this->addClass($result, 'form-error');
}
- if (!empty($result['disabled']) || $secure === self::SECURE_SKIP) {
+
+ if (!empty($result['disabled'])) {
return $result;
}
+
if (!isset($result['required']) &&
$this->_introspectModel($this->model(), 'validates', $this->field())
) {
$result['required'] = true;
}
+ if ($secure === self::SECURE_SKIP) {
+ return $result;
+ }
+
$this->_secure($secure, $this->_secureFieldName($options));
return $result;
}