diff --git a/apps/advanced/backend/views/layouts/main.php b/apps/advanced/backend/views/layouts/main.php index 84ad1ad..9f66a11 100644 --- a/apps/advanced/backend/views/layouts/main.php +++ b/apps/advanced/backend/views/layouts/main.php @@ -24,7 +24,7 @@ AppAsset::register($this);

My Company

-
+
array( - 'class' => 'yii\web\CaptchaAction', + 'class' => 'yii\captcha\CaptchaAction', ), ); } diff --git a/apps/advanced/frontend/views/emails/passwordResetToken.php b/apps/advanced/frontend/views/emails/passwordResetToken.php index 5ab5df1..11aa8e9 100644 --- a/apps/advanced/frontend/views/emails/passwordResetToken.php +++ b/apps/advanced/frontend/views/emails/passwordResetToken.php @@ -6,7 +6,7 @@ use yii\helpers\Html; * @var common\models\User $user; */ -$resetLink = Yii::$app->urlManager->createAbsoluteUrl('site/resetPassword', array('token' => $user->password_reset_token)); +$resetLink = Yii::$app->urlManager->createAbsoluteUrl('site/reset-password', array('token' => $user->password_reset_token)); ?> Hello username)?>, diff --git a/apps/advanced/frontend/views/layouts/main.php b/apps/advanced/frontend/views/layouts/main.php index f123892..864992b 100644 --- a/apps/advanced/frontend/views/layouts/main.php +++ b/apps/advanced/frontend/views/layouts/main.php @@ -25,7 +25,7 @@ AppAsset::register($this);

My Company

-
+
array( - 'class' => 'yii\web\CaptchaAction', + 'class' => 'yii\captcha\CaptchaAction', 'fixedVerifyCode' => YII_ENV_DEV ? 'testme' : null, ), ); diff --git a/apps/basic/views/layouts/main.php b/apps/basic/views/layouts/main.php index 726ad41..5f8603f 100644 --- a/apps/basic/views/layouts/main.php +++ b/apps/basic/views/layouts/main.php @@ -23,7 +23,7 @@ app\config\AppAsset::register($this);

My Company

-
+
Note: If controller name or action name contains camelCased words, internal route will use dashes i.e. for +`DateTimeController::actionFastForward` route will be `date-time/fast-forward`. + ### Defaults If user isn't specifying any route i.e. using URL like `http://example.com/`, Yii assumes that default route should be diff --git a/docs/guide/installation.md b/docs/guide/installation.md index 1873d47..5447635 100644 --- a/docs/guide/installation.md +++ b/docs/guide/installation.md @@ -1,7 +1,23 @@ Installation ============ -Installation of Yii mainly involves the following two steps: +Installing via Composer +----------------------- + +The recommended way of installing Yii is by using Composer package manager. + +There are two application templates available: + +- [basic](https://github.com/yiisoft/yii2-app-basic) that is just a basic frontend application template. +- [advanced](https://github.com/yiisoft/yii2-app-advanced) that is a set of frontend, backend, console, common + (shared code) and environments support. + +Please refer to installation instructions on these pages. + +Installing from zip +------------------- + +Installation from zip mainly involves the following two steps: 1. Download Yii Framework from [yiiframework.com](http://www.yiiframework.com/). 2. Unpack the Yii release file to a Web-accessible directory. @@ -12,7 +28,6 @@ needs to be exposed to Web users. Other PHP scripts, including those from Yii, should be protected from Web access; otherwise they might be exploited by hackers. - Requirements ------------ diff --git a/docs/guide/overview.md b/docs/guide/overview.md index 9e54fd4..c7eeb42 100644 --- a/docs/guide/overview.md +++ b/docs/guide/overview.md @@ -31,6 +31,10 @@ management systems (CMS), e-commerce systems, etc. How does Yii Compare with Other Frameworks? ------------------------------------------- -Like most PHP frameworks, Yii is an MVC (Model-View-Controller) framework. - -TBD \ No newline at end of file +- Like most PHP frameworks, Yii is an MVC (Model-View-Controller) framework. +- It is a fullstack framework providing many solutions and components such as logging, session management, caching etc. +- It has a good balance of simplicity and features. +- Syntax and overall development usability are taken seriously. +- Performance is one of the key goals. +- We are constantly watching other web frameworks out there and getting the best ideas in. Initial Yii release was heavily + influenced by Ruby on Rails. Still, we aren't blindly copying anyhting. \ No newline at end of file diff --git a/docs/guide/performance.md b/docs/guide/performance.md index 1fa3529..3f83dae 100644 --- a/docs/guide/performance.md +++ b/docs/guide/performance.md @@ -100,6 +100,8 @@ You can use `CacheSession` to store sessions using cache. Note that some cache storage such as memcached has no guarantee that session data will not be lost leading to unexpected logouts. +If you have [Redis](http://redis.io/) on your server, it's highly recommended as session storage. + Improving application --------------------- diff --git a/docs/guide/security.md b/docs/guide/security.md index e69de29..0a3a14e 100644 --- a/docs/guide/security.md +++ b/docs/guide/security.md @@ -0,0 +1,81 @@ +Security +======== + +Hashing and verifyig passwords +------------------------------ + +It is important not to store passwords in plain text but, contrary to popular belief, just using `md5` or `sha1` to +compute and verify hashes isn't a good way either. Modern hardware allows to brute force these very fast. + +In order to truly secure user passwords even in case your database is leaked you need to use a function that is resistant +to brute-force such as bcrypt. In PHP it can be achieved by using [crypt function](http://php.net/manual/en/function.crypt.php) +but since usage isn't trivial and one can easily misuse it, Yii provides two helper functions for generating hash from +password and verifying existing hash. + +When user sets his password we're taking password string from POST and then getting a hash: + +```php +$hash = \yii\helpers\Security::generatePasswordHash($password); +``` + +The hash we've got is persisted to database to be used later. + +Then when user is trying to log in we're verifying the password he entered against a hash that we've previously persisted: + +```php +if(Security::validatePassword($password, $hash)) { + // all good, logging user in +} +else { + // wrong password +} +``` + + +Random data +----------- + +Random data is useful in many cases. For example, when resetting a password via email you need to generate a token, +save it to database and send it via email to end user so he's able to prove that email belongs to him. It is very +important for this token to be truly unique else there will be a possibility to predict a value and reset another user's +password. + +Yii security helper makes it as simple as: + +```php +$key = \yii\helpers\Security::generateRandomKey(); +``` + +Encryption and decryption +------------------------- + +In order to encrypt data so only person knowing a secret passphrase or having a secret key will be able to decrypt it. +For example, we need to store some information in our database but we need to make sure only user knowing a secret code +can view it (even if database is leaked): + + +```php +// $data and $secretWord are from the form +$encryptedData = \yii\helpers\Security::encrypt($data, $secretWord); +// store $encryptedData to database +``` + +Then when user want to read it: + +```php +// $secretWord is from the form, $encryptedData is from database +$data = \yii\helpers\Security::decrypt($encryptedData, $secretWord); +``` + +Making sure data wasn't modified +-------------------------------- + +hashData() +validateData() + + +Securing Cookies +---------------- + +- validation +- httpOnly \ No newline at end of file diff --git a/extensions/twig/composer.json b/extensions/twig/composer.json index 0ff7437..e613807 100644 --- a/extensions/twig/composer.json +++ b/extensions/twig/composer.json @@ -20,7 +20,7 @@ "minimum-stability": "dev", "require": { "yiisoft/yii2": "*", - "twig/twig": "v1.13.0" + "twig/twig": "v1.13.2" }, "autoload": { "psr-0": { "yii\\twig": "" } diff --git a/framework/yii/assets.php b/framework/yii/assets.php index dd657f3..c52bca6 100644 --- a/framework/yii/assets.php +++ b/framework/yii/assets.php @@ -6,6 +6,6 @@ return array( yii\validators\PunycodeAsset::className(), yii\validators\ValidationAsset::className(), yii\widgets\ActiveFormAsset::className(), - yii\widgets\CaptchaAsset::className(), + yii\captcha\CaptchaAsset::className(), yii\widgets\MaskedInputAsset::className(), ); diff --git a/framework/yii/assets/yii.captcha.js b/framework/yii/assets/yii.captcha.js index 7dfe3cc..af14faa 100644 --- a/framework/yii/assets/yii.captcha.js +++ b/framework/yii/assets/yii.captcha.js @@ -1,7 +1,7 @@ /** * Yii Captcha widget. * - * This is the JavaScript widget used by the yii\widgets\Captcha widget. + * This is the JavaScript widget used by the yii\captcha\Captcha widget. * * @link http://www.yiiframework.com/ * @copyright Copyright (c) 2008 Yii Software LLC diff --git a/framework/yii/base/Application.php b/framework/yii/base/Application.php index 0381e16..687f1a3 100644 --- a/framework/yii/base/Application.php +++ b/framework/yii/base/Application.php @@ -180,6 +180,16 @@ abstract class Application extends Module } /** + * Returns an ID that uniquely identifies this module among all modules within the current application. + * Since this is an application instance, it will always return an empty string. + * @return string the unique ID of the module. + */ + public function getUniqueId() + { + return ''; + } + + /** * Runs the application. * This is the main entrance of an application. * @return integer the exit status (0 means normal, non-zero values mean abnormal) @@ -475,6 +485,8 @@ abstract class Application extends Module */ public function handleFatalError() { + unset($this->_memoryReserve); + // load ErrorException manually here because autoloading them will not work // when error occurs while autoloading a class if (!class_exists('\\yii\\base\\Exception', false)) { @@ -487,7 +499,6 @@ abstract class Application extends Module $error = error_get_last(); if (ErrorException::isFatalError($error)) { - unset($this->_memoryReserve); $exception = new ErrorException($error['message'], $error['type'], $error['type'], $error['file'], $error['line']); // use error_log because it's too late to use Yii log error_log($exception); diff --git a/framework/yii/base/Component.php b/framework/yii/base/Component.php index 8e75835..5ff8ae4 100644 --- a/framework/yii/base/Component.php +++ b/framework/yii/base/Component.php @@ -220,19 +220,19 @@ class Component extends Object * * - the class has a getter or setter method associated with the specified name * (in this case, property name is case-insensitive); - * - the class has a member variable with the specified name (when `$checkVar` is true); - * - an attached behavior has a property of the given name (when `$checkBehavior` is true). + * - the class has a member variable with the specified name (when `$checkVars` is true); + * - an attached behavior has a property of the given name (when `$checkBehaviors` is true). * * @param string $name the property name - * @param boolean $checkVar whether to treat member variables as properties - * @param boolean $checkBehavior whether to treat behaviors' properties as properties of this component + * @param boolean $checkVars whether to treat member variables as properties + * @param boolean $checkBehaviors whether to treat behaviors' properties as properties of this component * @return boolean whether the property is defined * @see canGetProperty * @see canSetProperty */ - public function hasProperty($name, $checkVar = true, $checkBehavior = true) + public function hasProperty($name, $checkVars = true, $checkBehaviors = true) { - return $this->canGetProperty($name, $checkVar, $checkBehavior) || $this->canSetProperty($name, $checkVar, $checkBehavior); + return $this->canGetProperty($name, $checkVars, $checkBehaviors) || $this->canSetProperty($name, false, $checkBehaviors); } /** @@ -241,23 +241,23 @@ class Component extends Object * * - the class has a getter method associated with the specified name * (in this case, property name is case-insensitive); - * - the class has a member variable with the specified name (when `$checkVar` is true); - * - an attached behavior has a readable property of the given name (when `$checkBehavior` is true). + * - the class has a member variable with the specified name (when `$checkVars` is true); + * - an attached behavior has a readable property of the given name (when `$checkBehaviors` is true). * * @param string $name the property name - * @param boolean $checkVar whether to treat member variables as properties - * @param boolean $checkBehavior whether to treat behaviors' properties as properties of this component + * @param boolean $checkVars whether to treat member variables as properties + * @param boolean $checkBehaviors whether to treat behaviors' properties as properties of this component * @return boolean whether the property can be read * @see canSetProperty */ - public function canGetProperty($name, $checkVar = true, $checkBehavior = true) + public function canGetProperty($name, $checkVars = true, $checkBehaviors = true) { - if (method_exists($this, 'get' . $name) || $checkVar && property_exists($this, $name)) { + if (method_exists($this, 'get' . $name) || $checkVars && property_exists($this, $name)) { return true; - } else { + } elseif ($checkBehaviors) { $this->ensureBehaviors(); foreach ($this->_behaviors as $behavior) { - if ($behavior->canGetProperty($name, $checkVar)) { + if ($behavior->canGetProperty($name, $checkVars)) { return true; } } @@ -271,23 +271,23 @@ class Component extends Object * * - the class has a setter method associated with the specified name * (in this case, property name is case-insensitive); - * - the class has a member variable with the specified name (when `$checkVar` is true); - * - an attached behavior has a writable property of the given name (when `$checkBehavior` is true). + * - the class has a member variable with the specified name (when `$checkVars` is true); + * - an attached behavior has a writable property of the given name (when `$checkBehaviors` is true). * * @param string $name the property name - * @param boolean $checkVar whether to treat member variables as properties - * @param boolean $checkBehavior whether to treat behaviors' properties as properties of this component + * @param boolean $checkVars whether to treat member variables as properties + * @param boolean $checkBehaviors whether to treat behaviors' properties as properties of this component * @return boolean whether the property can be written * @see canGetProperty */ - public function canSetProperty($name, $checkVar = true, $checkBehavior = true) + public function canSetProperty($name, $checkVars = true, $checkBehaviors = true) { - if (method_exists($this, 'set' . $name) || $checkVar && property_exists($this, $name)) { + if (method_exists($this, 'set' . $name) || $checkVars && property_exists($this, $name)) { return true; - } else { + } elseif ($checkBehaviors) { $this->ensureBehaviors(); foreach ($this->_behaviors as $behavior) { - if ($behavior->canSetProperty($name, $checkVar)) { + if ($behavior->canSetProperty($name, $checkVars)) { return true; } } diff --git a/framework/yii/base/ErrorHandler.php b/framework/yii/base/ErrorHandler.php index 39c87b0..99428fc 100644 --- a/framework/yii/base/ErrorHandler.php +++ b/framework/yii/base/ErrorHandler.php @@ -192,11 +192,16 @@ class ErrorHandler extends Component */ public function renderFile($_file_, $_params_) { - ob_start(); - ob_implicit_flush(false); - extract($_params_, EXTR_OVERWRITE); - require(Yii::getAlias($_file_)); - return ob_get_clean(); + $_params_['handler'] = $this; + if ($this->exception instanceof ErrorException) { + ob_start(); + ob_implicit_flush(false); + extract($_params_, EXTR_OVERWRITE); + require(Yii::getAlias($_file_)); + return ob_get_clean(); + } else { + return Yii::$app->getView()->renderFile($_file_, $_params_, $this); + } } /** diff --git a/framework/yii/base/Formatter.php b/framework/yii/base/Formatter.php index 5326ed8..d9b5778 100644 --- a/framework/yii/base/Formatter.php +++ b/framework/yii/base/Formatter.php @@ -71,22 +71,36 @@ class Formatter extends Component } /** - * Formats the value based on the given type. + * Formats the value based on the given format type. * This method will call one of the "as" methods available in this class to do the formatting. - * For type "xyz", the method "asXyz" will be used. For example, if the type is "html", - * then [[asHtml()]] will be used. Type names are case insensitive. + * For type "xyz", the method "asXyz" will be used. For example, if the format is "html", + * then [[asHtml()]] will be used. Format names are case insensitive. * @param mixed $value the value to be formatted - * @param string $type the type of the value, e.g., "html", "text". + * @param string|array $format the format of the value, e.g., "html", "text". To specify additional + * parameters of the formatting method, you may use an array. The first element of the array + * specifies the format name, while the rest of the elements will be used as the parameters to the formatting + * method. For example, a format of `array('date', 'Y-m-d')` will cause the invocation of `asDate($value, 'Y-m-d')`. * @return string the formatting result * @throws InvalidParamException if the type is not supported by this class. */ - public function format($value, $type) + public function format($value, $format) { - $method = 'as' . $type; + if (is_array($format)) { + if (!isset($format[0])) { + throw new InvalidParamException('The $format array must contain at least one element.'); + } + $f = $format[0]; + $format[0] = $value; + $params = $format; + $format = $f; + } else { + $params = array($value); + } + $method = 'as' . $format; if (method_exists($this, $method)) { - return $this->$method($value); + return call_user_func_array(array($this, $method), $params); } else { - throw new InvalidParamException("Unknown type: $type"); + throw new InvalidParamException("Unknown type: $format"); } } diff --git a/framework/yii/base/Model.php b/framework/yii/base/Model.php index d2c8aa5..bb0f4b1 100644 --- a/framework/yii/base/Model.php +++ b/framework/yii/base/Model.php @@ -117,8 +117,8 @@ class Model extends Component implements \IteratorAggregate, \ArrayAccess * array('password', 'compare', 'compareAttribute' => 'password2', 'on' => 'register'), * // an inline validator defined via the "authenticate()" method in the model class * array('password', 'authenticate', 'on' => 'login'), - * // a validator of class "CaptchaValidator" - * array('captcha', 'CaptchaValidator'), + * // a validator of class "DateRangeValidator" + * array('dateRange', 'DateRangeValidator'), * ); * ~~~ * diff --git a/framework/yii/base/Module.php b/framework/yii/base/Module.php index 2bc42e3..a85385b 100644 --- a/framework/yii/base/Module.php +++ b/framework/yii/base/Module.php @@ -192,13 +192,7 @@ abstract class Module extends Component */ public function getUniqueId() { - if ($this instanceof Application) { - return ''; - } elseif ($this->module) { - return ltrim($this->module->getUniqueId() . '/' . $this->id, '/'); - } else { - return $this->id; - } + return $this->module ? ltrim($this->module->getUniqueId() . '/' . $this->id, '/') : $this->id; } /** diff --git a/framework/yii/base/Object.php b/framework/yii/base/Object.php index 7724008..50ad9e9 100644 --- a/framework/yii/base/Object.php +++ b/framework/yii/base/Object.php @@ -170,17 +170,17 @@ class Object implements Arrayable * * - the class has a getter or setter method associated with the specified name * (in this case, property name is case-insensitive); - * - the class has a member variable with the specified name (when `$checkVar` is true); + * - the class has a member variable with the specified name (when `$checkVars` is true); * * @param string $name the property name - * @param boolean $checkVar whether to treat member variables as properties + * @param boolean $checkVars whether to treat member variables as properties * @return boolean whether the property is defined * @see canGetProperty * @see canSetProperty */ - public function hasProperty($name, $checkVar = true) + public function hasProperty($name, $checkVars = true) { - return $this->canGetProperty($name, $checkVar) || $this->canSetProperty($name, false); + return $this->canGetProperty($name, $checkVars) || $this->canSetProperty($name, false); } /** @@ -189,16 +189,16 @@ class Object implements Arrayable * * - the class has a getter method associated with the specified name * (in this case, property name is case-insensitive); - * - the class has a member variable with the specified name (when `$checkVar` is true); + * - the class has a member variable with the specified name (when `$checkVars` is true); * * @param string $name the property name - * @param boolean $checkVar whether to treat member variables as properties + * @param boolean $checkVars whether to treat member variables as properties * @return boolean whether the property can be read * @see canSetProperty */ - public function canGetProperty($name, $checkVar = true) + public function canGetProperty($name, $checkVars = true) { - return method_exists($this, 'get' . $name) || $checkVar && property_exists($this, $name); + return method_exists($this, 'get' . $name) || $checkVars && property_exists($this, $name); } /** @@ -207,16 +207,16 @@ class Object implements Arrayable * * - the class has a setter method associated with the specified name * (in this case, property name is case-insensitive); - * - the class has a member variable with the specified name (when `$checkVar` is true); + * - the class has a member variable with the specified name (when `$checkVars` is true); * * @param string $name the property name - * @param boolean $checkVar whether to treat member variables as properties + * @param boolean $checkVars whether to treat member variables as properties * @return boolean whether the property can be written * @see canGetProperty */ - public function canSetProperty($name, $checkVar = true) + public function canSetProperty($name, $checkVars = true) { - return method_exists($this, 'set' . $name) || $checkVar && property_exists($this, $name); + return method_exists($this, 'set' . $name) || $checkVars && property_exists($this, $name); } /** diff --git a/framework/yii/bootstrap/Carousel.php b/framework/yii/bootstrap/Carousel.php index c2c68a7..ec9a0c9 100644 --- a/framework/yii/bootstrap/Carousel.php +++ b/framework/yii/bootstrap/Carousel.php @@ -55,7 +55,7 @@ class Carousel extends Widget * // required, slide content (HTML), such as an image tag * 'content' => '', * // optional, the caption (HTML) of the slide - * 'caption'=> '

