'; - echo __d('cake_dev', 'You can install it from %s', $this->Html->link('GitHub', 'https://github.com/cakephp/debug_kit')); + echo __d('cake_dev', 'You can install it from %s', $this->Html->link('GitHub', 'https://github.com/cakephp/debug_kit/tree/2.2')); echo ''; endif; ?> @@ -181,7 +181,7 @@ You can also add some CSS styles for your pages at: %s.',
- - Html->link('DebugKit', 'https://github.com/cakephp/debug_kit') ?>: + Html->link('DebugKit', 'https://github.com/cakephp/debug_kit/tree/2.2') ?>:
-
diff --git a/lib/Cake/Console/Templates/skel/webroot/.htaccess b/lib/Cake/Console/Templates/skel/webroot/.htaccess
index 1f19e4c0601..1d499ba73bb 100644
--- a/lib/Cake/Console/Templates/skel/webroot/.htaccess
+++ b/lib/Cake/Console/Templates/skel/webroot/.htaccess
@@ -1,6 +1,6 @@
- RewriteEngine On - RewriteCond %{REQUEST_FILENAME} !-d - RewriteCond %{REQUEST_FILENAME} !-f - RewriteRule ^ index.php [L] + RewriteEngine On + RewriteCond %{REQUEST_FILENAME} !-d + RewriteCond %{REQUEST_FILENAME} !-f + RewriteRule ^ index.php [L] diff --git a/lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css b/lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css index 9bdf5307aef..ddfda2b4bc1 100644 --- a/lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css +++ b/lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css @@ -1,6 +1,5 @@ @charset "utf-8"; /** - * * Generic CSS for CakePHP * * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) @@ -84,7 +83,7 @@ p { line-height:20px; background: #003d4c url('../img/cake.icon.png') no-repeat left; color: #fff; - padding: 0px 30px; + padding: 0 30px; } #header h1 a { color: #fff; @@ -172,7 +171,7 @@ td.actions { white-space: nowrap; } table td.actions a { - margin: 0px 6px; + margin: 0 6px; padding:2px 5px; } @@ -334,7 +333,7 @@ option { input[type=checkbox] { clear: left; float: left; - margin: 0px 6px 7px 2px; + margin: 0 6px 7px 2px; width: auto; } div.checkbox label { @@ -363,7 +362,7 @@ form .submit input[type=submit] { background-image: -moz-linear-gradient(top, #76BF6B, #3B8230); border-color: #2d6324; color: #fff; - text-shadow: rgba(0, 0, 0, 0.5) 0px -1px 0px; + text-shadow: rgba(0, 0, 0, 0.5) 0 -1px 0; padding: 8px 10px; } form .submit input[type=submit]:hover { @@ -525,11 +524,11 @@ input[type=submit], -moz-border-radius: 4px; border-radius: 4px; text-decoration: none; - text-shadow: #fff 0px 1px 0px; + text-shadow: #fff 0 1px 0; min-width: 0; - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.2); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.2); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.2); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0 1px 1px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0 1px 1px rgba(0, 0, 0, 0.2); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0 1px 1px rgba(0, 0, 0, 0.2); -webkit-user-select: none; user-select: none; } @@ -549,7 +548,7 @@ input[type=submit]:active, background-image: -ms-linear-gradient(top, #dfdfdf, #eee); background-image: -o-linear-gradient(top, #dfdfdf, #eee); background-image: linear-gradient(top, #dfdfdf, #eee); - text-shadow: #eee 0px 1px 0px; + text-shadow: #eee 0 1px 0; -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); @@ -625,15 +624,15 @@ pre { -moz-border-radius: 10px; -webkit-border-radius: 10px; border-radius: 10px; - margin: 0px 4px 10px 2px; + margin: 0 4px 10px 2px; font-family: sans-serif; font-size: 14px; line-height: 14px; display: inline-block; text-decoration: none; - -moz-box-shadow: inset 0px 1px 0 rgba(0, 0, 0, 0.3); - -webkit-box-shadow: inset 0px 1px 0 rgba(0, 0, 0, 0.3); - box-shadow: inset 0px 1px 0 rgba(0, 0, 0, 0.3); + -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.3); + -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.3); + box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.3); } .cake-code-dump pre { position: relative; @@ -645,13 +644,13 @@ pre { .cake-stack-trace pre { color: #000; background-color: #F0F0F0; - margin: 0px 0 10px 0; + margin: 0 0 10px 0; padding: 1em; overflow: auto; text-shadow: none; } .cake-stack-trace li { - padding: 10px 5px 0px; + padding: 10px 5px 0; margin: 0 0 4px 0; font-family: monospace; border: 1px solid #bbb; @@ -707,7 +706,7 @@ pre { } .code-coverage-results div.start { border:1px solid #aaa; - border-width:1px 1px 0px 1px; + border-width:1px 1px 0 1px; margin-top:30px; padding-top:5px; } diff --git a/lib/Cake/Console/Templates/skel/webroot/index.php b/lib/Cake/Console/Templates/skel/webroot/index.php index 4b67fafa4ea..2db183b8d43 100644 --- a/lib/Cake/Console/Templates/skel/webroot/index.php +++ b/lib/Cake/Console/Templates/skel/webroot/index.php @@ -24,7 +24,6 @@ /** * The full path to the directory which holds "app", WITHOUT a trailing DS. - * */ if (!defined('ROOT')) { define('ROOT', dirname(dirname(dirname(__FILE__)))); @@ -32,7 +31,6 @@ /** * The actual directory name for the "app". - * */ if (!defined('APP_DIR')) { define('APP_DIR', basename(dirname(dirname(__FILE__)))); @@ -67,7 +65,6 @@ /** * Editing below this line should NOT be necessary. * Change at your own risk. - * */ if (!defined('WEBROOT_DIR')) { define('WEBROOT_DIR', basename(dirname(__FILE__))); @@ -77,7 +74,7 @@ } // for built-in server -if (php_sapi_name() === 'cli-server') { +if (PHP_SAPI === 'cli-server') { if ($_SERVER['REQUEST_URI'] !== '/' && file_exists(WWW_ROOT . $_SERVER['PHP_SELF'])) { return false; } diff --git a/lib/Cake/Console/Templates/skel/webroot/test.php b/lib/Cake/Console/Templates/skel/webroot/test.php index 0de048175a9..08eb92f3a2c 100644 --- a/lib/Cake/Console/Templates/skel/webroot/test.php +++ b/lib/Cake/Console/Templates/skel/webroot/test.php @@ -25,7 +25,6 @@ /** * The full path to the directory which holds "app", WITHOUT a trailing DS. - * */ if (!defined('ROOT')) { define('ROOT', dirname(dirname(dirname(__FILE__)))); @@ -33,7 +32,6 @@ /** * The actual directory name for the "app". - * */ if (!defined('APP_DIR')) { define('APP_DIR', basename(dirname(dirname(__FILE__)))); @@ -65,7 +63,6 @@ /** * Editing below this line should not be necessary. * Change at your own risk. - * */ if (!defined('WEBROOT_DIR')) { define('WEBROOT_DIR', basename(dirname(__FILE__))); diff --git a/lib/Cake/Controller/Component/Acl/DbAcl.php b/lib/Cake/Controller/Component/Acl/DbAcl.php index 33dfd3e4fa5..7d7db6522cb 100644 --- a/lib/Cake/Controller/Component/Acl/DbAcl.php +++ b/lib/Cake/Controller/Component/Acl/DbAcl.php @@ -41,7 +41,6 @@ class DbAcl extends Object implements AclInterface { /** * Constructor - * */ public function __construct() { parent::__construct(); diff --git a/lib/Cake/Controller/Component/Acl/PhpAcl.php b/lib/Cake/Controller/Component/Acl/PhpAcl.php index 8c24c08752c..40d2a77aeb5 100644 --- a/lib/Cake/Controller/Component/Acl/PhpAcl.php +++ b/lib/Cake/Controller/Component/Acl/PhpAcl.php @@ -68,7 +68,7 @@ class PhpAcl extends Object implements AclInterface { */ public function __construct() { $this->options = array( - 'policy' => self::DENY, + 'policy' => static::DENY, 'config' => APP . 'Config' . DS . 'acl.php', ); } @@ -196,7 +196,6 @@ public function check($aro, $aco, $action = "*") { /** * Access Control Object - * */ class PhpAco { @@ -252,7 +251,7 @@ public function path($aco) { } foreach ($root as $node => $elements) { - $pattern = '/^' . str_replace(array_keys(self::$modifiers), array_values(self::$modifiers), $node) . '$/'; + $pattern = '/^' . str_replace(array_keys(static::$modifiers), array_values(static::$modifiers), $node) . '$/'; if ($node == $aco[$level] || preg_match($pattern, $aco[$level])) { // merge allow/denies with $path of current level @@ -361,7 +360,6 @@ public function build(array $allow, array $deny = array()) { /** * Access Request Object - * */ class PhpAro { @@ -494,7 +492,7 @@ public function resolve($aro) { return $this->aliases[$mapped]; } } - return self::DEFAULT_ROLE; + return static::DEFAULT_ROLE; } /** diff --git a/lib/Cake/Controller/Component/AclComponent.php b/lib/Cake/Controller/Component/AclComponent.php index 184e436342b..cc74f24ccc4 100644 --- a/lib/Cake/Controller/Component/AclComponent.php +++ b/lib/Cake/Controller/Component/AclComponent.php @@ -79,7 +79,7 @@ public function __construct(ComponentCollection $collection, $settings = array() * Will call the initialize method on the adapter if setting a new one. * * @param AclInterface|string $adapter Instance of AclInterface or a string name of the class to use. (optional) - * @return AclInterface|void either null, or the adapter implementation. + * @return AclInterface|null Either null, or the adapter implementation. * @throws CakeException when the given class is not an instance of AclInterface */ public function adapter($adapter = null) { @@ -92,7 +92,7 @@ public function adapter($adapter = null) { } $this->_Instance = $adapter; $this->_Instance->initialize($this); - return; + return null; } return $this->_Instance; } diff --git a/lib/Cake/Controller/Component/AuthComponent.php b/lib/Cake/Controller/Component/AuthComponent.php index 3d2169b47c0..56b6a06dd09 100644 --- a/lib/Cake/Controller/Component/AuthComponent.php +++ b/lib/Cake/Controller/Component/AuthComponent.php @@ -50,7 +50,7 @@ class AuthComponent extends Component { * * @var array */ - public $components = array('Session', 'RequestHandler'); + public $components = array('Session', 'Flash', 'RequestHandler'); /** * An array of authentication objects to use for authenticating users. You can configure @@ -373,7 +373,9 @@ protected function _unauthenticated(Controller $controller) { $this->_stop(); return false; } - $controller->redirect(null, 403); + $controller->response->statusCode(403); + $controller->response->send(); + $this->_stop(); return false; } @@ -479,7 +481,7 @@ public function isAuthorized($user = null, CakeRequest $request = null) { */ public function constructAuthorize() { if (empty($this->authorize)) { - return; + return null; } $this->_authorizeObjects = array(); $config = Hash::normalize((array)$this->authorize); @@ -608,7 +610,7 @@ public function login($user = null) { } if ($user) { $this->Session->renew(); - $this->Session->write(self::$sessionKey, $user); + $this->Session->write(static::$sessionKey, $user); $event = new CakeEvent('Auth.afterIdentify', $this, array('user' => $user)); $this->_Collection->getController()->getEventManager()->dispatch($event); } @@ -637,7 +639,7 @@ public function logout() { foreach ($this->_authenticateObjects as $auth) { $auth->logout($user); } - $this->Session->delete(self::$sessionKey); + $this->Session->delete(static::$sessionKey); $this->Session->delete('Auth.redirect'); $this->Session->renew(); return Router::normalize($this->logoutRedirect); @@ -655,10 +657,10 @@ public function logout() { * @link http://book.cakephp.org/2.0/en/core-libraries/components/authentication.html#accessing-the-logged-in-user */ public static function user($key = null) { - if (!empty(self::$_user)) { - $user = self::$_user; - } elseif (self::$sessionKey && CakeSession::check(self::$sessionKey)) { - $user = CakeSession::read(self::$sessionKey); + if (!empty(static::$_user)) { + $user = static::$_user; + } elseif (static::$sessionKey && CakeSession::check(static::$sessionKey)) { + $user = CakeSession::read(static::$sessionKey); } else { return null; } @@ -687,7 +689,7 @@ protected function _getUser() { foreach ($this->_authenticateObjects as $auth) { $result = $auth->getUser($this->request); if (!empty($result) && is_array($result)) { - self::$_user = $result; + static::$_user = $result; return true; } } @@ -770,12 +772,12 @@ public function identify(CakeRequest $request, CakeResponse $response) { /** * Loads the configured authentication objects. * - * @return mixed either null on empty authenticate value, or an array of loaded objects. + * @return mixed Either null on empty authenticate value, or an array of loaded objects. * @throws CakeException */ public function constructAuthenticate() { if (empty($this->authenticate)) { - return; + return null; } $this->_authenticateObjects = array(); $config = Hash::normalize((array)$this->authenticate); @@ -840,7 +842,7 @@ public function flash($message) { if ($message === false) { return; } - $this->Session->setFlash($message, $this->flash['element'], $this->flash['params'], $this->flash['key']); + $this->Flash->set($message, $this->flash); } } diff --git a/lib/Cake/Controller/Component/CookieComponent.php b/lib/Cake/Controller/Component/CookieComponent.php index 6ed908d555b..2bb75194d60 100644 --- a/lib/Cake/Controller/Component/CookieComponent.php +++ b/lib/Cake/Controller/Component/CookieComponent.php @@ -27,7 +27,6 @@ * * @package Cake.Controller.Component * @link http://book.cakephp.org/2.0/en/core-libraries/components/cookie.html - * */ class CookieComponent extends Component { diff --git a/lib/Cake/Controller/Component/EmailComponent.php b/lib/Cake/Controller/Component/EmailComponent.php index 799baaca8f1..d89099f7e84 100644 --- a/lib/Cake/Controller/Component/EmailComponent.php +++ b/lib/Cake/Controller/Component/EmailComponent.php @@ -309,7 +309,8 @@ public function send($content = null, $template = null, $layout = null) { $lib->readReceipt($this->_formatAddresses((array)$this->readReceipt)); } - $lib->subject($this->subject)->messageID($this->messageId); + $lib->subject($this->subject); + $lib->messageID($this->messageId); $lib->helpers($this->_controller->helpers); $headers = array('X-Mailer' => $this->xMailer); diff --git a/lib/Cake/Controller/Component/FlashComponent.php b/lib/Cake/Controller/Component/FlashComponent.php new file mode 100644 index 00000000000..2e0fa4e6861 --- /dev/null +++ b/lib/Cake/Controller/Component/FlashComponent.php @@ -0,0 +1,120 @@ + 'flash', + 'element' => 'default', + 'params' => array(), + ); + +/** + * Constructor + * + * @param ComponentCollection $collection The ComponentCollection object + * @param array $settings Settings passed via controller + */ + public function __construct(ComponentCollection $collection, $settings = array()) { + $this->_defaultConfig = Hash::merge($this->_defaultConfig, $settings); + } + +/** + * Used to set a session variable that can be used to output messages in the view. + * + * In your controller: $this->Flash->set('This has been saved'); + * + * ### Options: + * + * - `key` The key to set under the session's Flash key + * - `element` The element used to render the flash message. Default to 'default'. + * - `params` An array of variables to make available when using an element + * + * @param string $message Message to be flashed. If an instance + * of Exception the exception message will be used and code will be set + * in params. + * @param array $options An array of options. + * @return void + */ + + public function set($message, $options = array()) { + $options += $this->_defaultConfig; + + if ($message instanceof Exception) { + $options['params'] += array('code' => $message->getCode()); + $message = $message->getMessage(); + } + + list($plugin, $element) = pluginSplit($options['element']); + + if ($plugin) { + $options['element'] = $plugin . '.Flash/' . $element; + } else { + $options['element'] = 'Flash/' . $element; + } + + CakeSession::write('Message.' . $options['key'], array( + 'message' => $message, + 'key' => $options['key'], + 'element' => $options['element'], + 'params' => $options['params'] + )); + } + +/** + * Magic method for verbose flash methods based on element names. + * + * For example: $this->Flash->success('My message') would use the + * success.ctp element under `app/View/Element/Flash` for rendering the + * flash message. + * + * @param string $name Element name to use. + * @param array $args Parameters to pass when calling `FlashComponent::set()`. + * @return void + * @throws InternalErrorException If missing the flash message. + */ + public function __call($name, $args) { + $options = array('element' => Inflector::underscore($name)); + + if (count($args) < 1) { + throw new InternalErrorException('Flash message missing.'); + } + + if (!empty($args[1])) { + $options += (array)$args[1]; + } + + $this->set($args[0], $options); + } +} diff --git a/lib/Cake/Controller/Component/PaginatorComponent.php b/lib/Cake/Controller/Component/PaginatorComponent.php index 94a6065521c..6e34fa6d784 100644 --- a/lib/Cake/Controller/Component/PaginatorComponent.php +++ b/lib/Cake/Controller/Component/PaginatorComponent.php @@ -333,15 +333,13 @@ public function getDefaults($alias) { if (isset($this->settings[$alias])) { $defaults = $this->settings[$alias]; } - if (isset($defaults['limit']) && - (empty($defaults['maxLimit']) || $defaults['limit'] > $defaults['maxLimit']) - ) { - $defaults['maxLimit'] = $defaults['limit']; - } - return array_merge( - array('page' => 1, 'limit' => 20, 'maxLimit' => 100, 'paramType' => 'named'), - $defaults + $defaults += array( + 'page' => 1, + 'limit' => 20, + 'maxLimit' => 100, + 'paramType' => 'named' ); + return $defaults; } /** @@ -388,6 +386,10 @@ public function validateSort(Model $object, array $options, array $whitelist = a if (!empty($options['order']) && is_array($options['order'])) { $order = array(); foreach ($options['order'] as $key => $value) { + if (is_int($key)) { + $key = $value; + $value = 'asc'; + } $field = $key; $alias = $object->alias; if (strpos($key, '.') !== false) { diff --git a/lib/Cake/Controller/Component/RequestHandlerComponent.php b/lib/Cake/Controller/Component/RequestHandlerComponent.php index 9d55814873c..ea1d727045b 100644 --- a/lib/Cake/Controller/Component/RequestHandlerComponent.php +++ b/lib/Cake/Controller/Component/RequestHandlerComponent.php @@ -32,7 +32,6 @@ * * @package Cake.Controller.Component * @link http://book.cakephp.org/2.0/en/core-libraries/components/request-handling.html - * */ class RequestHandlerComponent extends Component { @@ -229,7 +228,7 @@ public function startup(Controller $controller) { */ public function convertXml($xml) { try { - $xml = Xml::build($xml); + $xml = Xml::build($xml, array('readFile' => false)); if (isset($xml->data)) { return Xml::toArray($xml->data); } @@ -280,7 +279,7 @@ public function beforeRedirect(Controller $controller, $url, $status = null, $ex * "304 Not Modified" header. * * @param Controller $controller Controller instance. - * @return bool false if the render process should be aborted + * @return bool False if the render process should be aborted. */ public function beforeRender(Controller $controller) { if ($this->settings['checkHttpCache'] && $this->response->checkNotModified($this->request)) { diff --git a/lib/Cake/Controller/Component/SecurityComponent.php b/lib/Cake/Controller/Component/SecurityComponent.php index 68255eb2e93..12f225ff366 100644 --- a/lib/Cake/Controller/Component/SecurityComponent.php +++ b/lib/Cake/Controller/Component/SecurityComponent.php @@ -17,7 +17,7 @@ */ App::uses('Component', 'Controller'); -App::uses('String', 'Utility'); +App::uses('CakeText', 'Utility'); App::uses('Hash', 'Utility'); App::uses('Security', 'Utility'); @@ -47,7 +47,7 @@ class SecurityComponent extends Component { * List of controller actions for which a POST request is required * * @var array - * @deprecated 3.0.0 Use CakeRequest::onlyAllow() instead. + * @deprecated 3.0.0 Use CakeRequest::allowMethod() instead. * @see SecurityComponent::requirePost() */ public $requirePost = array(); @@ -56,7 +56,7 @@ class SecurityComponent extends Component { * List of controller actions for which a GET request is required * * @var array - * @deprecated 3.0.0 Use CakeRequest::onlyAllow() instead. + * @deprecated 3.0.0 Use CakeRequest::allowMethod() instead. * @see SecurityComponent::requireGet() */ public $requireGet = array(); @@ -65,7 +65,7 @@ class SecurityComponent extends Component { * List of controller actions for which a PUT request is required * * @var array - * @deprecated 3.0.0 Use CakeRequest::onlyAllow() instead. + * @deprecated 3.0.0 Use CakeRequest::allowMethod() instead. * @see SecurityComponent::requirePut() */ public $requirePut = array(); @@ -74,7 +74,7 @@ class SecurityComponent extends Component { * List of controller actions for which a DELETE request is required * * @var array - * @deprecated 3.0.0 Use CakeRequest::onlyAllow() instead. + * @deprecated 3.0.0 Use CakeRequest::allowMethod() instead. * @see SecurityComponent::requireDelete() */ public $requireDelete = array(); diff --git a/lib/Cake/Controller/Component/SessionComponent.php b/lib/Cake/Controller/Component/SessionComponent.php index 9ce9a38f93b..0a7dd062eaf 100644 --- a/lib/Cake/Controller/Component/SessionComponent.php +++ b/lib/Cake/Controller/Component/SessionComponent.php @@ -34,14 +34,14 @@ class SessionComponent extends Component { * Get / Set the userAgent * * @param string $userAgent Set the userAgent - * @return void + * @return string Current user agent. */ public function userAgent($userAgent = null) { return CakeSession::userAgent($userAgent); } /** - * Used to write a value to a session key. + * Writes a value to a session key. * * In your controller: $this->Session->write('Controller.sessKey', 'session value'); * @@ -56,7 +56,7 @@ public function write($name, $value = null) { } /** - * Used to read a session values for a key or return values for all keys. + * Reads a session value for a key or returns values for all keys. * * In your controller: $this->Session->read('Controller.sessKey'); * Calling the method without a param will return all session vars @@ -70,7 +70,7 @@ public function read($name = null) { } /** - * Wrapper for SessionComponent::del(); + * Deletes a session value for a key. * * In your controller: $this->Session->delete('Controller.sessKey'); * @@ -83,7 +83,19 @@ public function delete($name) { } /** - * Used to check if a session variable is set + * Reads and deletes a session value for a key. + * + * In your controller: `$this->Session->consume('Controller.sessKey');` + * + * @param string $name the name of the session key you want to read + * @return mixed values from the session vars + */ + public function consume($name) { + return CakeSession::consume($name); + } + +/** + * Checks if a session variable is set. * * In your controller: $this->Session->check('Controller.sessKey'); * @@ -121,6 +133,7 @@ public function error() { * @param string $key Message key, default is 'flash' * @return void * @link http://book.cakephp.org/2.0/en/core-libraries/components/sessions.html#creating-notification-messages + * @deprecated 3.0.0 Since 2.7, use the FlashComponent instead. */ public function setFlash($message, $element = 'default', $params = array(), $key = 'flash') { CakeSession::write('Message.' . $key, compact('message', 'element', 'params')); diff --git a/lib/Cake/Controller/Controller.php b/lib/Cake/Controller/Controller.php index 6005a1dc25c..78381e90acd 100644 --- a/lib/Cake/Controller/Controller.php +++ b/lib/Cake/Controller/Controller.php @@ -514,12 +514,12 @@ protected function _isPrivateAction(ReflectionMethod $method, CakeRequest $reque !$method->isPublic() || !in_array($method->name, $this->methods) ); - $prefixes = Router::prefixes(); + $prefixes = array_map('strtolower', Router::prefixes()); if (!$privateAction && !empty($prefixes)) { if (empty($request->params['prefix']) && strpos($request->params['action'], '_') > 0) { list($prefix) = explode('_', $request->params['action']); - $privateAction = in_array($prefix, $prefixes); + $privateAction = in_array(strtolower($prefix), $prefixes); } } return $privateAction; @@ -751,7 +751,7 @@ public function loadModel($modelClass = null, $id = null) { * * @param string|array $url A string or array-based URL pointing to another location within the app, * or an absolute URL - * @param int $status Optional HTTP status code (eg: 404) + * @param int|array|null $status HTTP status code (eg: 301). Defaults to 302 when null is passed. * @param bool $exit If true, exit() will be called after the redirect * @return void * @triggers Controller.beforeRedirect $this, array($url, $status, $exit) @@ -785,9 +785,10 @@ public function redirect($url, $status = null, $exit = true) { } } - if ($status) { - $this->response->statusCode($status); + if ($status === null) { + $status = 302; } + $this->response->statusCode($status); if ($exit) { $this->response->send(); @@ -974,7 +975,7 @@ public function referer($default = null, $local = false) { } $referer = $this->request->referer($local); - if ($referer === '/' && $default) { + if ($referer === '/' && $default && $default !== $referer) { return Router::url($default, !$local); } return $referer; diff --git a/lib/Cake/Controller/Scaffold.php b/lib/Cake/Controller/Scaffold.php index 459b87fd87c..af6f6a969db 100644 --- a/lib/Cake/Controller/Scaffold.php +++ b/lib/Cake/Controller/Scaffold.php @@ -399,7 +399,7 @@ protected function _scaffold(CakeRequest $request) { } } else { throw new MissingActionException(array( - 'controller' => $this->controller->name, + 'controller' => get_class($this->controller), 'action' => $request->action )); } diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php index ab2e86ad015..b9b43fce9ab 100644 --- a/lib/Cake/Core/App.php +++ b/lib/Cake/Core/App.php @@ -218,14 +218,14 @@ class App { * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::path */ public static function path($type, $plugin = null) { - if (!empty(self::$legacy[$type])) { - $type = self::$legacy[$type]; + if (!empty(static::$legacy[$type])) { + $type = static::$legacy[$type]; } if (!empty($plugin)) { $path = array(); $pluginPath = CakePlugin::path($plugin); - $packageFormat = self::_packageFormat(); + $packageFormat = static::_packageFormat(); if (!empty($packageFormat[$type])) { foreach ($packageFormat[$type] as $f) { $path[] = sprintf($f, $pluginPath); @@ -243,10 +243,10 @@ public static function path($type, $plugin = null) { return $path; } - if (!isset(self::$_packages[$type])) { + if (!isset(static::$_packages[$type])) { return array(); } - return self::$_packages[$type]; + return static::$_packages[$type]; } /** @@ -258,7 +258,7 @@ public static function path($type, $plugin = null) { * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::paths */ public static function paths() { - return self::$_packages; + return static::$_packages; } /** @@ -268,7 +268,7 @@ public static function paths() { * * Usage: * - * `App::build(array(Model' => array('/a/full/path/to/models/'))); will setup a new search path for the Model package` + * `App::build(array('Model' => array('/a/full/path/to/models/'))); will setup a new search path for the Model package` * * `App::build(array('Model' => array('/path/to/models/')), App::RESET); will setup the path as the only valid path for searching models` * @@ -288,8 +288,8 @@ public static function build($paths = array(), $mode = App::PREPEND) { //Provides Backwards compatibility for old-style package names $legacyPaths = array(); foreach ($paths as $type => $path) { - if (!empty(self::$legacy[$type])) { - $type = self::$legacy[$type]; + if (!empty(static::$legacy[$type])) { + $type = static::$legacy[$type]; } $legacyPaths[$type] = $path; } @@ -297,17 +297,17 @@ public static function build($paths = array(), $mode = App::PREPEND) { if ($mode === App::RESET) { foreach ($paths as $type => $new) { - self::$_packages[$type] = (array)$new; - self::objects($type, null, false); + static::$_packages[$type] = (array)$new; + static::objects($type, null, false); } return; } if (empty($paths)) { - self::$_packageFormat = null; + static::$_packageFormat = null; } - $packageFormat = self::_packageFormat(); + $packageFormat = static::_packageFormat(); if ($mode === App::REGISTER) { foreach ($paths as $package => $formats) { @@ -318,7 +318,7 @@ public static function build($paths = array(), $mode = App::PREPEND) { $packageFormat[$package] = array_values(array_unique($formats)); } } - self::$_packageFormat = $packageFormat; + static::$_packageFormat = $packageFormat; } $defaults = array(); @@ -329,7 +329,7 @@ public static function build($paths = array(), $mode = App::PREPEND) { } if (empty($paths)) { - self::$_packages = $defaults; + static::$_packages = $defaults; return; } @@ -338,8 +338,8 @@ public static function build($paths = array(), $mode = App::PREPEND) { } foreach ($defaults as $type => $default) { - if (!empty(self::$_packages[$type])) { - $path = self::$_packages[$type]; + if (!empty(static::$_packages[$type])) { + $path = static::$_packages[$type]; } else { $path = $default; } @@ -356,7 +356,7 @@ public static function build($paths = array(), $mode = App::PREPEND) { $path = array_values(array_unique($path)); } - self::$_packages[$type] = $path; + static::$_packages[$type] = $path; } } @@ -389,12 +389,12 @@ public static function pluginPath($plugin) { */ public static function themePath($theme) { $themeDir = 'Themed' . DS . Inflector::camelize($theme); - foreach (self::$_packages['View'] as $path) { + foreach (static::$_packages['View'] as $path) { if (is_dir($path . $themeDir)) { return $path . $themeDir . DS; } } - return self::$_packages['View'][0] . $themeDir . DS; + return static::$_packages['View'][0] . $themeDir . DS; } /** @@ -436,8 +436,8 @@ public static function core($type) { * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::objects */ public static function objects($type, $path = null, $cache = true) { - if (empty(self::$_objects) && $cache === true) { - self::$_objects = (array)Cache::read('object_map', '_cake_core_'); + if (empty(static::$_objects) && $cache === true) { + static::$_objects = (array)Cache::read('object_map', '_cake_core_'); } $extension = '/\.php$/'; @@ -455,8 +455,8 @@ public static function objects($type, $path = null, $cache = true) { list($plugin, $type) = pluginSplit($type); - if (isset(self::$legacy[$type . 's'])) { - $type = self::$legacy[$type . 's']; + if (isset(static::$legacy[$type . 's'])) { + $type = static::$legacy[$type . 's']; } if ($type === 'file' && !$path) { @@ -468,11 +468,11 @@ public static function objects($type, $path = null, $cache = true) { $cacheLocation = empty($plugin) ? 'app' : $plugin; - if ($cache !== true || !isset(self::$_objects[$cacheLocation][$name])) { + if ($cache !== true || !isset(static::$_objects[$cacheLocation][$name])) { $objects = array(); if (empty($path)) { - $path = self::path($type, $plugin); + $path = static::path($type, $plugin); } foreach ((array)$path as $dir) { @@ -503,13 +503,13 @@ public static function objects($type, $path = null, $cache = true) { return $objects; } - self::$_objects[$cacheLocation][$name] = $objects; + static::$_objects[$cacheLocation][$name] = $objects; if ($cache) { - self::$_objectCacheChange = true; + static::$_objectCacheChange = true; } } - return self::$_objects[$cacheLocation][$name]; + return static::$_objects[$cacheLocation][$name]; } /** @@ -528,7 +528,7 @@ public static function objects($type, $path = null, $cache = true) { * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::uses */ public static function uses($className, $location) { - self::$_classMap[$className] = $location; + static::$_classMap[$className] = $location; } /** @@ -541,24 +541,24 @@ public static function uses($className, $location) { * @return bool */ public static function load($className) { - if (!isset(self::$_classMap[$className])) { + if (!isset(static::$_classMap[$className])) { return false; } if (strpos($className, '..') !== false) { return false; } - $parts = explode('.', self::$_classMap[$className], 2); + $parts = explode('.', static::$_classMap[$className], 2); list($plugin, $package) = count($parts) > 1 ? $parts : array(null, current($parts)); - $file = self::_mapped($className, $plugin); + $file = static::_mapped($className, $plugin); if ($file) { return include $file; } - $paths = self::path($package, $plugin); + $paths = static::path($package, $plugin); if (empty($plugin)) { - $appLibs = empty(self::$_packages['Lib']) ? APPLIBS : current(self::$_packages['Lib']); + $appLibs = empty(static::$_packages['Lib']) ? APPLIBS : current(static::$_packages['Lib']); $paths[] = $appLibs . $package . DS; $paths[] = APP . $package . DS; $paths[] = CAKE . $package . DS; @@ -572,7 +572,7 @@ public static function load($className) { foreach ($paths as $path) { $file = $path . $normalizedClassName . '.php'; if (file_exists($file)) { - self::_map($file, $className, $plugin); + static::_map($file, $className, $plugin); return include $file; } } @@ -588,8 +588,8 @@ public static function load($className) { * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::location */ public static function location($className) { - if (!empty(self::$_classMap[$className])) { - return self::$_classMap[$className]; + if (!empty(static::$_classMap[$className])) { + return static::$_classMap[$className]; } return null; } @@ -638,8 +638,8 @@ public static function import($type = null, $name = null, $parent = true, $searc $originalType = strtolower($type); $specialPackage = in_array($originalType, array('file', 'vendor')); - if (!$specialPackage && isset(self::$legacy[$originalType . 's'])) { - $type = self::$legacy[$originalType . 's']; + if (!$specialPackage && isset(static::$legacy[$originalType . 's'])) { + $type = static::$legacy[$originalType . 's']; } list($plugin, $name) = pluginSplit($name); if (!empty($plugin)) { @@ -649,15 +649,15 @@ public static function import($type = null, $name = null, $parent = true, $searc } if (!$specialPackage) { - return self::_loadClass($name, $plugin, $type, $originalType, $parent); + return static::_loadClass($name, $plugin, $type, $originalType, $parent); } if ($originalType === 'file' && !empty($file)) { - return self::_loadFile($name, $plugin, $search, $file, $return); + return static::_loadFile($name, $plugin, $search, $file, $return); } if ($originalType === 'vendor') { - return self::_loadVendor($name, $plugin, $file, $ext); + return static::_loadVendor($name, $plugin, $file, $ext); } return false; @@ -677,12 +677,12 @@ public static function import($type = null, $name = null, $parent = true, $searc protected static function _loadClass($name, $plugin, $type, $originalType, $parent) { if ($type === 'Console/Command' && $name === 'Shell') { $type = 'Console'; - } elseif (isset(self::$types[$originalType]['suffix'])) { - $suffix = self::$types[$originalType]['suffix']; + } elseif (isset(static::$types[$originalType]['suffix'])) { + $suffix = static::$types[$originalType]['suffix']; $name .= ($suffix === $name) ? '' : $suffix; } - if ($parent && isset(self::$types[$originalType]['extends'])) { - $extends = self::$types[$originalType]['extends']; + if ($parent && isset(static::$types[$originalType]['extends'])) { + $extends = static::$types[$originalType]['extends']; $extendType = $type; if (strpos($extends, '/') !== false) { $parts = explode('/', $extends); @@ -713,7 +713,7 @@ protected static function _loadClass($name, $plugin, $type, $originalType, $pare * @return mixed if $return contents of the file after php parses it, boolean indicating success otherwise */ protected static function _loadFile($name, $plugin, $search, $file, $return) { - $mapped = self::_mapped($name, $plugin); + $mapped = static::_mapped($name, $plugin); if ($mapped) { $file = $mapped; } elseif (!empty($search)) { @@ -730,7 +730,7 @@ protected static function _loadFile($name, $plugin, $search, $file, $return) { } } if (!empty($file) && file_exists($file)) { - self::_map($file, $name, $plugin); + static::_map($file, $name, $plugin); $returnValue = include $file; if ($return) { return $returnValue; @@ -750,7 +750,7 @@ protected static function _loadFile($name, $plugin, $search, $file, $return) { * @return bool true if the file was loaded successfully, false otherwise */ protected static function _loadVendor($name, $plugin, $file, $ext) { - if ($mapped = self::_mapped($name, $plugin)) { + if ($mapped = static::_mapped($name, $plugin)) { return (bool)include_once $mapped; } $fileTries = array(); @@ -768,7 +768,7 @@ protected static function _loadVendor($name, $plugin, $file, $ext) { foreach ($fileTries as $file) { foreach ($paths as $path) { if (file_exists($path . $file)) { - self::_map($path . $file, $name, $plugin); + static::_map($path . $file, $name, $plugin); return (bool)include $path . $file; } } @@ -782,7 +782,7 @@ protected static function _loadVendor($name, $plugin, $file, $ext) { * @return void */ public static function init() { - self::$_map += (array)Cache::read('file_map', '_cake_core_'); + static::$_map += (array)Cache::read('file_map', '_cake_core_'); register_shutdown_function(array('App', 'shutdown')); } @@ -799,14 +799,14 @@ protected static function _map($file, $name, $plugin = null) { if ($plugin) { $key = 'plugin.' . $name; } - if ($plugin && empty(self::$_map[$name])) { - self::$_map[$key] = $file; + if ($plugin && empty(static::$_map[$name])) { + static::$_map[$key] = $file; } - if (!$plugin && empty(self::$_map['plugin.' . $name])) { - self::$_map[$key] = $file; + if (!$plugin && empty(static::$_map['plugin.' . $name])) { + static::$_map[$key] = $file; } - if (!self::$bootstrapping) { - self::$_cacheChange = true; + if (!static::$bootstrapping) { + static::$_cacheChange = true; } } @@ -822,7 +822,7 @@ protected static function _mapped($name, $plugin = null) { if ($plugin) { $key = 'plugin.' . $name; } - return isset(self::$_map[$key]) ? self::$_map[$key] : false; + return isset(static::$_map[$key]) ? static::$_map[$key] : false; } /** @@ -831,8 +831,8 @@ protected static function _mapped($name, $plugin = null) { * @return array templates for each customizable package path */ protected static function _packageFormat() { - if (empty(self::$_packageFormat)) { - self::$_packageFormat = array( + if (empty(static::$_packageFormat)) { + static::$_packageFormat = array( 'Model' => array( '%s' . 'Model' . DS ), @@ -883,16 +883,18 @@ protected static function _packageFormat() { ), 'Vendor' => array( '%s' . 'Vendor' . DS, - dirname(dirname(CAKE)) . DS . 'vendors' . DS, + ROOT . DS . 'vendors' . DS, + dirname(dirname(CAKE)) . DS . 'vendors' . DS ), 'Plugin' => array( APP . 'Plugin' . DS, + ROOT . DS . 'plugins' . DS, dirname(dirname(CAKE)) . DS . 'plugins' . DS ) ); } - return self::$_packageFormat; + return static::$_packageFormat; } /** @@ -904,13 +906,13 @@ protected static function _packageFormat() { * @return void */ public static function shutdown() { - if (self::$_cacheChange) { - Cache::write('file_map', array_filter(self::$_map), '_cake_core_'); + if (static::$_cacheChange) { + Cache::write('file_map', array_filter(static::$_map), '_cake_core_'); } - if (self::$_objectCacheChange) { - Cache::write('object_map', self::$_objects, '_cake_core_'); + if (static::$_objectCacheChange) { + Cache::write('object_map', static::$_objects, '_cake_core_'); } - self::_checkFatalError(); + static::_checkFatalError(); } /** diff --git a/lib/Cake/Core/CakePlugin.php b/lib/Cake/Core/CakePlugin.php index 96ce894fd41..426e22a948b 100644 --- a/lib/Cake/Core/CakePlugin.php +++ b/lib/Cake/Core/CakePlugin.php @@ -37,19 +37,39 @@ class CakePlugin { * * Examples: * - * `CakePlugin::load('DebugKit')` will load the DebugKit plugin and will not load any bootstrap nor route files - * `CakePlugin::load('DebugKit', array('bootstrap' => true, 'routes' => true))` will load the bootstrap.php and routes.php files - * `CakePlugin::load('DebugKit', array('bootstrap' => false, 'routes' => true))` will load routes.php file but not bootstrap.php - * `CakePlugin::load('DebugKit', array('bootstrap' => array('config1', 'config2')))` will load config1.php and config2.php files - * `CakePlugin::load('DebugKit', array('bootstrap' => 'aCallableMethod'))` will run the aCallableMethod function to initialize it + * `CakePlugin::load('DebugKit')` * - * Bootstrap initialization functions can be expressed as a PHP callback type, including closures. Callbacks will receive two - * parameters (plugin name, plugin configuration) + * Will load the DebugKit plugin and will not load any bootstrap nor route files + * + * `CakePlugin::load('DebugKit', array('bootstrap' => true, 'routes' => true))` + * + * will load the bootstrap.php and routes.php files + * + * `CakePlugin::load('DebugKit', array('bootstrap' => false, 'routes' => true))` + * + * will load routes.php file but not bootstrap.php + * + * `CakePlugin::load('DebugKit', array('bootstrap' => array('config1', 'config2')))` + * + * will load config1.php and config2.php files + * + * `CakePlugin::load('DebugKit', array('bootstrap' => 'aCallableMethod'))` + * + * will run the aCallableMethod function to initialize it + * + * Bootstrap initialization functions can be expressed as a PHP callback type, + * including closures. Callbacks will receive two parameters + * (plugin name, plugin configuration) * * It is also possible to load multiple plugins at once. Examples: * - * `CakePlugin::load(array('DebugKit', 'ApiGenerator'))` will load the DebugKit and ApiGenerator plugins - * `CakePlugin::load(array('DebugKit', 'ApiGenerator'), array('bootstrap' => true))` will load bootstrap file for both plugins + * `CakePlugin::load(array('DebugKit', 'ApiGenerator'))` + * + * will load the DebugKit and ApiGenerator plugins + * + * `CakePlugin::load(array('DebugKit', 'ApiGenerator'), array('bootstrap' => true))` + * + * will load bootstrap file for both plugins * * ``` * CakePlugin::load(array( @@ -58,7 +78,9 @@ class CakePlugin { * ), array('bootstrap' => true)) * ``` * - * Will only load the bootstrap for ApiGenerator and only the routes for DebugKit + * Will only load the bootstrap for ApiGenerator and only the routes for DebugKit. + * By using the `path` option you can specify an absolute path to the plugin. Make + * sure that the path is slash terminated or your plugin will not be located properly. * * @param string|array $plugin name of the plugin to be loaded in CamelCase format or array or plugins to load * @param array $config configuration options for the plugin @@ -69,7 +91,7 @@ public static function load($plugin, $config = array()) { if (is_array($plugin)) { foreach ($plugin as $name => $conf) { list($name, $conf) = (is_numeric($name)) ? array($conf, $config) : array($name, $conf); - self::load($name, $conf); + static::load($name, $conf); } return; } @@ -77,26 +99,26 @@ public static function load($plugin, $config = array()) { if (empty($config['path'])) { foreach (App::path('plugins') as $path) { if (is_dir($path . $plugin)) { - self::$_plugins[$plugin] = $config + array('path' => $path . $plugin . DS); + static::$_plugins[$plugin] = $config + array('path' => $path . $plugin . DS); break; } //Backwards compatibility to make easier to migrate to 2.0 $underscored = Inflector::underscore($plugin); if (is_dir($path . $underscored)) { - self::$_plugins[$plugin] = $config + array('path' => $path . $underscored . DS); + static::$_plugins[$plugin] = $config + array('path' => $path . $underscored . DS); break; } } } else { - self::$_plugins[$plugin] = $config; + static::$_plugins[$plugin] = $config; } - if (empty(self::$_plugins[$plugin]['path'])) { + if (empty(static::$_plugins[$plugin]['path'])) { throw new MissingPluginException(array('plugin' => $plugin)); } - if (!empty(self::$_plugins[$plugin]['bootstrap'])) { - self::bootstrap($plugin); + if (!empty(static::$_plugins[$plugin]['bootstrap'])) { + static::bootstrap($plugin); } } @@ -107,13 +129,26 @@ public static function load($plugin, $config = array()) { * * ``` * CakePlugin::loadAll(array( - * array('bootstrap' => true), + * array('bootstrap' => true), * 'DebugKit' => array('routes' => true, 'bootstrap' => false), * )) * ``` * * The above example will load the bootstrap file for all plugins, but for DebugKit it will only load - * the routes file and will not look for any bootstrap script. + * the routes file and will not look for any bootstrap script. If you are loading + * many plugins that inconsistently support routes/bootstrap files, instead of detailing + * each plugin you can use the `ignoreMissing` option: + * + * ``` + * CakePlugin::loadAll(array( + * 'ignoreMissing' => true, + * 'bootstrap' => true, + * 'routes' => true, + * )); + * ``` + * + * The ignoreMissing option will do additional file_exists() calls but is simpler + * to use. * * @param array $options Options list. See CakePlugin::load() for valid options. * @return void @@ -125,7 +160,7 @@ public static function loadAll($options = array()) { if (isset($options[0])) { $opts += $options[0]; } - self::load($p, $opts); + static::load($p, $opts); } } @@ -137,10 +172,10 @@ public static function loadAll($options = array()) { * @throws MissingPluginException if the folder for plugin was not found or plugin has not been loaded */ public static function path($plugin) { - if (empty(self::$_plugins[$plugin])) { + if (empty(static::$_plugins[$plugin])) { throw new MissingPluginException(array('plugin' => $plugin)); } - return self::$_plugins[$plugin]['path']; + return static::$_plugins[$plugin]['path']; } /** @@ -151,7 +186,7 @@ public static function path($plugin) { * @see CakePlugin::load() for examples of bootstrap configuration */ public static function bootstrap($plugin) { - $config = self::$_plugins[$plugin]; + $config = static::$_plugins[$plugin]; if ($config['bootstrap'] === false) { return false; } @@ -159,9 +194,9 @@ public static function bootstrap($plugin) { return call_user_func_array($config['bootstrap'], array($plugin, $config)); } - $path = self::path($plugin); + $path = static::path($plugin); if ($config['bootstrap'] === true) { - return self::_includeFile( + return static::_includeFile( $path . 'Config' . DS . 'bootstrap.php', $config['ignoreMissing'] ); @@ -169,7 +204,7 @@ public static function bootstrap($plugin) { $bootstrap = (array)$config['bootstrap']; foreach ($bootstrap as $file) { - self::_includeFile( + static::_includeFile( $path . 'Config' . DS . $file . '.php', $config['ignoreMissing'] ); @@ -187,17 +222,17 @@ public static function bootstrap($plugin) { */ public static function routes($plugin = null) { if ($plugin === null) { - foreach (self::loaded() as $p) { - self::routes($p); + foreach (static::loaded() as $p) { + static::routes($p); } return true; } - $config = self::$_plugins[$plugin]; + $config = static::$_plugins[$plugin]; if ($config['routes'] === false) { return false; } - return (bool)self::_includeFile( - self::path($plugin) . 'Config' . DS . 'routes.php', + return (bool)static::_includeFile( + static::path($plugin) . 'Config' . DS . 'routes.php', $config['ignoreMissing'] ); } @@ -212,9 +247,9 @@ public static function routes($plugin = null) { */ public static function loaded($plugin = null) { if ($plugin) { - return isset(self::$_plugins[$plugin]); + return isset(static::$_plugins[$plugin]); } - $return = array_keys(self::$_plugins); + $return = array_keys(static::$_plugins); sort($return); return $return; } @@ -227,9 +262,9 @@ public static function loaded($plugin = null) { */ public static function unload($plugin = null) { if ($plugin === null) { - self::$_plugins = array(); + static::$_plugins = array(); } else { - unset(self::$_plugins[$plugin]); + unset(static::$_plugins[$plugin]); } } diff --git a/lib/Cake/Core/Configure.php b/lib/Cake/Core/Configure.php index 5872b016144..464608e8f2f 100644 --- a/lib/Cake/Core/Configure.php +++ b/lib/Cake/Core/Configure.php @@ -67,7 +67,7 @@ class Configure { */ public static function bootstrap($boot = true) { if ($boot) { - self::_appDefaults(); + static::_appDefaults(); if (!include APP . 'Config' . DS . 'core.php') { trigger_error(__d('cake_dev', @@ -87,7 +87,7 @@ public static function bootstrap($boot = true) { 'handler' => 'ErrorHandler::handleError', 'level' => E_ALL & ~E_DEPRECATED, ); - self::_setErrorHandlers($error, $exception); + static::_setErrorHandlers($error, $exception); if (!include APP . 'Config' . DS . 'bootstrap.php') { trigger_error(__d('cake_dev', @@ -98,15 +98,15 @@ public static function bootstrap($boot = true) { } restore_error_handler(); - self::_setErrorHandlers( - self::$_values['Error'], - self::$_values['Exception'] + static::_setErrorHandlers( + static::$_values['Error'], + static::$_values['Exception'] ); - // Preload Debugger + String in case of E_STRICT errors when loading files. - if (self::$_values['debug'] > 0) { + // Preload Debugger + CakeText in case of E_STRICT errors when loading files. + if (static::$_values['debug'] > 0) { class_exists('Debugger'); - class_exists('String'); + class_exists('CakeText'); } } } @@ -117,7 +117,7 @@ class_exists('String'); * @return void */ protected static function _appDefaults() { - self::write('App', (array)self::read('App') + array( + static::write('App', (array)static::read('App') + array( 'base' => false, 'baseUrl' => false, 'dir' => APP_DIR, @@ -156,11 +156,11 @@ public static function write($config, $value = null) { } foreach ($config as $name => $value) { - self::$_values = Hash::insert(self::$_values, $name, $value); + static::$_values = Hash::insert(static::$_values, $name, $value); } if (isset($config['debug']) && function_exists('ini_set')) { - if (self::$_values['debug']) { + if (static::$_values['debug']) { ini_set('display_errors', 1); } else { ini_set('display_errors', 0); @@ -179,15 +179,39 @@ public static function write($config, $value = null) { * Configure::read('Name.key'); will return only the value of Configure::Name[key] * ``` * - * @param string $var Variable to obtain. Use '.' to access array elements. + * @param string|null $var Variable to obtain. Use '.' to access array elements. * @return mixed value stored in configure, or null. * @link http://book.cakephp.org/2.0/en/development/configuration.html#Configure::read */ public static function read($var = null) { if ($var === null) { - return self::$_values; + return static::$_values; } - return Hash::get(self::$_values, $var); + return Hash::get(static::$_values, $var); + } + +/** + * Used to read and delete a variable from Configure. + * + * This is primarily used during bootstrapping to move configuration data + * out of configure into the various other classes in CakePHP. + * + * @param string $var The key to read and remove. + * @return array|null + */ + public static function consume($var) { + $simple = strpos($var, '.') === false; + if ($simple && !isset(static::$_values[$var])) { + return null; + } + if ($simple) { + $value = static::$_values[$var]; + unset(static::$_values[$var]); + return $value; + } + $value = Hash::get(static::$_values, $var); + static::$_values = Hash::remove(static::$_values, $var); + return $value; } /** @@ -196,11 +220,11 @@ public static function read($var = null) { * @param string $var Variable name to check for * @return bool True if variable is there */ - public static function check($var = null) { + public static function check($var) { if (empty($var)) { return false; } - return Hash::get(self::$_values, $var) !== null; + return Hash::get(static::$_values, $var) !== null; } /** @@ -216,8 +240,8 @@ public static function check($var = null) { * @return void * @link http://book.cakephp.org/2.0/en/development/configuration.html#Configure::delete */ - public static function delete($var = null) { - self::$_values = Hash::remove(self::$_values, $var); + public static function delete($var) { + static::$_values = Hash::remove(static::$_values, $var); } /** @@ -235,20 +259,20 @@ public static function delete($var = null) { * @return void */ public static function config($name, ConfigReaderInterface $reader) { - self::$_readers[$name] = $reader; + static::$_readers[$name] = $reader; } /** * Gets the names of the configured reader objects. * - * @param string $name Name to check. If null returns all configured reader names. + * @param string|null $name Name to check. If null returns all configured reader names. * @return array Array of the configured reader objects. */ public static function configured($name = null) { if ($name) { - return isset(self::$_readers[$name]); + return isset(static::$_readers[$name]); } - return array_keys(self::$_readers); + return array_keys(static::$_readers); } /** @@ -259,10 +283,10 @@ public static function configured($name = null) { * @return bool Success */ public static function drop($name) { - if (!isset(self::$_readers[$name])) { + if (!isset(static::$_readers[$name])) { return false; } - unset(self::$_readers[$name]); + unset(static::$_readers[$name]); return true; } @@ -292,7 +316,7 @@ public static function drop($name) { * @link http://book.cakephp.org/2.0/en/development/configuration.html#Configure::load */ public static function load($key, $config = 'default', $merge = true) { - $reader = self::_getReader($config); + $reader = static::_getReader($config); if (!$reader) { return false; } @@ -301,13 +325,13 @@ public static function load($key, $config = 'default', $merge = true) { if ($merge) { $keys = array_keys($values); foreach ($keys as $key) { - if (($c = self::read($key)) && is_array($values[$key]) && is_array($c)) { + if (($c = static::read($key)) && is_array($values[$key]) && is_array($c)) { $values[$key] = Hash::merge($c, $values[$key]); } } } - return self::write($values); + return static::write($values); } /** @@ -336,14 +360,14 @@ public static function load($key, $config = 'default', $merge = true) { * @throws ConfigureException if the adapter does not implement a `dump` method. */ public static function dump($key, $config = 'default', $keys = array()) { - $reader = self::_getReader($config); + $reader = static::_getReader($config); if (!$reader) { throw new ConfigureException(__d('cake_dev', 'There is no "%s" adapter.', $config)); } if (!method_exists($reader, 'dump')) { throw new ConfigureException(__d('cake_dev', 'The "%s" adapter, does not have a %s method.', $config, 'dump()')); } - $values = self::$_values; + $values = static::$_values; if (!empty($keys) && is_array($keys)) { $values = array_intersect_key($values, array_flip($keys)); } @@ -358,14 +382,14 @@ public static function dump($key, $config = 'default', $keys = array()) { * @return mixed Reader instance or false */ protected static function _getReader($config) { - if (!isset(self::$_readers[$config])) { + if (!isset(static::$_readers[$config])) { if ($config !== 'default') { return false; } App::uses('PhpReader', 'Configure'); - self::config($config, new PhpReader()); + static::config($config, new PhpReader()); } - return self::$_readers[$config]; + return static::$_readers[$config]; } /** @@ -376,11 +400,11 @@ protected static function _getReader($config) { * @return string Current version of CakePHP */ public static function version() { - if (!isset(self::$_values['Cake']['version'])) { + if (!isset(static::$_values['Cake']['version'])) { require CAKE . 'Config' . DS . 'config.php'; - self::write($config); + static::write($config); } - return self::$_values['Cake']['version']; + return static::$_values['Cake']['version']; } /** @@ -395,7 +419,7 @@ public static function version() { */ public static function store($name, $cacheConfig = 'default', $data = null) { if ($data === null) { - $data = self::$_values; + $data = static::$_values; } return Cache::write($name, $data, $cacheConfig); } @@ -411,7 +435,7 @@ public static function store($name, $cacheConfig = 'default', $data = null) { public static function restore($name, $cacheConfig = 'default') { $values = Cache::read($name, $cacheConfig); if ($values) { - return self::write($values); + return static::write($values); } return false; } @@ -419,10 +443,10 @@ public static function restore($name, $cacheConfig = 'default') { /** * Clear all values stored in Configure. * - * @return bool success. + * @return bool Success. */ public static function clear() { - self::$_values = array(); + static::$_values = array(); return true; } diff --git a/lib/Cake/Core/Object.php b/lib/Cake/Core/Object.php index 1c754375088..ffc7f19dc5c 100644 --- a/lib/Cake/Core/Object.php +++ b/lib/Cake/Core/Object.php @@ -18,7 +18,6 @@ App::uses('Dispatcher', 'Routing'); App::uses('Router', 'Routing'); App::uses('Set', 'Utility'); -App::uses('CakeLog', 'Log'); /** * Object class provides a few generic methods used in several subclasses. @@ -32,7 +31,6 @@ class Object { /** * Constructor, no-op - * */ public function __construct() { } diff --git a/lib/Cake/Error/ErrorHandler.php b/lib/Cake/Error/ErrorHandler.php index e87c636d1ce..3192ed5f87c 100644 --- a/lib/Cake/Error/ErrorHandler.php +++ b/lib/Cake/Error/ErrorHandler.php @@ -95,6 +95,14 @@ */ class ErrorHandler { +/** + * Whether to give up rendering an exception, if the renderer itself is + * throwing exceptions. + * + * @var bool + */ + protected static $_bailExceptionRendering = false; + /** * Set as the default exception handler by the CakePHP bootstrap process. * @@ -107,7 +115,7 @@ class ErrorHandler { */ public static function handleException(Exception $exception) { $config = Configure::read('Exception'); - self::_log($exception, $config); + static::_log($exception, $config); $renderer = isset($config['renderer']) ? $config['renderer'] : 'ExceptionRenderer'; if ($renderer !== 'ExceptionRenderer') { @@ -125,6 +133,8 @@ public static function handleException(Exception $exception) { $e->getMessage(), $e->getTraceAsString() ); + + static::$_bailExceptionRendering = true; trigger_error($message, E_USER_ERROR); } } @@ -146,7 +156,7 @@ protected static function _getMessage($exception) { $message .= "\nException Attributes: " . var_export($exception->getAttributes(), true); } } - if (php_sapi_name() !== 'cli') { + if (PHP_SAPI !== 'cli') { $request = Router::getRequest(); if ($request) { $message .= "\nRequest URL: " . $request->here(); @@ -175,7 +185,7 @@ protected static function _log(Exception $exception, $config) { } } } - return CakeLog::write(LOG_ERR, self::_getMessage($exception)); + return CakeLog::write(LOG_ERR, static::_getMessage($exception)); } /** @@ -198,9 +208,9 @@ public static function handleError($code, $description, $file = null, $line = nu return false; } $errorConfig = Configure::read('Error'); - list($error, $log) = self::mapErrorCode($code); + list($error, $log) = static::mapErrorCode($code); if ($log === LOG_ERR) { - return self::handleFatalError($code, $description, $file, $line); + return static::handleFatalError($code, $description, $file, $line); } $debug = Configure::read('debug'); @@ -220,6 +230,16 @@ public static function handleError($code, $description, $file = null, $line = nu } $message = $error . ' (' . $code . '): ' . $description . ' in [' . $file . ', line ' . $line . ']'; if (!empty($errorConfig['trace'])) { + // https://bugs.php.net/bug.php?id=65322 + if (version_compare(PHP_VERSION, '5.4.21', '<')) { + if (!class_exists('Debugger')) { + App::load('Debugger'); + } + if (!class_exists('CakeText')) { + App::uses('CakeText', 'Utility'); + App::load('CakeText'); + } + } $trace = Debugger::trace(array('start' => 1, 'format' => 'log')); $message .= "\nTrace:\n" . $trace . "\n"; } @@ -234,6 +254,8 @@ public static function handleError($code, $description, $file = null, $line = nu * @param string $file File on which error occurred * @param int $line Line that triggered the error * @return bool + * @throws FatalErrorException If the Exception renderer threw an exception during rendering, and debug > 0. + * @throws InternalErrorException If the Exception renderer threw an exception during rendering, and debug is 0. */ public static function handleFatalError($code, $description, $file, $line) { $logMessage = 'Fatal Error (' . $code . '): ' . $description . ' in [' . $file . ', line ' . $line . ']'; @@ -249,10 +271,18 @@ public static function handleFatalError($code, $description, $file, $line) { } if (Configure::read('debug')) { - call_user_func($exceptionHandler, new FatalErrorException($description, 500, $file, $line)); + $exception = new FatalErrorException($description, 500, $file, $line); } else { - call_user_func($exceptionHandler, new InternalErrorException()); + $exception = new InternalErrorException(); + } + + if (static::$_bailExceptionRendering) { + static::$_bailExceptionRendering = false; + throw $exception; } + + call_user_func($exceptionHandler, $exception); + return false; } diff --git a/lib/Cake/Event/CakeEvent.php b/lib/Cake/Event/CakeEvent.php index 8696092838e..d8ed262347d 100644 --- a/lib/Cake/Event/CakeEvent.php +++ b/lib/Cake/Event/CakeEvent.php @@ -71,7 +71,6 @@ class CakeEvent { * $event = new CakeEvent('Order.afterBuy', $this, array('buyer' => $userData)); * $event = new CakeEvent('User.afterRegister', $UserModel); * ``` - * */ public function __construct($name, $subject = null, $data = null) { $this->_name = $name; diff --git a/lib/Cake/Event/CakeEventManager.php b/lib/Cake/Event/CakeEventManager.php index 64d94ccd8bc..f647fd941d0 100644 --- a/lib/Cake/Event/CakeEventManager.php +++ b/lib/Cake/Event/CakeEventManager.php @@ -67,14 +67,14 @@ class CakeEventManager { */ public static function instance($manager = null) { if ($manager instanceof CakeEventManager) { - self::$_generalManager = $manager; + static::$_generalManager = $manager; } - if (empty(self::$_generalManager)) { - self::$_generalManager = new CakeEventManager(); + if (empty(static::$_generalManager)) { + static::$_generalManager = new CakeEventManager(); } - self::$_generalManager->_isGlobal = true; - return self::$_generalManager; + static::$_generalManager->_isGlobal = true; + return static::$_generalManager; } /** @@ -105,7 +105,7 @@ public function attach($callable, $eventKey = null, $options = array()) { $this->_attachSubscriber($callable); return; } - $options = $options + array('priority' => self::$defaultPriority, 'passParams' => false); + $options = $options + array('priority' => static::$defaultPriority, 'passParams' => false); $this->_listeners[$eventKey][$options['priority']][] = array( 'callable' => $callable, 'passParams' => $options['passParams'], @@ -265,7 +265,7 @@ public function listeners($eventKey) { $localListeners = $this->prioritisedListeners($eventKey); $localListeners = empty($localListeners) ? array() : $localListeners; } - $globalListeners = self::instance()->prioritisedListeners($eventKey); + $globalListeners = static::instance()->prioritisedListeners($eventKey); $globalListeners = empty($globalListeners) ? array() : $globalListeners; $priorities = array_merge(array_keys($globalListeners), array_keys($localListeners)); diff --git a/lib/Cake/I18n/I18n.php b/lib/Cake/I18n/I18n.php index 907adc5f40e..1ce5aae4890 100644 --- a/lib/Cake/I18n/I18n.php +++ b/lib/Cake/I18n/I18n.php @@ -223,7 +223,7 @@ public static function translate($singular, $plural = null, $domain = null, $cat } if ($domain === null) { - $domain = self::$defaultDomain; + $domain = static::$defaultDomain; } if ($domain === '') { throw new CakeException(__d('cake_dev', 'You cannot use "" as a domain.')); @@ -399,7 +399,7 @@ protected function _bindTextDomain($domain) { foreach ($this->l10n->languagePath as $lang) { $localeDef = $directory . $lang . DS . $this->category; if (is_file($localeDef)) { - $definitions = self::loadLocaleDefinition($localeDef); + $definitions = static::loadLocaleDefinition($localeDef); if ($definitions !== false) { $this->_domains[$domain][$this->_lang][$this->category] = $definitions; $this->_noLocale = false; @@ -412,10 +412,10 @@ protected function _bindTextDomain($domain) { $translations = false; if (is_file($app . '.mo')) { - $translations = self::loadMo($app . '.mo'); + $translations = static::loadMo($app . '.mo'); } if ($translations === false && is_file($app . '.po')) { - $translations = self::loadPo($app . '.po'); + $translations = static::loadPo($app . '.po'); } if ($translations !== false) { @@ -430,10 +430,10 @@ protected function _bindTextDomain($domain) { $translations = false; if (is_file($file . '.mo')) { - $translations = self::loadMo($file . '.mo'); + $translations = static::loadMo($file . '.mo'); } if ($translations === false && is_file($file . '.po')) { - $translations = self::loadPo($file . '.po'); + $translations = static::loadPo($file . '.po'); } if ($translations !== false) { @@ -497,6 +497,9 @@ public static function loadMo($filename) { $msgid = substr($data, $r["offs"], $r["len"]); unset($msgid_plural); + if (strpos($msgid, "\x04") !== false) { + list($context, $msgid) = explode("\x04", $msgid); + } if (strpos($msgid, "\000")) { list($msgid, $msgid_plural) = explode("\000", $msgid); } @@ -508,9 +511,10 @@ public static function loadMo($filename) { } if ($msgid != '') { - $msgstr = array($context => $msgstr); + $translations[$msgid][$context] = $msgstr; + } else { + $translations[$msgid] = $msgstr; } - $translations[$msgid] = $msgstr; if (isset($msgid_plural)) { $translations[$msgid_plural] =& $translations[$msgid]; diff --git a/lib/Cake/I18n/Multibyte.php b/lib/Cake/I18n/Multibyte.php index 9568065b56d..d11e15afab5 100644 --- a/lib/Cake/I18n/Multibyte.php +++ b/lib/Cake/I18n/Multibyte.php @@ -550,7 +550,7 @@ public static function strtolower($string) { $matched = true; } else { $matched = false; - $keys = self::_find($char, 'upper'); + $keys = static::_find($char, 'upper'); if (!empty($keys)) { foreach ($keys as $key => $value) { @@ -596,7 +596,7 @@ public static function strtoupper($string) { } else { $matched = false; - $keys = self::_find($char); + $keys = static::_find($char); $keyCount = count($keys); if (!empty($keys)) { @@ -815,7 +815,7 @@ protected static function _codepoint($decimal) { } else { $return = false; } - self::$_codeRange[$decimal] = $return; + static::$_codeRange[$decimal] = $return; return $return; } @@ -828,8 +828,8 @@ protected static function _codepoint($decimal) { */ protected static function _find($char, $type = 'lower') { $found = array(); - if (!isset(self::$_codeRange[$char])) { - $range = self::_codepoint($char); + if (!isset(static::$_codeRange[$char])) { + $range = static::_codepoint($char); if ($range === false) { return array(); } @@ -838,21 +838,21 @@ protected static function _find($char, $type = 'lower') { Configure::config('_cake_core_', new PhpReader(CAKE . 'Config' . DS)); } Configure::load('unicode' . DS . 'casefolding' . DS . $range, '_cake_core_'); - self::$_caseFold[$range] = Configure::read($range); + static::$_caseFold[$range] = Configure::read($range); Configure::delete($range); } - if (!self::$_codeRange[$char]) { + if (!static::$_codeRange[$char]) { return array(); } - self::$_table = self::$_codeRange[$char]; - $count = count(self::$_caseFold[self::$_table]); + static::$_table = static::$_codeRange[$char]; + $count = count(static::$_caseFold[static::$_table]); for ($i = 0; $i < $count; $i++) { - if ($type === 'lower' && self::$_caseFold[self::$_table][$i][$type][0] === $char) { - $found[] = self::$_caseFold[self::$_table][$i]; - } elseif ($type === 'upper' && self::$_caseFold[self::$_table][$i][$type] === $char) { - $found[] = self::$_caseFold[self::$_table][$i]; + if ($type === 'lower' && static::$_caseFold[static::$_table][$i][$type][0] === $char) { + $found[] = static::$_caseFold[static::$_table][$i]; + } elseif ($type === 'upper' && static::$_caseFold[static::$_table][$i][$type] === $char) { + $found[] = static::$_caseFold[static::$_table][$i]; } } return $found; diff --git a/lib/Cake/Log/CakeLog.php b/lib/Cake/Log/CakeLog.php index b8e4ed05869..0e8ae276041 100644 --- a/lib/Cake/Log/CakeLog.php +++ b/lib/Cake/Log/CakeLog.php @@ -118,8 +118,8 @@ class CakeLog { * @return void */ protected static function _init() { - self::$_levels = self::defaultLevels(); - self::$_Collection = new LogEngineCollection(); + static::$_levels = static::defaultLevels(); + static::$_Collection = new LogEngineCollection(); } /** @@ -193,10 +193,10 @@ public static function config($key, $config) { if (empty($config['engine'])) { throw new CakeLogException(__d('cake_dev', 'Missing logger class name')); } - if (empty(self::$_Collection)) { - self::_init(); + if (empty(static::$_Collection)) { + static::_init(); } - self::$_Collection->load($key, $config); + static::$_Collection->load($key, $config); return true; } @@ -206,10 +206,10 @@ public static function config($key, $config) { * @return array Array of configured log streams. */ public static function configured() { - if (empty(self::$_Collection)) { - self::_init(); + if (empty(static::$_Collection)) { + static::_init(); } - return self::$_Collection->loaded(); + return static::$_Collection->loaded(); } /** @@ -259,20 +259,20 @@ public static function configured() { * @return array Active log levels */ public static function levels($levels = array(), $append = true) { - if (empty(self::$_Collection)) { - self::_init(); + if (empty(static::$_Collection)) { + static::_init(); } if (empty($levels)) { - return self::$_levels; + return static::$_levels; } $levels = array_values($levels); if ($append) { - self::$_levels = array_merge(self::$_levels, $levels); + static::$_levels = array_merge(static::$_levels, $levels); } else { - self::$_levels = $levels; + static::$_levels = $levels; } - self::$_levelMap = array_flip(self::$_levels); - return self::$_levels; + static::$_levelMap = array_flip(static::$_levels); + return static::$_levels; } /** @@ -281,9 +281,9 @@ public static function levels($levels = array(), $append = true) { * @return array Default log levels */ public static function defaultLevels() { - self::$_levelMap = self::$_defaultLevels; - self::$_levels = array_flip(self::$_levelMap); - return self::$_levels; + static::$_levelMap = static::$_defaultLevels; + static::$_levels = array_flip(static::$_levelMap); + return static::$_levels; } /** @@ -294,10 +294,10 @@ public static function defaultLevels() { * @return void */ public static function drop($streamName) { - if (empty(self::$_Collection)) { - self::_init(); + if (empty(static::$_Collection)) { + static::_init(); } - self::$_Collection->unload($streamName); + static::$_Collection->unload($streamName); } /** @@ -308,13 +308,13 @@ public static function drop($streamName) { * @throws CakeLogException */ public static function enabled($streamName) { - if (empty(self::$_Collection)) { - self::_init(); + if (empty(static::$_Collection)) { + static::_init(); } - if (!isset(self::$_Collection->{$streamName})) { + if (!isset(static::$_Collection->{$streamName})) { throw new CakeLogException(__d('cake_dev', 'Stream %s not found', $streamName)); } - return self::$_Collection->enabled($streamName); + return static::$_Collection->enabled($streamName); } /** @@ -326,13 +326,13 @@ public static function enabled($streamName) { * @throws CakeLogException */ public static function enable($streamName) { - if (empty(self::$_Collection)) { - self::_init(); + if (empty(static::$_Collection)) { + static::_init(); } - if (!isset(self::$_Collection->{$streamName})) { + if (!isset(static::$_Collection->{$streamName})) { throw new CakeLogException(__d('cake_dev', 'Stream %s not found', $streamName)); } - self::$_Collection->enable($streamName); + static::$_Collection->enable($streamName); } /** @@ -345,13 +345,13 @@ public static function enable($streamName) { * @throws CakeLogException */ public static function disable($streamName) { - if (empty(self::$_Collection)) { - self::_init(); + if (empty(static::$_Collection)) { + static::_init(); } - if (!isset(self::$_Collection->{$streamName})) { + if (!isset(static::$_Collection->{$streamName})) { throw new CakeLogException(__d('cake_dev', 'Stream %s not found', $streamName)); } - self::$_Collection->disable($streamName); + static::$_Collection->disable($streamName); } /** @@ -362,11 +362,11 @@ public static function disable($streamName) { * @see BaseLog */ public static function stream($streamName) { - if (empty(self::$_Collection)) { - self::_init(); + if (empty(static::$_Collection)) { + static::_init(); } - if (!empty(self::$_Collection->{$streamName})) { - return self::$_Collection->{$streamName}; + if (!empty(static::$_Collection->{$streamName})) { + return static::$_Collection->{$streamName}; } return false; } @@ -403,19 +403,19 @@ public static function stream($streamName) { * @link http://book.cakephp.org/2.0/en/core-libraries/logging.html#writing-to-logs */ public static function write($type, $message, $scope = array()) { - if (empty(self::$_Collection)) { - self::_init(); + if (empty(static::$_Collection)) { + static::_init(); } - if (is_int($type) && isset(self::$_levels[$type])) { - $type = self::$_levels[$type]; + if (is_int($type) && isset(static::$_levels[$type])) { + $type = static::$_levels[$type]; } - if (is_string($type) && empty($scope) && !in_array($type, self::$_levels)) { + if (is_string($type) && empty($scope) && !in_array($type, static::$_levels)) { $scope = $type; } $logged = false; - foreach (self::$_Collection->enabled() as $streamName) { - $logger = self::$_Collection->{$streamName}; + foreach (static::$_Collection->enabled() as $streamName) { + $logger = static::$_Collection->{$streamName}; $types = $scopes = $config = array(); if (method_exists($logger, 'config')) { $config = $logger->config(); @@ -455,7 +455,7 @@ public static function write($type, $message, $scope = array()) { * @return bool Success */ public static function emergency($message, $scope = array()) { - return self::write(self::$_levelMap['emergency'], $message, $scope); + return static::write(static::$_levelMap['emergency'], $message, $scope); } /** @@ -467,7 +467,7 @@ public static function emergency($message, $scope = array()) { * @return bool Success */ public static function alert($message, $scope = array()) { - return self::write(self::$_levelMap['alert'], $message, $scope); + return static::write(static::$_levelMap['alert'], $message, $scope); } /** @@ -479,7 +479,7 @@ public static function alert($message, $scope = array()) { * @return bool Success */ public static function critical($message, $scope = array()) { - return self::write(self::$_levelMap['critical'], $message, $scope); + return static::write(static::$_levelMap['critical'], $message, $scope); } /** @@ -491,7 +491,7 @@ public static function critical($message, $scope = array()) { * @return bool Success */ public static function error($message, $scope = array()) { - return self::write(self::$_levelMap['error'], $message, $scope); + return static::write(static::$_levelMap['error'], $message, $scope); } /** @@ -503,7 +503,7 @@ public static function error($message, $scope = array()) { * @return bool Success */ public static function warning($message, $scope = array()) { - return self::write(self::$_levelMap['warning'], $message, $scope); + return static::write(static::$_levelMap['warning'], $message, $scope); } /** @@ -515,7 +515,7 @@ public static function warning($message, $scope = array()) { * @return bool Success */ public static function notice($message, $scope = array()) { - return self::write(self::$_levelMap['notice'], $message, $scope); + return static::write(static::$_levelMap['notice'], $message, $scope); } /** @@ -527,7 +527,7 @@ public static function notice($message, $scope = array()) { * @return bool Success */ public static function debug($message, $scope = array()) { - return self::write(self::$_levelMap['debug'], $message, $scope); + return static::write(static::$_levelMap['debug'], $message, $scope); } /** @@ -539,7 +539,7 @@ public static function debug($message, $scope = array()) { * @return bool Success */ public static function info($message, $scope = array()) { - return self::write(self::$_levelMap['info'], $message, $scope); + return static::write(static::$_levelMap['info'], $message, $scope); } } diff --git a/lib/Cake/Log/Engine/ConsoleLog.php b/lib/Cake/Log/Engine/ConsoleLog.php index e7617295786..3c716946edd 100644 --- a/lib/Cake/Log/Engine/ConsoleLog.php +++ b/lib/Cake/Log/Engine/ConsoleLog.php @@ -48,7 +48,7 @@ class ConsoleLog extends BaseLog { */ public function __construct($config = array()) { parent::__construct($config); - if ((DS === '\\' && !(bool)env('ANSICON')) || + if ((DS === '\\' && !(bool)env('ANSICON') && env('ConEmuANSI') !== 'ON') || (function_exists('posix_isatty') && !posix_isatty($this->_output)) ) { $outputAs = ConsoleOutput::PLAIN; diff --git a/lib/Cake/Log/Engine/FileLog.php b/lib/Cake/Log/Engine/FileLog.php index 840889466f9..988ed341feb 100644 --- a/lib/Cake/Log/Engine/FileLog.php +++ b/lib/Cake/Log/Engine/FileLog.php @@ -182,7 +182,7 @@ protected function _getFilename($type) { * Also if `rotate` count is reached oldest file is removed. * * @param string $filename Log file name - * @return mixed True if rotated successfully or false in case of error. + * @return mixed True if rotated successfully or false in case of error, otherwise null. * Void if file doesn't need to be rotated. */ protected function _rotateFile($filename) { @@ -196,7 +196,7 @@ protected function _rotateFile($filename) { if (!file_exists($filepath) || filesize($filepath) < $this->_size ) { - return; + return null; } if ($this->_config['rotate'] === 0) { diff --git a/lib/Cake/Model/AclNode.php b/lib/Cake/Model/AclNode.php index ab73f7b1d49..1080b9a228b 100644 --- a/lib/Cake/Model/AclNode.php +++ b/lib/Cake/Model/AclNode.php @@ -39,7 +39,6 @@ class AclNode extends Model { /** * Constructor - * */ public function __construct() { $config = Configure::read('Acl.database'); diff --git a/lib/Cake/Model/Behavior/TranslateBehavior.php b/lib/Cake/Model/Behavior/TranslateBehavior.php index 1b0be00abfd..3ba00ff75de 100644 --- a/lib/Cake/Model/Behavior/TranslateBehavior.php +++ b/lib/Cake/Model/Behavior/TranslateBehavior.php @@ -140,7 +140,7 @@ public function beforeFind(Model $Model, $query) { unset($this->_joinTable, $this->_runtimeModel); return $query; } elseif (is_string($query['fields'])) { - $query['fields'] = String::tokenize($query['fields']); + $query['fields'] = CakeText::tokenize($query['fields']); } $fields = array_merge( diff --git a/lib/Cake/Model/Behavior/TreeBehavior.php b/lib/Cake/Model/Behavior/TreeBehavior.php index 11bbb5bb18e..a19d4a8fe6f 100644 --- a/lib/Cake/Model/Behavior/TreeBehavior.php +++ b/lib/Cake/Model/Behavior/TreeBehavior.php @@ -44,7 +44,7 @@ class TreeBehavior extends ModelBehavior { * @var array */ protected $_defaults = array( - 'parent' => 'parent_id', 'left' => 'lft', 'right' => 'rght', + 'parent' => 'parent_id', 'left' => 'lft', 'right' => 'rght', 'level' => null, 'scope' => '1 = 1', 'type' => 'nested', '__parentChange' => false, 'recursive' => -1 ); @@ -97,10 +97,47 @@ public function afterSave(Model $Model, $created, $options = array()) { } } elseif ($this->settings[$Model->alias]['__parentChange']) { $this->settings[$Model->alias]['__parentChange'] = false; + if ($level) { + $this->_setChildrenLevel($Model, $Model->id); + } return $this->_setParent($Model, $Model->data[$Model->alias][$parent]); } } +/** + * Set level for descendents. + * + * @param Model $Model Model using this behavior. + * @param int|string $id Record ID + * @return void + */ + protected function _setChildrenLevel(Model $Model, $id) { + $settings = $Model->Behaviors->Tree->settings[$Model->alias]; + $primaryKey = $Model->primaryKey; + $depths = array($id => (int)$Model->data[$Model->alias][$settings['level']]); + + $children = $Model->children( + $id, + false, + array($primaryKey, $settings['parent'], $settings['level']), + $settings['left'], + null, + 1, + -1 + ); + + foreach ($children as $node) { + $parentIdValue = $node[$Model->alias][$settings['parent']]; + $depth = (int)$depths[$parentIdValue] + 1; + $depths[$node[$Model->alias][$primaryKey]] = $depth; + + $Model->updateAll( + array($Model->escapeField($settings['level']) => $depth), + array($Model->escapeField($primaryKey) => $node[$Model->alias][$primaryKey]) + ); + } + } + /** * Runs before a find() operation * @@ -182,67 +219,96 @@ public function beforeSave(Model $Model, $options = array()) { extract($this->settings[$Model->alias]); $this->_addToWhitelist($Model, array($left, $right)); + if ($level) { + $this->_addToWhitelist($Model, $level); + } + $parentIsSet = array_key_exists($parent, $Model->data[$Model->alias]); + if (!$Model->id || !$Model->exists()) { - if (array_key_exists($parent, $Model->data[$Model->alias]) && $Model->data[$Model->alias][$parent]) { - $parentNode = $Model->find('first', array( - 'conditions' => array($scope, $Model->escapeField() => $Model->data[$Model->alias][$parent]), - 'fields' => array($Model->primaryKey, $right), - 'recursive' => $recursive, - 'order' => false, - )); + if ($parentIsSet && $Model->data[$Model->alias][$parent]) { + $parentNode = $this->_getNode($Model, $Model->data[$Model->alias][$parent]); if (!$parentNode) { return false; } - list($parentNode) = array_values($parentNode); + $Model->data[$Model->alias][$left] = 0; $Model->data[$Model->alias][$right] = 0; - } else { - $edge = $this->_getMax($Model, $scope, $right, $recursive); - $Model->data[$Model->alias][$left] = $edge + 1; - $Model->data[$Model->alias][$right] = $edge + 2; + if ($level) { + $Model->data[$Model->alias][$level] = (int)$parentNode[$Model->alias][$level] + 1; + } + return true; } - } elseif (array_key_exists($parent, $Model->data[$Model->alias])) { + + $edge = $this->_getMax($Model, $scope, $right, $recursive); + $Model->data[$Model->alias][$left] = $edge + 1; + $Model->data[$Model->alias][$right] = $edge + 2; + if ($level) { + $Model->data[$Model->alias][$level] = 0; + } + return true; + } + + if ($parentIsSet) { if ($Model->data[$Model->alias][$parent] != $Model->field($parent)) { $this->settings[$Model->alias]['__parentChange'] = true; } if (!$Model->data[$Model->alias][$parent]) { $Model->data[$Model->alias][$parent] = null; $this->_addToWhitelist($Model, $parent); - } else { - $values = $Model->find('first', array( - 'conditions' => array($scope, $Model->escapeField() => $Model->id), - 'fields' => array($Model->primaryKey, $parent, $left, $right), - 'order' => false, - 'recursive' => $recursive) - ); - - if (empty($values)) { - return false; + if ($level) { + $Model->data[$Model->alias][$level] = 0; } - list($node) = array_values($values); - - $parentNode = $Model->find('first', array( - 'conditions' => array($scope, $Model->escapeField() => $Model->data[$Model->alias][$parent]), - 'fields' => array($Model->primaryKey, $left, $right), - 'order' => false, - 'recursive' => $recursive - )); - if (!$parentNode) { - return false; - } - list($parentNode) = array_values($parentNode); + return true; + } - if (($node[$left] < $parentNode[$left]) && ($parentNode[$right] < $node[$right])) { - return false; - } - if ($node[$Model->primaryKey] === $parentNode[$Model->primaryKey]) { - return false; - } + $values = $this->_getNode($Model, $Model->id); + if (empty($values)) { + return false; + } + list($node) = array_values($values); + + $parentNode = $this->_getNode($Model, $Model->data[$Model->alias][$parent]); + if (!$parentNode) { + return false; + } + list($parentNode) = array_values($parentNode); + + if (($node[$left] < $parentNode[$left]) && ($parentNode[$right] < $node[$right])) { + return false; + } + if ($node[$Model->primaryKey] === $parentNode[$Model->primaryKey]) { + return false; + } + if ($level) { + $Model->data[$Model->alias][$level] = (int)$parentNode[$level] + 1; } } + return true; } +/** + * Returns a single node from the tree from its primary key + * + * @param Model $Model Model using this behavior + * @param int|string $id The ID of the record to read + * @return array|bool The record read or false + */ + protected function _getNode(Model $Model, $id) { + $settings = $this->settings[$Model->alias]; + $fields = array($Model->primaryKey, $settings['parent'], $settings['left'], $settings['right']); + if ($settings['level']) { + $fields[] = $settings['level']; + } + + return $Model->find('first', array( + 'conditions' => array($Model->escapeField() => $id), + 'fields' => $fields, + 'recursive' => $settings['recursive'], + 'order' => false, + )); + } + /** * Get the number of child nodes * @@ -275,11 +341,7 @@ public function childCount(Model $Model, $id = null, $direct = false) { } elseif ($Model->id === $id && isset($Model->data[$Model->alias][$left]) && isset($Model->data[$Model->alias][$right])) { $data = $Model->data[$Model->alias]; } else { - $data = $Model->find('first', array( - 'conditions' => array($scope, $Model->escapeField() => $id), - 'order' => false, - 'recursive' => $recursive - )); + $data = $this->_getNode($Model, $id); if (!$data) { return 0; } @@ -380,27 +442,61 @@ public function generateTreeList(Model $Model, $conditions = null, $keyPath = nu $fields = array($Model->primaryKey, $Model->displayField, $left, $right); } - if (!$keyPath) { - $keyPath = '{n}.' . $Model->alias . '.' . $Model->primaryKey; + $conditions = (array)$conditions; + if ($scope) { + $conditions[] = $scope; } - if (!$valuePath) { - $valuePath = array('%s%s', '{n}.tree_prefix', '{n}.' . $Model->alias . '.' . $Model->displayField); + $order = $Model->escapeField($left) . ' asc'; + $results = $Model->find('all', compact('conditions', 'fields', 'order', 'recursive')); - } elseif (is_string($valuePath)) { - $valuePath = array('%s%s', '{n}.tree_prefix', $valuePath); + return $this->formatTreeList($Model, $results, compact('keyPath', 'valuePath', 'spacer')); + } - } else { - array_unshift($valuePath, '%s' . $valuePath[0], '{n}.tree_prefix'); +/** + * Formats result of a find() call to a hierarchical array used for HTML select boxes. + * + * Note that when using your own find() call this expects the order to be "left" field asc in order + * to generate the same result as using generateTreeList() directly. + * + * Options: + * + * - 'keyPath': A string path to the key, i.e. "{n}.Post.id" + * - 'valuePath': A string path to the value, i.e. "{n}.Post.title" + * - 'spacer': The character or characters which will be repeated + * + * @param Model $Model Model using this behavior + * @param array $results Result array of a find() call + * @param array $options Options + * @return array An associative array of records, where the id is the key, and the display field is the value + */ + public function formatTreeList(Model $Model, array $results, array $options = array()) { + if (empty($results)) { + return array(); } + $defaults = array( + 'keyPath' => null, + 'valuePath' => null, + 'spacer' => '_' + ); + $options += $defaults; - $conditions = (array)$conditions; - if ($scope) { - $conditions[] = $scope; + extract($this->settings[$Model->alias]); + + if (!$options['keyPath']) { + $options['keyPath'] = '{n}.' . $Model->alias . '.' . $Model->primaryKey; + } + + if (!$options['valuePath']) { + $options['valuePath'] = array('%s%s', '{n}.tree_prefix', '{n}.' . $Model->alias . '.' . $Model->displayField); + + } elseif (is_string($options['valuePath'])) { + $options['valuePath'] = array('%s%s', '{n}.tree_prefix', $options['valuePath']); + + } else { + array_unshift($options['valuePath'], '%s' . $options['valuePath'][0], '{n}.tree_prefix'); } - $order = $Model->escapeField($left) . " asc"; - $results = $Model->find('all', compact('conditions', 'fields', 'order', 'recursive')); $stack = array(); foreach ($results as $i => $result) { @@ -409,13 +505,11 @@ public function generateTreeList(Model $Model, $conditions = null, $keyPath = nu array_pop($stack); $count--; } - $results[$i]['tree_prefix'] = str_repeat($spacer, $count); + $results[$i]['tree_prefix'] = str_repeat($options['spacer'], $count); $stack[] = $result[$Model->alias][$right]; } - if (empty($results)) { - return array(); - } - return Hash::combine($results, $keyPath, $valuePath); + + return Hash::combine($results, $options['keyPath'], $options['valuePath']); } /** @@ -561,19 +655,9 @@ public function moveDown(Model $Model, $id = null, $number = 1) { $id = $Model->id; } extract($this->settings[$Model->alias]); - list($node) = array_values($Model->find('first', array( - 'conditions' => array($scope, $Model->escapeField() => $id), - 'fields' => array($Model->primaryKey, $left, $right, $parent), - 'order' => false, - 'recursive' => $recursive - ))); + list($node) = array_values($this->_getNode($Model, $id)); if ($node[$parent]) { - list($parentNode) = array_values($Model->find('first', array( - 'conditions' => array($scope, $Model->escapeField() => $node[$parent]), - 'fields' => array($Model->primaryKey, $left, $right), - 'order' => false, - 'recursive' => $recursive - ))); + list($parentNode) = array_values($this->_getNode($Model, $node[$parent])); if (($node[$right] + 1) == $parentNode[$right]) { return false; } @@ -625,19 +709,9 @@ public function moveUp(Model $Model, $id = null, $number = 1) { $id = $Model->id; } extract($this->settings[$Model->alias]); - list($node) = array_values($Model->find('first', array( - 'conditions' => array($scope, $Model->escapeField() => $id), - 'fields' => array($Model->primaryKey, $left, $right, $parent), - 'order' => false, - 'recursive' => $recursive - ))); + list($node) = array_values($this->_getNode($Model, $id)); if ($node[$parent]) { - list($parentNode) = array_values($Model->find('first', array( - 'conditions' => array($scope, $Model->escapeField() => $node[$parent]), - 'fields' => array($Model->primaryKey, $left, $right), - 'order' => false, - 'recursive' => $recursive - ))); + list($parentNode) = array_values($this->_getNode($Model, $node[$parent])); if (($node[$left] - 1) == $parentNode[$left]) { return false; } @@ -866,12 +940,7 @@ public function removeFromTree(Model $Model, $id = null, $delete = false) { } extract($this->settings[$Model->alias]); - list($node) = array_values($Model->find('first', array( - 'conditions' => array($scope, $Model->escapeField() => $id), - 'fields' => array($Model->primaryKey, $left, $right, $parent), - 'order' => false, - 'recursive' => $recursive - ))); + list($node) = array_values($this->_getNode($Model, $id)); if ($node[$right] == $node[$left] + 1) { if ($delete) { @@ -880,12 +949,7 @@ public function removeFromTree(Model $Model, $id = null, $delete = false) { $Model->id = $id; return $Model->saveField($parent, null); } elseif ($node[$parent]) { - list($parentNode) = array_values($Model->find('first', array( - 'conditions' => array($scope, $Model->escapeField() => $node[$parent]), - 'fields' => array($Model->primaryKey, $left, $right), - 'order' => false, - 'recursive' => $recursive - ))); + list($parentNode) = array_values($this->_getNode($Model, $node[$parent])); } else { $parentNode[$right] = $node[$right] + 1; } @@ -996,6 +1060,41 @@ public function verify(Model $Model) { return true; } +/** + * Returns the depth level of a node in the tree. + * + * @param Model $Model Model using this behavior + * @param int|string $id The primary key for record to get the level of. + * @return int|bool Integer of the level or false if the node does not exist. + */ + public function getLevel(Model $Model, $id = null) { + if ($id === null) { + $id = $Model->id; + } + + $node = $Model->find('first', array( + 'conditions' => array($Model->escapeField() => $id), + 'order' => false, + 'recursive' => -1 + )); + + if (empty($node)) { + return false; + } + + extract($this->settings[$Model->alias]); + + return $Model->find('count', array( + 'conditions' => array( + $scope, + $left . ' <' => $node[$Model->alias][$left], + $right . ' >' => $node[$Model->alias][$right] + ), + 'order' => false, + 'recursive' => -1 + )); + } + /** * Sets the parent of the given node * @@ -1010,24 +1109,14 @@ public function verify(Model $Model) { */ protected function _setParent(Model $Model, $parentId = null, $created = false) { extract($this->settings[$Model->alias]); - list($node) = array_values($Model->find('first', array( - 'conditions' => array($scope, $Model->escapeField() => $Model->id), - 'fields' => array($Model->primaryKey, $parent, $left, $right), - 'order' => false, - 'recursive' => $recursive - ))); + list($node) = array_values($this->_getNode($Model, $Model->id)); $edge = $this->_getMax($Model, $scope, $right, $recursive, $created); if (empty($parentId)) { $this->_sync($Model, $edge - $node[$left] + 1, '+', 'BETWEEN ' . $node[$left] . ' AND ' . $node[$right], $created); $this->_sync($Model, $node[$right] - $node[$left] + 1, '-', '> ' . $node[$left], $created); } else { - $values = $Model->find('first', array( - 'conditions' => array($scope, $Model->escapeField() => $parentId), - 'fields' => array($Model->primaryKey, $left, $right), - 'order' => false, - 'recursive' => $recursive - )); + $values = $this->_getNode($Model, $parentId); if ($values === false) { return false; diff --git a/lib/Cake/Model/ConnectionManager.php b/lib/Cake/Model/ConnectionManager.php index 26a637b39b1..926b5f22ec9 100644 --- a/lib/Cake/Model/ConnectionManager.php +++ b/lib/Cake/Model/ConnectionManager.php @@ -66,9 +66,9 @@ class ConnectionManager { protected static function _init() { include_once APP . 'Config' . DS . 'database.php'; if (class_exists('DATABASE_CONFIG')) { - self::$config = new DATABASE_CONFIG(); + static::$config = new DATABASE_CONFIG(); } - self::$_init = true; + static::$_init = true; } /** @@ -79,20 +79,20 @@ protected static function _init() { * @throws MissingDatasourceException */ public static function getDataSource($name) { - if (empty(self::$_init)) { - self::_init(); + if (empty(static::$_init)) { + static::_init(); } - if (!empty(self::$_dataSources[$name])) { - return self::$_dataSources[$name]; + if (!empty(static::$_dataSources[$name])) { + return static::$_dataSources[$name]; } - if (empty(self::$_connectionsEnum[$name])) { - self::_getConnectionObject($name); + if (empty(static::$_connectionsEnum[$name])) { + static::_getConnectionObject($name); } - self::loadDataSource($name); - $conn = self::$_connectionsEnum[$name]; + static::loadDataSource($name); + $conn = static::$_connectionsEnum[$name]; $class = $conn['classname']; if (strpos(App::location($class), 'Datasource') === false) { @@ -102,10 +102,10 @@ public static function getDataSource($name) { 'message' => 'Datasource is not found in Model/Datasource package.' )); } - self::$_dataSources[$name] = new $class(self::$config->{$name}); - self::$_dataSources[$name]->configKeyName = $name; + static::$_dataSources[$name] = new $class(static::$config->{$name}); + static::$_dataSources[$name]->configKeyName = $name; - return self::$_dataSources[$name]; + return static::$_dataSources[$name]; } /** @@ -116,10 +116,10 @@ public static function getDataSource($name) { * @return array List of available connections */ public static function sourceList() { - if (empty(self::$_init)) { - self::_init(); + if (empty(static::$_init)) { + static::_init(); } - return array_keys(self::$_dataSources); + return array_keys(static::$_dataSources); } /** @@ -130,10 +130,10 @@ public static function sourceList() { * in the ConnectionManager. */ public static function getSourceName($source) { - if (empty(self::$_init)) { - self::_init(); + if (empty(static::$_init)) { + static::_init(); } - foreach (self::$_dataSources as $name => $ds) { + foreach (static::$_dataSources as $name => $ds) { if ($ds === $source) { return $name; } @@ -151,14 +151,14 @@ public static function getSourceName($source) { * @throws MissingDatasourceException */ public static function loadDataSource($connName) { - if (empty(self::$_init)) { - self::_init(); + if (empty(static::$_init)) { + static::_init(); } if (is_array($connName)) { $conn = $connName; } else { - $conn = self::$_connectionsEnum[$connName]; + $conn = static::$_connectionsEnum[$connName]; } if (class_exists($conn['classname'], false)) { @@ -190,10 +190,10 @@ public static function loadDataSource($connName) { * (as defined in Connections), and the value is an array with keys 'filename' and 'classname'. */ public static function enumConnectionObjects() { - if (empty(self::$_init)) { - self::_init(); + if (empty(static::$_init)) { + static::_init(); } - return (array)self::$config; + return (array)static::$config; } /** @@ -204,16 +204,16 @@ public static function enumConnectionObjects() { * @return DataSource|null A reference to the DataSource object, or null if creation failed */ public static function create($name = '', $config = array()) { - if (empty(self::$_init)) { - self::_init(); + if (empty(static::$_init)) { + static::_init(); } - if (empty($name) || empty($config) || array_key_exists($name, self::$_connectionsEnum)) { + if (empty($name) || empty($config) || array_key_exists($name, static::$_connectionsEnum)) { return null; } - self::$config->{$name} = $config; - self::$_connectionsEnum[$name] = self::_connectionData($config); - $return = self::getDataSource($name); + static::$config->{$name} = $config; + static::$_connectionsEnum[$name] = static::_connectionData($config); + $return = static::getDataSource($name); return $return; } @@ -224,14 +224,14 @@ public static function create($name = '', $config = array()) { * @return bool success if connection was removed, false if it does not exist */ public static function drop($name) { - if (empty(self::$_init)) { - self::_init(); + if (empty(static::$_init)) { + static::_init(); } - if (!isset(self::$config->{$name})) { + if (!isset(static::$config->{$name})) { return false; } - unset(self::$_connectionsEnum[$name], self::$_dataSources[$name], self::$config->{$name}); + unset(static::$_connectionsEnum[$name], static::$_dataSources[$name], static::$config->{$name}); return true; } @@ -243,8 +243,8 @@ public static function drop($name) { * @throws MissingDatasourceConfigException */ protected static function _getConnectionObject($name) { - if (!empty(self::$config->{$name})) { - self::$_connectionsEnum[$name] = self::_connectionData(self::$config->{$name}); + if (!empty(static::$config->{$name})) { + static::$_connectionsEnum[$name] = static::_connectionData(static::$config->{$name}); } else { throw new MissingDatasourceConfigException(array('config' => $name)); } diff --git a/lib/Cake/Model/Datasource/CakeSession.php b/lib/Cake/Model/Datasource/CakeSession.php index bfb16e298b1..b3b471686fe 100644 --- a/lib/Cake/Model/Datasource/CakeSession.php +++ b/lib/Cake/Model/Datasource/CakeSession.php @@ -137,35 +137,35 @@ class CakeSession { /** * Pseudo constructor. * - * @param string $base The base path for the Session + * @param string|null $base The base path for the Session * @return void */ public static function init($base = null) { - self::$time = time(); + static::$time = time(); if (env('HTTP_USER_AGENT')) { - self::$_userAgent = md5(env('HTTP_USER_AGENT') . Configure::read('Security.salt')); + static::$_userAgent = md5(env('HTTP_USER_AGENT') . Configure::read('Security.salt')); } - self::_setPath($base); - self::_setHost(env('HTTP_HOST')); + static::_setPath($base); + static::_setHost(env('HTTP_HOST')); - if (!self::$_initialized) { + if (!static::$_initialized) { register_shutdown_function('session_write_close'); } - self::$_initialized = true; + static::$_initialized = true; } /** * Setup the Path variable * - * @param string $base base path + * @param string|null $base base path * @return void */ protected static function _setPath($base = null) { if (empty($base)) { - self::$path = '/'; + static::$path = '/'; return; } if (strpos($base, 'index.php') !== false) { @@ -174,7 +174,7 @@ protected static function _setPath($base = null) { if (strpos($base, '?') !== false) { $base = str_replace('?', '', $base); } - self::$path = $base; + static::$path = $base; } /** @@ -184,9 +184,9 @@ protected static function _setPath($base = null) { * @return void */ protected static function _setHost($host) { - self::$host = $host; - if (strpos(self::$host, ':') !== false) { - self::$host = substr(self::$host, 0, strpos(self::$host, ':')); + static::$host = $host; + if (strpos(static::$host, ':') !== false) { + static::$host = substr(static::$host, 0, strpos(static::$host, ':')); } } @@ -196,20 +196,20 @@ protected static function _setHost($host) { * @return bool True if session was started */ public static function start() { - if (self::started()) { + if (static::started()) { return true; } - $id = self::id(); - self::_startSession(); + $id = static::id(); + static::_startSession(); - if (!$id && self::started()) { - self::_checkValid(); + if (!$id && static::started()) { + static::_checkValid(); } - self::$error = false; - self::$valid = true; - return self::started(); + static::$error = false; + static::$valid = true; + return static::started(); } /** @@ -227,8 +227,8 @@ public static function started() { * @param string $name Variable name to check for * @return bool True if variable is there */ - public static function check($name = null) { - if (empty($name) || !self::_hasSession() || !self::start()) { + public static function check($name) { + if (empty($name) || !static::_hasSession() || !static::start()) { return false; } @@ -246,18 +246,18 @@ public static function check($name = null) { * within the session id. For example, the file session handler only allows * characters in the range a-z A-Z 0-9 , (comma) and - (minus). * - * @param string $id Id to replace the current session id + * @param string|null $id Id to replace the current session id * @return string Session id */ public static function id($id = null) { if ($id) { - self::$id = $id; - session_id(self::$id); + static::$id = $id; + session_id(static::$id); } - if (self::started()) { + if (static::started()) { return session_id(); } - return self::$id; + return static::$id; } /** @@ -267,9 +267,9 @@ public static function id($id = null) { * @return bool Success */ public static function delete($name) { - if (self::check($name)) { - self::_overwrite($_SESSION, Hash::remove($_SESSION, $name)); - return !self::check($name); + if (static::check($name)) { + static::_overwrite($_SESSION, Hash::remove($_SESSION, $name)); + return !static::check($name); } return false; } @@ -301,10 +301,10 @@ protected static function _overwrite(&$old, $new) { * @return string Error as string */ protected static function _error($errorNumber) { - if (!is_array(self::$error) || !array_key_exists($errorNumber, self::$error)) { + if (!is_array(static::$error) || !array_key_exists($errorNumber, static::$error)) { return false; } - return self::$error[$errorNumber]; + return static::$error[$errorNumber]; } /** @@ -313,8 +313,8 @@ protected static function _error($errorNumber) { * @return mixed Error description as a string, or false. */ public static function error() { - if (self::$lastError) { - return self::_error(self::$lastError); + if (static::$lastError) { + return static::_error(static::$lastError); } return false; } @@ -325,66 +325,66 @@ public static function error() { * @return bool Success */ public static function valid() { - if (self::start() && self::read('Config')) { - if (self::_validAgentAndTime() && self::$error === false) { - self::$valid = true; + if (static::start() && static::read('Config')) { + if (static::_validAgentAndTime() && static::$error === false) { + static::$valid = true; } else { - self::$valid = false; - self::_setError(1, 'Session Highjacking Attempted !!!'); + static::$valid = false; + static::_setError(1, 'Session Highjacking Attempted !!!'); } } - return self::$valid; + return static::$valid; } /** * Tests that the user agent is valid and that the session hasn't 'timed out'. - * Since timeouts are implemented in CakeSession it checks the current self::$time + * Since timeouts are implemented in CakeSession it checks the current static::$time * against the time the session is set to expire. The User agent is only checked * if Session.checkAgent == true. * * @return bool */ protected static function _validAgentAndTime() { - $config = self::read('Config'); + $config = static::read('Config'); $validAgent = ( Configure::read('Session.checkAgent') === false || - isset($config['userAgent']) && self::$_userAgent === $config['userAgent'] + isset($config['userAgent']) && static::$_userAgent === $config['userAgent'] ); - return ($validAgent && self::$time <= $config['time']); + return ($validAgent && static::$time <= $config['time']); } /** * Get / Set the user agent * - * @param string $userAgent Set the user agent - * @return string Current user agent + * @param string|null $userAgent Set the user agent + * @return string Current user agent. */ public static function userAgent($userAgent = null) { if ($userAgent) { - self::$_userAgent = $userAgent; + static::$_userAgent = $userAgent; } - if (empty(self::$_userAgent)) { - CakeSession::init(self::$path); + if (empty(static::$_userAgent)) { + CakeSession::init(static::$path); } - return self::$_userAgent; + return static::$_userAgent; } /** * Returns given session variable, or all of them, if no parameters given. * - * @param string|array $name The name of the session variable (or a path as sent to Set.extract) + * @param string|null $name The name of the session variable (or a path as sent to Set.extract) * @return mixed The value of the session variable, null if session not available, - * session not started, or provided name not found in the session. + * session not started, or provided name not found in the session, false on failure. */ public static function read($name = null) { if (empty($name) && $name !== null) { return null; } - if (!self::_hasSession() || !self::start()) { + if (!static::_hasSession() || !static::start()) { return null; } if ($name === null) { - return self::_returnSessionVars(); + return static::_returnSessionVars(); } $result = Hash::get($_SESSION, $name); @@ -403,7 +403,7 @@ protected static function _returnSessionVars() { if (!empty($_SESSION)) { return $_SESSION; } - self::_setError(2, 'No Session vars set'); + static::_setError(2, 'No Session vars set'); return false; } @@ -415,7 +415,7 @@ protected static function _returnSessionVars() { * @return bool True if the write was successful, false if the write failed */ public static function write($name, $value = null) { - if (empty($name) || !self::start()) { + if (empty($name) || !static::start()) { return false; } @@ -424,7 +424,7 @@ public static function write($name, $value = null) { $write = array($name => $value); } foreach ($write as $key => $val) { - self::_overwrite($_SESSION, Hash::insert($_SESSION, $key, $val)); + static::_overwrite($_SESSION, Hash::insert($_SESSION, $key, $val)); if (Hash::get($_SESSION, $key) !== $val) { return false; } @@ -432,32 +432,60 @@ public static function write($name, $value = null) { return true; } +/** + * Reads and deletes a variable from session. + * + * @param string $name The key to read and remove (or a path as sent to Hash.extract). + * @return mixed The value of the session variable, null if session not available, + * session not started, or provided name not found in the session. + */ + public static function consume($name) { + if (empty($name)) { + return null; + } + $value = static::read($name); + if ($value !== null) { + static::_overwrite($_SESSION, Hash::remove($_SESSION, $name)); + } + return $value; + } + /** * Helper method to destroy invalid sessions. * * @return void */ public static function destroy() { - if (!self::started()) { - self::_startSession(); + if (!static::started()) { + static::_startSession(); } - session_destroy(); + if (static::started()) { + session_destroy(); + } $_SESSION = null; - self::$id = null; - self::$_cookieName = null; + static::$id = null; + static::$_cookieName = null; } /** - * Clears the session, the session id, and renews the session. + * Clears the session. * + * Optionally also clears the session id and renews the session. + * + * @param bool $renew If the session should also be renewed. Defaults to true. * @return void */ - public static function clear() { + public static function clear($renew = true) { + if (!$renew) { + $_SESSION = array(); + return; + } + $_SESSION = null; - self::$id = null; - self::renew(); + static::$id = null; + static::renew(); } /** @@ -472,7 +500,7 @@ protected static function _configureSession() { $sessionConfig = Configure::read('Session'); if (isset($sessionConfig['defaults'])) { - $defaults = self::_defaultConfig($sessionConfig['defaults']); + $defaults = static::_defaultConfig($sessionConfig['defaults']); if ($defaults) { $sessionConfig = Hash::merge($defaults, $sessionConfig); } @@ -490,7 +518,7 @@ protected static function _configureSession() { if (!isset($sessionConfig['ini']['session.name'])) { $sessionConfig['ini']['session.name'] = $sessionConfig['cookie']; } - self::$_cookieName = $sessionConfig['ini']['session.name']; + static::$_cookieName = $sessionConfig['ini']['session.name']; if (!empty($sessionConfig['handler'])) { $sessionConfig['ini']['session.save_handler'] = 'user'; @@ -520,7 +548,7 @@ protected static function _configureSession() { call_user_func_array('session_set_save_handler', $sessionConfig['handler']); } if (!empty($sessionConfig['handler']['engine'])) { - $handler = self::_getHandler($sessionConfig['handler']['engine']); + $handler = static::_getHandler($sessionConfig['handler']['engine']); session_set_save_handler( array($handler, 'open'), array($handler, 'close'), @@ -531,7 +559,7 @@ protected static function _configureSession() { ); } Configure::write('Session', $sessionConfig); - self::$sessionTime = self::$time + ($sessionConfig['timeout'] * 60); + static::$sessionTime = static::$time + ($sessionConfig['timeout'] * 60); } /** @@ -540,14 +568,14 @@ protected static function _configureSession() { * @return string */ protected static function _cookieName() { - if (self::$_cookieName !== null) { - return self::$_cookieName; + if (static::$_cookieName !== null) { + return static::$_cookieName; } - self::init(); - self::_configureSession(); + static::init(); + static::_configureSession(); - return self::$_cookieName = session_name(); + return static::$_cookieName = session_name(); } /** @@ -556,7 +584,7 @@ protected static function _cookieName() { * @return bool */ protected static function _hasSession() { - return self::started() || isset($_COOKIE[self::_cookieName()]); + return static::started() || isset($_COOKIE[static::_cookieName()]); } /** @@ -592,7 +620,7 @@ protected static function _defaultConfig($name) { 'timeout' => 240, 'ini' => array( 'session.use_trans_sid' => 0, - 'session.cookie_path' => self::$path + 'session.cookie_path' => static::$path ) ), 'cake' => array( @@ -603,7 +631,7 @@ protected static function _defaultConfig($name) { 'url_rewriter.tags' => '', 'session.serialize_handler' => 'php', 'session.use_cookies' => 1, - 'session.cookie_path' => self::$path, + 'session.cookie_path' => static::$path, 'session.save_path' => TMP . 'sessions', 'session.save_handler' => 'files' ) @@ -615,7 +643,7 @@ protected static function _defaultConfig($name) { 'session.use_trans_sid' => 0, 'url_rewriter.tags' => '', 'session.use_cookies' => 1, - 'session.cookie_path' => self::$path, + 'session.cookie_path' => static::$path, 'session.save_handler' => 'user', ), 'handler' => array( @@ -630,7 +658,7 @@ protected static function _defaultConfig($name) { 'session.use_trans_sid' => 0, 'url_rewriter.tags' => '', 'session.use_cookies' => 1, - 'session.cookie_path' => self::$path, + 'session.cookie_path' => static::$path, 'session.save_handler' => 'user', 'session.serialize_handler' => 'php', ), @@ -652,9 +680,9 @@ protected static function _defaultConfig($name) { * @return bool Success */ protected static function _startSession() { - self::init(); + static::init(); session_write_close(); - self::_configureSession(); + static::_configureSession(); if (headers_sent()) { if (empty($_SESSION)) { @@ -674,31 +702,31 @@ protected static function _startSession() { * @return void */ protected static function _checkValid() { - $config = self::read('Config'); + $config = static::read('Config'); if ($config) { $sessionConfig = Configure::read('Session'); - if (self::valid()) { - self::write('Config.time', self::$sessionTime); + if (static::valid()) { + static::write('Config.time', static::$sessionTime); if (isset($sessionConfig['autoRegenerate']) && $sessionConfig['autoRegenerate'] === true) { $check = $config['countdown']; $check -= 1; - self::write('Config.countdown', $check); + static::write('Config.countdown', $check); if ($check < 1) { - self::renew(); - self::write('Config.countdown', self::$requestCountdown); + static::renew(); + static::write('Config.countdown', static::$requestCountdown); } } } else { $_SESSION = array(); - self::destroy(); - self::_setError(1, 'Session Highjacking Attempted !!!'); - self::_startSession(); - self::_writeConfig(); + static::destroy(); + static::_setError(1, 'Session Highjacking Attempted !!!'); + static::_startSession(); + static::_writeConfig(); } } else { - self::_writeConfig(); + static::_writeConfig(); } } @@ -708,9 +736,9 @@ protected static function _checkValid() { * @return void */ protected static function _writeConfig() { - self::write('Config.userAgent', self::$_userAgent); - self::write('Config.time', self::$sessionTime); - self::write('Config.countdown', self::$requestCountdown); + static::write('Config.userAgent', static::$_userAgent); + static::write('Config.time', static::$sessionTime); + static::write('Config.countdown', static::$requestCountdown); } /** @@ -719,11 +747,11 @@ protected static function _writeConfig() { * @return void */ public static function renew() { - if (!session_id()) { + if (session_id() === '') { return; } if (isset($_COOKIE[session_name()])) { - setcookie(Configure::read('Session.cookie'), '', time() - 42000, self::$path); + setcookie(Configure::read('Session.cookie'), '', time() - 42000, static::$path); } session_regenerate_id(true); } @@ -736,11 +764,11 @@ public static function renew() { * @return void */ protected static function _setError($errorNumber, $errorMessage) { - if (self::$error === false) { - self::$error = array(); + if (static::$error === false) { + static::$error = array(); } - self::$error[$errorNumber] = $errorMessage; - self::$lastError = $errorNumber; + static::$error[$errorNumber] = $errorMessage; + static::$lastError = $errorNumber; } } diff --git a/lib/Cake/Model/Datasource/Database/Mysql.php b/lib/Cake/Model/Datasource/Database/Mysql.php index d6f7e199770..b5ec790ef81 100644 --- a/lib/Cake/Model/Datasource/Database/Mysql.php +++ b/lib/Cake/Model/Datasource/Database/Mysql.php @@ -354,7 +354,7 @@ public function describe($model) { if (in_array($fields[$column->Field]['type'], $this->fieldParameters['unsigned']['types'], true)) { $fields[$column->Field]['unsigned'] = $this->_unsigned($column->Type); } - if ($fields[$column->Field]['type'] === 'timestamp' && strtoupper($column->Default) === 'CURRENT_TIMESTAMP') { + if (in_array($fields[$column->Field]['type'], array('timestamp', 'datetime')) && strtoupper($column->Default) === 'CURRENT_TIMESTAMP') { $fields[$column->Field]['default'] = null; } if (!empty($column->Key) && isset($this->index[$column->Key])) { @@ -803,6 +803,17 @@ public function column($real) { return 'text'; } +/** + * {@inheritDoc} + */ + public function value($data, $column = null, $null = true) { + $value = parent::value($data, $column, $null); + if (is_numeric($value) && substr($column, 0, 3) === 'set') { + return $this->_connection->quote($value); + } + return $value; + } + /** * Gets the schema name * diff --git a/lib/Cake/Model/Datasource/Database/Postgres.php b/lib/Cake/Model/Datasource/Database/Postgres.php index 87b26798fd3..033527ae0d1 100644 --- a/lib/Cake/Model/Datasource/Database/Postgres.php +++ b/lib/Cake/Model/Datasource/Database/Postgres.php @@ -1,7 +1,5 @@ buildColumn($col)) . ' USING CASE WHEN TRUE THEN 1 ELSE 0 END'; } else { - $colList[] = 'ALTER COLUMN ' . $fieldName . ' TYPE ' . str_replace(array($fieldName, 'NOT NULL'), '', $this->buildColumn($col)); + if ($original['type'] === 'text' && $col['type'] === 'integer') { + $colList[] = 'ALTER COLUMN ' . $fieldName . ' TYPE ' . str_replace(array($fieldName, 'NOT NULL'), '', $this->buildColumn($col)) . " USING cast({$fieldName} as INTEGER)"; + } else { + $colList[] = 'ALTER COLUMN ' . $fieldName . ' TYPE ' . str_replace(array($fieldName, 'NOT NULL'), '', $this->buildColumn($col)); + } } if (isset($nullable)) { diff --git a/lib/Cake/Model/Datasource/Database/Sqlite.php b/lib/Cake/Model/Datasource/Database/Sqlite.php index 37c3787a8f7..9bdc81c4cf7 100644 --- a/lib/Cake/Model/Datasource/Database/Sqlite.php +++ b/lib/Cake/Model/Datasource/Database/Sqlite.php @@ -17,7 +17,7 @@ */ App::uses('DboSource', 'Model/Datasource'); -App::uses('String', 'Utility'); +App::uses('CakeText', 'Utility'); /** * DBO implementation for the SQLite3 DBMS. @@ -303,7 +303,7 @@ public function resultSet($results) { if (stripos($querystring, 'SELECT') === 0 && stripos($querystring, 'FROM') > 0) { $selectpart = substr($querystring, 7); $selects = array(); - foreach (String::tokenize($selectpart, ',', '(', ')') as $part) { + foreach (CakeText::tokenize($selectpart, ',', '(', ')') as $part) { $fromPos = stripos($part, ' FROM '); if ($fromPos !== false) { $selects[] = trim(substr($part, 0, $fromPos)); @@ -323,7 +323,7 @@ public function resultSet($results) { $j++; continue; } - if (preg_match('/\bAS\s+(.*)/i', $selects[$j], $matches)) { + if (preg_match('/\bAS(?!.*\bAS\b)\s+(.*)/i', $selects[$j], $matches)) { $columnName = trim($matches[1], '"'); } else { $columnName = trim(str_replace('"', '', $selects[$j])); diff --git a/lib/Cake/Model/Datasource/Database/Sqlserver.php b/lib/Cake/Model/Datasource/Database/Sqlserver.php index eb7dad8c086..cb66267b585 100644 --- a/lib/Cake/Model/Datasource/Database/Sqlserver.php +++ b/lib/Cake/Model/Datasource/Database/Sqlserver.php @@ -544,7 +544,7 @@ public function renderStatement($type, $data) { $page = (int)($limitOffset[1] / $limitOffset[2]); $offset = (int)($limitOffset[2] * $page); - $rowCounter = self::ROW_COUNTER; + $rowCounter = static::ROW_COUNTER; $sql = "SELECT {$limit} * FROM ( SELECT {$fields}, ROW_NUMBER() OVER ({$order}) AS {$rowCounter} FROM {$table} {$alias} {$joins} {$conditions} {$group} @@ -584,11 +584,12 @@ public function renderStatement($type, $data) { * * @param string $data String to be prepared for use in an SQL statement * @param string $column The column into which this data will be inserted + * @param bool $null Column allows NULL values * @return string Quoted and escaped data */ - public function value($data, $column = null) { + public function value($data, $column = null, $null = true) { if ($data === null || is_array($data) || is_object($data)) { - return parent::value($data, $column); + return parent::value($data, $column, $null); } if (in_array($data, array('{$__cakeID__$}', '{$__cakeForeignKey__$}'), true)) { return $data; @@ -603,7 +604,7 @@ public function value($data, $column = null) { case 'text': return 'N' . $this->_connection->quote($data, PDO::PARAM_STR); default: - return parent::value($data, $column); + return parent::value($data, $column, $null); } } @@ -633,7 +634,7 @@ public function fetchResult() { $resultRow = array(); foreach ($this->map as $col => $meta) { list($table, $column, $type) = $meta; - if ($table === 0 && $column === self::ROW_COUNTER) { + if ($table === 0 && $column === static::ROW_COUNTER) { continue; } $resultRow[$table][$column] = $row[$col]; diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php index c18f3318a88..a01cee65498 100644 --- a/lib/Cake/Model/Datasource/DboSource.php +++ b/lib/Cake/Model/Datasource/DboSource.php @@ -17,7 +17,7 @@ */ App::uses('DataSource', 'Model/Datasource'); -App::uses('String', 'Utility'); +App::uses('CakeText', 'Utility'); App::uses('View', 'View'); /** @@ -284,7 +284,7 @@ public function disconnect() { if ($this->_result instanceof PDOStatement) { $this->_result->closeCursor(); } - unset($this->_connection); + $this->_connection = null; $this->connected = false; return true; } @@ -312,9 +312,10 @@ public function getVersion() { * * @param string $data String to be prepared for use in an SQL statement * @param string $column The column datatype into which this data will be inserted. + * @param bool $null Column allows NULL values * @return string Quoted and escaped data */ - public function value($data, $column = null) { + public function value($data, $column = null, $null = true) { if (is_array($data) && !empty($data)) { return array_map( array(&$this, 'value'), @@ -348,14 +349,16 @@ public function value($data, $column = null) { return $this->_connection->quote($data, PDO::PARAM_STR); default: if ($data === '') { - return 'NULL'; + return $null ? 'NULL' : '""'; } if (is_float($data)) { return str_replace(',', '.', strval($data)); } if ((is_int($data) || $data === '0') || ( - is_numeric($data) && strpos($data, ',') === false && - $data[0] != '0' && strpos($data, 'e') === false) + is_numeric($data) && + strpos($data, ',') === false && + $data[0] != '0' && + strpos($data, 'e') === false) ) { return $data; } @@ -400,7 +403,7 @@ public function expression($expression) { */ public function rawQuery($sql, $params = array()) { $this->took = $this->numRows = false; - return $this->execute($sql, $params); + return $this->execute($sql, array(), $params); } /** @@ -756,7 +759,7 @@ public function field($name, $sql) { */ public function flushMethodCache() { $this->_methodCacheChange = true; - self::$methodCache = array(); + static::$methodCache = array(); } /** @@ -775,14 +778,14 @@ public function cacheMethod($method, $key, $value = null) { if ($this->cacheMethods === false) { return $value; } - if (!$this->_methodCacheChange && empty(self::$methodCache)) { - self::$methodCache = (array)Cache::read('method_cache', '_cake_core_'); + if (!$this->_methodCacheChange && empty(static::$methodCache)) { + static::$methodCache = (array)Cache::read('method_cache', '_cake_core_'); } if ($value === null) { - return (isset(self::$methodCache[$method][$key])) ? self::$methodCache[$method][$key] : null; + return (isset(static::$methodCache[$method][$key])) ? static::$methodCache[$method][$key] : null; } $this->_methodCacheChange = true; - return self::$methodCache[$method][$key] = $value; + return static::$methodCache[$method][$key] = $value; } /** @@ -854,6 +857,16 @@ public function name($data) { * @return bool True if the database is connected, else false */ public function isConnected() { + if ($this->_connection === null) { + $connected = false; + } else { + try { + $connected = $this->_connection->query('SELECT 1'); + } catch (Exception $e) { + $connected = false; + } + } + $this->connected = !empty($connected); return $this->connected; } @@ -994,7 +1007,8 @@ public function create(Model $Model, $fields = null, $values = null) { $count = count($fields); for ($i = 0; $i < $count; $i++) { - $valueInsert[] = $this->value($values[$i], $Model->getColumnType($fields[$i])); + $schema = $Model->schema(); + $valueInsert[] = $this->value($values[$i], $Model->getColumnType($fields[$i]), isset($schema[$fields[$i]]) ? $schema[$fields[$i]]['null'] : true); $fieldInsert[] = $this->name($fields[$i]); if ($fields[$i] === $Model->primaryKey) { $id = $values[$i]; @@ -1254,7 +1268,7 @@ public function queryAssociation(Model $Model, Model $LinkModel, $type, $associa $queryTemplate = $this->generateAssociationQuery($Model, $LinkModel, $type, $association, $assocData, $queryData, $external); if (empty($queryTemplate)) { - return; + return null; } if (!is_array($resultSet)) { @@ -1948,7 +1962,7 @@ public function renderJoinStatement($data) { * * @param string $type type of query being run. e.g select, create, update, delete, schema, alter. * @param array $data Array of data to insert into the query. - * @return string Rendered SQL expression to be run. + * @return string|null Rendered SQL expression to be run, otherwise null. */ public function renderStatement($type, $data) { extract($data); @@ -1982,7 +1996,7 @@ public function renderStatement($type, $data) { } return "CREATE TABLE {$table} (\n{$columns}{$indexes}) {$tableParameters};"; case 'alter': - return; + return null; } } @@ -2061,6 +2075,7 @@ public function update(Model $Model, $fields = array(), $values = null, $conditi */ protected function _prepareUpdateFields(Model $Model, $fields, $quoteValues = true, $alias = false) { $quotedAlias = $this->startQuote . $Model->alias . $this->endQuote; + $schema = $Model->schema(); $updates = array(); foreach ($fields as $field => $value) { @@ -2081,7 +2096,7 @@ protected function _prepareUpdateFields(Model $Model, $fields, $quoteValues = tr $update = $quoted . ' = '; if ($quoteValues) { - $update .= $this->value($value, $Model->getColumnType($field)); + $update .= $this->value($value, $Model->getColumnType($field), isset($schema[$field]) ? $schema[$field]['null'] : true); } elseif ($Model->getColumnType($field) === 'boolean' && (is_int($value) || is_bool($value))) { $update .= $this->boolean($value, true); } elseif (!$alias) { @@ -2513,7 +2528,7 @@ public function fields(Model $Model, $alias = null, $fields = array(), $quote = if ($allFields) { $fields = array_keys($Model->schema()); } elseif (!is_array($fields)) { - $fields = String::tokenize($fields); + $fields = CakeText::tokenize($fields); } $fields = array_values(array_filter($fields)); $allFields = $allFields || in_array('*', $fields) || in_array($Model->alias . '.*', $fields); @@ -2813,7 +2828,7 @@ protected function _parseKey($key, $value, Model $Model = null) { } if ($bound) { - return String::insert($key . ' ' . trim($operator), $value); + return CakeText::insert($key . ' ' . trim($operator), $value); } if (!preg_match($operatorMatch, trim($operator))) { @@ -2867,12 +2882,19 @@ protected function _quoteFields($conditions) { if (!empty($this->endQuote)) { $end = preg_quote($this->endQuote); } + // Remove quotes and requote all the Model.field names. $conditions = str_replace(array($start, $end), '', $conditions); $conditions = preg_replace_callback( '/(?:[\'\"][^\'\"\\\]*(?:\\\.[^\'\"\\\]*)*[\'\"])|([a-z0-9_][a-z0-9\\-_]*\\.[a-z0-9_][a-z0-9_\\-]*)/i', array(&$this, '_quoteMatchedField'), $conditions ); + // Quote `table_name AS Alias` + $conditions = preg_replace( + '/(\s[a-z0-9\\-_.' . $start . $end . ']*' . $end . ')\s+AS\s+([a-z0-9\\-_]+)/i', + '\1 AS ' . $this->startQuote . '\2' . $this->endQuote, + $conditions + ); if ($conditions !== null) { return $conditions; } @@ -3559,8 +3581,9 @@ public function getQueryCache($sql, $params = array()) { */ public function __destruct() { if ($this->_methodCacheChange) { - Cache::write('method_cache', self::$methodCache, '_cake_core_'); + Cache::write('method_cache', static::$methodCache, '_cake_core_'); } + parent::__destruct(); } -} +} \ No newline at end of file diff --git a/lib/Cake/Model/Datasource/Session/DatabaseSession.php b/lib/Cake/Model/Datasource/Session/DatabaseSession.php index 4a1193beaf5..a9c6e862772 100644 --- a/lib/Cake/Model/Datasource/Session/DatabaseSession.php +++ b/lib/Cake/Model/Datasource/Session/DatabaseSession.php @@ -43,7 +43,6 @@ class DatabaseSession implements CakeSessionHandlerInterface { /** * Constructor. Looks at Session configuration information and * sets up the session model. - * */ public function __construct() { $modelName = Configure::read('Session.handler.model'); @@ -103,6 +102,9 @@ public function read($id) { /** * Helper function called on write for database sessions. * + * Will retry, once, if the save triggers a PDOException which + * can happen if a race condition is encountered + * * @param int $id ID that uniquely identifies session in database * @param mixed $data The value of the data to be saved. * @return bool True for successful write, false otherwise. @@ -114,7 +116,17 @@ public function write($id, $data) { $expires = time() + $this->_timeout; $record = compact('id', 'data', 'expires'); $record[$this->_model->primaryKey] = $id; - return $this->_model->save($record); + + $options = array( + 'validate' => false, + 'callbacks' => false, + 'counterCache' => false + ); + try { + return $this->_model->save($record, $options); + } catch (PDOException $e) { + return $this->_model->save($record, $options); + } } /** diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php index 6a794b09a90..23f39d7cc8b 100644 --- a/lib/Cake/Model/Model.php +++ b/lib/Cake/Model/Model.php @@ -20,7 +20,7 @@ App::uses('ClassRegistry', 'Utility'); App::uses('Validation', 'Utility'); -App::uses('String', 'Utility'); +App::uses('CakeText', 'Utility'); App::uses('Hash', 'Utility'); App::uses('BehaviorCollection', 'Model'); App::uses('ModelBehavior', 'Model'); @@ -134,7 +134,7 @@ class Model extends Object implements CakeEventListener { * * ``` * public $validate = array( - * 'name' => 'notEmpty' + * 'name' => 'notBlank' * ); * ``` * @@ -1190,12 +1190,12 @@ public function setSource($tableName) { * * @param string|array|SimpleXmlElement|DomNode $one Array or string of data * @param string $two Value string for the alternative indata method - * @return array Data with all of $one's keys and values + * @return array|null Data with all of $one's keys and values, otherwise null. * @link http://book.cakephp.org/2.0/en/models/saving-your-data.html */ public function set($one, $two = null) { if (!$one) { - return; + return null; } if (is_object($one)) { @@ -1428,8 +1428,12 @@ public function getColumnTypes() { * @return string Column type */ public function getColumnType($column) { - $db = $this->getDataSource(); $cols = $this->schema(); + if (isset($cols[$column]) && isset($cols[$column]['type'])) { + return $cols[$column]['type']; + } + + $db = $this->getDataSource(); $model = null; $startQuote = isset($db->startQuote) ? $db->startQuote : null; @@ -1713,7 +1717,7 @@ public function saveField($name, $value, $validate = false) { * - validate: Set to true/false to enable or disable validation. * - fieldList: An array of fields you want to allow for saving. * - callbacks: Set to false to disable callbacks. Using 'before' or 'after' - * will enable only those callbacks. + * will enable only those callbacks. * - `counterCache`: Boolean to control updating of counter caches (if any) * * @param array $fieldList List of fields to allow to be saved @@ -1831,7 +1835,12 @@ protected function _doSave($data = null, $options = array()) { $now = time(); foreach ($dateFields as $updateCol) { - if (in_array($updateCol, $fields) || !$this->hasField($updateCol)) { + $fieldHasValue = in_array($updateCol, $fields); + $fieldInWhitelist = ( + count($this->whitelist) === 0 || + in_array($updateCol, $this->whitelist) + ); + if (($fieldHasValue && $fieldInWhitelist) || !$this->hasField($updateCol)) { continue; } @@ -1915,9 +1924,9 @@ protected function _doSave($data = null, $options = array()) { if (empty($this->data[$this->alias][$this->primaryKey]) && $this->_isUUIDField($this->primaryKey)) { if (array_key_exists($this->primaryKey, $this->data[$this->alias])) { $j = array_search($this->primaryKey, $fields); - $values[$j] = String::uuid(); + $values[$j] = CakeText::uuid(); } else { - list($fields[], $values[]) = array($this->primaryKey, String::uuid()); + list($fields[], $values[]) = array($this->primaryKey, CakeText::uuid()); } } @@ -1937,9 +1946,8 @@ protected function _doSave($data = null, $options = array()) { $this->_saveMulti($joined, $this->id, $db); } - $this->whitelist = $_whitelist; - if (!$success) { + $this->whitelist = $_whitelist; return $success; } @@ -1960,6 +1968,7 @@ protected function _doSave($data = null, $options = array()) { $this->_clearCache(); $this->validationErrors = array(); + $this->whitelist = $_whitelist; $this->data = false; return $success; @@ -2026,7 +2035,7 @@ protected function _saveMulti($joined, $id, $db) { $values = array($id, $row); if ($isUUID && $primaryAdded) { - $values[] = String::uuid(); + $values[] = CakeText::uuid(); } $newValues[$row] = $values; @@ -2331,11 +2340,11 @@ public function saveMany($data = null, $options = array()) { if ($options['deep']) { $saved = $this->saveAssociated($record, array('atomic' => false) + $options); } else { - $saved = $this->save($record, array('atomic' => false) + $options); + $saved = (bool)$this->save($record, array('atomic' => false) + $options); } } - $validates = ($validates && ($saved === true || (is_array($saved) && !in_array(false, $saved, true)))); + $validates = ($validates && ($saved === true || (is_array($saved) && !in_array(false, Hash::flatten($saved), true)))); if (!$validates) { $validationErrors[$key] = $this->validationErrors; } @@ -2474,9 +2483,9 @@ public function saveAssociated($data = null, $options = array()) { if ($options['deep']) { $saved = $Model->saveAssociated($values, array('atomic' => false) + $options); } else { - $saved = $Model->save($values, array('atomic' => false) + $options); + $saved = (bool)$Model->save($values, array('atomic' => false) + $options); } - $validates = ($saved === true || (is_array($saved) && !in_array(false, $saved, true))); + $validates = ($saved === true || (is_array($saved) && !in_array(false, Hash::flatten($saved), true))); } if ($validates) { @@ -2530,11 +2539,11 @@ public function saveAssociated($data = null, $options = array()) { if ($options['deep']) { $saved = $Model->saveAssociated($values, array('atomic' => false) + $options); } else { - $saved = $Model->save($values, $options); + $saved = (bool)$Model->save($values, $options); } } - $validates = ($validates && ($saved === true || (is_array($saved) && !in_array(false, $saved, true)))); + $validates = ($validates && ($saved === true || (is_array($saved) && !in_array(false, Hash::flatten($saved), true)))); if (!$validates) { $validationErrors[$association] = $Model->validationErrors; } @@ -2648,7 +2657,7 @@ public function validateAssociated(&$data, $options = array()) { * Fields are treated as SQL snippets, to insert literal values manually escape your data. * @param mixed $conditions Conditions to match, true for all records * @return bool True on success, false on failure - * @link http://book.cakephp.org/2.0/en/models/saving-your-data.html#model-updateall-array-fields-array-conditions + * @link http://book.cakephp.org/2.0/en/models/saving-your-data.html#model-updateall-array-fields-mixed-conditions */ public function updateAll($fields, $conditions = true) { return $this->getDataSource()->update($this, $fields, null, $conditions); @@ -2891,6 +2900,10 @@ public function exists($id = null) { return false; } + if ($this->useTable === false) { + return false; + } + return (bool)$this->find('count', array( 'conditions' => array( $this->alias . '.' . $this->primaryKey => $id @@ -3187,7 +3200,7 @@ protected function _findList($state, $query, $results = array()) { $list = array("{n}.{$this->alias}.{$this->primaryKey}", "{n}.{$this->alias}.{$this->displayField}", null); } else { if (!is_array($query['fields'])) { - $query['fields'] = String::tokenize($query['fields']); + $query['fields'] = CakeText::tokenize($query['fields']); } if (count($query['fields']) === 1) { diff --git a/lib/Cake/Model/ModelValidator.php b/lib/Cake/Model/ModelValidator.php index 474e24bb18e..061055e4efb 100644 --- a/lib/Cake/Model/ModelValidator.php +++ b/lib/Cake/Model/ModelValidator.php @@ -537,7 +537,7 @@ public function count() { * * ``` * $validator - * ->add('title', 'required', array('rule' => 'notEmpty', 'required' => true)) + * ->add('title', 'required', array('rule' => 'notBlank', 'required' => true)) * ->add('user_id', 'valid', array('rule' => 'numeric', 'message' => 'Invalid User')) * * $validator->add('password', array( diff --git a/lib/Cake/Model/Validator/CakeValidationSet.php b/lib/Cake/Model/Validator/CakeValidationSet.php index 7a8457c7e5c..f3420a96f49 100644 --- a/lib/Cake/Model/Validator/CakeValidationSet.php +++ b/lib/Cake/Model/Validator/CakeValidationSet.php @@ -185,7 +185,7 @@ public function getRules() { * * ``` * $set - * ->setRule('required', array('rule' => 'notEmpty', 'required' => true)) + * ->setRule('required', array('rule' => 'notBlank', 'required' => true)) * ->setRule('between', array('rule' => array('lengthBetween', 4, 10)) * ``` * @@ -227,7 +227,7 @@ public function removeRule($name) { * * ``` * $set->setRules(array( - * 'required' => array('rule' => 'notEmpty', 'required' => true), + * 'required' => array('rule' => 'notBlank', 'required' => true), * 'inRange' => array('rule' => array('between', 4, 10) * )); * ``` diff --git a/lib/Cake/Network/CakeRequest.php b/lib/Cake/Network/CakeRequest.php index 5e9932069e8..f14373370f3 100644 --- a/lib/Cake/Network/CakeRequest.php +++ b/lib/Cake/Network/CakeRequest.php @@ -106,12 +106,14 @@ class CakeRequest implements ArrayAccess { 'ajax' => array('env' => 'HTTP_X_REQUESTED_WITH', 'value' => 'XMLHttpRequest'), 'flash' => array('env' => 'HTTP_USER_AGENT', 'pattern' => '/^(Shockwave|Adobe) Flash/'), 'mobile' => array('env' => 'HTTP_USER_AGENT', 'options' => array( - 'Android', 'AvantGo', 'BlackBerry', 'DoCoMo', 'Fennec', 'iPod', 'iPhone', 'iPad', + 'Android', 'AvantGo', 'BB10', 'BlackBerry', 'DoCoMo', 'Fennec', 'iPod', 'iPhone', 'iPad', 'J2ME', 'MIDP', 'NetFront', 'Nokia', 'Opera Mini', 'Opera Mobi', 'PalmOS', 'PalmSource', 'portalmmm', 'Plucker', 'ReqwirelessWeb', 'SonyEricsson', 'Symbian', 'UP\\.Browser', 'webOS', 'Windows CE', 'Windows Phone OS', 'Xiino' )), - 'requested' => array('param' => 'requested', 'value' => 1) + 'requested' => array('param' => 'requested', 'value' => 1), + 'json' => array('accept' => array('application/json'), 'param' => 'ext', 'value' => 'json'), + 'xml' => array('accept' => array('application/xml', 'text/xml'), 'param' => 'ext', 'value' => 'xml'), ); /** @@ -293,6 +295,8 @@ protected function _base() { if (!$baseUrl) { $base = dirname(env('PHP_SELF')); + // Clean up additional / which cause following code to fail.. + $base = preg_replace('#/+#', '/', $base); $indexPos = strpos($base, '/webroot/index.php'); if ($indexPos !== false) { @@ -496,6 +500,100 @@ public function is($type) { return false; } $detect = $this->_detectors[$type]; + if (isset($detect['env']) && $this->_environmentDetector($detect)) { + return true; + } + if (isset($detect['header']) && $this->_headerDetector($detect)) { + return true; + } + if (isset($detect['accept']) && $this->_acceptHeaderDetector($detect)) { + return true; + } + if (isset($detect['param']) && $this->_paramDetector($detect)) { + return true; + } + if (isset($detect['callback']) && is_callable($detect['callback'])) { + return call_user_func($detect['callback'], $this); + } + return false; + } + +/** + * Detects if a URL extension is present. + * + * @param array $detect Detector options array. + * @return bool Whether or not the request is the type you are checking. + */ + protected function _extensionDetector($detect) { + if (is_string($detect['extension'])) { + $detect['extension'] = array($detect['extension']); + } + if (in_array($this->params['ext'], $detect['extension'])) { + return true; + } + return false; + } + +/** + * Detects if a specific accept header is present. + * + * @param array $detect Detector options array. + * @return bool Whether or not the request is the type you are checking. + */ + protected function _acceptHeaderDetector($detect) { + $acceptHeaders = explode(',', (string)env('HTTP_ACCEPT')); + foreach ($detect['accept'] as $header) { + if (in_array($header, $acceptHeaders)) { + return true; + } + } + return false; + } + +/** + * Detects if a specific header is present. + * + * @param array $detect Detector options array. + * @return bool Whether or not the request is the type you are checking. + */ + protected function _headerDetector($detect) { + foreach ($detect['header'] as $header => $value) { + $header = env('HTTP_' . strtoupper($header)); + if (!is_null($header)) { + if (!is_string($value) && !is_bool($value) && is_callable($value)) { + return call_user_func($value, $header); + } + return ($header === $value); + } + } + return false; + } + +/** + * Detects if a specific request parameter is present. + * + * @param array $detect Detector options array. + * @return bool Whether or not the request is the type you are checking. + */ + protected function _paramDetector($detect) { + $key = $detect['param']; + if (isset($detect['value'])) { + $value = $detect['value']; + return isset($this->params[$key]) ? $this->params[$key] == $value : false; + } + if (isset($detect['options'])) { + return isset($this->params[$key]) ? in_array($this->params[$key], $detect['options']) : false; + } + return false; + } + +/** + * Detects if a specific environment variable is present. + * + * @param array $detect Detector options array. + * @return bool Whether or not the request is the type you are checking. + */ + protected function _environmentDetector($detect) { if (isset($detect['env'])) { if (isset($detect['value'])) { return env($detect['env']) == $detect['value']; @@ -508,19 +606,6 @@ public function is($type) { return (bool)preg_match($pattern, env($detect['env'])); } } - if (isset($detect['param'])) { - $key = $detect['param']; - if (isset($detect['value'])) { - $value = $detect['value']; - return isset($this->params[$key]) ? $this->params[$key] == $value : false; - } - if (isset($detect['options'])) { - return isset($this->params[$key]) ? in_array($this->params[$key], $detect['options']) : false; - } - } - if (isset($detect['callback']) && is_callable($detect['callback'])) { - return call_user_func($detect['callback'], $this); - } return false; } @@ -648,7 +733,7 @@ public function here($base = true) { */ public static function header($name) { $name = 'HTTP_' . strtoupper(str_replace('-', '_', $name)); - if (!empty($_SERVER[$name])) { + if (isset($_SERVER[$name])) { return $_SERVER[$name]; } return false; @@ -768,7 +853,7 @@ public function parseAccept() { * @return mixed If a $language is provided, a boolean. Otherwise the array of accepted languages. */ public static function acceptLanguage($language = null) { - $raw = self::_parseAcceptWithQualifier(self::header('Accept-Language')); + $raw = static::_parseAcceptWithQualifier(static::header('Accept-Language')); $accept = array(); foreach ($raw as $languages) { foreach ($languages as &$lang) { diff --git a/lib/Cake/Network/CakeResponse.php b/lib/Cake/Network/CakeResponse.php index 9902fe632dd..6815c8c11eb 100644 --- a/lib/Cake/Network/CakeResponse.php +++ b/lib/Cake/Network/CakeResponse.php @@ -68,6 +68,7 @@ class CakeResponse { 415 => 'Unsupported Media Type', 416 => 'Requested range not satisfiable', 417 => 'Expectation Failed', + 429 => 'Too Many Requests', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', @@ -95,7 +96,7 @@ class CakeResponse { 'cpio' => 'application/x-cpio', 'cpt' => 'application/mac-compactpro', 'csh' => 'application/x-csh', - 'csv' => array('text/csv', 'application/vnd.ms-excel', 'text/plain'), + 'csv' => array('text/csv', 'application/vnd.ms-excel'), 'dcr' => 'application/x-director', 'dir' => 'application/x-director', 'dms' => 'application/octet-stream', @@ -451,7 +452,7 @@ protected function _setCookies() { /** * Formats the Content-Type header based on the configured contentType and charset - * the charset will only be set in the header if the response is of type text/* + * the charset will only be set in the header if the response is of type text * * @return void */ @@ -831,7 +832,7 @@ public function sharable($public = null, $time = null) { if (!$public && !$private && !$noCache) { return null; } - $sharable = $public || ! ($private || $noCache); + $sharable = $public || !($private || $noCache); return $sharable; } if ($public) { @@ -1138,7 +1139,7 @@ public function length($bytes = null) { /** * Checks whether a response has not been modified according to the 'If-None-Match' * (Etags) and 'If-Modified-Since' (last modification date) request - * headers headers. If the response is detected to be not modified, it + * headers. If the response is detected to be not modified, it * is marked as so accordingly so the client can be informed of that. * * In order to mark a response as not modified, you need to set at least @@ -1336,7 +1337,7 @@ public function file($path, $options = array()) { 'download' => null ); - if (strpos($path, '..') !== false) { + if (strpos($path, '../') !== false || strpos($path, '..\\') !== false) { throw new NotFoundException(__d( 'cake_dev', 'The requested file contains `..` and will not be read.' @@ -1495,9 +1496,10 @@ protected function _isActive() { * @return bool */ protected function _clearBuffer() { - //@codingStandardsIgnoreStart - return @ob_end_clean(); - //@codingStandardsIgnoreEnd + if (ob_get_length()) { + return ob_end_clean(); + } + return true; } /** diff --git a/lib/Cake/Network/CakeSocket.php b/lib/Cake/Network/CakeSocket.php index 55c45998148..aebdee1913a 100644 --- a/lib/Cake/Network/CakeSocket.php +++ b/lib/Cake/Network/CakeSocket.php @@ -119,7 +119,7 @@ public function __construct($config = array()) { } /** - * Connect the socket to the given host and port. + * Connects the socket to the given host and port. * * @return bool Success * @throws SocketException @@ -130,7 +130,7 @@ public function connect() { } $scheme = null; - if (!empty($this->config['protocol']) && strpos($this->config['host'], '://') === false) { + if (!empty($this->config['protocol']) && strpos($this->config['host'], '://') === false && empty($this->config['proxy'])) { $scheme = $this->config['protocol'] . '://'; } @@ -169,6 +169,28 @@ public function connect() { $this->connected = is_resource($this->connection); if ($this->connected) { stream_set_timeout($this->connection, $this->config['timeout']); + + if (!empty($this->config['request']) && + $this->config['request']['uri']['scheme'] === 'https' && + !empty($this->config['proxy']) + ) { + $req = array(); + $req[] = 'CONNECT ' . $this->config['request']['uri']['host'] . ':' . + $this->config['request']['uri']['port'] . ' HTTP/1.1'; + $req[] = 'Host: ' . $this->config['host']; + $req[] = 'User-Agent: php proxy'; + + fwrite($this->connection, implode("\r\n", $req) . "\r\n\r\n"); + + while (!feof($this->connection)) { + $s = rtrim(fgets($this->connection, 4096)); + if (preg_match('/^$/', $s)) { + break; + } + } + + $this->enableCrypto('tls', 'client'); + } } return $this->connected; } @@ -188,19 +210,19 @@ protected function _connectionErrorHandler($code, $message) { } /** - * Get the connection context. + * Gets the connection context. * * @return null|array Null when there is no connection, an array when there is. */ public function context() { if (!$this->connection) { - return; + return null; } return stream_context_get_options($this->connection); } /** - * Get the host name of the current connection. + * Gets the host name of the current connection. * * @return string Host name */ @@ -212,7 +234,7 @@ public function host() { } /** - * Get the IP address of the current connection. + * Gets the IP address of the current connection. * * @return string IP address */ @@ -224,7 +246,7 @@ public function address() { } /** - * Get all IP addresses associated with the current connection. + * Gets all IP addresses associated with the current connection. * * @return array IP addresses */ @@ -236,7 +258,7 @@ public function addresses() { } /** - * Get the last error as a string. + * Gets the last error as a string. * * @return string|null Last error */ @@ -248,7 +270,7 @@ public function lastError() { } /** - * Set the last error. + * Sets the last error. * * @param int $errNum Error code * @param string $errStr Error string @@ -259,7 +281,7 @@ public function setLastError($errNum, $errStr) { } /** - * Write data to the socket. + * Writes data to the socket. * * @param string $data The data to write to the socket * @return bool Success @@ -281,7 +303,7 @@ public function write($data) { } /** - * Read data from the socket. Returns false if no data is available or no connection could be + * Reads data from the socket. Returns false if no data is available or no connection could be * established. * * @param int $length Optional buffer length to read; defaults to 1024 @@ -307,7 +329,7 @@ public function read($length = 1024) { } /** - * Disconnect the socket from the current connection. + * Disconnects the socket from the current connection. * * @return bool Success */ @@ -353,14 +375,14 @@ public function reset($state = null) { } /** - * Encrypts current stream socket, using one of the defined encryption methods + * Encrypts current stream socket, using one of the defined encryption methods. * - * @param string $type can be one of 'ssl2', 'ssl3', 'ssl23' or 'tls' - * @param string $clientOrServer can be one of 'client', 'server'. Default is 'client' - * @param bool $enable enable or disable encryption. Default is true (enable) + * @param string $type Type which can be one of 'sslv2', 'sslv3', 'sslv23' or 'tls'. + * @param string $clientOrServer Can be one of 'client', 'server'. Default is 'client'. + * @param bool $enable Enable or disable encryption. Default is true (enable) * @return bool True on success * @throws InvalidArgumentException When an invalid encryption scheme is chosen. - * @throws SocketException When attempting to enable SSL/TLS fails + * @throws SocketException When attempting to enable SSL/TLS fails. * @see stream_socket_enable_crypto */ public function enableCrypto($type, $clientOrServer = 'client', $enable = true) { @@ -369,7 +391,8 @@ public function enableCrypto($type, $clientOrServer = 'client', $enable = true) } $enableCryptoResult = false; try { - $enableCryptoResult = stream_socket_enable_crypto($this->connection, $enable, $this->_encryptMethods[$type . '_' . $clientOrServer]); + $enableCryptoResult = stream_socket_enable_crypto($this->connection, $enable, + $this->_encryptMethods[$type . '_' . $clientOrServer]); } catch (Exception $e) { $this->setLastError(null, $e->getMessage()); throw new SocketException($e->getMessage()); diff --git a/lib/Cake/Network/Email/CakeEmail.php b/lib/Cake/Network/Email/CakeEmail.php index 4cae10499fb..027cd539d7f 100644 --- a/lib/Cake/Network/Email/CakeEmail.php +++ b/lib/Cake/Network/Email/CakeEmail.php @@ -17,7 +17,7 @@ App::uses('Multibyte', 'I18n'); App::uses('AbstractTransport', 'Network/Email'); App::uses('File', 'Utility'); -App::uses('String', 'Utility'); +App::uses('CakeText', 'Utility'); App::uses('View', 'View'); /** @@ -336,6 +336,13 @@ class CakeEmail { */ protected $_configClass = 'EmailConfig'; +/** + * An instance of the EmailConfig class can be set here + * + * @var string + */ + protected $_configInstance; + /** * Constructor * @@ -353,6 +360,11 @@ public function __construct($config = null) { if ($config) { $this->config($config); + } elseif (config('email') && class_exists($this->_configClass)) { + $this->_configInstance = new $this->_configClass(); + if (isset($this->_configInstance->default)) { + $this->config('default'); + } } if (empty($this->headerCharset)) { $this->headerCharset = $this->charset; @@ -769,14 +781,14 @@ public function getHeaders($include = array()) { $headers += $this->_headers; if (!isset($headers['X-Mailer'])) { - $headers['X-Mailer'] = self::EMAIL_CLIENT; + $headers['X-Mailer'] = static::EMAIL_CLIENT; } if (!isset($headers['Date'])) { $headers['Date'] = date(DATE_RFC2822); } if ($this->_messageId !== false) { if ($this->_messageId === true) { - $headers['Message-ID'] = '<' . str_replace('-', '', String::UUID()) . '@' . $this->_domain . '>'; + $headers['Message-ID'] = '<' . str_replace('-', '', CakeText::UUID()) . '@' . $this->_domain . '>'; } else { $headers['Message-ID'] = $this->_messageId; } @@ -1101,9 +1113,9 @@ public function addAttachments($attachments) { */ public function message($type = null) { switch ($type) { - case self::MESSAGE_HTML: + case static::MESSAGE_HTML: return $this->_htmlMessage; - case self::MESSAGE_TEXT: + case static::MESSAGE_TEXT: return $this->_textMessage; } return $this->_message; @@ -1223,14 +1235,16 @@ public static function deliver($to = null, $subject = null, $message = null, $tr */ protected function _applyConfig($config) { if (is_string($config)) { - if (!class_exists($this->_configClass) && !config('email')) { - throw new ConfigureException(__d('cake_dev', '%s not found.', APP . 'Config' . DS . 'email.php')); + if (!$this->_configInstance) { + if (!class_exists($this->_configClass) && !config('email')) { + throw new ConfigureException(__d('cake_dev', '%s not found.', APP . 'Config' . DS . 'email.php')); + } + $this->_configInstance = new $this->_configClass(); } - $configs = new $this->_configClass(); - if (!isset($configs->{$config})) { + if (!isset($this->_configInstance->{$config})) { throw new ConfigureException(__d('cake_dev', 'Unknown email configuration "%s".', $config)); } - $config = $configs->{$config}; + $config = $this->_configInstance->{$config}; } $this->_config = $config + $this->_config; if (!empty($config['charset'])) { @@ -1301,7 +1315,7 @@ public function reset() { $this->headerCharset = null; $this->_attachments = array(); $this->_config = array(); - $this->_emailPattern = self::EMAIL_PATTERN; + $this->_emailPattern = static::EMAIL_PATTERN; return $this; } @@ -1421,7 +1435,7 @@ protected function _wrap($message, $wrapLength = CakeEmail::LINE_LENGTH_MUST) { $tmpLine .= $char; $tmpLineLength++; if ($tmpLineLength === $wrapLength) { - $nextChar = $line[$i + 1]; + $nextChar = isset($line[$i + 1]) ? $line[$i + 1] : ''; if ($nextChar === ' ' || $nextChar === '<') { $formatted[] = trim($tmpLine); $tmpLine = ''; diff --git a/lib/Cake/Network/Http/BasicAuthentication.php b/lib/Cake/Network/Http/BasicAuthentication.php index 05588822508..df33252ff42 100644 --- a/lib/Cake/Network/Http/BasicAuthentication.php +++ b/lib/Cake/Network/Http/BasicAuthentication.php @@ -33,7 +33,7 @@ class BasicAuthentication { */ public static function authentication(HttpSocket $http, &$authInfo) { if (isset($authInfo['user'], $authInfo['pass'])) { - $http->request['header']['Authorization'] = self::_generateHeader($authInfo['user'], $authInfo['pass']); + $http->request['header']['Authorization'] = static::_generateHeader($authInfo['user'], $authInfo['pass']); } } @@ -47,7 +47,7 @@ public static function authentication(HttpSocket $http, &$authInfo) { */ public static function proxyAuthentication(HttpSocket $http, &$proxyInfo) { if (isset($proxyInfo['user'], $proxyInfo['pass'])) { - $http->request['header']['Proxy-Authorization'] = self::_generateHeader($proxyInfo['user'], $proxyInfo['pass']); + $http->request['header']['Proxy-Authorization'] = static::_generateHeader($proxyInfo['user'], $proxyInfo['pass']); } } diff --git a/lib/Cake/Network/Http/DigestAuthentication.php b/lib/Cake/Network/Http/DigestAuthentication.php index 2c43a3184ca..f38cfc0faaa 100644 --- a/lib/Cake/Network/Http/DigestAuthentication.php +++ b/lib/Cake/Network/Http/DigestAuthentication.php @@ -33,10 +33,10 @@ class DigestAuthentication { */ public static function authentication(HttpSocket $http, &$authInfo) { if (isset($authInfo['user'], $authInfo['pass'])) { - if (!isset($authInfo['realm']) && !self::_getServerInformation($http, $authInfo)) { + if (!isset($authInfo['realm']) && !static::_getServerInformation($http, $authInfo)) { return; } - $http->request['header']['Authorization'] = self::_generateHeader($http, $authInfo); + $http->request['header']['Authorization'] = static::_generateHeader($http, $authInfo); } } diff --git a/lib/Cake/Network/Http/HttpSocket.php b/lib/Cake/Network/Http/HttpSocket.php index 16fc0edcfc2..0fdf4a12d90 100644 --- a/lib/Cake/Network/Http/HttpSocket.php +++ b/lib/Cake/Network/Http/HttpSocket.php @@ -378,7 +378,7 @@ public function request($request = array()) { $response = null; $inHeader = true; - while ($data = $this->read()) { + while (($data = $this->read()) !== false) { if ($this->_contentResource) { if ($inHeader) { $response .= $data; @@ -652,6 +652,7 @@ protected function _setProxy() { } $this->config['host'] = $this->_proxy['host']; $this->config['port'] = $this->_proxy['port']; + $this->config['proxy'] = true; if (empty($this->_proxy['method']) || !isset($this->_proxy['user'], $this->_proxy['pass'])) { return; @@ -717,6 +718,20 @@ protected function _configContext($host) { } unset($this->config[$key]); } + if (version_compare(PHP_VERSION, '5.3.2', '>=')) { + if (!isset($this->config['context']['ssl']['SNI_enabled'])) { + $this->config['context']['ssl']['SNI_enabled'] = true; + } + if (version_compare(PHP_VERSION, '5.6.0', '>=')) { + if (empty($this->config['context']['ssl']['peer_name'])) { + $this->config['context']['ssl']['peer_name'] = $host; + } + } else { + if (empty($this->config['context']['ssl']['SNI_server_name'])) { + $this->config['context']['ssl']['SNI_server_name'] = $host; + } + } + } if (empty($this->config['context']['ssl']['cafile'])) { $this->config['context']['ssl']['cafile'] = CAKE . 'Config' . DS . 'cacert.pem'; } @@ -926,7 +941,7 @@ protected function _buildRequestLine($request = array()) { $request['uri'] = $this->_parseUri($request['uri']); $request += array('method' => 'GET'); - if (!empty($this->_proxy['host'])) { + if (!empty($this->_proxy['host']) && $request['uri']['scheme'] !== 'https') { $request['uri'] = $this->_buildUri($request['uri'], '%scheme://%host:%port/%path?%query'); } else { $request['uri'] = $this->_buildUri($request['uri'], '/%path?%query'); diff --git a/lib/Cake/Routing/Dispatcher.php b/lib/Cake/Routing/Dispatcher.php index 13e2a2248a9..35a2df21ede 100644 --- a/lib/Cake/Routing/Dispatcher.php +++ b/lib/Cake/Routing/Dispatcher.php @@ -137,7 +137,7 @@ protected function _attachFilters($manager) { * @param CakeRequest $request Request object to dispatch. * @param CakeResponse $response Response object to put the results of the dispatch into. * @param array $additionalParams Settings array ("bare", "return") which is melded with the GET and POST params - * @return string|void if `$request['return']` is set then it returns response body, null otherwise + * @return string|null if `$request['return']` is set then it returns response body, null otherwise * @triggers Dispatcher.beforeDispatch $this, compact('request', 'response', 'additionalParams') * @triggers Dispatcher.afterDispatch $this, compact('request', 'response') * @throws MissingControllerException When the controller is missing. @@ -152,7 +152,7 @@ public function dispatch(CakeRequest $request, CakeResponse $response, $addition return $beforeEvent->result->body(); } $beforeEvent->result->send(); - return; + return null; } $controller = $this->_getController($request, $response); diff --git a/lib/Cake/Routing/Filter/AssetDispatcher.php b/lib/Cake/Routing/Filter/AssetDispatcher.php index 3a4908bcf68..c90a8235c0d 100644 --- a/lib/Cake/Routing/Filter/AssetDispatcher.php +++ b/lib/Cake/Routing/Filter/AssetDispatcher.php @@ -42,7 +42,7 @@ class AssetDispatcher extends DispatcherFilter { public function beforeDispatch(CakeEvent $event) { $url = urldecode($event->data['request']->url); if (strpos($url, '..') !== false || strpos($url, '.') === false) { - return; + return null; } if ($result = $this->_filterAsset($event)) { diff --git a/lib/Cake/Routing/Filter/CacheDispatcher.php b/lib/Cake/Routing/Filter/CacheDispatcher.php index 9219005bbd4..24361bf3bbe 100644 --- a/lib/Cake/Routing/Filter/CacheDispatcher.php +++ b/lib/Cake/Routing/Filter/CacheDispatcher.php @@ -39,7 +39,7 @@ class CacheDispatcher extends DispatcherFilter { */ public function beforeDispatch(CakeEvent $event) { if (Configure::read('Cache.check') !== true) { - return; + return null; } $path = $event->data['request']->here(); diff --git a/lib/Cake/Routing/Router.php b/lib/Cake/Routing/Router.php index 595192f97f3..cfc9bbd1cad 100644 --- a/lib/Cake/Routing/Router.php +++ b/lib/Cake/Routing/Router.php @@ -213,10 +213,10 @@ class Router { */ public static function defaultRouteClass($routeClass = null) { if ($routeClass === null) { - return self::$_routeClass; + return static::$_routeClass; } - self::$_routeClass = self::_validateRouteClass($routeClass); + static::$_routeClass = static::_validateRouteClass($routeClass); } /** @@ -243,7 +243,7 @@ protected static function _validateRouteClass($routeClass) { protected static function _setPrefixes() { $routing = Configure::read('Routing'); if (!empty($routing['prefixes'])) { - self::$_prefixes = array_merge(self::$_prefixes, (array)$routing['prefixes']); + static::$_prefixes = array_merge(static::$_prefixes, (array)$routing['prefixes']); } } @@ -254,7 +254,7 @@ protected static function _setPrefixes() { * @see Router::$_namedExpressions */ public static function getNamedExpressions() { - return self::$_namedExpressions; + return static::$_namedExpressions; } /** @@ -266,9 +266,9 @@ public static function getNamedExpressions() { */ public static function resourceMap($resourceMap = null) { if ($resourceMap === null) { - return self::$_resourceMap; + return static::$_resourceMap; } - self::$_resourceMap = $resourceMap; + static::$_resourceMap = $resourceMap; } /** @@ -342,9 +342,9 @@ public static function resourceMap($resourceMap = null) { * @throws RouterException */ public static function connect($route, $defaults = array(), $options = array()) { - self::$initialized = true; + static::$initialized = true; - foreach (self::$_prefixes as $prefix) { + foreach (static::$_prefixes as $prefix) { if (isset($defaults[$prefix])) { if ($defaults[$prefix]) { $defaults['prefix'] = $prefix; @@ -354,28 +354,28 @@ public static function connect($route, $defaults = array(), $options = array()) break; } } - if (isset($defaults['prefix']) && !in_array($defaults['prefix'], self::$_prefixes)) { - self::$_prefixes[] = $defaults['prefix']; + if (isset($defaults['prefix']) && !in_array($defaults['prefix'], static::$_prefixes)) { + static::$_prefixes[] = $defaults['prefix']; } $defaults += array('plugin' => null); if (empty($options['action'])) { $defaults += array('action' => 'index'); } - $routeClass = self::$_routeClass; + $routeClass = static::$_routeClass; if (isset($options['routeClass'])) { if (strpos($options['routeClass'], '.') === false) { $routeClass = $options['routeClass']; } else { list(, $routeClass) = pluginSplit($options['routeClass'], true); } - $routeClass = self::_validateRouteClass($routeClass); + $routeClass = static::_validateRouteClass($routeClass); unset($options['routeClass']); } if ($routeClass === 'RedirectRoute' && isset($defaults['redirect'])) { $defaults = $defaults['redirect']; } - self::$routes[] = new $routeClass($route, $defaults, $options); - return self::$routes; + static::$routes[] = new $routeClass($route, $defaults, $options); + return static::$routes; } /** @@ -416,7 +416,7 @@ public static function redirect($route, $url, $options = array()) { if (is_string($url)) { $url = array('redirect' => $url); } - return self::connect($route, $url, $options); + return static::connect($route, $url, $options); } /** @@ -473,7 +473,7 @@ public static function redirect($route, $url, $options = array()) { */ public static function connectNamed($named, $options = array()) { if (isset($options['separator'])) { - self::$_namedConfig['separator'] = $options['separator']; + static::$_namedConfig['separator'] = $options['separator']; unset($options['separator']); } @@ -484,23 +484,23 @@ public static function connectNamed($named, $options = array()) { $options += array('default' => false, 'reset' => false, 'greedy' => true); } - if ($options['reset'] || self::$_namedConfig['rules'] === false) { - self::$_namedConfig['rules'] = array(); + if ($options['reset'] || static::$_namedConfig['rules'] === false) { + static::$_namedConfig['rules'] = array(); } if ($options['default']) { - $named = array_merge($named, self::$_namedConfig['default']); + $named = array_merge($named, static::$_namedConfig['default']); } foreach ($named as $key => $val) { if (is_numeric($key)) { - self::$_namedConfig['rules'][$val] = true; + static::$_namedConfig['rules'][$val] = true; } else { - self::$_namedConfig['rules'][$key] = $val; + static::$_namedConfig['rules'][$key] = $val; } } - self::$_namedConfig['greedyNamed'] = $options['greedy']; - return self::$_namedConfig; + static::$_namedConfig['greedyNamed'] = $options['greedy']; + return static::$_namedConfig; } /** @@ -510,7 +510,7 @@ public static function connectNamed($named, $options = array()) { * @see Router::$_namedConfig */ public static function namedConfig() { - return self::$_namedConfig; + return static::$_namedConfig; } /** @@ -533,7 +533,7 @@ public static function mapResources($controller, $options = array()) { $options += array( 'connectOptions' => array(), 'prefix' => '/', - 'id' => self::ID . '|' . self::UUID + 'id' => static::ID . '|' . static::UUID ); $prefix = $options['prefix']; @@ -554,7 +554,7 @@ public static function mapResources($controller, $options = array()) { $prefix = '/' . $plugin . '/'; } - foreach (self::$_resourceMap as $params) { + foreach (static::$_resourceMap as $params) { $url = $prefix . $urlName . (($params['id']) ? '/:id' : ''); Router::connect($url, @@ -570,9 +570,9 @@ public static function mapResources($controller, $options = array()) { ) ); } - self::$_resourceMapped[] = $urlName; + static::$_resourceMapped[] = $urlName; } - return self::$_resourceMapped; + return static::$_resourceMapped; } /** @@ -581,7 +581,7 @@ public static function mapResources($controller, $options = array()) { * @return array A list of prefixes used in connected routes */ public static function prefixes() { - return self::$_prefixes; + return static::$_prefixes; } /** @@ -591,8 +591,8 @@ public static function prefixes() { * @return array Parsed elements from URL */ public static function parse($url) { - if (!self::$initialized) { - self::_loadRoutes(); + if (!static::$initialized) { + static::_loadRoutes(); } $ext = null; @@ -606,11 +606,11 @@ public static function parse($url) { parse_str($queryParameters, $queryParameters); } - extract(self::_parseExtension($url)); + extract(static::_parseExtension($url)); - foreach (self::$routes as $route) { + foreach (static::$routes as $route) { if (($r = $route->parse($url)) !== false) { - self::$_currentRoute[] = $route; + static::$_currentRoute[] = $route; $out = $r; break; } @@ -638,14 +638,14 @@ public static function parse($url) { protected static function _parseExtension($url) { $ext = null; - if (self::$_parseExtensions) { + if (static::$_parseExtensions) { if (preg_match('/\.[0-9a-zA-Z]*$/', $url, $match) === 1) { $match = substr($match[0], 1); - if (empty(self::$_validExtensions)) { + if (empty(static::$_validExtensions)) { $url = substr($url, 0, strpos($url, '.' . $match)); $ext = $match; } else { - foreach (self::$_validExtensions as $name) { + foreach (static::$_validExtensions as $name) { if (strcasecmp($name, $match) === 0) { $url = substr($url, 0, strpos($url, '.' . $name)); $ext = $match; @@ -674,13 +674,13 @@ protected static function _parseExtension($url) { */ public static function setRequestInfo($request) { if ($request instanceof CakeRequest) { - self::$_requests[] = $request; + static::$_requests[] = $request; } else { $requestObj = new CakeRequest(); $request += array(array(), array()); $request[0] += array('controller' => false, 'action' => false, 'plugin' => null); $requestObj->addParams($request[0])->addPaths($request[1]); - self::$_requests[] = $requestObj; + static::$_requests[] = $requestObj; } } @@ -692,7 +692,7 @@ public static function setRequestInfo($request) { * @see Object::requestAction() */ public static function popRequest() { - return array_pop(self::$_requests); + return array_pop(static::$_requests); } /** @@ -703,10 +703,10 @@ public static function popRequest() { */ public static function getRequest($current = false) { if ($current) { - $i = count(self::$_requests) - 1; - return isset(self::$_requests[$i]) ? self::$_requests[$i] : null; + $i = count(static::$_requests) - 1; + return isset(static::$_requests[$i]) ? static::$_requests[$i] : null; } - return isset(self::$_requests[0]) ? self::$_requests[0] : null; + return isset(static::$_requests[0]) ? static::$_requests[0] : null; } /** @@ -716,11 +716,11 @@ public static function getRequest($current = false) { * @return array Parameter information */ public static function getParams($current = false) { - if ($current && self::$_requests) { - return self::$_requests[count(self::$_requests) - 1]->params; + if ($current && static::$_requests) { + return static::$_requests[count(static::$_requests) - 1]->params; } - if (isset(self::$_requests[0])) { - return self::$_requests[0]->params; + if (isset(static::$_requests[0])) { + return static::$_requests[0]->params; } return array(); } @@ -748,12 +748,12 @@ public static function getParam($name = 'controller', $current = false) { */ public static function getPaths($current = false) { if ($current) { - return self::$_requests[count(self::$_requests) - 1]; + return static::$_requests[count(static::$_requests) - 1]; } - if (!isset(self::$_requests[0])) { + if (!isset(static::$_requests[0])) { return array('base' => null); } - return array('base' => self::$_requests[0]->base); + return array('base' => static::$_requests[0]->base); } /** @@ -763,17 +763,17 @@ public static function getPaths($current = false) { * @return void */ public static function reload() { - if (empty(self::$_initialState)) { - self::$_initialState = get_class_vars('Router'); - self::_setPrefixes(); + if (empty(static::$_initialState)) { + static::$_initialState = get_class_vars('Router'); + static::_setPrefixes(); return; } - foreach (self::$_initialState as $key => $val) { + foreach (static::$_initialState as $key => $val) { if ($key !== '_initialState') { - self::${$key} = $val; + static::${$key} = $val; } } - self::_setPrefixes(); + static::_setPrefixes(); } /** @@ -785,14 +785,14 @@ public static function reload() { */ public static function promote($which = null) { if ($which === null) { - $which = count(self::$routes) - 1; + $which = count(static::$routes) - 1; } - if (!isset(self::$routes[$which])) { + if (!isset(static::$routes[$which])) { return false; } - $route =& self::$routes[$which]; - unset(self::$routes[$which]); - array_unshift(self::$routes, $route); + $route =& static::$routes[$which]; + unset(static::$routes[$which]); + array_unshift(static::$routes, $route); return true; } @@ -826,8 +826,8 @@ public static function promote($which = null) { * @return string Full translated URL with base path. */ public static function url($url = null, $full = false) { - if (!self::$initialized) { - self::_loadRoutes(); + if (!static::$initialized) { + static::_loadRoutes(); } $params = array('plugin' => null, 'controller' => null, 'action' => 'index'); @@ -839,8 +839,8 @@ public static function url($url = null, $full = false) { } $path = array('base' => null); - if (!empty(self::$_requests)) { - $request = self::$_requests[count(self::$_requests) - 1]; + if (!empty(static::$_requests)) { + $request = static::$_requests[count(static::$_requests) - 1]; $params = $request->params; $path = array('base' => $request->base, 'here' => $request->here); } @@ -854,7 +854,7 @@ public static function url($url = null, $full = false) { if (empty($url)) { $output = isset($path['here']) ? $path['here'] : '/'; if ($full) { - $output = self::fullBaseUrl() . $output; + $output = static::fullBaseUrl() . $output; } return $output; } elseif (is_array($url)) { @@ -886,8 +886,8 @@ public static function url($url = null, $full = false) { } } - $prefixExists = (array_intersect_key($url, array_flip(self::$_prefixes))); - foreach (self::$_prefixes as $prefix) { + $prefixExists = (array_intersect_key($url, array_flip(static::$_prefixes))); + foreach (static::$_prefixes as $prefix) { if (!empty($params[$prefix]) && !$prefixExists) { $url[$prefix] = true; } elseif (isset($url[$prefix]) && !$url[$prefix]) { @@ -902,7 +902,7 @@ public static function url($url = null, $full = false) { $match = false; - foreach (self::$routes as $route) { + foreach (static::$routes as $route) { $originalUrl = $url; $url = $route->persistParams($url, $params); @@ -914,7 +914,7 @@ public static function url($url = null, $full = false) { $url = $originalUrl; } if ($match === false) { - $output = self::_handleNoRoute($url); + $output = static::_handleNoRoute($url); } } else { if (preg_match('/^([a-z][a-z0-9.+\-]+:|:?\/\/|[#?])/i', $url)) { @@ -923,7 +923,7 @@ public static function url($url = null, $full = false) { if (substr($url, 0, 1) === '/') { $output = substr($url, 1); } else { - foreach (self::$_prefixes as $prefix) { + foreach (static::$_prefixes as $prefix) { if (isset($params[$prefix])) { $output .= $prefix . '/'; break; @@ -940,13 +940,13 @@ public static function url($url = null, $full = false) { $output = str_replace('//', '/', $base . '/' . $output); if ($full) { - $output = self::fullBaseUrl() . $output; + $output = static::fullBaseUrl() . $output; } if (!empty($extension)) { $output = rtrim($output, '/'); } } - return $output . $extension . self::queryString($q, array(), $escape) . $frag; + return $output . $extension . static::queryString($q, array(), $escape) . $frag; } /** @@ -966,13 +966,13 @@ public static function url($url = null, $full = false) { */ public static function fullBaseUrl($base = null) { if ($base !== null) { - self::$_fullBaseUrl = $base; + static::$_fullBaseUrl = $base; Configure::write('App.fullBaseUrl', $base); } - if (empty(self::$_fullBaseUrl)) { - self::$_fullBaseUrl = Configure::read('App.fullBaseUrl'); + if (empty(static::$_fullBaseUrl)) { + static::$_fullBaseUrl = Configure::read('App.fullBaseUrl'); } - return self::$_fullBaseUrl; + return static::$_fullBaseUrl; } /** @@ -987,7 +987,7 @@ protected static function _handleNoRoute($url) { $named = $args = array(); $skip = array_merge( array('bare', 'action', 'controller', 'plugin', 'prefix'), - self::$_prefixes + static::$_prefixes ); $keys = array_values(array_diff(array_keys($url), $skip)); @@ -1002,7 +1002,7 @@ protected static function _handleNoRoute($url) { } list($args, $named) = array(Hash::filter($args), Hash::filter($named)); - foreach (self::$_prefixes as $prefix) { + foreach (static::$_prefixes as $prefix) { $prefixed = $prefix . '_'; if (!empty($url[$prefix]) && strpos($url['action'], $prefixed) === 0) { $url['action'] = substr($url['action'], strlen($prefixed) * -1); @@ -1020,7 +1020,7 @@ protected static function _handleNoRoute($url) { array_unshift($urlOut, $url['plugin']); } - foreach (self::$_prefixes as $prefix) { + foreach (static::$_prefixes as $prefix) { if (isset($url[$prefix])) { array_unshift($urlOut, $prefix); break; @@ -1037,10 +1037,10 @@ protected static function _handleNoRoute($url) { if (is_array($value)) { $flattend = Hash::flatten($value, '%5D%5B'); foreach ($flattend as $namedKey => $namedValue) { - $output .= '/' . $name . "%5B{$namedKey}%5D" . self::$_namedConfig['separator'] . rawurlencode($namedValue); + $output .= '/' . $name . "%5B{$namedKey}%5D" . static::$_namedConfig['separator'] . rawurlencode($namedValue); } } else { - $output .= '/' . $name . self::$_namedConfig['separator'] . rawurlencode($value); + $output .= '/' . $name . static::$_namedConfig['separator'] . rawurlencode($value); } } } @@ -1163,7 +1163,7 @@ public static function normalize($url = '/') { * @return CakeRoute Matching route object. */ public static function requestRoute() { - return self::$_currentRoute[0]; + return static::$_currentRoute[0]; } /** @@ -1172,8 +1172,8 @@ public static function requestRoute() { * @return CakeRoute Matching route object. */ public static function currentRoute() { - $count = count(self::$_currentRoute) - 1; - return ($count >= 0) ? self::$_currentRoute[$count] : false; + $count = count(static::$_currentRoute) - 1; + return ($count >= 0) ? static::$_currentRoute[$count] : false; } /** @@ -1215,9 +1215,9 @@ public static function stripPlugin($base, $plugin = null) { * @see RequestHandler::startup() */ public static function parseExtensions() { - self::$_parseExtensions = true; + static::$_parseExtensions = true; if (func_num_args() > 0) { - self::setExtensions(func_get_args(), false); + static::setExtensions(func_get_args(), false); } } @@ -1230,11 +1230,11 @@ public static function parseExtensions() { * @return array Array of extensions Router is configured to parse. */ public static function extensions() { - if (!self::$initialized) { - self::_loadRoutes(); + if (!static::$initialized) { + static::_loadRoutes(); } - return self::$_validExtensions; + return static::$_validExtensions; } /** @@ -1248,12 +1248,12 @@ public static function extensions() { */ public static function setExtensions($extensions, $merge = true) { if (!is_array($extensions)) { - return self::$_validExtensions; + return static::$_validExtensions; } if (!$merge) { - return self::$_validExtensions = $extensions; + return static::$_validExtensions = $extensions; } - return self::$_validExtensions = array_merge(self::$_validExtensions, $extensions); + return static::$_validExtensions = array_merge(static::$_validExtensions, $extensions); } /** @@ -1262,7 +1262,7 @@ public static function setExtensions($extensions, $merge = true) { * @return void */ protected static function _loadRoutes() { - self::$initialized = true; + static::$initialized = true; include APP . 'Config' . DS . 'routes.php'; } diff --git a/lib/Cake/Test/Case/BasicsTest.php b/lib/Cake/Test/Case/BasicsTest.php index 25b9e339529..65821693ed3 100644 --- a/lib/Cake/Test/Case/BasicsTest.php +++ b/lib/Cake/Test/Case/BasicsTest.php @@ -952,7 +952,7 @@ public function testDebug() { ########################### EXPECTED; - if (php_sapi_name() === 'cli') { + if (PHP_SAPI === 'cli') { $expected = sprintf($expectedText, str_replace(CAKE_CORE_INCLUDE_PATH, '', __FILE__), __LINE__ - 18); } else { $expected = sprintf($expectedHtml, str_replace(CAKE_CORE_INCLUDE_PATH, '', __FILE__), __LINE__ - 20); @@ -977,7 +977,7 @@ public function testDebug() { ########################### EXPECTED; - if (php_sapi_name() === 'cli') { + if (PHP_SAPI === 'cli') { $expected = sprintf($expectedText, str_replace(CAKE_CORE_INCLUDE_PATH, '', __FILE__), __LINE__ - 18); } else { $expected = sprintf($expectedHtml, str_replace(CAKE_CORE_INCLUDE_PATH, '', __FILE__), __LINE__ - 19); @@ -1043,7 +1043,7 @@ public function testDebug() { * @return void */ public function testPr() { - $this->skipIf(php_sapi_name() === 'cli', 'Skipping web test in cli mode'); + $this->skipIf(PHP_SAPI === 'cli', 'Skipping web test in cli mode'); ob_start(); pr('this is a test'); $result = ob_get_clean(); @@ -1063,7 +1063,7 @@ public function testPr() { * @return void */ public function testPrCli() { - $this->skipIf(php_sapi_name() != 'cli', 'Skipping cli test in web mode'); + $this->skipIf(PHP_SAPI !== 'cli', 'Skipping cli test in web mode'); ob_start(); pr('this is a test'); $result = ob_get_clean(); diff --git a/lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php index 91f019b6242..9c56241c2ad 100644 --- a/lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php +++ b/lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php @@ -34,7 +34,7 @@ public function setUp() { parent::setUp(); $this->skipIf(!function_exists('apc_store'), 'Apc is not installed or configured properly.'); - if (php_sapi_name() === 'cli') { + if (PHP_SAPI === 'cli') { $this->skipIf(!ini_get('apc.enable_cli'), 'APC is not enabled for the CLI.'); } diff --git a/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php index fbe99dbbb9a..36f8f0d8bd3 100644 --- a/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php +++ b/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php @@ -161,6 +161,17 @@ public function testConnectIpv6() { $this->assertTrue($result); } +/** + * test domain starts with u + * + * @return void + */ + public function testParseServerStringWithU() { + $Memcached = new TestMemcachedEngine(); + $result = $Memcached->parseServerString('udomain.net:13211'); + $this->assertEquals(array('udomain.net', '13211'), $result); + } + /** * test non latin domains. * diff --git a/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php index 4f940ef41d3..17f1f99727d 100644 --- a/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php +++ b/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php @@ -400,6 +400,17 @@ public function testConnectIpv6() { $this->assertTrue($result); } +/** + * test domain starts with u + * + * @return void + */ + public function testParseServerStringWithU() { + $Memcached = new TestMemcachedEngine(); + $result = $Memcached->parseServerString('udomain.net:13211'); + $this->assertEquals(array('udomain.net', '13211'), $result); + } + /** * test non latin domains. * diff --git a/lib/Cake/Test/Case/Console/Command/CompletionShellTest.php b/lib/Cake/Test/Case/Console/Command/CompletionShellTest.php index 7ef3ef53a01..b28db0c65cd 100644 --- a/lib/Cake/Test/Case/Console/Command/CompletionShellTest.php +++ b/lib/Cake/Test/Case/Console/Command/CompletionShellTest.php @@ -125,7 +125,7 @@ public function testCommands() { $this->Shell->runCommand('commands', array()); $output = $this->Shell->stdout->output; - $expected = "TestPlugin.example TestPluginTwo.example TestPluginTwo.welcome acl api bake command_list completion console i18n schema server test testsuite upgrade sample\n"; + $expected = "TestPlugin.example TestPlugin.test_plugin TestPluginTwo.example TestPluginTwo.welcome acl api bake command_list completion console i18n schema server test testsuite upgrade sample\n"; $this->assertEquals($expected, $output); } diff --git a/lib/Cake/Test/Case/Console/Command/Task/CommandTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/CommandTaskTest.php index 6a129325913..1aa91ffd72e 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/CommandTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/CommandTaskTest.php @@ -85,9 +85,10 @@ public function testGetShellList() { 'upgrade' ), 'TestPlugin' => array( - 'example' + 'example', + 'test_plugin' ), - 'TestPluginTwo' => array( + 'TestPluginTwo' => array( 'example', 'welcome' ), @@ -108,6 +109,7 @@ public function testCommands() { $expected = array( 'TestPlugin.example', + 'TestPlugin.test_plugin', 'TestPluginTwo.example', 'TestPluginTwo.welcome', 'acl', diff --git a/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php index ded7e9596e7..9d8c9e2b28d 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php @@ -222,7 +222,7 @@ public function testDoHelpersTrailingCommas() { public function testDoComponentsNo() { $this->Task->expects($this->any())->method('in')->will($this->returnValue('n')); $result = $this->Task->doComponents(); - $this->assertSame(array('Paginator'), $result); + $this->assertSame(array('Paginator', 'Flash'), $result); } /** @@ -235,7 +235,7 @@ public function testDoComponentsTrailingSpaces() { $this->Task->expects($this->at(1))->method('in')->will($this->returnValue(' RequestHandler, Security ')); $result = $this->Task->doComponents(); - $expected = array('Paginator', 'RequestHandler', 'Security'); + $expected = array('Paginator', 'Flash', 'RequestHandler', 'Security'); $this->assertEquals($expected, $result); } @@ -249,7 +249,7 @@ public function testDoComponentsTrailingCommas() { $this->Task->expects($this->at(1))->method('in')->will($this->returnValue(' RequestHandler, Security, , ')); $result = $this->Task->doComponents(); - $expected = array('Paginator', 'RequestHandler', 'Security'); + $expected = array('Paginator', 'Flash', 'RequestHandler', 'Security'); $this->assertEquals($expected, $result); } diff --git a/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php index 238803acf74..363afb2ffe4 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php @@ -162,19 +162,19 @@ public function testExecute() { $this->assertContains('msgid "double \\"quoted\\""', $result, 'Strings with quotes not handled correctly'); $this->assertContains("msgid \"single 'quoted'\"", $result, 'Strings with quotes not handled correctly'); - $pattern = '/\#: (\\\\|\/)extract\.ctp:34\nmsgid "letter"/'; + $pattern = '/\#: (\\\\|\/)extract\.ctp:36\nmsgid "letter"/'; $this->assertRegExp($pattern, $result, 'Strings with context should not overwrite strings without context'); - $pattern = '/\#: (\\\\|\/)extract\.ctp:35;37\nmsgctxt "A"\nmsgid "letter"/'; + $pattern = '/\#: (\\\\|\/)extract\.ctp:37;39\nmsgctxt "A"\nmsgid "letter"/'; $this->assertRegExp($pattern, $result, 'Should contain string with context "A"'); - $pattern = '/\#: (\\\\|\/)extract\.ctp:36\nmsgctxt "B"\nmsgid "letter"/'; + $pattern = '/\#: (\\\\|\/)extract\.ctp:38\nmsgctxt "B"\nmsgid "letter"/'; $this->assertRegExp($pattern, $result, 'Should contain string with context "B"'); - $pattern = '/\#: (\\\\|\/)extract\.ctp:38\nmsgid "%d letter"\nmsgid_plural "%d letters"/'; + $pattern = '/\#: (\\\\|\/)extract\.ctp:40\nmsgid "%d letter"\nmsgid_plural "%d letters"/'; $this->assertRegExp($pattern, $result, 'Plural strings with context should not overwrite strings without context'); - $pattern = '/\#: (\\\\|\/)extract\.ctp:39\nmsgctxt "A"\nmsgid "%d letter"\nmsgid_plural "%d letters"/'; + $pattern = '/\#: (\\\\|\/)extract\.ctp:41\nmsgctxt "A"\nmsgid "%d letter"\nmsgid_plural "%d letters"/'; $this->assertRegExp($pattern, $result, 'Should contain plural string with context "A"'); // extract.ctp - reading the domain.pot @@ -209,12 +209,16 @@ public function testExtractCategory() { $this->Task->expects($this->never())->method('_stop'); $this->Task->execute(); - $this->assertTrue(file_exists($this->path . DS . 'LC_TIME' . DS . 'default.pot')); + $this->assertTrue(file_exists($this->path . DS . 'LC_NUMERIC' . DS . 'default.pot')); + $this->assertFalse(file_exists($this->path . DS . 'LC_TIME' . DS . 'default.pot')); $result = file_get_contents($this->path . DS . 'default.pot'); $pattern = '/\#: .*extract\.ctp:31\n/'; $this->assertNotRegExp($pattern, $result); + + $pattern = '/\#: .*extract\.ctp:33\n/'; + $this->assertNotRegExp($pattern, $result); } /** diff --git a/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php index dd62bd5f6f5..a649b7b7583 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php @@ -186,6 +186,9 @@ public function testImportRecordsFromDatabaseWithConditionsPoo() { $this->Task->interactive = true; $this->Task->expects($this->at(0))->method('in') ->will($this->returnValue('WHERE 1=1')); + $this->Task->expects($this->at(1))->method('in') + ->with($this->anything(), $this->anything(), '3') + ->will($this->returnValue('2')); $this->Task->connection = 'test'; $this->Task->path = '/my/path/'; @@ -197,9 +200,8 @@ public function testImportRecordsFromDatabaseWithConditionsPoo() { $this->assertContains('class ArticleFixture extends CakeTestFixture', $result); $this->assertContains('public $records', $result); $this->assertContains('public $import', $result); - $this->assertContains("'title' => 'First Article'", $result, 'Missing import data %s'); - $this->assertContains('Second Article', $result, 'Missing import data %s'); - $this->assertContains('Third Article', $result, 'Missing import data %s'); + $this->assertContains("'title' => 'First Article'", $result, 'Missing import data'); + $this->assertContains('Second Article', $result, 'Missing import data'); } /** diff --git a/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php index ce2258bb878..e1b3625a0ab 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php @@ -268,7 +268,7 @@ public function testGetTableOddTable() { */ public function testInitValidations() { $result = $this->Task->initValidations(); - $this->assertTrue(in_array('notEmpty', $result)); + $this->assertTrue(in_array('notBlank', $result)); } /** @@ -282,7 +282,7 @@ public function testFieldValidationGuessing() { $this->Task->initValidations(); $result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false)); - $expected = array('notEmpty' => 'notEmpty'); + $expected = array('notBlank' => 'notBlank'); $this->assertEquals($expected, $result); $result = $this->Task->fieldValidation('text', array('type' => 'date', 'length' => 10, 'null' => false)); @@ -315,10 +315,10 @@ public function testInteractiveFieldValidation() { $this->Task->initValidations(); $this->Task->interactive = true; $this->Task->expects($this->any())->method('in') - ->will($this->onConsecutiveCalls('25', 'y', '19', 'n')); + ->will($this->onConsecutiveCalls('24', 'y', '18', 'n')); $result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false)); - $expected = array('notEmpty' => 'notEmpty', 'maxLength' => 'maxLength'); + $expected = array('notBlank' => 'notBlank', 'maxLength' => 'maxLength'); $this->assertEquals($expected, $result); } @@ -333,13 +333,13 @@ public function testInteractiveFieldValidationWithBogusResponse() { $this->Task->interactive = true; $this->Task->expects($this->any())->method('in') - ->will($this->onConsecutiveCalls('999999', '25', 'n')); + ->will($this->onConsecutiveCalls('999999', '24', 'n')); $this->Task->expects($this->at(10))->method('out') ->with($this->stringContains('make a valid')); $result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false)); - $expected = array('notEmpty' => 'notEmpty'); + $expected = array('notBlank' => 'notBlank'); $this->assertEquals($expected, $result); } @@ -368,10 +368,10 @@ public function testSkippingChoiceInteractiveFieldValidation() { $this->Task->initValidations(); $this->Task->interactive = true; $this->Task->expects($this->any())->method('in') - ->will($this->onConsecutiveCalls('25', 'y', 's')); + ->will($this->onConsecutiveCalls('24', 'y', 's')); $result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false)); - $expected = array('notEmpty' => 'notEmpty', '_skipFields' => true); + $expected = array('notBlank' => 'notBlank', '_skipFields' => true); $this->assertEquals($expected, $result); } @@ -384,10 +384,10 @@ public function testSkippingAnotherInteractiveFieldValidation() { $this->Task->initValidations(); $this->Task->interactive = true; $this->Task->expects($this->any())->method('in') - ->will($this->onConsecutiveCalls('25', 's')); + ->will($this->onConsecutiveCalls('24', 's')); $result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false)); - $expected = array('notEmpty' => 'notEmpty', '_skipFields' => true); + $expected = array('notBlank' => 'notBlank', '_skipFields' => true); $this->assertEquals($expected, $result); } @@ -400,7 +400,7 @@ public function testSkippingAnotherInteractiveFieldValidation() { public function testInteractiveDoValidationWithSkipping() { $this->Task->expects($this->any()) ->method('in') - ->will($this->onConsecutiveCalls('36', '25', 'n', '11', 's')); + ->will($this->onConsecutiveCalls('34', '24', 'n', '10', 's')); $this->Task->interactive = true; $Model = $this->getMock('Model'); $Model->primaryKey = 'id'; @@ -444,7 +444,7 @@ public function testInteractiveDoValidationWithSkipping() { $result = $this->Task->doValidation($Model); $expected = array( 'name' => array( - 'notEmpty' => 'notEmpty' + 'notBlank' => 'notBlank' ), 'email' => array( 'email' => 'email', @@ -502,7 +502,7 @@ public function testNonInteractiveDoValidation() { $result = $this->Task->doValidation($Model); $expected = array( 'name' => array( - 'notEmpty' => 'notEmpty' + 'notBlank' => 'notBlank' ), 'email' => array( 'email' => 'email', @@ -838,7 +838,7 @@ public function testInOptions() { public function testBakeValidation() { $validate = array( 'name' => array( - 'notempty' => 'notEmpty' + 'notBlank' => 'notBlank' ), 'email' => array( 'email' => 'email', @@ -855,8 +855,8 @@ public function testBakeValidation() { $this->assertRegExp('/\$validate \= array\(/', $result); $expected = <<< STRINGEND array( - 'notempty' => array( - 'rule' => array('notEmpty'), + 'notBlank' => array( + 'rule' => array('notBlank'), //'message' => 'Your custom message here', //'allowEmpty' => false, //'required' => false, diff --git a/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php index 38c243d21a5..3405a454435 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php @@ -58,7 +58,7 @@ public function setUp() { array_splice($paths, $i, 1); } } - $this->_testPath = array_push($paths, TMP . 'tests' . DS); + $this->_testPath = array_push($paths, TMP . 'tests' . DS) - 1; App::build(array('plugins' => $paths)); } @@ -80,17 +80,23 @@ public function tearDown() { * @return void */ public function testBakeFoldersAndFiles() { - $this->Task->expects($this->at(0))->method('in')->will($this->returnValue($this->_testPath)); - $this->Task->expects($this->at(1))->method('in')->will($this->returnValue('y')); + $this->Task->expects($this->at(0)) + ->method('in') + ->will($this->returnValue($this->_testPath)); + $this->Task->expects($this->at(1)) + ->method('in') + ->will($this->returnValue('y')); $path = $this->Task->path . 'BakeTestPlugin'; $file = $path . DS . 'Controller' . DS . 'BakeTestPluginAppController.php'; - $this->Task->expects($this->at(2))->method('createFile') + $this->Task->expects($this->at(2)) + ->method('createFile') ->with($file, new PHPUnit_Framework_Constraint_IsAnything()); $file = $path . DS . 'Model' . DS . 'BakeTestPluginAppModel.php'; - $this->Task->expects($this->at(3))->method('createFile') + $this->Task->expects($this->at(3)) + ->method('createFile') ->with($file, new PHPUnit_Framework_Constraint_IsAnything()); $this->Task->bake('BakeTestPlugin'); @@ -115,7 +121,7 @@ public function testBakeFoldersAndFiles() { 'Test' . DS . 'Fixture', 'View' . DS . 'Elements', 'View' . DS . 'Helper', - 'View' . DS . 'Layout', + 'View' . DS . 'Layouts', 'webroot' . DS . 'css', 'webroot' . DS . 'js', 'webroot' . DS . 'img', diff --git a/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php index b288b9cd7c2..15ec7679825 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php @@ -197,7 +197,6 @@ public function testBakeEmptyFlag() { 'Test' . DS . 'Case' . DS . 'View' . DS . 'Helper' => 'empty', 'Test' . DS . 'Fixture' => 'empty', 'Vendor' => 'empty', - 'View' . DS . 'Elements' => 'empty', 'View' . DS . 'Scaffolds' => 'empty', 'tmp' . DS . 'cache' . DS . 'models' => 'empty', 'tmp' . DS . 'cache' . DS . 'persistent' => 'empty', diff --git a/lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php index 6b02d12bac4..c5ab4762f84 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php @@ -323,10 +323,11 @@ public function testBakeEdit() { public function testBakeIndex() { $this->Task->controllerName = 'ViewTaskComments'; + $expected = file_get_contents(CAKE . 'Test' . DS . 'bake_compare' . DS . 'View' . DS . 'index.ctp'); $this->Task->expects($this->at(0))->method('createFile') ->with( TMP . 'ViewTaskComments' . DS . 'index.ctp', - $this->stringContains("\$viewTaskComment['Article']['title']") + $expected ); $this->Task->bake('index', true); } diff --git a/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php b/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php index 0b68f999a70..5a194db086f 100644 --- a/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php +++ b/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php @@ -37,7 +37,7 @@ public function testDescription() { $this->assertEquals($parser, $result, 'Setting description is not chainable'); $this->assertEquals('A test', $parser->description(), 'getting value is wrong.'); - $result = $parser->description(array('A test', 'something')); + $parser->description(array('A test', 'something')); $this->assertEquals("A test\nsomething", $parser->description(), 'getting value is wrong.'); } @@ -53,7 +53,7 @@ public function testEpilog() { $this->assertEquals($parser, $result, 'Setting epilog is not chainable'); $this->assertEquals('A test', $parser->epilog(), 'getting value is wrong.'); - $result = $parser->epilog(array('A test', 'something')); + $parser->epilog(array('A test', 'something')); $this->assertEquals("A test\nsomething", $parser->epilog(), 'getting value is wrong.'); } @@ -294,7 +294,7 @@ public function testOptionWithChoices() { $expected = array('name' => 'mark', 'help' => false); $this->assertEquals($expected, $result[0], 'Got the correct value.'); - $result = $parser->parse(array('--name', 'jimmy')); + $parser->parse(array('--name', 'jimmy')); } /** @@ -384,7 +384,7 @@ public function testParseArgumentTooMany() { $result = $parser->parse($expected); $this->assertEquals($expected, $result[1], 'Arguments are not as expected'); - $result = $parser->parse(array('one', 'two', 'three')); + $parser->parse(array('one', 'two', 'three')); } /** @@ -430,7 +430,7 @@ public function testPositionalArgWithChoices() { $expected = array('mark', 'samurai', 'sword'); $this->assertEquals($expected, $result[1], 'Got the correct value.'); - $result = $parser->parse(array('jose', 'coder')); + $parser->parse(array('jose', 'coder')); } /** diff --git a/lib/Cake/Test/Case/Console/ConsoleOutputTest.php b/lib/Cake/Test/Case/Console/ConsoleOutputTest.php index 4b26aae250d..5eabefd5847 100644 --- a/lib/Cake/Test/Case/Console/ConsoleOutputTest.php +++ b/lib/Cake/Test/Case/Console/ConsoleOutputTest.php @@ -231,6 +231,17 @@ public function testOutputAsPlain() { $this->output->write('Bad Regular', false); } +/** + * test plain output when php://output, as php://output is + * not compatible with posix_ functions. + * + * @return void + */ + public function testOutputAsPlainWhenOutputStream() { + $output = $this->getMock('ConsoleOutput', array('_write'), array('php://output')); + $this->assertEquals(ConsoleOutput::PLAIN, $output->outputAs()); + } + /** * test plain output only strips tags used for formatting. * diff --git a/lib/Cake/Test/Case/Console/ShellDispatcherTest.php b/lib/Cake/Test/Case/Console/ShellDispatcherTest.php index 2d3aa5bf59a..20473db635e 100644 --- a/lib/Cake/Test/Case/Console/ShellDispatcherTest.php +++ b/lib/Cake/Test/Case/Console/ShellDispatcherTest.php @@ -427,6 +427,14 @@ public function testGetShell() { $Dispatcher = new TestShellDispatcher(); $result = $Dispatcher->getShell('TestPlugin.example'); $this->assertInstanceOf('ExampleShell', $result); + + $Dispatcher = new TestShellDispatcher(); + $result = $Dispatcher->getShell('test_plugin'); + $this->assertInstanceOf('TestPluginShell', $result); + + $Dispatcher = new TestShellDispatcher(); + $result = $Dispatcher->getShell('TestPlugin'); + $this->assertInstanceOf('TestPluginShell', $result); } /** diff --git a/lib/Cake/Test/Case/Console/ShellTest.php b/lib/Cake/Test/Case/Console/ShellTest.php index bfd8c9e4e9e..c7f5d86f70d 100644 --- a/lib/Cake/Test/Case/Console/ShellTest.php +++ b/lib/Cake/Test/Case/Console/ShellTest.php @@ -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'; @@ -855,6 +855,51 @@ public function testShellNaming() { $this->assertEquals($expected, $this->Shell->TestApple->name); } +/** + * Test reading params + * + * @dataProvider paramReadingDataProvider + */ + public function testParamReading($toRead, $expected) { + $this->Shell->params = array( + 'key' => 'value', + 'help' => false, + 'emptykey' => '', + 'truthy' => true + ); + $this->assertSame($expected, $this->Shell->param($toRead)); + } + +/** + * Data provider for testing reading values with Shell::param() + * + * @return array + */ + public function paramReadingDataProvider() { + return array( + array( + 'key', + 'value', + ), + array( + 'help', + false, + ), + array( + 'emptykey', + '', + ), + array( + 'truthy', + true, + ), + array( + 'does_not_exist', + null, + ) + ); + } + /** * Test that option parsers are created with the correct name/command. * diff --git a/lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php b/lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php index d4f2b6347d6..b1f927a5832 100644 --- a/lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php +++ b/lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php @@ -155,7 +155,6 @@ class DbAclTwoTest extends DbAcl { /** * construct method - * */ public function __construct() { $this->Aro = new AroTwoTest(); diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php index c4402a7f7ba..df18703c409 100644 --- a/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php +++ b/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php @@ -254,7 +254,11 @@ public function testAuthenticateUserFieldsSuccess() { */ public function testAuthenticateUserFieldsRelatedModelsSuccess() { $User = ClassRegistry::init('User'); - $User->bindModel(array('hasOne' => array('Article'))); + $User->bindModel(array('hasOne' => array( + 'Article' => array( + 'order' => 'Article.id ASC' + ) + ))); $this->auth->settings['recursive'] = 0; $this->auth->settings['userFields'] = array('Article.id', 'Article.title'); $request = new CakeRequest('posts/index', false); diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/BlowfishAuthenticateTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/BlowfishAuthenticateTest.php index 747f0c9e8eb..7fc200db114 100644 --- a/lib/Cake/Test/Case/Controller/Component/Auth/BlowfishAuthenticateTest.php +++ b/lib/Cake/Test/Case/Controller/Component/Auth/BlowfishAuthenticateTest.php @@ -200,7 +200,7 @@ public function testPluginModel() { 'username' => 'gwoo', 'created' => '2007-03-17 01:16:23' ); - $this->assertEquals(self::date(), $result['updated']); + $this->assertEquals(static::date(), $result['updated']); unset($result['updated']); $this->assertEquals($expected, $result); CakePlugin::unload(); diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php index 8c57c6e766b..80bb5c25860 100644 --- a/lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php +++ b/lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php @@ -45,6 +45,8 @@ public function setUp() { } /** + * testControllerTypeError + * * @expectedException PHPUnit_Framework_Error * @return void */ @@ -53,6 +55,8 @@ public function testControllerTypeError() { } /** + * testControllerErrorOnMissingMethod + * * @expectedException CakeException * @return void */ diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticateTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticateTest.php index a8a17b2b860..9b0a196f1af 100644 --- a/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticateTest.php +++ b/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticateTest.php @@ -288,7 +288,7 @@ public function testPluginModel() { 'username' => 'gwoo', 'created' => '2007-03-17 01:16:23' ); - $this->assertEquals(self::date(), $result['updated']); + $this->assertEquals(static::date(), $result['updated']); unset($result['updated']); $this->assertEquals($expected, $result); CakePlugin::unload(); diff --git a/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php b/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php index 89341b4e0cd..8faae470ade 100644 --- a/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php +++ b/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php @@ -125,7 +125,7 @@ protected function _stop($status = 0) { } public static function clearUser() { - self::$_user = array(); + static::$_user = array(); } } @@ -165,7 +165,7 @@ class AuthTestController extends Controller { * * @var array */ - public $components = array('Session', 'Auth'); + public $components = array('Session', 'Flash', 'Auth'); /** * testUrl property @@ -176,7 +176,6 @@ class AuthTestController extends Controller { /** * construct method - * */ public function __construct($request, $response) { $request->addParams(Router::parse('/auth_test')); @@ -1093,9 +1092,9 @@ public function testRedirectToUnauthorizedRedirect() { array('on', 'redirect'), array($CakeRequest, $CakeResponse) ); - $this->Auth->Session = $this->getMock( - 'SessionComponent', - array('setFlash'), + $this->Auth->Flash = $this->getMock( + 'FlashComponent', + array('set'), array($Controller->Components) ); @@ -1105,8 +1104,8 @@ public function testRedirectToUnauthorizedRedirect() { $Controller->expects($this->once()) ->method('redirect') ->with($this->equalTo($expected)); - $this->Auth->Session->expects($this->once()) - ->method('setFlash'); + $this->Auth->Flash->expects($this->once()) + ->method('set'); $this->Auth->startup($Controller); } @@ -1132,9 +1131,9 @@ public function testRedirectToUnauthorizedRedirectSuppressedAuthError() { array('on', 'redirect'), array($CakeRequest, $CakeResponse) ); - $this->Auth->Session = $this->getMock( - 'SessionComponent', - array('setFlash'), + $this->Auth->Flash = $this->getMock( + 'FlashComponent', + array('set'), array($Controller->Components) ); @@ -1144,8 +1143,8 @@ public function testRedirectToUnauthorizedRedirectSuppressedAuthError() { $Controller->expects($this->once()) ->method('redirect') ->with($this->equalTo($expected)); - $this->Auth->Session->expects($this->never()) - ->method('setFlash'); + $this->Auth->Flash->expects($this->never()) + ->method('set'); $this->Auth->startup($Controller); } @@ -1282,14 +1281,47 @@ public function testAjaxLoginResponseCode() { $this->Controller->response = $this->getMock('CakeResponse', array('_sendHeader')); $this->Controller->response->expects($this->at(0)) - ->method('_sendHeader') - ->with('HTTP/1.1 403 Forbidden', null); + ->method('_sendHeader') + ->with('HTTP/1.1 403 Forbidden', null); $this->Auth->initialize($this->Controller); + ob_start(); $result = $this->Auth->startup($this->Controller); + ob_end_clean(); $this->assertFalse($result); $this->assertEquals('this is the test element', $this->Controller->response->body()); + $this->assertArrayNotHasKey('Location', $this->Controller->response->header()); + $this->assertNull($this->Controller->testUrl, 'redirect() not called'); + unset($_SERVER['HTTP_X_REQUESTED_WITH']); + } + +/** + * test ajax login with no element + * + * @return void + */ + public function testAjaxLoginResponseCodeNoElement() { + $_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'; + + $url = '/ajax_auth/add'; + $this->Auth->request->addParams(Router::parse($url)); + $this->Auth->request->query['url'] = ltrim($url, '/'); + $this->Auth->request->base = ''; + $this->Auth->ajaxLogin = false; + + Router::setRequestInfo($this->Auth->request); + + $this->Controller->response = $this->getMock('CakeResponse', array('_sendHeader')); + $this->Controller->response->expects($this->at(0)) + ->method('_sendHeader') + ->with('HTTP/1.1 403 Forbidden', null); + $this->Auth->initialize($this->Controller); + + $this->Auth->startup($this->Controller); + + $this->assertArrayNotHasKey('Location', $this->Controller->response->header()); + $this->assertNull($this->Controller->testUrl, 'redirect() not called'); unset($_SERVER['HTTP_X_REQUESTED_WITH']); } @@ -1514,10 +1546,10 @@ public function testLoginWithUserData() { * @return void */ public function testFlashSettings() { - $this->Auth->Session = $this->getMock('SessionComponent', array(), array(), '', false); - $this->Auth->Session->expects($this->once()) - ->method('setFlash') - ->with('Auth failure', 'custom', array(1), 'auth-key'); + $this->Auth->Flash = $this->getMock('FlashComponent', array(), array(), '', false); + $this->Auth->Flash->expects($this->once()) + ->method('set') + ->with('Auth failure', array('element' => 'custom', 'params' => array(1), 'key' => 'auth-key')); $this->Auth->flash = array( 'element' => 'custom', diff --git a/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php b/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php index c3dd8c1b135..aee72160d89 100644 --- a/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php +++ b/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php @@ -77,7 +77,7 @@ public function send(CakeEmail $email) { $last .= sprintf("%s\n\n%s", 'Message:', $message); $last .= ''; - self::$lastEmail = $last; + static::$lastEmail = $last; return true; } @@ -149,7 +149,7 @@ public function setUp() { $this->Controller->Components->init($this->Controller); $this->Controller->EmailTest->initialize($this->Controller, array()); - self::$sentDate = date(DATE_RFC2822); + static::$sentDate = date(DATE_RFC2822); App::build(array( 'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS) @@ -170,7 +170,7 @@ public function testSendFormats() { $this->Controller->EmailTest->delivery = 'DebugComp'; $this->Controller->EmailTest->messageId = false; - $date = self::$sentDate; + $date = static::$sentDate; $message = <<To: postmaster@example.com From: noreply@example.com @@ -217,7 +217,7 @@ public function testTemplates() { $this->Controller->EmailTest->delivery = 'DebugComp'; $this->Controller->EmailTest->messageId = false; - $date = self::$sentDate; + $date = static::$sentDate; $header = << assertRegExp('/http\:\/\/example\.com/', $result); } +/** + * test send with null properties + * + * @return void + */ + public function testSendNullProperties() { + $this->Controller->EmailTest->to = 'test@example.com'; + $this->Controller->EmailTest->from = 'test@example.com'; + $this->Controller->EmailTest->subject = null; + $this->Controller->EmailTest->replyTo = null; + $this->Controller->EmailTest->messageId = null; + $this->Controller->EmailTest->template = null; + + $this->Controller->EmailTest->delivery = 'DebugComp'; + $this->assertTrue($this->Controller->EmailTest->send(null)); + $result = DebugCompTransport::$lastEmail; + + $this->assertRegExp('/To: test@example.com\n/', $result); + $this->assertRegExp('/Subject: \n/', $result); + $this->assertRegExp('/From: test@example.com\n/', $result); + $this->assertRegExp('/Date: ' . preg_quote(static::$sentDate) . '\n/', $result); + $this->assertRegExp('/X-Mailer: CakePHP Email Component\n/', $result); + $this->assertRegExp('/Content-Type: text\/plain; charset=UTF-8\n/', $result); + $this->assertRegExp('/Content-Transfer-Encoding: 8bitMessage:\n/', $result); + } + /** * testSendDebug method * @@ -363,7 +389,7 @@ public function testSendDebug() { $this->assertRegExp('/From: noreply@example.com\n/', $result); $this->assertRegExp('/Cc: cc@example.com\n/', $result); $this->assertRegExp('/Bcc: bcc@example.com\n/', $result); - $this->assertRegExp('/Date: ' . preg_quote(self::$sentDate) . '\n/', $result); + $this->assertRegExp('/Date: ' . preg_quote(static::$sentDate) . '\n/', $result); $this->assertRegExp('/X-Mailer: CakePHP Email Component\n/', $result); $this->assertRegExp('/Content-Type: text\/plain; charset=UTF-8\n/', $result); $this->assertRegExp('/Content-Transfer-Encoding: 8bitMessage:\n/', $result); @@ -392,7 +418,7 @@ public function testSendDebugWithNoSessions() { $this->assertRegExp('/Subject: Cake Debug Test\n/', $result); $this->assertRegExp('/Reply-To: noreply@example.com\n/', $result); $this->assertRegExp('/From: noreply@example.com\n/', $result); - $this->assertRegExp('/Date: ' . preg_quote(self::$sentDate) . '\n/', $result); + $this->assertRegExp('/Date: ' . preg_quote(static::$sentDate) . '\n/', $result); $this->assertRegExp('/X-Mailer: CakePHP Email Component\n/', $result); $this->assertRegExp('/Content-Type: text\/plain; charset=UTF-8\n/', $result); $this->assertRegExp('/Content-Transfer-Encoding: 8bitMessage:\n/', $result); @@ -563,7 +589,7 @@ public function testDateProperty() { $this->Controller->EmailTest->to = 'postmaster@example.com'; $this->Controller->EmailTest->from = 'noreply@example.com'; $this->Controller->EmailTest->subject = 'Cake Debug Test'; - $this->Controller->EmailTest->date = self::$sentDate = 'Today!'; + $this->Controller->EmailTest->date = static::$sentDate = 'Today!'; $this->Controller->EmailTest->template = null; $this->Controller->EmailTest->delivery = 'DebugComp'; diff --git a/lib/Cake/Test/Case/Controller/Component/FlashComponentTest.php b/lib/Cake/Test/Case/Controller/Component/FlashComponentTest.php new file mode 100644 index 00000000000..56905c54555 --- /dev/null +++ b/lib/Cake/Test/Case/Controller/Component/FlashComponentTest.php @@ -0,0 +1,171 @@ + + * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org) + * + * Licensed under The MIT License + * For full copyright and license information, please see the LICENSE.txt + * Redistributions of files must retain the above copyright notice + * + * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests + * @package Cake.Test.Case.Controller.Component + * @since CakePHP(tm) v 2.7.0-dev + * @license http://www.opensource.org/licenses/mit-license.php MIT License + */ + +App::uses('FlashComponent', 'Controller/Component'); +App::uses('ComponentCollection', 'Controller'); + +/** + * FlashComponentTest class + * + * @package Cake.Test.Case.Controller.Component + */ +class FlashComponentTest extends CakeTestCase { + +/** + * setUp method + * + * @return void + */ + public function setUp() { + parent::setUp(); + $this->Components = new ComponentCollection(); + $this->Flash = new FlashComponent($this->Components); + } + +/** + * tearDown method + * + * @return void + */ + public function tearDown() { + parent::tearDown(); + CakeSession::destroy(); + } + +/** + * testSet method + * + * @return void + */ + public function testSet() { + $this->assertNull(CakeSession::read('Message.flash')); + + $this->Flash->set('This is a test message'); + $expected = array( + 'message' => 'This is a test message', + 'key' => 'flash', + 'element' => 'Flash/default', + 'params' => array() + ); + $result = CakeSession::read('Message.flash'); + $this->assertEquals($expected, $result); + + $this->Flash->set('This is a test message', array( + 'element' => 'test', + 'params' => array('foo' => 'bar') + )); + $expected = array( + 'message' => 'This is a test message', + 'key' => 'flash', + 'element' => 'Flash/test', + 'params' => array('foo' => 'bar') + ); + $result = CakeSession::read('Message.flash'); + $this->assertEquals($expected, $result); + + $this->Flash->set('This is a test message', array('element' => 'MyPlugin.alert')); + $expected = array( + 'message' => 'This is a test message', + 'key' => 'flash', + 'element' => 'MyPlugin.Flash/alert', + 'params' => array() + ); + $result = CakeSession::read('Message.flash'); + $this->assertEquals($expected, $result); + + $this->Flash->set('This is a test message', array('key' => 'foobar')); + $expected = array( + 'message' => 'This is a test message', + 'key' => 'foobar', + 'element' => 'Flash/default', + 'params' => array() + ); + $result = CakeSession::read('Message.foobar'); + $this->assertEquals($expected, $result); + } + +/** + * testSetWithException method + * + * @return void + */ + public function testSetWithException() { + $this->assertNull(CakeSession::read('Message.flash')); + + $this->Flash->set(new Exception('This is a test message', 404)); + $expected = array( + 'message' => 'This is a test message', + 'key' => 'flash', + 'element' => 'Flash/default', + 'params' => array('code' => 404) + ); + $result = CakeSession::read('Message.flash'); + $this->assertEquals($expected, $result); + } + +/** + * testSetWithComponentConfiguration method + * + * @return void + */ + public function testSetWithComponentConfiguration() { + $this->assertNull(CakeSession::read('Message.flash')); + + $FlashWithSettings = $this->Components->load('Flash', array('element' => 'test')); + $FlashWithSettings->set('This is a test message'); + $expected = array( + 'message' => 'This is a test message', + 'key' => 'flash', + 'element' => 'Flash/test', + 'params' => array() + ); + $result = CakeSession::read('Message.flash'); + $this->assertEquals($expected, $result); + } + +/** + * Test magic call method. + * + * @return void + */ + public function testCall() { + $this->assertNull(CakeSession::read('Message.flash')); + + $this->Flash->success('It worked'); + $expected = array( + 'message' => 'It worked', + 'key' => 'flash', + 'element' => 'Flash/success', + 'params' => array() + ); + $result = CakeSession::read('Message.flash'); + $this->assertEquals($expected, $result); + + $this->Flash->error('It did not work', array('element' => 'error_thing')); + $expected = array( + 'message' => 'It did not work', + 'key' => 'flash', + 'element' => 'Flash/error', + 'params' => array() + ); + $result = CakeSession::read('Message.flash'); + $this->assertEquals($expected, $result, 'Element is ignored in magic call.'); + } +} diff --git a/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php b/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php index 5fa098314e9..fbcccc26659 100644 --- a/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php +++ b/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php @@ -454,6 +454,13 @@ public function testPaginateExtraParams() { $this->assertEquals(array(1, 2, 3), Hash::extract($result, '{n}.PaginatorControllerPost.id')); $this->assertTrue(!isset($Controller->PaginatorControllerPost->lastQueries[1]['contain'])); + $Controller->Paginator->settings = array( + 'order' => array('PaginatorControllerPost.author_id') + ); + $result = $Controller->Paginator->paginate('PaginatorControllerPost'); + $this->assertEquals(1, $Controller->params['paging']['PaginatorControllerPost']['page']); + $this->assertEquals(array(1, 3, 2), Hash::extract($result, '{n}.PaginatorControllerPost.id')); + $Controller->request->params['named'] = array('page' => '-1'); $Controller->Paginator->settings = array( 'PaginatorControllerPost' => array( @@ -479,7 +486,7 @@ public function testPaginateExtraParams() { $Controller->request->params['named'] = array('limit' => 12); $Controller->Paginator->settings = array('limit' => 30, 'maxLimit' => 100, 'paramType' => 'named'); - $result = $Controller->Paginator->paginate('PaginatorControllerPost'); + $Controller->Paginator->paginate('PaginatorControllerPost'); $paging = $Controller->params['paging']['PaginatorControllerPost']; $this->assertEquals(12, $Controller->PaginatorControllerPost->lastQueries[0]['limit']); @@ -497,7 +504,7 @@ public function testPaginateExtraParams() { 'paramType' => 'named' ) ); - $result = $Controller->Paginator->paginate('ControllerPaginateModel'); + $Controller->Paginator->paginate('ControllerPaginateModel'); $expected = array( 'contain' => array('ControllerPaginateModel'), 'group' => 'Comment.author_id', @@ -606,7 +613,7 @@ public function testPaginateOrderModelDefault() { $Controller->PaginatorControllerPost->order = array('PaginatorControllerPost.id'); $result = $Controller->Paginator->validateSort($Controller->PaginatorControllerPost, array()); - $this->assertEmpty($result['order']); + $this->assertEquals(array('PaginatorControllerPost.id' => 'asc'), $result['order']); $Controller->PaginatorControllerPost->order = 'PaginatorControllerPost.id'; $result = $Controller->Paginator->validateSort($Controller->PaginatorControllerPost, array()); @@ -617,7 +624,10 @@ public function testPaginateOrderModelDefault() { 'PaginatorControllerPost.created' => 'asc' ); $result = $Controller->Paginator->validateSort($Controller->PaginatorControllerPost, array()); - $expected = array('PaginatorControllerPost.created' => 'asc'); + $expected = array( + 'PaginatorControllerPost.id' => 'asc', + 'PaginatorControllerPost.created' => 'asc' + ); $this->assertEquals($expected, $result['order']); } @@ -843,7 +853,7 @@ public function testMergeOptionsMaxLimit() { 'paramType' => 'named', ); $result = $this->Paginator->mergeOptions('Post'); - $expected = array('page' => 1, 'limit' => 200, 'maxLimit' => 200, 'paramType' => 'named'); + $expected = array('page' => 1, 'limit' => 200, 'maxLimit' => 100, 'paramType' => 'named'); $this->assertEquals($expected, $result); $this->Paginator->settings = array( @@ -862,7 +872,7 @@ public function testMergeOptionsMaxLimit() { 'paramType' => 'named', ); $result = $this->Paginator->mergeOptions('Post'); - $expected = array('page' => 1, 'limit' => 500, 'maxLimit' => 150, 'paramType' => 'named'); + $expected = array('page' => 1, 'limit' => 500, 'maxLimit' => 100, 'paramType' => 'named'); $this->assertEquals($expected, $result); } diff --git a/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php b/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php index 3f330b60aa5..aa20baeff45 100644 --- a/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php +++ b/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php @@ -197,6 +197,20 @@ public function testInitializeContentTypeWithjQueryAccept() { $this->assertEquals('json', $this->RequestHandler->ext); } +/** + * Test that RequestHandler does not set extension to csv for text/plain mimetype + * + * @return void + */ + public function testInitializeContentTypeWithjQueryTextPlainAccept() { + $_SERVER['HTTP_ACCEPT'] = 'text/plain, */*; q=0.01'; + $this->assertNull($this->RequestHandler->ext); + Router::parseExtensions('csv'); + + $this->RequestHandler->initialize($this->Controller); + $this->assertNull($this->RequestHandler->ext); + } + /** * Test that RequestHandler sets $this->ext when jQuery sends its wonky-ish headers * and the application is configured to handle multiple extensions diff --git a/lib/Cake/Test/Case/Controller/Component/SessionComponentTest.php b/lib/Cake/Test/Case/Controller/Component/SessionComponentTest.php index 214ee9d3a26..fa7bae08b3d 100644 --- a/lib/Cake/Test/Case/Controller/Component/SessionComponentTest.php +++ b/lib/Cake/Test/Case/Controller/Component/SessionComponentTest.php @@ -91,7 +91,7 @@ class SessionComponentTest extends CakeTestCase { * @return void */ public static function setupBeforeClass() { - self::$_sessionBackup = Configure::read('Session'); + static::$_sessionBackup = Configure::read('Session'); Configure::write('Session', array( 'defaults' => 'php', 'timeout' => 100, @@ -105,7 +105,7 @@ public static function setupBeforeClass() { * @return void */ public static function teardownAfterClass() { - Configure::write('Session', self::$_sessionBackup); + Configure::write('Session', static::$_sessionBackup); } /** diff --git a/lib/Cake/Test/Case/Controller/ControllerTest.php b/lib/Cake/Test/Case/Controller/ControllerTest.php index d713e0d8078..a8abc2bdd11 100644 --- a/lib/Cake/Test/Case/Controller/ControllerTest.php +++ b/lib/Cake/Test/Case/Controller/ControllerTest.php @@ -653,7 +653,7 @@ public function testRender() { $expected = $Controller->ControllerComment->validationErrors; $Controller->viewPath = 'Posts'; - $result = $Controller->render('index'); + $Controller->render('index'); $View = $Controller->View; $this->assertTrue(isset($View->validationErrors['ControllerComment'])); $this->assertEquals($expected, $View->validationErrors['ControllerComment']); @@ -1031,6 +1031,30 @@ public function testReferer() { $this->assertEquals('/', $result); } +/** + * Test that the referer is not absolute if it is '/'. + * + * This avoids the base path being applied twice on string urls. + * + * @return void + */ + public function testRefererSlash() { + $request = $this->getMock('CakeRequest', array('referer')); + $request->base = '/base'; + $request->expects($this->any()) + ->method('referer') + ->will($this->returnValue('/')); + Router::setRequestInfo($request); + + $controller = new Controller($request); + $result = $controller->referer('/', true); + $this->assertEquals('/', $result); + + $controller = new Controller($request); + $result = $controller->referer('/some/path', true); + $this->assertEquals('/base/some/path', $result); + } + /** * testSetAction method * @@ -1082,7 +1106,7 @@ public function testValidateErrorsOnArbitraryModels() { $TestController = new TestController(); $Post = new ControllerPost(); - $Post->validate = array('title' => 'notEmpty'); + $Post->validate = array('title' => 'notBlank'); $Post->set('title', ''); $result = $TestController->validateErrors($Post); @@ -1423,6 +1447,25 @@ public function testInvokeActionPrefixProtection() { $Controller->invokeAction($url); } +/** + * test invoking controller methods. + * + * @expectedException PrivateActionException + * @expectedExceptionMessage Private Action TestController::Admin_add() is not directly accessible. + * @return void + */ + public function testInvokeActionPrefixProtectionCasing() { + Router::reload(); + Router::connect('/admin/:controller/:action/*', array('prefix' => 'admin')); + + $url = new CakeRequest('test/Admin_add/'); + $url->addParams(array('controller' => 'test_controller', 'action' => 'Admin_add')); + $response = $this->getMock('CakeResponse'); + + $Controller = new TestController($url, $response); + $Controller->invokeAction($url); + } + /** * test invoking controller methods. * diff --git a/lib/Cake/Test/Case/Core/CakePluginTest.php b/lib/Cake/Test/Case/Core/CakePluginTest.php index 94bc3c5acf7..3398d166132 100644 --- a/lib/Cake/Test/Case/Core/CakePluginTest.php +++ b/lib/Cake/Test/Case/Core/CakePluginTest.php @@ -20,7 +20,6 @@ /** * CakePluginTest class - * */ class CakePluginTest extends CakeTestCase { diff --git a/lib/Cake/Test/Case/Core/ConfigureTest.php b/lib/Cake/Test/Case/Core/ConfigureTest.php index f91218418c2..744932dac87 100644 --- a/lib/Cake/Test/Case/Core/ConfigureTest.php +++ b/lib/Cake/Test/Case/Core/ConfigureTest.php @@ -69,6 +69,7 @@ public function tearDown() { /** * Test to ensure bootrapping doesn't overwrite prior configs set under 'App' key + * * @return void */ public function testBootstrap() { @@ -148,6 +149,39 @@ public function testWrite() { $this->assertEquals('4', $result); } +/** + * Test the consume method. + * + * @return void + */ + public function testConsume() { + $this->assertNull(Configure::consume('DoesNotExist'), 'Should be null on empty value'); + Configure::write('Test', array('key' => 'value', 'key2' => 'value2')); + + $result = Configure::consume('Test.key'); + $this->assertEquals('value', $result); + + $result = Configure::read('Test.key2'); + $this->assertEquals('value2', $result, 'Other values should remain.'); + + $result = Configure::consume('Test'); + $expected = array('key2' => 'value2'); + $this->assertEquals($expected, $result); + } + +/** + * testConsumeEmpty + * + * @return void + */ + public function testConsumeEmpty() { + Configure::write('Test', array('key' => 'value', 'key2' => 'value2')); + $result = Configure::consume(''); + $this->assertNull($result); + $result = Configure::consume(null); + $this->assertNull($result); + } + /** * test setting display_errors with debug. * @@ -175,7 +209,7 @@ public function testDelete() { Configure::delete('SomeName.someKey'); $result = Configure::read('SomeName.someKey'); - $this->assertTrue($result === null); + $this->assertNull($result); Configure::write('SomeName', array('someKey' => 'myvalue', 'otherKey' => 'otherValue')); @@ -188,10 +222,10 @@ public function testDelete() { Configure::delete('SomeName'); $result = Configure::read('SomeName.someKey'); - $this->assertTrue($result === null); + $this->assertNull($result); $result = Configure::read('SomeName.otherKey'); - $this->assertTrue($result === null); + $this->assertNull($result); } /** @@ -245,7 +279,8 @@ public function testCheckKeyWithSpaces() { * @return void */ public function testCheckEmpty() { - $this->assertFalse(Configure::check()); + $this->assertFalse(Configure::check('')); + $this->assertFalse(Configure::check(null)); } /** @@ -435,6 +470,8 @@ public function testClear() { } /** + * testDumpNoAdapter + * * @expectedException ConfigureException * @return void */ diff --git a/lib/Cake/Test/Case/Core/ObjectTest.php b/lib/Cake/Test/Case/Core/ObjectTest.php index c44291a3f7d..1556baa8949 100644 --- a/lib/Cake/Test/Case/Core/ObjectTest.php +++ b/lib/Cake/Test/Case/Core/ObjectTest.php @@ -73,7 +73,7 @@ public function another_ra_test($id, $other) { /** * normal_request_action method * - * @return void + * @return string Hello World! */ public function normal_request_action() { return 'Hello World'; @@ -82,7 +82,7 @@ public function normal_request_action() { /** * returns $this->here * - * @return void + * @return string $this->here. */ public function return_here() { return $this->here; @@ -91,7 +91,7 @@ public function return_here() { /** * paginate_request_action method * - * @return void + * @return true */ public function paginate_request_action() { $this->paginate(); @@ -251,8 +251,9 @@ public function methodWithOptionalParam($param = null) { } /** - * undocumented function + * Set properties. * + * @param array $properties The $properties. * @return void */ public function set($properties = array()) { diff --git a/lib/Cake/Test/Case/Error/ErrorHandlerTest.php b/lib/Cake/Test/Case/Error/ErrorHandlerTest.php index 6ec656036bf..18930737b32 100644 --- a/lib/Cake/Test/Case/Error/ErrorHandlerTest.php +++ b/lib/Cake/Test/Case/Error/ErrorHandlerTest.php @@ -19,6 +19,24 @@ App::uses('ErrorHandler', 'Error'); App::uses('Controller', 'Controller'); App::uses('Router', 'Routing'); +App::uses('Debugger', 'Utility'); + +/** + * A faulty ExceptionRenderer to test nesting. + */ +class FaultyExceptionRenderer extends ExceptionRenderer { + +/** + * Dummy rendering implementation. + * + * @return void + * @throws Exception + */ + public function render() { + throw new Exception('Error from renderer.'); + } + +} /** * ErrorHandlerTest class @@ -75,6 +93,8 @@ public function testHandleErrorDebugOn() { set_error_handler('ErrorHandler::handleError'); $this->_restoreError = true; + Debugger::getInstance()->output('html'); + ob_start(); $wrong .= ''; $result = ob_get_clean(); @@ -106,6 +126,8 @@ public function testErrorMapping($error, $expected) { set_error_handler('ErrorHandler::handleError'); $this->_restoreError = true; + Debugger::getInstance()->output('html'); + ob_start(); trigger_error('Test error', $error); @@ -320,4 +342,48 @@ public function testHandleFatalErrorLog() { $this->assertContains('[FatalErrorException] Something wrong', $log[1], 'message missing.'); } +/** + * testExceptionRendererNestingDebug method + * + * @return void + */ + public function testExceptionRendererNestingDebug() { + Configure::write('debug', 2); + Configure::write('Exception.renderer', 'FaultyExceptionRenderer'); + + $result = false; + try { + ob_start(); + ob_start(); + ErrorHandler::handleFatalError(E_USER_ERROR, 'Initial error', __FILE__, __LINE__); + } catch (Exception $e) { + $result = $e instanceof FatalErrorException; + } + + restore_error_handler(); + $this->assertTrue($result); + } + +/** + * testExceptionRendererNestingProduction method + * + * @return void + */ + public function testExceptionRendererNestingProduction() { + Configure::write('debug', 0); + Configure::write('Exception.renderer', 'FaultyExceptionRenderer'); + + $result = false; + try { + ob_start(); + ob_start(); + ErrorHandler::handleFatalError(E_USER_ERROR, 'Initial error', __FILE__, __LINE__); + } catch (Exception $e) { + $result = $e instanceof InternalErrorException; + } + + restore_error_handler(); + $this->assertTrue($result); + } + } diff --git a/lib/Cake/Test/Case/Event/CakeEventManagerTest.php b/lib/Cake/Test/Case/Event/CakeEventManagerTest.php index 5eb8d3a2cae..db16e6b7fb5 100644 --- a/lib/Cake/Test/Case/Event/CakeEventManagerTest.php +++ b/lib/Cake/Test/Case/Event/CakeEventManagerTest.php @@ -88,7 +88,6 @@ public function thirdListenerFunction() { /** * Tests the CakeEventManager class functionality - * */ class CakeEventManagerTest extends CakeTestCase { diff --git a/lib/Cake/Test/Case/Event/CakeEventTest.php b/lib/Cake/Test/Case/Event/CakeEventTest.php index 9ba28d3a909..3bb4771f917 100644 --- a/lib/Cake/Test/Case/Event/CakeEventTest.php +++ b/lib/Cake/Test/Case/Event/CakeEventTest.php @@ -22,7 +22,6 @@ /** * Tests the CakeEvent class functionality - * */ class CakeEventTest extends CakeTestCase { diff --git a/lib/Cake/Test/Case/I18n/I18nTest.php b/lib/Cake/Test/Case/I18n/I18nTest.php index 79657c4614d..faac0e0694b 100644 --- a/lib/Cake/Test/Case/I18n/I18nTest.php +++ b/lib/Cake/Test/Case/I18n/I18nTest.php @@ -2040,6 +2040,22 @@ public function testContext() { $this->assertSame("saldo", __x('money', 'balance')); } +/** + * Test basic context support using mo files. + * + * @return void + */ + public function testContextMoFile() { + Configure::write('Config.language', 'nld_mo'); + + $this->assertSame("brief", __x('mail', 'letter')); + $this->assertSame("letter", __x('character', 'letter')); + $this->assertSame("bal", __x('spherical object', 'ball')); + $this->assertSame("danspartij", __x('social gathering', 'ball')); + $this->assertSame("balans", __('balance')); + $this->assertSame("saldo", __x('money', 'balance')); + } + /** * Singular method * diff --git a/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php b/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php index c9a06b7fc1c..f177488dcf6 100644 --- a/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php +++ b/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php @@ -35,7 +35,7 @@ class TestConsoleLog extends ConsoleLog { class TestCakeLog extends CakeLog { public static function replace($key, &$engine) { - self::$_Collection->{$key} = $engine; + static::$_Collection->{$key} = $engine; } } @@ -139,7 +139,7 @@ public function testDefaultOutputAs() { TestCakeLog::config('test_console_log', array( 'engine' => 'TestConsole', )); - if ((DS === '\\' && !(bool)env('ANSICON')) || + if ((DS === '\\' && !(bool)env('ANSICON') && env('ConEmuANSI') !== 'ON') || (function_exists('posix_isatty') && !posix_isatty(null)) ) { $expected = ConsoleOutput::PLAIN; diff --git a/lib/Cake/Test/Case/Model/AclNodeTest.php b/lib/Cake/Test/Case/Model/AclNodeTest.php index 391ccd79b7a..ca40243e6e8 100644 --- a/lib/Cake/Test/Case/Model/AclNodeTest.php +++ b/lib/Cake/Test/Case/Model/AclNodeTest.php @@ -181,8 +181,7 @@ public function bindNode($ref = null) { class TestDbAcl extends DbAcl { /** - * construct method - * + * Constructor */ public function __construct() { $this->Aro = new DbAroTest(); diff --git a/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php b/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php index 3c1fdfe7662..81737576a8a 100644 --- a/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php +++ b/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php @@ -942,7 +942,7 @@ public function testMultipleUpdate() { $TestModel = new TranslatedItem(); $TestModel->locale = 'eng'; - $TestModel->validate['title'] = 'notEmpty'; + $TestModel->validate['title'] = 'notBlank'; $data = array('TranslatedItem' => array( 'id' => 1, 'title' => array('eng' => 'New Title #1', 'deu' => 'Neue Titel #1', 'cze' => 'Novy Titulek #1'), diff --git a/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php b/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php index f03ac2a79cd..b9eb1ed2528 100644 --- a/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php +++ b/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php @@ -46,7 +46,8 @@ class TreeBehaviorNumberTest extends CakeTestCase { 'modelClass' => 'NumberTree', 'leftField' => 'lft', 'rightField' => 'rght', - 'parentField' => 'parent_id' + 'parentField' => 'parent_id', + 'level' => 'level' ); /** @@ -548,6 +549,26 @@ public function testMovePromote() { $this->assertTrue($validTree); } +/** + * testGetLevel method + * + * @return void + */ + public function testGetLevel() { + extract($this->settings); + $this->Tree = new $modelClass(); + $this->Tree->initialize(2, 2); + $this->Tree->id = null; + + $result = $this->Tree->getLevel(5); + $this->assertEquals(1, $result); + + $result = $this->Tree->getLevel(3); + $this->assertEquals(2, $result); + + $this->assertFalse($this->Tree->getLevel(999)); + } + /** * testMoveWithWhitelist method * @@ -1412,6 +1433,29 @@ public function testGenerateTreeListFormatting() { $this->assertEquals('__3 - 1.1.1', $result[3]); } +/** + * Test the formatting options of formatTreeList() + * + * @return void + */ + public function testFormatTreeList() { + extract($this->settings); + $this->Tree = new $modelClass(); + $this->Tree->initialize(2, 2); + + $options = array('order' => array('lft' => 'asc')); + $records = $this->Tree->find('all', $options); + + $options = array( + 'keyPath' => "{n}.$modelClass.id", + 'valuePath' => array('%s - %s', "{n}.$modelClass.id", "{n}.$modelClass.name"), + 'spacer' => '--'); + $result = $this->Tree->formatTreeList($records, $options); + $this->assertEquals('1 - 1. Root', $result[1]); + $this->assertEquals('--2 - 1.1', $result[2]); + $this->assertEquals('----3 - 1.1.1', $result[3]); + } + /** * testArraySyntax method * @@ -1507,4 +1551,61 @@ public function testFindThreaded() { ); $this->assertEquals($expected, $result); } + + public function testLevel() { + extract($this->settings); + $this->Tree = new $modelClass(); + $this->Tree->Behaviors->attach('Tree', array('level' => 'level')); + $this->Tree->initialize(2, 2); + + $result = $this->Tree->findByName('1. Root'); + $this->assertEquals(0, $result[$modelClass][$level]); + + $result = $this->Tree->findByName('1.1'); + $this->assertEquals(1, $result[$modelClass][$level]); + + $result = $this->Tree->findByName('1.2.2'); + $this->assertEquals(2, $result[$modelClass][$level]); + + $result = $this->Tree->findByName('1.2.1'); + $this->assertEquals(2, $result[$modelClass][$level]); + + // Save with parent_id not set + $this->Tree->save(array('id' => $result[$modelClass]['id'], 'name' => 'foo')); + $result = $this->Tree->findByName('foo'); + $this->assertEquals(2, $result[$modelClass][$level]); + + // Save with parent_id not changed + $this->Tree->save(array( + 'id' => $result[$modelClass]['id'], + 'parent_id' => $result[$modelClass]['parent_id'], + 'name' => 'foo2' + )); + $result = $this->Tree->findByName('foo2'); + $this->assertEquals(2, $result[$modelClass][$level]); + + // Save with parent_id changed + $result = $this->Tree->findByName('1.1'); + $this->Tree->save(array( + 'id' => $result[$modelClass]['id'], + 'parent_id' => '' + )); + $result = $this->Tree->findByName('1.1'); + $this->assertEquals(0, $result[$modelClass][$level]); + + $result = $this->Tree->findByName('1.1.2'); + $this->assertEquals(1, $result[$modelClass][$level]); + + $parent = $this->Tree->findByName('1.1.2'); + $result = $this->Tree->findByName('1.2'); + $this->Tree->save(array( + 'id' => $result[$modelClass]['id'], + 'parent_id' => $parent[$modelClass]['id'] + )); + $result = $this->Tree->findByName('1.2'); + $this->assertEquals(2, $result[$modelClass][$level]); + + $result = $this->Tree->findByName('1.2.2'); + $this->assertEquals(3, $result[$modelClass][$level]); + } } diff --git a/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorUuidTest.php b/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorUuidTest.php index b106abb88f0..ee031bebb12 100644 --- a/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorUuidTest.php +++ b/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorUuidTest.php @@ -20,7 +20,7 @@ App::uses('Model', 'Model'); App::uses('AppModel', 'Model'); -App::uses('String', 'Utility'); +App::uses('CakeText', 'Utility'); require_once dirname(dirname(__FILE__)) . DS . 'models.php'; @@ -73,7 +73,7 @@ public function testAddWithPreSpecifiedId() { 'conditions' => array($modelClass . '.name' => '1.1') )); - $id = String::uuid(); + $id = CakeText::uuid(); $this->Tree->create(); $result = $this->Tree->save(array($modelClass => array( 'id' => $id, diff --git a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php index 534aaa1edcc..41111a898b0 100644 --- a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php @@ -28,11 +28,11 @@ class TestCakeSession extends CakeSession { public static function setUserAgent($value) { - self::$_userAgent = $value; + static::$_userAgent = $value; } public static function setHost($host) { - self::_setHost($host); + static::_setHost($host); } } @@ -86,7 +86,7 @@ class CakeSessionTest extends CakeTestCase { */ public static function setupBeforeClass() { // Make sure garbage colector will be called - self::$_gcDivisor = ini_get('session.gc_divisor'); + static::$_gcDivisor = ini_get('session.gc_divisor'); ini_set('session.gc_divisor', '1'); } @@ -97,7 +97,7 @@ public static function setupBeforeClass() { */ public static function teardownAfterClass() { // Revert to the default setting - ini_set('session.gc_divisor', self::$_gcDivisor); + ini_set('session.gc_divisor', static::$_gcDivisor); } /** @@ -328,6 +328,28 @@ public function testWriteOverwriteStringValue() { ); } +/** + * Test consuming session data. + * + * @return void + */ + public function testConsume() { + TestCakeSession::write('Some.string', 'value'); + TestCakeSession::write('Some.array', array('key1' => 'value1', 'key2' => 'value2')); + $this->assertEquals('value', TestCakeSession::read('Some.string')); + $value = TestCakeSession::consume('Some.string'); + $this->assertEquals('value', $value); + $this->assertFalse(TestCakeSession::check('Some.string')); + $value = TestCakeSession::consume(''); + $this->assertNull($value); + $value = TestCakeSession::consume(null); + $this->assertNull($value); + $value = TestCakeSession::consume('Some.array'); + $expected = array('key1' => 'value1', 'key2' => 'value2'); + $this->assertEquals($expected, $value); + $this->assertFalse(TestCakeSession::check('Some.array')); + } + /** * testId method * @@ -371,11 +393,36 @@ public function testDelete() { $this->assertTrue(TestCakeSession::check('Delete')); $this->assertTrue(TestCakeSession::write('Clearing.sale', 'everything must go')); + $this->assertFalse(TestCakeSession::delete('')); + $this->assertTrue(TestCakeSession::check('Clearing.sale')); + $this->assertFalse(TestCakeSession::delete(null)); + $this->assertTrue(TestCakeSession::check('Clearing.sale')); + $this->assertTrue(TestCakeSession::delete('Clearing')); $this->assertFalse(TestCakeSession::check('Clearing.sale')); $this->assertFalse(TestCakeSession::check('Clearing')); } +/** + * testClear method + * + * @return void + */ + public function testClear() { + $this->assertTrue(TestCakeSession::write('Delete.me', 'Clearing out')); + TestCakeSession::clear(false); + $this->assertFalse(TestCakeSession::check('Delete.me')); + $this->assertFalse(TestCakeSession::check('Delete')); + + TestCakeSession::write('Some.string', 'value'); + TestCakeSession::clear(false); + $this->assertNull(TestCakeSession::read('Some')); + + TestCakeSession::write('Some.string.array', array('values')); + TestCakeSession::clear(false); + $this->assertFalse(TestCakeSession::read()); + } + /** * testDestroy method * @@ -429,7 +476,8 @@ public function testCheckKeyWithSpaces() { * @return void */ public function testCheckEmpty() { - $this->assertFalse(TestCakeSession::check()); + $this->assertFalse(TestCakeSession::check('')); + $this->assertFalse(TestCakeSession::check(null)); } /** diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php index 994ad75e1a4..6ad52f5390f 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php @@ -553,6 +553,10 @@ public function testColumn() { $result = $this->Dbo->column('decimal(14,7) unsigned'); $expected = 'decimal'; $this->assertEquals($expected, $result); + + $result = $this->Dbo->column("set('a','b','c')"); + $expected = "set('a','b','c')"; + $this->assertEquals($expected, $result); } /** @@ -922,6 +926,44 @@ public function testDescribeHandleCurrentTimestamp() { $this->assertContains('`limit_date` timestamp NOT NULL,', $result); } +/** + * Test that describe() ignores `default current_timestamp` in datetime columns. + * This is for MySQL >= 5.6. + * + * @return void + */ + public function testDescribeHandleCurrentTimestampDatetime() { + $mysqlVersion = $this->Dbo->query('SELECT VERSION() as version', array('log' => false)); + $this->skipIf(version_compare($mysqlVersion[0][0]['version'], '5.6.0', '<')); + + $name = $this->Dbo->fullTableName('timestamp_default_values'); + $sql = << Dbo->execute($sql); + $model = new Model(array( + 'table' => 'timestamp_default_values', + 'ds' => 'test', + 'alias' => 'TimestampDefaultValue' + )); + $result = $this->Dbo->describe($model); + $this->Dbo->execute('DROP TABLE ' . $name); + + $this->assertNull($result['limit_date']['default']); + + $schema = new CakeSchema(array( + 'connection' => 'test', + 'testdescribes' => $result + )); + $result = $this->Dbo->createSchema($schema); + $this->assertContains('`limit_date` datetime NOT NULL,', $result); + } + /** * test that a describe() gets additional fieldParameters * @@ -4071,4 +4113,34 @@ public function testNestedTransaction() { $this->Dbo->useNestedTransactions = $nested; } +/** + * Test that value() quotes set values even when numeric. + * + * @return void + */ + public function testSetValue() { + $column = "set('a','b','c')"; + $result = $this->Dbo->value('1', $column); + $this->assertEquals("'1'", $result); + + $result = $this->Dbo->value(1, $column); + $this->assertEquals("'1'", $result); + + $result = $this->Dbo->value('a', $column); + $this->assertEquals("'a'", $result); + } + +/** + * Test isConnected + * + * @return void + */ + public function testIsConnected() { + $this->Dbo->disconnect(); + $this->assertFalse($this->Dbo->isConnected(), 'Not connected now.'); + + $this->Dbo->connect(); + $this->assertTrue($this->Dbo->isConnected(), 'Should be connected.'); + } + } diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php index e41567150f3..20f96cd5c27 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php @@ -318,8 +318,8 @@ public function testValueQuoting() { $this->assertEquals("0", $this->Dbo->value('0', 'integer')); $this->assertEquals('NULL', $this->Dbo->value('', 'integer')); $this->assertEquals('NULL', $this->Dbo->value('', 'float')); - $this->assertEquals("NULL", $this->Dbo->value('', 'integer', false)); - $this->assertEquals("NULL", $this->Dbo->value('', 'float', false)); + $this->assertEquals('""', $this->Dbo->value('', 'integer', false)); + $this->assertEquals('""', $this->Dbo->value('', 'float', false)); $this->assertEquals("'0.0'", $this->Dbo->value('0.0', 'float')); $this->assertEquals("'TRUE'", $this->Dbo->value('t', 'boolean')); @@ -490,6 +490,10 @@ public function testRegexpOperatorConditionsParsing() { $this->assertSame(' WHERE "name" ~* \'[a-z_]+\'', $this->Dbo->conditions(array('name ~*' => '[a-z_]+'))); $this->assertSame(' WHERE "name" !~ \'[a-z_]+\'', $this->Dbo->conditions(array('name !~' => '[a-z_]+'))); $this->assertSame(' WHERE "name" !~* \'[a-z_]+\'', $this->Dbo->conditions(array('name !~*' => '[a-z_]+'))); + $this->assertSame( + ' WHERE EXTRACT( \'YEAR\' FROM "User"."birthday" ) = 2015', + $this->Dbo->conditions(array('EXTRACT( \'YEAR\' FROM User.birthday )' => 2015)) + ); } /** @@ -731,6 +735,42 @@ public function testAlterSchemaBooleanToIntegerField() { $this->Dbo->query($this->Dbo->dropSchema($Old)); } +/** + * Test the alterSchema changing text to integer + * + * @return void + */ + public function testAlterSchemaTextToIntegerField() { + $default = array( + 'connection' => 'test', + 'name' => 'TextField', + 'text_fields' => array( + 'id' => array('type' => 'integer', 'key' => 'primary'), + 'name' => array('type' => 'string', 'length' => 50), + 'active' => array('type' => 'text', 'null' => false), + ) + ); + $Old = new CakeSchema($default); + $result = $this->Dbo->query($this->Dbo->createSchema($Old)); + $this->assertTrue($result); + + $modified = $default; + $modified['text_fields']['active'] = array('type' => 'integer', 'null' => true); + + $New = new CakeSchema($modified); + $this->Dbo->query($this->Dbo->alterSchema($New->compare($Old))); + $result = $this->Dbo->describe('text_fields'); + + $this->Dbo->query($this->Dbo->dropSchema($Old)); + $expected = array( + 'type' => 'integer', + 'null' => true, + 'default' => null, + 'length' => null, + ); + $this->assertEquals($expected, $result['active']); + } + /** * Test the alter index capabilities of postgres * diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php index 48ca6851357..14758c7d7ac 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php @@ -560,4 +560,29 @@ public function testFetchRowColumnParsing() { $this->assertEquals($expected, $result); } +/** + * Test parsing more complex field names. + * + * @return void + */ + public function testFetchColumnRowParsingMoreComplex() { + $this->loadFixtures('User'); + $sql = 'SELECT + COUNT(*) AS User__count, + COUNT(CASE id WHEN 2 THEN 1 ELSE NULL END) as User__case, + AVG(CAST("User"."id" AS BIGINT)) AS User__bigint + FROM "users" AS "User" + WHERE "User"."id" > 0'; + $result = $this->Dbo->fetchRow($sql); + + $expected = array( + '0' => array( + 'User__count' => '4', + 'User__case' => '1', + 'User__bigint' => '2.5', + ), + ); + $this->assertEquals($expected, $result); + } + } diff --git a/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php b/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php index dff12ecc527..9b5bf1655a5 100644 --- a/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php @@ -784,6 +784,35 @@ public function testFetchAllBooleanReturns() { $this->assertTrue($result, 'Query did not return a boolean'); } +/** + * Test NOT NULL on ENUM data type with empty string as a value + * + * @return void + */ + public function testNotNullOnEnum() { + if (!$this->db instanceof Mysql) { + $this->markTestSkipped('This test can only run on MySQL'); + } + $name = $this->db->fullTableName('enum_tests'); + $query = "CREATE TABLE {$name} (mood ENUM('','happy','sad','ok') NOT NULL);"; + $result = $this->db->query($query); + $this->assertTrue($result); + + $EnumTest = ClassRegistry::init('EnumTest'); + $enumResult = $EnumTest->save(array('mood' => '')); + + $query = "DROP TABLE {$name};"; + $result = $this->db->query($query); + $this->assertTrue($result); + + $this->assertEquals(array( + 'EnumTest' => array( + 'mood' => '', + 'id' => '0' + ) + ), $enumResult); + } + /** * test order to generate query order clause for virtual fields * diff --git a/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php index 42b4e7120b6..553f70bf4bb 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php @@ -39,7 +39,7 @@ public static function setupBeforeClass() { 'engine' => 'File', 'prefix' => 'session_test_' )); - self::$_sessionBackup = Configure::read('Session'); + static::$_sessionBackup = Configure::read('Session'); Configure::write('Session.handler.config', 'session_test'); } @@ -53,7 +53,7 @@ public static function teardownAfterClass() { Cache::clear(false, 'session_test'); Cache::drop('session_test'); - Configure::write('Session', self::$_sessionBackup); + Configure::write('Session', static::$_sessionBackup); } /** diff --git a/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php index b39a325169b..da19cfcc6fc 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php @@ -54,7 +54,7 @@ class DatabaseSessionTest extends CakeTestCase { * @return void */ public static function setupBeforeClass() { - self::$_sessionBackup = Configure::read('Session'); + static::$_sessionBackup = Configure::read('Session'); Configure::write('Session.handler', array( 'model' => 'SessionTestModel', )); @@ -67,7 +67,7 @@ public static function setupBeforeClass() { * @return void */ public static function teardownAfterClass() { - Configure::write('Session', self::$_sessionBackup); + Configure::write('Session', static::$_sessionBackup); } /** @@ -191,4 +191,56 @@ public function testGc() { $storage->gc(); $this->assertFalse($storage->read('foo')); } + +/** + * testConcurrentInsert + * + * @return void + */ + public function testConcurrentInsert() { + $this->skipIf( + $this->db instanceof Sqlite, + 'Sqlite does not throw exceptions when attempting to insert a duplicate primary key' + ); + + ClassRegistry::removeObject('Session'); + + $mockedModel = $this->getMockForModel( + 'SessionTestModel', + array('exists'), + array('alias' => 'MockedSessionTestModel', 'table' => 'sessions') + ); + Configure::write('Session.handler.model', 'MockedSessionTestModel'); + + $counter = 0; + // First save + $mockedModel->expects($this->at($counter++)) + ->method('exists') + ->will($this->returnValue(false)); + + // Second save + $mockedModel->expects($this->at($counter++)) + ->method('exists') + ->will($this->returnValue(false)); + + // Second save retry + $mockedModel->expects($this->at($counter++)) + ->method('exists') + ->will($this->returnValue(true)); + + // Datasource exists check + $mockedModel->expects($this->at($counter++)) + ->method('exists') + ->will($this->returnValue(true)); + + $this->storage = new DatabaseSession(); + + $this->storage->write('foo', 'Some value'); + $return = $this->storage->read('foo'); + $this->assertSame('Some value', $return); + + $this->storage->write('foo', 'Some other value'); + $return = $this->storage->read('foo'); + $this->assertSame('Some other value', $return); + } } diff --git a/lib/Cake/Test/Case/Model/ModelIntegrationTest.php b/lib/Cake/Test/Case/Model/ModelIntegrationTest.php index 839af667183..65ab2ad3a4c 100644 --- a/lib/Cake/Test/Case/Model/ModelIntegrationTest.php +++ b/lib/Cake/Test/Case/Model/ModelIntegrationTest.php @@ -226,7 +226,8 @@ public function testDynamicBehaviorAttachment() { 'scope' => '1 = 1', 'type' => 'nested', '__parentChange' => false, - 'recursive' => -1 + 'recursive' => -1, + 'level' => null ); $this->assertEquals($expected, $TestModel->Behaviors->Tree->settings['Apple']); @@ -1333,7 +1334,7 @@ public function testUseTableFalseExistsCheck() { $Article->useTable = false; $Article->id = 1; $result = $Article->exists(); - $this->assertTrue($result); + $this->assertFalse($result); } /** @@ -1993,7 +1994,7 @@ public function testWithAssociation() { 'afterFind' => 'Successfully added by AfterFind' ) )); - $this->assertEquals(self::date(), $result['Something']['updated']); + $this->assertEquals(static::date(), $result['Something']['updated']); unset($result['Something']['updated']); $this->assertEquals($expected, $result); } @@ -2497,4 +2498,17 @@ public function testSchemaNoDB() { $model->expects($this->never())->method('getDataSource'); $this->assertEmpty($model->schema()); } + +/** + * Tests that calling getColumnType() on a model that is not supposed to use a table + * does not trigger any calls on any datasource + * + * @return void + */ + public function testGetColumnTypeNoDB() { + $model = $this->getMock('Example', array('getDataSource')); + $model->expects($this->never())->method('getDataSource'); + $result = $model->getColumnType('filefield'); + $this->assertEquals('string', $result); + } } diff --git a/lib/Cake/Test/Case/Model/ModelReadTest.php b/lib/Cake/Test/Case/Model/ModelReadTest.php index b684f06d07e..255371253ee 100644 --- a/lib/Cake/Test/Case/Model/ModelReadTest.php +++ b/lib/Cake/Test/Case/Model/ModelReadTest.php @@ -7836,6 +7836,38 @@ public function testVirtualFields() { $this->assertEquals(4, $result); } +/** + * Test virtualfields that contain subqueries get correctly + * quoted allowing reserved words to be used. + * + * @return void + */ + public function testVirtualFieldSubqueryReservedWords() { + $this->loadFixtures('User'); + $user = ClassRegistry::init('User'); + $user->cacheMethods = false; + $ds = $user->getDataSource(); + + $sub = $ds->buildStatement( + array( + 'fields' => array('Table.user'), + 'table' => $ds->fullTableName($user), + 'alias' => 'Table', + 'limit' => 1, + 'conditions' => array( + "Table.id > 1" + ) + ), + $user + ); + $user->virtualFields = array( + 'sub_test' => $sub + ); + + $result = $user->find('first'); + $this->assertNotEmpty($result); + } + /** * testVirtualFieldsOrder() * diff --git a/lib/Cake/Test/Case/Model/ModelValidationTest.php b/lib/Cake/Test/Case/Model/ModelValidationTest.php index 9ec889f800d..bd65b16e96a 100644 --- a/lib/Cake/Test/Case/Model/ModelValidationTest.php +++ b/lib/Cake/Test/Case/Model/ModelValidationTest.php @@ -210,8 +210,8 @@ public function testValidates() { $TestModel->validate = array( 'user_id' => 'numeric', - 'title' => array('allowEmpty' => false, 'rule' => 'notEmpty'), - 'body' => 'notEmpty' + 'title' => array('allowEmpty' => false, 'rule' => 'notBlank'), + 'body' => 'notBlank' ); $data = array('TestValidate' => array( @@ -380,7 +380,7 @@ public function testValidates() { ), 'title' => array( 'allowEmpty' => false, - 'rule' => 'notEmpty' + 'rule' => 'notBlank' )); $data = array('TestValidate' => array( @@ -427,7 +427,7 @@ public function testValidates() { ), 'title' => array( 'allowEmpty' => false, - 'rule' => 'notEmpty' + 'rule' => 'notBlank' )); $data = array('TestValidate' => array( @@ -554,6 +554,44 @@ public function testValidates() { $this->assertEquals($expected, $result); } +/** + * test that validates() still performs correctly when useTable = false on the model. + * + * @return void + */ + public function testValidatesWithNoTable() { + $TestModel = new TheVoid(); + $TestModel->validate = array( + 'title' => array( + 'notEmpty' => array( + 'rule' => array('notBlank'), + 'required' => true, + ), + 'tooShort' => array( + 'rule' => array('minLength', 10), + ), + ), + ); + $data = array( + 'TheVoid' => array( + 'title' => 'too short', + ), + ); + $TestModel->create($data); + $result = $TestModel->validates(); + $this->assertFalse($result); + + $data = array( + 'TheVoid' => array( + 'id' => '1', + 'title' => 'A good title', + ), + ); + $TestModel->create($data); + $result = $TestModel->validates(); + $this->assertTrue($result); + } + /** * test that validates() checks all the 'with' associations as well for validation * as this can cause partial/wrong data insertion. @@ -577,7 +615,7 @@ public function testValidatesWithAssociations() { $Something = new Something(); $JoinThing = $Something->JoinThing; - $JoinThing->validate = array('doomed' => array('rule' => 'notEmpty')); + $JoinThing->validate = array('doomed' => array('rule' => 'notBlank')); $expectedError = array('doomed' => array('This field cannot be left blank')); @@ -620,10 +658,10 @@ public function testValidateWithFieldListAndBehavior() { $TestModel = new ValidationTest1(); $TestModel->validate = array( 'title' => array( - 'rule' => 'notEmpty', + 'rule' => 'notBlank', ), 'name' => array( - 'rule' => 'notEmpty', + 'rule' => 'notBlank', )); $TestModel->Behaviors->attach('ValidationRule', array('fields' => array('name'))); @@ -659,7 +697,7 @@ public function testValidatesWithModelsAndSaveAll() { $Something = new Something(); $JoinThing = $Something->JoinThing; - $JoinThing->validate = array('doomed' => array('rule' => 'notEmpty')); + $JoinThing->validate = array('doomed' => array('rule' => 'notBlank')); $expectedError = array('doomed' => array('This field cannot be left blank')); $Something->create(); @@ -850,8 +888,8 @@ public function testStateValidation() { $Article->validate = array( 'title' => array( - 'notempty' => array( - 'rule' => 'notEmpty', + 'notBlank' => array( + 'rule' => 'notBlank', 'on' => 'create' ) ) @@ -868,8 +906,8 @@ public function testStateValidation() { unset($data['Article']['id']); $Article->validate = array( 'title' => array( - 'notempty' => array( - 'rule' => 'notEmpty', + 'notBlank' => array( + 'rule' => 'notBlank', 'on' => 'update' ) ) @@ -903,8 +941,8 @@ public function testStateRequiredValidation() { $Article->validate = array( 'title' => array( - 'notempty' => array( - 'rule' => 'notEmpty', + 'notBlank' => array( + 'rule' => 'notBlank', 'required' => 'create' ) ) @@ -921,8 +959,8 @@ public function testStateRequiredValidation() { unset($data['Article']['id']); $Article->validate = array( 'title' => array( - 'notempty' => array( - 'rule' => 'notEmpty', + 'notBlank' => array( + 'rule' => 'notBlank', 'required' => 'update' ) ) @@ -956,8 +994,8 @@ public function testOnRequiredConflictValidation() { $Article->validate = array( 'title' => array( - 'notempty' => array( - 'rule' => 'notEmpty', + 'notBlank' => array( + 'rule' => 'notBlank', 'required' => 'create', 'on' => 'create' ) @@ -969,8 +1007,8 @@ public function testOnRequiredConflictValidation() { $Article->validate = array( 'title' => array( - 'notempty' => array( - 'rule' => 'notEmpty', + 'notBlank' => array( + 'rule' => 'notBlank', 'required' => 'update', 'on' => 'create' ) @@ -982,8 +1020,8 @@ public function testOnRequiredConflictValidation() { $Article->validate = array( 'title' => array( - 'notempty' => array( - 'rule' => 'notEmpty', + 'notBlank' => array( + 'rule' => 'notBlank', 'required' => 'create', 'on' => 'update' ) @@ -995,8 +1033,8 @@ public function testOnRequiredConflictValidation() { $Article->validate = array( 'title' => array( - 'notempty' => array( - 'rule' => 'notEmpty', + 'notBlank' => array( + 'rule' => 'notBlank', 'required' => 'update', 'on' => 'update' ) @@ -1008,8 +1046,8 @@ public function testOnRequiredConflictValidation() { $Article->validate = array( 'title' => array( - 'notempty' => array( - 'rule' => 'notEmpty', + 'notBlank' => array( + 'rule' => 'notBlank', 'required' => 'create', 'on' => 'create' ) @@ -1023,8 +1061,8 @@ public function testOnRequiredConflictValidation() { $Article->validate = array( 'title' => array( - 'notempty' => array( - 'rule' => 'notEmpty', + 'notBlank' => array( + 'rule' => 'notBlank', 'required' => 'update', 'on' => 'create' ) @@ -1036,8 +1074,8 @@ public function testOnRequiredConflictValidation() { $Article->validate = array( 'title' => array( - 'notempty' => array( - 'rule' => 'notEmpty', + 'notBlank' => array( + 'rule' => 'notBlank', 'required' => 'create', 'on' => 'update' ) @@ -1049,8 +1087,8 @@ public function testOnRequiredConflictValidation() { $Article->validate = array( 'title' => array( - 'notempty' => array( - 'rule' => 'notEmpty', + 'notBlank' => array( + 'rule' => 'notBlank', 'required' => 'update', 'on' => 'update' ) @@ -1072,8 +1110,8 @@ public function testSaveAllDeepValidateOnly() { $TestModel = new Article(); $TestModel->hasMany['Comment']['order'] = array('Comment.created' => 'ASC'); $TestModel->hasAndBelongsToMany = array(); - $TestModel->Comment->Attachment->validate['attachment'] = 'notEmpty'; - $TestModel->Comment->validate['comment'] = 'notEmpty'; + $TestModel->Comment->Attachment->validate['attachment'] = 'notBlank'; + $TestModel->Comment->validate['comment'] = 'notBlank'; $data = array( 'Article' => array('id' => 2), @@ -1400,8 +1438,8 @@ public function testSaveAllNotDeepValidateOnly() { $TestModel = new Article(); $TestModel->hasMany['Comment']['order'] = array('Comment.created' => 'ASC'); $TestModel->hasAndBelongsToMany = array(); - $TestModel->Comment->Attachment->validate['attachment'] = 'notEmpty'; - $TestModel->Comment->validate['comment'] = 'notEmpty'; + $TestModel->Comment->Attachment->validate['attachment'] = 'notBlank'; + $TestModel->Comment->validate['comment'] = 'notBlank'; $data = array( 'Article' => array('id' => 2, 'body' => ''), @@ -1550,7 +1588,7 @@ public function testSaveAllNotDeepValidateOnly() { public function testValidateAssociated() { $this->loadFixtures('Comment', 'Attachment', 'Article', 'User'); $TestModel = new Comment(); - $TestModel->Attachment->validate = array('attachment' => 'notEmpty'); + $TestModel->Attachment->validate = array('attachment' => 'notBlank'); $data = array( 'Comment' => array( @@ -1577,7 +1615,7 @@ public function testValidateAssociated() { $this->assertTrue($result); $this->assertEmpty($TestModel->validationErrors); - $TestModel->validate = array('comment' => 'notEmpty'); + $TestModel->validate = array('comment' => 'notBlank'); $record = array( 'Comment' => array( 'user_id' => 1, @@ -1608,7 +1646,7 @@ public function testValidateAssociated() { $TestModel = new Article(); $TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array(); - $TestModel->Comment->validate = array('comment' => 'notEmpty'); + $TestModel->Comment->validate = array('comment' => 'notBlank'); $data = array( 'Article' => array('id' => 2), 'Comment' => array( @@ -1653,8 +1691,8 @@ public function testValidateAssociated() { $model = new Comment(); $model->deleteAll(true); - $model->validate = array('comment' => 'notEmpty'); - $model->Attachment->validate = array('attachment' => 'notEmpty'); + $model->validate = array('comment' => 'notBlank'); + $model->Attachment->validate = array('attachment' => 'notBlank'); $model->Attachment->bindModel(array('belongsTo' => array('Comment'))); $expected = array( 'comment' => array('This field cannot be left blank'), @@ -1682,7 +1720,7 @@ public function testValidateAssociated() { */ public function testValidateMany() { $TestModel = new Article(); - $TestModel->validate = array('title' => 'notEmpty'); + $TestModel->validate = array('title' => 'notBlank'); $data = array( 0 => array('title' => ''), 1 => array('title' => 'title 1'), @@ -1803,13 +1841,13 @@ public function testArrayAccessGet() { $this->assertEquals('title', $titleValidator->field); $this->assertCount(1, $titleValidator->getRules()); $rule = current($titleValidator->getRules()); - $this->assertEquals('notEmpty', $rule->rule); + $this->assertEquals('notBlank', $rule->rule); $titleValidator = $Validator['body']; $this->assertEquals('body', $titleValidator->field); $this->assertCount(1, $titleValidator->getRules()); $rule = current($titleValidator->getRules()); - $this->assertEquals('notEmpty', $rule->rule); + $this->assertEquals('notBlank', $rule->rule); $titleValidator = $Validator['user_id']; $this->assertEquals('user_id', $titleValidator->field); @@ -1996,8 +2034,8 @@ public function testValidateFirstWithBeforeValidate() { $model = new CustomArticle(); $model->validate = array( 'title' => array( - 'notempty' => array( - 'rule' => 'notEmpty', + 'notBlank' => array( + 'rule' => 'notBlank', 'required' => true, 'allowEmpty' => false ) @@ -2050,8 +2088,8 @@ public function testValidateFirstAssociatedWithBeforeValidate() { $model = new CustomArticle(); $model->validate = array( 'title' => array( - 'notempty' => array( - 'rule' => 'notEmpty', + 'notBlank' => array( + 'rule' => 'notBlank', 'required' => true ) ) @@ -2203,8 +2241,8 @@ public function testValidateFirstAssociatedWithBeforeValidate2() { $model = new CustomArticle(); $model->validate = array( 'title' => array( - 'notempty' => array( - 'rule' => 'notEmpty', + 'notBlank' => array( + 'rule' => 'notBlank', 'required' => true ) ) @@ -2294,7 +2332,7 @@ public function testValidateAssociatedAtomicFalseDeepTrueWithErrors() { $this->loadFixtures('Comment', 'Article', 'User', 'Attachment'); $Attachment = ClassRegistry::init('Attachment'); $Attachment->Comment->validator()->add('comment', array( - array('rule' => 'notEmpty') + array('rule' => 'notBlank') )); $Attachment->Comment->User->bindModel(array( 'hasMany' => array( @@ -2353,7 +2391,7 @@ public function testValidateManyAtomicFalseDeepTrueWithErrors() { $this->loadFixtures('Comment', 'Article', 'User'); $Article = ClassRegistry::init('Article'); $Article->Comment->validator()->add('comment', array( - array('rule' => 'notEmpty') + array('rule' => 'notBlank') )); $data = array( diff --git a/lib/Cake/Test/Case/Model/ModelWriteTest.php b/lib/Cake/Test/Case/Model/ModelWriteTest.php index 529d62902ec..70ca570e991 100644 --- a/lib/Cake/Test/Case/Model/ModelWriteTest.php +++ b/lib/Cake/Test/Case/Model/ModelWriteTest.php @@ -387,6 +387,66 @@ public function testSaveFieldListResetsWhitelistOnFailedSave() { $this->assertEquals($whitelist, $model->whitelist); } +/** + * Test that save() with a fieldList continues to write + * updated in all cases. + * + * @return void + */ + public function testSaveUpdatedWithFieldList() { + $this->loadFixtures('Post', 'Author'); + $model = ClassRegistry::init('Post'); + $original = $model->find('first', array( + 'conditions' => array('Post.id' => 1) + )); + $data = array( + 'Post' => array( + 'id' => 1, + 'title' => 'New title', + 'updated' => '1999-01-01 00:00:00', + ) + ); + $model->save($data, array( + 'fieldList' => array('title') + )); + $new = $model->find('first', array( + 'conditions' => array('Post.id' => 1) + )); + $this->assertGreaterThan($original['Post']['updated'], $new['Post']['updated']); + } + +/** + * Test save() resets the whitelist after afterSave + * + * @return void + */ + public function testSaveResetWhitelistOnSuccess() { + $this->loadFixtures('Post'); + + $callback = array($this, 'callbackForWhitelistReset'); + $model = ClassRegistry::init('Post'); + $model->whitelist = array('author_id', 'title', 'body'); + $model->getEventManager()->attach($callback, 'Model.afterSave'); + $data = array( + 'title' => 'New post', + 'body' => 'Post body', + 'author_id' => 1 + ); + $result = $model->save($data); + $this->assertNotEmpty($result); + } + +/** + * Callback for testing whitelist in afterSave + * + * @param Model $model The model having save called. + * @return void + */ + public function callbackForWhitelistReset($event) { + $expected = array('author_id', 'title', 'body', 'updated', 'created'); + $this->assertEquals($expected, $event->subject()->whitelist); + } + /** * testSaveWithCounterCache method * @@ -847,7 +907,7 @@ public function testSaveTransaction() { // Check if Database supports transactions - $PostModel->validate = array('title' => 'notEmpty'); + $PostModel->validate = array('title' => 'notBlank'); $data = array( array('author_id' => 1, 'title' => 'New Fourth Post'), array('author_id' => 1, 'title' => 'New Fifth Post'), @@ -1928,8 +1988,8 @@ public function testSaveHabtm() { 'title' => 'New Article With Tags and fieldList', 'body' => '', 'published' => 'N', - 'created' => '', - 'updated' => '' + 'created' => static::date(), + 'updated' => static::date(), ), 'Tag' => array( 0 => array( @@ -2070,7 +2130,7 @@ public function testSaveHabtmNoPrimaryData() { 'body' => 'Second Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', - 'updated' => self::date() + 'updated' => static::date() ), 'Tag' => array( array( @@ -2753,18 +2813,9 @@ public function testRecordExists() { $TestModel = new TheVoid(); $this->assertFalse($TestModel->exists()); - } -/** - * testRecordExistsMissingTable method - * - * @expectedException PDOException - * @return void - */ - public function testRecordExistsMissingTable() { - $TestModel = new TheVoid(); $TestModel->id = 5; - $TestModel->exists(); + $this->assertFalse($TestModel->exists()); } /** @@ -3010,23 +3061,23 @@ public function testSaveMultipleHabtm() { 'JoinA' => array( 'id' => '1', 'name' => 'New name for Join A 1', - 'updated' => self::date() + 'updated' => static::date() ), 'JoinB' => array( array( 'id' => 1, 'join_b_id' => 2, 'other' => 'New data for Join A 1 Join B 2', - 'created' => self::date(), - 'updated' => self::date() + 'created' => static::date(), + 'updated' => static::date() )), 'JoinC' => array( array( 'id' => 1, 'join_c_id' => 2, 'other' => 'New data for Join A 1 Join C 2', - 'created' => self::date(), - 'updated' => self::date() + 'created' => static::date(), + 'updated' => static::date() ))); $TestModel->set($data); @@ -3039,7 +3090,7 @@ public function testSaveMultipleHabtm() { 'name' => 'New name for Join A 1', 'body' => 'Join A 1 Body', 'created' => '2008-01-03 10:54:23', - 'updated' => self::date() + 'updated' => static::date() ), 'JoinB' => array( 0 => array( @@ -3052,8 +3103,8 @@ public function testSaveMultipleHabtm() { 'join_a_id' => 1, 'join_b_id' => 2, 'other' => 'New data for Join A 1 Join B 2', - 'created' => self::date(), - 'updated' => self::date() + 'created' => static::date(), + 'updated' => static::date() ))), 'JoinC' => array( 0 => array( @@ -3066,8 +3117,8 @@ public function testSaveMultipleHabtm() { 'join_a_id' => 1, 'join_c_id' => 2, 'other' => 'New data for Join A 1 Join C 2', - 'created' => self::date(), - 'updated' => self::date() + 'created' => static::date(), + 'updated' => static::date() )))); $this->assertEquals($expected, $result); @@ -3111,10 +3162,10 @@ public function testSaveAll() { 'password' => '5f4dcc3b5aa765d61d8327deb882cf90', 'test' => 'working' )); - $this->assertEquals(self::date(), $result[3]['Post']['created']); - $this->assertEquals(self::date(), $result[3]['Post']['updated']); - $this->assertEquals(self::date(), $result[3]['Author']['created']); - $this->assertEquals(self::date(), $result[3]['Author']['updated']); + $this->assertEquals(static::date(), $result[3]['Post']['created']); + $this->assertEquals(static::date(), $result[3]['Post']['updated']); + $this->assertEquals(static::date(), $result[3]['Author']['created']); + $this->assertEquals(static::date(), $result[3]['Author']['updated']); unset($result[3]['Post']['created'], $result[3]['Post']['updated']); unset($result[3]['Author']['created'], $result[3]['Author']['updated']); $this->assertEquals($expected, $result[3]); @@ -3159,10 +3210,10 @@ public function testSaveAll() { 'body' => 'Second multi-record post', 'published' => 'N' ))); - $this->assertEquals(self::date(), $result[0]['Post']['created']); - $this->assertEquals(self::date(), $result[0]['Post']['updated']); - $this->assertEquals(self::date(), $result[1]['Post']['created']); - $this->assertEquals(self::date(), $result[1]['Post']['updated']); + $this->assertEquals(static::date(), $result[0]['Post']['created']); + $this->assertEquals(static::date(), $result[0]['Post']['updated']); + $this->assertEquals(static::date(), $result[1]['Post']['created']); + $this->assertEquals(static::date(), $result[1]['Post']['updated']); unset($result[0]['Post']['created'], $result[0]['Post']['updated']); unset($result[1]['Post']['created'], $result[1]['Post']['updated']); $this->assertEquals($expected, $result); @@ -3188,8 +3239,8 @@ public function testSaveAll() { 'comment' => 'New comment with attachment', 'published' => 'Y' ); - $this->assertEquals(self::date(), $result[6]['Comment']['created']); - $this->assertEquals(self::date(), $result[6]['Comment']['updated']); + $this->assertEquals(static::date(), $result[6]['Comment']['created']); + $this->assertEquals(static::date(), $result[6]['Comment']['updated']); unset($result[6]['Comment']['created'], $result[6]['Comment']['updated']); $this->assertEquals($expected, $result[6]['Comment']); @@ -3198,8 +3249,8 @@ public function testSaveAll() { 'comment_id' => '7', 'attachment' => 'some_file.tgz' ); - $this->assertEquals(self::date(), $result[6]['Attachment']['created']); - $this->assertEquals(self::date(), $result[6]['Attachment']['updated']); + $this->assertEquals(static::date(), $result[6]['Attachment']['created']); + $this->assertEquals(static::date(), $result[6]['Attachment']['updated']); unset($result[6]['Attachment']['created'], $result[6]['Attachment']['updated']); $this->assertEquals($expected, $result[6]['Attachment']); } @@ -3381,8 +3432,8 @@ public function testSaveAllHasOneValidation() { $model->Attachment->deleteAll(true); $this->assertEquals(array(), $model->Attachment->find('all')); - $model->validate = array('comment' => 'notEmpty'); - $model->Attachment->validate = array('attachment' => 'notEmpty'); + $model->validate = array('comment' => 'notBlank'); + $model->Attachment->validate = array('attachment' => 'notBlank'); $model->Attachment->bindModel(array('belongsTo' => array('Comment'))); $result = $model->saveAll( @@ -3464,7 +3515,7 @@ public function testSaveAllAtomic() { $this->assertSame($result, array('Article' => true, 'Comment' => array(true, true))); $TestModel->validate = array( - 'title' => 'notEmpty', + 'title' => 'notBlank', 'author_id' => 'numeric' ); $result = $TestModel->saveAll(array( @@ -3669,7 +3720,7 @@ public function testSaveAllDeepMany() { ) ) ); - $TestModel->Comment->validate['comment'] = 'notEmpty'; + $TestModel->Comment->validate['comment'] = 'notBlank'; $result = $TestModel->saveAll($data, array('deep' => true)); $this->assertFalse($result); @@ -3712,8 +3763,8 @@ public function testSaveAllDeepValidateOnly() { $TestModel = new Article(); $TestModel->hasMany['Comment']['order'] = array('Comment.created' => 'ASC'); $TestModel->hasAndBelongsToMany = array(); - $TestModel->Comment->Attachment->validate['attachment'] = 'notEmpty'; - $TestModel->Comment->validate['comment'] = 'notEmpty'; + $TestModel->Comment->Attachment->validate['attachment'] = 'notBlank'; + $TestModel->Comment->validate['comment'] = 'notBlank'; $result = $TestModel->saveAll( array( @@ -4123,7 +4174,7 @@ public function testSaveAllNotDeepMany() { ) ) ); - $TestModel->Comment->validate['comment'] = 'notEmpty'; + $TestModel->Comment->validate['comment'] = 'notBlank'; $result = $TestModel->saveAll($data, array('deep' => false)); $this->assertFalse($result); @@ -4163,8 +4214,8 @@ public function testSaveAllNotDeepValidateOnly() { $TestModel = new Article(); $TestModel->hasMany['Comment']['order'] = array('Comment.created' => 'ASC'); $TestModel->hasAndBelongsToMany = array(); - $TestModel->Comment->Attachment->validate['attachment'] = 'notEmpty'; - $TestModel->Comment->validate['comment'] = 'notEmpty'; + $TestModel->Comment->Attachment->validate['attachment'] = 'notBlank'; + $TestModel->Comment->validate['comment'] = 'notBlank'; $result = $TestModel->saveAll( array( @@ -4384,7 +4435,7 @@ public function testSaveAllHasManyValidation() { $this->loadFixtures('Article', 'Comment'); $TestModel = new Article(); $TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array(); - $TestModel->Comment->validate = array('comment' => 'notEmpty'); + $TestModel->Comment->validate = array('comment' => 'notBlank'); $result = $TestModel->saveAll(array( 'Article' => array('id' => 2), @@ -4425,7 +4476,7 @@ public function testSaveAllManyRowsTransactionNoRollback() { $Post = new TestPost(); $Post->validate = array( - 'title' => array('rule' => array('notEmpty')) + 'title' => array('rule' => array('notBlank')) ); // If validation error occurs, rollback() should be called. @@ -4486,7 +4537,7 @@ public function testSaveAllAssociatedTransactionNoRollback() { $Post = new TestPost(); $Post->Author->validate = array( - 'user' => array('rule' => array('notEmpty')) + 'user' => array('rule' => array('notBlank')) ); // If validation error occurs, rollback() should be called. @@ -4586,7 +4637,7 @@ public function testSaveAllTransaction() { $this->loadFixtures('Post', 'Author', 'Comment', 'Attachment'); $TestModel = new Post(); - $TestModel->validate = array('title' => 'notEmpty'); + $TestModel->validate = array('title' => 'notBlank'); $data = array( array('author_id' => 1, 'title' => 'New Fourth Post'), array('author_id' => 1, 'title' => 'New Fifth Post'), @@ -4633,8 +4684,8 @@ public function testSaveAllTransaction() { 'title' => 'New Fourth Post', 'body' => null, 'published' => 'N', - 'created' => self::date(), - 'updated' => self::date() + 'created' => static::date(), + 'updated' => static::date() )); $expected[] = array( @@ -4644,8 +4695,8 @@ public function testSaveAllTransaction() { 'title' => 'New Fifth Post', 'body' => null, 'published' => 'N', - 'created' => self::date(), - 'updated' => self::date() + 'created' => static::date(), + 'updated' => static::date() )); $this->assertEquals($expected, $result); @@ -4701,8 +4752,8 @@ public function testSaveAllTransaction() { 'title' => 'New Fourth Post', 'body' => 'Third Post Body', 'published' => 'N', - 'created' => self::date(), - 'updated' => self::date() + 'created' => static::date(), + 'updated' => static::date() )); $expected[] = array( @@ -4712,13 +4763,13 @@ public function testSaveAllTransaction() { 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'N', - 'created' => self::date(), - 'updated' => self::date() + 'created' => static::date(), + 'updated' => static::date() )); } $this->assertEquals($expected, $result); - $TestModel->validate = array('title' => 'notEmpty'); + $TestModel->validate = array('title' => 'notBlank'); $data = array( array('author_id' => 1, 'title' => 'New Fourth Post'), array('author_id' => 1, 'title' => 'New Fifth Post'), @@ -4838,15 +4889,15 @@ public function testSaveAllValidation() { 'body' => 'Fourth post body', 'published' => 'N' ))); - $this->assertEquals(self::date(), $result[0]['Post']['updated']); - $this->assertEquals(self::date(), $result[1]['Post']['updated']); - $this->assertEquals(self::date(), $result[3]['Post']['created']); - $this->assertEquals(self::date(), $result[3]['Post']['updated']); + $this->assertEquals(static::date(), $result[0]['Post']['updated']); + $this->assertEquals(static::date(), $result[1]['Post']['updated']); + $this->assertEquals(static::date(), $result[3]['Post']['created']); + $this->assertEquals(static::date(), $result[3]['Post']['updated']); unset($result[0]['Post']['updated'], $result[1]['Post']['updated']); unset($result[3]['Post']['created'], $result[3]['Post']['updated']); $this->assertEquals($expected, $result); - $TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric'); + $TestModel->validate = array('title' => 'notBlank', 'author_id' => 'numeric'); $data = array( array( 'id' => '1', @@ -4872,7 +4923,7 @@ public function testSaveAllValidation() { $this->assertEquals($errors, $TestModel->validationErrors); - $TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric'); + $TestModel->validate = array('title' => 'notBlank', 'author_id' => 'numeric'); $data = array( array( 'id' => '1', @@ -4932,10 +4983,10 @@ public function testSaveAllValidation() { ) ); - $this->assertEquals(self::date(), $result[0]['Post']['updated']); - $this->assertEquals(self::date(), $result[1]['Post']['updated']); - $this->assertEquals(self::date(), $result[3]['Post']['updated']); - $this->assertEquals(self::date(), $result[3]['Post']['created']); + $this->assertEquals(static::date(), $result[0]['Post']['updated']); + $this->assertEquals(static::date(), $result[1]['Post']['updated']); + $this->assertEquals(static::date(), $result[3]['Post']['updated']); + $this->assertEquals(static::date(), $result[3]['Post']['created']); unset( $result[0]['Post']['updated'], $result[1]['Post']['updated'], $result[3]['Post']['updated'], $result[3]['Post']['created'] @@ -4974,7 +5025,7 @@ public function testSaveAllValidation() { public function testSaveAllValidationOnly() { $this->loadFixtures('Comment', 'Attachment'); $TestModel = new Comment(); - $TestModel->Attachment->validate = array('attachment' => 'notEmpty'); + $TestModel->Attachment->validate = array('attachment' => 'notBlank'); $data = array( 'Comment' => array( @@ -4989,7 +5040,7 @@ public function testSaveAllValidationOnly() { $this->assertFalse($result); $TestModel = new Article(); - $TestModel->validate = array('title' => 'notEmpty'); + $TestModel->validate = array('title' => 'notBlank'); $result = $TestModel->saveAll( array( 0 => array('title' => ''), @@ -5029,7 +5080,7 @@ public function testSaveAllValidateFirst() { $model = new Article(); $model->deleteAll(true); - $model->Comment->validate = array('comment' => 'notEmpty'); + $model->Comment->validate = array('comment' => 'notBlank'); $result = $model->saveAll(array( 'Article' => array( 'title' => 'Post with Author', @@ -5166,7 +5217,7 @@ public function testSaveAllHasManyValidationOnly() { $this->loadFixtures('Article', 'Comment', 'Attachment'); $TestModel = new Article(); $TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array(); - $TestModel->Comment->validate = array('comment' => 'notEmpty'); + $TestModel->Comment->validate = array('comment' => 'notBlank'); $result = $TestModel->saveAll( array( @@ -5316,10 +5367,10 @@ public function testSaveAssociated() { 'password' => '5f4dcc3b5aa765d61d8327deb882cf90', 'test' => 'working' )); - $this->assertEquals(self::date(), $result[3]['Post']['updated']); - $this->assertEquals(self::date(), $result[3]['Post']['created']); - $this->assertEquals(self::date(), $result[3]['Author']['created']); - $this->assertEquals(self::date(), $result[3]['Author']['updated']); + $this->assertEquals(static::date(), $result[3]['Post']['updated']); + $this->assertEquals(static::date(), $result[3]['Post']['created']); + $this->assertEquals(static::date(), $result[3]['Author']['created']); + $this->assertEquals(static::date(), $result[3]['Author']['updated']); unset( $result[3]['Post']['updated'], $result[3]['Post']['created'], $result[3]['Author']['updated'], $result[3]['Author']['created'] @@ -5348,8 +5399,8 @@ public function testSaveAssociated() { 'comment' => 'New comment with attachment', 'published' => 'Y' ); - $this->assertEquals(self::date(), $result[6]['Comment']['updated']); - $this->assertEquals(self::date(), $result[6]['Comment']['created']); + $this->assertEquals(static::date(), $result[6]['Comment']['updated']); + $this->assertEquals(static::date(), $result[6]['Comment']['created']); unset($result[6]['Comment']['updated'], $result[6]['Comment']['created']); $this->assertEquals($expected, $result[6]['Comment']); @@ -5358,8 +5409,8 @@ public function testSaveAssociated() { 'comment_id' => '7', 'attachment' => 'some_file.tgz' ); - $this->assertEquals(self::date(), $result[6]['Attachment']['updated']); - $this->assertEquals(self::date(), $result[6]['Attachment']['created']); + $this->assertEquals(static::date(), $result[6]['Attachment']['updated']); + $this->assertEquals(static::date(), $result[6]['Attachment']['created']); unset($result[6]['Attachment']['updated'], $result[6]['Attachment']['created']); $this->assertEquals($expected, $result[6]['Attachment']); } @@ -5374,7 +5425,7 @@ public function testSaveAssociatedAtomicFalseValidateFirstWithErrors() { $this->loadFixtures('Comment', 'Article', 'User'); $Article = ClassRegistry::init('Article'); $Article->Comment->validator()->add('comment', array( - array('rule' => 'notEmpty') + array('rule' => 'notBlank') )); $data = array( @@ -5459,10 +5510,10 @@ public function testSaveMany() { ) ) ); - $this->assertEquals(self::date(), $result[0]['Post']['updated']); - $this->assertEquals(self::date(), $result[0]['Post']['created']); - $this->assertEquals(self::date(), $result[1]['Post']['updated']); - $this->assertEquals(self::date(), $result[1]['Post']['created']); + $this->assertEquals(static::date(), $result[0]['Post']['updated']); + $this->assertEquals(static::date(), $result[0]['Post']['created']); + $this->assertEquals(static::date(), $result[1]['Post']['updated']); + $this->assertEquals(static::date(), $result[1]['Post']['created']); unset($result[0]['Post']['updated'], $result[0]['Post']['created']); unset($result[1]['Post']['updated'], $result[1]['Post']['created']); $this->assertEquals($expected, $result); @@ -5662,8 +5713,8 @@ public function testSaveAssociatedHasOneValidation() { $model->Attachment->deleteAll(true); $this->assertEquals(array(), $model->Attachment->find('all')); - $model->validate = array('comment' => 'notEmpty'); - $model->Attachment->validate = array('attachment' => 'notEmpty'); + $model->validate = array('comment' => 'notBlank'); + $model->Attachment->validate = array('attachment' => 'notBlank'); $model->Attachment->bindModel(array('belongsTo' => array('Comment'))); $result = $model->saveAssociated( @@ -5757,7 +5808,7 @@ public function testSaveManyAtomic() { ), array('atomic' => false)); $this->assertSame($result, array(true, true, true)); - $TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric'); + $TestModel->validate = array('title' => 'notBlank', 'author_id' => 'numeric'); $result = $TestModel->saveMany(array( array( 'id' => '1', @@ -5860,7 +5911,7 @@ public function testSaveAssociatedHasManyEmpty() { $this->loadFixtures('Article', 'Comment'); $TestModel = new Article(); $TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array(); - $TestModel->validate = $TestModel->Comment->validate = array('user_id' => array('notEmpty' => array('rule' => 'notEmpty', 'required' => true))); + $TestModel->validate = $TestModel->Comment->validate = array('user_id' => array('notBlank' => array('rule' => 'notBlank', 'required' => true))); //empty hasMany data is ignored in save $result = $TestModel->saveAssociated(array( @@ -5892,7 +5943,7 @@ public function testSaveAssociatedHasManyValidation() { $this->loadFixtures('Article', 'Comment'); $TestModel = new Article(); $TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array(); - $TestModel->Comment->validate = array('comment' => 'notEmpty'); + $TestModel->Comment->validate = array('comment' => 'notBlank'); $result = $TestModel->saveAssociated(array( 'Article' => array('id' => 2), @@ -5933,7 +5984,7 @@ public function testSaveManyTransactionNoRollback() { $Post = new TestPost(); $Post->validate = array( - 'title' => array('rule' => array('notEmpty')) + 'title' => array('rule' => array('notBlank')) ); // If validation error occurs, rollback() should be called. @@ -5994,7 +6045,7 @@ public function testSaveAssociatedTransactionNoRollback() { $Post = new TestPost(); $Post->Author->validate = array( - 'user' => array('rule' => array('notEmpty')) + 'user' => array('rule' => array('notBlank')) ); // If validation error occurs, rollback() should be called. @@ -6094,7 +6145,7 @@ public function testSaveManyTransaction() { $this->loadFixtures('Post', 'Author', 'Comment', 'Attachment'); $TestModel = new Post(); - $TestModel->validate = array('title' => 'notEmpty'); + $TestModel->validate = array('title' => 'notBlank'); $data = array( array('author_id' => 1, 'title' => 'New Fourth Post'), array('author_id' => 1, 'title' => 'New Fifth Post'), @@ -6152,10 +6203,10 @@ public function testSaveManyTransaction() { 'published' => 'N', )); - $this->assertEquals(self::date(), $result[3]['Post']['created']); - $this->assertEquals(self::date(), $result[3]['Post']['updated']); - $this->assertEquals(self::date(), $result[4]['Post']['created']); - $this->assertEquals(self::date(), $result[4]['Post']['updated']); + $this->assertEquals(static::date(), $result[3]['Post']['created']); + $this->assertEquals(static::date(), $result[3]['Post']['updated']); + $this->assertEquals(static::date(), $result[4]['Post']['created']); + $this->assertEquals(static::date(), $result[4]['Post']['updated']); unset($result[3]['Post']['created'], $result[3]['Post']['updated']); unset($result[4]['Post']['created'], $result[4]['Post']['updated']); $this->assertEquals($expected, $result); @@ -6221,16 +6272,16 @@ public function testSaveManyTransaction() { 'body' => 'Third Post Body', 'published' => 'N' )); - $this->assertEquals(self::date(), $result[3]['Post']['created']); - $this->assertEquals(self::date(), $result[3]['Post']['updated']); - $this->assertEquals(self::date(), $result[4]['Post']['created']); - $this->assertEquals(self::date(), $result[4]['Post']['updated']); + $this->assertEquals(static::date(), $result[3]['Post']['created']); + $this->assertEquals(static::date(), $result[3]['Post']['updated']); + $this->assertEquals(static::date(), $result[4]['Post']['created']); + $this->assertEquals(static::date(), $result[4]['Post']['updated']); unset($result[3]['Post']['created'], $result[3]['Post']['updated']); unset($result[4]['Post']['created'], $result[4]['Post']['updated']); } $this->assertEquals($expected, $result); - $TestModel->validate = array('title' => 'notEmpty'); + $TestModel->validate = array('title' => 'notBlank'); $data = array( array('author_id' => 1, 'title' => 'New Fourth Post'), array('author_id' => 1, 'title' => 'New Fifth Post'), @@ -6355,15 +6406,15 @@ public function testSaveManyValidation() { ) ); - $this->assertEquals(self::date(), $result[0]['Post']['updated']); - $this->assertEquals(self::date(), $result[1]['Post']['updated']); - $this->assertEquals(self::date(), $result[3]['Post']['created']); - $this->assertEquals(self::date(), $result[3]['Post']['updated']); + $this->assertEquals(static::date(), $result[0]['Post']['updated']); + $this->assertEquals(static::date(), $result[1]['Post']['updated']); + $this->assertEquals(static::date(), $result[3]['Post']['created']); + $this->assertEquals(static::date(), $result[3]['Post']['updated']); unset($result[0]['Post']['updated'], $result[1]['Post']['updated']); unset($result[3]['Post']['created'], $result[3]['Post']['updated']); $this->assertEquals($expected, $result); - $TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric'); + $TestModel->validate = array('title' => 'notBlank', 'author_id' => 'numeric'); $data = array( array( 'id' => '1', @@ -6389,7 +6440,7 @@ public function testSaveManyValidation() { $this->assertEquals($errors, $TestModel->validationErrors); - $TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric'); + $TestModel->validate = array('title' => 'notBlank', 'author_id' => 'numeric'); $data = array( array( 'id' => '1', @@ -6477,7 +6528,7 @@ public function testSaveManyValidation() { */ public function testValidateMany() { $TestModel = new Article(); - $TestModel->validate = array('title' => 'notEmpty'); + $TestModel->validate = array('title' => 'notBlank'); $data = array( 0 => array('title' => ''), 1 => array('title' => 'title 1'), @@ -6513,7 +6564,7 @@ public function testSaveAssociatedValidateFirst() { $model = new Article(); $model->deleteAll(true); - $model->Comment->validate = array('comment' => 'notEmpty'); + $model->Comment->validate = array('comment' => 'notBlank'); $result = $model->saveAssociated(array( 'Article' => array( 'title' => 'Post with Author', @@ -6648,7 +6699,7 @@ public function testSaveManyValidateFirstAtomicFalse() { public function testValidateAssociated() { $this->loadFixtures('Attachment', 'Article', 'Comment'); $TestModel = new Comment(); - $TestModel->Attachment->validate = array('attachment' => 'notEmpty'); + $TestModel->Attachment->validate = array('attachment' => 'notBlank'); $data = array( 'Comment' => array( @@ -6664,7 +6715,7 @@ public function testValidateAssociated() { $TestModel = new Article(); $TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array(); - $TestModel->Comment->validate = array('comment' => 'notEmpty'); + $TestModel->Comment->validate = array('comment' => 'notBlank'); $data = array( 'Article' => array('id' => 2), @@ -7115,15 +7166,15 @@ public function testSaveAllFieldListValidateBelongsTo() { 'title' => 'Post without body', 'body' => null, 'published' => 'N', - 'created' => self::date(), - 'updated' => self::date(), + 'created' => static::date(), + 'updated' => static::date(), ), 'Author' => array( 'id' => '5', 'user' => 'bob', 'password' => null, - 'created' => self::date(), - 'updated' => self::date(), + 'created' => static::date(), + 'updated' => static::date(), 'test' => 'working', ), ); @@ -7178,15 +7229,15 @@ public function testSaveAllFieldListValidateBelongsTo() { 'title' => 'Post title', 'body' => 'Post body', 'published' => 'N', - 'created' => self::date(), - 'updated' => self::date() + 'created' => static::date(), + 'updated' => static::date() ), 'Author' => array( 'id' => '6', 'user' => 'jack', 'password' => 'foobar', - 'created' => self::date(), - 'updated' => self::date(), + 'created' => static::date(), + 'updated' => static::date(), 'test' => 'working' ), ); @@ -7220,8 +7271,8 @@ public function testSaveAllFieldListValidateBelongsTo() { 'title' => 'Multi-record post 1', 'body' => '', 'published' => 'N', - 'created' => self::date(), - 'updated' => self::date() + 'created' => static::date(), + 'updated' => static::date() ) ), array( @@ -7231,8 +7282,8 @@ public function testSaveAllFieldListValidateBelongsTo() { 'title' => 'Multi-record post 2', 'body' => '', 'published' => 'N', - 'created' => self::date(), - 'updated' => self::date() + 'created' => static::date(), + 'updated' => static::date() ) ) ); @@ -7299,8 +7350,8 @@ public function testSaveAllFieldListHasOne() { $this->loadFixtures('Attachment', 'Comment', 'Article', 'User'); $TestModel = new Comment(); - $TestModel->validate = array('comment' => 'notEmpty'); - $TestModel->Attachment->validate = array('attachment' => 'notEmpty'); + $TestModel->validate = array('comment' => 'notBlank'); + $TestModel->Attachment->validate = array('attachment' => 'notBlank'); $record = array( 'Comment' => array( @@ -7335,7 +7386,7 @@ public function testSaveAllFieldListHasOneAddFkToWhitelist() { $this->loadFixtures('ArticleFeatured', 'Featured'); $Article = new ArticleFeatured(); $Article->belongsTo = $Article->hasMany = array(); - $Article->Featured->validate = array('end_date' => 'notEmpty'); + $Article->Featured->validate = array('end_date' => 'notBlank'); $record = array( 'ArticleFeatured' => array( @@ -7652,6 +7703,218 @@ public function testSaveAllDeepEmptyHasManyHasMany() { $this->assertEquals(2, count($result['Attachment'])); } +/** + * Test that boolean fields don't cause saveMany to fail + * + * @return void + */ + public function testSaveManyBooleanFields() { + $this->loadFixtures('Item', 'Syfile', 'Image'); + $data = array( + array( + 'Item' => array( + 'name' => 'testing', + 'syfile_id' => 1, + 'published' => false + ) + ), + array( + 'Item' => array( + 'name' => 'testing 2', + 'syfile_id' => 1, + 'published' => true + ) + ), + ); + $item = ClassRegistry::init('Item'); + $result = $item->saveMany($data, array('atomic' => false)); + + $this->assertCount(2, $result, '2 records should have been saved.'); + $this->assertTrue($result[0], 'Both should have succeded'); + $this->assertTrue($result[1], 'Both should have succeded'); + } + +/** + * testSaveManyDeepHasManyValidationFailure method + * + * @return void + */ + public function testSaveManyDeepHasManyValidationFailure() { + $this->loadFixtures('Article', 'Comment'); + $TestModel = new Article(); + $TestModel->Comment->validate = array( + 'comment' => array( + 'notBlank' => array( + 'rule' => array('notBlank'), + ) + ) + ); + + $result = $TestModel->saveMany(array( + array( + 'user_id' => 1, + 'title' => 'New Article', + 'body' => 'This article contains a invalid comment', + 'Comment' => array( + array( + 'user_id' => 1, + 'comment' => '' + ) + ) + ) + ), array('deep' => true)); + $this->assertFalse($result); + $this->assertEquals(array( + array( + 'Comment' => array( + array('comment' => array('notBlank')) + ) + ) + ), $TestModel->validationErrors); + } + +/** + * testSaveAssociatedDeepHasOneHasManyValidateTrueValidationFailure method + * + * @return void + */ + public function testSaveAssociatedDeepHasOneHasManyValidateTrueValidationFailure() { + $this->loadFixtures('User', 'Article', 'Comment'); + $TestModel = new UserHasOneArticle(); + $TestModel->Article->Comment->validate = array( + 'comment' => array( + 'notBlank' => array( + 'rule' => array('notBlank'), + ) + ) + ); + + $result = $TestModel->saveAssociated(array( + 'User' => array( + 'user' => 'hiromi', + 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', + ), + 'Article' => array( + 'title' => 'Article with User', + 'body' => 'This article will be saved with an user and contains a invalid comment', + 'Comment' => array( + array( + 'user_id' => 1, + 'comment' => '' + ) + ) + ) + ), array('deep' => true, 'validate' => true)); + $this->assertFalse($result); + $this->assertEquals(array( + 'Article' => array( + 'Comment' => array( + array('comment' => array('notBlank')) + ) + ) + ), $TestModel->validationErrors); + } + +/** + * testSaveAssociatedDeepBelongsToHasManyValidateTrueValidationFailure method + * + * @return void + */ + public function testSaveAssociatedDeepBelongsToHasManyValidateTrueValidationFailure() { + $this->loadFixtures('ArticlesTag', 'Article', 'Comment'); + $TestModel = new ArticlesTagBelongsToArticle(); + $TestModel->Article->Comment->validate = array( + 'comment' => array( + 'notBlank' => array( + 'rule' => array('notBlank'), + ) + ) + ); + + $result = $TestModel->saveAssociated(array( + 'ArticlesTagBelongsToArticle' => array( + 'tag_id' => 1, + ), + 'Article' => array( + 'title' => 'Article with User', + 'body' => 'This article will be saved with an user and contains a invalid comment', + 'Comment' => array( + array( + 'user_id' => 1, + 'comment' => '' + ) + ) + ) + ), array('deep' => true, 'validate' => true)); + $this->assertFalse($result); + $this->assertEquals(array( + 'Article' => array( + 'Comment' => array( + array('comment' => array('notBlank')) + ) + ) + ), $TestModel->validationErrors); + } + +/** + * Test that boolean fields don't cause saveAssociated to fail + * + * @return void + */ + public function testSaveAssociatedHasOneBooleanFields() { + $this->loadFixtures('Item', 'Syfile', 'Image'); + $data = array( + 'Syfile' => array( + 'image_id' => 1, + 'name' => 'Some file', + ), + 'Item' => array( + 'name' => 'testing', + 'published' => false + ), + ); + $syfile = ClassRegistry::init('Syfile'); + $syfile->bindModel(array('hasOne' => array('Item')), false); + $result = $syfile->saveAssociated($data, array('atomic' => false)); + + $this->assertCount(2, $result, '2 records should have been saved.'); + $this->assertTrue($result['Syfile'], 'Both should have succeded'); + $this->assertTrue($result['Item'], 'Both should have succeded'); + } + +/** + * Test that boolean fields don't cause saveAssociated to fail + * + * @return void + */ + public function testSaveAssociatedBelongsToBooleanFields() { + $this->loadFixtures('Item', 'Syfile', 'Image'); + $data = array( + 'Syfile' => array( + 'image_id' => 1, + 'name' => 'Some file', + ), + 'Item' => array( + 'name' => 'testing', + 'syfile_id' => 2, + 'published' => false + ), + ); + $item = ClassRegistry::init('Item'); + $item->bindModel(array( + 'belongsTo' => array( + 'Item' => array( + 'foreignKey' => 'image_id' + ) + ) + ), false); + $result = $item->saveAssociated($data, array('atomic' => false)); + + $this->assertCount(2, $result, '2 records should have been saved.'); + $this->assertTrue($result['Syfile'], 'Both should have succeded'); + $this->assertTrue($result['Item'], 'Both should have succeded'); + } + /** * testUpdateAllBoolean * diff --git a/lib/Cake/Test/Case/Model/Validator/CakeValidationRuleTest.php b/lib/Cake/Test/Case/Model/Validator/CakeValidationRuleTest.php index 970ca7a10ff..5b1a9caffb4 100644 --- a/lib/Cake/Test/Case/Model/Validator/CakeValidationRuleTest.php +++ b/lib/Cake/Test/Case/Model/Validator/CakeValidationRuleTest.php @@ -58,7 +58,7 @@ public function myTestRule3() { * @return void */ public function testIsValid() { - $def = array('rule' => 'notEmpty', 'message' => 'Can not be empty'); + $def = array('rule' => 'notBlank', 'message' => 'Can not be empty'); $data = array( 'fieldName' => '' ); @@ -122,19 +122,19 @@ public function testCustomMethodMissingError() { * @return void */ public function testIsRequired() { - $def = array('rule' => 'notEmpty', 'required' => true); + $def = array('rule' => 'notBlank', 'required' => true); $Rule = new CakeValidationRule($def); $this->assertTrue($Rule->isRequired()); - $def = array('rule' => 'notEmpty', 'required' => false); + $def = array('rule' => 'notBlank', 'required' => false); $Rule = new CakeValidationRule($def); $this->assertFalse($Rule->isRequired()); - $def = array('rule' => 'notEmpty', 'required' => 'create'); + $def = array('rule' => 'notBlank', 'required' => 'create'); $Rule = new CakeValidationRule($def); $this->assertTrue($Rule->isRequired()); - $def = array('rule' => 'notEmpty', 'required' => 'update'); + $def = array('rule' => 'notBlank', 'required' => 'update'); $Rule = new CakeValidationRule($def); $this->assertFalse($Rule->isRequired()); @@ -156,14 +156,14 @@ public function testIsEmptyAllowed() { $Rule = new CakeValidationRule($def); $this->assertFalse($Rule->isEmptyAllowed()); - $def = array('rule' => 'notEmpty', 'allowEmpty' => false, 'on' => 'update'); + $def = array('rule' => 'notBlank', 'allowEmpty' => false, 'on' => 'update'); $Rule = new CakeValidationRule($def); $this->assertTrue($Rule->isEmptyAllowed()); $Rule->isUpdate(true); $this->assertFalse($Rule->isEmptyAllowed()); - $def = array('rule' => 'notEmpty', 'allowEmpty' => false, 'on' => 'create'); + $def = array('rule' => 'notBlank', 'allowEmpty' => false, 'on' => 'create'); $Rule = new CakeValidationRule($def); $this->assertFalse($Rule->isEmptyAllowed()); diff --git a/lib/Cake/Test/Case/Model/Validator/CakeValidationSetTest.php b/lib/Cake/Test/Case/Model/Validator/CakeValidationSetTest.php index ecd9e444e3d..ee2b178a864 100644 --- a/lib/Cake/Test/Case/Model/Validator/CakeValidationSetTest.php +++ b/lib/Cake/Test/Case/Model/Validator/CakeValidationSetTest.php @@ -41,7 +41,7 @@ public function setUp() { * @return void */ public function testValidate() { - $Field = new CakeValidationSet('title', 'notEmpty'); + $Field = new CakeValidationSet('title', 'notBlank'); $data = array( 'title' => '', 'body' => 'a body' @@ -51,20 +51,20 @@ public function testValidate() { $expected = array('This field cannot be left blank'); $this->assertEquals($expected, $result); - $Field = new CakeValidationSet('body', 'notEmpty'); + $Field = new CakeValidationSet('body', 'notBlank'); $result = $Field->validate($data); $this->assertEmpty($result); $Field = new CakeValidationSet('nothere', array( - 'notEmpty' => array( - 'rule' => 'notEmpty', + 'notBlank' => array( + 'rule' => 'notBlank', 'required' => true ) )); $result = $Field->validate($data); - $expected = array('notEmpty'); + $expected = array('notBlank'); $this->assertEquals($expected, $result); $Field = new CakeValidationSet('body', array( @@ -83,11 +83,11 @@ public function testValidate() { * @return void */ public function testGetRule() { - $rules = array('notEmpty' => array('rule' => 'notEmpty', 'message' => 'Can not be empty')); + $rules = array('notBlank' => array('rule' => 'notBlank', 'message' => 'Can not be empty')); $Field = new CakeValidationSet('title', $rules); - $result = $Field->getRule('notEmpty'); + $result = $Field->getRule('notBlank'); $this->assertInstanceOf('CakeValidationRule', $result); - $this->assertEquals('notEmpty', $result->rule); + $this->assertEquals('notBlank', $result->rule); $this->assertEquals(null, $result->required); $this->assertEquals(false, $result->allowEmpty); $this->assertEquals(null, $result->on); @@ -101,12 +101,12 @@ public function testGetRule() { * @return void */ public function testGetRules() { - $rules = array('notEmpty' => array('rule' => 'notEmpty', 'message' => 'Can not be empty')); + $rules = array('notBlank' => array('rule' => 'notBlank', 'message' => 'Can not be empty')); $Field = new CakeValidationSet('title', $rules); $result = $Field->getRules(); - $this->assertEquals(array('notEmpty'), array_keys($result)); - $this->assertInstanceOf('CakeValidationRule', $result['notEmpty']); + $this->assertEquals(array('notBlank'), array_keys($result)); + $this->assertInstanceOf('CakeValidationRule', $result['notBlank']); } /** @@ -115,23 +115,23 @@ public function testGetRules() { * @return void */ public function testSetRule() { - $rules = array('notEmpty' => array('rule' => 'notEmpty', 'message' => 'Can not be empty')); + $rules = array('notBlank' => array('rule' => 'notBlank', 'message' => 'Can not be empty')); $Field = new CakeValidationSet('title', $rules); - $Rule = new CakeValidationRule($rules['notEmpty']); + $Rule = new CakeValidationRule($rules['notBlank']); - $this->assertEquals($Rule, $Field->getRule('notEmpty')); + $this->assertEquals($Rule, $Field->getRule('notBlank')); $rules = array('validEmail' => array('rule' => 'email', 'message' => 'Invalid email')); $Rule = new CakeValidationRule($rules['validEmail']); $Field->setRule('validEmail', $Rule); $result = $Field->getRules(); - $this->assertEquals(array('notEmpty', 'validEmail'), array_keys($result)); + $this->assertEquals(array('notBlank', 'validEmail'), array_keys($result)); $rules = array('validEmail' => array('rule' => 'email', 'message' => 'Other message')); $Rule = new CakeValidationRule($rules['validEmail']); $Field->setRule('validEmail', $Rule); $result = $Field->getRules(); - $this->assertEquals(array('notEmpty', 'validEmail'), array_keys($result)); + $this->assertEquals(array('notBlank', 'validEmail'), array_keys($result)); $result = $Field->getRule('validEmail'); $this->assertInstanceOf('CakeValidationRule', $result); $this->assertEquals('email', $result->rule); @@ -148,9 +148,9 @@ public function testSetRule() { * @return void */ public function testSetRules() { - $rule = array('notEmpty' => array('rule' => 'notEmpty', 'message' => 'Can not be empty')); + $rule = array('notBlank' => array('rule' => 'notBlank', 'message' => 'Can not be empty')); $Field = new CakeValidationSet('title', $rule); - $RuleEmpty = new CakeValidationRule($rule['notEmpty']); + $RuleEmpty = new CakeValidationRule($rule['notBlank']); $rule = array('validEmail' => array('rule' => 'email', 'message' => 'Invalid email')); $RuleEmail = new CakeValidationRule($rule['validEmail']); @@ -165,15 +165,15 @@ public function testSetRules() { $this->assertEquals(array('validEmail'), array_keys($result)); $this->assertTrue(array_pop($result) instanceof CakeValidationRule); - $rules = array('notEmpty' => $RuleEmpty); + $rules = array('notBlank' => $RuleEmpty); $Field->setRules($rules, true); $result = $Field->getRules(); - $this->assertEquals(array('validEmail', 'notEmpty'), array_keys($result)); + $this->assertEquals(array('validEmail', 'notBlank'), array_keys($result)); - $rules = array('notEmpty' => array('rule' => 'notEmpty')); + $rules = array('notBlank' => array('rule' => 'notBlank')); $Field->setRules($rules, true); $result = $Field->getRules(); - $this->assertEquals(array('validEmail', 'notEmpty'), array_keys($result)); + $this->assertEquals(array('validEmail', 'notBlank'), array_keys($result)); $this->assertTrue(array_pop($result) instanceof CakeValidationRule); $this->assertTrue(array_pop($result) instanceof CakeValidationRule); } @@ -185,14 +185,14 @@ public function testSetRules() { */ public function testArrayAccessGet() { $Set = new CakeValidationSet('title', array( - 'notEmpty' => array('rule' => 'notEmpty', 'required' => true), + 'notBlank' => array('rule' => 'notBlank', 'required' => true), 'numeric' => array('rule' => 'numeric'), 'other' => array('rule' => array('other', 1)), )); - $rule = $Set['notEmpty']; + $rule = $Set['notBlank']; $this->assertInstanceOf('CakeValidationRule', $rule); - $this->assertEquals('notEmpty', $rule->rule); + $this->assertEquals('notBlank', $rule->rule); $rule = $Set['numeric']; $this->assertInstanceOf('CakeValidationRule', $rule); @@ -210,12 +210,12 @@ public function testArrayAccessGet() { */ public function testArrayAccessExists() { $Set = new CakeValidationSet('title', array( - 'notEmpty' => array('rule' => 'notEmpty', 'required' => true), + 'notBlank' => array('rule' => 'notBlank', 'required' => true), 'numeric' => array('rule' => 'numeric'), 'other' => array('rule' => array('other', 1)), )); - $this->assertTrue(isset($Set['notEmpty'])); + $this->assertTrue(isset($Set['notBlank'])); $this->assertTrue(isset($Set['numeric'])); $this->assertTrue(isset($Set['other'])); $this->assertFalse(isset($Set['fail'])); @@ -228,7 +228,7 @@ public function testArrayAccessExists() { */ public function testArrayAccessSet() { $Set = new CakeValidationSet('title', array( - 'notEmpty' => array('rule' => 'notEmpty', 'required' => true), + 'notBlank' => array('rule' => 'notBlank', 'required' => true), )); $this->assertFalse(isset($Set['other'])); @@ -251,19 +251,19 @@ public function testArrayAccessSet() { */ public function testArrayAccessUnset() { $Set = new CakeValidationSet('title', array( - 'notEmpty' => array('rule' => 'notEmpty', 'required' => true), + 'notBlank' => array('rule' => 'notBlank', 'required' => true), 'numeric' => array('rule' => 'numeric'), 'other' => array('rule' => array('other', 1)), )); - unset($Set['notEmpty']); - $this->assertFalse(isset($Set['notEmpty'])); + unset($Set['notBlank']); + $this->assertFalse(isset($Set['notBlank'])); unset($Set['numeric']); - $this->assertFalse(isset($Set['notEmpty'])); + $this->assertFalse(isset($Set['notBlank'])); unset($Set['other']); - $this->assertFalse(isset($Set['notEmpty'])); + $this->assertFalse(isset($Set['notBlank'])); } /** @@ -273,7 +273,7 @@ public function testArrayAccessUnset() { */ public function testIterator() { $Set = new CakeValidationSet('title', array( - 'notEmpty' => array('rule' => 'notEmpty', 'required' => true), + 'notBlank' => array('rule' => 'notBlank', 'required' => true), 'numeric' => array('rule' => 'numeric'), 'other' => array('rule' => array('other', 1)), )); @@ -281,7 +281,7 @@ public function testIterator() { $i = 0; foreach ($Set as $name => $rule) { if ($i === 0) { - $this->assertEquals('notEmpty', $name); + $this->assertEquals('notBlank', $name); } if ($i === 1) { $this->assertEquals('numeric', $name); @@ -302,7 +302,7 @@ public function testIterator() { */ public function testCount() { $Set = new CakeValidationSet('title', array( - 'notEmpty' => array('rule' => 'notEmpty', 'required' => true), + 'notBlank' => array('rule' => 'notBlank', 'required' => true), 'numeric' => array('rule' => 'numeric'), 'other' => array('rule' => array('other', 1)), )); @@ -319,13 +319,13 @@ public function testCount() { */ public function testRemoveRule() { $Set = new CakeValidationSet('title', array( - 'notEmpty' => array('rule' => 'notEmpty', 'required' => true), + 'notBlank' => array('rule' => 'notBlank', 'required' => true), 'numeric' => array('rule' => 'numeric'), 'other' => array('rule' => array('other', 1)), )); - $Set->removeRule('notEmpty'); - $this->assertFalse(isset($Set['notEmpty'])); + $Set->removeRule('notBlank'); + $this->assertFalse(isset($Set['notBlank'])); $Set->removeRule('numeric'); $this->assertFalse(isset($Set['numeric'])); diff --git a/lib/Cake/Test/Case/Model/models.php b/lib/Cake/Test/Case/Model/models.php index a4ce60c91d2..ea8d36426db 100644 --- a/lib/Cake/Test/Case/Model/models.php +++ b/lib/Cake/Test/Case/Model/models.php @@ -208,7 +208,7 @@ class User extends CakeTestModel { * * @var array */ - public $validate = array('user' => 'notEmpty', 'password' => 'notEmpty'); + public $validate = array('user' => 'notBlank', 'password' => 'notBlank'); /** * beforeFind() callback used to run ContainableBehaviorTest::testLazyLoad() @@ -269,8 +269,8 @@ class Article extends CakeTestModel { */ public $validate = array( 'user_id' => 'numeric', - 'title' => array('required' => false, 'rule' => 'notEmpty'), - 'body' => array('required' => false, 'rule' => 'notEmpty'), + 'title' => array('required' => false, 'rule' => 'notBlank'), + 'body' => array('required' => false, 'rule' => 'notBlank'), ); /** @@ -424,7 +424,7 @@ class ArticleFeatured extends CakeTestModel { * * @var array */ - public $validate = array('user_id' => 'numeric', 'title' => 'notEmpty', 'body' => 'notEmpty'); + public $validate = array('user_id' => 'numeric', 'title' => 'notBlank', 'body' => 'notBlank'); } @@ -802,7 +802,7 @@ class Apple extends CakeTestModel { * * @var array */ - public $validate = array('name' => 'notEmpty'); + public $validate = array('name' => 'notBlank'); /** * hasOne property @@ -1197,7 +1197,7 @@ class NodeAfterFind extends CakeTestModel { * * @var array */ - public $validate = array('name' => 'notEmpty'); + public $validate = array('name' => 'notBlank'); /** * useTable property @@ -1287,7 +1287,7 @@ class NodeNoAfterFind extends CakeTestModel { * * @var array */ - public $validate = array('name' => 'notEmpty'); + public $validate = array('name' => 'notBlank'); /** * useTable property @@ -2191,10 +2191,10 @@ class ValidationTest1 extends CakeTestModel { * @var array */ public $validate = array( - 'title' => 'notEmpty', + 'title' => 'notBlank', 'published' => 'customValidationMethod', 'body' => array( - 'notEmpty', + 'notBlank', '/^.{5,}$/s' => 'no matchy', '/^[0-9A-Za-z \\.]{1,}$/s' ) @@ -2270,10 +2270,10 @@ class ValidationTest2 extends CakeTestModel { * @var array */ public $validate = array( - 'title' => 'notEmpty', + 'title' => 'notBlank', 'published' => 'customValidationMethod', 'body' => array( - 'notEmpty', + 'notBlank', '/^.{5,}$/s' => 'no matchy', '/^[0-9A-Za-z \\.]{1,}$/s' ) @@ -2394,7 +2394,7 @@ class Story extends CakeTestModel { * * @var array */ - public $validate = array('title' => 'notEmpty'); + public $validate = array('title' => 'notBlank'); } /** @@ -4781,7 +4781,6 @@ public function schema($field = false) { /** * Test model for datasource prefixes - * */ class PrefixTestModel extends CakeTestModel { } @@ -5048,3 +5047,81 @@ public function beforeValidate($options = array()) { } } + +/** + * Example class + * + * @package Cake.Test.Case.Model + */ +class Example extends AppModel { + +/** + * useTable property + * + * @var string + */ + public $useTable = false; + +/** + * schema property + * + * @var array + */ + protected $_schema = array( + 'filefield' => array( + 'type' => 'string', + 'length' => 254, + 'default' => null, + 'null' => true, + 'comment' => null + ), + ); + +} + +/** + * UserHasOneArticle class + * + * @package Cake.Test.Case.Model + */ +class UserHasOneArticle extends AppModel { + +/** + * useTable property + * + * @var string + */ + public $useTable = 'users'; + +/** + * hasOne property + * + * @var array + */ + public $hasOne = array('Article'); + +} + + +/** + * ArticlesTagBelongsToArticle class + * + * @package Cake.Test.Case.Model + */ +class ArticlesTagBelongsToArticle extends CakeTestModel { + +/** + * useTable property + * + * @var string + */ + public $useTable = 'articles_tags'; + +/** + * belongsTo property + * + * @var array + */ + public $belongsTo = array('Article'); + +} diff --git a/lib/Cake/Test/Case/Network/CakeRequestTest.php b/lib/Cake/Test/Case/Network/CakeRequestTest.php index 8216d5e2bbe..b588565a5ef 100644 --- a/lib/Cake/Test/Case/Network/CakeRequestTest.php +++ b/lib/Cake/Test/Case/Network/CakeRequestTest.php @@ -89,6 +89,50 @@ public function tearDown() { Configure::write('App', $this->_app); } +/** + * Test the header detector. + * + * @return void + */ + public function testHeaderDetector() { + $request = new CakeRequest('some/path'); + $request->addDetector('host', array('header' => array('host' => 'cakephp.org'))); + + $_SERVER['HTTP_HOST'] = 'cakephp.org'; + $this->assertTrue($request->is('host')); + + $_SERVER['HTTP_HOST'] = 'php.net'; + $this->assertFalse($request->is('host')); + } + +/** + * Test the accept header detector. + * + * @return void + */ + public function testExtensionDetector() { + $request = new CakeRequest('some/path'); + $request->params['ext'] = 'json'; + $this->assertTrue($request->is('json')); + + $request->params['ext'] = 'xml'; + $this->assertFalse($request->is('json')); + } + +/** + * Test the accept header detector. + * + * @return void + */ + public function testAcceptHeaderDetector() { + $request = new CakeRequest('some/path'); + $_SERVER['HTTP_ACCEPT'] = 'application/json, text/plain, */*'; + $this->assertTrue($request->is('json')); + + $_SERVER['HTTP_ACCEPT'] = 'text/plain, */*'; + $this->assertFalse($request->is('json')); + } + /** * Test that the autoparse = false constructor works. * @@ -274,12 +318,6 @@ public function testPutParsing() { $request->reConstruct(); $this->assertEquals($data, $request->data); - $data = array( - 'data' => array( - 'Article' => array('title' => 'Testing'), - ), - 'action' => 'update' - ); $request = $this->getMock('TestCakeRequest', array('_readInput')); $request->expects($this->at(0))->method('_readInput') ->will($this->returnValue('data[Article][title]=Testing&action=update')); @@ -749,6 +787,24 @@ public function testIsHttpMethods() { $this->assertFalse($request->is('delete')); } +/** + * Test is() with json and xml. + * + * @return void + */ + public function testIsJsonAndXml() { + $request = new CakeRequest('some/path'); + + $_SERVER['HTTP_ACCEPT'] = 'application/json, text/plain, */*'; + $this->assertTrue($request->is(array('json'))); + + $_SERVER['HTTP_ACCEPT'] = 'application/xml, text/plain, */*'; + $this->assertTrue($request->is(array('xml'))); + + $_SERVER['HTTP_ACCEPT'] = 'text/xml, */*'; + $this->assertTrue($request->is(array('xml'))); + } + /** * Test is() with multiple types. * @@ -1069,12 +1125,14 @@ public function detectCallback($request) { * @return void */ public function testHeader() { + $_SERVER['HTTP_X_THING'] = ''; $_SERVER['HTTP_HOST'] = 'localhost'; $_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_4; en-ca) AppleWebKit/534.8+ (KHTML, like Gecko) Version/5.0 Safari/533.16'; $request = new CakeRequest('/', false); $this->assertEquals($_SERVER['HTTP_HOST'], $request->header('host')); $this->assertEquals($_SERVER['HTTP_USER_AGENT'], $request->header('User-Agent')); + $this->assertSame('', $request->header('X-thing')); } /** @@ -1359,6 +1417,24 @@ public function testBaseUrlWithModRewriteAndIndexPhp() { $this->assertEquals('/cakephp/bananas/eat/tasty_banana', $request->here); } +/** + * Test that even if mod_rewrite is on, and the url contains index.php + * and there are numerous //s that the base/webroot is calculated correctly. + * + * @return void + */ + public function testBaseUrlWithModRewriteAndExtraSlashes() { + $_SERVER['REQUEST_URI'] = '/cakephp/webroot///index.php/bananas/eat'; + $_SERVER['PHP_SELF'] = '/cakephp/webroot///index.php/bananas/eat'; + $_SERVER['PATH_INFO'] = '/bananas/eat'; + $request = new CakeRequest(); + + $this->assertEquals('/cakephp', $request->base); + $this->assertEquals('/cakephp/', $request->webroot); + $this->assertEquals('bananas/eat', $request->url); + $this->assertEquals('/cakephp/bananas/eat', $request->here); + } + /** * Test base, webroot, and URL parsing when there is no URL rewriting * @@ -2179,7 +2255,7 @@ public function testAcceptLanguage() { // Checking if requested $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'es_mx,en_ca'; - $result = CakeRequest::acceptLanguage(); + CakeRequest::acceptLanguage(); $result = CakeRequest::acceptLanguage('en-ca'); $this->assertTrue($result); diff --git a/lib/Cake/Test/Case/Network/CakeResponseTest.php b/lib/Cake/Test/Case/Network/CakeResponseTest.php index 801f08664de..cbbe1c7c691 100644 --- a/lib/Cake/Test/Case/Network/CakeResponseTest.php +++ b/lib/Cake/Test/Case/Network/CakeResponseTest.php @@ -373,7 +373,7 @@ public function testCache() { * @return void */ public function testCompress() { - if (php_sapi_name() !== 'cli') { + if (PHP_SAPI !== 'cli') { $this->markTestSkipped('The response compression can only be tested in cli.'); } @@ -404,7 +404,7 @@ public function testCompress() { public function testHttpCodes() { $response = new CakeResponse(); $result = $response->httpCodes(); - $this->assertEquals(40, count($result)); + $this->assertEquals(41, count($result)); $result = $response->httpCodes(100); $expected = array(100 => 'Continue'); @@ -417,7 +417,7 @@ public function testHttpCodes() { $result = $response->httpCodes($codes); $this->assertTrue($result); - $this->assertEquals(42, count($response->httpCodes())); + $this->assertEquals(43, count($response->httpCodes())); $result = $response->httpCodes(381); $expected = array(381 => 'Unicorn Moved'); @@ -426,7 +426,7 @@ public function testHttpCodes() { $codes = array(404 => 'Sorry Bro'); $result = $response->httpCodes($codes); $this->assertTrue($result); - $this->assertEquals(42, count($response->httpCodes())); + $this->assertEquals(43, count($response->httpCodes())); $result = $response->httpCodes(404); $expected = array(404 => 'Sorry Bro'); @@ -491,7 +491,7 @@ public function testOutputCompressed() { if (!extension_loaded("zlib")) { $this->markTestSkipped('Skipping further tests for outputCompressed as zlib extension is not loaded'); } - if (php_sapi_name() !== 'cli') { + if (PHP_SAPI !== 'cli') { $this->markTestSkipped('Testing outputCompressed method with compression enabled done only in cli'); } @@ -566,7 +566,7 @@ public function testSendContentLength() { $response->send(); ob_start(); - $response = $this->getMock('CakeResponse', array('_sendHeader', '_sendContent')); + $this->getMock('CakeResponse', array('_sendHeader', '_sendContent')); $goofyOutput = 'I am goofily sending output in the controller'; echo $goofyOutput; $response = $this->getMock('CakeResponse', array('_sendHeader', '_sendContent')); @@ -1167,16 +1167,42 @@ public function testFileNotFound() { } /** - * test file with .. + * test file with ../ * * @expectedException NotFoundException + * @expectedExceptionMessage The requested file contains `..` and will not be read. * @return void */ - public function testFileWithPathTraversal() { + public function testFileWithForwardSlashPathTraversal() { $response = new CakeResponse(); $response->file('my/../cat.gif'); } +/** + * test file with ..\ + * + * @expectedException NotFoundException + * @expectedExceptionMessage The requested file contains `..` and will not be read. + * @return void + */ + public function testFileWithBackwardSlashPathTraversal() { + $response = new CakeResponse(); + $response->file('my\..\cat.gif'); + } + +/** + * Although unlikely, a file may contain dots in its filename. + * This should be allowed, as long as the dots doesn't specify a path (../ or ..\) + * + * @expectedException NotFoundException + * @execptedExceptionMessageRegExp #The requested file .+my/Some..cat.gif was not found or not readable# + * @return void + */ + public function testFileWithDotsInFilename() { + $response = new CakeResponse(); + $response->file('my/Some..cat.gif'); + } + /** * testFile method * @@ -1720,7 +1746,7 @@ public function testFileRangeInvalid() { ); $this->assertEquals(416, $response->statusCode()); - $result = $response->send(); + $response->send(); } /** @@ -1761,7 +1787,7 @@ public function testFileRangeOffsetsNoDownload($range, $length, $offsetResponse) ); ob_start(); - $result = $response->send(); + $response->send(); ob_get_clean(); } @@ -1850,7 +1876,7 @@ public function testFileRangeInvalidNoDownload() { ); $this->assertEquals(416, $response->statusCode()); - $result = $response->send(); + $response->send(); } /** diff --git a/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php b/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php index 1dc125fead6..a86412ce66f 100644 --- a/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php +++ b/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php @@ -17,10 +17,10 @@ */ App::uses('CakeEmail', 'Network/Email'); +App::uses('File', 'Utility'); /** * Help to test CakeEmail - * */ class TestCakeEmail extends CakeEmail { @@ -35,7 +35,6 @@ class TestCakeEmail extends CakeEmail { /** * Config - * */ protected $_config = array(); @@ -88,10 +87,18 @@ public function render($content) { /** * EmailConfig class - * */ class TestEmailConfig { +/** + * default config + * + * @var array + */ + public $default = array( + 'subject' => 'Default Subject', + ); + /** * test config * @@ -125,7 +132,6 @@ class TestEmailConfig { /** * ExtendTransport class * test class to ensure the class has send() method - * */ class ExtendTransport { @@ -145,6 +151,14 @@ class CakeEmailTest extends CakeTestCase { */ public function setUp() { parent::setUp(); + + $this->_configFileExists = true; + $emailConfig = new File(APP . 'Config' . DS . 'email.php'); + if (!$emailConfig->exists()) { + $this->_configFileExists = false; + $emailConfig->create(); + } + $this->CakeEmail = new TestCakeEmail(); App::build(array( @@ -160,6 +174,19 @@ public function setUp() { public function tearDown() { parent::tearDown(); App::build(); + + if (!$this->_configFileExists) { + unlink(APP . 'Config' . DS . 'email.php'); + } + } + +/** + * Test if the EmailConfig::$default configuration is read when present + * + * @return void + */ + public function testDefaultConfig() { + $this->assertEquals('Default Subject', $this->CakeEmail->subject()); } /** @@ -186,7 +213,7 @@ public function testFrom() { $this->assertSame($this->CakeEmail, $result); $this->setExpectedException('SocketException'); - $result = $this->CakeEmail->from(array('cake@cakephp.org' => 'CakePHP', 'fail@cakephp.org' => 'From can only be one address')); + $this->CakeEmail->from(array('cake@cakephp.org' => 'CakePHP', 'fail@cakephp.org' => 'From can only be one address')); } /** @@ -835,7 +862,7 @@ public function testTransport() { $this->setExpectedException('SocketException'); $this->CakeEmail->transport('Invalid'); - $result = $this->CakeEmail->transportClass(); + $this->CakeEmail->transportClass(); } /** @@ -860,16 +887,17 @@ public function testConfig() { $config = array('test' => 'ok', 'test2' => true); $this->CakeEmail->config($config); $this->assertSame($config, $transportClass->config()); - $this->assertSame($config, $this->CakeEmail->config()); + $expected = $config + array('subject' => 'Default Subject'); + $this->assertSame($expected, $this->CakeEmail->config()); $this->CakeEmail->config(array()); $this->assertSame($config, $transportClass->config()); - $config = array('test' => 'test@example.com'); + $config = array('test' => 'test@example.com', 'subject' => 'my test subject'); $this->CakeEmail->config($config); - $expected = array('test' => 'test@example.com', 'test2' => true); + $expected = array('test' => 'test@example.com', 'subject' => 'my test subject', 'test2' => true); $this->assertSame($expected, $this->CakeEmail->config()); - $this->assertSame($expected, $transportClass->config()); + $this->assertSame(array('test' => 'test@example.com', 'test2' => true), $transportClass->config()); } /** @@ -923,7 +951,7 @@ public function testConfigMerge() { $this->assertEquals($expected, $this->CakeEmail->transportClass()->config()); $this->CakeEmail->config(array('log' => true)); - $result = $this->CakeEmail->transportClass()->config(); + $this->CakeEmail->transportClass()->config(); $expected += array('log' => true); $this->assertEquals($expected, $this->CakeEmail->transportClass()->config()); @@ -1570,7 +1598,7 @@ public function testSendRenderWithImage() { $server .= ':' . env('SERVER_PORT'); } - $expected = ' 
';
+ $expected = '';
$result = $this->CakeEmail->send();
$this->assertContains($expected, $result['message']);
}
@@ -1996,7 +2024,7 @@ public function testEmailFormat() {
$this->assertEquals('html', $result);
$this->setExpectedException('SocketException');
- $result = $this->CakeEmail->emailFormat('invalid');
+ $this->CakeEmail->emailFormat('invalid');
}
/**
@@ -2256,10 +2284,10 @@ public function testCharsetsCompatible() {
protected function _getEmailByOldStyleCharset($charset, $headerCharset) {
$email = new CakeEmail(array('transport' => 'Debug'));
- if (! empty($charset)) {
+ if (!empty($charset)) {
$email->charset = $charset;
}
- if (! empty($headerCharset)) {
+ if (!empty($headerCharset)) {
$email->headerCharset = $headerCharset;
}
@@ -2280,10 +2308,10 @@ protected function _getEmailByOldStyleCharset($charset, $headerCharset) {
protected function _getEmailByNewStyleCharset($charset, $headerCharset) {
$email = new CakeEmail(array('transport' => 'Debug'));
- if (! empty($charset)) {
+ if (!empty($charset)) {
$email->charset($charset);
}
- if (! empty($headerCharset)) {
+ if (!empty($headerCharset)) {
$email->headerCharset($headerCharset);
}
@@ -2353,7 +2381,6 @@ public function testWrapWithTagsAcrossLines() {
style="font-weight: bold">The tag is across multiple lines
HTML;
- $length = strlen($str);
$message = $str . str_repeat('x', CakeEmail::LINE_LENGTH_MUST + 1);
$this->CakeEmail->reset();
@@ -2435,6 +2462,25 @@ public function testZeroOnlyLinesNotBeingEmptied() {
$this->assertEquals($expected, $result['message']);
}
+/**
+ * Test that really long lines don't cause errors.
+ *
+ * @return void
+ */
+ public function testReallyLongLine() {
+ $this->CakeEmail->reset();
+ $this->CakeEmail->config(array('empty'));
+ $this->CakeEmail->transport('Debug');
+ $this->CakeEmail->from('cake@cakephp.org');
+ $this->CakeEmail->to('cake@cakephp.org');
+ $this->CakeEmail->subject('Wordwrap Test');
+ $this->CakeEmail->emailFormat('html');
+ $this->CakeEmail->template('long_line', null);
+ $result = $this->CakeEmail->send();
+ $this->assertContains('', $result['message'], 'First bits are included');
+ $this->assertContains('x', $result['message'], 'Last byte are included');
+ }
+
/**
* CakeEmailTest::assertLineLengths()
*
diff --git a/lib/Cake/Test/Case/Network/Email/DebugTransportTest.php b/lib/Cake/Test/Case/Network/Email/DebugTransportTest.php
index ca5653b49c1..9c6061c3645 100644
--- a/lib/Cake/Test/Case/Network/Email/DebugTransportTest.php
+++ b/lib/Cake/Test/Case/Network/Email/DebugTransportTest.php
@@ -22,7 +22,6 @@
/**
* Test case
- *
*/
class DebugTransportTest extends CakeTestCase {
diff --git a/lib/Cake/Test/Case/Network/Email/MailTransportTest.php b/lib/Cake/Test/Case/Network/Email/MailTransportTest.php
index bccc95439db..dde5eaa9010 100644
--- a/lib/Cake/Test/Case/Network/Email/MailTransportTest.php
+++ b/lib/Cake/Test/Case/Network/Email/MailTransportTest.php
@@ -22,7 +22,6 @@
/**
* Test case
- *
*/
class MailTransportTest extends CakeTestCase {
diff --git a/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php b/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php
index 7c4076439e6..478de6b98ac 100644
--- a/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php
+++ b/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php
@@ -22,14 +22,13 @@
/**
* Help to test SmtpTransport
- *
*/
class SmtpTestTransport extends SmtpTransport {
/**
* Helper to change the socket
*
- * @param object $socket
+ * @param CakeSocket $socket A socket.
* @return void
*/
public function setSocket(CakeSocket $socket) {
@@ -39,7 +38,7 @@ public function setSocket(CakeSocket $socket) {
/**
* Helper to change the CakeEmail
*
- * @param object $cakeEmail
+ * @param object $cakeEmail An email object.
* @return void
*/
public function setCakeEmail($cakeEmail) {
@@ -57,8 +56,8 @@ protected function _generateSocket() {
/**
* Magic function to call protected methods
*
- * @param string $method
- * @param string $args
+ * @param string $method The method to call.
+ * @param string $args The arguments.
* @return mixed
*/
public function __call($method, $args) {
@@ -70,7 +69,6 @@ public function __call($method, $args) {
/**
* Test case
- *
*/
class SmtpTransportTest extends CakeTestCase {
diff --git a/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php b/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
index 6456a0c21fc..318e43401fa 100644
--- a/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
+++ b/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
@@ -29,8 +29,8 @@ class TestAuthentication {
/**
* authentication method
*
- * @param HttpSocket $http
- * @param array $authInfo
+ * @param HttpSocket $http A HTTP socket.
+ * @param array &$authInfo Some auth info.
* @return void
*/
public static function authentication(HttpSocket $http, &$authInfo) {
@@ -40,8 +40,8 @@ public static function authentication(HttpSocket $http, &$authInfo) {
/**
* proxyAuthentication method
*
- * @param HttpSocket $http
- * @param array $proxyInfo
+ * @param HttpSocket $http A HTTP socket.
+ * @param array &$proxyInfo Some proxy info.
* @return void
*/
public static function proxyAuthentication(HttpSocket $http, &$proxyInfo) {
@@ -52,7 +52,6 @@ public static function proxyAuthentication(HttpSocket $http, &$proxyInfo) {
/**
* CustomResponse
- *
*/
class CustomResponse {
@@ -66,6 +65,7 @@ class CustomResponse {
/**
* Constructor
*
+ * @param string $message A message.
*/
public function __construct($message) {
$this->first10 = substr($message, 0, 10);
@@ -75,7 +75,6 @@ public function __construct($message) {
/**
* TestHttpSocket
- *
*/
class TestHttpSocket extends HttpSocket {
@@ -135,7 +134,6 @@ public function parseQuery($query) {
* Convenience method for testing protected method
*
* @param array $request Needs to contain a 'uri' key. Should also contain a 'method' key, otherwise defaults to GET.
- * @param string $versionToken The version token to use, defaults to HTTP/1.1
* @return string Request line
*/
public function buildRequestLine($request = array()) {
@@ -307,6 +305,10 @@ public function testConfigUri() {
* @return void
*/
public function testRequest() {
+ $this->Socket->expects($this->any())
+ ->method('read')
+ ->will($this->returnValue(false));
+
$this->Socket->reset();
$response = $this->Socket->request(true);
@@ -317,11 +319,18 @@ public function testRequest() {
'verify_peer' => true,
'allow_self_signed' => false,
'verify_depth' => 5,
+ 'SNI_enabled' => true,
'CN_match' => 'www.cakephp.org',
'cafile' => CAKE . 'Config' . DS . 'cacert.pem'
)
);
+ if (version_compare(PHP_VERSION, '5.6.0', '>=')) {
+ $context['ssl']['peer_name'] = 'www.cakephp.org';
+ } else {
+ $context['ssl']['SNI_server_name'] = 'www.cakephp.org';
+ }
+
$tests = array(
array(
'request' => 'http://www.cakephp.org/?foo=bar',
@@ -572,7 +581,7 @@ public function testRequest() {
$this->Socket->reset();
$request = array('method' => 'POST', 'uri' => 'http://www.cakephp.org/posts/add', 'body' => array('name' => 'HttpSocket-is-released', 'date' => 'today'));
- $response = $this->Socket->request($request);
+ $this->Socket->request($request);
$this->assertEquals("name=HttpSocket-is-released&date=today", $this->Socket->request['body']);
}
@@ -582,6 +591,10 @@ public function testRequest() {
* @return void
*/
public function testGetWithSchemeAndPort() {
+ $this->Socket->expects($this->any())
+ ->method('read')
+ ->will($this->returnValue(false));
+
$this->Socket->reset();
$request = array(
'uri' => array(
@@ -602,6 +615,10 @@ public function testGetWithSchemeAndPort() {
* @return void
*/
public function testRequestWithStringQuery() {
+ $this->Socket->expects($this->any())
+ ->method('read')
+ ->will($this->returnValue(false));
+
$this->Socket->reset();
$request = array(
'uri' => array(
@@ -635,14 +652,18 @@ public function testRequestNotAllowedUri() {
*/
public function testRequest2() {
$this->Socket->reset();
+
$request = array('uri' => 'htpp://www.cakephp.org/');
$number = mt_rand(0, 9999999);
$this->Socket->expects($this->any())->method('connect')->will($this->returnValue(true));
$serverResponse = "HTTP/1.x 200 OK\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\nHello, your lucky number is " . $number . "
"; $this->Socket->expects($this->at(0))->method('write') ->with("GET / HTTP/1.1\r\nHost: www.cakephp.org\r\nConnection: close\r\nUser-Agent: CakePHP\r\n\r\n"); - $this->Socket->expects($this->at(0))->method('read')->will($this->returnValue(false)); - $this->Socket->expects($this->at(1))->method('read')->will($this->returnValue($serverResponse)); + + $this->Socket->expects($this->any()) + ->method('read') + ->will($this->onConsecutiveCalls($serverResponse, false)); + $response = (string)$this->Socket->request($request); $this->assertEquals($response, "Hello, your lucky number is " . $number . "
"); } @@ -655,7 +676,11 @@ public function testRequest2() { public function testRequest3() { $request = array('uri' => 'htpp://www.cakephp.org/'); $serverResponse = "HTTP/1.x 200 OK\r\nSet-Cookie: foo=bar\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\nThis is a cookie test!
"; - $this->Socket->expects($this->at(1))->method('read')->will($this->returnValue($serverResponse)); + + $this->Socket->expects($this->any()) + ->method('read') + ->will($this->onConsecutiveCalls($serverResponse, false)); + $this->Socket->connected = true; $this->Socket->request($request); $result = $this->Socket->response['cookies']; @@ -704,9 +729,10 @@ public function testRequestWithConstructor() { */ public function testRequestWithResource() { $serverResponse = "HTTP/1.x 200 OK\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\nThis is a test!
"; - $this->Socket->expects($this->at(1))->method('read')->will($this->returnValue($serverResponse)); - $this->Socket->expects($this->at(2))->method('read')->will($this->returnValue(false)); - $this->Socket->expects($this->at(4))->method('read')->will($this->returnValue($serverResponse)); + + $this->Socket->expects($this->any()) + ->method('read') + ->will($this->onConsecutiveCalls($serverResponse, false, $serverResponse, false)); $this->Socket->connected = true; $f = fopen(TMP . 'download.txt', 'w'); @@ -737,8 +763,10 @@ public function testRequestWithCrossCookie() { $this->Socket->config['request']['cookies'] = array(); $serverResponse = "HTTP/1.x 200 OK\r\nSet-Cookie: foo=bar\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\nThis is a test!
"; + $this->Socket->expects($this->at(1))->method('read')->will($this->returnValue($serverResponse)); $this->Socket->expects($this->at(2))->method('read')->will($this->returnValue(false)); + $expected = array('www.cakephp.org' => array('foo' => array('value' => 'bar'))); $this->Socket->request('http://www.cakephp.org/'); $this->assertEquals($expected, $this->Socket->config['request']['cookies']); @@ -774,8 +802,9 @@ public function testRequestWithCrossCookie() { public function testRequestCustomResponse() { $this->Socket->connected = true; $serverResponse = "HTTP/1.x 200 OK\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\nThis is a test!
"; - $this->Socket->expects($this->at(1))->method('read')->will($this->returnValue($serverResponse)); - $this->Socket->expects($this->at(2))->method('read')->will($this->returnValue(false)); + $this->Socket->expects($this->any()) + ->method('read') + ->will($this->onConsecutiveCalls($serverResponse, false)); $this->Socket->responseClass = 'CustomResponse'; $response = $this->Socket->request('http://www.cakephp.org/'); @@ -810,6 +839,8 @@ public function testRequestWithRedirectUrlEncoded() { $this->Socket->expects($this->at(4)) ->method('read') ->will($this->returnValue($serverResponse2)); + $this->Socket->expects($this->any()) + ->method('read')->will($this->returnValue(false)); $response = $this->Socket->request($request); $this->assertEquals('You have been redirected
', $response->body()); @@ -827,8 +858,10 @@ public function testRequestWithRedirectAsTrue() { ); $serverResponse1 = "HTTP/1.x 302 Found\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\nLocation: http://localhost/anotheruri\r\n\r\n"; $serverResponse2 = "HTTP/1.x 200 OK\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\nYou have been redirected
"; - $this->Socket->expects($this->at(1))->method('read')->will($this->returnValue($serverResponse1)); - $this->Socket->expects($this->at(4))->method('read')->will($this->returnValue($serverResponse2)); + + $this->Socket->expects($this->any()) + ->method('read') + ->will($this->onConsecutiveCalls($serverResponse1, false, $serverResponse2, false)); $response = $this->Socket->request($request); $this->assertEquals('You have been redirected
', $response->body()); @@ -846,8 +879,10 @@ public function testRequestWithRedirectAsInt() { ); $serverResponse1 = "HTTP/1.x 302 Found\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\nLocation: http://localhost/anotheruri\r\n\r\n"; $serverResponse2 = "HTTP/1.x 200 OK\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\nYou have been redirected
"; - $this->Socket->expects($this->at(1))->method('read')->will($this->returnValue($serverResponse1)); - $this->Socket->expects($this->at(4))->method('read')->will($this->returnValue($serverResponse2)); + + $this->Socket->expects($this->any()) + ->method('read') + ->will($this->onConsecutiveCalls($serverResponse1, false, $serverResponse2, false)); $this->Socket->request($request); $this->assertEquals(1, $this->Socket->request['redirect']); @@ -865,8 +900,10 @@ public function testRequestWithRedirectAsIntReachingZero() { ); $serverResponse1 = "HTTP/1.x 302 Found\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\nLocation: http://localhost/oneruri\r\n\r\n"; $serverResponse2 = "HTTP/1.x 302 Found\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\nLocation: http://localhost/anotheruri\r\n\r\n"; - $this->Socket->expects($this->at(1))->method('read')->will($this->returnValue($serverResponse1)); - $this->Socket->expects($this->at(4))->method('read')->will($this->returnValue($serverResponse2)); + + $this->Socket->expects($this->any()) + ->method('read') + ->will($this->onConsecutiveCalls($serverResponse1, false, $serverResponse2, false)); $response = $this->Socket->request($request); $this->assertEquals(0, $this->Socket->request['redirect']); @@ -1106,6 +1143,9 @@ public function testHead() { * @return void */ public function testAuth() { + $this->Socket->expects($this->any()) + ->method('read')->will($this->returnValue(false)); + $this->Socket->get('http://mark:secret@example.com/test'); $this->assertTrue(strpos($this->Socket->request['header'], 'Authorization: Basic bWFyazpzZWNyZXQ=') !== false); @@ -1147,6 +1187,9 @@ public function testAuth() { * @return void */ public function testConsecutiveGetResetsAuthCredentials() { + $this->Socket->expects($this->any()) + ->method('read')->will($this->returnValue(false)); + $this->Socket->get('http://mark:secret@example.com/test'); $this->assertEquals('mark', $this->Socket->request['uri']['user']); $this->assertEquals('secret', $this->Socket->request['uri']['pass']); @@ -1806,6 +1849,9 @@ public function testPartialReset() { * @return void */ public function testConfigContext() { + $this->Socket->expects($this->any()) + ->method('read')->will($this->returnValue(false)); + $this->Socket->reset(); $this->Socket->request('http://example.com'); $this->assertTrue($this->Socket->config['context']['ssl']['verify_peer']); @@ -1862,8 +1908,10 @@ public function statusProvider() { public function testResponseStatusParsing($status, $code, $msg = '') { $this->Socket->connected = true; $serverResponse = $status . "\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\n\r\nThis is a test!
"; - $this->Socket->expects($this->at(1))->method('read')->will($this->returnValue($serverResponse)); - $this->Socket->expects($this->at(2))->method('read')->will($this->returnValue(false)); + + $this->Socket->expects($this->any()) + ->method('read') + ->will($this->onConsecutiveCalls($serverResponse, false)); $response = $this->Socket->request('http://www.cakephp.org/'); $this->assertInstanceOf('HttpSocketResponse', $response); diff --git a/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php b/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php index e9e5b5ddd87..c67cba3846e 100644 --- a/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php +++ b/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php @@ -258,7 +258,6 @@ public function testAssetContentLength() { $file = file_get_contents($path); $this->assertEquals($file, $result); - $expected = filesize($path); $headers = $response->header(); $this->assertFalse($headers['Content-Length']); } diff --git a/lib/Cake/Test/Case/Routing/Route/RedirectRouteTest.php b/lib/Cake/Test/Case/Routing/Route/RedirectRouteTest.php index fe3b41ab888..4eb65404750 100644 --- a/lib/Cake/Test/Case/Routing/Route/RedirectRouteTest.php +++ b/lib/Cake/Test/Case/Routing/Route/RedirectRouteTest.php @@ -47,14 +47,14 @@ public function testParsing() { $route = new RedirectRoute('/home', array('controller' => 'posts')); $route->stop = false; $route->response = $this->getMock('CakeResponse', array('_sendHeader')); - $result = $route->parse('/home'); + $route->parse('/home'); $header = $route->response->header(); $this->assertEquals(Router::url('/posts', true), $header['Location']); $route = new RedirectRoute('/home', array('controller' => 'posts', 'action' => 'index')); $route->stop = false; $route->response = $this->getMock('CakeResponse', array('_sendHeader')); - $result = $route->parse('/home'); + $route->parse('/home'); $header = $route->response->header(); $this->assertEquals(Router::url('/posts', true), $header['Location']); $this->assertEquals(301, $route->response->statusCode()); @@ -62,14 +62,14 @@ public function testParsing() { $route = new RedirectRoute('/google', 'http://google.com'); $route->stop = false; $route->response = $this->getMock('CakeResponse', array('_sendHeader')); - $result = $route->parse('/google'); + $route->parse('/google'); $header = $route->response->header(); $this->assertEquals('http://google.com', $header['Location']); $route = new RedirectRoute('/posts/*', array('controller' => 'posts', 'action' => 'view'), array('status' => 302)); $route->stop = false; $route->response = $this->getMock('CakeResponse', array('_sendHeader')); - $result = $route->parse('/posts/2'); + $route->parse('/posts/2'); $header = $route->response->header(); $this->assertEquals(Router::url('/posts/view', true), $header['Location']); $this->assertEquals(302, $route->response->statusCode()); @@ -77,35 +77,35 @@ public function testParsing() { $route = new RedirectRoute('/posts/*', array('controller' => 'posts', 'action' => 'view'), array('persist' => true)); $route->stop = false; $route->response = $this->getMock('CakeResponse', array('_sendHeader')); - $result = $route->parse('/posts/2'); + $route->parse('/posts/2'); $header = $route->response->header(); $this->assertEquals(Router::url('/posts/view/2', true), $header['Location']); $route = new RedirectRoute('/posts/*', '/test', array('persist' => true)); $route->stop = false; $route->response = $this->getMock('CakeResponse', array('_sendHeader')); - $result = $route->parse('/posts/2'); + $route->parse('/posts/2'); $header = $route->response->header(); $this->assertEquals(Router::url('/test', true), $header['Location']); $route = new RedirectRoute('/my_controllers/:action/*', array('controller' => 'tags', 'action' => 'add'), array('persist' => true)); $route->stop = false; $route->response = $this->getMock('CakeResponse', array('_sendHeader')); - $result = $route->parse('/my_controllers/do_something/passme/named:param'); + $route->parse('/my_controllers/do_something/passme/named:param'); $header = $route->response->header(); $this->assertEquals(Router::url('/tags/add/passme/named:param', true), $header['Location']); $route = new RedirectRoute('/my_controllers/:action/*', array('controller' => 'tags', 'action' => 'add')); $route->stop = false; $route->response = $this->getMock('CakeResponse', array('_sendHeader')); - $result = $route->parse('/my_controllers/do_something/passme/named:param'); + $route->parse('/my_controllers/do_something/passme/named:param'); $header = $route->response->header(); $this->assertEquals(Router::url('/tags/add', true), $header['Location']); $route = new RedirectRoute('/:lang/my_controllers', array('controller' => 'tags', 'action' => 'add'), array('lang' => '(nl|en)', 'persist' => array('lang'))); $route->stop = false; $route->response = $this->getMock('CakeResponse', array('_sendHeader')); - $result = $route->parse('/nl/my_controllers/'); + $route->parse('/nl/my_controllers/'); $header = $route->response->header(); $this->assertEquals(Router::url('/tags/add/lang:nl', true), $header['Location']); @@ -114,7 +114,7 @@ public function testParsing() { $route = new RedirectRoute('/:lang/my_controllers', array('controller' => 'tags', 'action' => 'add'), array('lang' => '(nl|en)', 'persist' => array('lang'))); $route->stop = false; $route->response = $this->getMock('CakeResponse', array('_sendHeader')); - $result = $route->parse('/nl/my_controllers/'); + $route->parse('/nl/my_controllers/'); $header = $route->response->header(); $this->assertEquals(Router::url('/nl/preferred_controllers', true), $header['Location']); } diff --git a/lib/Cake/Test/Case/Routing/RouterTest.php b/lib/Cake/Test/Case/Routing/RouterTest.php index 0a78cdedc3d..20d493bfe38 100644 --- a/lib/Cake/Test/Case/Routing/RouterTest.php +++ b/lib/Cake/Test/Case/Routing/RouterTest.php @@ -201,7 +201,7 @@ public function testMapResourcesConnectOptions() { )); CakePlugin::load('TestPlugin'); App::uses('TestRoute', 'TestPlugin.Routing/Route'); - $resources = Router::mapResources('Posts', array( + Router::mapResources('Posts', array( 'connectOptions' => array( 'routeClass' => 'TestPlugin.TestRoute', 'foo' => '^(bar)$', @@ -238,7 +238,7 @@ public function testPluginMapResourcesWithPrefix() { $this->assertEquals($expected, $result); $this->assertEquals(array('test_plugin'), $resources); - $resources = Router::mapResources('Posts', array('prefix' => 'api')); + Router::mapResources('Posts', array('prefix' => 'api')); $_SERVER['REQUEST_METHOD'] = 'GET'; $result = Router::parse('/api/posts'); @@ -1579,7 +1579,7 @@ public function testNamedArgsUrlGeneration() { $request->base = '/'; Router::setRequestInfo($request); - $result = Router::parse('/admin/controller/index/type:whatever'); + Router::parse('/admin/controller/index/type:whatever'); $result = Router::url(array('type' => 'new')); $expected = "/admin/controller/index/type:new"; $this->assertEquals($expected, $result); diff --git a/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php b/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php index d6c4fc1f05a..da97150c370 100644 --- a/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php +++ b/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php @@ -327,7 +327,6 @@ public function testAssertTextEquals() { */ public function testAssertTextStartsWith() { $stringDirty = "some\nstring\r\nwith\rdifferent\nline endings!"; - $stringClean = "some\nstring\nwith\ndifferent\nline endings!"; $this->assertStringStartsWith("some\nstring", $stringDirty); $this->assertStringStartsNotWith("some\r\nstring\r\nwith", $stringDirty); @@ -344,8 +343,6 @@ public function testAssertTextStartsWith() { */ public function testAssertTextStartsNotWith() { $stringDirty = "some\nstring\r\nwith\rdifferent\nline endings!"; - $stringClean = "some\nstring\nwith\ndifferent\nline endings!"; - $this->assertTextStartsNotWith("some\nstring\nwithout", $stringDirty); } @@ -356,8 +353,6 @@ public function testAssertTextStartsNotWith() { */ public function testAssertTextEndsWith() { $stringDirty = "some\nstring\r\nwith\rdifferent\nline endings!"; - $stringClean = "some\nstring\nwith\ndifferent\nline endings!"; - $this->assertTextEndsWith("string\nwith\r\ndifferent\rline endings!", $stringDirty); $this->assertTextEndsWith("string\r\nwith\ndifferent\nline endings!", $stringDirty); } @@ -369,8 +364,6 @@ public function testAssertTextEndsWith() { */ public function testAssertTextEndsNotWith() { $stringDirty = "some\nstring\r\nwith\rdifferent\nline endings!"; - $stringClean = "some\nstring\nwith\ndifferent\nline endings!"; - $this->assertStringEndsNotWith("different\nline endings", $stringDirty); $this->assertTextEndsNotWith("different\rline endings", $stringDirty); } @@ -382,11 +375,8 @@ public function testAssertTextEndsNotWith() { */ public function testAssertTextContains() { $stringDirty = "some\nstring\r\nwith\rdifferent\nline endings!"; - $stringClean = "some\nstring\nwith\ndifferent\nline endings!"; - $this->assertContains("different", $stringDirty); $this->assertNotContains("different\rline", $stringDirty); - $this->assertTextContains("different\rline", $stringDirty); } @@ -397,8 +387,6 @@ public function testAssertTextContains() { */ public function testAssertTextNotContains() { $stringDirty = "some\nstring\r\nwith\rdifferent\nline endings!"; - $stringClean = "some\nstring\nwith\ndifferent\nline endings!"; - $this->assertTextNotContains("different\rlines", $stringDirty); } @@ -414,7 +402,7 @@ public function testGetMockForModel() { ) ), App::RESET); $Post = $this->getMockForModel('Post'); - + $this->assertEquals('test', $Post->useDbConfig); $this->assertInstanceOf('Post', $Post); $this->assertNull($Post->save(array())); $this->assertNull($Post->find('all')); @@ -460,7 +448,7 @@ public function testGetMockForModelWithPlugin() { ), App::RESET); CakePlugin::load('TestPlugin'); $this->getMockForModel('TestPlugin.TestPluginAppModel'); - $TestPluginComment = $this->getMockForModel('TestPlugin.TestPluginComment'); + $this->getMockForModel('TestPlugin.TestPluginComment'); $result = ClassRegistry::init('TestPlugin.TestPluginComment'); $this->assertInstanceOf('TestPluginComment', $result); diff --git a/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php b/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php index 1a04dae0f5f..b50e219262b 100644 --- a/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php +++ b/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php @@ -534,7 +534,7 @@ public function testInsertStrings() { */ public function testInsertInvalid() { $Fixture = new InvalidTestFixture(); - $return = $Fixture->insert($this->criticDb); + $Fixture->insert($this->criticDb); } /** diff --git a/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php b/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php index 4eb1d301142..efd8878d842 100644 --- a/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php +++ b/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php @@ -276,7 +276,7 @@ public function testGenerateWithPlugin() { * @return void */ public function testTestAction() { - $Controller = $this->Case->generate('TestsApps'); + $this->Case->generate('TestsApps'); $this->Case->testAction('/tests_apps/index'); $this->assertInternalType('array', $this->Case->controller->viewVars); @@ -297,6 +297,30 @@ public function testTestAction() { 'Location' => 'http://cakephp.org' ); $this->assertEquals($expected, $results); + $this->assertSame(302, $Controller->response->statusCode()); + } + +/** + * Test array URLs with testAction() + * + * @return void + */ + public function testTestActionArrayUrls() { + $this->Case->generate('TestsApps'); + $this->Case->testAction(array('controller' => 'tests_apps', 'action' => 'index')); + $this->assertInternalType('array', $this->Case->controller->viewVars); + } + +/** + * Test that file responses don't trigger errors. + * + * @return void + */ + public function testActionWithFile() { + $Controller = $this->Case->generate('TestsApps'); + $this->Case->testAction('/tests_apps/file'); + $this->assertArrayHasKey('Content-Disposition', $Controller->response->header()); + $this->assertArrayHasKey('Content-Length', $Controller->response->header()); } /** @@ -428,7 +452,7 @@ public function testTestActionPostData() { public function testTestActionGetData() { $this->Case->autoMock = true; - $result = $this->Case->testAction('/tests_apps_posts/url_var', array( + $this->Case->testAction('/tests_apps_posts/url_var', array( 'method' => 'get', 'data' => array( 'some' => 'var', @@ -450,7 +474,7 @@ public function testTestActionGetData() { )); $this->assertEquals(array('gogo', 'val2'), $result['params']['pass']); - $result = $this->Case->testAction('/tests_apps_posts/url_var', array( + $this->Case->testAction('/tests_apps_posts/url_var', array( 'return' => 'vars', 'method' => 'get', 'data' => array( diff --git a/lib/Cake/Test/Case/Utility/StringTest.php b/lib/Cake/Test/Case/Utility/CakeTextTest.php similarity index 82% rename from lib/Cake/Test/Case/Utility/StringTest.php rename to lib/Cake/Test/Case/Utility/CakeTextTest.php index 52af3ca2cf6..2e085c39afe 100644 --- a/lib/Cake/Test/Case/Utility/StringTest.php +++ b/lib/Cake/Test/Case/Utility/CakeTextTest.php @@ -1,6 +1,6 @@ Text = new String(); + $this->Text = new CakeText(); } +/** + * Tear down object under test + * + * @return void + */ public function tearDown() { parent::tearDown(); unset($this->Text); @@ -39,9 +50,10 @@ public function tearDown() { * testUuidGeneration method * * @return void + * @covers ::uuid */ public function testUuidGeneration() { - $result = String::uuid(); + $result = CakeText::uuid(); $pattern = "/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/"; $match = (bool)preg_match($pattern, $result); $this->assertTrue($match); @@ -51,6 +63,7 @@ public function testUuidGeneration() { * testMultipleUuidGeneration method * * @return void + * @covers ::uuid */ public function testMultipleUuidGeneration() { $check = array(); @@ -58,7 +71,7 @@ public function testMultipleUuidGeneration() { $pattern = "/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/"; for ($i = 0; $i < $count; $i++) { - $result = String::uuid(); + $result = CakeText::uuid(); $match = (bool)preg_match($pattern, $result); $this->assertTrue($match); $this->assertFalse(in_array($result, $check)); @@ -70,131 +83,132 @@ public function testMultipleUuidGeneration() { * testInsert method * * @return void + * @covers ::insert */ public function testInsert() { $string = 'some string'; $expected = 'some string'; - $result = String::insert($string, array()); + $result = CakeText::insert($string, array()); $this->assertEquals($expected, $result); $string = '2 + 2 = :sum. Cake is :adjective.'; $expected = '2 + 2 = 4. Cake is yummy.'; - $result = String::insert($string, array('sum' => '4', 'adjective' => 'yummy')); + $result = CakeText::insert($string, array('sum' => '4', 'adjective' => 'yummy')); $this->assertEquals($expected, $result); $string = '2 + 2 = %sum. Cake is %adjective.'; - $result = String::insert($string, array('sum' => '4', 'adjective' => 'yummy'), array('before' => '%')); + $result = CakeText::insert($string, array('sum' => '4', 'adjective' => 'yummy'), array('before' => '%')); $this->assertEquals($expected, $result); $string = '2 + 2 = 2sum2. Cake is 9adjective9.'; - $result = String::insert($string, array('sum' => '4', 'adjective' => 'yummy'), array('format' => '/([\d])%s\\1/')); + $result = CakeText::insert($string, array('sum' => '4', 'adjective' => 'yummy'), array('format' => '/([\d])%s\\1/')); $this->assertEquals($expected, $result); $string = '2 + 2 = 12sum21. Cake is 23adjective45.'; $expected = '2 + 2 = 4. Cake is 23adjective45.'; - $result = String::insert($string, array('sum' => '4', 'adjective' => 'yummy'), array('format' => '/([\d])([\d])%s\\2\\1/')); + $result = CakeText::insert($string, array('sum' => '4', 'adjective' => 'yummy'), array('format' => '/([\d])([\d])%s\\2\\1/')); $this->assertEquals($expected, $result); $string = ':web :web_site'; $expected = 'www http'; - $result = String::insert($string, array('web' => 'www', 'web_site' => 'http')); + $result = CakeText::insert($string, array('web' => 'www', 'web_site' => 'http')); $this->assertEquals($expected, $result); $string = '2 + 2 =.'; $expected = '2 + 2 = '4', 'adjective' => 'yummy'), array('before' => '<', 'after' => '>')); + $result = CakeText::insert($string, array('sum' => '4', 'adjective' => 'yummy'), array('before' => '<', 'after' => '>')); $this->assertEquals($expected, $result); $string = '2 + 2 = \:sum. Cake is :adjective.'; $expected = '2 + 2 = :sum. Cake is yummy.'; - $result = String::insert($string, array('sum' => '4', 'adjective' => 'yummy')); + $result = CakeText::insert($string, array('sum' => '4', 'adjective' => 'yummy')); $this->assertEquals($expected, $result); $string = '2 + 2 = !:sum. Cake is :adjective.'; - $result = String::insert($string, array('sum' => '4', 'adjective' => 'yummy'), array('escape' => '!')); + $result = CakeText::insert($string, array('sum' => '4', 'adjective' => 'yummy'), array('escape' => '!')); $this->assertEquals($expected, $result); $string = '2 + 2 = \%sum. Cake is %adjective.'; $expected = '2 + 2 = %sum. Cake is yummy.'; - $result = String::insert($string, array('sum' => '4', 'adjective' => 'yummy'), array('before' => '%')); + $result = CakeText::insert($string, array('sum' => '4', 'adjective' => 'yummy'), array('before' => '%')); $this->assertEquals($expected, $result); $string = ':a :b \:a :a'; $expected = '1 2 :a 1'; - $result = String::insert($string, array('a' => 1, 'b' => 2)); + $result = CakeText::insert($string, array('a' => 1, 'b' => 2)); $this->assertEquals($expected, $result); $string = ':a :b :c'; $expected = '2 3'; - $result = String::insert($string, array('b' => 2, 'c' => 3), array('clean' => true)); + $result = CakeText::insert($string, array('b' => 2, 'c' => 3), array('clean' => true)); $this->assertEquals($expected, $result); $string = ':a :b :c'; $expected = '1 3'; - $result = String::insert($string, array('a' => 1, 'c' => 3), array('clean' => true)); + $result = CakeText::insert($string, array('a' => 1, 'c' => 3), array('clean' => true)); $this->assertEquals($expected, $result); $string = ':a :b :c'; $expected = '2 3'; - $result = String::insert($string, array('b' => 2, 'c' => 3), array('clean' => true)); + $result = CakeText::insert($string, array('b' => 2, 'c' => 3), array('clean' => true)); $this->assertEquals($expected, $result); $string = ':a, :b and :c'; $expected = '2 and 3'; - $result = String::insert($string, array('b' => 2, 'c' => 3), array('clean' => true)); + $result = CakeText::insert($string, array('b' => 2, 'c' => 3), array('clean' => true)); $this->assertEquals($expected, $result); $string = '":a, :b and :c"'; $expected = '"1, 2"'; - $result = String::insert($string, array('a' => 1, 'b' => 2), array('clean' => true)); + $result = CakeText::insert($string, array('a' => 1, 'b' => 2), array('clean' => true)); $this->assertEquals($expected, $result); $string = '"${a}, ${b} and ${c}"'; $expected = '"1, 2"'; - $result = String::insert($string, array('a' => 1, 'b' => 2), array('before' => '${', 'after' => '}', 'clean' => true)); + $result = CakeText::insert($string, array('a' => 1, 'b' => 2), array('before' => '${', 'after' => '}', 'clean' => true)); $this->assertEquals($expected, $result); $string = ' '; $expected = '
'; - $result = String::insert($string, array('src' => 'foo'), array('clean' => 'html')); + $result = CakeText::insert($string, array('src' => 'foo'), array('clean' => 'html')); $this->assertEquals($expected, $result); $string = '
Text here
', array('clean' => 'html', 'before' => ':', 'after' => '') ); @@ -268,13 +283,14 @@ public function testCleanInsert() { /** * Tests that non-insertable variables (i.e. arrays) are skipped when used as values in - * String::insert(). + * CakeText::insert(). * * @return void + * @covers ::insert */ public function testAutoIgnoreBadInsertData() { $data = array('foo' => 'alpha', 'bar' => 'beta', 'fale' => array()); - $result = String::insert('(:foo > :bar || :fale!)', $data, array('clean' => 'text')); + $result = CakeText::insert('(:foo > :bar || :fale!)', $data, array('clean' => 'text')); $this->assertEquals('(alpha > beta || !)', $result); } @@ -282,37 +298,49 @@ public function testAutoIgnoreBadInsertData() { * testTokenize method * * @return void + * @covers ::tokenize */ public function testTokenize() { - $result = String::tokenize('A,(short,boring test)'); + $result = CakeText::tokenize('A,(short,boring test)'); $expected = array('A', '(short,boring test)'); $this->assertEquals($expected, $result); - $result = String::tokenize('A,(short,more interesting( test)'); + $result = CakeText::tokenize('A,(short,more interesting( test)'); $expected = array('A', '(short,more interesting( test)'); $this->assertEquals($expected, $result); - $result = String::tokenize('A,(short,very interesting( test))'); + $result = CakeText::tokenize('A,(short,very interesting( test))'); $expected = array('A', '(short,very interesting( test))'); $this->assertEquals($expected, $result); - $result = String::tokenize('"single tag"', ' ', '"', '"'); + $result = CakeText::tokenize('"single tag"', ' ', '"', '"'); $expected = array('"single tag"'); $this->assertEquals($expected, $result); - $result = String::tokenize('tagA "single tag" tagB', ' ', '"', '"'); + $result = CakeText::tokenize('tagA "single tag" tagB', ' ', '"', '"'); $expected = array('tagA', '"single tag"', 'tagB'); $this->assertEquals($expected, $result); - $result = String::tokenize(''); + // Ideographic width space. + $result = CakeText::tokenize("tagA\xe3\x80\x80\"single\xe3\x80\x80tag\"\xe3\x80\x80tagB", "\xe3\x80\x80", '"', '"'); + $expected = array('tagA', '"single tag"', 'tagB'); + $this->assertEquals($expected, $result); + + $result = CakeText::tokenize(''); $expected = array(); $this->assertEquals($expected, $result); } +/** + * testReplaceWithQuestionMarkInString method + * + * @return void + * @covers ::insert + */ public function testReplaceWithQuestionMarkInString() { $string = ':a, :b and :c?'; $expected = '2 and 3?'; - $result = String::insert($string, array('b' => 2, 'c' => 3), array('clean' => true)); + $result = CakeText::insert($string, array('b' => 2, 'c' => 3), array('clean' => true)); $this->assertEquals($expected, $result); } @@ -321,9 +349,11 @@ public function testReplaceWithQuestionMarkInString() { * * @dataProvider wordWrapProvider * @return void + * @covers ::wordWrap + * @covers ::_wordWrap */ public function testWordWrap($text, $width, $break = "\n", $cut = false) { - $result = String::wordWrap($text, $width, $break, $cut); + $result = CakeText::wordWrap($text, $width, $break, $cut); $expected = wordwrap($text, $width, $break, $cut); $this->assertTextEquals($expected, $result, 'Text not wrapped same as built-in function.'); } @@ -354,10 +384,12 @@ public function wordWrapProvider() { * test that wordWrap() properly handle unicode strings. * * @return void + * @covers ::wordWrap + * @covers ::_wordWrap */ public function testWordWrapUnicodeAware() { $text = 'Но вим омниюм факёльиси элыктрам, мюнырэ лэгыры векж ыт. Выльёт квюандо нюмквуам ты кюм. Зыд эю рыбюм.'; - $result = String::wordWrap($text, 33, "\n", true); + $result = CakeText::wordWrap($text, 33, "\n", true); $expected = <<assertTextEquals($expected, $result, 'Text not wrapped.'); $text = 'Но вим омниюм факёльиси элыктрам, мюнырэ лэгыры векж ыт. Выльёт квюандо нюмквуам ты кюм. Зыд эю рыбюм.'; - $result = String::wordWrap($text, 33, "\n"); + $result = CakeText::wordWrap($text, 33, "\n"); $expected = << assertTextEquals($expected, $result, 'Text not wrapped.'); - $result = String::wrap($text, array('width' => 20, 'wordWrap' => false)); + $result = CakeText::wrap($text, array('width' => 20, 'wordWrap' => false)); $expected = 'This is the song th' . "\n" . 'at never ends. This' . "\n" . ' is the song that n' . "\n" . @@ -419,7 +456,7 @@ public function testWrap() { $this->assertTextEquals($expected, $result, 'Text not wrapped.'); $text = 'Но вим омниюм факёльиси элыктрам, мюнырэ лэгыры векж ыт. Выльёт квюандо нюмквуам ты кюм. Зыд эю рыбюм.'; - $result = String::wrap($text, 33); + $result = CakeText::wrap($text, 33); $expected = << 33, 'indent' => "\t", 'indentAt' => 1)); + $result = CakeText::wrap($text, array('width' => 33, 'indent' => "\t", 'indentAt' => 1)); $expected = << Text->toList(array()); diff --git a/lib/Cake/Test/Case/Utility/CakeTimeTest.php b/lib/Cake/Test/Case/Utility/CakeTimeTest.php index a76ffb6b07b..447af6dca09 100644 --- a/lib/Cake/Test/Case/Utility/CakeTimeTest.php +++ b/lib/Cake/Test/Case/Utility/CakeTimeTest.php @@ -72,13 +72,13 @@ protected function _restoreSystemTimezone() { */ public function testToQuarter() { $result = $this->Time->toQuarter('2007-12-25'); - $this->assertEquals(4, $result); + $this->assertSame(4, $result); $result = $this->Time->toQuarter('2007-9-25'); - $this->assertEquals(3, $result); + $this->assertSame(3, $result); $result = $this->Time->toQuarter('2007-3-25'); - $this->assertEquals(1, $result); + $this->assertSame(1, $result); $result = $this->Time->toQuarter('2007-3-25', true); $this->assertEquals(array('2007-01-01', '2007-03-31'), $result); @@ -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); diff --git a/lib/Cake/Test/Case/Utility/DebuggerTest.php b/lib/Cake/Test/Case/Utility/DebuggerTest.php index e967e7776d3..4179a7636e2 100644 --- a/lib/Cake/Test/Case/Utility/DebuggerTest.php +++ b/lib/Cake/Test/Case/Utility/DebuggerTest.php @@ -516,8 +516,8 @@ public function testDump() { Debugger::dump($var); $result = ob_get_clean(); - $open = php_sapi_name() === 'cli' ? "\n" : ' '; - $close = php_sapi_name() === 'cli' ? "\n" : '
'; + $open = PHP_SAPI === 'cli' ? "\n" : ''; + $close = PHP_SAPI === 'cli' ? "\n" : '
'; $expected = <<array( @@ -540,8 +540,8 @@ public function testDump() { Debugger::dump($var, 1); $result = ob_get_clean(); - $open = php_sapi_name() === 'cli' ? "\n" : ' '; - $close = php_sapi_name() === 'cli' ? "\n" : '
'; + $open = PHP_SAPI === 'cli' ? "\n" : ''; + $close = PHP_SAPI === 'cli' ? "\n" : '
'; $expected = <<array( diff --git a/lib/Cake/Test/Case/Utility/FileTest.php b/lib/Cake/Test/Case/Utility/FileTest.php index ce433a7f355..f596767c4a4 100644 --- a/lib/Cake/Test/Case/Utility/FileTest.php +++ b/lib/Cake/Test/Case/Utility/FileTest.php @@ -23,6 +23,7 @@ * FileTest class * * @package Cake.Test.Case.Utility + * @coversDefaultClass File */ class FileTest extends CakeTestCase { @@ -62,6 +63,15 @@ public function tearDown() { * testBasic method * * @return void + * @covers ::__construct + * @covers ::info + * @covers ::ext + * @covers ::name + * @covers ::md5 + * @covers ::size + * @covers ::owner + * @covers ::group + * @covers ::Folder */ public function testBasic() { $file = CAKE . DS . 'LICENSE.txt'; @@ -126,6 +136,7 @@ function_exists('mime_content_type') && * testPermission method * * @return void + * @covers ::perms */ public function testPermission() { $this->skipIf(DIRECTORY_SEPARATOR === '\\', 'File permissions tests not supported on Windows.'); @@ -172,6 +183,7 @@ public function testPermission() { * testRead method * * @return void + * @covers ::read */ public function testRead() { $file = __FILE__; @@ -203,6 +215,7 @@ public function testRead() { * testOffset method * * @return void + * @covers ::offset */ public function testOffset() { $this->File->close(); @@ -235,6 +248,7 @@ public function testOffset() { * testOpen method * * @return void + * @covers ::open */ public function testOpen() { $this->File->handle = null; @@ -259,6 +273,7 @@ public function testOpen() { * testClose method * * @return void + * @covers ::close */ public function testClose() { $this->File->handle = null; @@ -276,6 +291,9 @@ public function testClose() { * testCreate method * * @return void + * @covers ::create + * @covers ::exists + * @covers ::clearStatCache */ public function testCreate() { $tmpFile = TMP . 'tests' . DS . 'cakephp.file.test.tmp'; @@ -287,6 +305,8 @@ public function testCreate() { * testOpeningNonExistentFileCreatesIt method * * @return void + * @covers ::open + * @covers ::create */ public function testOpeningNonExistentFileCreatesIt() { $someFile = new File(TMP . 'some_file.txt', false); @@ -300,6 +320,7 @@ public function testOpeningNonExistentFileCreatesIt() { * testPrepare method * * @return void + * @covers ::prepare */ public function testPrepare() { $string = "some\nvery\ncool\r\nteststring here\n\n\nfor\r\r\n\n\r\n\nhere"; @@ -320,6 +341,7 @@ public function testPrepare() { * testReadable method * * @return void + * @covers ::readable */ public function testReadable() { $someFile = new File(TMP . 'some_file.txt', false); @@ -333,6 +355,7 @@ public function testReadable() { * testWritable method * * @return void + * @covers ::writable */ public function testWritable() { $someFile = new File(TMP . 'some_file.txt', false); @@ -346,6 +369,7 @@ public function testWritable() { * testExecutable method * * @return void + * @covers ::executable */ public function testExecutable() { $someFile = new File(TMP . 'some_file.txt', false); @@ -359,6 +383,7 @@ public function testExecutable() { * testLastAccess method * * @return void + * @covers ::lastAccess */ public function testLastAccess() { $someFile = new File(TMP . 'some_file.txt', false); @@ -373,6 +398,7 @@ public function testLastAccess() { * testLastChange method * * @return void + * @covers ::lastChange */ public function testLastChange() { $someFile = new File(TMP . 'some_file.txt', false); @@ -391,6 +417,7 @@ public function testLastChange() { * testWrite method * * @return void + * @covers ::write */ public function testWrite() { if (!$tmpFile = $this->_getTmpFile()) { @@ -421,6 +448,7 @@ public function testWrite() { * testAppend method * * @return void + * @covers ::append */ public function testAppend() { if (!$tmpFile = $this->_getTmpFile()) { @@ -457,6 +485,7 @@ public function testAppend() { * testDelete method * * @return void + * @covers ::delete */ public function testDelete() { if (!$tmpFile = $this->_getTmpFile()) { @@ -482,6 +511,7 @@ public function testDelete() { * active filehandles open. * * @return void + * @covers ::delete */ public function testDeleteAfterRead() { if (!$tmpFile = $this->_getTmpFile()) { @@ -499,6 +529,7 @@ public function testDeleteAfterRead() { * testCopy method * * @return void + * @covers ::copy */ public function testCopy() { $dest = TMP . 'tests' . DS . 'cakephp.file.test.tmp'; @@ -527,6 +558,7 @@ public function testCopy() { * Test mime() * * @return void + * @covers ::mime */ public function testMime() { $this->skipIf(!function_exists('finfo_open') && !function_exists('mime_content_type'), 'Not able to read mime type'); @@ -566,6 +598,7 @@ protected function _getTmpFile($paintSkip = true) { * testReplaceText method * * @return void + * @covers ::replaceText */ public function testReplaceText() { $TestFile = new File(dirname(__FILE__) . '/../../test_app/Vendor/welcome.php'); @@ -603,6 +636,7 @@ public function testReplaceText() { * do not exist. * * @return void + * @covers ::pwd */ public function testNoPartialPathBeingSetForNonExistentPath() { $tmpFile = new File('/non/existent/file'); diff --git a/lib/Cake/Test/Case/Utility/FolderTest.php b/lib/Cake/Test/Case/Utility/FolderTest.php index 007d363797c..55292281803 100644 --- a/lib/Cake/Test/Case/Utility/FolderTest.php +++ b/lib/Cake/Test/Case/Utility/FolderTest.php @@ -41,7 +41,7 @@ public static function setUpBeforeClass() { foreach (scandir(TMP) as $file) { if (is_dir(TMP . $file) && !in_array($file, array('.', '..'))) { - self::$_tmp[] = $file; + static::$_tmp[] = $file; } } } @@ -62,7 +62,7 @@ public function setUp() { * @return void */ public function tearDown() { - $exclude = array_merge(self::$_tmp, array('.', '..')); + $exclude = array_merge(static::$_tmp, array('.', '..')); foreach (scandir(TMP) as $dir) { if (is_dir(TMP . $dir) && !in_array($dir, $exclude)) { $iterator = new RecursiveDirectoryIterator(TMP . $dir); @@ -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); @@ -1026,7 +1026,7 @@ public function testCopyWithOverwrite() { extract($this->_setupFilesystem()); $Folder = new Folder($folderOne); - $result = $Folder->copy(array('to' => $folderThree, 'scheme' => Folder::OVERWRITE)); + $Folder->copy(array('to' => $folderThree, 'scheme' => Folder::OVERWRITE)); $this->assertTrue(file_exists($folderThree . DS . 'file1.php')); $this->assertTrue(file_exists($folderThree . DS . 'folderA' . DS . 'fileA.php')); diff --git a/lib/Cake/Test/Case/Utility/HashTest.php b/lib/Cake/Test/Case/Utility/HashTest.php index 5580315cd5b..0f8b8b540cf 100644 --- a/lib/Cake/Test/Case/Utility/HashTest.php +++ b/lib/Cake/Test/Case/Utility/HashTest.php @@ -198,7 +198,7 @@ public function testGet() { $result = Hash::get($data, '1'); $this->assertEquals('def', $result); - $data = self::articleData(); + $data = static::articleData(); $result = Hash::get(array(), '1.Article.title'); $this->assertNull($result); @@ -239,6 +239,19 @@ public function testGetInvalidPath() { Hash::get(array('one' => 'two'), true); } +/** + * Test testGetNullPath() + * + * @return void + */ + public function testGetNullPath() { + $result = Hash::get(array('one' => 'two'), null, '-'); + $this->assertEquals('-', $result); + + $result = Hash::get(array('one' => 'two'), '', '-'); + $this->assertEquals('-', $result); + } + /** * Test dimensions. * @@ -275,42 +288,37 @@ public function testDimensions() { * @return void */ public function testMaxDimensions() { - $data = array('1' => '1.1', '2', '3' => array('3.1' => '3.1.1')); + $data = array(); $result = Hash::maxDimensions($data); - $this->assertEquals($result, 2); + $this->assertEquals(0, $result); - $data = array('1' => array('1.1' => '1.1.1'), '2', '3' => array('3.1' => array('3.1.1' => '3.1.1.1'))); + $data = array('a', 'b'); $result = Hash::maxDimensions($data); - $this->assertEquals($result, 3); + $this->assertEquals(1, $result); - $data = array( - '1' => array('1.1' => '1.1.1'), - array('2' => array('2.1' => array('2.1.1' => '2.1.1.1'))), - '3' => array('3.1' => array('3.1.1' => '3.1.1.1')) - ); - $result = Hash::maxDimensions($data); - $this->assertEquals($result, 4); - - $data = array( - '1' => array('1.1' => '1.1.1'), - array('2' => array('2.1' => array('2.1.1' => array('2.1.1.1')))), - '3' => array('3.1' => array('3.1.1' => '3.1.1.1')) - ); + $data = array('1' => '1.1', '2', '3' => array('3.1' => '3.1.1')); $result = Hash::maxDimensions($data); - $this->assertEquals($result, 5); + $this->assertEquals($result, 2); $data = array( '1' => array('1.1' => '1.1.1'), - array('2' => array('2.1' => array('2.1.1' => array('2.1.1.1' => '2.1.1.1.1')))), + '2', '3' => array('3.1' => array('3.1.1' => '3.1.1.1')) ); $result = Hash::maxDimensions($data); - $this->assertEquals($result, 5); + $this->assertEquals($result, 3); $data = array( - '1' => array('1.1' => '1.1.1'), - array('2' => array('2.1' => array('2.1.1' => array('2.1.1.1' => '2.1.1.1.1')))), - '3' => array('3.1' => array('3.1.1' => '3.1.1.1')) + '1' => array( + '1.1' => '1.1.1', + '1.2' => array( + '1.2.1' => array( + '1.2.1.1', + array('1.2.2.1') + ) + ) + ), + '2' => array('2.1' => '2.1.1') ); $result = Hash::maxDimensions($data); $this->assertEquals($result, 5); @@ -700,7 +708,7 @@ public function testNumeric() { * @return void */ public function testExtractBasic() { - $data = self::articleData(); + $data = static::articleData(); $result = Hash::extract($data, ''); $this->assertEquals($data, $result); @@ -721,7 +729,7 @@ public function testExtractBasic() { * @return void */ public function testExtractNumericKey() { - $data = self::articleData(); + $data = static::articleData(); $result = Hash::extract($data, '{n}.Article.title'); $expected = array( 'First Article', 'Second Article', @@ -800,7 +808,7 @@ public function testExtractNumericNonZero() { * @return void */ public function testExtractStringKey() { - $data = self::articleData(); + $data = static::articleData(); $result = Hash::extract($data, '{n}.{s}.user'); $expected = array( 'mariano', @@ -815,13 +823,39 @@ public function testExtractStringKey() { $this->assertEquals(array('foo'), $result); } +/** + * Test wildcard matcher + * + * @return void + */ + public function testExtractWildcard() { + $data = array( + '02000009C5560001' => array('name' => 'Mr. Alphanumeric'), + '2300000918020101' => array('name' => 'Mr. Numeric'), + '390000096AB30001' => array('name' => 'Mrs. Alphanumeric'), + 'stuff' => array('name' => 'Ms. Word'), + 123 => array('name' => 'Mr. Number'), + true => array('name' => 'Ms. Bool'), + ); + $result = Hash::extract($data, '{*}.name'); + $expected = array( + 'Mr. Alphanumeric', + 'Mr. Numeric', + 'Mrs. Alphanumeric', + 'Ms. Word', + 'Mr. Number', + 'Ms. Bool', + ); + $this->assertEquals($expected, $result); + } + /** * Test the attribute presense selector. * * @return void */ public function testExtractAttributePresence() { - $data = self::articleData(); + $data = static::articleData(); $result = Hash::extract($data, '{n}.Article[published]'); $expected = array($data[1]['Article']); @@ -838,7 +872,7 @@ public function testExtractAttributePresence() { * @return void */ public function testExtractAttributeEquality() { - $data = self::articleData(); + $data = static::articleData(); $result = Hash::extract($data, '{n}.Article[id=3]'); $expected = array($data[2]['Article']); @@ -923,7 +957,7 @@ public function testExtractAttributeEqualityOnScalarValue() { * @return void */ public function testExtractAttributeComparison() { - $data = self::articleData(); + $data = static::articleData(); $result = Hash::extract($data, '{n}.Comment.{n}[user_id > 2]'); $expected = array($data[0]['Comment'][1]); @@ -952,7 +986,7 @@ public function testExtractAttributeComparison() { * @return void */ public function testExtractAttributeMultiple() { - $data = self::articleData(); + $data = static::articleData(); $result = Hash::extract($data, '{n}.Comment.{n}[user_id > 2][id=1]'); $this->assertEmpty($result); @@ -969,7 +1003,7 @@ public function testExtractAttributeMultiple() { * @return void */ public function testExtractAttributePattern() { - $data = self::articleData(); + $data = static::articleData(); $result = Hash::extract($data, '{n}.Article[title=/^First/]'); $expected = array($data[0]['Article']); @@ -1392,7 +1426,7 @@ public function testInsertSimple() { * @return void */ public function testInsertMulti() { - $data = self::articleData(); + $data = static::articleData(); $result = Hash::insert($data, '{n}.Article.insert', 'value'); $this->assertEquals('value', $result[0]['Article']['insert']); @@ -1518,7 +1552,7 @@ public function testRemove() { * @return void */ public function testRemoveMulti() { - $data = self::articleData(); + $data = static::articleData(); $result = Hash::remove($data, '{n}.Article.title'); $this->assertFalse(isset($result[0]['Article']['title'])); @@ -1585,7 +1619,7 @@ public function testCombine() { $result = Hash::combine(array(), '{n}.User.id', '{n}.User.Data'); $this->assertTrue(empty($result)); - $a = self::userData(); + $a = static::userData(); $result = Hash::combine($a, '{n}.User.id'); $expected = array(2 => null, 14 => null, 25 => null); @@ -1644,7 +1678,7 @@ public function testCombineErrorMissingKey() { * @return void */ public function testCombineWithGroupPath() { - $a = self::userData(); + $a = static::userData(); $result = Hash::combine($a, '{n}.User.id', '{n}.User.Data', '{n}.User.group_id'); $expected = array( @@ -1701,7 +1735,7 @@ public function testCombineWithGroupPath() { * @return void */ public function testCombineWithFormatting() { - $a = self::userData(); + $a = static::userData(); $result = Hash::combine( $a, @@ -1767,7 +1801,7 @@ public function testCombineWithFormatting() { * @return void */ public function testFormat() { - $data = self::userData(); + $data = static::userData(); $result = Hash::format( $data, @@ -1827,7 +1861,7 @@ public function testFormatNullValues() { * @return void */ public function testMap() { - $data = self::articleData(); + $data = static::articleData(); $result = Hash::map($data, '{n}.Article.id', array($this, 'mapCallback')); $expected = array(2, 4, 6, 8, 10); @@ -1840,7 +1874,7 @@ public function testMap() { * @return void */ public function testApply() { - $data = self::articleData(); + $data = static::articleData(); $result = Hash::apply($data, '{n}.Article.id', 'array_sum'); $this->assertEquals(15, $result); @@ -1852,7 +1886,7 @@ public function testApply() { * @return void */ public function testReduce() { - $data = self::articleData(); + $data = static::articleData(); $result = Hash::reduce($data, '{n}.Article.id', array($this, 'reduceCallback')); $this->assertEquals(15, $result); diff --git a/lib/Cake/Test/Case/Utility/InflectorTest.php b/lib/Cake/Test/Case/Utility/InflectorTest.php index f600ae75776..9df596e78dd 100644 --- a/lib/Cake/Test/Case/Utility/InflectorTest.php +++ b/lib/Cake/Test/Case/Utility/InflectorTest.php @@ -123,11 +123,12 @@ public function testInflectingSingulars() { $this->assertEquals(Inflector::singularize('fungi'), 'fungus'); $this->assertEquals(Inflector::singularize('nuclei'), 'nucleus'); $this->assertEquals(Inflector::singularize('octopuses'), 'octopus'); + $this->assertEquals(Inflector::singularize('octopuses'), 'octopus'); $this->assertEquals(Inflector::singularize('radii'), 'radius'); $this->assertEquals(Inflector::singularize('stimuli'), 'stimulus'); $this->assertEquals(Inflector::singularize('syllabi'), 'syllabus'); $this->assertEquals(Inflector::singularize('termini'), 'terminus'); - $this->assertEquals(Inflector::singularize('viri'), 'virus'); + $this->assertEquals(Inflector::singularize('viruses'), 'virus'); $this->assertEquals(Inflector::singularize('people'), 'person'); $this->assertEquals(Inflector::singularize('gloves'), 'glove'); $this->assertEquals(Inflector::singularize('doves'), 'dove'); @@ -177,9 +178,34 @@ public function testInflectingSingulars() { $this->assertEquals(Inflector::singularize('body_curves'), 'body_curve'); $this->assertEquals(Inflector::singularize('metadata'), 'metadata'); $this->assertEquals(Inflector::singularize('files_metadata'), 'files_metadata'); + $this->assertEquals(Inflector::singularize('sieves'), 'sieve'); + $this->assertEquals(Inflector::singularize('blue_octopuses'), 'blue_octopus'); $this->assertEquals(Inflector::singularize(''), ''); } +/** + * Test that overlapping irregulars don't collide. + * + * @return void + */ + public function testSingularizeMultiWordIrregular() { + Inflector::rules('singular', array( + 'irregular' => array( + 'preguntas_frecuentes' => 'pregunta_frecuente', + 'categorias_preguntas_frecuentes' => 'categoria_pregunta_frecuente', + ) + )); + $this->assertEquals('pregunta_frecuente', Inflector::singularize('preguntas_frecuentes')); + $this->assertEquals( + 'categoria_pregunta_frecuente', + Inflector::singularize('categorias_preguntas_frecuentes') + ); + $this->assertEquals( + 'faq_categoria_pregunta_frecuente', + Inflector::singularize('faq_categorias_preguntas_frecuentes') + ); + } + /** * testInflectingPlurals method * @@ -220,7 +246,7 @@ public function testInflectingPlurals() { $this->assertEquals(Inflector::pluralize('stimulus'), 'stimuli'); $this->assertEquals(Inflector::pluralize('syllabus'), 'syllabi'); $this->assertEquals(Inflector::pluralize('terminus'), 'termini'); - $this->assertEquals(Inflector::pluralize('virus'), 'viri'); + $this->assertEquals(Inflector::pluralize('virus'), 'viruses'); $this->assertEquals(Inflector::pluralize('person'), 'people'); $this->assertEquals(Inflector::pluralize('people'), 'people'); $this->assertEquals(Inflector::pluralize('glove'), 'gloves'); @@ -248,9 +274,66 @@ public function testInflectingPlurals() { $this->assertEquals(Inflector::pluralize('metadata'), 'metadata'); $this->assertEquals(Inflector::pluralize('files_metadata'), 'files_metadata'); $this->assertEquals(Inflector::pluralize('stadia'), 'stadia'); + $this->assertEquals(Inflector::pluralize('sieve'), 'sieves'); + $this->assertEquals(Inflector::pluralize('blue_octopus'), 'blue_octopuses'); $this->assertEquals(Inflector::pluralize(''), ''); } +/** + * Test that overlapping irregulars don't collide. + * + * @return void + */ + public function testPluralizeMultiWordIrregular() { + Inflector::rules('plural', array( + 'irregular' => array( + 'mytable1' => 'mytables1', + 'mytable2' => 'mytables2', + 'mytable1_mytable2' => 'mytables1_mytables2', + 'pregunta_frecuente' => 'preguntas_frecuentes', + 'categoria_pregunta_frecuente' => 'categorias_preguntas_frecuentes', + ) + )); + $this->assertEquals('preguntas_frecuentes', Inflector::pluralize('pregunta_frecuente')); + $this->assertEquals( + 'categorias_preguntas_frecuentes', + Inflector::pluralize('categoria_pregunta_frecuente') + ); + $this->assertEquals( + 'faq_categorias_preguntas_frecuentes', + Inflector::pluralize('faq_categoria_pregunta_frecuente') + ); + $this->assertEquals('mytables1', Inflector::pluralize('mytable1')); + $this->assertEquals('mytables2', Inflector::pluralize('mytable2')); + $this->assertEquals('mytables1_mytables2', Inflector::pluralize('mytable1_mytable2')); + $this->assertEquals('mytables1_mytables2', Inflector::tableize('Mytable1Mytable2')); + } + +/** + * testInflectingMultiWordIrregulars + * + * @return void + */ + public function testInflectingMultiWordIrregulars() { + // unset the default rules in order to avoid them possibly matching + // the words in case the irregular regex won't match, the tests + // should fail in that case + Inflector::rules('plural', array( + 'rules' => array(), + )); + Inflector::rules('singular', array( + 'rules' => array(), + )); + + $this->assertEquals(Inflector::singularize('wisdom teeth'), 'wisdom tooth'); + $this->assertEquals(Inflector::singularize('wisdom-teeth'), 'wisdom-tooth'); + $this->assertEquals(Inflector::singularize('wisdom_teeth'), 'wisdom_tooth'); + + $this->assertEquals(Inflector::pluralize('sweet potato'), 'sweet potatoes'); + $this->assertEquals(Inflector::pluralize('sweet-potato'), 'sweet-potatoes'); + $this->assertEquals(Inflector::pluralize('sweet_potato'), 'sweet_potatoes'); + } + /** * testInflectorSlug method * @@ -323,7 +406,7 @@ public function testInflectorSlug() { * @return void */ public function testInflectorSlugCharList() { - foreach (self::$maps as $language => $list) { + foreach (static::$maps as $language => $list) { foreach ($list as $from => $to) { $result = Inflector::slug($from); $this->assertEquals($to, $result, $from . ' (' . $language . ') should be ' . $to . ' - but is ' . $result); @@ -369,12 +452,14 @@ public function testInflectorUnderscore() { $this->assertSame(Inflector::underscore('testThing'), 'test_thing'); $this->assertSame(Inflector::underscore('TestThingExtra'), 'test_thing_extra'); $this->assertSame(Inflector::underscore('testThingExtra'), 'test_thing_extra'); + $this->assertSame(Inflector::underscore('testThingExtrå'), 'test_thing_extrå'); // Identical checks test the cache code path. $this->assertSame(Inflector::underscore('TestThing'), 'test_thing'); $this->assertSame(Inflector::underscore('testThing'), 'test_thing'); $this->assertSame(Inflector::underscore('TestThingExtra'), 'test_thing_extra'); $this->assertSame(Inflector::underscore('testThingExtra'), 'test_thing_extra'); + $this->assertSame(Inflector::underscore('testThingExtrå'), 'test_thing_extrå'); // Test stupid values $this->assertSame(Inflector::underscore(''), ''); @@ -382,6 +467,19 @@ public function testInflectorUnderscore() { $this->assertSame(Inflector::underscore(false), ''); } +/** + * Test camelize() + * + * @return void + */ + public function testCamelize() { + $this->assertSame('BlogArticles', Inflector::camelize('blog_articles')); + $this->assertSame('BlogArticles', Inflector::camelize('blog articles')); + $this->assertSame('MyPlugin.MyClass', Inflector::camelize('MyPlugin.MyClass')); + $this->assertSame('MyPlugin.MyClass', Inflector::camelize('my_plugin.MyClass')); + $this->assertSame('MyPlugin.myClass', Inflector::camelize('MyPlugin.my_class')); + } + /** * testVariableNaming method * @@ -412,10 +510,10 @@ public function testClassNaming() { * @return void */ public function testTableNaming() { - $this->assertEquals(Inflector::tableize('ArtistsGenre'), 'artists_genres'); - $this->assertEquals(Inflector::tableize('FileSystem'), 'file_systems'); - $this->assertEquals(Inflector::tableize('News'), 'news'); - $this->assertEquals(Inflector::tableize('Bureau'), 'bureaus'); + $this->assertEquals('artists_genres', Inflector::tableize('ArtistsGenre')); + $this->assertEquals('file_systems', Inflector::tableize('FileSystem')); + $this->assertEquals('news', Inflector::tableize('News')); + $this->assertEquals('bureaus', Inflector::tableize('Bureau')); } /** @@ -424,9 +522,12 @@ public function testTableNaming() { * @return void */ public function testHumanization() { - $this->assertEquals(Inflector::humanize('posts'), 'Posts'); - $this->assertEquals(Inflector::humanize('posts_tags'), 'Posts Tags'); - $this->assertEquals(Inflector::humanize('file_systems'), 'File Systems'); + $this->assertEquals('Posts', Inflector::humanize('posts')); + $this->assertEquals('Posts Tags', Inflector::humanize('posts_tags')); + $this->assertEquals('File Systems', Inflector::humanize('file_systems')); + $this->assertEquals('FiLe SysTems', Inflector::humanize('FiLe_SysTems')); + $this->assertEquals('Hello Wörld', Inflector::humanize('hello_wörld')); + $this->assertEquals('福岡 City', Inflector::humanize('福岡_city')); } /** diff --git a/lib/Cake/Test/Case/Utility/ObjectCollectionTest.php b/lib/Cake/Test/Case/Utility/ObjectCollectionTest.php index c92c4923b1b..7d2eade79d4 100644 --- a/lib/Cake/Test/Case/Utility/ObjectCollectionTest.php +++ b/lib/Cake/Test/Case/Utility/ObjectCollectionTest.php @@ -27,8 +27,8 @@ class GenericObject { /** * Constructor * - * @param GenericObjectCollection $collection - * @param array $settings + * @param GenericObjectCollection $collection A collection. + * @param array $settings Settings. */ public function __construct(GenericObjectCollection $collection, $settings = array()) { $this->_Collection = $collection; @@ -583,4 +583,33 @@ public function testDispatchEventNoSubject() { $this->assertTrue($this->Objects->trigger($event)); } +/** + * test that the various methods ignore plugin prefixes + * + * plugin prefixes should be removed consistently as load() will + * remove them. Furthermore the __get() method does not support + * names with '.' in them. + * + * @return void + */ + public function testPluginPrefixes() { + $this->Objects->load('TestPlugin.First'); + $this->assertTrue($this->Objects->loaded('First')); + $this->assertTrue($this->Objects->loaded('TestPlugin.First')); + + $this->assertTrue($this->Objects->enabled('First')); + $this->assertTrue($this->Objects->enabled('TestPlugin.First')); + + $this->assertNull($this->Objects->disable('TestPlugin.First')); + $this->assertFalse($this->Objects->enabled('First')); + $this->assertFalse($this->Objects->enabled('TestPlugin.First')); + + $this->assertNull($this->Objects->enable('TestPlugin.First')); + $this->assertTrue($this->Objects->enabled('First')); + $this->assertTrue($this->Objects->enabled('TestPlugin.First')); + $this->Objects->setPriority('TestPlugin.First', 1000); + + $result = $this->Objects->prioritize(); + $this->assertEquals(1000, $result['First'][0]); + } } diff --git a/lib/Cake/Test/Case/Utility/SanitizeTest.php b/lib/Cake/Test/Case/Utility/SanitizeTest.php index 524e8ab4905..b6112c124a7 100644 --- a/lib/Cake/Test/Case/Utility/SanitizeTest.php +++ b/lib/Cake/Test/Case/Utility/SanitizeTest.php @@ -154,7 +154,7 @@ public function testClean() { $string = ''; $expected = ''; $result = Sanitize::clean($string, array('connection' => 'test')); - $this->assertEquals($expected, $string); + $this->assertEquals($expected, $result); $data = array( 'Grant' => array( diff --git a/lib/Cake/Test/Case/Utility/SecurityTest.php b/lib/Cake/Test/Case/Utility/SecurityTest.php index bc81aecfe67..90ea96c86dd 100644 --- a/lib/Cake/Test/Case/Utility/SecurityTest.php +++ b/lib/Cake/Test/Case/Utility/SecurityTest.php @@ -324,7 +324,7 @@ public function testEncryptDecrypt() { public function testDecryptKeyFailure() { $txt = 'The quick brown fox'; $key = 'This key is longer than 32 bytes long.'; - $result = Security::encrypt($txt, $key); + Security::encrypt($txt, $key); $key = 'Not the same key. This one will fail'; $this->assertFalse(Security::decrypt($txt, $key), 'Modified key will fail.'); diff --git a/lib/Cake/Test/Case/Utility/SetTest.php b/lib/Cake/Test/Case/Utility/SetTest.php index f55afd1069d..6097191db6b 100644 --- a/lib/Cake/Test/Case/Utility/SetTest.php +++ b/lib/Cake/Test/Case/Utility/SetTest.php @@ -2763,7 +2763,6 @@ public function testPushDiff() { /** * testSetApply method * @return void - * */ public function testApply() { $data = array( diff --git a/lib/Cake/Test/Case/Utility/ValidationTest.php b/lib/Cake/Test/Case/Utility/ValidationTest.php index 7126f6ecf17..7c5dca57601 100644 --- a/lib/Cake/Test/Case/Utility/ValidationTest.php +++ b/lib/Cake/Test/Case/Utility/ValidationTest.php @@ -28,7 +28,7 @@ class CustomValidator { /** * Makes sure that a given $email address is valid and unique * - * @param string $email + * @param string $check Email to check. * @return bool */ public static function customValidate($check) { @@ -124,37 +124,37 @@ public function tearDown() { } /** - * testNotEmpty method + * Test notBlank method * * @return void */ - public function testNotEmpty() { - $this->assertTrue(Validation::notEmpty('abcdefg')); - $this->assertTrue(Validation::notEmpty('fasdf ')); - $this->assertTrue(Validation::notEmpty('fooo' . chr(243) . 'blabla')); - $this->assertTrue(Validation::notEmpty('abçďĕʑʘπй')); - $this->assertTrue(Validation::notEmpty('José')); - $this->assertTrue(Validation::notEmpty('é')); - $this->assertTrue(Validation::notEmpty('π')); - $this->assertFalse(Validation::notEmpty("\t ")); - $this->assertFalse(Validation::notEmpty("")); + public function testNotBlank() { + $this->assertTrue(Validation::notBlank('abcdefg')); + $this->assertTrue(Validation::notBlank('fasdf ')); + $this->assertTrue(Validation::notBlank('fooo' . chr(243) . 'blabla')); + $this->assertTrue(Validation::notBlank('abçďĕʑʘπй')); + $this->assertTrue(Validation::notBlank('José')); + $this->assertTrue(Validation::notBlank('é')); + $this->assertTrue(Validation::notBlank('π')); + $this->assertFalse(Validation::notBlank("\t ")); + $this->assertFalse(Validation::notBlank("")); } /** - * testNotEmptyISO88591Encoding method + * Test notBlank method with ISO88591 encoding * * @return void */ - public function testNotEmptyISO88591AppEncoding() { + public function testNotBlankISO88591AppEncoding() { Configure::write('App.encoding', 'ISO-8859-1'); - $this->assertTrue(Validation::notEmpty('abcdefg')); - $this->assertTrue(Validation::notEmpty('fasdf ')); - $this->assertTrue(Validation::notEmpty('fooo' . chr(243) . 'blabla')); - $this->assertTrue(Validation::notEmpty('abçďĕʑʘπй')); - $this->assertTrue(Validation::notEmpty('José')); - $this->assertTrue(Validation::notEmpty(utf8_decode('José'))); - $this->assertFalse(Validation::notEmpty("\t ")); - $this->assertFalse(Validation::notEmpty("")); + $this->assertTrue(Validation::notBlank('abcdefg')); + $this->assertTrue(Validation::notBlank('fasdf ')); + $this->assertTrue(Validation::notBlank('fooo' . chr(243) . 'blabla')); + $this->assertTrue(Validation::notBlank('abçďĕʑʘπй')); + $this->assertTrue(Validation::notBlank('José')); + $this->assertTrue(Validation::notBlank(utf8_decode('José'))); + $this->assertFalse(Validation::notBlank("\t ")); + $this->assertFalse(Validation::notBlank("")); } /** @@ -930,6 +930,25 @@ public function testComparison() { $this->assertFalse(Validation::comparison(7, '==', 6)); $this->assertFalse(Validation::comparison(7, 'not equal', 7)); $this->assertFalse(Validation::comparison(7, '!=', 7)); + + $this->assertTrue(Validation::comparison('6.5', '!=', 6)); + $this->assertTrue(Validation::comparison('6.5', '<', 7)); + } + +/** + * Test comparison casting values before comparisons. + * + * @return void + */ + public function testComparisonTypeChecks() { + $this->assertFalse(Validation::comparison('\x028', '>=', 1), 'hexish encoding fails'); + $this->assertFalse(Validation::comparison('0b010', '>=', 1), 'binary string data fails'); + $this->assertFalse(Validation::comparison('0x01', '>=', 1), 'hex string data fails'); + $this->assertFalse(Validation::comparison('0x1', '>=', 1), 'hex string data fails'); + + $this->assertFalse(Validation::comparison('\x028', '>=', 1.5), 'hexish encoding fails'); + $this->assertFalse(Validation::comparison('0b010', '>=', 1.5), 'binary string data fails'); + $this->assertFalse(Validation::comparison('0x02', '>=', 1.5), 'hex string data fails'); } /** @@ -2004,6 +2023,22 @@ public function testRange() { $this->assertFalse(Validation::range('word')); } +/** + * Test range type checks + * + * @return void + */ + public function testRangeTypeChecks() { + $this->assertFalse(Validation::range('\x028', 1, 5), 'hexish encoding fails'); + $this->assertFalse(Validation::range('0b010', 1, 5), 'binary string data fails'); + $this->assertFalse(Validation::range('0x01', 1, 5), 'hex string data fails'); + $this->assertFalse(Validation::range('0x1', 1, 5), 'hex string data fails'); + + $this->assertFalse(Validation::range('\x028', 1, 5), 'hexish encoding fails'); + $this->assertFalse(Validation::range('0b010', 1, 5), 'binary string data fails'); + $this->assertFalse(Validation::range('0x02', 1, 5), 'hex string data fails'); + } + /** * testExtension method * @@ -2085,8 +2120,9 @@ public function testMultiple() { $this->assertFalse(Validation::multiple('')); $this->assertFalse(Validation::multiple(null)); $this->assertFalse(Validation::multiple(array())); - $this->assertFalse(Validation::multiple(array(0))); - $this->assertFalse(Validation::multiple(array('0'))); + $this->assertTrue(Validation::multiple(array(0))); + $this->assertTrue(Validation::multiple(array('0'))); + $this->assertFalse(Validation::multiple(array(''))); $this->assertTrue(Validation::multiple(array(0, 3, 4, 5), array('in' => range(0, 10)))); $this->assertFalse(Validation::multiple(array(0, 15, 20, 5), array('in' => range(0, 10)))); @@ -2094,8 +2130,9 @@ public function testMultiple() { $this->assertFalse(Validation::multiple(array('boo', 'foo', 'bar'), array('in' => array('foo', 'bar', 'baz')))); $this->assertFalse(Validation::multiple(array('foo', '1bar'), array('in' => range(0, 10)))); - $this->assertTrue(Validation::multiple(array(0, 5, 10, 11), array('max' => 3))); - $this->assertFalse(Validation::multiple(array(0, 5, 10, 11, 55), array('max' => 3))); + $this->assertFalse(Validation::multiple(array(1, 5, 10, 11), array('max' => 3))); + $this->assertTrue(Validation::multiple(array(0, 5, 10, 11), array('max' => 4))); + $this->assertFalse(Validation::multiple(array(0, 5, 10, 11, 55), array('max' => 4))); $this->assertTrue(Validation::multiple(array('foo', 'bar', 'baz'), array('max' => 3))); $this->assertFalse(Validation::multiple(array('foo', 'bar', 'baz', 'squirrel'), array('max' => 3))); @@ -2110,8 +2147,8 @@ public function testMultiple() { $this->assertFalse(Validation::multiple(array(0, 5, 9, 8, 6, 2, 1), array('in' => range(0, 10), 'max' => 5))); $this->assertFalse(Validation::multiple(array(0, 5, 9, 8, 11), array('in' => range(0, 10), 'max' => 5))); - $this->assertFalse(Validation::multiple(array(0, 5, 9), array('in' => range(0, 10), 'max' => 5, 'min' => 3))); - $this->assertFalse(Validation::multiple(array(0, 5, 9, 8, 6, 2, 1), array('in' => range(0, 10), 'max' => 5, 'min' => 2))); + $this->assertFalse(Validation::multiple(array(-1, 5, 9), array('in' => range(0, 10), 'max' => 5, 'min' => 3))); + $this->assertFalse(Validation::multiple(array(-1, 5, 9, 8, 6, 2, 1), array('in' => range(0, 10), 'max' => 5, 'min' => 2))); $this->assertFalse(Validation::multiple(array(0, 5, 9, 8, 11), array('in' => range(0, 10), 'max' => 5, 'min' => 2))); $this->assertFalse(Validation::multiple(array('2x', '3x'), array('in' => array(1, 2, 3, 4, 5)))); diff --git a/lib/Cake/Test/Case/Utility/XmlTest.php b/lib/Cake/Test/Case/Utility/XmlTest.php index 273801892a0..5cb62d0f879 100644 --- a/lib/Cake/Test/Case/Utility/XmlTest.php +++ b/lib/Cake/Test/Case/Utility/XmlTest.php @@ -167,6 +167,28 @@ public function testBuild() { $this->assertNotRegExp('/encoding/', $obj->saveXML()); } +/** + * Test that the readFile option disables local file parsing. + * + * @expectedException XmlException + * @return void + */ + public function testBuildFromFileWhenDisabled() { + $xml = CAKE . 'Test' . DS . 'Fixture' . DS . 'sample.xml'; + Xml::build($xml, array('readFile' => false)); + } + +/** + * Test that the readFile option disables local file parsing. + * + * @expectedException XmlException + * @return void + */ + public function testBuildFromUrlWhenDisabled() { + $xml = 'http://www.google.com'; + Xml::build($xml, array('readFile' => false)); + } + /** * data provider function for testBuildInvalidData * @@ -200,7 +222,7 @@ public function testBuildInvalidData($value) { */ public function testBuildInvalidDataSimpleXml() { $input = ' Recorded'; + $result = $this->Flash->render('classy'); + $this->assertContains($expected, $result); + + $result = $this->Flash->render('notification'); + $expected = "\n\t"; + $this->assertContains($expected, $result); + + $this->assertNull($this->Flash->render('non-existent')); + } + +/** + * testFlashThrowsException + * + * @expectedException UnexpectedValueException + */ + public function testFlashThrowsException() { + CakeSession::write('Message.foo', 'bar'); + $this->Flash->render('foo'); + } + +/** + * test setting the element from the attrs. + * + * @return void + */ + public function testFlashElementInAttrs() { + $result = $this->Flash->render('notification', array( + 'element' => 'flash_helper', + 'params' => array('title' => 'Alert!', 'name' => 'Notice!') + )); + + $expected = "Alert!
\n\tNotice!
\n\tBroadcast message testing
\n\n\t"; + + $this->assertContains($expected, $result); + } + +/** + * test using elements in plugins. + * + * @return void + */ + public function testFlashWithPluginElement() { + App::build(array( + 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) + )); + CakePlugin::load('TestPlugin'); + + $result = $this->Flash->render('flash', array('element' => 'TestPlugin.plugin_element')); + $expected = 'this is the plugin element'; + $this->assertContains($expected, $result); + } +} diff --git a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php index 3f9a765cbd8..1058bc72f38 100644 --- a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php @@ -81,15 +81,15 @@ class Contact extends CakeTestModel { 'non_existing' => array(), 'idontexist' => array(), 'imrequired' => array('rule' => array('between', 5, 30), 'allowEmpty' => false), - 'imrequiredonupdate' => array('notEmpty' => array('rule' => 'alphaNumeric', 'on' => 'update')), + 'imrequiredonupdate' => array('notBlank' => array('rule' => 'alphaNumeric', 'on' => 'update')), 'imrequiredoncreate' => array('required' => array('rule' => 'alphaNumeric', 'on' => 'create')), 'imrequiredonboth' => array( 'required' => array('rule' => 'alphaNumeric'), ), - 'string_required' => 'notEmpty', + 'string_required' => 'notBlank', 'imalsorequired' => array('rule' => 'alphaNumeric', 'allowEmpty' => false), - 'imrequiredtoo' => array('rule' => 'notEmpty'), - 'required_one' => array('required' => array('rule' => array('notEmpty'))), + 'imrequiredtoo' => array('rule' => 'notBlank'), + 'required_one' => array('required' => array('rule' => array('notBlank'))), 'imnotrequired' => array('required' => false, 'rule' => 'alphaNumeric', 'allowEmpty' => true), 'imalsonotrequired' => array( 'alpha' => array('rule' => 'alphaNumeric', 'allowEmpty' => true), @@ -763,6 +763,31 @@ public function testTextFieldGenerationForFloats() { $this->assertTags($result, $expected); } +/** + * Tests correct generation of decimal fields as text inputs + * + * @return void + */ + public function testTextFieldGenerationForDecimalAsText() { + $this->Form->create('ValidateUser'); + $result = $this->Form->input('cost_decimal', array( + 'type' => 'text' + )); + $expected = array( + 'div' => array('class' => 'input text'), + 'label' => array('for' => 'ValidateUserCostDecimal'), + 'Cost Decimal', + '/label', + array('input' => array( + 'type' => 'text', + 'name' => 'data[ValidateUser][cost_decimal]', + 'id' => 'ValidateUserCostDecimal', + )), + '/div' + ); + $this->assertTags($result, $expected); + } + /** * Tests correct generation of number fields for integer fields * @@ -1265,6 +1290,30 @@ public function testFormSecuredInput() { $this->assertTags($result, $expected); } +/** + * Test that a hidden field followed by a visible field + * undoes the hidden field locking. + * + * @return void + */ + public function testSecuredInputDuplicate() { + $this->Form->request['_Token'] = array('key' => 'testKey'); + $this->assertEquals(array(), $this->Form->fields); + + $this->Form->input('text_val', array( + 'type' => 'hidden', + 'value' => 'some text', + )); + $expected = array('text_val' => 'some text'); + $this->assertEquals($expected, $this->Form->fields); + + $this->Form->input('text_val', array( + 'type' => 'text', + )); + $expected = array('text_val'); + $this->assertEquals($expected, $this->Form->fields); + } + /** * Test secured inputs with custom names. * @@ -2492,6 +2541,61 @@ public function testTimeSelectedWithInterval() { $this->assertContains('', $result); } +/** + * Test interval + value near the hour roll over. + * + * @return void + */ + public function testTimeValueWithInterval() { + $result = $this->Form->input('Model.start_time', array( + 'type' => 'time', + 'interval' => 15, + 'value' => array('hour' => '3', 'min' => '57', 'meridian' => 'pm') + )); + $this->assertContains('', $result); + $this->assertContains('', $result); + $this->assertContains('', $result); + + $result = $this->Form->input('Model.start_time', array( + 'type' => 'time', + 'interval' => 15, + 'value' => '2012-10-23 15:57:00' + )); + $this->assertContains('', $result); + $this->assertContains('', $result); + $this->assertContains('', $result); + + $result = $this->Form->input('Model.start_time', array( + 'timeFormat' => 24, + 'type' => 'time', + 'interval' => 15, + 'value' => '15:57' + )); + $this->assertContains('', $result); + $this->assertContains('', $result); + + $result = $this->Form->input('Model.start_time', array( + 'timeFormat' => 24, + 'type' => 'time', + 'interval' => 15, + 'value' => '23:57' + )); + $this->assertContains('', $result); + $this->assertContains('', $result); + + $result = $this->Form->input('Model.created', array( + 'timeFormat' => 24, + 'type' => 'datetime', + 'interval' => 15, + 'value' => '2012-09-30 23:56' + )); + $this->assertContains('', $result); + $this->assertContains('', $result); + $this->assertContains('', $result); + $this->assertContains('', $result); + $this->assertContains('', $result); + } + /** * Test time with selected values around 12:xx:xx * @@ -2529,6 +2633,43 @@ public function testTimeSelectedWithIntervalTwelve() { $this->assertContains('', $result); } +/** + * Test time with selected values around 12:xx:xx + * + * @return void + */ + public function testTimeValueWithIntervalTwelve() { + $result = $this->Form->input('Model.start_time', array( + 'type' => 'time', + 'timeFormat' => 12, + 'interval' => 15, + 'value' => '00:00:00' + )); + $this->assertContains('', $result); + $this->assertContains('', $result); + $this->assertContains('', $result); + + $result = $this->Form->input('Model.start_time', array( + 'type' => 'time', + 'timeFormat' => 12, + 'interval' => 15, + 'value' => '12:00:00' + )); + $this->assertContains('', $result); + $this->assertContains('', $result); + $this->assertContains('', $result); + + $result = $this->Form->input('Model.start_time', array( + 'type' => 'time', + 'timeFormat' => 12, + 'interval' => 15, + 'value' => '12:15:00' + )); + $this->assertContains('', $result); + $this->assertContains('', $result); + $this->assertContains('', $result); + } + /** * Test interval & timeFormat = 12 * @@ -3598,9 +3739,9 @@ public function testError() { ); $this->assertTags($result, $expected); - $Contact->validationErrors['field'] = array('notEmpty', 'email', 'Something else'); + $Contact->validationErrors['field'] = array('notBlank', 'email', 'Something else'); $result = $this->Form->error('Contact.field', array( - 'notEmpty' => 'Cannot be empty', + 'notBlank' => 'Cannot be empty', 'email' => 'No good!' )); $expected = array( @@ -3615,13 +3756,13 @@ public function testError() { $this->assertTags($result, $expected); // Testing error messages list options - $Contact->validationErrors['field'] = array('notEmpty', 'email'); + $Contact->validationErrors['field'] = array('notBlank', 'email'); $result = $this->Form->error('Contact.field', null, array('listOptions' => 'ol')); $expected = array( 'div' => array('class' => 'error-message'), 'ol' => array(), - 'Notice!
\n\tAlert!
\n\tBroadcast message testing
\ntd content 1 td content 2 td content 3 td content 1 td content 2 td content 3 td content 1 td content 2 td content 3 \'quote\' "double-quote" &'); + $serialize = 'rfc4627_escape'; + $expected = json_encode(' \'quote\' "double-quote" &', JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT); + + $Controller->set($data); + $Controller->set('_serialize', $serialize); + $Controller->set('_jsonOptions', JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT); + $View = new JsonView($Controller); + $output = $View->render(false); + + $this->assertSame($expected, $output); + } /** * Test that rendering with _serialize does not load helpers. * @@ -306,4 +350,56 @@ public function testRenderWithViewAndNamed() { $this->assertSame($expected, $output); $this->assertSame('application/javascript', $Response->type()); } + +/** + * JsonViewTest::testRenderInvalidJSON() + * + * @return void + */ + public function testRenderInvalidJSON() { + $Request = new CakeRequest(); + $Response = new CakeResponse(); + $Controller = new Controller($Request, $Response); + + // non utf-8 stuff + $data = array('data' => array('foo' => 'bar' . chr('0x97'))); + + $Controller->set($data); + $Controller->set('_serialize', 'data'); + $View = new JsonView($Controller); + + // Use a custom error handler + set_error_handler(array($this, 'jsonEncodeErrorHandler')); + + try { + $View->render(); + restore_error_handler(); + $this->fail('Failed asserting that exception of type "CakeException" is thrown.'); + } catch (CakeException $e) { + restore_error_handler(); + $this->assertRegExp('/UTF-8/', $e->getMessage()); + return; + } + } + +/** + * JsonViewTest::testRenderJSONBoolFalse() + * + * @return void + */ + public function testRenderJSONBoolFalse() { + $Request = new CakeRequest(); + $Response = new CakeResponse(); + $Controller = new Controller($Request, $Response); + + // encoding a false, ensure this doesn't trigger exception + $data = false; + + $Controller->set($data); + $Controller->set('_serialize', 'data'); + $View = new JsonView($Controller); + $output = $View->render(); + $this->assertSame('null', $output); + } + } diff --git a/lib/Cake/Test/Case/View/ViewTest.php b/lib/Cake/Test/Case/View/ViewTest.php index f18a02093b9..d154e8deaa5 100644 --- a/lib/Cake/Test/Case/View/ViewTest.php +++ b/lib/Cake/Test/Case/View/ViewTest.php @@ -1425,6 +1425,17 @@ public function testBlockReset() { $this->assertSame('', $result); } +/** + * Test checking a block's existance. + * + * @return void + */ + public function testBlockExist() { + $this->assertFalse($this->View->exists('test')); + $this->View->assign('test', 'Block content'); + $this->assertTrue($this->View->exists('test')); + } + /** * Test setting a block's content to null * diff --git a/lib/Cake/Test/Case/View/XmlViewTest.php b/lib/Cake/Test/Case/View/XmlViewTest.php index 89399beef32..5498137307d 100644 --- a/lib/Cake/Test/Case/View/XmlViewTest.php +++ b/lib/Cake/Test/Case/View/XmlViewTest.php @@ -96,6 +96,76 @@ public function testRenderSerializeNoHelpers() { $this->assertFalse(isset($View->Html), 'No helper loaded.'); } +/** + * Test that rendering with _serialize respects XML options. + * + * @return void + */ + public function testRenderSerializeWithOptions() { + $Request = new CakeRequest(); + $Response = new CakeResponse(); + $Controller = new Controller($Request, $Response); + $data = array( + '_serialize' => array('tags'), + '_xmlOptions' => array('format' => 'attributes'), + 'tags' => array( + 'tag' => array( + array( + 'id' => '1', + 'name' => 'defect' + ), + array( + 'id' => '2', + 'name' => 'enhancement' + ) + ) + ) + ); + $Controller->set($data); + $Controller->viewClass = 'Xml'; + $View = new XmlView($Controller); + $result = $View->render(); + + $expected = Xml::build(array('response' => array('tags' => $data['tags'])), $data['_xmlOptions'])->asXML(); + $this->assertSame($expected, $result); + } + +/** + * Test that rendering with _serialize can work with string setting. + * + * @return void + */ + public function testRenderSerializeWithString() { + $Request = new CakeRequest(); + $Response = new CakeResponse(); + $Controller = new Controller($Request, $Response); + $data = array( + '_serialize' => 'tags', + '_xmlOptions' => array('format' => 'attributes'), + 'tags' => array( + 'tags' => array( + 'tag' => array( + array( + 'id' => '1', + 'name' => 'defect' + ), + array( + 'id' => '2', + 'name' => 'enhancement' + ) + ) + ) + ) + ); + $Controller->set($data); + $Controller->viewClass = 'Xml'; + $View = new XmlView($Controller); + $result = $View->render(); + + $expected = Xml::build($data['tags'], $data['_xmlOptions'])->asXML(); + $this->assertSame($expected, $result); + } + /** * Test render with an array in _serialize * diff --git a/lib/Cake/Test/Fixture/NumberTreeFixture.php b/lib/Cake/Test/Fixture/NumberTreeFixture.php index cea90492175..78d34cf21c7 100644 --- a/lib/Cake/Test/Fixture/NumberTreeFixture.php +++ b/lib/Cake/Test/Fixture/NumberTreeFixture.php @@ -37,6 +37,7 @@ class NumberTreeFixture extends CakeTestFixture { 'name' => array('type' => 'string', 'null' => false), 'parent_id' => 'integer', 'lft' => array('type' => 'integer', 'null' => false), - 'rght' => array('type' => 'integer', 'null' => false) + 'rght' => array('type' => 'integer', 'null' => false), + 'level' => array('type' => 'integer', 'null' => true) ); } diff --git a/lib/Cake/Test/bake_compare/Controller/ActionsUsingSessions.ctp b/lib/Cake/Test/bake_compare/Controller/ActionsUsingSessions.ctp index 5cd6a4dee52..b4072d770e9 100644 --- a/lib/Cake/Test/bake_compare/Controller/ActionsUsingSessions.ctp +++ b/lib/Cake/Test/bake_compare/Controller/ActionsUsingSessions.ctp @@ -33,10 +33,10 @@ if ($this->request->is('post')) { $this->BakeArticle->create(); if ($this->BakeArticle->save($this->request->data)) { - $this->Session->setFlash(__('The bake article has been saved.')); + $this->Flash->success(__('The bake article has been saved.')); return $this->redirect(array('action' => 'index')); } else { - $this->Session->setFlash(__('The bake article could not be saved. Please, try again.')); + $this->Flash->error(__('The bake article could not be saved. Please, try again.')); } } $bakeTags = $this->BakeArticle->BakeTag->find('list'); @@ -56,10 +56,10 @@ } if ($this->request->is(array('post', 'put'))) { if ($this->BakeArticle->save($this->request->data)) { - $this->Session->setFlash(__('The bake article has been saved.')); + $this->Flash->success(__('The bake article has been saved.')); return $this->redirect(array('action' => 'index')); } else { - $this->Session->setFlash(__('The bake article could not be saved. Please, try again.')); + $this->Flash->error(__('The bake article could not be saved. Please, try again.')); } } else { $options = array('conditions' => array('BakeArticle.' . $this->BakeArticle->primaryKey => $id)); @@ -83,9 +83,9 @@ } $this->request->allowMethod('post', 'delete'); if ($this->BakeArticle->delete()) { - $this->Session->setFlash(__('The bake article has been deleted.')); + $this->Flash->success(__('The bake article has been deleted.')); } else { - $this->Session->setFlash(__('The bake article could not be deleted. Please, try again.')); + $this->Flash->error(__('The bake article could not be deleted. Please, try again.')); } return $this->redirect(array('action' => 'index')); } diff --git a/lib/Cake/Test/bake_compare/Controller/Scaffold.ctp b/lib/Cake/Test/bake_compare/Controller/Scaffold.ctp index 325fdb9912e..757e0eabd94 100644 --- a/lib/Cake/Test/bake_compare/Controller/Scaffold.ctp +++ b/lib/Cake/Test/bake_compare/Controller/Scaffold.ctp @@ -2,7 +2,6 @@ App::uses('AppController', 'Controller'); /** * Articles Controller - * */ class ArticlesController extends AppController { diff --git a/lib/Cake/Test/bake_compare/View/index.ctp b/lib/Cake/Test/bake_compare/View/index.ctp new file mode 100644 index 00000000000..b2738e4b3bc --- /dev/null +++ b/lib/Cake/Test/bake_compare/View/index.ctp @@ -0,0 +1,58 @@ + + +++ +
++ + + + +Paginator->sort('id'); ?> +Paginator->sort('article_id'); ?> +Paginator->sort('user_id'); ?> +Paginator->sort('comment'); ?> +Paginator->sort('published'); ?> +Paginator->sort('created'); ?> +Paginator->sort('updated'); ?> ++ + + + ++ Html->link($viewTaskComment['Article']['title'], array('controller' => 'view_task_articles', 'action' => 'view', $viewTaskComment['Article']['id'])); ?> + ++ Html->link(__('View'), array('action' => 'view', $viewTaskComment['ViewTaskComment']['id'])); ?> + Html->link(__('Edit'), array('action' => 'edit', $viewTaskComment['ViewTaskComment']['id'])); ?> + Form->postLink(__('Delete'), array('action' => 'delete', $viewTaskComment['ViewTaskComment']['id']), array('confirm' => __('Are you sure you want to delete # %s?', $viewTaskComment['ViewTaskComment']['id']))); ?> + ++ Paginator->counter(array( + 'format' => __('Page {:page} of {:pages}, showing {:current} records out of {:count} total, starting on record {:start}, ending on {:end}') + )); + ?>
++ Paginator->prev('< ' . __('previous'), array(), null, array('class' => 'prev disabled')); + echo $this->Paginator->numbers(array('separator' => '')); + echo $this->Paginator->next(__('next') . ' >', array(), null, array('class' => 'next disabled')); + ?> +++ +diff --git a/lib/Cake/Test/test_app/Controller/TestsAppsController.php b/lib/Cake/Test/test_app/Controller/TestsAppsController.php index 8cd847c5dcf..35783548d00 100644 --- a/lib/Cake/Test/test_app/Controller/TestsAppsController.php +++ b/lib/Cake/Test/test_app/Controller/TestsAppsController.php @@ -44,6 +44,10 @@ public function set_action() { $this->render('index'); } + public function file() { + $this->response->file(__FILE__); + } + public function redirect_to() { return $this->redirect('http://cakephp.org'); } diff --git a/lib/Cake/Test/test_app/Locale/nld_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/Locale/nld_mo/LC_MESSAGES/default.mo new file mode 100644 index 00000000000..bb89fa6e9ae Binary files /dev/null and b/lib/Cake/Test/test_app/Locale/nld_mo/LC_MESSAGES/default.mo differ diff --git a/lib/Cake/Test/test_app/Model/Datasource/Session/TestAppLibSession.php b/lib/Cake/Test/test_app/Model/Datasource/Session/TestAppLibSession.php index e7b5f9f308d..2ba874dba62 100644 --- a/lib/Cake/Test/test_app/Model/Datasource/Session/TestAppLibSession.php +++ b/lib/Cake/Test/test_app/Model/Datasource/Session/TestAppLibSession.php @@ -1,7 +1,6 @@ + * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org) + * + * Licensed under The MIT License + * For full copyright and license information, please see the LICENSE.txt + * Redistributions of files must retain the above copyright notice + * + * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org) + * @link http://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests + * @package Cake.Test.TestApp.Plugin.TestPlugin.Console.Command + * @since CakePHP(tm) v 2.7.0 + * @license http://www.opensource.org/licenses/mit-license.php MIT License + */ + +/** + * Class TestPluginShell + * @package Cake.Test.TestApp.Plugin.TestPlugin.Console.Command + */ +class TestPluginShell extends Shell { + +/** + * main method + * + * @return void + */ + public function main() { + $this->out('This is the main method called from TestPlugin.TestPluginShell'); + } +} diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthors.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthors.php index d1c32b8d65d..a52c21e75a3 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthors.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthors.php @@ -29,8 +29,8 @@ class TestPluginAuthors extends TestPluginAppModel { public $validate = array( 'field' => array( - 'notEmpty' => array( - 'rule' => 'notEmpty', + 'notBlank' => array( + 'rule' => 'notBlank', 'message' => 'I can haz plugin model validation message', ), ), diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Errors/error500.ctp b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Errors/error500.ctp index cd0fd599582..3be431d0746 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Errors/error500.ctp +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Errors/error500.ctp @@ -8,4 +8,3 @@ test plugin error500 if (Configure::read('debug') > 0): echo $this->element('exception_stack_trace'); endif; -?> diff --git a/lib/Cake/Test/test_app/View/Elements/Flash/default.ctp b/lib/Cake/Test/test_app/View/Elements/Flash/default.ctp new file mode 100644 index 00000000000..fd1533971b4 --- /dev/null +++ b/lib/Cake/Test/test_app/View/Elements/Flash/default.ctp @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/lib/Cake/Test/test_app/View/Elements/flash_classy.ctp b/lib/Cake/Test/test_app/View/Elements/flash_classy.ctp new file mode 100644 index 00000000000..6fd3a5d3ff9 --- /dev/null +++ b/lib/Cake/Test/test_app/View/Elements/flash_classy.ctp @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/lib/Cake/Test/test_app/View/Elements/flash_helper.ctp b/lib/Cake/Test/test_app/View/Elements/flash_helper.ctp new file mode 100644 index 00000000000..43be11a889f --- /dev/null +++ b/lib/Cake/Test/test_app/View/Elements/flash_helper.ctp @@ -0,0 +1,5 @@ +-
+
- Html->link(__('New View Task Comment'), array('action' => 'add')); ?> +
- Html->link(__('List View Task Articles'), array('controller' => 'view_task_articles', 'action' => 'index')); ?> +
- Html->link(__('New Article'), array('controller' => 'view_task_articles', 'action' => 'add')); ?> +
+ + + +\ No newline at end of file diff --git a/lib/Cake/Test/test_app/View/Elements/html_call.ctp b/lib/Cake/Test/test_app/View/Elements/html_call.ctp index 8c2c089786a..fb5122dd270 100644 --- a/lib/Cake/Test/test_app/View/Elements/html_call.ctp +++ b/lib/Cake/Test/test_app/View/Elements/html_call.ctp @@ -1,3 +1,2 @@ Html->link('Test', 'http://example.com'); -?> \ No newline at end of file +echo $this->Html->link('Test', 'http://example.com'); \ No newline at end of file diff --git a/lib/Cake/Test/test_app/View/Emails/html/default.ctp b/lib/Cake/Test/test_app/View/Emails/html/default.ctp index 5d6eabd09c5..538e907f50d 100644 --- a/lib/Cake/Test/test_app/View/Emails/html/default.ctp +++ b/lib/Cake/Test/test_app/View/Emails/html/default.ctp @@ -3,5 +3,4 @@ $content = explode("\n", $content); foreach ($content as $line): echo '' . $line . '
'; -endforeach; -?> \ No newline at end of file +endforeach; \ No newline at end of file diff --git a/lib/Cake/Test/test_app/View/Emails/html/long_line.ctp b/lib/Cake/Test/test_app/View/Emails/html/long_line.ctp new file mode 100644 index 00000000000..4bf8bbdab53 --- /dev/null +++ b/lib/Cake/Test/test_app/View/Emails/html/long_line.ctp @@ -0,0 +1,14 @@ +34567890123456789012345678901234567890123456789012345678901234567890' . +'12345678901234567890123456789012345678901234567890123456789012345678901234567890' . +'12345678901234567890123456789012345678901234567890123456789012345678901234567890' . +'12345678901234567890123456789012345678901234567890123456789012345678901234567890' . +'12345678901234567890123456789012345678901234567890123456789012345678901234567890' . +'12345678901234567890123456789012345678901234567890123456789012345678901234567890' . +'12345678901234567890123456789012345678901234567890123456789012345678901234567890' . +'12345678901234567890123456789012345678901234567890123456789012345678901234567890' . +'12345678901234567890123456789012345678901234567890123456789012345678901234567890' . +'12345678901234567890123456789012345678901234567890123456789012345678901234567890' . +'12345678901234567890123456789012345678901234567890123456789012345678901234567890' . +'12345678901234567890123456789012345678901234567890123456789012345678901234567890' . +'1234567890123456789012345678901234567890123456x'; diff --git a/lib/Cake/Test/test_app/View/Layouts/ajax2.ctp b/lib/Cake/Test/test_app/View/Layouts/ajax2.ctp index 43331599001..25c20f425ca 100644 --- a/lib/Cake/Test/test_app/View/Layouts/ajax2.ctp +++ b/lib/Cake/Test/test_app/View/Layouts/ajax2.ctp @@ -1,2 +1,3 @@ Ajax! -fetch('content'); ?> \ No newline at end of file +fetch('content'); \ No newline at end of file diff --git a/lib/Cake/Test/test_app/View/Layouts/rss/default.ctp b/lib/Cake/Test/test_app/View/Layouts/rss/default.ctp index df2f0ab19b8..f0af9c0d842 100644 --- a/lib/Cake/Test/test_app/View/Layouts/rss/default.ctp +++ b/lib/Cake/Test/test_app/View/Layouts/rss/default.ctp @@ -12,6 +12,4 @@ echo $this->Rss->document( $this->Rss->channel( array(), $channel, $this->fetch('content') ) -); - -?> \ No newline at end of file +); \ No newline at end of file diff --git a/lib/Cake/Test/test_app/View/Pages/extract.ctp b/lib/Cake/Test/test_app/View/Pages/extract.ctp index 3331f2fd4da..63e8c73a573 100644 --- a/lib/Cake/Test/test_app/View/Pages/extract.ctp +++ b/lib/Cake/Test/test_app/View/Pages/extract.ctp @@ -28,6 +28,8 @@ __('Hot features!' . ' Join us #cakephp on IRC. We\'d love to help you get started'); // Category +echo __c('You have a new message (category: LC_NUMERIC).', 4); +// LC_TIME is skipped. echo __c('You have a new message (category: LC_TIME).', 5); // Context diff --git a/lib/Cake/Test/test_app/View/Posts/helper_overwrite.ctp b/lib/Cake/Test/test_app/View/Posts/helper_overwrite.ctp index 100c5f51bb1..610d33ad907 100644 --- a/lib/Cake/Test/test_app/View/Posts/helper_overwrite.ctp +++ b/lib/Cake/Test/test_app/View/Posts/helper_overwrite.ctp @@ -1,4 +1,3 @@ Html->link('Test link', '#'); -?> \ No newline at end of file +echo $this->Html->link('Test link', '#'); \ No newline at end of file diff --git a/lib/Cake/Test/test_app/View/Posts/parent_view.ctp b/lib/Cake/Test/test_app/View/Posts/parent_view.ctp index e338b784f28..ee468954414 100644 --- a/lib/Cake/Test/test_app/View/Posts/parent_view.ctp +++ b/lib/Cake/Test/test_app/View/Posts/parent_view.ctp @@ -1,2 +1,2 @@ Parent View. -fetch('content') ?> +fetch('content'); ?> diff --git a/lib/Cake/Test/test_app/View/Posts/test_nocache_tags.ctp b/lib/Cake/Test/test_app/View/Posts/test_nocache_tags.ctp index c0b2ac283ab..19a88e33919 100644 --- a/lib/Cake/Test/test_app/View/Posts/test_nocache_tags.ctp +++ b/lib/Cake/Test/test_app/View/Posts/test_nocache_tags.ctp @@ -47,7 +47,7 @@ Html->image('test.jpg') ?> \ No newline at end of file +Html->image('test.jpg'); ?> \ No newline at end of file diff --git a/lib/Cake/Test/test_app/View/Themed/TestTheme/Layouts/default.ctp b/lib/Cake/Test/test_app/View/Themed/TestTheme/Layouts/default.ctp index 9f2aa062d63..d4e3dd5868f 100644 --- a/lib/Cake/Test/test_app/View/Themed/TestTheme/Layouts/default.ctp +++ b/lib/Cake/Test/test_app/View/Themed/TestTheme/Layouts/default.ctp @@ -1,2 +1,2 @@ default test_theme layout -fetch('content') ?> +fetch('content'); ?> diff --git a/lib/Cake/TestSuite/CakeTestCase.php b/lib/Cake/TestSuite/CakeTestCase.php index e457a033b51..c375717fe9a 100644 --- a/lib/Cake/TestSuite/CakeTestCase.php +++ b/lib/Cake/TestSuite/CakeTestCase.php @@ -548,7 +548,7 @@ protected function _assertAttributes($assertions, $string) { * @return void */ protected static function assertEqual($result, $expected, $message = '') { - return self::assertEquals($expected, $result, $message); + return static::assertEquals($expected, $result, $message); } /** @@ -561,7 +561,7 @@ protected static function assertEqual($result, $expected, $message = '') { * @return void */ protected static function assertNotEqual($result, $expected, $message = '') { - return self::assertNotEquals($expected, $result, $message); + return static::assertNotEquals($expected, $result, $message); } /** @@ -574,7 +574,7 @@ protected static function assertNotEqual($result, $expected, $message = '') { * @return void */ protected static function assertPattern($pattern, $string, $message = '') { - return self::assertRegExp($pattern, $string, $message); + return static::assertRegExp($pattern, $string, $message); } /** @@ -587,7 +587,7 @@ protected static function assertPattern($pattern, $string, $message = '') { * @return void */ protected static function assertIdentical($actual, $expected, $message = '') { - return self::assertSame($expected, $actual, $message); + return static::assertSame($expected, $actual, $message); } /** @@ -600,7 +600,7 @@ protected static function assertIdentical($actual, $expected, $message = '') { * @return void */ protected static function assertNotIdentical($actual, $expected, $message = '') { - return self::assertNotSame($expected, $actual, $message); + return static::assertNotSame($expected, $actual, $message); } /** @@ -613,7 +613,7 @@ protected static function assertNotIdentical($actual, $expected, $message = '') * @return void */ protected static function assertNoPattern($pattern, $string, $message = '') { - return self::assertNotRegExp($pattern, $string, $message); + return static::assertNotRegExp($pattern, $string, $message); } /** @@ -643,9 +643,9 @@ protected function expectError($expected = false, $message = '') { /** * Compatibility wrapper function for setExpectedException * - * @param mixed $expected the name of the Exception + * @param mixed $name The name of the expected Exception. * @param string $message the text to display if the assertion is not correct - * @deprecated 3.0.0 This is a compatiblity wrapper for 1.x. It will be removed in 3.0 + * @deprecated 3.0.0 This is a compatibility wrapper for 1.x. It will be removed in 3.0. * @return void */ protected function expectException($name = 'Exception', $message = '') { @@ -662,7 +662,7 @@ protected function expectException($name = 'Exception', $message = '') { * @return void */ protected static function assertReference(&$first, &$second, $message = '') { - return self::assertSame($first, $second, $message); + return static::assertSame($first, $second, $message); } /** @@ -675,7 +675,7 @@ protected static function assertReference(&$first, &$second, $message = '') { * @return void */ protected static function assertIsA($object, $type, $message = '') { - return self::assertInstanceOf($type, $object, $message); + return static::assertInstanceOf($type, $object, $message); } /** @@ -690,7 +690,7 @@ protected static function assertIsA($object, $type, $message = '') { protected static function assertWithinMargin($result, $expected, $margin, $message = '') { $upper = $result + $margin; $lower = $result - $margin; - return self::assertTrue((($expected <= $upper) && ($expected >= $lower)), $message); + return static::assertTrue((($expected <= $upper) && ($expected >= $lower)), $message); } /** @@ -732,12 +732,12 @@ public function getMockForModel($model, $methods = array(), $config = array()) { $mock = $this->getMock($name, $methods, array($config)); $availableDs = array_keys(ConnectionManager::enumConnectionObjects()); - if ($mock->useDbConfig === 'default') { - $mock->useDbConfig = null; - $mock->setDataSource('test'); - } + if ($mock->useDbConfig !== 'test' && in_array('test_' . $mock->useDbConfig, $availableDs)) { $mock->setDataSource('test_' . $mock->useDbConfig); + } else { + $mock->useDbConfig = 'test'; + $mock->setDataSource('test'); } ClassRegistry::removeObject($name); diff --git a/lib/Cake/TestSuite/CakeTestLoader.php b/lib/Cake/TestSuite/CakeTestLoader.php index d6f3d8df41e..3fe681bde87 100644 --- a/lib/Cake/TestSuite/CakeTestLoader.php +++ b/lib/Cake/TestSuite/CakeTestLoader.php @@ -42,9 +42,9 @@ public function load($filePath, $params = '') { /** * Convert path fragments used by CakePHP's test runner to absolute paths that can be fed to PHPUnit. * - * @param string $filePath The file path to load - * @param string $params Additional parameters - * @return void + * @param string $filePath The file path to load. + * @param string $params Additional parameters. + * @return string Converted path fragments. */ protected function _resolveTestFile($filePath, $params) { $basePath = $this->_basePath($params) . DS . $filePath; @@ -85,8 +85,8 @@ protected static function _basePath($params) { * @return array */ public static function generateTestList($params) { - $directory = self::_basePath($params); - $fileList = self::_getRecursiveFileList($directory); + $directory = static::_basePath($params); + $fileList = static::_getRecursiveFileList($directory); $testCases = array(); foreach ($fileList as $testCaseFile) { diff --git a/lib/Cake/TestSuite/CakeTestRunner.php b/lib/Cake/TestSuite/CakeTestRunner.php index 3aafdc198cc..d512724cc04 100644 --- a/lib/Cake/TestSuite/CakeTestRunner.php +++ b/lib/Cake/TestSuite/CakeTestRunner.php @@ -48,7 +48,7 @@ public function __construct($loader, $params) { */ public function doRun(PHPUnit_Framework_Test $suite, array $arguments = array()) { if (isset($arguments['printer'])) { - self::$versionStringPrinted = true; + static::$versionStringPrinted = true; } $fixture = $this->_getFixtureManager($arguments); diff --git a/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php b/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php index 8b8b1e3cad2..85c6e2278e3 100644 --- a/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php +++ b/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php @@ -37,7 +37,7 @@ class CakeTestSuiteDispatcher { 'codeCoverage' => false, 'case' => null, 'core' => false, - 'app' => true, + 'app' => false, 'plugin' => null, 'output' => 'html', 'show' => 'groups', @@ -254,7 +254,7 @@ protected function _runTestCase() { restore_error_handler(); try { - self::time(); + static::time(); $command = new CakeTestSuiteCommand('CakeTestLoader', $commandArgs); $command->run($options); } catch (MissingConnectionException $exception) { @@ -287,7 +287,7 @@ public static function time($reset = false) { * @return string formatted date */ public static function date($format) { - return date($format, self::time()); + return date($format, static::time()); } } diff --git a/lib/Cake/TestSuite/ControllerTestCase.php b/lib/Cake/TestSuite/ControllerTestCase.php index 8ed11c7da66..03d78011a3b 100644 --- a/lib/Cake/TestSuite/ControllerTestCase.php +++ b/lib/Cake/TestSuite/ControllerTestCase.php @@ -210,7 +210,7 @@ public function __call($name, $arguments) { * - `result` Get the return value of the controller action. Useful * for testing requestAction methods. * - * @param string $url The URL to test + * @param string|array $url The URL to test. * @param array $options See options * @return mixed The specified return type. * @triggers ControllerTestCase $Dispatch, array('request' => $request) @@ -224,6 +224,10 @@ protected function _testAction($url, $options = array()) { 'return' => 'result' ); + if (is_array($url)) { + $url = Router::url($url); + } + $restore = array('get' => $_GET, 'post' => $_POST); $_SERVER['REQUEST_METHOD'] = strtoupper($options['method']); @@ -254,7 +258,7 @@ protected function _testAction($url, $options = array()) { $Dispatch->parseParams(new CakeEvent('ControllerTestCase', $Dispatch, array('request' => $request))); if (!isset($request->params['controller']) && Router::currentRoute()) { $this->headers = Router::currentRoute()->response->header(); - return; + return null; } if ($this->_dirtyController) { $this->controller = null; @@ -271,7 +275,7 @@ protected function _testAction($url, $options = array()) { $params['requested'] = 1; } $Dispatch->testController = $this->controller; - $Dispatch->response = $this->getMock('CakeResponse', array('send')); + $Dispatch->response = $this->getMock('CakeResponse', array('send', '_clearBuffer')); $this->result = $Dispatch->dispatch($request, $Dispatch->response, $params); $this->controller = $Dispatch->testController; $this->vars = $this->controller->viewVars; diff --git a/lib/Cake/TestSuite/templates/header.php b/lib/Cake/TestSuite/templates/header.php index 616bc179f73..60afa75595b 100644 --- a/lib/Cake/TestSuite/templates/header.php +++ b/lib/Cake/TestSuite/templates/header.php @@ -106,7 +106,7 @@ div.code-coverage-results span.line-num strong { color:#666; } div.code-coverage-results div.start { border:1px solid #aaa; - border-width:1px 1px 0px 1px; + border-width:1px 1px 0 1px; margin-top:30px; padding-top:5px; } diff --git a/lib/Cake/TestSuite/templates/phpunit.php b/lib/Cake/TestSuite/templates/phpunit.php index f25d8d971b0..3f39a59d9ed 100644 --- a/lib/Cake/TestSuite/templates/phpunit.php +++ b/lib/Cake/TestSuite/templates/phpunit.php @@ -20,12 +20,7 @@diff --git a/lib/Cake/View/Scaffolds/index.ctp b/lib/Cake/View/Scaffolds/index.ctp index dbae1916789..e0219f4f0b3 100644 --- a/lib/Cake/View/Scaffolds/index.ctp +++ b/lib/Cake/View/Scaffolds/index.ctp @@ -26,21 +26,21 @@ '; - foreach ($scaffoldFields as $_field) { + foreach ($scaffoldFields as $_field): $isKey = false; - if (!empty($associations['belongsTo'])) { - foreach ($associations['belongsTo'] as $_alias => $_details) { - if ($_field === $_details['foreignKey']) { + if (!empty($associations['belongsTo'])): + foreach ($associations['belongsTo'] as $_alias => $_details): + if ($_field === $_details['foreignKey']): $isKey = true; echo 'PHPUnit is not installed!
You must install PHPUnit to use the CakePHP(tm) Test Suite.
-PHPUnit can be installed with pear, using the pear installer.
-To install with the PEAR installer run the following commands:
--
-
pear config-set auto_discover 1
- pear install pear.phpunit.de/PHPUnit
-
PHPUnit can be installed with Composer, or downloaded as a phar archive.
Once PHPUnit is installed make sure its located on PHP's
include_pathby checking your php.iniFor full instructions on how to install PHPUnit, see the PHPUnit installation guide.
diff --git a/lib/Cake/Utility/CakeNumber.php b/lib/Cake/Utility/CakeNumber.php index 61a3daf5942..970f734e9d6 100644 --- a/lib/Cake/Utility/CakeNumber.php +++ b/lib/Cake/Utility/CakeNumber.php @@ -116,13 +116,13 @@ public static function toReadableSize($size) { case $size < 1024: return __dn('cake', '%d Byte', '%d Bytes', $size, $size); case round($size / 1024) < 1024: - return __d('cake', '%s KB', self::precision($size / 1024, 0)); + return __d('cake', '%s KB', static::precision($size / 1024, 0)); case round($size / 1024 / 1024, 2) < 1024: - return __d('cake', '%s MB', self::precision($size / 1024 / 1024, 2)); + return __d('cake', '%s MB', static::precision($size / 1024 / 1024, 2)); case round($size / 1024 / 1024 / 1024, 2) < 1024: - return __d('cake', '%s GB', self::precision($size / 1024 / 1024 / 1024, 2)); + return __d('cake', '%s GB', static::precision($size / 1024 / 1024 / 1024, 2)); default: - return __d('cake', '%s TB', self::precision($size / 1024 / 1024 / 1024 / 1024, 2)); + return __d('cake', '%s TB', static::precision($size / 1024 / 1024 / 1024 / 1024, 2)); } } @@ -181,7 +181,7 @@ public static function toPercentage($value, $precision = 2, $options = array()) if ($options['multiply']) { $value *= 100; } - return self::precision($value, $precision) . '%'; + return static::precision($value, $precision) . '%'; } /** @@ -221,8 +221,8 @@ public static function format($value, $options = false) { extract($options); } - $value = self::_numberFormat($value, $places, '.', ''); - $out = $before . self::_numberFormat($value, $places, $decimals, $thousands) . $after; + $value = static::_numberFormat($value, $places, '.', ''); + $out = $before . static::_numberFormat($value, $places, $decimals, $thousands) . $after; if ($escape) { return h($out); @@ -249,10 +249,10 @@ public static function format($value, $options = false) { */ public static function formatDelta($value, $options = array()) { $places = isset($options['places']) ? $options['places'] : 0; - $value = self::_numberFormat($value, $places, '.', ''); + $value = static::_numberFormat($value, $places, '.', ''); $sign = $value > 0 ? '+' : ''; $options['before'] = isset($options['before']) ? $options['before'] . $sign : $sign; - return self::format($value, $options); + return static::format($value, $options); } /** @@ -265,10 +265,10 @@ public static function formatDelta($value, $options = array()) { * @return string */ protected static function _numberFormat($value, $places = 0, $decimals = '.', $thousands = ',') { - if (!isset(self::$_numberFormatSupport)) { - self::$_numberFormatSupport = version_compare(PHP_VERSION, '5.4.0', '>='); + if (!isset(static::$_numberFormatSupport)) { + static::$_numberFormatSupport = version_compare(PHP_VERSION, '5.4.0', '>='); } - if (self::$_numberFormatSupport) { + if (static::$_numberFormatSupport) { return number_format($value, $places, $decimals, $thousands); } $value = number_format($value, $places, '.', ''); @@ -323,13 +323,13 @@ protected static function _numberFormat($value, $places = 0, $decimals = '.', $t * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/number.html#NumberHelper::currency */ public static function currency($value, $currency = null, $options = array()) { - $defaults = self::$_currencyDefaults; + $defaults = static::$_currencyDefaults; if ($currency === null) { - $currency = self::defaultCurrency(); + $currency = static::defaultCurrency(); } - if (isset(self::$_currencies[$currency])) { - $defaults = self::$_currencies[$currency]; + if (isset(static::$_currencies[$currency])) { + $defaults = static::$_currencies[$currency]; } elseif (is_string($currency)) { $options['before'] = $currency; } @@ -364,7 +364,7 @@ public static function currency($value, $currency = null, $options = array()) { $options[$position] = $options[$symbolKey . 'Symbol']; $abs = abs($value); - $result = self::format($abs, $options); + $result = static::format($abs, $options); if ($value < 0) { if ($options['negative'] === '()') { @@ -396,7 +396,7 @@ public static function currency($value, $currency = null, $options = array()) { * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/number.html#NumberHelper::addFormat */ public static function addFormat($formatName, $options) { - self::$_currencies[$formatName] = $options + self::$_currencyDefaults; + static::$_currencies[$formatName] = $options + static::$_currencyDefaults; } /** @@ -408,9 +408,9 @@ public static function addFormat($formatName, $options) { */ public static function defaultCurrency($currency = null) { if ($currency) { - self::$_defaultCurrency = $currency; + static::$_defaultCurrency = $currency; } - return self::$_defaultCurrency; + return static::$_defaultCurrency; } } diff --git a/lib/Cake/Utility/CakeText.php b/lib/Cake/Utility/CakeText.php new file mode 100644 index 00000000000..ff60cffa7a9 --- /dev/null +++ b/lib/Cake/Utility/CakeText.php @@ -0,0 +1,710 @@ + 65535) { + $pid = mt_rand(0, 0xfff) | 0x4000; + } + + list($timeMid, $timeLow) = explode(' ', microtime()); + return sprintf( + "%08x-%04x-%04x-%02x%02x-%04x%08x", (int)$timeLow, (int)substr($timeMid, 2) & 0xffff, + mt_rand(0, 0xfff) | 0x4000, mt_rand(0, 0x3f) | 0x80, mt_rand(0, 0xff), $pid, $node + ); + } + +/** + * Tokenizes a string using $separator, ignoring any instance of $separator that appears between + * $leftBound and $rightBound. + * + * @param string $data The data to tokenize. + * @param string $separator The token to split the data on. + * @param string $leftBound The left boundary to ignore separators in. + * @param string $rightBound The right boundary to ignore separators in. + * @return mixed Array of tokens in $data or original input if empty. + */ + public static function tokenize($data, $separator = ',', $leftBound = '(', $rightBound = ')') { + if (empty($data)) { + return array(); + } + + $depth = 0; + $offset = 0; + $buffer = ''; + $results = array(); + $length = mb_strlen($data); + $open = false; + + while ($offset <= $length) { + $tmpOffset = -1; + $offsets = array( + mb_strpos($data, $separator, $offset), + mb_strpos($data, $leftBound, $offset), + mb_strpos($data, $rightBound, $offset) + ); + for ($i = 0; $i < 3; $i++) { + if ($offsets[$i] !== false && ($offsets[$i] < $tmpOffset || $tmpOffset == -1)) { + $tmpOffset = $offsets[$i]; + } + } + if ($tmpOffset !== -1) { + $buffer .= mb_substr($data, $offset, ($tmpOffset - $offset)); + $char = mb_substr($data, $tmpOffset, 1); + if (!$depth && $char === $separator) { + $results[] = $buffer; + $buffer = ''; + } else { + $buffer .= $char; + } + if ($leftBound !== $rightBound) { + if ($char === $leftBound) { + $depth++; + } + if ($char === $rightBound) { + $depth--; + } + } else { + if ($char === $leftBound) { + if (!$open) { + $depth++; + $open = true; + } else { + $depth--; + } + } + } + $offset = ++$tmpOffset; + } else { + $results[] = $buffer . mb_substr($data, $offset); + $offset = $length + 1; + } + } + if (empty($results) && !empty($buffer)) { + $results[] = $buffer; + } + + if (!empty($results)) { + return array_map('trim', $results); + } + + return array(); + } + +/** + * Replaces variable placeholders inside a $str with any given $data. Each key in the $data array + * corresponds to a variable placeholder name in $str. + * Example: `CakeText::insert(':name is :age years old.', array('name' => 'Bob', '65'));` + * Returns: Bob is 65 years old. + * + * Available $options are: + * + * - before: The character or string in front of the name of the variable placeholder (Defaults to `:`) + * - after: The character or string after the name of the variable placeholder (Defaults to null) + * - escape: The character or string used to escape the before character / string (Defaults to `\`) + * - format: A regex to use for matching variable placeholders. Default is: `/(? val array where each key stands for a placeholder variable name + * to be replaced with val + * @param array $options An array of options, see description above + * @return string + */ + public static function insert($str, $data, $options = array()) { + $defaults = array( + 'before' => ':', 'after' => null, 'escape' => '\\', 'format' => null, 'clean' => false + ); + $options += $defaults; + $format = $options['format']; + $data = (array)$data; + if (empty($data)) { + return ($options['clean']) ? CakeText::cleanInsert($str, $options) : $str; + } + + if (!isset($format)) { + $format = sprintf( + '/(? $hashVal) { + $key = sprintf($format, preg_quote($key, '/')); + $str = preg_replace($key, $hashVal, $str); + } + $dataReplacements = array_combine($hashKeys, array_values($data)); + foreach ($dataReplacements as $tmpHash => $tmpValue) { + $tmpValue = (is_array($tmpValue)) ? '' : $tmpValue; + $str = str_replace($tmpHash, $tmpValue, $str); + } + + if (!isset($options['format']) && isset($options['before'])) { + $str = str_replace($options['escape'] . $options['before'], $options['before'], $str); + } + return ($options['clean']) ? CakeText::cleanInsert($str, $options) : $str; + } + +/** + * Cleans up a CakeText::insert() formatted string with given $options depending on the 'clean' key in + * $options. The default method used is text but html is also available. The goal of this function + * is to replace all whitespace and unneeded markup around placeholders that did not get replaced + * by CakeText::insert(). + * + * @param string $str CakeText to clean. + * @param array $options Options list. + * @return string + * @see CakeText::insert() + */ + public static function cleanInsert($str, $options) { + $clean = $options['clean']; + if (!$clean) { + return $str; + } + if ($clean === true) { + $clean = array('method' => 'text'); + } + if (!is_array($clean)) { + $clean = array('method' => $options['clean']); + } + switch ($clean['method']) { + case 'html': + $clean = array_merge(array( + 'word' => '[\w,.]+', + 'andText' => true, + 'replacement' => '', + ), $clean); + $kleenex = sprintf( + '/[\s]*[a-z]+=(")(%s%s%s[\s]*)+\\1/i', + preg_quote($options['before'], '/'), + $clean['word'], + preg_quote($options['after'], '/') + ); + $str = preg_replace($kleenex, $clean['replacement'], $str); + if ($clean['andText']) { + $options['clean'] = array('method' => 'text'); + $str = CakeText::cleanInsert($str, $options); + } + break; + case 'text': + $clean = array_merge(array( + 'word' => '[\w,.]+', + 'gap' => '[\s]*(?:(?:and|or)[\s]*)?', + 'replacement' => '', + ), $clean); + + $kleenex = sprintf( + '/(%s%s%s%s|%s%s%s%s)/', + preg_quote($options['before'], '/'), + $clean['word'], + preg_quote($options['after'], '/'), + $clean['gap'], + $clean['gap'], + preg_quote($options['before'], '/'), + $clean['word'], + preg_quote($options['after'], '/') + ); + $str = preg_replace($kleenex, $clean['replacement'], $str); + break; + } + return $str; + } + +/** + * Wraps text to a specific width, can optionally wrap at word breaks. + * + * ### Options + * + * - `width` The width to wrap to. Defaults to 72. + * - `wordWrap` Only wrap on words breaks (spaces) Defaults to true. + * - `indent` CakeText to indent with. Defaults to null. + * - `indentAt` 0 based index to start indenting at. Defaults to 0. + * + * @param string $text The text to format. + * @param array|int $options Array of options to use, or an integer to wrap the text to. + * @return string Formatted text. + */ + public static function wrap($text, $options = array()) { + if (is_numeric($options)) { + $options = array('width' => $options); + } + $options += array('width' => 72, 'wordWrap' => true, 'indent' => null, 'indentAt' => 0); + if ($options['wordWrap']) { + $wrapped = static::wordWrap($text, $options['width'], "\n"); + } else { + $wrapped = trim(chunk_split($text, $options['width'] - 1, "\n")); + } + if (!empty($options['indent'])) { + $chunks = explode("\n", $wrapped); + for ($i = $options['indentAt'], $len = count($chunks); $i < $len; $i++) { + $chunks[$i] = $options['indent'] . $chunks[$i]; + } + $wrapped = implode("\n", $chunks); + } + return $wrapped; + } + +/** + * Unicode aware version of wordwrap. + * + * @param string $text The text to format. + * @param int $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 bool $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) { + $paragraphs = explode($break, $text); + foreach ($paragraphs as &$paragraph) { + $paragraph = static::_wordWrap($paragraph, $width, $break, $cut); + } + return implode($break, $paragraphs); + } + +/** + * Helper method for wordWrap(). + * + * @param string $text The text to format. + * @param int $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 bool $cut If the cut is set to true, the string is always wrapped at the specified width. + * @return string Formatted text. + */ + protected 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. + * + * ### Options: + * + * - `format` The piece of html with that the phrase will be highlighted + * - `html` If true, will ignore any HTML tags, ensuring that only the correct text is highlighted + * - `regex` a custom regex rule that is used to match words, default is '|$tag|iu' + * + * @param string $text Text to search the phrase in. + * @param string|array $phrase The phrase or phrases that will be searched. + * @param array $options An array of html attributes and options. + * @return string The highlighted text + * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::highlight + */ + public static function highlight($text, $phrase, $options = array()) { + if (empty($phrase)) { + return $text; + } + + $defaults = array( + 'format' => '\1', + 'html' => false, + 'regex' => "|%s|iu" + ); + $options += $defaults; + extract($options); + + if (is_array($phrase)) { + $replace = array(); + $with = array(); + + foreach ($phrase as $key => $segment) { + $segment = '(' . preg_quote($segment, '|') . ')'; + if ($html) { + $segment = "(?![^<]+>)$segment(?![^<]+>)"; + } + + $with[] = (is_array($format)) ? $format[$key] : $format; + $replace[] = sprintf($options['regex'], $segment); + } + + return preg_replace($replace, $with, $text); + } + + $phrase = '(' . preg_quote($phrase, '|') . ')'; + if ($html) { + $phrase = "(?![^<]+>)$phrase(?![^<]+>)"; + } + + return preg_replace(sprintf($options['regex'], $phrase), $format, $text); + } + +/** + * Strips given text of all links (]+>|im', '', preg_replace('|<\/a>|im', '', $text)); + } + +/** + * Truncates text starting from the end. + * + * Cuts a string to the length of $length and replaces the first characters + * with the ellipsis if the text is longer than length. + * + * ### Options: + * + * - `ellipsis` Will be used as Beginning and prepended to the trimmed string + * - `exact` If false, $text will not be cut mid-word + * + * @param string $text CakeText to truncate. + * @param int $length Length of returned string, including ellipsis. + * @param array $options An array of options. + * @return string Trimmed string. + */ + public static function tail($text, $length = 100, $options = array()) { + $defaults = array( + 'ellipsis' => '...', 'exact' => true + ); + $options += $defaults; + extract($options); + + if (!function_exists('mb_strlen')) { + class_exists('Multibyte'); + } + + if (mb_strlen($text) <= $length) { + return $text; + } + + $truncate = mb_substr($text, mb_strlen($text) - $length + mb_strlen($ellipsis)); + if (!$exact) { + $spacepos = mb_strpos($truncate, ' '); + $truncate = $spacepos === false ? '' : trim(mb_substr($truncate, $spacepos)); + } + + return $ellipsis . $truncate; + } + +/** + * Truncates text. + * + * Cuts a string to the length of $length and replaces the last characters + * with the ellipsis if the text is longer than length. + * + * ### Options: + * + * - `ellipsis` Will be used as Ending and appended to the trimmed string (`ending` is deprecated) + * - `exact` If false, $text will not be cut mid-word + * - `html` If true, HTML tags would be handled correctly + * + * @param string $text CakeText to truncate. + * @param int $length Length of returned string, including ellipsis. + * @param array $options An array of html attributes and options. + * @return string Trimmed string. + * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::truncate + */ + public static function truncate($text, $length = 100, $options = array()) { + $defaults = array( + 'ellipsis' => '...', 'exact' => true, 'html' => false + ); + if (isset($options['ending'])) { + $defaults['ellipsis'] = $options['ending']; + } elseif (!empty($options['html']) && Configure::read('App.encoding') === 'UTF-8') { + $defaults['ellipsis'] = "\xe2\x80\xa6"; + } + $options += $defaults; + extract($options); + + if (!function_exists('mb_strlen')) { + class_exists('Multibyte'); + } + + if ($html) { + if (mb_strlen(preg_replace('/<.*?>/', '', $text)) <= $length) { + return $text; + } + $totalLength = mb_strlen(strip_tags($ellipsis)); + $openTags = array(); + $truncate = ''; + + preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER); + foreach ($tags as $tag) { + if (!preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/s', $tag[2])) { + if (preg_match('/<[\w]+[^>]*>/s', $tag[0])) { + array_unshift($openTags, $tag[2]); + } elseif (preg_match('/<\/([\w]+)[^>]*>/s', $tag[0], $closeTag)) { + $pos = array_search($closeTag[1], $openTags); + if ($pos !== false) { + array_splice($openTags, $pos, 1); + } + } + } + $truncate .= $tag[1]; + + $contentLength = mb_strlen(preg_replace('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i', ' ', $tag[3])); + if ($contentLength + $totalLength > $length) { + $left = $length - $totalLength; + $entitiesLength = 0; + if (preg_match_all('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i', $tag[3], $entities, PREG_OFFSET_CAPTURE)) { + foreach ($entities[0] as $entity) { + if ($entity[1] + 1 - $entitiesLength <= $left) { + $left--; + $entitiesLength += mb_strlen($entity[0]); + } else { + break; + } + } + } + + $truncate .= mb_substr($tag[3], 0, $left + $entitiesLength); + break; + } else { + $truncate .= $tag[3]; + $totalLength += $contentLength; + } + if ($totalLength >= $length) { + break; + } + } + } else { + if (mb_strlen($text) <= $length) { + return $text; + } + $truncate = mb_substr($text, 0, $length - mb_strlen($ellipsis)); + } + if (!$exact) { + $spacepos = mb_strrpos($truncate, ' '); + if ($html) { + $truncateCheck = mb_substr($truncate, 0, $spacepos); + $lastOpenTag = mb_strrpos($truncateCheck, '<'); + $lastCloseTag = mb_strrpos($truncateCheck, '>'); + if ($lastOpenTag > $lastCloseTag) { + preg_match_all('/<[\w]+[^>]*>/s', $truncate, $lastTagMatches); + $lastTag = array_pop($lastTagMatches[0]); + $spacepos = mb_strrpos($truncate, $lastTag) + mb_strlen($lastTag); + } + $bits = mb_substr($truncate, $spacepos); + preg_match_all('/<\/([a-z]+)>/', $bits, $droppedTags, PREG_SET_ORDER); + if (!empty($droppedTags)) { + if (!empty($openTags)) { + foreach ($droppedTags as $closingTag) { + if (!in_array($closingTag[1], $openTags)) { + array_unshift($openTags, $closingTag[1]); + } + } + } else { + foreach ($droppedTags as $closingTag) { + $openTags[] = $closingTag[1]; + } + } + } + } + $truncate = mb_substr($truncate, 0, $spacepos); + } + $truncate .= $ellipsis; + + if ($html) { + foreach ($openTags as $tag) { + $truncate .= ''; + } + } + + return $truncate; + } + +/** + * Extracts an excerpt from the text surrounding the phrase with a number of characters on each side + * determined by radius. + * + * @param string $text CakeText to search the phrase in + * @param string $phrase Phrase that will be searched for + * @param int $radius The amount of characters that will be returned on each side of the founded phrase + * @param string $ellipsis Ending that will be appended + * @return string Modified string + * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::excerpt + */ + public static function excerpt($text, $phrase, $radius = 100, $ellipsis = '...') { + if (empty($text) || empty($phrase)) { + return static::truncate($text, $radius * 2, array('ellipsis' => $ellipsis)); + } + + $append = $prepend = $ellipsis; + + $phraseLen = mb_strlen($phrase); + $textLen = mb_strlen($text); + + $pos = mb_strpos(mb_strtolower($text), mb_strtolower($phrase)); + if ($pos === false) { + return mb_substr($text, 0, $radius) . $ellipsis; + } + + $startPos = $pos - $radius; + if ($startPos <= 0) { + $startPos = 0; + $prepend = ''; + } + + $endPos = $pos + $phraseLen + $radius; + if ($endPos >= $textLen) { + $endPos = $textLen; + $append = ''; + } + + $excerpt = mb_substr($text, $startPos, $endPos - $startPos); + $excerpt = $prepend . $excerpt . $append; + + return $excerpt; + } + +/** + * Creates a comma separated list where the last two items are joined with 'and', forming natural language. + * + * @param array $list The list to be joined. + * @param string $and The word used to join the last and second last items together with. Defaults to 'and'. + * @param string $separator The separator used to join all the other items together. Defaults to ', '. + * @return string The glued together string. + * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::toList + */ + public static function toList($list, $and = null, $separator = ', ') { + if ($and === null) { + $and = __d('cake', 'and'); + } + if (count($list) > 1) { + return implode($separator, array_slice($list, null, -1)) . ' ' . $and . ' ' . array_pop($list); + } + + return array_pop($list); + } +} diff --git a/lib/Cake/Utility/CakeTime.php b/lib/Cake/Utility/CakeTime.php index 38c22196a33..0987dce3c16 100644 --- a/lib/Cake/Utility/CakeTime.php +++ b/lib/Cake/Utility/CakeTime.php @@ -100,7 +100,7 @@ class CakeTime { public function __set($name, $value) { switch ($name) { case 'niceFormat': - self::${$name} = $value; + static::${$name} = $value; break; } } @@ -115,7 +115,7 @@ public function __set($name, $value) { public function __get($name) { switch ($name) { case 'niceFormat': - return self::${$name}; + return static::${$name}; default: return null; } @@ -123,25 +123,25 @@ 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) { if (!$time) { $time = time(); } - self::$_time = $time; + static::$_time = $time; return preg_replace_callback('/\%(\w+)/', array('CakeTime', '_translateSpecifier'), $format); } /** * 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 @@ -151,47 +151,47 @@ protected static function _translateSpecifier($specifier) { case 'a': $abday = __dc('cake', 'abday', 5); if (is_array($abday)) { - return $abday[date('w', self::$_time)]; + return $abday[date('w', static::$_time)]; } break; case 'A': $day = __dc('cake', 'day', 5); if (is_array($day)) { - return $day[date('w', self::$_time)]; + return $day[date('w', static::$_time)]; } break; case 'c': $format = __dc('cake', 'd_t_fmt', 5); if ($format !== 'd_t_fmt') { - return self::convertSpecifiers($format, self::$_time); + return static::convertSpecifiers($format, static::$_time); } break; case 'C': - return sprintf("%02d", date('Y', self::$_time) / 100); + return sprintf("%02d", date('Y', static::$_time) / 100); case 'D': return '%m/%d/%y'; case 'e': if (DS === '/') { return '%e'; } - $day = date('j', self::$_time); + $day = date('j', static::$_time); if ($day < 10) { $day = ' ' . $day; } return $day; case 'eS' : - return date('jS', self::$_time); + return date('jS', static::$_time); case 'b': case 'h': $months = __dc('cake', 'abmon', 5); if (is_array($months)) { - return $months[date('n', self::$_time) - 1]; + return $months[date('n', static::$_time) - 1]; } return '%b'; case 'B': $months = __dc('cake', 'mon', 5); if (is_array($months)) { - return $months[date('n', self::$_time) - 1]; + return $months[date('n', static::$_time) - 1]; } break; case 'n': @@ -199,7 +199,7 @@ protected static function _translateSpecifier($specifier) { case 'p': case 'P': $default = array('am' => 0, 'pm' => 1); - $meridiem = $default[date('a', self::$_time)]; + $meridiem = $default[date('a', static::$_time)]; $format = __dc('cake', 'am_pm', 5); if (is_array($format)) { $meridiem = $format[$meridiem]; @@ -209,27 +209,27 @@ protected static function _translateSpecifier($specifier) { case 'r': $complete = __dc('cake', 't_fmt_ampm', 5); if ($complete !== 't_fmt_ampm') { - return str_replace('%p', self::_translateSpecifier(array('%p', 'p')), $complete); + return str_replace('%p', static::_translateSpecifier(array('%p', 'p')), $complete); } break; case 'R': - return date('H:i', self::$_time); + return date('H:i', static::$_time); case 't': return "\t"; case 'T': return '%H:%M:%S'; case 'u': - return ($weekDay = date('w', self::$_time)) ? $weekDay : 7; + return ($weekDay = date('w', static::$_time)) ? $weekDay : 7; case 'x': $format = __dc('cake', 'd_fmt', 5); if ($format !== 'd_fmt') { - return self::convertSpecifiers($format, self::$_time); + return static::convertSpecifiers($format, static::$_time); } break; case 'X': $format = __dc('cake', 't_fmt', 5); if ($format !== 't_fmt') { - return self::convertSpecifiers($format, self::$_time); + return static::convertSpecifiers($format, static::$_time); } break; } @@ -254,7 +254,7 @@ public static function convert($serverTime, $timezone) { if (is_numeric($timezone)) { $userOffset = $timezone * (60 * 60); } else { - $timezone = self::timezone($timezone); + $timezone = static::timezone($timezone); $userOffset = $timezone->getOffset(new DateTime('@' . $gmtTime)); } $userTime = $gmtTime + $userOffset; @@ -343,7 +343,7 @@ public static function fromString($dateString, $timezone = null) { } if ($timezone !== null) { - return self::convert($date, $timezone); + return static::convert($date, $timezone); } return $date; } @@ -364,12 +364,12 @@ public static function nice($dateString = null, $timezone = null, $format = null if (!$dateString) { $dateString = time(); } - $date = self::fromString($dateString, $timezone); + $date = static::fromString($dateString, $timezone); if (!$format) { - $format = self::$niceFormat; + $format = static::$niceFormat; } - return self::_strftime(self::convertSpecifiers($format, $date), $date); + return static::_strftime(static::convertSpecifiers($format, $date), $date); } /** @@ -391,19 +391,19 @@ public static function niceShort($dateString = null, $timezone = null) { if (!$dateString) { $dateString = time(); } - $date = self::fromString($dateString, $timezone); + $date = static::fromString($dateString, $timezone); - if (self::isToday($dateString, $timezone)) { - return __d('cake', 'Today, %s', self::_strftime("%H:%M", $date)); + if (static::isToday($dateString, $timezone)) { + return __d('cake', 'Today, %s', static::_strftime("%H:%M", $date)); } - if (self::wasYesterday($dateString, $timezone)) { - return __d('cake', 'Yesterday, %s', self::_strftime("%H:%M", $date)); + if (static::wasYesterday($dateString, $timezone)) { + return __d('cake', 'Yesterday, %s', static::_strftime("%H:%M", $date)); } - if (self::isTomorrow($dateString, $timezone)) { - return __d('cake', 'Tomorrow, %s', self::_strftime("%H:%M", $date)); + if (static::isTomorrow($dateString, $timezone)) { + return __d('cake', 'Tomorrow, %s', static::_strftime("%H:%M", $date)); } - $d = self::_strftime("%w", $date); + $d = static::_strftime("%w", $date); $day = array( __d('cake', 'Sunday'), __d('cake', 'Monday'), @@ -413,18 +413,18 @@ public static function niceShort($dateString = null, $timezone = null) { __d('cake', 'Friday'), __d('cake', 'Saturday') ); - if (self::wasWithinLast('7 days', $dateString, $timezone)) { - return sprintf('%s %s', $day[$d], self::_strftime(self::$niceShortFormat, $date)); + if (static::wasWithinLast('7 days', $dateString, $timezone)) { + return sprintf('%s %s', $day[$d], static::_strftime(static::$niceShortFormat, $date)); } - if (self::isWithinNext('7 days', $dateString, $timezone)) { - return __d('cake', 'On %s %s', $day[$d], self::_strftime(self::$niceShortFormat, $date)); + if (static::isWithinNext('7 days', $dateString, $timezone)) { + return __d('cake', 'On %s %s', $day[$d], static::_strftime(static::$niceShortFormat, $date)); } $y = ''; - if (!self::isThisYear($date)) { + if (!static::isThisYear($date)) { $y = ' %Y'; } - return self::_strftime(self::convertSpecifiers("%b %eS{$y}, %H:%M", $date), $date); + return static::_strftime(static::convertSpecifiers("%b %eS{$y}, %H:%M", $date), $date); } /** @@ -438,8 +438,8 @@ public static function niceShort($dateString = null, $timezone = null) { * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::daysAsSql */ public static function daysAsSql($begin, $end, $fieldName, $timezone = null) { - $begin = self::fromString($begin, $timezone); - $end = self::fromString($end, $timezone); + $begin = static::fromString($begin, $timezone); + $end = static::fromString($end, $timezone); $begin = date('Y-m-d', $begin) . ' 00:00:00'; $end = date('Y-m-d', $end) . ' 23:59:59'; @@ -457,7 +457,7 @@ public static function daysAsSql($begin, $end, $fieldName, $timezone = null) { * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::dayAsSql */ public static function dayAsSql($dateString, $fieldName, $timezone = null) { - return self::daysAsSql($dateString, $dateString, $fieldName, $timezone); + return static::daysAsSql($dateString, $dateString, $fieldName, $timezone); } /** @@ -469,8 +469,8 @@ public static function dayAsSql($dateString, $fieldName, $timezone = null) { * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::isToday */ public static function isToday($dateString, $timezone = null) { - $timestamp = self::fromString($dateString, $timezone); - $now = self::fromString('now', $timezone); + $timestamp = static::fromString($dateString, $timezone); + $now = static::fromString('now', $timezone); return date('Y-m-d', $timestamp) === date('Y-m-d', $now); } @@ -483,7 +483,7 @@ public static function isToday($dateString, $timezone = null) { * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::isFuture */ public static function isFuture($dateString, $timezone = null) { - $timestamp = self::fromString($dateString, $timezone); + $timestamp = static::fromString($dateString, $timezone); return $timestamp > time(); } @@ -496,7 +496,7 @@ public static function isFuture($dateString, $timezone = null) { * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::isPast */ public static function isPast($dateString, $timezone = null) { - $timestamp = self::fromString($dateString, $timezone); + $timestamp = static::fromString($dateString, $timezone); return $timestamp < time(); } @@ -509,8 +509,8 @@ public static function isPast($dateString, $timezone = null) { * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::isThisWeek */ public static function isThisWeek($dateString, $timezone = null) { - $timestamp = self::fromString($dateString, $timezone); - $now = self::fromString('now', $timezone); + $timestamp = static::fromString($dateString, $timezone); + $now = static::fromString('now', $timezone); return date('W o', $timestamp) === date('W o', $now); } @@ -523,8 +523,8 @@ public static function isThisWeek($dateString, $timezone = null) { * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::isThisMonth */ public static function isThisMonth($dateString, $timezone = null) { - $timestamp = self::fromString($dateString, $timezone); - $now = self::fromString('now', $timezone); + $timestamp = static::fromString($dateString, $timezone); + $now = static::fromString('now', $timezone); return date('m Y', $timestamp) === date('m Y', $now); } @@ -537,8 +537,8 @@ public static function isThisMonth($dateString, $timezone = null) { * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::isThisYear */ public static function isThisYear($dateString, $timezone = null) { - $timestamp = self::fromString($dateString, $timezone); - $now = self::fromString('now', $timezone); + $timestamp = static::fromString($dateString, $timezone); + $now = static::fromString('now', $timezone); return date('Y', $timestamp) === date('Y', $now); } @@ -551,8 +551,8 @@ public static function isThisYear($dateString, $timezone = null) { * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::wasYesterday */ public static function wasYesterday($dateString, $timezone = null) { - $timestamp = self::fromString($dateString, $timezone); - $yesterday = self::fromString('yesterday', $timezone); + $timestamp = static::fromString($dateString, $timezone); + $yesterday = static::fromString('yesterday', $timezone); return date('Y-m-d', $timestamp) === date('Y-m-d', $yesterday); } @@ -565,8 +565,8 @@ public static function wasYesterday($dateString, $timezone = null) { * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::isTomorrow */ public static function isTomorrow($dateString, $timezone = null) { - $timestamp = self::fromString($dateString, $timezone); - $tomorrow = self::fromString('tomorrow', $timezone); + $timestamp = static::fromString($dateString, $timezone); + $tomorrow = static::fromString('tomorrow', $timezone); return date('Y-m-d', $timestamp) === date('Y-m-d', $tomorrow); } @@ -575,12 +575,12 @@ public static function isTomorrow($dateString, $timezone = null) { * * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object * @param bool $range if true returns a range in Y-m-d format - * @return mixed 1, 2, 3, or 4 quarter of year or array if $range true + * @return int|array 1, 2, 3, or 4 quarter of year or array if $range true * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::toQuarter */ public static function toQuarter($dateString, $range = false) { - $time = self::fromString($dateString); - $date = ceil(date('m', $time) / 3); + $time = static::fromString($dateString); + $date = (int)ceil(date('m', $time) / 3); if ($range === false) { return $date; } @@ -607,7 +607,7 @@ public static function toQuarter($dateString, $range = false) { * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::toUnix */ public static function toUnix($dateString, $timezone = null) { - return self::fromString($dateString, $timezone); + return static::fromString($dateString, $timezone); } /** @@ -658,7 +658,7 @@ public static function toServer($dateString, $timezone = null, $format = 'Y-m-d * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::toAtom */ public static function toAtom($dateString, $timezone = null) { - return date('Y-m-d\TH:i:s\Z', self::fromString($dateString, $timezone)); + return date('Y-m-d\TH:i:s\Z', static::fromString($dateString, $timezone)); } /** @@ -670,7 +670,7 @@ public static function toAtom($dateString, $timezone = null) { * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::toRSS */ public static function toRSS($dateString, $timezone = null) { - $date = self::fromString($dateString, $timezone); + $date = static::fromString($dateString, $timezone); if ($timezone === null) { return date("r", $date); @@ -737,9 +737,9 @@ public static function toRSS($dateString, $timezone = null) { */ public static function timeAgoInWords($dateTime, $options = array()) { $timezone = null; - $accuracies = self::$wordAccuracy; - $format = self::$wordFormat; - $relativeEnd = self::$wordEnd; + $accuracies = static::$wordAccuracy; + $format = static::$wordFormat; + $relativeEnd = static::$wordEnd; $relativeStringPast = __d('cake', '%s ago'); $relativeStringFuture = __d('cake', 'in %s'); $absoluteString = __d('cake', 'on %s'); @@ -784,8 +784,8 @@ public static function timeAgoInWords($dateTime, $options = array()) { unset($options['end'], $options['format']); } - $now = self::fromString(time(), $timezone); - $inSeconds = self::fromString($dateTime, $timezone); + $now = static::fromString(time(), $timezone); + $inSeconds = static::fromString($dateTime, $timezone); $isFuture = ($inSeconds > $now); if ($isFuture) { @@ -801,12 +801,12 @@ public static function timeAgoInWords($dateTime, $options = array()) { return __d('cake', 'just now', 'just now'); } - $isAbsoluteDate = $diff > abs($now - self::fromString($relativeEnd)); + $isAbsoluteDate = $diff > abs($now - static::fromString($relativeEnd)); if ($isAbsoluteDate) { if (strpos($format, '%') === false) { $date = date($format, $inSeconds); } else { - $date = self::_strftime($format, $inSeconds); + $date = static::_strftime($format, $inSeconds); } return sprintf($absoluteString, $date); } @@ -958,9 +958,9 @@ public static function wasWithinLast($timeInterval, $dateString, $timezone = nul $timeInterval = $tmp . ' ' . __d('cake', 'days'); } - $date = self::fromString($dateString, $timezone); - $interval = self::fromString('-' . $timeInterval); - $now = self::fromString('now', $timezone); + $date = static::fromString($dateString, $timezone); + $interval = static::fromString('-' . $timeInterval); + $now = static::fromString('now', $timezone); return $date >= $interval && $date <= $now; } @@ -980,9 +980,9 @@ public static function isWithinNext($timeInterval, $dateString, $timezone = null $timeInterval = $tmp . ' ' . __d('cake', 'days'); } - $date = self::fromString($dateString, $timezone); - $interval = self::fromString('+' . $timeInterval); - $now = self::fromString('now', $timezone); + $date = static::fromString($dateString, $timezone); + $interval = static::fromString('+' . $timeInterval); + $now = static::fromString('now', $timezone); return $date <= $interval && $date >= $now; } @@ -997,7 +997,7 @@ public static function isWithinNext($timeInterval, $dateString, $timezone = null public static function gmt($dateString = null) { $time = time(); if ($dateString) { - $time = self::fromString($dateString); + $time = static::fromString($dateString); } return gmmktime( (int)date('G', $time), @@ -1035,10 +1035,10 @@ public static function gmt($dateString = null) { */ public static function format($date, $format = null, $default = false, $timezone = null) { //Backwards compatible params re-order test - $time = self::fromString($format, $timezone); + $time = static::fromString($format, $timezone); if ($time === false) { - return self::i18nFormat($date, $format, $default, $timezone); + return static::i18nFormat($date, $format, $default, $timezone); } return date($date, $time); } @@ -1055,7 +1055,7 @@ public static function format($date, $format = null, $default = false, $timezone * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::i18nFormat */ public static function i18nFormat($date, $format = null, $default = false, $timezone = null) { - $date = self::fromString($date, $timezone); + $date = static::fromString($date, $timezone); if ($date === false && $default !== false) { return $default; } @@ -1065,7 +1065,7 @@ public static function i18nFormat($date, $format = null, $default = false, $time if (empty($format)) { $format = '%x'; } - return self::_strftime(self::convertSpecifiers($format, $date), $date); + return static::_strftime(static::convertSpecifiers($format, $date), $date); } /** diff --git a/lib/Cake/Utility/ClassRegistry.php b/lib/Cake/Utility/ClassRegistry.php index 144a0318fea..1208b4401f1 100644 --- a/lib/Cake/Utility/ClassRegistry.php +++ b/lib/Cake/Utility/ClassRegistry.php @@ -91,7 +91,7 @@ public static function getInstance() { * stored in the registry and returned. * @param bool $strict if set to true it will return false if the class was not found instead * of trying to create an AppModel - * @return object instance of ClassName. + * @return $class instance of ClassName. * @throws CakeException when you try to construct an interface or abstract class. */ public static function init($class, $strict = false) { diff --git a/lib/Cake/Utility/Debugger.php b/lib/Cake/Utility/Debugger.php index d35ea1ffc95..ec29a4d6eb9 100644 --- a/lib/Cake/Utility/Debugger.php +++ b/lib/Cake/Utility/Debugger.php @@ -19,7 +19,7 @@ */ App::uses('CakeLog', 'Log'); -App::uses('String', 'Utility'); +App::uses('CakeText', 'Utility'); /** * Provide custom logging and error handling. @@ -91,7 +91,6 @@ class Debugger { /** * Constructor. - * */ public function __construct() { $docRef = ini_get('docref_root'); @@ -174,7 +173,7 @@ public static function getInstance($class = null) { * @link http://book.cakephp.org/2.0/en/development/debugging.html#Debugger::dump */ public static function dump($var, $depth = 3) { - pr(self::exportVar($var, $depth)); + pr(static::exportVar($var, $depth)); } /** @@ -188,8 +187,8 @@ public static function dump($var, $depth = 3) { * @link http://book.cakephp.org/2.0/en/development/debugging.html#Debugger::log */ public static function log($var, $level = LOG_DEBUG, $depth = 3) { - $source = self::trace(array('start' => 1)) . "\n"; - CakeLog::write($level, "\n" . $source . self::exportVar($var, $depth)); + $source = static::trace(array('start' => 1)) . "\n"; + CakeLog::write($level, "\n" . $source . static::exportVar($var, $depth)); } /** @@ -200,7 +199,7 @@ public static function log($var, $level = LOG_DEBUG, $depth = 3) { * @param string $file File on which error occurred * @param int $line Line that triggered the error * @param array $context Context - * @return bool true if error was handled + * @return bool|null True if error was handled, otherwise null. * @deprecated 3.0.0 Will be removed in 3.0. This function is superseded by Debugger::outputError(). */ public static function showError($code, $description, $file = null, $line = null, $context = null) { @@ -217,7 +216,7 @@ public static function showError($code, $description, $file = null, $line = null if (!in_array($info, $self->errors)) { $self->errors[] = $info; } else { - return; + return null; } switch ($code) { @@ -247,7 +246,7 @@ public static function showError($code, $description, $file = null, $line = null $level = LOG_NOTICE; break; default: - return; + return null; } $data = compact( @@ -334,10 +333,10 @@ public static function trace($options = array()) { } else { $tpl = $self->_templates['base']['traceLine']; } - $trace['path'] = self::trimPath($trace['file']); + $trace['path'] = static::trimPath($trace['file']); $trace['reference'] = $reference; unset($trace['object'], $trace['args']); - $back[] = String::insert($tpl, $trace, array('before' => '{:', 'after' => '}')); + $back[] = CakeText::insert($tpl, $trace, array('before' => '{:', 'after' => '}')); } } @@ -408,7 +407,7 @@ public static function excerpt($file, $line, $context = 2) { if (!isset($data[$i])) { continue; } - $string = str_replace(array("\r\n", "\n"), "", self::_highlight($data[$i])); + $string = str_replace(array("\r\n", "\n"), "", static::_highlight($data[$i])); if ($i == $line) { $lines[] = '' . $string . ''; } else { @@ -468,7 +467,7 @@ protected static function _highlight($str) { * @link http://book.cakephp.org/2.0/en/development/debugging.html#Debugger::exportVar */ public static function exportVar($var, $depth = 3) { - return self::_export($var, $depth, 0); + return static::_export($var, $depth, 0); } /** @@ -480,7 +479,7 @@ public static function exportVar($var, $depth = 3) { * @return string The dumped variable. */ protected static function _export($var, $depth, $indent) { - switch (self::getType($var)) { + switch (static::getType($var)) { case 'boolean': return ($var) ? 'true' : 'false'; case 'integer': @@ -493,7 +492,7 @@ protected static function _export($var, $depth, $indent) { } return "'" . $var . "'"; case 'array': - return self::_array($var, $depth - 1, $indent + 1); + return static::_array($var, $depth - 1, $indent + 1); case 'resource': return strtolower(gettype($var)); case 'null': @@ -501,7 +500,7 @@ protected static function _export($var, $depth, $indent) { case 'unknown': return 'unknown'; default: - return self::_object($var, $depth - 1, $indent + 1); + return static::_object($var, $depth - 1, $indent + 1); } } @@ -550,9 +549,9 @@ protected static function _array(array $var, $depth, $indent) { if ($key === 'GLOBALS' && is_array($val) && isset($val['GLOBALS'])) { $val = '[recursion]'; } elseif ($val !== $var) { - $val = self::_export($val, $depth, $indent); + $val = static::_export($val, $depth, $indent); } - $vars[] = $break . self::exportVar($key) . + $vars[] = $break . static::exportVar($key) . ' => ' . $val; } @@ -583,7 +582,7 @@ protected static function _object($var, $depth, $indent) { $break = "\n" . str_repeat("\t", $indent); $objectVars = get_object_vars($var); foreach ($objectVars as $key => $value) { - $value = self::_export($value, $depth - 1, $indent); + $value = static::_export($value, $depth - 1, $indent); $props[] = "$key => " . $value; } @@ -600,7 +599,7 @@ protected static function _object($var, $depth, $indent) { $reflectionProperty->setAccessible(true); $property = $reflectionProperty->getValue($var); - $value = self::_export($property, $depth - 1, $indent); + $value = static::_export($property, $depth - 1, $indent); $key = $reflectionProperty->name; $props[] = sprintf('[%s] %s => %s', $visibility, $key, $value); } @@ -637,7 +636,7 @@ public static function outputAs($format = null) { * * `Debugger::addFormat('custom', $data);` * - * Where $data is an array of strings that use String::insert() variable + * Where $data is an array of strings that use CakeText::insert() variable * replacement. The template vars should be in a `{:id}` style. * An error formatter can have the following keys: * @@ -775,7 +774,7 @@ public function outputError($data) { if (isset($tpl['links'])) { foreach ($tpl['links'] as $key => $val) { - $links[$key] = String::insert($val, $data, $insertOpts); + $links[$key] = CakeText::insert($val, $data, $insertOpts); } } @@ -791,14 +790,14 @@ public function outputError($data) { if (is_array($value)) { $value = implode("\n", $value); } - $info .= String::insert($tpl[$key], array($key => $value) + $data, $insertOpts); + $info .= CakeText::insert($tpl[$key], array($key => $value) + $data, $insertOpts); } $links = implode(' ', $links); if (isset($tpl['callback']) && is_callable($tpl['callback'])) { return call_user_func($tpl['callback'], $data, compact('links', 'info')); } - echo String::insert($tpl['error'], compact('links', 'info') + $data, $insertOpts); + echo CakeText::insert($tpl['error'], compact('links', 'info') + $data, $insertOpts); } /** diff --git a/lib/Cake/Utility/Folder.php b/lib/Cake/Utility/Folder.php index 088723cb2e8..20058f17449 100644 --- a/lib/Cake/Utility/Folder.php +++ b/lib/Cake/Utility/Folder.php @@ -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) { @@ -285,7 +285,7 @@ public static function isAbsolute($path) { return $path[0] === '/' || preg_match('/^[A-Z]:\\\\/i', $path) || substr($path, 0, 2) === '\\\\' || - self::isRegisteredStreamWrapper($path); + static::isRegisteredStreamWrapper($path); } /** @@ -525,8 +525,8 @@ public function create($pathname, $mode = false) { return true; } - if (!self::isAbsolute($pathname)) { - $pathname = self::addPathElement($this->pwd(), $pathname); + if (!static::isAbsolute($pathname)) { + $pathname = static::addPathElement($this->pwd(), $pathname); } if (!$mode) { diff --git a/lib/Cake/Utility/Hash.php b/lib/Cake/Utility/Hash.php index 70485195b30..451e8f13e95 100644 --- a/lib/Cake/Utility/Hash.php +++ b/lib/Cake/Utility/Hash.php @@ -14,7 +14,7 @@ * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -App::uses('String', 'Utility'); +App::uses('CakeText', 'Utility'); /** * Library of array functions for manipulating and extracting data @@ -43,7 +43,7 @@ class Hash { * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::get */ public static function get(array $data, $path, $default = null) { - if (empty($data)) { + if (empty($data) || $path === '' || $path === null) { return $default; } if (is_string($path) || is_numeric($path)) { @@ -55,7 +55,6 @@ public static function get(array $data, $path, $default = null) { $path )); } - $parts = $path; } @@ -77,6 +76,7 @@ public static function get(array $data, $path, $default = null) { * * - `{n}` Matches any numeric key, or integer. * - `{s}` Matches any string key. + * - `{*}` Matches any value. * - `Foo` Matches any key with the exact same value. * * There are a number of attribute operators: @@ -106,13 +106,13 @@ public static function extract(array $data, $path) { // Simple paths. if (!preg_match('/[{\[]/', $path)) { - return (array)self::get($data, $path); + return (array)static::get($data, $path); } if (strpos($path, '[') === false) { $tokens = explode('.', $path); } else { - $tokens = String::tokenize($path, '.', '[', ']'); + $tokens = CakeText::tokenize($path, '.', '[', ']'); } $_key = '__set_item__'; @@ -122,11 +122,11 @@ public static function extract(array $data, $path) { foreach ($tokens as $token) { $next = array(); - list($token, $conditions) = self::_splitConditions($token); + list($token, $conditions) = static::_splitConditions($token); foreach ($context[$_key] as $item) { foreach ((array)$item as $k => $v) { - if (self::_matchToken($k, $token)) { + if (static::_matchToken($k, $token)) { $next[] = $v; } } @@ -136,7 +136,7 @@ public static function extract(array $data, $path) { if ($conditions) { $filter = array(); foreach ($next as $item) { - if (is_array($item) && self::_matches($item, $conditions)) { + if (is_array($item) && static::_matches($item, $conditions)) { $filter[] = $item; } } @@ -172,16 +172,16 @@ protected static function _splitConditions($token) { * @return bool */ protected static function _matchToken($key, $token) { - if ($token === '{n}') { - return is_numeric($key); - } - if ($token === '{s}') { - return is_string($key); - } - if (is_numeric($token)) { - return ($key == $token); + switch ($token) { + case '{n}': + return is_numeric($key); + case '{s}': + return is_string($key); + case '{*}': + return true; + default: + return is_numeric($token) ? ($key == $token) : $key === $token; } - return ($key === $token); } /** @@ -250,7 +250,7 @@ protected static function _matches(array $data, $selector) { * * @param array $data The data to insert into. * @param string $path The path to insert at. - * @param array $values The values to insert. + * @param mixed $values The values to insert. * @return array The data with $values inserted. * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::insert */ @@ -258,26 +258,26 @@ public static function insert(array $data, $path, $values = null) { if (strpos($path, '[') === false) { $tokens = explode('.', $path); } else { - $tokens = String::tokenize($path, '.', '[', ']'); + $tokens = CakeText::tokenize($path, '.', '[', ']'); } if (strpos($path, '{') === false && strpos($path, '[') === false) { - return self::_simpleOp('insert', $data, $tokens, $values); + return static::_simpleOp('insert', $data, $tokens, $values); } $token = array_shift($tokens); $nextPath = implode('.', $tokens); - list($token, $conditions) = self::_splitConditions($token); + list($token, $conditions) = static::_splitConditions($token); foreach ($data as $k => $v) { - if (self::_matchToken($k, $token)) { - if ($conditions && self::_matches($v, $conditions)) { + if (static::_matchToken($k, $token)) { + if ($conditions && static::_matches($v, $conditions)) { $data[$k] = array_merge($v, $values); continue; } if (!$conditions) { - $data[$k] = self::insert($v, $nextPath, $values); + $data[$k] = static::insert($v, $nextPath, $values); } } } @@ -341,26 +341,26 @@ public static function remove(array $data, $path) { if (strpos($path, '[') === false) { $tokens = explode('.', $path); } else { - $tokens = String::tokenize($path, '.', '[', ']'); + $tokens = CakeText::tokenize($path, '.', '[', ']'); } if (strpos($path, '{') === false && strpos($path, '[') === false) { - return self::_simpleOp('remove', $data, $tokens); + return static::_simpleOp('remove', $data, $tokens); } $token = array_shift($tokens); $nextPath = implode('.', $tokens); - list($token, $conditions) = self::_splitConditions($token); + list($token, $conditions) = static::_splitConditions($token); foreach ($data as $k => $v) { - $match = self::_matchToken($k, $token); + $match = static::_matchToken($k, $token); if ($match && is_array($v)) { - if ($conditions && self::_matches($v, $conditions)) { + if ($conditions && static::_matches($v, $conditions)) { unset($data[$k]); continue; } - $data[$k] = self::remove($v, $nextPath); + $data[$k] = static::remove($v, $nextPath); if (empty($data[$k])) { unset($data[$k]); } @@ -392,9 +392,9 @@ public static function combine(array $data, $keyPath, $valuePath = null, $groupP if (is_array($keyPath)) { $format = array_shift($keyPath); - $keys = self::format($data, $keyPath, $format); + $keys = static::format($data, $keyPath, $format); } else { - $keys = self::extract($data, $keyPath); + $keys = static::extract($data, $keyPath); } if (empty($keys)) { return array(); @@ -402,9 +402,9 @@ public static function combine(array $data, $keyPath, $valuePath = null, $groupP if (!empty($valuePath) && is_array($valuePath)) { $format = array_shift($valuePath); - $vals = self::format($data, $valuePath, $format); + $vals = static::format($data, $valuePath, $format); } elseif (!empty($valuePath)) { - $vals = self::extract($data, $valuePath); + $vals = static::extract($data, $valuePath); } if (empty($vals)) { $vals = array_fill(0, count($keys), null); @@ -418,7 +418,7 @@ public static function combine(array $data, $keyPath, $valuePath = null, $groupP } if ($groupPath !== null) { - $group = self::extract($data, $groupPath); + $group = static::extract($data, $groupPath); if (!empty($group)) { $c = count($keys); for ($i = 0; $i < $c; $i++) { @@ -465,11 +465,11 @@ public static function format(array $data, array $paths, $format) { $count = count($paths); if (!$count) { - return; + return null; } for ($i = 0; $i < $count; $i++) { - $extracted[] = self::extract($data, $paths[$i]); + $extracted[] = static::extract($data, $paths[$i]); } $out = array(); $data = $extracted; @@ -539,7 +539,7 @@ public static function contains(array $data, array $needle) { * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::check */ public static function check(array $data, $path) { - $results = self::extract($data, $path); + $results = static::extract($data, $path); if (!is_array($results)) { return false; } @@ -551,14 +551,14 @@ public static function check(array $data, $path) { * * @param array $data Either an array to filter, or value when in callback * @param callable $callback A function to filter the data with. Defaults to - * `self::_filter()` Which strips out all non-zero empty values. + * `static::_filter()` Which strips out all non-zero empty values. * @return array Filtered array * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::filter */ public static function filter(array $data, $callback = array('self', '_filter')) { foreach ($data as $k => $v) { if (is_array($v)) { - $data[$k] = self::filter($v, $callback); + $data[$k] = static::filter($v, $callback); } } return array_filter($data, $callback); @@ -759,14 +759,14 @@ public static function dimensions(array $data) { * @return int The maximum number of dimensions in $data * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::maxDimensions */ - public static function maxDimensions(array $data) { + public static function maxDimensions($data) { $depth = array(); if (is_array($data) && reset($data) !== false) { foreach ($data as $value) { - $depth[] = self::dimensions((array)$value) + 1; + $depth[] = static::maxDimensions($value) + 1; } } - return max($depth); + return empty($depth) ? 0 : max($depth); } /** @@ -780,7 +780,7 @@ public static function maxDimensions(array $data) { * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::map */ public static function map(array $data, $path, $function) { - $values = (array)self::extract($data, $path); + $values = (array)static::extract($data, $path); return array_map($function, $values); } @@ -794,7 +794,7 @@ public static function map(array $data, $path, $function) { * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::reduce */ public static function reduce(array $data, $path, $function) { - $values = (array)self::extract($data, $path); + $values = (array)static::extract($data, $path); return array_reduce($values, $function); } @@ -819,7 +819,7 @@ public static function reduce(array $data, $path, $function) { * @return mixed The results of the applied method. */ public static function apply(array $data, $path, $function) { - $values = (array)self::extract($data, $path); + $values = (array)static::extract($data, $path); return call_user_func($function, $values); } @@ -855,7 +855,7 @@ public static function sort(array $data, $path, $dir = 'asc', $type = 'regular') if ($numeric) { $data = array_values($data); } - $sortValues = self::extract($data, $path); + $sortValues = static::extract($data, $path); $sortCount = count($sortValues); $dataCount = count($data); @@ -864,9 +864,9 @@ public static function sort(array $data, $path, $dir = 'asc', $type = 'regular') if ($sortCount < $dataCount) { $sortValues = array_pad($sortValues, $dataCount, null); } - $result = self::_squash($sortValues); - $keys = self::extract($result, '{n}.id'); - $values = self::extract($result, '{n}.value'); + $result = static::_squash($sortValues); + $keys = static::extract($result, '{n}.id'); + $values = static::extract($result, '{n}.value'); $dir = strtolower($dir); $type = strtolower($type); @@ -921,7 +921,7 @@ protected static function _squash($data, $key = null) { $id = $key; } if (is_array($r) && !empty($r)) { - $stack = array_merge($stack, self::_squash($r, $id)); + $stack = array_merge($stack, static::_squash($r, $id)); } else { $stack[] = array('id' => $id, 'value' => $r); } @@ -977,7 +977,7 @@ public static function mergeDiff(array $data, $compare) { if (!array_key_exists($key, $data)) { $data[$key] = $value; } elseif (is_array($value)) { - $data[$key] = self::mergeDiff($data[$key], $compare[$key]); + $data[$key] = static::mergeDiff($data[$key], $compare[$key]); } } return $data; @@ -1051,7 +1051,7 @@ public static function nest(array $data, $options = array()) { ); $return = $idMap = array(); - $ids = self::extract($data, $options['idPath']); + $ids = static::extract($data, $options['idPath']); $idKeys = explode('.', $options['idPath']); array_shift($idKeys); @@ -1062,8 +1062,8 @@ public static function nest(array $data, $options = array()) { foreach ($data as $result) { $result[$options['children']] = array(); - $id = self::get($result, $idKeys); - $parentId = self::get($result, $parentKeys); + $id = static::get($result, $idKeys); + $parentId = static::get($result, $parentKeys); if (isset($idMap[$id][$options['children']])) { $idMap[$id] = array_merge($result, (array)$idMap[$id]); @@ -1086,12 +1086,12 @@ public static function nest(array $data, $options = array()) { if ($options['root']) { $root = $options['root']; } else { - $root = self::get($return[0], $parentKeys); + $root = static::get($return[0], $parentKeys); } foreach ($return as $i => $result) { - $id = self::get($result, $idKeys); - $parentId = self::get($result, $parentKeys); + $id = static::get($result, $idKeys); + $parentId = static::get($result, $parentKeys); if ($id !== $root && $parentId != $root) { unset($return[$i]); } diff --git a/lib/Cake/Utility/Inflector.php b/lib/Cake/Utility/Inflector.php index 6e7b4d4934b..40b9de2810e 100644 --- a/lib/Cake/Utility/Inflector.php +++ b/lib/Cake/Utility/Inflector.php @@ -47,7 +47,7 @@ class Inflector { '/(? '\1en', '/(c)hild$/i' => '\1hildren', '/(buffal|tomat)o$/i' => '\1\2oes', - '/(alumn|bacill|cact|foc|fung|nucle|radi|stimul|syllab|termin|vir)us$/i' => '\1i', + '/(alumn|bacill|cact|foc|fung|nucle|radi|stimul|syllab|termin)us$/i' => '\1i', '/us$/i' => 'uses', '/(alias)$/i' => '\1es', '/(ax|cris|test)is$/i' => '\1es', @@ -107,7 +107,8 @@ class Inflector { 'hero' => 'heroes', 'tooth' => 'teeth', 'goose' => 'geese', - 'foot' => 'feet' + 'foot' => 'feet', + 'sieve' => 'sieves' ) ); @@ -273,13 +274,13 @@ protected static function _cache($type, $key, $value = false) { $key = '_' . $key; $type = '_' . $type; if ($value !== false) { - self::$_cache[$type][$key] = $value; + static::$_cache[$type][$key] = $value; return $value; } - if (!isset(self::$_cache[$type][$key])) { + if (!isset(static::$_cache[$type][$key])) { return false; } - return self::$_cache[$type][$key]; + return static::$_cache[$type][$key]; } /** @@ -289,13 +290,13 @@ protected static function _cache($type, $key, $value = false) { * @return void */ public static function reset() { - if (empty(self::$_initialState)) { - self::$_initialState = get_class_vars('Inflector'); + if (empty(static::$_initialState)) { + static::$_initialState = get_class_vars('Inflector'); return; } - foreach (self::$_initialState as $key => $val) { + foreach (static::$_initialState as $key => $val) { if ($key !== '_initialState') { - self::${$key} = $val; + static::${$key} = $val; } } } @@ -327,9 +328,9 @@ public static function rules($type, $rules, $reset = false) { switch ($type) { case 'transliteration': if ($reset) { - self::$_transliteration = $rules; + static::$_transliteration = $rules; } else { - self::$_transliteration = $rules + self::$_transliteration; + static::$_transliteration = $rules + static::$_transliteration; } break; @@ -337,26 +338,26 @@ public static function rules($type, $rules, $reset = false) { foreach ($rules as $rule => $pattern) { if (is_array($pattern)) { if ($reset) { - self::${$var}[$rule] = $pattern; + static::${$var}[$rule] = $pattern; } else { if ($rule === 'uninflected') { - self::${$var}[$rule] = array_merge($pattern, self::${$var}[$rule]); + static::${$var}[$rule] = array_merge($pattern, static::${$var}[$rule]); } else { - self::${$var}[$rule] = $pattern + self::${$var}[$rule]; + static::${$var}[$rule] = $pattern + static::${$var}[$rule]; } } - unset($rules[$rule], self::${$var}['cache' . ucfirst($rule)]); - if (isset(self::${$var}['merged'][$rule])) { - unset(self::${$var}['merged'][$rule]); + unset($rules[$rule], static::${$var}['cache' . ucfirst($rule)]); + if (isset(static::${$var}['merged'][$rule])) { + unset(static::${$var}['merged'][$rule]); } if ($type === 'plural') { - self::$_cache['pluralize'] = self::$_cache['tableize'] = array(); + static::$_cache['pluralize'] = static::$_cache['tableize'] = array(); } elseif ($type === 'singular') { - self::$_cache['singularize'] = array(); + static::$_cache['singularize'] = array(); } } } - self::${$var}['rules'] = $rules + self::${$var}['rules']; + static::${$var}['rules'] = $rules + static::${$var}['rules']; } } @@ -368,37 +369,39 @@ public static function rules($type, $rules, $reset = false) { * @link http://book.cakephp.org/2.0/en/core-utility-libraries/inflector.html#Inflector::pluralize */ public static function pluralize($word) { - if (isset(self::$_cache['pluralize'][$word])) { - return self::$_cache['pluralize'][$word]; + if (isset(static::$_cache['pluralize'][$word])) { + return static::$_cache['pluralize'][$word]; } - if (!isset(self::$_plural['merged']['irregular'])) { - self::$_plural['merged']['irregular'] = self::$_plural['irregular']; + if (!isset(static::$_plural['merged']['irregular'])) { + static::$_plural['merged']['irregular'] = static::$_plural['irregular']; } - if (!isset(self::$_plural['merged']['uninflected'])) { - self::$_plural['merged']['uninflected'] = array_merge(self::$_plural['uninflected'], self::$_uninflected); + if (!isset(static::$_plural['merged']['uninflected'])) { + static::$_plural['merged']['uninflected'] = array_merge(static::$_plural['uninflected'], static::$_uninflected); } - if (!isset(self::$_plural['cacheUninflected']) || !isset(self::$_plural['cacheIrregular'])) { - self::$_plural['cacheUninflected'] = '(?:' . implode('|', self::$_plural['merged']['uninflected']) . ')'; - self::$_plural['cacheIrregular'] = '(?:' . implode('|', array_keys(self::$_plural['merged']['irregular'])) . ')'; + if (!isset(static::$_plural['cacheUninflected']) || !isset(static::$_plural['cacheIrregular'])) { + static::$_plural['cacheUninflected'] = '(?:' . implode('|', static::$_plural['merged']['uninflected']) . ')'; + static::$_plural['cacheIrregular'] = '(?:' . implode('|', array_keys(static::$_plural['merged']['irregular'])) . ')'; } - if (preg_match('/(.*)\\b(' . self::$_plural['cacheIrregular'] . ')$/i', $word, $regs)) { - self::$_cache['pluralize'][$word] = $regs[1] . substr($word, 0, 1) . substr(self::$_plural['merged']['irregular'][strtolower($regs[2])], 1); - return self::$_cache['pluralize'][$word]; + if (preg_match('/(.*?(?:\\b|_))(' . static::$_plural['cacheIrregular'] . ')$/i', $word, $regs)) { + static::$_cache['pluralize'][$word] = $regs[1] . + substr($regs[2], 0, 1) . + substr(static::$_plural['merged']['irregular'][strtolower($regs[2])], 1); + return static::$_cache['pluralize'][$word]; } - if (preg_match('/^(' . self::$_plural['cacheUninflected'] . ')$/i', $word, $regs)) { - self::$_cache['pluralize'][$word] = $word; + if (preg_match('/^(' . static::$_plural['cacheUninflected'] . ')$/i', $word, $regs)) { + static::$_cache['pluralize'][$word] = $word; return $word; } - foreach (self::$_plural['rules'] as $rule => $replacement) { + foreach (static::$_plural['rules'] as $rule => $replacement) { if (preg_match($rule, $word)) { - self::$_cache['pluralize'][$word] = preg_replace($rule, $replacement, $word); - return self::$_cache['pluralize'][$word]; + static::$_cache['pluralize'][$word] = preg_replace($rule, $replacement, $word); + return static::$_cache['pluralize'][$word]; } } } @@ -411,46 +414,48 @@ public static function pluralize($word) { * @link http://book.cakephp.org/2.0/en/core-utility-libraries/inflector.html#Inflector::singularize */ public static function singularize($word) { - if (isset(self::$_cache['singularize'][$word])) { - return self::$_cache['singularize'][$word]; + if (isset(static::$_cache['singularize'][$word])) { + return static::$_cache['singularize'][$word]; } - if (!isset(self::$_singular['merged']['uninflected'])) { - self::$_singular['merged']['uninflected'] = array_merge( - self::$_singular['uninflected'], - self::$_uninflected + if (!isset(static::$_singular['merged']['uninflected'])) { + static::$_singular['merged']['uninflected'] = array_merge( + static::$_singular['uninflected'], + static::$_uninflected ); } - if (!isset(self::$_singular['merged']['irregular'])) { - self::$_singular['merged']['irregular'] = array_merge( - self::$_singular['irregular'], - array_flip(self::$_plural['irregular']) + if (!isset(static::$_singular['merged']['irregular'])) { + static::$_singular['merged']['irregular'] = array_merge( + static::$_singular['irregular'], + array_flip(static::$_plural['irregular']) ); } - if (!isset(self::$_singular['cacheUninflected']) || !isset(self::$_singular['cacheIrregular'])) { - self::$_singular['cacheUninflected'] = '(?:' . implode('|', self::$_singular['merged']['uninflected']) . ')'; - self::$_singular['cacheIrregular'] = '(?:' . implode('|', array_keys(self::$_singular['merged']['irregular'])) . ')'; + if (!isset(static::$_singular['cacheUninflected']) || !isset(static::$_singular['cacheIrregular'])) { + static::$_singular['cacheUninflected'] = '(?:' . implode('|', static::$_singular['merged']['uninflected']) . ')'; + static::$_singular['cacheIrregular'] = '(?:' . implode('|', array_keys(static::$_singular['merged']['irregular'])) . ')'; } - if (preg_match('/(.*)\\b(' . self::$_singular['cacheIrregular'] . ')$/i', $word, $regs)) { - self::$_cache['singularize'][$word] = $regs[1] . substr($word, 0, 1) . substr(self::$_singular['merged']['irregular'][strtolower($regs[2])], 1); - return self::$_cache['singularize'][$word]; + if (preg_match('/(.*?(?:\\b|_))(' . static::$_singular['cacheIrregular'] . ')$/i', $word, $regs)) { + static::$_cache['singularize'][$word] = $regs[1] . + substr($regs[2], 0, 1) . + substr(static::$_singular['merged']['irregular'][strtolower($regs[2])], 1); + return static::$_cache['singularize'][$word]; } - if (preg_match('/^(' . self::$_singular['cacheUninflected'] . ')$/i', $word, $regs)) { - self::$_cache['singularize'][$word] = $word; + if (preg_match('/^(' . static::$_singular['cacheUninflected'] . ')$/i', $word, $regs)) { + static::$_cache['singularize'][$word] = $word; return $word; } - foreach (self::$_singular['rules'] as $rule => $replacement) { + foreach (static::$_singular['rules'] as $rule => $replacement) { if (preg_match($rule, $word)) { - self::$_cache['singularize'][$word] = preg_replace($rule, $replacement, $word); - return self::$_cache['singularize'][$word]; + static::$_cache['singularize'][$word] = preg_replace($rule, $replacement, $word); + return static::$_cache['singularize'][$word]; } } - self::$_cache['singularize'][$word] = $word; + static::$_cache['singularize'][$word] = $word; return $word; } @@ -462,9 +467,9 @@ public static function singularize($word) { * @link http://book.cakephp.org/2.0/en/core-utility-libraries/inflector.html#Inflector::camelize */ public static function camelize($lowerCaseAndUnderscoredWord) { - if (!($result = self::_cache(__FUNCTION__, $lowerCaseAndUnderscoredWord))) { + if (!($result = static::_cache(__FUNCTION__, $lowerCaseAndUnderscoredWord))) { $result = str_replace(' ', '', Inflector::humanize($lowerCaseAndUnderscoredWord)); - self::_cache(__FUNCTION__, $lowerCaseAndUnderscoredWord, $result); + static::_cache(__FUNCTION__, $lowerCaseAndUnderscoredWord, $result); } return $result; } @@ -477,9 +482,10 @@ public static function camelize($lowerCaseAndUnderscoredWord) { * @link http://book.cakephp.org/2.0/en/core-utility-libraries/inflector.html#Inflector::underscore */ public static function underscore($camelCasedWord) { - if (!($result = self::_cache(__FUNCTION__, $camelCasedWord))) { - $result = strtolower(preg_replace('/(?<=\\w)([A-Z])/', '_\\1', $camelCasedWord)); - self::_cache(__FUNCTION__, $camelCasedWord, $result); + if (!($result = static::_cache(__FUNCTION__, $camelCasedWord))) { + $underscoredWord = preg_replace('/(?<=\\w)([A-Z])/', '_\\1', $camelCasedWord); + $result = mb_strtolower($underscoredWord); + static::_cache(__FUNCTION__, $camelCasedWord, $result); } return $result; } @@ -493,9 +499,13 @@ public static function underscore($camelCasedWord) { * @link http://book.cakephp.org/2.0/en/core-utility-libraries/inflector.html#Inflector::humanize */ public static function humanize($lowerCaseAndUnderscoredWord) { - if (!($result = self::_cache(__FUNCTION__, $lowerCaseAndUnderscoredWord))) { - $result = ucwords(str_replace('_', ' ', $lowerCaseAndUnderscoredWord)); - self::_cache(__FUNCTION__, $lowerCaseAndUnderscoredWord, $result); + if (!($result = static::_cache(__FUNCTION__, $lowerCaseAndUnderscoredWord))) { + $result = explode(' ', str_replace('_', ' ', $lowerCaseAndUnderscoredWord)); + foreach ($result as &$word) { + $word = mb_strtoupper(mb_substr($word, 0, 1)) . mb_substr($word, 1); + } + $result = implode(' ', $result); + static::_cache(__FUNCTION__, $lowerCaseAndUnderscoredWord, $result); } return $result; } @@ -508,9 +518,9 @@ public static function humanize($lowerCaseAndUnderscoredWord) { * @link http://book.cakephp.org/2.0/en/core-utility-libraries/inflector.html#Inflector::tableize */ public static function tableize($className) { - if (!($result = self::_cache(__FUNCTION__, $className))) { + if (!($result = static::_cache(__FUNCTION__, $className))) { $result = Inflector::pluralize(Inflector::underscore($className)); - self::_cache(__FUNCTION__, $className, $result); + static::_cache(__FUNCTION__, $className, $result); } return $result; } @@ -523,9 +533,9 @@ public static function tableize($className) { * @link http://book.cakephp.org/2.0/en/core-utility-libraries/inflector.html#Inflector::classify */ public static function classify($tableName) { - if (!($result = self::_cache(__FUNCTION__, $tableName))) { + if (!($result = static::_cache(__FUNCTION__, $tableName))) { $result = Inflector::camelize(Inflector::singularize($tableName)); - self::_cache(__FUNCTION__, $tableName, $result); + static::_cache(__FUNCTION__, $tableName, $result); } return $result; } @@ -538,11 +548,11 @@ public static function classify($tableName) { * @link http://book.cakephp.org/2.0/en/core-utility-libraries/inflector.html#Inflector::variable */ public static function variable($string) { - if (!($result = self::_cache(__FUNCTION__, $string))) { + if (!($result = static::_cache(__FUNCTION__, $string))) { $camelized = Inflector::camelize(Inflector::underscore($string)); $replace = strtolower(substr($camelized, 0, 1)); $result = preg_replace('/\\w/', $replace, $camelized, 1); - self::_cache(__FUNCTION__, $string, $result); + static::_cache(__FUNCTION__, $string, $result); } return $result; } @@ -565,7 +575,7 @@ public static function slug($string, $replacement = '_') { sprintf('/^[%s]+|[%s]+$/', $quotedReplacement, $quotedReplacement) => '', ); - $map = self::$_transliteration + $merge; + $map = static::$_transliteration + $merge; return preg_replace(array_keys($map), array_values($map), $string); } diff --git a/lib/Cake/Utility/ObjectCollection.php b/lib/Cake/Utility/ObjectCollection.php index 4bbb1a3ea41..49e4ae9f89c 100644 --- a/lib/Cake/Utility/ObjectCollection.php +++ b/lib/Cake/Utility/ObjectCollection.php @@ -176,6 +176,7 @@ public function __isset($name) { public function enable($name, $prioritize = true) { $enabled = false; foreach ((array)$name as $object) { + list(, $object) = pluginSplit($object); if (isset($this->_loaded[$object]) && !isset($this->_enabled[$object])) { $priority = $this->defaultPriority; if (isset($this->_loaded[$object]->settings['priority'])) { @@ -219,6 +220,7 @@ public function setPriority($name, $priority = null) { $name = array($name => $priority); } foreach ($name as $object => $objectPriority) { + list(, $object) = pluginSplit($object); if (isset($this->_loaded[$object])) { if ($objectPriority === null) { $objectPriority = $this->defaultPriority; @@ -241,6 +243,7 @@ public function setPriority($name, $priority = null) { */ public function disable($name) { foreach ((array)$name as $object) { + list(, $object) = pluginSplit($object); unset($this->_enabled[$object]); } } @@ -255,6 +258,7 @@ public function disable($name) { */ public function enabled($name = null) { if (!empty($name)) { + list(, $name) = pluginSplit($name); return isset($this->_enabled[$name]); } return array_keys($this->_enabled); @@ -283,6 +287,7 @@ public function attached($name = null) { */ public function loaded($name = null) { if (!empty($name)) { + list(, $name) = pluginSplit($name); return isset($this->_loaded[$name]); } return array_keys($this->_loaded); diff --git a/lib/Cake/Utility/Security.php b/lib/Cake/Utility/Security.php index 7d3afa8f4f1..6ad3c01c14d 100644 --- a/lib/Cake/Utility/Security.php +++ b/lib/Cake/Utility/Security.php @@ -16,7 +16,7 @@ * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -App::uses('String', 'Utility'); +App::uses('CakeText', 'Utility'); /** * Security Library contains utility methods related to security @@ -63,7 +63,7 @@ public static function inactiveMins() { * @return string Hash */ public static function generateAuthKey() { - return Security::hash(String::uuid()); + return Security::hash(CakeText::uuid()); } /** @@ -105,12 +105,12 @@ public static function validateAuthKey($authKey) { */ public static function hash($string, $type = null, $salt = false) { if (empty($type)) { - $type = self::$hashType; + $type = static::$hashType; } $type = strtolower($type); if ($type === 'blowfish') { - return self::_crypt($string, $salt); + return static::_crypt($string, $salt); } if ($salt) { if (!is_string($salt)) { @@ -145,7 +145,7 @@ public static function hash($string, $type = null, $salt = false) { * @see Security::hash() */ public static function setHash($hash) { - self::$hashType = $hash; + static::$hashType = $hash; } /** @@ -163,7 +163,7 @@ public static function setCost($cost) { ), E_USER_WARNING); return null; } - self::$hashCost = $cost; + static::$hashCost = $cost; } /** @@ -273,8 +273,8 @@ protected static function _salt($length = 22) { */ protected static function _crypt($password, $salt = false) { if ($salt === false) { - $salt = self::_salt(22); - $salt = vsprintf('$2a$%02d$%s', array(self::$hashCost, $salt)); + $salt = static::_salt(22); + $salt = vsprintf('$2a$%02d$%s', array(static::$hashCost, $salt)); } $invalidCipher = ( @@ -307,7 +307,7 @@ protected static function _crypt($password, $salt = false) { * @throws CakeException On invalid data or key. */ public static function encrypt($plain, $key, $hmacSalt = null) { - self::_checkKey($key, 'encrypt()'); + static::_checkKey($key, 'encrypt()'); if ($hmacSalt === null) { $hmacSalt = Configure::read('Security.salt'); @@ -350,7 +350,7 @@ protected static function _checkKey($key, $method) { * @throws CakeException On invalid data or key. */ public static function decrypt($cipher, $key, $hmacSalt = null) { - self::_checkKey($key, 'decrypt()'); + static::_checkKey($key, 'decrypt()'); if (empty($cipher)) { throw new CakeException(__d('cake_dev', 'The data to decrypt cannot be empty.')); } diff --git a/lib/Cake/Utility/Set.php b/lib/Cake/Utility/Set.php index 5d05e0c8b26..10750c1c62e 100644 --- a/lib/Cake/Utility/Set.php +++ b/lib/Cake/Utility/Set.php @@ -16,7 +16,7 @@ * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -App::uses('String', 'Utility'); +App::uses('CakeText', 'Utility'); App::uses('Hash', 'Utility'); /** @@ -228,7 +228,7 @@ public static function enum($select, $list = null) { * @param array $data Source array from which to extract the data * @param string $format Format string into which values will be inserted, see sprintf() * @param array $keys An array containing one or more Set::extract()-style key paths - * @return array An array of strings extracted from $keys and formatted with $format + * @return array|null An array of strings extracted from $keys and formatted with $format, otherwise null. * @link http://book.cakephp.org/2.0/en/core-utility-libraries/set.html#Set::format */ public static function format($data, $format, $keys) { @@ -236,7 +236,7 @@ public static function format($data, $format, $keys) { $count = count($keys); if (!$count) { - return; + return null; } for ($i = 0; $i < $count; $i++) { @@ -549,7 +549,7 @@ public static function classicExtract($data, $path = null) { return null; } if (is_string($path) && strpos($path, '{') !== false) { - $path = String::tokenize($path, '.', '{', '}'); + $path = CakeText::tokenize($path, '.', '{', '}'); } elseif (is_string($path)) { $path = explode('.', $path); } diff --git a/lib/Cake/Utility/String.php b/lib/Cake/Utility/String.php index 42b8aab6d36..bacb45f4140 100644 --- a/lib/Cake/Utility/String.php +++ b/lib/Cake/Utility/String.php @@ -15,695 +15,13 @@ * @since CakePHP(tm) v 1.2.0.5551 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ +App::uses('CakeText', 'Utility'); /** * String handling methods. * - * @package Cake.Utility - */ -class String { - -/** - * Generate a random UUID - * - * @see http://www.ietf.org/rfc/rfc4122.txt - * @return RFC 4122 UUID - */ - public static function uuid() { - $node = env('SERVER_ADDR'); - - if (strpos($node, ':') !== false) { - if (substr_count($node, '::')) { - $node = str_replace( - '::', str_repeat(':0000', 8 - substr_count($node, ':')) . ':', $node - ); - } - $node = explode(':', $node); - $ipSix = ''; - - foreach ($node as $id) { - $ipSix .= str_pad(base_convert($id, 16, 2), 16, 0, STR_PAD_LEFT); - } - $node = base_convert($ipSix, 2, 10); - - if (strlen($node) < 38) { - $node = null; - } else { - $node = crc32($node); - } - } elseif (empty($node)) { - $host = env('HOSTNAME'); - - if (empty($host)) { - $host = env('HOST'); - } - - if (!empty($host)) { - $ip = gethostbyname($host); - - if ($ip === $host) { - $node = crc32($host); - } else { - $node = ip2long($ip); - } - } - } elseif ($node !== '127.0.0.1') { - $node = ip2long($node); - } else { - $node = null; - } - - if (empty($node)) { - $node = crc32(Configure::read('Security.salt')); - } - - if (function_exists('hphp_get_thread_id')) { - $pid = hphp_get_thread_id(); - } elseif (function_exists('zend_thread_id')) { - $pid = zend_thread_id(); - } else { - $pid = getmypid(); - } - - if (!$pid || $pid > 65535) { - $pid = mt_rand(0, 0xfff) | 0x4000; - } - - list($timeMid, $timeLow) = explode(' ', microtime()); - return sprintf( - "%08x-%04x-%04x-%02x%02x-%04x%08x", (int)$timeLow, (int)substr($timeMid, 2) & 0xffff, - mt_rand(0, 0xfff) | 0x4000, mt_rand(0, 0x3f) | 0x80, mt_rand(0, 0xff), $pid, $node - ); - } - -/** - * Tokenizes a string using $separator, ignoring any instance of $separator that appears between - * $leftBound and $rightBound. - * - * @param string $data The data to tokenize. - * @param string $separator The token to split the data on. - * @param string $leftBound The left boundary to ignore separators in. - * @param string $rightBound The right boundary to ignore separators in. - * @return mixed Array of tokens in $data or original input if empty. - */ - public static function tokenize($data, $separator = ',', $leftBound = '(', $rightBound = ')') { - if (empty($data)) { - return array(); - } - - $depth = 0; - $offset = 0; - $buffer = ''; - $results = array(); - $length = strlen($data); - $open = false; - - while ($offset <= $length) { - $tmpOffset = -1; - $offsets = array( - strpos($data, $separator, $offset), - strpos($data, $leftBound, $offset), - strpos($data, $rightBound, $offset) - ); - for ($i = 0; $i < 3; $i++) { - if ($offsets[$i] !== false && ($offsets[$i] < $tmpOffset || $tmpOffset == -1)) { - $tmpOffset = $offsets[$i]; - } - } - if ($tmpOffset !== -1) { - $buffer .= substr($data, $offset, ($tmpOffset - $offset)); - if (!$depth && $data{$tmpOffset} === $separator) { - $results[] = $buffer; - $buffer = ''; - } else { - $buffer .= $data{$tmpOffset}; - } - if ($leftBound !== $rightBound) { - if ($data{$tmpOffset} === $leftBound) { - $depth++; - } - if ($data{$tmpOffset} === $rightBound) { - $depth--; - } - } else { - if ($data{$tmpOffset} === $leftBound) { - if (!$open) { - $depth++; - $open = true; - } else { - $depth--; - } - } - } - $offset = ++$tmpOffset; - } else { - $results[] = $buffer . substr($data, $offset); - $offset = $length + 1; - } - } - if (empty($results) && !empty($buffer)) { - $results[] = $buffer; - } - - if (!empty($results)) { - return array_map('trim', $results); - } - - return array(); - } - -/** - * Replaces variable placeholders inside a $str with any given $data. Each key in the $data array - * corresponds to a variable placeholder name in $str. - * Example: `String::insert(':name is :age years old.', array('name' => 'Bob', '65'));` - * Returns: Bob is 65 years old. - * - * Available $options are: - * - * - before: The character or string in front of the name of the variable placeholder (Defaults to `:`) - * - after: The character or string after the name of the variable placeholder (Defaults to null) - * - escape: The character or string used to escape the before character / string (Defaults to `\`) - * - format: A regex to use for matching variable placeholders. Default is: `/(? val array where each key stands for a placeholder variable name - * to be replaced with val - * @param array $options An array of options, see description above - * @return string - */ - public static function insert($str, $data, $options = array()) { - $defaults = array( - 'before' => ':', 'after' => null, 'escape' => '\\', 'format' => null, 'clean' => false - ); - $options += $defaults; - $format = $options['format']; - $data = (array)$data; - if (empty($data)) { - return ($options['clean']) ? String::cleanInsert($str, $options) : $str; - } - - if (!isset($format)) { - $format = sprintf( - '/(? $hashVal) { - $key = sprintf($format, preg_quote($key, '/')); - $str = preg_replace($key, $hashVal, $str); - } - $dataReplacements = array_combine($hashKeys, array_values($data)); - foreach ($dataReplacements as $tmpHash => $tmpValue) { - $tmpValue = (is_array($tmpValue)) ? '' : $tmpValue; - $str = str_replace($tmpHash, $tmpValue, $str); - } - - if (!isset($options['format']) && isset($options['before'])) { - $str = str_replace($options['escape'] . $options['before'], $options['before'], $str); - } - return ($options['clean']) ? String::cleanInsert($str, $options) : $str; - } - -/** - * Cleans up a String::insert() formatted string with given $options depending on the 'clean' key in - * $options. The default method used is text but html is also available. The goal of this function - * is to replace all whitespace and unneeded markup around placeholders that did not get replaced - * by String::insert(). - * - * @param string $str String to clean. - * @param array $options Options list. - * @return string - * @see String::insert() - */ - public static function cleanInsert($str, $options) { - $clean = $options['clean']; - if (!$clean) { - return $str; - } - if ($clean === true) { - $clean = array('method' => 'text'); - } - if (!is_array($clean)) { - $clean = array('method' => $options['clean']); - } - switch ($clean['method']) { - case 'html': - $clean = array_merge(array( - 'word' => '[\w,.]+', - 'andText' => true, - 'replacement' => '', - ), $clean); - $kleenex = sprintf( - '/[\s]*[a-z]+=(")(%s%s%s[\s]*)+\\1/i', - preg_quote($options['before'], '/'), - $clean['word'], - preg_quote($options['after'], '/') - ); - $str = preg_replace($kleenex, $clean['replacement'], $str); - if ($clean['andText']) { - $options['clean'] = array('method' => 'text'); - $str = String::cleanInsert($str, $options); - } - break; - case 'text': - $clean = array_merge(array( - 'word' => '[\w,.]+', - 'gap' => '[\s]*(?:(?:and|or)[\s]*)?', - 'replacement' => '', - ), $clean); - - $kleenex = sprintf( - '/(%s%s%s%s|%s%s%s%s)/', - preg_quote($options['before'], '/'), - $clean['word'], - preg_quote($options['after'], '/'), - $clean['gap'], - $clean['gap'], - preg_quote($options['before'], '/'), - $clean['word'], - preg_quote($options['after'], '/') - ); - $str = preg_replace($kleenex, $clean['replacement'], $str); - break; - } - return $str; - } - -/** - * Wraps text to a specific width, can optionally wrap at word breaks. - * - * ### Options - * - * - `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 The text to format. - * @param array|int $options Array of options to use, or an integer to wrap the text to. - * @return string Formatted text. - */ - public static function wrap($text, $options = array()) { - if (is_numeric($options)) { - $options = array('width' => $options); - } - $options += array('width' => 72, 'wordWrap' => true, 'indent' => null, 'indentAt' => 0); - if ($options['wordWrap']) { - $wrapped = self::wordWrap($text, $options['width'], "\n"); - } else { - $wrapped = trim(chunk_split($text, $options['width'] - 1, "\n")); - } - if (!empty($options['indent'])) { - $chunks = explode("\n", $wrapped); - for ($i = $options['indentAt'], $len = count($chunks); $i < $len; $i++) { - $chunks[$i] = $options['indent'] . $chunks[$i]; - } - $wrapped = implode("\n", $chunks); - } - return $wrapped; - } - -/** - * Unicode and newline aware version of wordwrap. - * - * @param string $text The text to format. - * @param int $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 bool $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) { - $paragraphs = explode($break, $text); - foreach ($paragraphs as &$paragraph) { - $paragraph = String::_wordWrap($paragraph, $width, $break, $cut); - } - return implode($break, $paragraphs); - } - -/** - * Unicode aware version of wordwrap as helper method. - * - * @param string $text The text to format. - * @param int $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 bool $cut If the cut is set to true, the string is always wrapped at the specified width. - * @return string Formatted text. - */ - protected 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. - * - * ### Options: - * - * - `format` The piece of html with that the phrase will be highlighted - * - `html` If true, will ignore any HTML tags, ensuring that only the correct text is highlighted - * - `regex` a custom regex rule that is used to match words, default is '|$tag|iu' - * - * @param string $text Text to search the phrase in. - * @param string|array $phrase The phrase or phrases that will be searched. - * @param array $options An array of html attributes and options. - * @return string The highlighted text - * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::highlight - */ - public static function highlight($text, $phrase, $options = array()) { - if (empty($phrase)) { - return $text; - } - - $defaults = array( - 'format' => '\1', - 'html' => false, - 'regex' => "|%s|iu" - ); - $options += $defaults; - extract($options); - - if (is_array($phrase)) { - $replace = array(); - $with = array(); - - foreach ($phrase as $key => $segment) { - $segment = '(' . preg_quote($segment, '|') . ')'; - if ($html) { - $segment = "(?![^<]+>)$segment(?![^<]+>)"; - } - - $with[] = (is_array($format)) ? $format[$key] : $format; - $replace[] = sprintf($options['regex'], $segment); - } - - return preg_replace($replace, $with, $text); - } - - $phrase = '(' . preg_quote($phrase, '|') . ')'; - if ($html) { - $phrase = "(?![^<]+>)$phrase(?![^<]+>)"; - } - - return preg_replace(sprintf($options['regex'], $phrase), $format, $text); - } - -/** - * Strips given text of all links (]+>|im', '', preg_replace('|<\/a>|im', '', $text)); - } - -/** - * Truncates text starting from the end. - * - * Cuts a string to the length of $length and replaces the first characters - * with the ellipsis if the text is longer than length. - * - * ### Options: - * - * - `ellipsis` Will be used as Beginning and prepended to the trimmed string - * - `exact` If false, $text will not be cut mid-word - * - * @param string $text String to truncate. - * @param int $length Length of returned string, including ellipsis. - * @param array $options An array of options. - * @return string Trimmed string. - */ - public static function tail($text, $length = 100, $options = array()) { - $defaults = array( - 'ellipsis' => '...', 'exact' => true - ); - $options += $defaults; - extract($options); - - if (!function_exists('mb_strlen')) { - class_exists('Multibyte'); - } - - if (mb_strlen($text) <= $length) { - return $text; - } - - $truncate = mb_substr($text, mb_strlen($text) - $length + mb_strlen($ellipsis)); - if (!$exact) { - $spacepos = mb_strpos($truncate, ' '); - $truncate = $spacepos === false ? '' : trim(mb_substr($truncate, $spacepos)); - } - - return $ellipsis . $truncate; - } - -/** - * Truncates text. - * - * Cuts a string to the length of $length and replaces the last characters - * with the ellipsis if the text is longer than length. - * - * ### Options: - * - * - `ellipsis` Will be used as Ending and appended to the trimmed string (`ending` is deprecated) - * - `exact` If false, $text will not be cut mid-word - * - `html` If true, HTML tags would be handled correctly - * - * @param string $text String to truncate. - * @param int $length Length of returned string, including ellipsis. - * @param array $options An array of html attributes and options. - * @return string Trimmed string. - * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::truncate + * @package Cake.Utility + * @deprecated 3.0.0 Deprecated since version 2.7, use CakeText class instead. */ - public static function truncate($text, $length = 100, $options = array()) { - $defaults = array( - 'ellipsis' => '...', 'exact' => true, 'html' => false - ); - if (isset($options['ending'])) { - $defaults['ellipsis'] = $options['ending']; - } elseif (!empty($options['html']) && Configure::read('App.encoding') === 'UTF-8') { - $defaults['ellipsis'] = "\xe2\x80\xa6"; - } - $options += $defaults; - extract($options); - - if (!function_exists('mb_strlen')) { - class_exists('Multibyte'); - } - - if ($html) { - if (mb_strlen(preg_replace('/<.*?>/', '', $text)) <= $length) { - return $text; - } - $totalLength = mb_strlen(strip_tags($ellipsis)); - $openTags = array(); - $truncate = ''; - - preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER); - foreach ($tags as $tag) { - if (!preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/s', $tag[2])) { - if (preg_match('/<[\w]+[^>]*>/s', $tag[0])) { - array_unshift($openTags, $tag[2]); - } elseif (preg_match('/<\/([\w]+)[^>]*>/s', $tag[0], $closeTag)) { - $pos = array_search($closeTag[1], $openTags); - if ($pos !== false) { - array_splice($openTags, $pos, 1); - } - } - } - $truncate .= $tag[1]; - - $contentLength = mb_strlen(preg_replace('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i', ' ', $tag[3])); - if ($contentLength + $totalLength > $length) { - $left = $length - $totalLength; - $entitiesLength = 0; - if (preg_match_all('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i', $tag[3], $entities, PREG_OFFSET_CAPTURE)) { - foreach ($entities[0] as $entity) { - if ($entity[1] + 1 - $entitiesLength <= $left) { - $left--; - $entitiesLength += mb_strlen($entity[0]); - } else { - break; - } - } - } - - $truncate .= mb_substr($tag[3], 0, $left + $entitiesLength); - break; - } else { - $truncate .= $tag[3]; - $totalLength += $contentLength; - } - if ($totalLength >= $length) { - break; - } - } - } else { - if (mb_strlen($text) <= $length) { - return $text; - } - $truncate = mb_substr($text, 0, $length - mb_strlen($ellipsis)); - } - if (!$exact) { - $spacepos = mb_strrpos($truncate, ' '); - if ($html) { - $truncateCheck = mb_substr($truncate, 0, $spacepos); - $lastOpenTag = mb_strrpos($truncateCheck, '<'); - $lastCloseTag = mb_strrpos($truncateCheck, '>'); - if ($lastOpenTag > $lastCloseTag) { - preg_match_all('/<[\w]+[^>]*>/s', $truncate, $lastTagMatches); - $lastTag = array_pop($lastTagMatches[0]); - $spacepos = mb_strrpos($truncate, $lastTag) + mb_strlen($lastTag); - } - $bits = mb_substr($truncate, $spacepos); - preg_match_all('/<\/([a-z]+)>/', $bits, $droppedTags, PREG_SET_ORDER); - if (!empty($droppedTags)) { - if (!empty($openTags)) { - foreach ($droppedTags as $closingTag) { - if (!in_array($closingTag[1], $openTags)) { - array_unshift($openTags, $closingTag[1]); - } - } - } else { - foreach ($droppedTags as $closingTag) { - $openTags[] = $closingTag[1]; - } - } - } - } - $truncate = mb_substr($truncate, 0, $spacepos); - } - $truncate .= $ellipsis; - - if ($html) { - foreach ($openTags as $tag) { - $truncate .= ''; - } - } - - return $truncate; - } - -/** - * Extracts an excerpt from the text surrounding the phrase with a number of characters on each side - * determined by radius. - * - * @param string $text String to search the phrase in - * @param string $phrase Phrase that will be searched for - * @param int $radius The amount of characters that will be returned on each side of the founded phrase - * @param string $ellipsis Ending that will be appended - * @return string Modified string - * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::excerpt - */ - public static function excerpt($text, $phrase, $radius = 100, $ellipsis = '...') { - if (empty($text) || empty($phrase)) { - return self::truncate($text, $radius * 2, array('ellipsis' => $ellipsis)); - } - - $append = $prepend = $ellipsis; - - $phraseLen = mb_strlen($phrase); - $textLen = mb_strlen($text); - - $pos = mb_strpos(mb_strtolower($text), mb_strtolower($phrase)); - if ($pos === false) { - return mb_substr($text, 0, $radius) . $ellipsis; - } - - $startPos = $pos - $radius; - if ($startPos <= 0) { - $startPos = 0; - $prepend = ''; - } - - $endPos = $pos + $phraseLen + $radius; - if ($endPos >= $textLen) { - $endPos = $textLen; - $append = ''; - } - - $excerpt = mb_substr($text, $startPos, $endPos - $startPos); - $excerpt = $prepend . $excerpt . $append; - - return $excerpt; - } - -/** - * Creates a comma separated list where the last two items are joined with 'and', forming natural language. - * - * @param array $list The list to be joined. - * @param string $and The word used to join the last and second last items together with. Defaults to 'and'. - * @param string $separator The separator used to join all the other items together. Defaults to ', '. - * @return string The glued together string. - * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::toList - */ - public static function toList($list, $and = null, $separator = ', ') { - if ($and === null) { - $and = __d('cake', 'and'); - } - if (count($list) > 1) { - return implode($separator, array_slice($list, null, -1)) . ' ' . $and . ' ' . array_pop($list); - } - - return array_pop($list); - } +class String extends CakeText { } diff --git a/lib/Cake/Utility/Validation.php b/lib/Cake/Utility/Validation.php index a2243694d16..40449ab0d4f 100644 --- a/lib/Cake/Utility/Validation.php +++ b/lib/Cake/Utility/Validation.php @@ -48,6 +48,19 @@ class Validation { */ public static $errors = array(); +/** + * Backwards compatibility wrapper for Validation::notBlank(). + * + * @param string|array $check Value to check. + * @return bool Success. + * @deprecated 2.7.0 Use Validation::notBlank() instead. + * @see Validation::notBlank() + */ + public static function notEmpty($check) { + trigger_error('Validation::notEmpty() is deprecated. Use Validation::notBlank() instead.', E_USER_DEPRECATED); + return static::notBlank($check); + } + /** * Checks that a string contains something other than whitespace * @@ -59,15 +72,15 @@ class Validation { * @param string|array $check Value to check * @return bool Success */ - public static function notEmpty($check) { + public static function notBlank($check) { if (is_array($check)) { - extract(self::_defaults($check)); + extract(static::_defaults($check)); } - if (empty($check) && $check != '0') { + if (empty($check) && (string)$check !== '0') { return false; } - return self::_check($check, '/[^\s]+/m'); + return static::_check($check, '/[^\s]+/m'); } /** @@ -83,13 +96,13 @@ public static function notEmpty($check) { */ public static function alphaNumeric($check) { if (is_array($check)) { - extract(self::_defaults($check)); + extract(static::_defaults($check)); } if (empty($check) && $check != '0') { return false; } - return self::_check($check, '/^[\p{Ll}\p{Lm}\p{Lo}\p{Lt}\p{Lu}\p{Nd}]+$/Du'); + return static::_check($check, '/^[\p{Ll}\p{Lm}\p{Lo}\p{Lt}\p{Lu}\p{Nd}]+$/Du'); } /** @@ -118,7 +131,7 @@ public static function lengthBetween($check, $min, $max) { * @deprecated Deprecated 2.6. Use Validator::lengthBetween() instead. */ public static function between($check, $min, $max) { - return self::lengthBetween($check, $min, $max); + return static::lengthBetween($check, $min, $max); } /** @@ -133,9 +146,9 @@ public static function between($check, $min, $max) { */ public static function blank($check) { if (is_array($check)) { - extract(self::_defaults($check)); + extract(static::_defaults($check)); } - return !self::_check($check, '/[^\\s]/'); + return !static::_check($check, '/[^\\s]/'); } /** @@ -143,7 +156,7 @@ public static function blank($check) { * Returns true if $check is in the proper credit card format. * * @param string|array $check credit card number to validate - * @param string|array $type 'all' may be passed as a sting, defaults to fast which checks format of most major credit + * @param string|array $type 'all' may be passed as a sting, defaults to fast which checks format of most major credit * cards * if an array is used only the values of the array are checked. * Example: array('amex', 'bankcard', 'maestro') @@ -154,7 +167,7 @@ public static function blank($check) { */ public static function cc($check, $type = 'fast', $deep = false, $regex = null) { if (is_array($check)) { - extract(self::_defaults($check)); + extract(static::_defaults($check)); } $check = str_replace(array('-', ' '), '', $check); @@ -163,8 +176,8 @@ public static function cc($check, $type = 'fast', $deep = false, $regex = null) } if ($regex !== null) { - if (self::_check($check, $regex)) { - return self::luhn($check, $deep); + if (static::_check($check, $regex)) { + return static::luhn($check, $deep); } } $cards = array( @@ -192,23 +205,23 @@ public static function cc($check, $type = 'fast', $deep = false, $regex = null) foreach ($type as $value) { $regex = $cards['all'][strtolower($value)]; - if (self::_check($check, $regex)) { - return self::luhn($check, $deep); + if (static::_check($check, $regex)) { + return static::luhn($check, $deep); } } } elseif ($type === 'all') { foreach ($cards['all'] as $value) { $regex = $value; - if (self::_check($check, $regex)) { - return self::luhn($check, $deep); + if (static::_check($check, $regex)) { + return static::luhn($check, $deep); } } } else { $regex = $cards['fast']; - if (self::_check($check, $regex)) { - return self::luhn($check, $deep); + if (static::_check($check, $regex)) { + return static::luhn($check, $deep); } } return false; @@ -229,6 +242,10 @@ public static function comparison($check1, $operator = null, $check2 = null) { if (is_array($check1)) { extract($check1, EXTR_OVERWRITE); } + + if ((float)$check1 != $check1) { + return false; + } $operator = str_replace(array(' ', "\t", "\n", "\r", "\0", "\x0B"), '', strtolower($operator)); switch ($operator) { @@ -269,7 +286,7 @@ public static function comparison($check1, $operator = null, $check2 = null) { } break; default: - self::$errors[] = __d('cake_dev', 'You must define the $operator parameter for %s', 'Validation::comparison()'); + static::$errors[] = __d('cake_dev', 'You must define the $operator parameter for %s', 'Validation::comparison()'); } return false; } @@ -284,13 +301,13 @@ public static function comparison($check1, $operator = null, $check2 = null) { */ public static function custom($check, $regex = null) { if (is_array($check)) { - extract(self::_defaults($check)); + extract(static::_defaults($check)); } if ($regex === null) { - self::$errors[] = __d('cake_dev', 'You must define a regular expression for %s', 'Validation::custom()'); + static::$errors[] = __d('cake_dev', 'You must define a regular expression for %s', 'Validation::custom()'); return false; } - return self::_check($check, $regex); + return static::_check($check, $regex); } /** @@ -319,7 +336,7 @@ public static function custom($check, $regex = null) { */ public static function date($check, $format = 'ymd', $regex = null) { if ($regex !== null) { - return self::_check($check, $regex); + return static::_check($check, $regex); } $month = '(0[123456789]|10|11|12)'; $separator = '([- /.])'; @@ -353,7 +370,7 @@ public static function date($check, $format = 'ymd', $regex = null) { $format = (is_array($format)) ? array_values($format) : array($format); foreach ($format as $key) { - if (self::_check($check, $regex[$key]) === true) { + if (static::_check($check, $regex[$key]) === true) { return true; } } @@ -378,7 +395,7 @@ public static function datetime($check, $dateFormat = 'ymd', $regex = null) { if (!empty($parts) && count($parts) > 1) { $time = array_pop($parts); $date = implode(' ', $parts); - $valid = self::date($date, $dateFormat, $regex) && self::time($time); + $valid = static::date($date, $dateFormat, $regex) && static::time($time); } return $valid; } @@ -392,7 +409,7 @@ public static function datetime($check, $dateFormat = 'ymd', $regex = null) { * @return bool Success */ public static function time($check) { - return self::_check($check, '%^((0?[1-9]|1[012])(:[0-5]\d){0,2} ?([AP]M|[ap]m))$|^([01]\d|2[0-3])(:[0-5]\d){0,2}$%'); + return static::_check($check, '%^((0?[1-9]|1[012])(:[0-5]\d){0,2} ?([AP]M|[ap]m))$|^([01]\d|2[0-3])(:[0-5]\d){0,2}$%'); } /** @@ -448,14 +465,14 @@ public static function decimal($check, $places = null, $regex = null) { $check = str_replace($data['thousands_sep'], '', $check); $check = str_replace($data['decimal_point'], '.', $check); - return self::_check($check, $regex); + return static::_check($check, $regex); } /** * 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 @@ -464,18 +481,18 @@ public static function decimal($check, $places = null, $regex = null) { */ public static function email($check, $deep = false, $regex = null) { if (is_array($check)) { - extract(self::_defaults($check)); + extract(static::_defaults($check)); } if ($regex === null) { - $regex = '/^[\p{L}0-9!#$%&\'*+\/=?^_`{|}~-]+(?:\.[\p{L}0-9!#$%&\'*+\/=?^_`{|}~-]+)*@' . self::$_pattern['hostname'] . '$/ui'; + $regex = '/^[\p{L}0-9!#$%&\'*+\/=?^_`{|}~-]+(?:\.[\p{L}0-9!#$%&\'*+\/=?^_`{|}~-]+)*@' . static::$_pattern['hostname'] . '$/ui'; } - $return = self::_check($check, $regex); + $return = static::_check($check, $regex); if ($deep === false || $deep === null) { return $return; } - if ($return === true && preg_match('/@(' . self::$_pattern['hostname'] . ')$/i', $check, $regs)) { + if ($return === true && preg_match('/@(' . static::$_pattern['hostname'] . ')$/i', $check, $regs)) { if (function_exists('getmxrr') && getmxrr($regs[1], $mxhosts)) { return true; } @@ -507,7 +524,7 @@ public static function equalTo($check, $comparedTo) { */ public static function extension($check, $extensions = array('gif', 'jpeg', 'png', 'jpg')) { if (is_array($check)) { - return self::extension(array_shift($check), $extensions); + return static::extension(array_shift($check), $extensions); } $extension = strtolower(pathinfo($check, PATHINFO_EXTENSION)); foreach ($extensions as $value) { @@ -573,7 +590,7 @@ public static function money($check, $symbolPosition = 'left') { } else { $regex = '/^(?!\x{00a2})\p{Sc}?' . $money . '$/u'; } - return self::_check($check, $regex); + return static::_check($check, $regex); } /** @@ -594,7 +611,7 @@ public static function multiple($check, $options = array(), $caseInsensitive = f $defaults = array('in' => null, 'max' => null, 'min' => null); $options += $defaults; - $check = array_filter((array)$check); + $check = array_filter((array)$check, 'strlen'); if (empty($check)) { return false; } @@ -641,7 +658,7 @@ public static function numeric($check) { */ public static function naturalNumber($check, $allowZero = false) { $regex = $allowZero ? '/^(?:0|[1-9][0-9]*)$/' : '/^[1-9][0-9]*$/'; - return self::_check($check, $regex); + return static::_check($check, $regex); } /** @@ -654,7 +671,7 @@ public static function naturalNumber($check, $allowZero = false) { */ public static function phone($check, $regex = null, $country = 'all') { if (is_array($check)) { - extract(self::_defaults($check)); + extract(static::_defaults($check)); } if ($regex === null) { @@ -684,9 +701,9 @@ public static function phone($check, $regex = null, $country = 'all') { } } if (empty($regex)) { - return self::_pass('phone', $check, $country); + return static::_pass('phone', $check, $country); } - return self::_check($check, $regex); + return static::_check($check, $regex); } /** @@ -699,7 +716,7 @@ public static function phone($check, $regex = null, $country = 'all') { */ public static function postal($check, $regex = null, $country = 'us') { if (is_array($check)) { - extract(self::_defaults($check)); + extract(static::_defaults($check)); } if ($regex === null) { @@ -725,9 +742,9 @@ public static function postal($check, $regex = null, $country = 'us') { } } if (empty($regex)) { - return self::_pass('postal', $check, $country); + return static::_pass('postal', $check, $country); } - return self::_check($check, $regex); + return static::_check($check, $regex); } /** @@ -744,6 +761,9 @@ public static function range($check, $lower = null, $upper = null) { if (!is_numeric($check)) { return false; } + if ((float)$check != $check) { + return false; + } if (isset($lower) && isset($upper)) { return ($check > $lower && $check < $upper); } @@ -761,7 +781,7 @@ public static function range($check, $lower = null, $upper = null) { */ public static function ssn($check, $regex = null, $country = null) { if (is_array($check)) { - extract(self::_defaults($check)); + extract(static::_defaults($check)); } if ($regex === null) { @@ -778,9 +798,9 @@ public static function ssn($check, $regex = null, $country = null) { } } if (empty($regex)) { - return self::_pass('ssn', $check, $country); + return static::_pass('ssn', $check, $country); } - return self::_check($check, $regex); + return static::_check($check, $regex); } /** @@ -801,14 +821,14 @@ public static function ssn($check, $regex = null, $country = null) { * @return bool Success */ public static function url($check, $strict = false) { - self::_populateIp(); + static::_populateIp(); $validChars = '([' . preg_quote('!"$&\'()*+,-.@_:;=~[]') . '\/0-9\p{L}\p{N}]|(%[0-9a-f]{2}))'; $regex = '/^(?:(?:https?|ftps?|sftp|file|news|gopher):\/\/)' . (!empty($strict) ? '' : '?') . - '(?:' . self::$_pattern['IPv4'] . '|\[' . self::$_pattern['IPv6'] . '\]|' . self::$_pattern['hostname'] . ')(?::[1-9][0-9]{0,4})?' . + '(?:' . static::$_pattern['IPv4'] . '|\[' . static::$_pattern['IPv6'] . '\]|' . static::$_pattern['hostname'] . ')(?::[1-9][0-9]{0,4})?' . '(?:\/?|\/' . $validChars . '*)?' . '(?:\?' . $validChars . '*)?' . '(?:#' . $validChars . '*)?$/iu'; - return self::_check($check, $regex); + return static::_check($check, $regex); } /** @@ -850,7 +870,7 @@ public static function userDefined($check, $object, $method, $args = null) { */ public static function uuid($check) { $regex = '/^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[0-5][a-fA-F0-9]{3}-[089aAbB][a-fA-F0-9]{3}-[a-fA-F0-9]{12}$/'; - return self::_check($check, $regex); + return static::_check($check, $regex); } /** @@ -899,7 +919,7 @@ protected static function _check($check, $regex) { * @return void */ protected static function _defaults($params) { - self::_reset(); + static::_reset(); $defaults = array( 'check' => null, 'regex' => null, @@ -924,7 +944,7 @@ protected static function _defaults($params) { */ public static function luhn($check, $deep = false) { if (is_array($check)) { - extract(self::_defaults($check)); + extract(static::_defaults($check)); } if ($deep !== true) { return true; @@ -968,7 +988,7 @@ public static function mimeType($check, $mimeTypes = array()) { } if (is_string($mimeTypes)) { - return self::_check($mime, $mimeTypes); + return static::_check($mime, $mimeTypes); } foreach ($mimeTypes as $key => $val) { @@ -995,7 +1015,7 @@ public static function fileSize($check, $operator = null, $size = null) { } $filesize = filesize($check); - return self::comparison($filesize, $operator, $size); + return static::comparison($filesize, $operator, $size); } /** @@ -1019,7 +1039,7 @@ public static function uploadError($check) { * @return void */ protected static function _populateIp() { - if (!isset(self::$_pattern['IPv6'])) { + if (!isset(static::$_pattern['IPv6'])) { $pattern = '((([0-9A-Fa-f]{1,4}:){7}(([0-9A-Fa-f]{1,4})|:))|(([0-9A-Fa-f]{1,4}:){6}'; $pattern .= '(:|((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})'; $pattern .= '|(:[0-9A-Fa-f]{1,4})))|(([0-9A-Fa-f]{1,4}:){5}((:((25[0-5]|2[0-4]\d|[01]?\d{1,2})'; @@ -1035,11 +1055,11 @@ protected static function _populateIp() { $pattern .= '\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|((:[0-9A-Fa-f]{1,4})'; $pattern .= '{1,2})))|(((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})))(%.+)?'; - self::$_pattern['IPv6'] = $pattern; + static::$_pattern['IPv6'] = $pattern; } - if (!isset(self::$_pattern['IPv4'])) { + if (!isset(static::$_pattern['IPv4'])) { $pattern = '(?:(?:25[0-5]|2[0-4][0-9]|(?:(?:1[0-9])?|[1-9]?)[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|(?:(?:1[0-9])?|[1-9]?)[0-9])'; - self::$_pattern['IPv4'] = $pattern; + static::$_pattern['IPv4'] = $pattern; } } @@ -1049,7 +1069,7 @@ protected static function _populateIp() { * @return void */ protected static function _reset() { - self::$errors = array(); + static::$errors = array(); } } diff --git a/lib/Cake/Utility/Xml.php b/lib/Cake/Utility/Xml.php index e3bb4282da4..95bb4659e14 100644 --- a/lib/Cake/Utility/Xml.php +++ b/lib/Cake/Utility/Xml.php @@ -77,6 +77,9 @@ class Xml { * - `return` Can be 'simplexml' to return object of SimpleXMLElement or 'domdocument' to return DOMDocument. * - `loadEntities` Defaults to false. Set to true to enable loading of ` 'simplexml', 'loadEntities' => false, + 'readFile' => true ); $options += $defaults; if (is_array($input) || is_object($input)) { - return self::fromArray((array)$input, $options); + return static::fromArray((array)$input, $options); } elseif (strpos($input, '<') !== false) { - return self::_loadXml($input, $options); - } elseif (file_exists($input)) { - return self::_loadXml(file_get_contents($input), $options); - } elseif (strpos($input, 'http://') === 0 || strpos($input, 'https://') === 0) { + return static::_loadXml($input, $options); + } elseif ($options['readFile'] && file_exists($input)) { + return static::_loadXml(file_get_contents($input), $options); + } elseif ($options['readFile'] && strpos($input, 'http://') === 0 || strpos($input, 'https://') === 0) { try { $socket = new HttpSocket(array('request' => array('redirect' => 10))); $response = $socket->get($input); if (!$response->isOk()) { throw new XmlException(__d('cake_dev', 'XML cannot be read.')); } - return self::_loadXml($response->body, $options); + return static::_loadXml($response->body, $options); } catch (SocketException $e) { throw new XmlException(__d('cake_dev', 'XML cannot be read.')); } @@ -156,7 +160,7 @@ protected static function _loadXml($input, $options) { * * ### Options * - * - `format` If create childs ('tags') or attributes ('attribute'). + * - `format` If create childs ('tags') or attributes ('attributes'). * - `pretty` Returns formatted Xml when set to `true`. Defaults to `false` * - `version` Version of XML document. Default is 1.0. * - `encoding` Encoding of XML document. If null remove from XML header. Default is the some of application. @@ -180,7 +184,7 @@ protected static function _loadXml($input, $options) { * * `1 defect descriptiondescription : ' . h($pluginDot . $class) . ''); ?> - +
@@ -29,4 +29,6 @@ $pluginDot = empty($plugin) ? null : $plugin . '.'; -element('exception_stack_trace'); ?> +element('exception_stack_trace'); +?> diff --git a/lib/Cake/View/Errors/missing_datasource_config.ctp b/lib/Cake/View/Errors/missing_datasource_config.ctp index 0fe5929a67f..115bdc7ba1e 100644 --- a/lib/Cake/View/Errors/missing_datasource_config.ctp +++ b/lib/Cake/View/Errors/missing_datasource_config.ctp @@ -24,4 +24,6 @@ -element('exception_stack_trace'); ?> +element('exception_stack_trace'); +?> diff --git a/lib/Cake/View/Errors/missing_helper.ctp b/lib/Cake/View/Errors/missing_helper.ctp index 93fa54ed239..6e2dc0d679e 100644 --- a/lib/Cake/View/Errors/missing_helper.ctp +++ b/lib/Cake/View/Errors/missing_helper.ctp @@ -36,4 +36,6 @@ class extends AppHelper { -element('exception_stack_trace'); ?> +element('exception_stack_trace'); +?> diff --git a/lib/Cake/View/Errors/missing_layout.ctp b/lib/Cake/View/Errors/missing_layout.ctp index b8c5d81cf50..cf1b53e10ab 100644 --- a/lib/Cake/View/Errors/missing_layout.ctp +++ b/lib/Cake/View/Errors/missing_layout.ctp @@ -41,4 +41,6 @@ -element('exception_stack_trace'); ?> +element('exception_stack_trace'); +?> diff --git a/lib/Cake/View/Errors/missing_plugin.ctp b/lib/Cake/View/Errors/missing_plugin.ctp index 0d5592e71aa..3e7b4d1c3e4 100644 --- a/lib/Cake/View/Errors/missing_plugin.ctp +++ b/lib/Cake/View/Errors/missing_plugin.ctp @@ -40,4 +40,6 @@ CakePlugin::loadAll(); -element('exception_stack_trace'); ?> +element('exception_stack_trace'); +?> diff --git a/lib/Cake/View/Errors/missing_table.ctp b/lib/Cake/View/Errors/missing_table.ctp index 7c308a864bb..5fcf2ac3222 100644 --- a/lib/Cake/View/Errors/missing_table.ctp +++ b/lib/Cake/View/Errors/missing_table.ctp @@ -17,11 +17,13 @@: - ' . h($table) . '', '' . h($class) . '', '' . h($ds) . ''); ?> + ' . h($table) . '', '' . h($class) . '', '' . h($ds) . ''); ?>
:
-element('exception_stack_trace'); ?> +element('exception_stack_trace'); +?> diff --git a/lib/Cake/View/Errors/missing_view.ctp b/lib/Cake/View/Errors/missing_view.ctp index b2579d57857..208afffe733 100644 --- a/lib/Cake/View/Errors/missing_view.ctp +++ b/lib/Cake/View/Errors/missing_view.ctp @@ -41,4 +41,6 @@ -element('exception_stack_trace'); ?> +element('exception_stack_trace'); +?> diff --git a/lib/Cake/View/Errors/pdo_error.ctp b/lib/Cake/View/Errors/pdo_error.ctp index b9c7a0ca350..2f8d4aa2b4e 100644 --- a/lib/Cake/View/Errors/pdo_error.ctp +++ b/lib/Cake/View/Errors/pdo_error.ctp @@ -33,4 +33,6 @@ : -element('exception_stack_trace'); ?> +element('exception_stack_trace'); +?> diff --git a/lib/Cake/View/Errors/private_action.ctp b/lib/Cake/View/Errors/private_action.ctp index 11a18a3b809..0fd18585591 100644 --- a/lib/Cake/View/Errors/private_action.ctp +++ b/lib/Cake/View/Errors/private_action.ctp @@ -24,4 +24,6 @@ -element('exception_stack_trace'); ?> +element('exception_stack_trace'); +?> diff --git a/lib/Cake/View/Errors/scaffold_error.ctp b/lib/Cake/View/Errors/scaffold_error.ctp index ce1eea8e677..9cfe10490ff 100644 --- a/lib/Cake/View/Errors/scaffold_error.ctp +++ b/lib/Cake/View/Errors/scaffold_error.ctp @@ -33,6 +33,6 @@ function _scaffoldError() {
element('exception_stack_trace'); + echo $this->element('exception_stack_trace'); } -?> +?> \ No newline at end of file diff --git a/lib/Cake/View/Helper.php b/lib/Cake/View/Helper.php index e91299e7390..35aefff4445 100644 --- a/lib/Cake/View/Helper.php +++ b/lib/Cake/View/Helper.php @@ -145,9 +145,48 @@ class Helper extends Object { * @var array */ protected $_minimizedAttributes = array( - 'compact', 'checked', 'declare', 'readonly', 'disabled', 'selected', - 'defer', 'ismap', 'nohref', 'noshade', 'nowrap', 'multiple', 'noresize', - 'autoplay', 'controls', 'loop', 'muted', 'required', 'novalidate', 'formnovalidate' + 'allowfullscreen', + 'async', + 'autofocus', + 'autoplay', + 'checked', + 'compact', + 'controls', + 'declare', + 'default', + 'defaultchecked', + 'defaultmuted', + 'defaultselected', + 'defer', + 'disabled', + 'enabled', + 'formnovalidate', + 'hidden', + 'indeterminate', + 'inert', + 'ismap', + 'itemscope', + 'loop', + 'multiple', + 'muted', + 'nohref', + 'noresize', + 'noshade', + 'novalidate', + 'nowrap', + 'open', + 'pauseonexit', + 'readonly', + 'required', + 'reversed', + 'scoped', + 'seamless', + 'selected', + 'sortable', + 'spellcheck', + 'truespeed', + 'typemustmatch', + 'visible' ); /** diff --git a/lib/Cake/View/Helper/CacheHelper.php b/lib/Cake/View/Helper/CacheHelper.php index a6c7f47e36d..ed5560a5251 100644 --- a/lib/Cake/View/Helper/CacheHelper.php +++ b/lib/Cake/View/Helper/CacheHelper.php @@ -271,8 +271,8 @@ protected function _parseOutput($cache) { * * @param string $content view content to write to a cache file. * @param string $timestamp Duration to set for cache file. - * @param bool $useCallbacks Whether to include statements in cached file which - * run callbacks. + * @param bool|null $useCallbacks Whether to include statements in cached file which + * run callbacks, otherwise null. * @return bool success of caching view. */ protected function _writeFile($content, $timestamp, $useCallbacks = false) { @@ -294,7 +294,7 @@ protected function _writeFile($content, $timestamp, $useCallbacks = false) { $cache = strtolower(Inflector::slug($path)); if (empty($cache)) { - return; + return null; } $cache = $cache . '.php'; $file = 'Flash->render('somekey'); + * Will default to flash if no param is passed + * + * You can pass additional information into the flash message generation. This allows you + * to consolidate all the parameters for a given type of flash message into the view. + * + * ``` + * echo $this->Flash->render('flash', array('params' => array('name' => $user['User']['name']))); + * ``` + * + * This would pass the current user's name into the flash message, so you could create personalized + * messages without the controller needing access to that data. + * + * Lastly you can choose the element that is used for rendering the flash message. Using + * custom elements allows you to fully customize how flash messages are generated. + * + * ``` + * echo $this->Flash->render('flash', array('element' => 'my_custom_element')); + * ``` + * + * If you want to use an element from a plugin for rendering your flash message + * you can use the dot notation for the plugin's element name: + * + * ``` + * echo $this->Flash->render('flash', array( + * 'element' => 'MyPlugin.my_custom_element', + * )); + * ``` + * + * @param string $key The [Message.]key you are rendering in the view. + * @param array $options Additional options to use for the creation of this flash message. + * Supports the 'params', and 'element' keys that are used in the helper. + * @return string|null Rendered flash message or null if flash key does not exist + * in session. + * @throws UnexpectedValueException If value for flash settings key is not an array. + */ + public function render($key = 'flash', $options = array()) { + if (!CakeSession::check("Message.$key")) { + return null; + } + + $flash = CakeSession::read("Message.$key"); + + if (!is_array($flash)) { + throw new UnexpectedValueException(sprintf( + 'Value for flash setting key "%s" must be an array.', + $key + )); + } + + $flash = $options + $flash; + CakeSession::delete("Message.$key"); + $flash['key'] = $key; + + return $this->_View->element($flash['element'], $flash); + } +} diff --git a/lib/Cake/View/Helper/FormHelper.php b/lib/Cake/View/Helper/FormHelper.php index ed614e8307a..4f56e515b54 100644 --- a/lib/Cake/View/Helper/FormHelper.php +++ b/lib/Cake/View/Helper/FormHelper.php @@ -203,7 +203,7 @@ protected function _getModel($model) { protected function _introspectModel($model, $key, $field = null) { $object = $this->_getModel($model); if (!$object) { - return; + return null; } if ($key === 'key') { @@ -408,7 +408,7 @@ public function create($model = null, $options = array()) { 'action' => $options['action'], ); $options['action'] = array_merge($actionDefaults, (array)$options['url']); - if (empty($options['action'][0]) && !empty($id)) { + if (!isset($options['action'][0]) && !empty($id)) { $options['action'][0] = $id; } } elseif (is_string($options['url'])) { @@ -428,7 +428,7 @@ public function create($model = null, $options = array()) { case 'delete': $append .= $this->hidden('_method', array( 'name' => '_method', 'value' => strtoupper($options['type']), 'id' => null, - 'secure' => self::SECURE_SKIP + 'secure' => static::SECURE_SKIP )); default: $htmlAttributes['method'] = 'post'; @@ -488,7 +488,7 @@ protected function _csrfField() { } return $this->hidden('_Token.key', array( 'value' => $this->request->params['_Token']['key'], 'id' => 'Token' . mt_rand(), - 'secure' => self::SECURE_SKIP + 'secure' => static::SECURE_SKIP )); } @@ -561,12 +561,12 @@ public function end($options = null, $secureAttributes = array()) { * generating the hash, else $this->fields is being used. * @param array $secureAttributes will be passed as html attributes into the hidden * input elements generated for the Security Component. - * @return string A hidden input field with a security hash + * @return string|null A hidden input field with a security hash, otherwise null. * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::secure */ public function secure($fields = array(), $secureAttributes = array()) { if (!isset($this->request['_Token']) || empty($this->request['_Token'])) { - return; + return null; } $locked = array(); $unlockedFields = $this->_unlockedFields; @@ -661,6 +661,8 @@ protected function _secure($lock, $field = null, $value = null) { if (!in_array($field, $this->fields)) { if ($value !== null) { return $this->fields[$field] = $value; + } elseif (isset($this->fields[$field]) && $value === null) { + unset($this->fields[$field]); } $this->fields[] = $field; } @@ -814,6 +816,10 @@ public function error($field, $text = null, $options = array()) { * * ``` * + * *Warning* Unlike most FormHelper methods, this method does not automatically + * escape the $text parameter. You must escape the $text parameter yourself if you + * are using user supplied data. + * * @param string $fieldName This should be "Modelname.fieldname" * @param string $text Text that will appear in the label field. If * $text is left undefined the text will be inflected from the @@ -1086,13 +1092,13 @@ protected function _getInput($args) { unset($options['options']); return $this->select($fieldName, $list, $options); case 'time': - $options['value'] = $selected; + $options += array('value' => $selected); return $this->dateTime($fieldName, null, $timeFormat, $options); case 'date': - $options['value'] = $selected; + $options += array('value' => $selected); return $this->dateTime($fieldName, $dateFormat, null, $options); case 'datetime': - $options['value'] = $selected; + $options += array('value' => $selected); return $this->dateTime($fieldName, $dateFormat, $timeFormat, $options); case 'textarea': return $this->textarea($fieldName, $options + array('cols' => '30', 'rows' => '6')); @@ -1287,12 +1293,13 @@ protected function _maxLength($options) { isset($fieldDef['length']) && is_scalar($fieldDef['length']) && $fieldDef['length'] < 1000000 && + $fieldDef['type'] !== 'decimal' && $options['type'] !== 'select' ); if ($autoLength && in_array($options['type'], array('text', 'textarea', 'email', 'tel', 'url', 'search')) ) { - $options['maxlength'] = $fieldDef['length']; + $options['maxlength'] = (int)$fieldDef['length']; } return $options; } @@ -1470,6 +1477,15 @@ public function checkbox($fieldName, $options = array()) { * Creates a set of radio widgets. Will create a legend and fieldset * by default. Use $options to control this * + * You can also customize each radio input element using an array of arrays: + * + * ``` + * $options = array( + * array('name' => 'United states', 'value' => 'US', 'title' => 'My title'), + * array('name' => 'Germany', 'value' => 'DE', 'class' => 'de-de', 'title' => 'Another title'), + * ); + * ``` + * * ### Attributes: * * - `separator` - define the string in between the radio buttons @@ -1552,6 +1568,15 @@ public function radio($fieldName, $options = array(), $attributes = array()) { $this->_domIdSuffixes = array(); foreach ($options as $optValue => $optTitle) { $optionsHere = array('value' => $optValue, 'disabled' => false); + if (is_array($optTitle)) { + if (isset($optTitle['value'])) { + $optionsHere['value'] = $optTitle['value']; + } + + $optionsHere += $optTitle; + $optTitle = $optionsHere['name']; + unset($optionsHere['name']); + } if (isset($value) && strval($optValue) === strval($value)) { $optionsHere['checked'] = 'checked'; @@ -1571,7 +1596,7 @@ public function radio($fieldName, $options = array(), $attributes = array()) { if (is_array($between)) { $optTitle .= array_shift($between); } - $allOptions = array_merge($attributes, $optionsHere); + $allOptions = $optionsHere + $attributes; $out[] = $this->Html->useTag('radio', $attributes['name'], $tagName, array_diff_key($allOptions, array('name' => null, 'type' => null, 'id' => null)), $optTitle @@ -1677,7 +1702,7 @@ public function hidden($fieldName, $options = array()) { unset($options['secure']); $options = $this->_initInputField($fieldName, array_merge( - $options, array('secure' => self::SECURE_SKIP) + $options, array('secure' => static::SECURE_SKIP) )); if ($secure === true) { @@ -1698,7 +1723,7 @@ public function hidden($fieldName, $options = array()) { public function file($fieldName, $options = array()) { $options += array('secure' => true); $secure = $options['secure']; - $options['secure'] = self::SECURE_SKIP; + $options['secure'] = static::SECURE_SKIP; $options = $this->_initInputField($fieldName, $options); $field = $this->entity(); @@ -2048,7 +2073,7 @@ public function select($fieldName, $options = array(), $attributes = array()) { $id = $this->_extractOption('id', $attributes); $attributes = $this->_initInputField($fieldName, array_merge( - (array)$attributes, array('secure' => self::SECURE_SKIP) + (array)$attributes, array('secure' => static::SECURE_SKIP) )); if (is_string($options) && isset($this->_options[$options])) { @@ -2212,6 +2237,11 @@ public function day($fieldName = null, $attributes = array()) { * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::year */ public function year($fieldName, $minYear = null, $maxYear = null, $attributes = array()) { + if (is_array($minYear)) { + $attributes = $minYear; + $minYear = null; + } + $attributes += array('empty' => true, 'value' => null); if ((empty($attributes['value']) || $attributes['value'] === true) && $value = $this->value($fieldName)) { if (is_array($value)) { @@ -2309,6 +2339,11 @@ public function month($fieldName, $attributes = array()) { * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::hour */ public function hour($fieldName, $format24Hours = false, $attributes = array()) { + if (is_array($format24Hours)) { + $attributes = $format24Hours; + $format24Hours = false; + } + $attributes += array('empty' => true, 'value' => null); $attributes = $this->_dateTimeSelected('hour', $fieldName, $attributes); @@ -2978,7 +3013,7 @@ protected function _initInputField($field, $options = array()) { $result['required'] = true; } - if ($secure === self::SECURE_SKIP) { + if ($secure === static::SECURE_SKIP) { return $result; } diff --git a/lib/Cake/View/Helper/HtmlHelper.php b/lib/Cake/View/Helper/HtmlHelper.php index adb6220d51e..5098cec8670 100644 --- a/lib/Cake/View/Helper/HtmlHelper.php +++ b/lib/Cake/View/Helper/HtmlHelper.php @@ -47,13 +47,13 @@ class HtmlHelper extends AppHelper { 'meta' => '' . $this->Html->link(${$singularVar}[$_alias][$_details['displayField']], array('controller' => $_details['controller'], 'action' => 'view', ${$singularVar}[$_alias][$_details['primaryKey']])) . ' '; break; - } - } - } - if ($isKey !== true) { + endif; + endforeach; + endif; + if ($isKey !== true): echo '' . h(${$singularVar}[$modelClass][$_field]) . ' '; - } - } + endif; + endforeach; echo ''; echo $this->Html->link(__d('cake', 'View'), array('action' => 'view', ${$singularVar}[$modelClass][$primaryKey])); @@ -67,7 +67,7 @@ endforeach; Paginator->prev('< ' . __d('cake', 'previous'), array(), null, array('class' => 'prev disabled')); echo $this->Paginator->numbers(array('separator' => '')); - echo $this->Paginator->next(__d('cake', 'next') .' >', array(), null, array('class' => 'next disabled')); + echo $this->Paginator->next(__d('cake', 'next') . ' >', array(), null, array('class' => 'next disabled')); ?> diff --git a/lib/Cake/View/Scaffolds/view.ctp b/lib/Cake/View/Scaffolds/view.ctp index 8ec83432f80..64a3e31f156 100644 --- a/lib/Cake/View/Scaffolds/view.ctp +++ b/lib/Cake/View/Scaffolds/view.ctp @@ -95,10 +95,10 @@ foreach ($associations['hasOne'] as $_alias => $_details): ?> -
" . Inflector::humanize($_field) . "\n";
echo "\t\t
- \n\t" . ${$singularVar}[$_alias][$_field] . "\n \n"; - } + endforeach; ?>
%s
' : "\n%s\n"; + $template = PHP_SAPI !== 'cli' ? '%s
' : "\n%s\n"; printf($template, print_r($var, true)); } } @@ -580,7 +580,7 @@ function stripslashes_deep($values) { */ function __($singular, $args = null) { if (!$singular) { - return; + return null; } App::uses('I18n', 'I18n'); @@ -600,13 +600,13 @@ function __($singular, $args = null) { * @param string $singular Singular text to translate * @param string $plural Plural text * @param int $count Count - * @param mixed $args Array with arguments or multiple arguments in function + * @param mixed $args Array with arguments or multiple arguments in function, otherwise null. * @return mixed plural form of translated string * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__n */ function __n($singular, $plural, $count, $args = null) { if (!$singular) { - return; + return null; } App::uses('I18n', 'I18n'); @@ -624,13 +624,13 @@ function __n($singular, $plural, $count, $args = null) { * * @param string $domain Domain * @param string $msg String to translate - * @param mixed $args Array with arguments or multiple arguments in function - * @return translated string + * @param mixed $args Array with arguments or multiple arguments in function, otherwise null. + * @return string translated string * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__d */ function __d($domain, $msg, $args = null) { if (!$msg) { - return; + return null; } App::uses('I18n', 'I18n'); $translated = I18n::translate($msg, null, $domain); @@ -651,13 +651,13 @@ function __d($domain, $msg, $args = null) { * @param string $singular Singular string to translate * @param string $plural Plural * @param int $count Count - * @param mixed $args Array with arguments or multiple arguments in function - * @return plural form of translated string + * @param mixed $args Array with arguments or multiple arguments in function, otherwise null. + * @return string plural form of translated string * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dn */ function __dn($domain, $singular, $plural, $count, $args = null) { if (!$singular) { - return; + return null; } App::uses('I18n', 'I18n'); $translated = I18n::translate($singular, $plural, $domain, I18n::LC_MESSAGES, $count); @@ -689,13 +689,13 @@ function __dn($domain, $singular, $plural, $count, $args = null) { * @param string $domain Domain * @param string $msg Message to translate * @param int $category Category - * @param mixed $args Array with arguments or multiple arguments in function - * @return translated string + * @param mixed $args Array with arguments or multiple arguments in function, otherwise null. + * @return string translated string * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dc */ function __dc($domain, $msg, $category, $args = null) { if (!$msg) { - return; + return null; } App::uses('I18n', 'I18n'); $translated = I18n::translate($msg, null, $domain, $category); @@ -731,13 +731,13 @@ function __dc($domain, $msg, $category, $args = null) { * @param string $plural Plural * @param int $count Count * @param int $category Category - * @param mixed $args Array with arguments or multiple arguments in function - * @return plural form of translated string + * @param mixed $args Array with arguments or multiple arguments in function, otherwise null. + * @return string plural form of translated string * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dcn */ function __dcn($domain, $singular, $plural, $count, $category, $args = null) { if (!$singular) { - return; + return null; } App::uses('I18n', 'I18n'); $translated = I18n::translate($singular, $plural, $domain, $category, $count); @@ -765,13 +765,13 @@ function __dcn($domain, $singular, $plural, $count, $category, $args = null) { * * @param string $msg String to translate * @param int $category Category - * @param mixed $args Array with arguments or multiple arguments in function - * @return translated string + * @param mixed $args Array with arguments or multiple arguments in function, otherwise null. + * @return string translated string * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__c */ function __c($msg, $category, $args = null) { if (!$msg) { - return; + return null; } App::uses('I18n', 'I18n'); $translated = I18n::translate($msg, null, null, $category); @@ -788,13 +788,13 @@ function __c($msg, $category, $args = null) { * * @param string $context Context of the text * @param string $singular Text to translate - * @param mixed $args Array with arguments or multiple arguments in function + * @param mixed $args Array with arguments or multiple arguments in function, otherwise null. * @return mixed translated string * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__ */ function __x($context, $singular, $args = null) { if (!$singular) { - return; + return null; } App::uses('I18n', 'I18n'); @@ -815,13 +815,13 @@ function __x($context, $singular, $args = null) { * @param string $singular Singular text to translate * @param string $plural Plural text * @param int $count Count - * @param mixed $args Array with arguments or multiple arguments in function + * @param mixed $args Array with arguments or multiple arguments in function, otherwise null. * @return mixed plural form of translated string * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__n */ function __xn($context, $singular, $plural, $count, $args = null) { if (!$singular) { - return; + return null; } App::uses('I18n', 'I18n'); @@ -840,13 +840,13 @@ function __xn($context, $singular, $plural, $count, $args = null) { * @param string $domain Domain * @param string $context Context of the text * @param string $msg String to translate - * @param mixed $args Array with arguments or multiple arguments in function - * @return translated string + * @param mixed $args Array with arguments or multiple arguments in function, otherwise null. + * @return string translated string * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__d */ function __dx($domain, $context, $msg, $args = null) { if (!$msg) { - return; + return null; } App::uses('I18n', 'I18n'); $translated = I18n::translate($msg, null, $domain, null, null, null, $context); @@ -868,13 +868,13 @@ function __dx($domain, $context, $msg, $args = null) { * @param string $singular Singular string to translate * @param string $plural Plural * @param int $count Count - * @param mixed $args Array with arguments or multiple arguments in function - * @return plural form of translated string + * @param mixed $args Array with arguments or multiple arguments in function, otherwise null. + * @return string plural form of translated string * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dn */ function __dxn($domain, $context, $singular, $plural, $count, $args = null) { if (!$singular) { - return; + return null; } App::uses('I18n', 'I18n'); $translated = I18n::translate($singular, $plural, $domain, I18n::LC_MESSAGES, $count, null, $context); @@ -907,13 +907,13 @@ function __dxn($domain, $context, $singular, $plural, $count, $args = null) { * @param string $context Context of the text * @param string $msg Message to translate * @param int $category Category - * @param mixed $args Array with arguments or multiple arguments in function - * @return translated string + * @param mixed $args Array with arguments or multiple arguments in function, otherwise null. + * @return string translated string * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dc */ function __dxc($domain, $context, $msg, $category, $args = null) { if (!$msg) { - return; + return null; } App::uses('I18n', 'I18n'); $translated = I18n::translate($msg, null, $domain, $category, null, null, $context); @@ -950,13 +950,13 @@ function __dxc($domain, $context, $msg, $category, $args = null) { * @param string $plural Plural * @param int $count Count * @param int $category Category - * @param mixed $args Array with arguments or multiple arguments in function - * @return plural form of translated string + * @param mixed $args Array with arguments or multiple arguments in function, otherwise null. + * @return string plural form of translated string * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dcn */ function __dxcn($domain, $context, $singular, $plural, $count, $category, $args = null) { if (!$singular) { - return; + return null; } App::uses('I18n', 'I18n'); $translated = I18n::translate($singular, $plural, $domain, $category, $count, null, $context); @@ -985,13 +985,13 @@ function __dxcn($domain, $context, $singular, $plural, $count, $category, $args * @param string $context Context of the text * @param string $msg String to translate * @param int $category Category - * @param mixed $args Array with arguments or multiple arguments in function - * @return translated string + * @param mixed $args Array with arguments or multiple arguments in function, otherwise null. + * @return string translated string * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__c */ function __xc($context, $msg, $category, $args = null) { if (!$msg) { - return; + return null; } App::uses('I18n', 'I18n'); $translated = I18n::translate($msg, null, null, $category, null, null, $context); @@ -1025,7 +1025,7 @@ function LogError($message) { * Searches include path for files. * * @param string $file File to look for - * @return Full path to file if exists, otherwise false + * @return string Full path to file if exists, otherwise false * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#fileExistsInPath */ function fileExistsInPath($file) { @@ -1061,3 +1061,25 @@ function convertSlash($string) { } } + +if (!function_exists('json_last_error_msg')) { + +/** + * Provides the fallback implementation of json_last_error_msg() available in PHP 5.5 and above. + * + * @return string Error message. + */ + function json_last_error_msg() { + static $errors = array( + JSON_ERROR_NONE => '', + JSON_ERROR_DEPTH => 'Maximum stack depth exceeded', + JSON_ERROR_STATE_MISMATCH => 'Invalid or malformed JSON', + JSON_ERROR_CTRL_CHAR => 'Control character error, possibly incorrectly encoded', + JSON_ERROR_SYNTAX => 'Syntax error', + JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, possibly incorrectly encoded' + ); + $error = json_last_error(); + return array_key_exists($error, $errors) ? $errors[$error] : "Unknown error ({$error})"; + } + +} diff --git a/lib/Cake/bootstrap.php b/lib/Cake/bootstrap.php index 4ad77a21b5a..b17c9f68ffe 100644 --- a/lib/Cake/bootstrap.php +++ b/lib/Cake/bootstrap.php @@ -172,17 +172,6 @@ Configure::write('App.cssBaseUrl', CSS_URL); Configure::write('App.jsBaseUrl', JS_URL); -Configure::bootstrap(isset($boot) ? $boot : true); - -if (function_exists('mb_internal_encoding')) { - $encoding = Configure::read('App.encoding'); - if (!empty($encoding)) { - mb_internal_encoding($encoding); - } - if (!empty($encoding) && function_exists('mb_regex_encoding')) { - mb_regex_encoding($encoding); - } -} if (!function_exists('mb_stripos')) { @@ -438,3 +427,15 @@ function mb_encode_mimeheader($str, $charset = 'UTF-8', $transferEncoding = 'B', } } + +Configure::bootstrap(isset($boot) ? $boot : true); + +if (function_exists('mb_internal_encoding')) { + $encoding = Configure::read('App.encoding'); + if (!empty($encoding)) { + mb_internal_encoding($encoding); + } + if (!empty($encoding) && function_exists('mb_regex_encoding')) { + mb_regex_encoding($encoding); + } +}