This is title

This is the caption text

', + * 'caption' => '

This is title

This is the caption text

', * // optional the HTML attributes of the slide container * 'options' => array(), * ) diff --git a/framework/yii/bootstrap/Collapse.php b/framework/yii/bootstrap/Collapse.php index 8aed0b1..77fdde7 100644 --- a/framework/yii/bootstrap/Collapse.php +++ b/framework/yii/bootstrap/Collapse.php @@ -23,7 +23,7 @@ use yii\helpers\Html; * 'Collapsible Group Item #1' => array( * 'content' => 'Anim pariatur cliche...', * // open its content by default - * 'contentOptions' => array('class'=>'in') + * 'contentOptions' => array('class' => 'in') * ), * // another group item * 'Collapsible Group Item #2' => array( @@ -51,9 +51,9 @@ class Collapse extends Widget * // required, the content (HTML) of the group * 'content' => 'Anim pariatur cliche...', * // optional the HTML attributes of the content group - * 'contentOptions'=> array(), + * 'contentOptions' => array(), * // optional the HTML attributes of the group - * 'options'=> array(), + * 'options' => array(), * ) * ``` */ diff --git a/framework/yii/bootstrap/Nav.php b/framework/yii/bootstrap/Nav.php index cea83d8..5b5d40b 100644 --- a/framework/yii/bootstrap/Nav.php +++ b/framework/yii/bootstrap/Nav.php @@ -136,6 +136,7 @@ class Nav extends Widget if (is_array($items)) { $items = Dropdown::widget(array( 'items' => $items, + 'encodeLabels' => $this->encodeLabels, 'clientOptions' => false, )); } diff --git a/framework/yii/bootstrap/NavBar.php b/framework/yii/bootstrap/NavBar.php index f801df5..52804c4 100644 --- a/framework/yii/bootstrap/NavBar.php +++ b/framework/yii/bootstrap/NavBar.php @@ -87,7 +87,7 @@ class NavBar extends Widget * // optional, the menu item class type of the widget to render. Defaults to "Nav" widget. * 'class' => 'Menu item class type', * // required, the configuration options of the widget. - * 'options'=> array(...), + * 'options' => array(...), * ), * // optionally, you can pass a string * '
' . diff --git a/framework/yii/bootstrap/Progress.php b/framework/yii/bootstrap/Progress.php index 57046b1..33525b0 100644 --- a/framework/yii/bootstrap/Progress.php +++ b/framework/yii/bootstrap/Progress.php @@ -47,7 +47,7 @@ use yii\helpers\Html; * echo Progress::widget(array( * 'bars' => array( * array('percent' => 30, 'options' => array('class' => 'bar-danger')), - * array('percent' => 30, 'label'=>'test', 'options' => array('class' => 'bar-success')), + * array('percent' => 30, 'label' => 'test', 'options' => array('class' => 'bar-success')), * array('percent' => 35, 'options' => array('class' => 'bar-warning')) * ) * )); diff --git a/framework/yii/bootstrap/Tabs.php b/framework/yii/bootstrap/Tabs.php index 726dfb0..d6ddd7b 100644 --- a/framework/yii/bootstrap/Tabs.php +++ b/framework/yii/bootstrap/Tabs.php @@ -28,7 +28,7 @@ use yii\helpers\Html; * 'label' => 'Two', * 'content' => 'Anim pariatur cliche...', * 'headerOptions' => array(...), - * 'options' => array('id'=>'myveryownID'), + * 'options' => array('id' => 'myveryownID'), * ), * array( * 'label' => 'Dropdown', diff --git a/framework/yii/widgets/Captcha.php b/framework/yii/captcha/Captcha.php similarity index 98% rename from framework/yii/widgets/Captcha.php rename to framework/yii/captcha/Captcha.php index 1c538fb..78a4db3 100644 --- a/framework/yii/widgets/Captcha.php +++ b/framework/yii/captcha/Captcha.php @@ -5,13 +5,14 @@ * @license http://www.yiiframework.com/license/ */ -namespace yii\widgets; +namespace yii\captcha; use Yii; use yii\base\InvalidConfigException; use yii\helpers\Html; use yii\helpers\Json; -use yii\web\CaptchaAction; +use yii\widgets\InputWidget; + /** * Captcha renders a CAPTCHA image and an input field that takes user-entered verification code. diff --git a/framework/yii/web/CaptchaAction.php b/framework/yii/captcha/CaptchaAction.php similarity index 97% rename from framework/yii/web/CaptchaAction.php rename to framework/yii/captcha/CaptchaAction.php index 98599d9..771cc02 100644 --- a/framework/yii/web/CaptchaAction.php +++ b/framework/yii/captcha/CaptchaAction.php @@ -5,12 +5,11 @@ * @license http://www.yiiframework.com/license/ */ -namespace yii\web; +namespace yii\captcha; use Yii; use yii\base\Action; use yii\base\InvalidConfigException; -use yii\widgets\Captcha; /** * CaptchaAction renders a CAPTCHA image. @@ -85,7 +84,7 @@ class CaptchaAction extends Action /** * @var string the TrueType font file. This can be either a file path or path alias. */ - public $fontFile = '@yii/web/SpicyRice.ttf'; + public $fontFile = '@yii/captcha/SpicyRice.ttf'; /** * @var string the fixed verification code. When this property is set, * [[getVerifyCode()]] will always return the value of this property. @@ -116,12 +115,14 @@ class CaptchaAction extends Action if (isset($_GET[self::REFRESH_GET_VAR])) { // AJAX request for regenerating code $code = $this->getVerifyCode(true); + /** @var \yii\web\Controller $controller */ + $controller = $this->controller; return json_encode(array( 'hash1' => $this->generateValidationHash($code), 'hash2' => $this->generateValidationHash(strtolower($code)), // we add a random 'v' parameter so that FireFox can refresh the image // when src attribute of image tag is changed - 'url' => $this->controller->createUrl($this->id, array('v' => uniqid())), + 'url' => $controller->createUrl($this->id, array('v' => uniqid())), )); } else { $this->setHttpHeaders(); @@ -153,7 +154,7 @@ class CaptchaAction extends Action return $this->fixedVerifyCode; } - $session = Yii::$app->session; + $session = Yii::$app->getSession(); $session->open(); $name = $this->getSessionKey(); if ($session[$name] === null || $regenerate) { @@ -189,15 +190,15 @@ class CaptchaAction extends Action */ protected function generateVerifyCode() { + if ($this->minLength > $this->maxLength) { + $this->maxLength = $this->minLength; + } if ($this->minLength < 3) { $this->minLength = 3; } if ($this->maxLength > 20) { $this->maxLength = 20; } - if ($this->minLength > $this->maxLength) { - $this->maxLength = $this->minLength; - } $length = mt_rand($this->minLength, $this->maxLength); $letters = 'bcdfghjklmnpqrstvwxyz'; diff --git a/framework/yii/widgets/CaptchaAsset.php b/framework/yii/captcha/CaptchaAsset.php similarity index 94% rename from framework/yii/widgets/CaptchaAsset.php rename to framework/yii/captcha/CaptchaAsset.php index 4322e8e..50c75b7 100644 --- a/framework/yii/widgets/CaptchaAsset.php +++ b/framework/yii/captcha/CaptchaAsset.php @@ -5,7 +5,8 @@ * @license http://www.yiiframework.com/license/ */ -namespace yii\widgets; +namespace yii\captcha; + use yii\web\AssetBundle; /** diff --git a/framework/yii/validators/CaptchaValidator.php b/framework/yii/captcha/CaptchaValidator.php similarity index 96% rename from framework/yii/validators/CaptchaValidator.php rename to framework/yii/captcha/CaptchaValidator.php index 379859c..18c1d0d 100644 --- a/framework/yii/validators/CaptchaValidator.php +++ b/framework/yii/captcha/CaptchaValidator.php @@ -5,11 +5,13 @@ * @license http://www.yiiframework.com/license/ */ -namespace yii\validators; +namespace yii\captcha; use Yii; use yii\base\InvalidConfigException; use yii\helpers\Html; +use yii\validators\ValidationAsset; +use yii\validators\Validator; /** * CaptchaValidator validates that the attribute value is the same as the verification code displayed in the CAPTCHA. @@ -74,7 +76,7 @@ class CaptchaValidator extends Validator /** * Returns the CAPTCHA action object. * @throws InvalidConfigException - * @return \yii\web\CaptchaAction the action object + * @return \yii\captcha\CaptchaAction the action object */ public function getCaptchaAction() { diff --git a/framework/yii/web/SpicyRice.md b/framework/yii/captcha/SpicyRice.md similarity index 100% rename from framework/yii/web/SpicyRice.md rename to framework/yii/captcha/SpicyRice.md diff --git a/framework/yii/web/SpicyRice.ttf b/framework/yii/captcha/SpicyRice.ttf similarity index 100% rename from framework/yii/web/SpicyRice.ttf rename to framework/yii/captcha/SpicyRice.ttf diff --git a/framework/yii/classes.php b/framework/yii/classes.php index 41c9a3a..a638dc0 100644 --- a/framework/yii/classes.php +++ b/framework/yii/classes.php @@ -91,6 +91,10 @@ return array( 'yii\caching\WinCache' => YII_PATH . '/caching/WinCache.php', 'yii\caching\XCache' => YII_PATH . '/caching/XCache.php', 'yii\caching\ZendDataCache' => YII_PATH . '/caching/ZendDataCache.php', + 'yii\captcha\Captcha' => YII_PATH . '/captcha/Captcha.php', + 'yii\captcha\CaptchaAction' => YII_PATH . '/captcha/CaptchaAction.php', + 'yii\captcha\CaptchaAsset' => YII_PATH . '/captcha/CaptchaAsset.php', + 'yii\captcha\CaptchaValidator' => YII_PATH . '/captcha/CaptchaValidator.php', 'yii\data\ActiveDataProvider' => YII_PATH . '/data/ActiveDataProvider.php', 'yii\data\ArrayDataProvider' => YII_PATH . '/data/ArrayDataProvider.php', 'yii\data\DataProvider' => YII_PATH . '/data/DataProvider.php', @@ -167,7 +171,6 @@ return array( 'yii\rbac\PhpManager' => YII_PATH . '/rbac/PhpManager.php', 'yii\requirements\YiiRequirementChecker' => YII_PATH . '/requirements/YiiRequirementChecker.php', 'yii\validators\BooleanValidator' => YII_PATH . '/validators/BooleanValidator.php', - 'yii\validators\CaptchaValidator' => YII_PATH . '/validators/CaptchaValidator.php', 'yii\validators\CompareValidator' => YII_PATH . '/validators/CompareValidator.php', 'yii\validators\DateValidator' => YII_PATH . '/validators/DateValidator.php', 'yii\validators\DefaultValueValidator' => YII_PATH . '/validators/DefaultValueValidator.php', @@ -193,7 +196,6 @@ return array( 'yii\web\AssetConverter' => YII_PATH . '/web/AssetConverter.php', 'yii\web\AssetManager' => YII_PATH . '/web/AssetManager.php', 'yii\web\CacheSession' => YII_PATH . '/web/CacheSession.php', - 'yii\web\CaptchaAction' => YII_PATH . '/web/CaptchaAction.php', 'yii\web\Controller' => YII_PATH . '/web/Controller.php', 'yii\web\Cookie' => YII_PATH . '/web/Cookie.php', 'yii\web\CookieCollection' => YII_PATH . '/web/CookieCollection.php', @@ -225,14 +227,18 @@ return array( 'yii\widgets\ActiveFormAsset' => YII_PATH . '/widgets/ActiveFormAsset.php', 'yii\widgets\Block' => YII_PATH . '/widgets/Block.php', 'yii\widgets\Breadcrumbs' => YII_PATH . '/widgets/Breadcrumbs.php', - 'yii\widgets\Captcha' => YII_PATH . '/widgets/Captcha.php', - 'yii\widgets\CaptchaAsset' => YII_PATH . '/widgets/CaptchaAsset.php', 'yii\widgets\ContentDecorator' => YII_PATH . '/widgets/ContentDecorator.php', 'yii\widgets\DetailView' => YII_PATH . '/widgets/DetailView.php', 'yii\widgets\FragmentCache' => YII_PATH . '/widgets/FragmentCache.php', + 'yii\widgets\grid\CheckboxColumn' => YII_PATH . '/widgets/grid/CheckboxColumn.php', + 'yii\widgets\grid\Column' => YII_PATH . '/widgets/grid/Column.php', + 'yii\widgets\grid\DataColumn' => YII_PATH . '/widgets/grid/DataColumn.php', + 'yii\widgets\GridView' => YII_PATH . '/widgets/GridView.php', 'yii\widgets\InputWidget' => YII_PATH . '/widgets/InputWidget.php', 'yii\widgets\LinkPager' => YII_PATH . '/widgets/LinkPager.php', - 'yii\widgets\ListPager' => YII_PATH . '/widgets/ListPager.php', + 'yii\widgets\LinkSorter' => YII_PATH . '/widgets/LinkSorter.php', + 'yii\widgets\ListView' => YII_PATH . '/widgets/ListView.php', + 'yii\widgets\ListViewBase' => YII_PATH . '/widgets/ListViewBase.php', 'yii\widgets\MaskedInput' => YII_PATH . '/widgets/MaskedInput.php', 'yii\widgets\MaskedInputAsset' => YII_PATH . '/widgets/MaskedInputAsset.php', 'yii\widgets\Menu' => YII_PATH . '/widgets/Menu.php', diff --git a/framework/yii/console/controllers/HelpController.php b/framework/yii/console/controllers/HelpController.php index c1a8e0c..bf97e90 100644 --- a/framework/yii/console/controllers/HelpController.php +++ b/framework/yii/console/controllers/HelpController.php @@ -129,7 +129,7 @@ class HelpController extends Controller $files = scandir($module->getControllerPath()); foreach ($files as $file) { if (strcmp(substr($file, -14), 'Controller.php') === 0) { - $commands[] = $prefix . lcfirst(substr(basename($file), 0, -14)); + $commands[] = $prefix . Inflector::camel2id(substr(basename($file), 0, -14)); } } diff --git a/framework/yii/data/ActiveDataProvider.php b/framework/yii/data/ActiveDataProvider.php index 2b7400c..63635ab 100644 --- a/framework/yii/data/ActiveDataProvider.php +++ b/framework/yii/data/ActiveDataProvider.php @@ -29,7 +29,7 @@ use yii\db\Connection; * )); * * // get the posts in the current page - * $posts = $provider->getItems(); + * $posts = $provider->getModels(); * ~~~ * * And the following example shows how to use ActiveDataProvider without ActiveRecord: @@ -44,7 +44,7 @@ use yii\db\Connection; * )); * * // get the posts in the current page - * $posts = $provider->getItems(); + * $posts = $provider->getModels(); * ~~~ * * @author Qiang Xue @@ -53,18 +53,18 @@ use yii\db\Connection; class ActiveDataProvider extends DataProvider { /** - * @var Query the query that is used to fetch data items and [[totalCount]] + * @var Query the query that is used to fetch data models and [[totalCount]] * if it is not explicitly set. */ public $query; /** - * @var string|callable the column that is used as the key of the data items. - * This can be either a column name, or a callable that returns the key value of a given data item. + * @var string|callable the column that is used as the key of the data models. + * This can be either a column name, or a callable that returns the key value of a given data model. * - * If this is not set, the following rules will be used to determine the keys of the data items: + * If this is not set, the following rules will be used to determine the keys of the data models: * * - If [[query]] is an [[ActiveQuery]] instance, the primary keys of [[ActiveQuery::modelClass]] will be used. - * - Otherwise, the keys of the [[items]] array will be used. + * - Otherwise, the keys of the [[models]] array will be used. * * @see getKeys() */ @@ -75,9 +75,9 @@ class ActiveDataProvider extends DataProvider */ public $db; - private $_items; + private $_models; private $_keys; - private $_count; + private $_totalCount; /** * Initializes the DbCache component. @@ -96,59 +96,55 @@ class ActiveDataProvider extends DataProvider } /** - * Returns the number of data items in the current page. - * This is equivalent to `count($provider->items)`. + * Returns the number of data models in the current page. + * This is equivalent to `count($provider->models)`. * When [[pagination]] is false, this is the same as [[totalCount]]. - * @param boolean $refresh whether to recalculate the item count. If true, - * this will cause re-fetching of [[items]]. - * @return integer the number of data items in the current page. + * @return integer the number of data models in the current page. */ - public function getCount($refresh = false) + public function getCount() { - return count($this->getItems($refresh)); + return count($this->getModels()); } /** - * Returns the total number of data items. + * Returns the total number of data models. * When [[pagination]] is false, this returns the same value as [[count]]. * If [[totalCount]] is not explicitly set, it will be calculated * using [[query]] with a COUNT query. - * @param boolean $refresh whether to recalculate the item count - * @return integer total number of possible data items. + * @return integer total number of possible data models. * @throws InvalidConfigException */ - public function getTotalCount($refresh = false) + public function getTotalCount() { if ($this->getPagination() === false) { - return $this->getCount($refresh); - } elseif ($this->_count === null || $refresh) { + return $this->getCount(); + } elseif ($this->_totalCount === null) { if (!$this->query instanceof Query) { throw new InvalidConfigException('The "query" property must be an instance of Query or its subclass.'); } $query = clone $this->query; - $this->_count = $query->limit(-1)->offset(-1)->count('*', $this->db); + $this->_totalCount = $query->limit(-1)->offset(-1)->count('*', $this->db); } - return $this->_count; + return $this->_totalCount; } /** - * Sets the total number of data items. - * @param integer $value the total number of data items. + * Sets the total number of data models. + * @param integer $value the total number of data models. */ public function setTotalCount($value) { - $this->_count = $value; + $this->_totalCount = $value; } /** - * Returns the data items in the current page. - * @param boolean $refresh whether to re-fetch the data items. - * @return array the list of data items in the current page. - * @throws InvalidConfigException + * Returns the data models in the current page. + * @return array the list of data models in the current page. + * @throws InvalidConfigException if [[query]] is not set or invalid. */ - public function getItems($refresh = false) + public function getModels() { - if ($this->_items === null || $refresh) { + if ($this->_models === null) { if (!$this->query instanceof Query) { throw new InvalidConfigException('The "query" property must be an instance of Query or its subclass.'); } @@ -159,28 +155,27 @@ class ActiveDataProvider extends DataProvider if (($sort = $this->getSort()) !== false) { $this->query->orderBy($sort->getOrders()); } - $this->_items = $this->query->all($this->db); + $this->_models = $this->query->all($this->db); } - return $this->_items; + return $this->_models; } /** - * Returns the key values associated with the data items. - * @param boolean $refresh whether to re-fetch the data items and re-calculate the keys - * @return array the list of key values corresponding to [[items]]. Each data item in [[items]] + * Returns the key values associated with the data models. + * @return array the list of key values corresponding to [[models]]. Each data model in [[models]] * is uniquely identified by the corresponding key value in this array. */ - public function getKeys($refresh = false) + public function getKeys() { - if ($this->_keys === null || $refresh) { + if ($this->_keys === null) { $this->_keys = array(); - $items = $this->getItems($refresh); + $models = $this->getModels(); if ($this->key !== null) { - foreach ($items as $item) { + foreach ($models as $model) { if (is_string($this->key)) { - $this->_keys[] = $item[$this->key]; + $this->_keys[] = $model[$this->key]; } else { - $this->_keys[] = call_user_func($this->key, $item); + $this->_keys[] = call_user_func($this->key, $model); } } } elseif ($this->query instanceof ActiveQuery) { @@ -189,22 +184,34 @@ class ActiveDataProvider extends DataProvider $pks = $class::primaryKey(); if (count($pks) === 1) { $pk = $pks[0]; - foreach ($items as $item) { - $this->_keys[] = $item[$pk]; + foreach ($models as $model) { + $this->_keys[] = $model[$pk]; } } else { - foreach ($items as $item) { + foreach ($models as $model) { $keys = array(); foreach ($pks as $pk) { - $keys[] = $item[$pk]; + $keys[] = $model[$pk]; } $this->_keys[] = json_encode($keys); } } } else { - $this->_keys = array_keys($items); + $this->_keys = array_keys($models); } } return $this->_keys; } + + /** + * Refreshes the data provider. + * After calling this method, if [[getModels()]], [[getKeys()]] or [[getTotalCount()]] is called again, + * they will re-execute the query and return the latest data available. + */ + public function refresh() + { + $this->_models = null; + $this->_totalCount = null; + $this->_keys = null; + } } diff --git a/framework/yii/data/ArrayDataProvider.php b/framework/yii/data/ArrayDataProvider.php index 6a4aa7a..530bc69 100644 --- a/framework/yii/data/ArrayDataProvider.php +++ b/framework/yii/data/ArrayDataProvider.php @@ -13,25 +13,25 @@ use yii\helpers\ArrayHelper; /** * ArrayDataProvider implements a data provider based on a data array. * - * The [[allItems]] property contains all data items that may be sorted and/or paginated. + * The [[allModels]] property contains all data models that may be sorted and/or paginated. * ArrayDataProvider will provide the data after sorting and/or pagination. * You may configure the [[sort]] and [[pagination]] properties to * customize the sorting and pagination behaviors. * - * Elements in the [[allItems]] array may be either objects (e.g. model objects) + * Elements in the [[allModels]] array may be either objects (e.g. model objects) * or associative arrays (e.g. query results of DAO). * Make sure to set the [[key]] property to the name of the field that uniquely * identifies a data record or false if you do not have such a field. * * Compared to [[ActiveDataProvider]], ArrayDataProvider could be less efficient - * because it needs to have [[allItems]] ready. + * because it needs to have [[allModels]] ready. * * ArrayDataProvider may be used in the following way: * * ~~~ * $query = new Query; * $provider = new ArrayDataProvider(array( - * 'allItems' => $query->from('tbl_post')->all(), + * 'allModels' => $query->from('tbl_post')->all(), * 'sort' => array( * 'attributes' => array( * 'id', 'username', 'email', @@ -42,7 +42,7 @@ use yii\helpers\ArrayHelper; * ), * )); * // get the posts in the current page - * $posts = $provider->getItems(); + * $posts = $provider->getModels(); * ~~~ * * Note: if you want to use the sorting feature, you must configure the [[sort]] property @@ -54,116 +54,110 @@ use yii\helpers\ArrayHelper; class ArrayDataProvider extends DataProvider { /** - * @var string|callable the column that is used as the key of the data items. - * This can be either a column name, or a callable that returns the key value of a given data item. - * If this is not set, the index of the [[items]] array will be used. + * @var string|callable the column that is used as the key of the data models. + * This can be either a column name, or a callable that returns the key value of a given data model. + * If this is not set, the index of the [[models]] array will be used. * @see getKeys() */ public $key; /** * @var array the data that is not paginated or sorted. When pagination is enabled, - * this property usually contains more elements than [[items]]. + * this property usually contains more elements than [[models]]. * The array elements must use zero-based integer keys. */ - public $allItems; + public $allModels; private $_totalCount; /** - * Returns the total number of data items. - * @return integer total number of possible data items. - * @throws InvalidConfigException + * Returns the total number of data models. + * @return integer total number of possible data models. */ public function getTotalCount() { if ($this->getPagination() === false) { return $this->getCount(); } elseif ($this->_totalCount === null) { - if ($this->allItems !== null) { - $this->_totalCount = count($this->allItems); - } else { - throw new InvalidConfigException('Unable to determine total item count: either "allItems" or "totalCount" must be set.'); - } + $this->_totalCount = count($this->allModels); } return $this->_totalCount; } /** - * Sets the total number of data items. - * @param integer $value the total number of data items. + * Sets the total number of data models. + * @param integer $value the total number of data models. */ public function setTotalCount($value) { $this->_totalCount = $value; } - private $_items; + private $_models; /** - * Returns the data items in the current page. - * @return array the list of data items in the current page. - * @throws InvalidConfigException + * Returns the data models in the current page. + * @return array the list of data models in the current page. */ - public function getItems() + public function getModels() { - if ($this->_items === null) { - if (($items = $this->allItems) === null) { - throw new InvalidConfigException('Either "items" or "allItems" must be set.'); + if ($this->_models === null) { + if (($models = $this->allModels) === null) { + return array(); } if (($sort = $this->getSort()) !== false) { - $items = $this->sortItems($items, $sort); + $models = $this->sortModels($models, $sort); } if (($pagination = $this->getPagination()) !== false) { $pagination->totalCount = $this->getTotalCount(); - $items = array_slice($items, $pagination->getOffset(), $pagination->getLimit()); + $models = array_slice($models, $pagination->getOffset(), $pagination->getLimit()); } - $this->_items = $items; + $this->_models = $models; } - return $this->_items; + return $this->_models; } /** - * Sets the data items in the current page. - * @param array $items the items in the current page + * Sets the data models in the current page. + * @param array $models the models in the current page */ - public function setItems($items) + public function setModels($models) { - $this->_items = $items; + $this->_models = $models; } private $_keys; /** - * Returns the key values associated with the data items. - * @return array the list of key values corresponding to [[items]]. Each data item in [[items]] + * Returns the key values associated with the data models. + * @return array the list of key values corresponding to [[models]]. Each data model in [[models]] * is uniquely identified by the corresponding key value in this array. */ public function getKeys() { if ($this->_keys === null) { $this->_keys = array(); - $items = $this->getItems(); + $models = $this->getModels(); if ($this->key !== null) { - foreach ($items as $item) { + foreach ($models as $model) { if (is_string($this->key)) { - $this->_keys[] = $item[$this->key]; + $this->_keys[] = $model[$this->key]; } else { - $this->_keys[] = call_user_func($this->key, $item); + $this->_keys[] = call_user_func($this->key, $model); } } } else { - $this->_keys = array_keys($items); + $this->_keys = array_keys($models); } } return $this->_keys; } /** - * Sets the key values associated with the data items. - * @param array $keys the list of key values corresponding to [[items]]. + * Sets the key values associated with the data models. + * @param array $keys the list of key values corresponding to [[models]]. */ public function setKeys($keys) { @@ -171,17 +165,17 @@ class ArrayDataProvider extends DataProvider } /** - * Sorts the data items according to the given sort definition - * @param array $items the items to be sorted + * Sorts the data models according to the given sort definition + * @param array $models the models to be sorted * @param Sort $sort the sort definition - * @return array the sorted data items + * @return array the sorted data models */ - protected function sortItems($items, $sort) + protected function sortModels($models, $sort) { $orders = $sort->getOrders(); if (!empty($orders)) { - ArrayHelper::multisort($items, array_keys($orders), array_values($orders)); + ArrayHelper::multisort($models, array_keys($orders), array_values($orders)); } - return $items; + return $models; } } diff --git a/framework/yii/data/DataProvider.php b/framework/yii/data/DataProvider.php index 1d4b785..5f36f7e 100644 --- a/framework/yii/data/DataProvider.php +++ b/framework/yii/data/DataProvider.php @@ -118,11 +118,11 @@ abstract class DataProvider extends Component implements IDataProvider } /** - * Returns the number of data items in the current page. - * @return integer the number of data items in the current page. + * Returns the number of data models in the current page. + * @return integer the number of data models in the current page. */ public function getCount() { - return count($this->getItems()); + return count($this->getModels()); } } diff --git a/framework/yii/data/IDataProvider.php b/framework/yii/data/IDataProvider.php index 7b6dc93..9ae5546 100644 --- a/framework/yii/data/IDataProvider.php +++ b/framework/yii/data/IDataProvider.php @@ -19,29 +19,29 @@ namespace yii\data; interface IDataProvider { /** - * Returns the number of data items in the current page. - * This is equivalent to `count($provider->getItems())`. + * Returns the number of data models in the current page. + * This is equivalent to `count($provider->getModels())`. * When [[pagination]] is false, this is the same as [[totalCount]]. - * @return integer the number of data items in the current page. + * @return integer the number of data models in the current page. */ public function getCount(); /** - * Returns the total number of data items. + * Returns the total number of data models. * When [[pagination]] is false, this is the same as [[count]]. - * @return integer total number of possible data items. + * @return integer total number of possible data models. */ public function getTotalCount(); /** - * Returns the data items in the current page. - * @return array the list of data items in the current page. + * Returns the data models in the current page. + * @return array the list of data models in the current page. */ - public function getItems(); + public function getModels(); /** - * Returns the key values associated with the data items. - * @return array the list of key values corresponding to [[items]]. Each data item in [[items]] + * Returns the key values associated with the data models. + * @return array the list of key values corresponding to [[models]]. Each data model in [[models]] * is uniquely identified by the corresponding key value in this array. */ public function getKeys(); diff --git a/framework/yii/data/Sort.php b/framework/yii/data/Sort.php index cb5dd82..4d7851a 100644 --- a/framework/yii/data/Sort.php +++ b/framework/yii/data/Sort.php @@ -191,17 +191,18 @@ class Sort extends Object { $attributes = array(); foreach ($this->attributes as $name => $attribute) { - if (is_array($attribute)) { - $attributes[$name] = $attribute; - if (!isset($attribute['label'])) { - $attributes[$name]['label'] = Inflector::camel2words($name); - } - } else { + if (!is_array($attribute)) { $attributes[$attribute] = array( 'asc' => array($attribute => self::ASC), 'desc' => array($attribute => self::DESC), 'label' => Inflector::camel2words($attribute), ); + } elseif (!isset($attribute['asc'], $attribute['desc'], $attribute['label'])) { + $attributes[$name] = array_merge(array( + 'asc' => array($name => self::ASC), + 'desc' => array($name => self::DESC), + 'label' => Inflector::camel2words($name), + ), $attribute); } } $this->attributes = $attributes; diff --git a/framework/yii/db/ActiveQuery.php b/framework/yii/db/ActiveQuery.php index e0c40f7..4d08659 100644 --- a/framework/yii/db/ActiveQuery.php +++ b/framework/yii/db/ActiveQuery.php @@ -124,10 +124,14 @@ class ActiveQuery extends Query { $command = $this->createCommand($db); $row = $command->queryOne(); - if ($row !== false && !$this->asArray) { - /** @var $class ActiveRecord */ - $class = $this->modelClass; - $model = $class::create($row); + if ($row !== false) { + if ($this->asArray) { + $model = $row; + } else { + /** @var $class ActiveRecord */ + $class = $this->modelClass; + $model = $class::create($row); + } if (!empty($this->with)) { $models = array($model); $this->populateRelations($models, $this->with); @@ -135,7 +139,7 @@ class ActiveQuery extends Query } return $model; } else { - return $row === false ? null : $row; + return null; } } diff --git a/framework/yii/db/ActiveRecord.php b/framework/yii/db/ActiveRecord.php index 3ad5bd3..6e42106 100644 --- a/framework/yii/db/ActiveRecord.php +++ b/framework/yii/db/ActiveRecord.php @@ -536,6 +536,16 @@ class ActiveRecord extends Model } /** + * Returns a value indicating whether the model has an attribute with the specified name. + * @param string $name the name of the attribute + * @return boolean whether the model has an attribute with the specified name. + */ + public function hasAttribute($name) + { + return isset($this->_attributes[$name]) || isset($this->getTableSchema()->columns[$name]); + } + + /** * Returns the old attribute values. * @return array the old attribute values (name-value pairs) */ @@ -1400,10 +1410,10 @@ class ActiveRecord extends Model * @param string $class the class name to be namespaced * @return string the namespaced class name */ - protected function getNamespacedClass($class) + protected static function getNamespacedClass($class) { if (strpos($class, '\\') === false) { - $reflector = new \ReflectionClass($this); + $reflector = new \ReflectionClass(static::className()); return $reflector->getNamespaceName() . '\\' . $class; } else { return $class; diff --git a/framework/yii/db/Command.php b/framework/yii/db/Command.php index a754e34..bf93a2c 100644 --- a/framework/yii/db/Command.php +++ b/framework/yii/db/Command.php @@ -146,9 +146,9 @@ class Command extends \yii\base\Component try { $this->pdoStatement = $this->db->pdo->prepare($sql); } catch (\Exception $e) { - Yii::error($e->getMessage() . "\nFailed to prepare SQL: $sql", __METHOD__); + $message = $e->getMessage() . "\nFailed to prepare SQL: $sql"; $errorInfo = $e instanceof \PDOException ? $e->errorInfo : null; - throw new Exception($e->getMessage(), $errorInfo, (int)$e->getCode(), $e); + throw new Exception($message, $errorInfo, (int)$e->getCode(), $e); } } } @@ -293,10 +293,7 @@ class Command extends \yii\base\Component return $n; } catch (\Exception $e) { Yii::endProfile($token, __METHOD__); - $message = $e->getMessage(); - - Yii::error("$message\nFailed to execute SQL: $rawSql", __METHOD__); - + $message = $e->getMessage() . "\nThe SQL being executed was: $rawSql"; $errorInfo = $e instanceof \PDOException ? $e->errorInfo : null; throw new Exception($message, $errorInfo, (int)$e->getCode(), $e); } @@ -430,8 +427,7 @@ class Command extends \yii\base\Component return $result; } catch (\Exception $e) { Yii::endProfile($token, __METHOD__); - $message = $e->getMessage(); - Yii::error("$message\nCommand::$method() failed: $rawSql", __METHOD__); + $message = $e->getMessage() . "\nThe SQL being executed was: $rawSql"; $errorInfo = $e instanceof \PDOException ? $e->errorInfo : null; throw new Exception($message, $errorInfo, (int)$e->getCode(), $e); } diff --git a/framework/yii/db/Connection.php b/framework/yii/db/Connection.php index 0dd47d8..f27698a 100644 --- a/framework/yii/db/Connection.php +++ b/framework/yii/db/Connection.php @@ -307,9 +307,7 @@ class Connection extends Component Yii::endProfile($token, __METHOD__); } catch (\PDOException $e) { Yii::endProfile($token, __METHOD__); - Yii::error("Failed to open DB connection ({$this->dsn}): " . $e->getMessage(), __METHOD__); - $message = YII_DEBUG ? 'Failed to open DB connection: ' . $e->getMessage() : 'Failed to open DB connection.'; - throw new Exception($message, $e->errorInfo, (int)$e->getCode(), $e); + throw new Exception($e->getMessage(), $e->errorInfo, (int)$e->getCode(), $e); } } } diff --git a/framework/yii/debug/panels/LogPanel.php b/framework/yii/debug/panels/LogPanel.php index b1ad63d..0f56281 100644 --- a/framework/yii/debug/panels/LogPanel.php +++ b/framework/yii/debug/panels/LogPanel.php @@ -55,7 +55,7 @@ EOD; foreach ($this->data['messages'] as $log) { list ($message, $level, $category, $time, $traces) = $log; $time = date('H:i:s.', $time) . sprintf('%03d', (int)(($time - (int)$time) * 1000)); - $message = Html::encode($message); + $message = nl2br(Html::encode($message)); if (!empty($traces)) { $message .= Html::ul($traces, array( 'class' => 'trace', diff --git a/framework/yii/debug/panels/ProfilingPanel.php b/framework/yii/debug/panels/ProfilingPanel.php index 5bd32ee..b614611 100644 --- a/framework/yii/debug/panels/ProfilingPanel.php +++ b/framework/yii/debug/panels/ProfilingPanel.php @@ -33,10 +33,10 @@ class ProfilingPanel extends Panel return << - Time: $time + Time: $time
- Memory: $memory + Memory: $memory
EOD; } diff --git a/framework/yii/debug/panels/RequestPanel.php b/framework/yii/debug/panels/RequestPanel.php index e709de6..e655f2d 100644 --- a/framework/yii/debug/panels/RequestPanel.php +++ b/framework/yii/debug/panels/RequestPanel.php @@ -12,6 +12,7 @@ use yii\base\InlineAction; use yii\bootstrap\Tabs; use yii\debug\Panel; use yii\helpers\Html; +use yii\web\Response; /** * Debugger panel that collects and displays request data. @@ -29,9 +30,24 @@ class RequestPanel extends Panel public function getSummary() { $url = $this->getUrl(); + $statusCode = $this->data['statusCode']; + if ($statusCode === null) { + $statusCode = 200; + } + if ($statusCode >= 200 && $statusCode < 300) { + $class = 'label-success'; + } elseif ($statusCode >= 100 && $statusCode < 200) { + $class = 'label-info'; + } else { + $class = 'label-important'; + } + $statusText = Html::encode(isset(Response::$httpStatuses[$statusCode]) ? Response::$httpStatuses[$statusCode] : ''); return << + $statusCode +
+
Action: {$this->data['action']}
EOD; @@ -113,6 +129,7 @@ EOD; $session = Yii::$app->getComponent('session', false); return array( 'flashes' => $session ? $session->getAllFlashes() : array(), + 'statusCode' => Yii::$app->getResponse()->getStatusCode(), 'requestHeaders' => $requestHeaders, 'responseHeaders' => $responseHeaders, 'route' => Yii::$app->requestedAction ? Yii::$app->requestedAction->getUniqueId() : Yii::$app->requestedRoute, diff --git a/framework/yii/helpers/HtmlBase.php b/framework/yii/helpers/HtmlBase.php index b1d514f..2c8bead 100644 --- a/framework/yii/helpers/HtmlBase.php +++ b/framework/yii/helpers/HtmlBase.php @@ -1339,11 +1339,12 @@ class HtmlBase * * - is an empty string: the currently requested URL will be returned; * - is a non-empty string: it will first be processed by [[Yii::getAlias()]]. If the result - * is an absolute URL, it will be returned with any change further; Otherwise, the result + * is an absolute URL, it will be returned without any change further; Otherwise, the result * will be prefixed with [[\yii\web\Request::baseUrl]] and returned. * - is an array: the first array element is considered a route, while the rest of the name-value * pairs are treated as the parameters to be used for URL creation using [[\yii\web\Controller::createUrl()]]. * For example: `array('post/index', 'page' => 2)`, `array('index')`. + * In case there is no controller, [[\yii\web\UrlManager::createUrl()]] will be used. * * @param array|string $url the parameter to be used to generate a valid URL * @return string the normalized URL @@ -1355,7 +1356,7 @@ class HtmlBase if (isset($url[0])) { $route = $url[0]; $params = array_splice($url, 1); - if (Yii::$app->controller !== null) { + if (Yii::$app->controller instanceof \yii\web\Controller) { return Yii::$app->controller->createUrl($route, $params); } else { return Yii::$app->getUrlManager()->createUrl($route, $params); diff --git a/framework/yii/helpers/SecurityBase.php b/framework/yii/helpers/SecurityBase.php index 9b743c4..05b2682 100644 --- a/framework/yii/helpers/SecurityBase.php +++ b/framework/yii/helpers/SecurityBase.php @@ -120,7 +120,10 @@ class SecurityBase static $keys; $keyFile = Yii::$app->getRuntimePath() . '/keys.php'; if ($keys === null) { - $keys = is_file($keyFile) ? require($keyFile) : array(); + $keys = array(); + if (is_file($keyFile)) { + $keys = require($keyFile); + } } if (!isset($keys[$name])) { $keys[$name] = static::generateRandomKey($length); diff --git a/framework/yii/requirements/requirements.php b/framework/yii/requirements/requirements.php index 670544d..005a205 100644 --- a/framework/yii/requirements/requirements.php +++ b/framework/yii/requirements/requirements.php @@ -41,7 +41,7 @@ return array( array( 'name' => 'Intl extension', 'mandatory' => false, - 'condition' => $this->checkPhpExtensionVersion('intl', '1.0.2'), + 'condition' => $this->checkPhpExtensionVersion('intl', '1.0.2', '>='), 'by' => 'Internationalization support', 'memo' => 'PHP Intl extension 1.0.2 or higher is required when you want to use IDN-feature of EmailValidator or UrlValidator or the yii\i18n\Formatter class.' ), diff --git a/framework/yii/validators/Validator.php b/framework/yii/validators/Validator.php index fe31936..c519706 100644 --- a/framework/yii/validators/Validator.php +++ b/framework/yii/validators/Validator.php @@ -49,7 +49,7 @@ abstract class Validator extends Component */ public static $builtInValidators = array( 'boolean' => 'yii\validators\BooleanValidator', - 'captcha' => 'yii\validators\CaptchaValidator', + 'captcha' => 'yii\captcha\CaptchaValidator', 'compare' => 'yii\validators\CompareValidator', 'date' => 'yii\validators\DateValidator', 'default' => 'yii\validators\DefaultValueValidator', diff --git a/framework/yii/views/errorHandler/callStackItem.php b/framework/yii/views/errorHandler/callStackItem.php index 2cbced0..20ad398 100644 --- a/framework/yii/views/errorHandler/callStackItem.php +++ b/framework/yii/views/errorHandler/callStackItem.php @@ -8,19 +8,19 @@ * @var string[] $lines * @var integer $begin * @var integer $end - * @var \yii\base\ErrorHandler $this + * @var \yii\base\ErrorHandler $handler */ ?> -
  • . - htmlEncode($file); ?> + htmlEncode($file); ?> - addTypeLinks($class) . '::'; ?>addTypeLinks($method . '()'); ?> + addTypeLinks($class) . '::'; ?>addTypeLinks($method . '()'); ?> @@ -36,7 +36,7 @@ 
    htmlEncode($lines[$i]);
+						echo (trim($lines[$i]) == '') ? " \n" : $handler->htmlEncode($lines[$i]);
 					}
 				?>
    diff --git a/framework/yii/views/errorHandler/error.php b/framework/yii/views/errorHandler/error.php index 4765bdd..c9afaf5 100644 --- a/framework/yii/views/errorHandler/error.php +++ b/framework/yii/views/errorHandler/error.php @@ -1,10 +1,11 @@ htmlEncode($exception instanceof \yii\base\Exception ? $exception->getName() : get_class($exception)); +$title = $handler->htmlEncode($exception instanceof \yii\base\Exception ? $exception->getName() : get_class($exception)); ?> +beginPage(); ?> @@ -50,16 +51,18 @@ $title = $this->htmlEncode($exception instanceof \yii\base\Exception ? $exceptio -

    -

    htmlEncode($exception->getMessage()))?>

    -

    - The above error occurred while the Web server was processing your request. -

    -

    - Please contact us if you think this is a server error. Thank you. -

    -
    - -
    +

    +

    htmlEncode($exception->getMessage()))?>

    +

    + The above error occurred while the Web server was processing your request. +

    +

    + Please contact us if you think this is a server error. Thank you. +

    +
    + +
    + endBody(); // to allow injecting code into body (mostly by Yii Debug Toolbar) ?> +endPage(); ?> diff --git a/framework/yii/views/errorHandler/exception.php b/framework/yii/views/errorHandler/exception.php index 8c6612a..2062277 100644 --- a/framework/yii/views/errorHandler/exception.php +++ b/framework/yii/views/errorHandler/exception.php @@ -1,9 +1,10 @@ +beginPage(); ?> @@ -12,11 +13,11 @@ <?php if ($exception instanceof \yii\web\HttpException) { - echo (int) $exception->statusCode . ' ' . $this->htmlEncode($exception->getName()); + echo (int) $exception->statusCode . ' ' . $handler->htmlEncode($exception->getName()); } elseif ($exception instanceof \yii\base\Exception) { - echo $this->htmlEncode($exception->getName() . ' – ' . get_class($exception)); + echo $handler->htmlEncode($exception->getName() . ' – ' . get_class($exception)); } else { - echo $this->htmlEncode(get_class($exception)); + echo $handler->htmlEncode(get_class($exception)); } ?> @@ -38,14 +39,6 @@ ul{ } /* base */ -::selection{ - color: #fff !important; - background-color: #e51717 !important; -} -::-moz-selection{ - color: #fff !important; - background-color: #e51717 !important; -} a{ text-decoration: none; } @@ -353,32 +346,32 @@ pre .diff .change{ Gears

    - htmlEncode($exception->getName()); ?> - – addTypeLinks(get_class($exception)); ?> + htmlEncode($exception->getName()); ?> + – addTypeLinks(get_class($exception)); ?>

    Attention

    ' . $this->createHttpStatusLink($exception->statusCode, $this->htmlEncode($exception->getName())) . ''; - echo ' – ' . $this->addTypeLinks(get_class($exception)); + echo '' . $handler->createHttpStatusLink($exception->statusCode, $handler->htmlEncode($exception->getName())) . ''; + echo ' – ' . $handler->addTypeLinks(get_class($exception)); } elseif ($exception instanceof \yii\base\Exception) { - echo '' . $this->htmlEncode($exception->getName()) . ''; - echo ' – ' . $this->addTypeLinks(get_class($exception)); + echo '' . $handler->htmlEncode($exception->getName()) . ''; + echo ' – ' . $handler->addTypeLinks(get_class($exception)); } else { - echo '' . $this->htmlEncode(get_class($exception)) . ''; + echo '' . $handler->htmlEncode(get_class($exception)) . ''; } ?>

    -

    htmlEncode($exception->getMessage()); ?>

    - renderPreviousExceptions($exception); ?> +

    htmlEncode($exception->getMessage()); ?>

    + renderPreviousExceptions($exception); ?>
      - renderCallStackItem($exception->getFile(), $exception->getLine(), null, null, 1); ?> + renderCallStackItem($exception->getFile(), $exception->getLine(), null, null, 1); ?> getTrace(), $length = count($trace); $i < $length; ++$i): ?> - renderCallStackItem(@$trace[$i]['file'] ?: null, @$trace[$i]['line'] ?: null, + renderCallStackItem(@$trace[$i]['file'] ?: null, @$trace[$i]['line'] ?: null, @$trace[$i]['class'] ?: null, @$trace[$i]['function'] ?: null, $i + 1); ?>
    @@ -386,15 +379,15 @@ pre .diff .change{
    - renderRequest(); ?> + renderRequest(); ?>
    Yii Framework

    -

    createServerInformationLink(); ?>

    -

    Yii Framework/createFrameworkVersionLink(); ?>

    +

    createServerInformationLink(); ?>

    +

    Yii Framework/createFrameworkVersionLink(); ?>

    + endBody(); // to allow injecting code into body (mostly by Yii Debug Toolbar) ?> +endPage(); ?> diff --git a/framework/yii/views/errorHandler/previousException.php b/framework/yii/views/errorHandler/previousException.php index d56f6dd..e6dcf87 100644 --- a/framework/yii/views/errorHandler/previousException.php +++ b/framework/yii/views/errorHandler/previousException.php @@ -1,7 +1,7 @@ diff --git a/framework/yii/web/Request.php b/framework/yii/web/Request.php index d864d95..c2f5c4b 100644 --- a/framework/yii/web/Request.php +++ b/framework/yii/web/Request.php @@ -864,7 +864,7 @@ class Request extends \yii\base\Request private $_cookieValidationKey; /** - * @return string the secret key used for cookie validation. If it was set previously, + * @return string the secret key used for cookie validation. If it was not set previously, * a random key will be generated and used. */ public function getCookieValidationKey() diff --git a/framework/yii/web/Response.php b/framework/yii/web/Response.php index 5371122..6bb888c 100644 --- a/framework/yii/web/Response.php +++ b/framework/yii/web/Response.php @@ -258,7 +258,6 @@ class Response extends \yii\base\Response $this->sendHeaders(); $this->sendContent(); $this->trigger(self::EVENT_AFTER_SEND, new ResponseEvent($this)); - $this->clear(); } /** diff --git a/framework/yii/widgets/DetailView.php b/framework/yii/widgets/DetailView.php index 229cdec..c3bf864 100644 --- a/framework/yii/widgets/DetailView.php +++ b/framework/yii/widgets/DetailView.php @@ -21,7 +21,7 @@ use yii\helpers\Inflector; * DetailView displays the detail of a single data [[model]]. * * DetailView is best used for displaying a model in a regular format (e.g. each model attribute - * is displayed as a row in a table.) The model can be either an instance of [[Model]] or + * is displayed as a row in a table.) The model can be either an instance of [[Model]] * or an associative array. * * DetailView uses the [[attributes]] property to determines which model attributes @@ -105,7 +105,7 @@ class DetailView extends Widget public function init() { if ($this->model === null) { - throw new InvalidConfigException('Please specify the "data" property.'); + throw new InvalidConfigException('Please specify the "model" property.'); } if ($this->formatter == null) { $this->formatter = Yii::$app->getFormatter(); @@ -166,7 +166,7 @@ class DetailView extends Widget } elseif (is_array($this->model)) { $this->attributes = array_keys($this->model); } else { - throw new InvalidConfigException('The "data" property must be either an array or an object.'); + throw new InvalidConfigException('The "model" property must be either an array or an object.'); } sort($this->attributes); } diff --git a/framework/yii/widgets/GridView.php b/framework/yii/widgets/GridView.php new file mode 100644 index 0000000..cdfa782 --- /dev/null +++ b/framework/yii/widgets/GridView.php @@ -0,0 +1,328 @@ + + * @since 2.0 + */ +class GridView extends ListViewBase +{ + const FILTER_POS_HEADER = 'header'; + const FILTER_POS_FOOTER = 'footer'; + const FILTER_POS_BODY = 'body'; + + public $dataColumnClass = 'yii\widgets\grid\DataColumn'; + public $caption; + public $captionOptions = array(); + public $tableOptions = array('class' => 'table table-striped table-bordered'); + public $headerRowOptions = array(); + public $footerRowOptions = array(); + public $beforeRow; + public $afterRow; + public $showHeader = true; + public $showFooter = false; + /** + * @var array|Closure + */ + public $rowOptions = array(); + /** + * @var array|Formatter the formatter used to format model attribute values into displayable texts. + * This can be either an instance of [[Formatter]] or an configuration array for creating the [[Formatter]] + * instance. If this property is not set, the "formatter" application component will be used. + */ + public $formatter; + /** + * @var array grid column configuration. Each array element represents the configuration + * for one particular grid column which can be either a string or an array. + * + * When a column is specified as a string, it should be in the format of "name:type:header", + * where "type" and "header" are optional. A {@link CDataColumn} instance will be created in this case, + * whose {@link CDataColumn::name}, {@link CDataColumn::type} and {@link CDataColumn::header} + * properties will be initialized accordingly. + * + * When a column is specified as an array, it will be used to create a grid column instance, where + * the 'class' element specifies the column class name (defaults to {@link CDataColumn} if absent). + * Currently, these official column classes are provided: {@link CDataColumn}, + * {@link CLinkColumn}, {@link CButtonColumn} and {@link CCheckBoxColumn}. + */ + public $columns = array(); + /** + * @var string the layout that determines how different sections of the list view should be organized. + * The following tokens will be replaced with the corresponding section contents: + * + * - `{summary}`: the summary section. See [[renderSummary()]]. + * - `{items}`: the list items. See [[renderItems()]]. + * - `{sorter}`: the sorter. See [[renderSorter()]]. + * - `{pager}`: the pager. See [[renderPager()]]. + */ + public $layout = "{summary}\n{pager}{items}\n{pager}"; + public $emptyCell = ' '; + /** + * @var \yii\base\Model the model instance that keeps the user-entered filter data. When this property is set, + * the grid view will enable column-based filtering. Each data column by default will display a text field + * at the top that users can fill in to filter the data. + * Note that in order to show an input field for filtering, a column must have its {@link CDataColumn::name} + * property set or have {@link CDataColumn::filter} as the HTML code for the input field. + * When this property is not set (null) the filtering is disabled. + */ + public $filterModel; + /** + * @var string whether the filters should be displayed in the grid view. Valid values include: + *
      + *
    • header: the filters will be displayed on top of each column's header cell.
      • + *
    • body: the filters will be displayed right below each column's header cell.
      • + *
    • footer: the filters will be displayed below each column's footer cell.
      • + *
    + */ + public $filterPosition = 'body'; + public $filterOptions = array('class' => 'filters'); + + /** + * Initializes the grid view. + * This method will initialize required property values and instantiate {@link columns} objects. + */ + public function init() + { + parent::init(); + if ($this->formatter == null) { + $this->formatter = Yii::$app->getFormatter(); + } elseif (is_array($this->formatter)) { + $this->formatter = Yii::createObject($this->formatter); + } + if (!$this->formatter instanceof Formatter) { + throw new InvalidConfigException('The "formatter" property must be either a Format object or a configuration array.'); + } + + $this->initColumns(); + } + + /** + * Renders the data models for the grid view. + */ + public function renderItems() + { + $content = array_filter(array( + $this->renderCaption(), + $this->renderColumnGroup(), + $this->showHeader ? $this->renderTableHeader() : false, + $this->showFooter ? $this->renderTableFooter() : false, + $this->renderTableBody(), + )); + return Html::tag('table', implode("\n", $content), $this->tableOptions); + } + + public function renderCaption() + { + if (!empty($this->caption)) { + return Html::tag('caption', $this->caption, $this->captionOptions); + } else { + return false; + } + } + + public function renderColumnGroup() + { + $requireColumnGroup = false; + foreach ($this->columns as $column) { + /** @var \yii\widgets\grid\Column $column */ + if (!empty($column->options)) { + $requireColumnGroup = true; + break; + } + } + if ($requireColumnGroup) { + $cols = array(); + foreach ($this->columns as $column) { + $cols[] = Html::tag('col', '', $column->options); + } + return Html::tag('colgroup', implode("\n", $cols)); + } else { + return false; + } + } + + /** + * Renders the table header. + * @return string the rendering result + */ + public function renderTableHeader() + { + $cells = array(); + foreach ($this->columns as $column) { + /** @var \yii\widgets\grid\Column $column */ + $cells[] = $column->renderHeaderCell(); + } + $content = implode('', $cells); + if ($this->filterPosition == self::FILTER_POS_HEADER) { + $content = $this->renderFilters() . $content; + } elseif ($this->filterPosition == self::FILTER_POS_BODY) { + $content .= $this->renderFilters(); + } + return "\n" . Html::tag('tr', $content, $this->headerRowOptions) . "\n"; + } + + /** + * Renders the table footer. + * @return string the rendering result + */ + public function renderTableFooter() + { + $cells = array(); + foreach ($this->columns as $column) { + /** @var \yii\widgets\grid\Column $column */ + $cells[] = $column->renderFooterCell(); + } + $content = implode('', $cells); + if ($this->filterPosition == self::FILTER_POS_FOOTER) { + $content .= $this->renderFilters(); + } + return "\n" . Html::tag('tr', $content, $this->footerRowOptions) . "\n"; + } + + /** + * Renders the filter. + */ + public function renderFilters() + { + if ($this->filterModel !== null) { + $cells = array(); + foreach ($this->columns as $column) { + /** @var \yii\widgets\grid\Column $column */ + $cells[] = $column->renderFilterCell(); + } + return Html::tag('tr', implode('', $cells), $this->filterOptions); + } else { + return ''; + } + } + + /** + * Renders the table body. + * @return string the rendering result + */ + public function renderTableBody() + { + $models = array_values($this->dataProvider->getModels()); + $keys = $this->dataProvider->getKeys(); + $rows = array(); + foreach ($models as $index => $model) { + $key = $keys[$index]; + if ($this->beforeRow !== null) { + $row = call_user_func($this->beforeRow, $model, $key, $index); + if (!empty($row)) { + $rows[] = $row; + } + } + + $rows[] = $this->renderTableRow($model, $key, $index); + + if ($this->afterRow !== null) { + $row = call_user_func($this->afterRow, $model, $key, $index); + if (!empty($row)) { + $rows[] = $row; + } + } + } + return "\n" . implode("\n", $rows) . "\n"; + } + + /** + * Renders a table row with the given data model and key. + * @param mixed $model the data model to be rendered + * @param mixed $key the key associated with the data model + * @param integer $index the zero-based index of the data model among the model array returned by [[dataProvider]]. + * @return string the rendering result + */ + public function renderTableRow($model, $key, $index) + { + $cells = array(); + /** @var \yii\widgets\grid\Column $column */ + foreach ($this->columns as $column) { + $cells[] = $column->renderDataCell($model, $index); + } + if ($this->rowOptions instanceof Closure) { + $options = call_user_func($this->rowOptions, $model, $key, $index); + } else { + $options = $this->rowOptions; + } + $options['data-key'] = $key; + return Html::tag('tr', implode('', $cells), $options); + } + + /** + * Creates column objects and initializes them. + */ + protected function initColumns() + { + if (empty($this->columns)) { + $this->guessColumns(); + } + $id = $this->getId(); + foreach ($this->columns as $i => $column) { + if (is_string($column)) { + $column = $this->createDataColumn($column); + } else { + $column = Yii::createObject(array_merge(array( + 'class' => $this->dataColumnClass, + 'grid' => $this, + ), $column)); + } + if (!$column->visible) { + unset($this->columns[$i]); + continue; + } + if ($column->id === null) { + $column->id = $id . '_c' . $i; + } + $this->columns[$i] = $column; + } + } + + /** + * Creates a {@link CDataColumn} based on a shortcut column specification string. + * @param string $text the column specification string + * @return DataColumn the column instance + * @throws InvalidConfigException if the column specification is invalid + */ + protected function createDataColumn($text) + { + if (!preg_match('/^([\w\.]+)(:(\w*))?(:(.*))?$/', $text, $matches)) { + throw new InvalidConfigException('The column must be specified in the format of "Attribute", "Attribute:Format" or "Attribute:Format:Header'); + } + return Yii::createObject(array( + 'class' => $this->dataColumnClass, + 'grid' => $this, + 'attribute' => $matches[1], + 'format' => isset($matches[3]) ? $matches[3] : 'text', + 'header' => isset($matches[5]) ? $matches[5] : null, + )); + } + + protected function guessColumns() + { + $models = $this->dataProvider->getModels(); + $model = reset($models); + if (is_array($model) || is_object($model)) { + foreach ($model as $name => $value) { + $this->columns[] = $name; + } + } else { + throw new InvalidConfigException('Unable to generate columns from data.'); + } + } +} diff --git a/framework/yii/widgets/ListView.php b/framework/yii/widgets/ListView.php index dbcf6f5..c191389 100644 --- a/framework/yii/widgets/ListView.php +++ b/framework/yii/widgets/ListView.php @@ -19,7 +19,7 @@ use yii\helpers\Html; class ListView extends ListViewBase { /** - * @var array the HTML attributes for the container of the rendering result of each data item. + * @var array the HTML attributes for the container of the rendering result of each data model. * The "tag" element specifies the tag name of the container element and defaults to "div". * If "tag" is false, it means no container element will be rendered. */ @@ -29,7 +29,7 @@ class ListView extends ListViewBase * for rendering each data item. If it specifies a view name, the following variables will * be available in the view: * - * - `$item`: mixed, the data item + * - `$model`: mixed, the data model * - `$key`: mixed, the key value associated with the data item * - `$index`: integer, the zero-based index of the data item in the items array returned by [[dataProvider]]. * - `$widget`: ListView, this widget instance @@ -39,7 +39,7 @@ class ListView extends ListViewBase * If this property is specified as a callback, it should have the following signature: * * ~~~ - * function ($item, $key, $index, $widget) + * function ($model, $key, $index, $widget) * ~~~ */ public $itemView; @@ -50,40 +50,40 @@ class ListView extends ListViewBase /** - * Renders all data items. + * Renders all data models. * @return string the rendering result */ public function renderItems() { - $items = $this->dataProvider->getItems(); + $models = $this->dataProvider->getModels(); $keys = $this->dataProvider->getKeys(); $rows = array(); - foreach (array_values($items) as $index => $item) { - $rows[] = $this->renderItem($item, $keys[$index], $index); + foreach (array_values($models) as $index => $model) { + $rows[] = $this->renderItem($model, $keys[$index], $index); } return implode($this->separator, $rows); } /** - * Renders a single data item. - * @param mixed $item the data item to be rendered - * @param mixed $key the key value associated with the data item - * @param integer $index the zero-based index of the data item in the item array returned by [[dataProvider]]. + * Renders a single data model. + * @param mixed $model the data model to be rendered + * @param mixed $key the key value associated with the data model + * @param integer $index the zero-based index of the data model in the model array returned by [[dataProvider]]. * @return string the rendering result */ - public function renderItem($item, $key, $index) + public function renderItem($model, $key, $index) { if ($this->itemView === null) { $content = $key; } elseif (is_string($this->itemView)) { $content = $this->getView()->render($this->itemView, array( - 'item' => $item, + 'model' => $model, 'key' => $key, 'index' => $index, 'widget' => $this, )); } else { - $content = call_user_func($this->itemView, $item, $key, $index, $this); + $content = call_user_func($this->itemView, $model, $key, $index, $this); } $options = $this->itemOptions; $tag = ArrayHelper::remove($options, 'tag', 'div'); diff --git a/framework/yii/widgets/ListViewBase.php b/framework/yii/widgets/ListViewBase.php index a29fcf0..fe318c4 100644 --- a/framework/yii/widgets/ListViewBase.php +++ b/framework/yii/widgets/ListViewBase.php @@ -70,7 +70,7 @@ abstract class ListViewBase extends Widget /** - * Renders the data items. + * Renders the data models. * @return string the rendering result. */ abstract public function renderItems(); @@ -91,8 +91,9 @@ abstract class ListViewBase extends Widget public function run() { if ($this->dataProvider->getCount() > 0 || $this->empty === false) { - $content = preg_replace_callback("/{\\w+}/", function ($matches) { - $content = $this->renderSection($matches[0]); + $widget = $this; + $content = preg_replace_callback("/{\\w+}/", function ($matches) use ($widget) { + $content = $widget->renderSection($matches[0]); return $content === false ? $matches[0] : $content; }, $this->layout); } else { @@ -108,7 +109,7 @@ abstract class ListViewBase extends Widget * @param string $name the section name, e.g., `{summary}`, `{items}`. * @return string|boolean the rendering result of the section, or false if the named section is not supported. */ - protected function renderSection($name) + public function renderSection($name) { switch ($name) { case '{summary}': diff --git a/framework/yii/widgets/grid/CheckboxColumn.php b/framework/yii/widgets/grid/CheckboxColumn.php new file mode 100644 index 0000000..e6bb327 --- /dev/null +++ b/framework/yii/widgets/grid/CheckboxColumn.php @@ -0,0 +1,191 @@ + + * @since 2.0 + */ +class CheckboxColumn extends Column +{ + public $checked; + /** + * @var string a PHP expression that will be evaluated for every data cell and whose result will + * determine if checkbox for each data cell is disabled. In this expression, you can use the following variables: + *
      + *
    • $row the row number (zero-based)
      • + *
    • $data the data model for the row
      • + *
    • $this the column object
      • + *
    + * The PHP expression will be evaluated using {@link evaluateExpression}. + * + * A PHP expression can be any PHP code that has a value. To learn more about what an expression is, + * please refer to the {@link http://www.php.net/manual/en/language.expressions.php php manual}. + * + * Note that expression result will overwrite value set with checkBoxHtmlOptions['disabled']. + * @since 1.1.13 + */ + public $disabled; + /** + * @var array the HTML options for the data cell tags. + */ + public $htmlOptions = array('class' => 'checkbox-column'); + /** + * @var array the HTML options for the header cell tag. + */ + public $headerHtmlOptions = array('class' => 'checkbox-column'); + /** + * @var array the HTML options for the footer cell tag. + */ + public $footerHtmlOptions = array('class' => 'checkbox-column'); + /** + * @var array the HTML options for the checkboxes. + */ + public $checkBoxHtmlOptions = array(); + /** + * @var integer the number of rows that can be checked. + * Possible values: + *
      + *
    • 0 - the state of the checkbox cannot be changed (read-only mode)
      • + *
    • 1 - only one row can be checked. Checking a checkbox has nothing to do with selecting the row
      • + *
    • 2 or more - multiple checkboxes can be checked. Checking a checkbox has nothing to do with selecting the row
      • + *
    • null - {@link CGridView::selectableRows} is used to control how many checkboxes can be checked. + * Checking a checkbox will also select the row.
      • + *
    + * You may also call the JavaScript function $(gridID).yiiGridView('getChecked', columnID) + * to retrieve the key values of the checked rows. + * @since 1.1.6 + */ + public $selectableRows = null; + /** + * @var string the template to be used to control the layout of the header cell. + * The token "{item}" is recognized and it will be replaced with a "check all" checkbox. + * By default if in multiple checking mode, the header cell will display an additional checkbox, + * clicking on which will check or uncheck all of the checkboxes in the data cells. + * See {@link selectableRows} for more details. + * @since 1.1.11 + */ + public $headerTemplate = '{item}'; + + /** + * Initializes the column. + * This method registers necessary client script for the checkbox column. + */ + public function init() + { + if (isset($this->checkBoxHtmlOptions['name'])) { + $name = $this->checkBoxHtmlOptions['name']; + } else { + $name = $this->id; + if (substr($name, -2) !== '[]') { + $name .= '[]'; + } + $this->checkBoxHtmlOptions['name'] = $name; + } + $name = strtr($name, array('[' => "\\[", ']' => "\\]")); + + if ($this->selectableRows === null) { + if (isset($this->checkBoxHtmlOptions['class'])) { + $this->checkBoxHtmlOptions['class'] .= ' select-on-check'; + } else { + $this->checkBoxHtmlOptions['class'] = 'select-on-check'; + } + return; + } + + $cball = $cbcode = ''; + if ($this->selectableRows == 0) { + //.. read only + $cbcode = "return false;"; + } elseif ($this->selectableRows == 1) { + //.. only one can be checked, uncheck all other + $cbcode = "jQuery(\"input:not(#\"+this.id+\")[name='$name']\").prop('checked',false);"; + } elseif (strpos($this->headerTemplate, '{item}') !== false) { + //.. process check/uncheck all + $cball = <<id}_all',function() { + var checked=this.checked; + jQuery("input[name='$name']:enabled").each(function() {this.checked=checked;}); +}); + +CBALL; + $cbcode = "jQuery('#{$this->id}_all').prop('checked', jQuery(\"input[name='$name']\").length==jQuery(\"input[name='$name']:checked\").length);"; + } + + if ($cbcode !== '') { + $js = $cball; + $js .= <<getClientScript()->registerScript(__CLASS__ . '#' . $this->id, $js); + } + } + + /** + * Renders the header cell content. + * This method will render a checkbox in the header when {@link selectableRows} is greater than 1 + * or in case {@link selectableRows} is null when {@link CGridView::selectableRows} is greater than 1. + */ + protected function renderHeaderCellContent() + { + if (trim($this->headerTemplate) === '') { + echo $this->grid->blankDisplay; + return; + } + + $item = ''; + if ($this->selectableRows === null && $this->grid->selectableRows > 1) { + $item = CHtml::checkBox($this->id . '_all', false, array('class' => 'select-on-check-all')); + } elseif ($this->selectableRows > 1) { + $item = CHtml::checkBox($this->id . '_all', false); + } else { + ob_start(); + parent::renderHeaderCellContent(); + $item = ob_get_clean(); + } + + echo strtr($this->headerTemplate, array( + '{item}' => $item, + )); + } + + /** + * Renders the data cell content. + * This method renders a checkbox in the data cell. + * @param integer $row the row number (zero-based) + * @param mixed $data the data associated with the row + */ + protected function renderDataCellContent($row, $data) + { + if ($this->value !== null) { + $value = $this->evaluateExpression($this->value, array('data' => $data, 'row' => $row)); + } elseif ($this->name !== null) { + $value = CHtml::value($data, $this->name); + } else { + $value = $this->grid->dataProvider->keys[$row]; + } + + $checked = false; + if ($this->checked !== null) { + $checked = $this->evaluateExpression($this->checked, array('data' => $data, 'row' => $row)); + } + + $options = $this->checkBoxHtmlOptions; + if ($this->disabled !== null) { + $options['disabled'] = $this->evaluateExpression($this->disabled, array('data' => $data, 'row' => $row)); + } + + $name = $options['name']; + unset($options['name']); + $options['value'] = $value; + $options['id'] = $this->id . '_' . $row; + echo CHtml::checkBox($name, $checked, $options); + } +} diff --git a/framework/yii/widgets/grid/Column.php b/framework/yii/widgets/grid/Column.php new file mode 100644 index 0000000..939904a --- /dev/null +++ b/framework/yii/widgets/grid/Column.php @@ -0,0 +1,147 @@ + + * @since 2.0 + */ +class Column extends Object +{ + /** + * @var string the ID of this column. This value should be unique among all grid view columns. + * If this is not set, it will be assigned one automatically. + */ + public $id; + /** + * @var GridView the grid view object that owns this column. + */ + public $grid; + /** + * @var string the header cell content. Note that it will not be HTML-encoded. + */ + public $header; + /** + * @var string the footer cell content. Note that it will not be HTML-encoded. + */ + public $footer; + /** + * @var callable + */ + public $content; + /** + * @var boolean whether this column is visible. Defaults to true. + */ + public $visible = true; + public $options = array(); + public $headerOptions = array(); + /** + * @var array|\Closure + */ + public $bodyOptions = array(); + public $footerOptions = array(); + /** + * @var array the HTML attributes for the filter cell tag. + */ + public $filterOptions=array(); + + + /** + * Renders the header cell. + */ + public function renderHeaderCell() + { + return Html::tag('th', $this->renderHeaderCellContent(), $this->headerOptions); + } + + /** + * Renders the footer cell. + */ + public function renderFooterCell() + { + return Html::tag('td', $this->renderFooterCellContent(), $this->footerOptions); + } + + /** + * Renders a data cell. + * @param mixed $model the data model being rendered + * @param integer $index the zero-based index of the data item among the item array returned by [[dataProvider]]. + * @return string the rendering result + */ + public function renderDataCell($model, $index) + { + if ($this->bodyOptions instanceof Closure) { + $options = call_user_func($this->bodyOptions, $model, $index, $this); + } else { + $options = $this->bodyOptions; + } + return Html::tag('td', $this->renderDataCellContent($model, $index), $options); + } + + /** + * Renders the filter cell. + */ + public function renderFilterCell() + { + return Html::tag('td', $this->renderFilterCellContent(), $this->filterOptions); + } + + /** + * Renders the header cell content. + * The default implementation simply renders {@link header}. + * This method may be overridden to customize the rendering of the header cell. + * @return string the rendering result + */ + protected function renderHeaderCellContent() + { + return trim($this->header) !== '' ? $this->header : $this->grid->emptyCell; + } + + /** + * Renders the footer cell content. + * The default implementation simply renders {@link footer}. + * This method may be overridden to customize the rendering of the footer cell. + * @return string the rendering result + */ + protected function renderFooterCellContent() + { + return trim($this->footer) !== '' ? $this->footer : $this->grid->emptyCell; + } + + /** + * Renders the data cell content. + * @param mixed $model the data model + * @param integer $index the zero-based index of the data model among the models array returned by [[dataProvider]]. + * @return string the rendering result + */ + protected function renderDataCellContent($model, $index) + { + if ($this->content !== null) { + return call_user_func($this->content, $model, $index, $this); + } else { + return $this->grid->emptyCell; + } + } + + /** + * Renders the filter cell content. + * The default implementation simply renders a space. + * This method may be overridden to customize the rendering of the filter cell (if any). + * @return string the rendering result + */ + protected function renderFilterCellContent() + { + return $this->grid->emptyCell; + } +} diff --git a/framework/yii/widgets/grid/DataColumn.php b/framework/yii/widgets/grid/DataColumn.php new file mode 100644 index 0000000..ac65c4c --- /dev/null +++ b/framework/yii/widgets/grid/DataColumn.php @@ -0,0 +1,94 @@ + + * @since 2.0 + */ +class DataColumn extends Column +{ + public $attribute; + public $value; + public $format; + /** + * @var boolean whether to allow sorting by this column. If true and [[attribute]] is found in + * the sort definition of [[GridView::dataProvider]], then the header cell of this column + * will contain a link that may trigger the sorting when being clicked. + */ + public $enableSorting = true; + /** + * @var string|array|boolean the HTML code representing a filter input (eg a text field, a dropdown list) + * that is used for this data column. This property is effective only when + * {@link CGridView::filter} is set. + * If this property is not set, a text field will be generated as the filter input; + * If this property is an array, a dropdown list will be generated that uses this property value as + * the list options. + * If you don't want a filter for this data column, set this value to false. + */ + public $filter; + + + protected function renderHeaderCellContent() + { + if ($this->attribute !== null && $this->header === null) { + $provider = $this->grid->dataProvider; + if ($this->enableSorting && ($sort = $provider->getSort()) !== false && $sort->hasAttribute($this->attribute)) { + return $sort->link($this->attribute); + } + $models = $provider->getModels(); + if (($model = reset($models)) instanceof Model) { + /** @var Model $model */ + return $model->getAttributeLabel($this->attribute); + } elseif ($provider instanceof ActiveDataProvider) { + if ($provider->query instanceof ActiveQuery) { + /** @var Model $model */ + $model = new $provider->query->modelClass; + return $model->getAttributeLabel($this->attribute); + } + } + return Inflector::camel2words($this->attribute); + } else { + return parent::renderHeaderCellContent(); + } + } + + protected function renderFilterCellContent() + { + if (is_string($this->filter)) { + return $this->filter; + } elseif ($this->filter !== false && $this->grid->filterModel instanceof Model && $this->attribute !== null) { + if (is_array($this->filter)) { + return Html::activeDropDownList($this->grid->filterModel, $this->attribute, $this->filter, array('prompt' => '')); + } else { + return Html::activeTextInput($this->grid->filterModel, $this->attribute); + } + } else { + return parent::renderFilterCellContent(); + } + } + + protected function renderDataCellContent($model, $index) + { + if ($this->value !== null) { + $value = call_user_func($this->value, $model, $index, $this); + } elseif ($this->content === null && $this->attribute !== null) { + $value = ArrayHelper::getValue($model, $this->attribute); + } else { + return parent::renderDataCellContent($model, $index); + } + return $this->grid->formatter->format($value, $this->format); + } +} diff --git a/framework/yii/widgets/grid/SerialColumn.php b/framework/yii/widgets/grid/SerialColumn.php new file mode 100644 index 0000000..b9b78a7 --- /dev/null +++ b/framework/yii/widgets/grid/SerialColumn.php @@ -0,0 +1,32 @@ + + * @since 2.0 + */ +class SerialColumn extends Column +{ + /** + * Renders the data cell content. + * @param mixed $model the data model + * @param integer $index the zero-based index of the data model among the models array returned by [[dataProvider]]. + * @return string the rendering result + */ + protected function renderDataCellContent($model, $index) + { + $pagination = $this->grid->dataProvider->getPagination(); + if ($pagination !== false) { + return $pagination->getOffset() + $index + 1; + } else { + return $index + 1; + } + } +} diff --git a/tests/unit/data/base/Singer.php b/tests/unit/data/base/Singer.php index f1b91e1..5e9111d 100644 --- a/tests/unit/data/base/Singer.php +++ b/tests/unit/data/base/Singer.php @@ -15,7 +15,7 @@ class Singer extends Model return array( array('lastName', 'default', 'value' => 'Lennon'), array('lastName', 'required'), - array('underscore_style', 'yii\validators\CaptchaValidator'), + array('underscore_style', 'yii\captcha\CaptchaValidator'), ); } } diff --git a/tests/unit/framework/base/FormatterTest.php b/tests/unit/framework/base/FormatterTest.php index b851ae1..01dd682 100644 --- a/tests/unit/framework/base/FormatterTest.php +++ b/tests/unit/framework/base/FormatterTest.php @@ -189,4 +189,14 @@ class FormatterTest extends TestCase $this->assertSame("123123,12", $this->formatter->asNumber($value, 2)); $this->assertSame($this->formatter->nullDisplay, $this->formatter->asNumber(null)); } + + public function testFormat() + { + $value = time(); + $this->assertSame(date('Y/m/d', $value), $this->formatter->format($value, 'date')); + $this->assertSame(date('Y/m/d', $value), $this->formatter->format($value, 'DATE')); + $this->assertSame(date('Y-m-d', $value), $this->formatter->format($value, array('date', 'Y-m-d'))); + $this->setExpectedException('\yii\base\InvalidParamException'); + $this->assertSame(date('Y-m-d', $value), $this->formatter->format($value, 'data')); + } } diff --git a/tests/unit/framework/data/ActiveDataProviderTest.php b/tests/unit/framework/data/ActiveDataProviderTest.php index 7df2983..2699a52 100644 --- a/tests/unit/framework/data/ActiveDataProviderTest.php +++ b/tests/unit/framework/data/ActiveDataProviderTest.php @@ -30,7 +30,7 @@ class ActiveDataProviderTest extends DatabaseTestCase $provider = new ActiveDataProvider(array( 'query' => Order::find()->orderBy('id'), )); - $orders = $provider->getItems(); + $orders = $provider->getModels(); $this->assertEquals(3, count($orders)); $this->assertTrue($orders[0] instanceof Order); $this->assertEquals(array(1, 2, 3), $provider->getKeys()); @@ -41,7 +41,7 @@ class ActiveDataProviderTest extends DatabaseTestCase 'pageSize' => 2, ) )); - $orders = $provider->getItems(); + $orders = $provider->getModels(); $this->assertEquals(2, count($orders)); } @@ -52,7 +52,7 @@ class ActiveDataProviderTest extends DatabaseTestCase 'db' => $this->getConnection(), 'query' => $query->from('tbl_order')->orderBy('id'), )); - $orders = $provider->getItems(); + $orders = $provider->getModels(); $this->assertEquals(3, count($orders)); $this->assertTrue(is_array($orders[0])); $this->assertEquals(array(0, 1, 2), $provider->getKeys()); @@ -65,7 +65,22 @@ class ActiveDataProviderTest extends DatabaseTestCase 'pageSize' => 2, ) )); - $orders = $provider->getItems(); + $orders = $provider->getModels(); $this->assertEquals(2, count($orders)); } + + public function testRefresh() + { + $query = new Query; + $provider = new ActiveDataProvider(array( + 'db' => $this->getConnection(), + 'query' => $query->from('tbl_order')->orderBy('id'), + )); + $this->assertEquals(3, count($provider->getModels())); + + $provider->getPagination()->pageSize = 2; + $this->assertEquals(3, count($provider->getModels())); + $provider->refresh(); + $this->assertEquals(2, count($provider->getModels())); + } }