Commit 6c00f6d2 authored by Alexander Makarov's avatar Alexander Makarov

Merge branch 'master'

parents f6d405b9 b9a83551
deny from all
#!/usr/bin/env php
<?php
/**
* build script file.
*
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
// fcgi doesn't have STDIN defined by default
defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
require(__DIR__ . '/../framework/yii.php');
$id = 'yiic-build';
$basePath = __DIR__;
$application = new yii\console\Application($id, $basePath);
$application->run();
@echo off
rem -------------------------------------------------------------
rem build script for Windows.
rem
rem This is the bootstrap script for running build on Windows.
rem
rem @author Qiang Xue <qiang.xue@gmail.com>
rem @link http://www.yiiframework.com/
rem @copyright 2008 Yii Software LLC
rem @license http://www.yiiframework.com/license/
rem @version $Id$
rem -------------------------------------------------------------
@setlocal
set BUILD_PATH=%~dp0
if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe
%PHP_COMMAND% "%BUILD_PATH%build" %*
@endlocal
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Phing build file for Yii.
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
* @copyright 2008-2009 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
-->
<project name="yii" basedir="." default="help">
<!-- task definitions -->
<taskdef name="yii-init-build" classname="YiiInitTask" classpath="tasks" />
<!--
<taskdef name="yii-pear" classname="YiiPearTask" classpath="tasks"/>
-->
<!-- init yii.version, yii.revision and yii.winbuild -->
<yii-init-build />
<!-- these are required external commands -->
<property name="php" value="php" /> <!-- PHP parser -->
<property name="hhc" value="hhc" /> <!-- compile phpdoc into CHM -->
<property name="pdflatex" value="pdflatex" /> <!-- generates PDF from LaTex -->
<property name="pkgname" value="${phing.project.name}-${yii.version}.${yii.revision}"/>
<property name="docname" value="${phing.project.name}-docs-${yii.version}.${yii.revision}"/>
<property name="pearname" value="${phing.project.name}-${yii.release}.tgz" />
<!-- directory definitions -->
<property name="build.base.dir" value="release"/>
<property name="build.dist.dir" value="${build.base.dir}/dist"/>
<property name="build.src.dir" value="${build.base.dir}/${pkgname}"/>
<property name="build.pear.src.dir" value="${build.src.dir}/framework" />
<property name="build.doc.dir" value="${build.base.dir}/${docname}"/>
<property name="build.web.dir" value="${build.base.dir}/web"/>
<tstamp>
<format property="DATE" pattern="%b %e %Y" />
</tstamp>
<if>
<equals arg1="${yii.winbuild}" arg2="true"/>
<then>
<property name="build" value="build"/>
</then>
<else>
<property name="build" value="php build"/>
</else>
</if>
<!-- source files in the framework -->
<fileset dir=".." id="framework">
<exclude name="**/.gitignore"/>
<exclude name="**/*.bak"/>
<exclude name="**/*~"/>
<include name="framework/**/*"/>
<include name="requirements/**/*"/>
<include name="demos/**/*"/>
<include name="CHANGELOG"/>
<include name="UPGRADE"/>
<include name="LICENSE"/>
<include name="README"/>
</fileset>
<!-- doc files -->
<fileset dir="../docs" id="docs">
<exclude name="**/.gitignore"/>
<exclude name="**/*.bak"/>
<exclude name="**/*~"/>
<include name="guide/**/*"/>
<include name="blog/**/*"/>
</fileset>
<fileset dir="../docs/guide" id="docs-guide">
<exclude name="**/.gitignore"/>
<exclude name="**/*.bak"/>
<exclude name="**/*~"/>
<include name="**/*"/>
</fileset>
<fileset dir="../docs/blog" id="docs-blog">
<exclude name="**/.gitignore"/>
<exclude name="**/*.bak"/>
<exclude name="**/*~"/>
<include name="**/*"/>
</fileset>
<fileset dir="." id="writables">
<include name="${build.src.dir}/**/runtime" />
<include name="${build.src.dir}/**/assets" />
<include name="${build.src.dir}/demos/**/data" />
</fileset>
<fileset dir="." id="executables">
<include name="${build.src.dir}/**/yiic" />
</fileset>
<target name="src" depends="sync">
<echo>Building package ${pkgname}...</echo>
<echo>Copying files to build directory...</echo>
<copy todir="${build.src.dir}">
<fileset refid="framework"/>
</copy>
<echo>Changing file permissions...</echo>
<chmod mode="0777">
<fileset refid="writables" />
</chmod>
<chmod mode="0755">
<fileset refid="executables" />
</chmod>
<echo>Generating source release file...</echo>
<mkdir dir="${build.dist.dir}" />
<if>
<equals arg1="${yii.winbuild}" arg2="true"/>
<then>
<tar destfile="${build.dist.dir}/${pkgname}.tar.gz" compression="gzip">
<fileset dir="${build.base.dir}">
<include name="${pkgname}/**/*"/>
</fileset>
</tar>
</then>
<else>
<exec command="tar czpf ${pkgname}.tar.gz ${pkgname}" dir="${build.base.dir}"/>
<move file="${build.base.dir}/${pkgname}.tar.gz" todir="${build.dist.dir}" />
</else>
</if>
<zip destfile="${build.dist.dir}/${pkgname}.zip">
<fileset dir="${build.base.dir}">
<include name="${pkgname}/**/*"/>
</fileset>
</zip>
</target>
<target name="doc" depends="sync">
<echo>Building documentation...</echo>
<echo>Building Guide PDF...</echo>
<exec command="${build} guideLatex" dir="." passthru="true" />
<exec command="${pdflatex} guide.tex -interaction=nonstopmode -max-print-line=120" dir="commands/guide" passthru="true"/>
<exec command="${pdflatex} guide.tex -interaction=nonstopmode -max-print-line=120" dir="commands/guide" passthru="true"/>
<exec command="${pdflatex} guide.tex -interaction=nonstopmode -max-print-line=120" dir="commands/guide" passthru="true"/>
<move file="commands/guide/guide.pdf" tofile="${build.doc.dir}/yii-guide-${yii.version}.pdf" />
<echo>Building Blog PDF...</echo>
<exec command="${build} blogLatex" dir="." passthru="true" />
<exec command="${pdflatex} blog.tex -interaction=nonstopmode -max-print-line=120" dir="commands/blog" passthru="true"/>
<exec command="${pdflatex} blog.tex -interaction=nonstopmode -max-print-line=120" dir="commands/blog" passthru="true"/>
<exec command="${pdflatex} blog.tex -interaction=nonstopmode -max-print-line=120" dir="commands/blog" passthru="true"/>
<move file="commands/blog/blog.pdf" tofile="${build.doc.dir}/yii-blog-${yii.version}.pdf" />
<echo>Building API...</echo>
<exec command="${build} api ${build.doc.dir}" dir="." passthru="true" />
<!--
<echo>Building API CHM...</echo>
<exec command="${hhc} ${build.doc.dir}/api/manual.hhp" />
<move file="${build.doc.dir}/api/manual.chm" tofile="${build.doc.dir}/yii-api-${yii.version}.chm" />
<delete>
<fileset dir="${build.doc.dir}/api">
<include name="manual.*" />
</fileset>
</delete>
-->
<echo>Generating doc release file...</echo>
<mkdir dir="${build.dist.dir}" />
<tar destfile="${build.dist.dir}/${docname}.tar.gz" compression="gzip">
<fileset dir="${build.base.dir}">
<include name="${docname}/**/*"/>
</fileset>
</tar>
<zip destfile="${build.dist.dir}/${docname}.zip">
<fileset dir="${build.base.dir}">
<include name="${docname}/**/*"/>
</fileset>
</zip>
</target>
<target name="web" depends="sync">
<echo>Building online API...</echo>
<mkdir dir="${build.web.dir}/common/data/${yii.version}" />
<exec command="${build} api ${build.web.dir}/common/data/${yii.version} online" dir="." passthru="true" />
<echo>Copying tutorials...</echo>
<copy todir="${build.web.dir}/common/data/${yii.version}/tutorials/guide">
<fileset refid="docs-guide"/>
</copy>
<copy todir="${build.web.dir}/common/data/${yii.version}/tutorials/blog">
<fileset refid="docs-blog"/>
</copy>
<echo>Copying release text files...</echo>
<mkdir dir="${build.web.dir}/frontend/www/files" />
<copy file="../CHANGELOG" tofile="${build.web.dir}/frontend/www/files/CHANGELOG-${yii.version}.txt" />
<copy file="../UPGRADE" tofile="${build.web.dir}/frontend/www/files/UPGRADE-${yii.version}.txt" />
<echo>
Finished building Web files.
Please update yiisite/common/data/versions.php file with the following code:
'1.1'=>array(
'version'=>'${yii.version}',
'revision'=>'${yii.revision}',
'date'=>'${yii.date}',
'latest'=>true,
),
</echo>
</target>
<target name="sync">
<echo>Synchronizing code changes for ${pkgname}...</echo>
<echo>Building autoload map...</echo>
<exec command="${build} autoload" dir="." passthru="true"/>
<echo>Building yiilite.php...</echo>
<exec command="${build} lite" dir="." passthru="true"/>
</target>
<target name="message">
<echo>Extracting i18n messages...</echo>
<exec command="${build} message ../framework/messages/config.php" dir="." passthru="true"/>
</target>
<!--
<target name="pear" depends="clean,build">
<echo>Generating pear package for ${phing.project.name}-${yii.release}</echo>
<mkdir dir="${build.dist.dir}" />
<yii-pear pkgdir="${build.pear.src.dir}"
channel="pear.php.net"
version="${yii.release}"
state="stable"
category="framework"
package="${phing.project.name}"
summary="Yii PHP Framework"
pkgdescription="Yii PHP Framework: Best for Web 2.0 Development"
notes="http://www.yiiframework.com/files/CHANGELOG-${yii.release}.txt"
license="BSD"
/>
<exec command="pear package" dir="${build.pear.src.dir}" passthru="true" />
<move file="${build.pear.src.dir}/${pearname}" tofile="${build.dist.dir}/${pearname}" />
</target>
-->
<target name="clean">
<echo>Cleaning up the build...</echo>
<delete dir="${build.base.dir}"/>
</target>
<target name="help">
<echo>
Welcome to use Yii build script!
--------------------------------
You may use the following command format to build a target:
phing &lt;target name&gt;
where &lt;target name&gt; can be one of the following:
- sync : synchronize yiilite.php and YiiBase.php
- message : extract i18n messages of the framework
- src : build source release
- doc : build documentation release (Windows only)
- clean : clean up the build
</echo>
</target>
</project>
<?php
/**
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
use yii\console\Controller;
use yii\helpers\FileHelper;
/**
* http://www.unicode.org/cldr/charts/supplemental/language_plural_rules.html
* @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0
*/
class LocaleController extends Controller
{
public $defaultAction = 'plural';
/**
* Generates the plural rules data.
*
* This command will parse the plural rule XML file from CLDR and convert them
* into appropriate PHP representation to support Yii message translation feature.
* @param string $xmlFile the original plural rule XML file (from CLDR). This file may be found in
* http://www.unicode.org/Public/cldr/latest/core.zip
* Extract the zip file and locate the file "common/supplemental/plurals.xml".
* @throws Exception
*/
public function actionPlural($xmlFile)
{
if (!is_file($xmlFile)) {
throw new Exception("The source plural rule file does not exist: $xmlFile");
}
$xml = simplexml_load_file($xmlFile);
$allRules = array();
$patterns = array(
'/n in 0..1/' => '(n==0||n==1)',
'/\s+is\s+not\s+/i' => '!=', //is not
'/\s+is\s+/i' => '==', //is
'/n\s+mod\s+(\d+)/i' => 'fmod(n,$1)', //mod (CLDR's "mod" is "fmod()", not "%")
'/^(.*?)\s+not\s+in\s+(\d+)\.\.(\d+)/i' => '!in_array($1,range($2,$3))', //not in
'/^(.*?)\s+in\s+(\d+)\.\.(\d+)/i' => 'in_array($1,range($2,$3))', //in
'/^(.*?)\s+not\s+within\s+(\d+)\.\.(\d+)/i' => '($1<$2||$1>$3)', //not within
'/^(.*?)\s+within\s+(\d+)\.\.(\d+)/i' => '($1>=$2&&$1<=$3)', //within
);
foreach ($xml->plurals->pluralRules as $node) {
$attributes = $node->attributes();
$locales = explode(' ', $attributes['locales']);
$rules = array();
if (!empty($node->pluralRule)) {
foreach ($node->pluralRule as $rule) {
$expr_or = preg_split('/\s+or\s+/i', $rule);
foreach ($expr_or as $key_or => $val_or) {
$expr_and = preg_split('/\s+and\s+/i', $val_or);
$expr_and = preg_replace(array_keys($patterns), array_values($patterns), $expr_and);
$expr_or[$key_or] = implode('&&', $expr_and);
}
$expr = preg_replace('/\\bn\\b/', '$n', implode('||', $expr_or));
$rules[] = preg_replace_callback('/range\((\d+),(\d+)\)/', function ($matches) {
if ($matches[2] - $matches[1] <= 5) {
return 'array(' . implode(',', range($matches[1], $matches[2])) . ')';
} else {
return $matches[0];
}
}, $expr);
}
foreach ($locales as $locale) {
$allRules[$locale] = $rules;
}
}
}
// hard fix for "br": the rule is too complex
$allRules['br'] = array(
0 => 'fmod($n,10)==1&&!in_array(fmod($n,100),array(11,71,91))',
1 => 'fmod($n,10)==2&&!in_array(fmod($n,100),array(12,72,92))',
2 => 'in_array(fmod($n,10),array(3,4,9))&&!in_array(fmod($n,100),array_merge(range(10,19),range(70,79),range(90,99)))',
3 => 'fmod($n,1000000)==0&&$n!=0',
);
if (preg_match('/\d+/', $xml->version['number'], $matches)) {
$revision = $matches[0];
} else {
$revision = -1;
}
echo "<?php\n";
echo <<<EOD
/**
* Plural rules.
*
* This file is automatically generated by the "yiic locale/plural" command under the "build" folder.
* Do not modify it directly.
*
* The original plural rule data used for generating this file has the following copyright terms:
*
* Copyright © 1991-2007 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
*
* @revision $revision (of the original plural file)
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
EOD;
echo "\nreturn " . var_export($allRules, true) . ';';
}
}
...@@ -204,7 +204,7 @@ doIt('a', array( ...@@ -204,7 +204,7 @@ doIt('a', array(
~~~ ~~~
if ($event === null) { if ($event === null) {
return new Event($this); return new Event();
} elseif ($event instanceof CoolEvent) { } elseif ($event instanceof CoolEvent) {
return $event->instance(); return $event->instance();
} else { } else {
......
...@@ -192,6 +192,7 @@ class YiiBase ...@@ -192,6 +192,7 @@ class YiiBase
* @param boolean $throwException whether to throw an exception if the given alias is invalid. * @param boolean $throwException whether to throw an exception if the given alias is invalid.
* If this is false and an invalid alias is given, false will be returned by this method. * If this is false and an invalid alias is given, false will be returned by this method.
* @return string|boolean path corresponding to the alias, false if the root alias is not previously registered. * @return string|boolean path corresponding to the alias, false if the root alias is not previously registered.
* @throws InvalidParamException if the alias is invalid while $throwException is true.
* @see setAlias * @see setAlias
*/ */
public static function getAlias($alias, $throwException = true) public static function getAlias($alias, $throwException = true)
...@@ -231,6 +232,7 @@ class YiiBase ...@@ -231,6 +232,7 @@ class YiiBase
* - a URL (e.g. `http://www.yiiframework.com`) * - a URL (e.g. `http://www.yiiframework.com`)
* - a path alias (e.g. `@yii/base`). In this case, the path alias will be converted into the * - a path alias (e.g. `@yii/base`). In this case, the path alias will be converted into the
* actual path first by calling [[getAlias]]. * actual path first by calling [[getAlias]].
*
* @throws Exception if $path is an invalid alias * @throws Exception if $path is an invalid alias
* @see getAlias * @see getAlias
*/ */
...@@ -238,7 +240,7 @@ class YiiBase ...@@ -238,7 +240,7 @@ class YiiBase
{ {
if ($path === null) { if ($path === null) {
unset(self::$aliases[$alias]); unset(self::$aliases[$alias]);
} elseif ($path[0] !== '@') { } elseif (strncmp($path, '@', 1)) {
self::$aliases[$alias] = rtrim($path, '\\/'); self::$aliases[$alias] = rtrim($path, '\\/');
} else { } else {
self::$aliases[$alias] = static::getAlias($path); self::$aliases[$alias] = static::getAlias($path);
...@@ -504,20 +506,28 @@ class YiiBase ...@@ -504,20 +506,28 @@ class YiiBase
/** /**
* Translates a message to the specified language. * Translates a message to the specified language.
* This method supports choice format (see {@link CChoiceFormat}), *
* i.e., the message returned will be chosen from a few candidates according to the given * The translation will be conducted according to the message category and the target language.
* number value. This feature is mainly used to solve plural format issue in case * To specify the category of the message, prefix the message with the category name and separate it
* a message has different plural forms in some languages. * with "|". For example, "app|hello world". If the category is not specified, the default category "app"
* @param string $message the original message * will be used. The actual message translation is done by a [[\yii\i18n\MessageSource|message source]].
* @param array $params parameters to be applied to the message using <code>strtr</code>. *
* The first parameter can be a number without key. * In case when a translated message has different plural forms (separated by "|"), this method
* And in this case, the method will call {@link CChoiceFormat::format} to choose * will also attempt to choose an appropriate one according to a given numeric value which is
* an appropriate message translation. * specified as the first parameter (indexed by 0) in `$params`.
* You can pass parameter for {@link CChoiceFormat::format} *
* or plural forms format without wrapping it with array. * For example, if a translated message is "I have an apple.|I have {n} apples.", and the first
* @param string $language the target language. If null (default), the {@link CApplication::getLanguage application language} will be used. * parameter is 2, the message returned will be "I have 2 apples.". Note that the placeholder "{n}"
* @return string the translated message * will be replaced with the given number.
* @see CMessageSource *
* For more details on how plural rules are applied, please refer to:
* [[http://www.unicode.org/cldr/charts/supplemental/language_plural_rules.html]]
*
* @param string $message the message to be translated.
* @param array $params the parameters that will be used to replace the corresponding placeholders in the message.
* @param string $language the language code (e.g. `en_US`, `en`). If this is null, the current
* [[\yii\base\Application::language|application language]] will be used.
* @return string the translated message.
*/ */
public static function t($message, $params = array(), $language = null) public static function t($message, $params = array(), $language = null)
{ {
......
...@@ -78,7 +78,7 @@ class Application extends Module ...@@ -78,7 +78,7 @@ class Application extends Module
*/ */
public $preload = array(); public $preload = array();
/** /**
* @var Controller the currently active controller instance * @var \yii\web\Controller|\yii\console\Controller the currently active controller instance
*/ */
public $controller; public $controller;
/** /**
...@@ -355,7 +355,7 @@ class Application extends Module ...@@ -355,7 +355,7 @@ class Application extends Module
/** /**
* Returns the request component. * Returns the request component.
* @return Request the request component * @return \yii\web\Request|\yii\console\Request the request component
*/ */
public function getRequest() public function getRequest()
{ {
......
...@@ -422,7 +422,10 @@ class Component extends \yii\base\Object ...@@ -422,7 +422,10 @@ class Component extends \yii\base\Object
$this->ensureBehaviors(); $this->ensureBehaviors();
if (isset($this->_e[$name]) && $this->_e[$name]->getCount()) { if (isset($this->_e[$name]) && $this->_e[$name]->getCount()) {
if ($event === null) { if ($event === null) {
$event = new Event($this); $event = new Event;
}
if ($event->sender === null) {
$event->sender = $this;
} }
$event->handled = false; $event->handled = false;
$event->name = $name; $event->name = $name;
......
...@@ -14,9 +14,6 @@ use yii\helpers\StringHelper; ...@@ -14,9 +14,6 @@ use yii\helpers\StringHelper;
/** /**
* Controller is the base class for classes containing controller logic. * Controller is the base class for classes containing controller logic.
* *
* @property string $route the route (module ID, controller ID and action ID) of the current request.
* @property string $uniqueId the controller ID that is prefixed with the module ID (if any).
*
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0 * @since 2.0
*/ */
...@@ -50,6 +47,11 @@ class Controller extends Component ...@@ -50,6 +47,11 @@ class Controller extends Component
* by [[run()]] when it is called by [[Application]] to run an action. * by [[run()]] when it is called by [[Application]] to run an action.
*/ */
public $action; public $action;
/**
* @var View the view object that can be used to render views or view files.
*/
private $_view;
/** /**
* @param string $id the ID of this controller * @param string $id the ID of this controller
...@@ -138,7 +140,7 @@ class Controller extends Component ...@@ -138,7 +140,7 @@ class Controller extends Component
} elseif ($pos > 0) { } elseif ($pos > 0) {
return $this->module->runAction($route, $params); return $this->module->runAction($route, $params);
} else { } else {
return \Yii::$app->runAction(ltrim($route, '/'), $params); return Yii::$app->runAction(ltrim($route, '/'), $params);
} }
} }
...@@ -296,6 +298,37 @@ class Controller extends Component ...@@ -296,6 +298,37 @@ class Controller extends Component
/** /**
* Renders a view and applies layout if available. * Renders a view and applies layout if available.
*
* The view to be rendered can be specified in one of the following formats:
*
* - path alias (e.g. "@app/views/site/index");
* - absolute path within application (e.g. "//site/index"): the view name starts with double slashes.
* The actual view file will be looked for under the [[Application::viewPath|view path]] of the application.
* - absolute path within module (e.g. "/site/index"): the view name starts with a single slash.
* The actual view file will be looked for under the [[Module::viewPath|view path]] of [[module]].
* - relative path (e.g. "index"): the actual view file will be looked for under [[viewPath]].
*
* To determine which layout should be applied, the following two steps are conducted:
*
* 1. In the first step, it determines the layout name and the context module:
*
* - If [[layout]] is specified as a string, use it as the layout name and [[module]] as the context module;
* - If [[layout]] is null, search through all ancestor modules of this controller and find the first
* module whose [[Module::layout|layout]] is not null. The layout and the corresponding module
* are used as the layout name and the context module, respectively. If such a module is not found
* or the corresponding layout is not a string, it will return false, meaning no applicable layout.
*
* 2. In the second step, it determines the actual layout file according to the previously found layout name
* and context module. The layout name can be
*
* - a path alias (e.g. "@app/views/layouts/main");
* - an absolute path (e.g. "/main"): the layout name starts with a slash. The actual layout file will be
* looked for under the [[Application::layoutPath|layout path]] of the application;
* - a relative path (e.g. "main"): the actual layout layout file will be looked for under the
* [[Module::viewPath|view path]] of the context module.
*
* If the layout name does not contain a file extension, it will use the default one `.php`.
*
* @param string $view the view name. Please refer to [[findViewFile()]] on how to specify a view name. * @param string $view the view name. Please refer to [[findViewFile()]] on how to specify a view name.
* @param array $params the parameters (name-value pairs) that should be made available in the view. * @param array $params the parameters (name-value pairs) that should be made available in the view.
* These parameters will not be available in the layout. * These parameters will not be available in the layout.
...@@ -304,10 +337,11 @@ class Controller extends Component ...@@ -304,10 +337,11 @@ class Controller extends Component
*/ */
public function render($view, $params = array()) public function render($view, $params = array())
{ {
$output = Yii::$app->getView()->render($view, $params, $this); $viewFile = $this->findViewFile($view);
$output = $this->getView()->renderFile($viewFile, $params, $this);
$layoutFile = $this->findLayoutFile(); $layoutFile = $this->findLayoutFile();
if ($layoutFile !== false) { if ($layoutFile !== false) {
return Yii::$app->getView()->renderFile($layoutFile, array('content' => $output), $this); return $this->getView()->renderFile($layoutFile, array('content' => $output), $this);
} else { } else {
return $output; return $output;
} }
...@@ -316,14 +350,14 @@ class Controller extends Component ...@@ -316,14 +350,14 @@ class Controller extends Component
/** /**
* Renders a view. * Renders a view.
* This method differs from [[render()]] in that it does not apply any layout. * This method differs from [[render()]] in that it does not apply any layout.
* @param string $view the view name. Please refer to [[findViewFile()]] on how to specify a view name. * @param string $view the view name. Please refer to [[render()]] on how to specify a view name.
* @param array $params the parameters (name-value pairs) that should be made available in the view. * @param array $params the parameters (name-value pairs) that should be made available in the view.
* @return string the rendering result. * @return string the rendering result.
* @throws InvalidParamException if the view file does not exist. * @throws InvalidParamException if the view file does not exist.
*/ */
public function renderPartial($view, $params = array()) public function renderPartial($view, $params = array())
{ {
return Yii::$app->getView()->render($view, $params, $this); return $this->getView()->render($view, $params, $this);
} }
/** /**
...@@ -335,7 +369,30 @@ class Controller extends Component ...@@ -335,7 +369,30 @@ class Controller extends Component
*/ */
public function renderFile($file, $params = array()) public function renderFile($file, $params = array())
{ {
return Yii::$app->getView()->renderFile($file, $params, $this); return $this->getView()->renderFile($file, $params, $this);
}
/**
* Returns the view object that can be used to render views or view files.
* The [[render()]], [[renderPartial()]] and [[renderFile()]] methods will use
* this view object to implement the actual view rendering.
* @return View the view object that can be used to render views or view files.
*/
public function getView()
{
if ($this->_view === null) {
$this->_view = Yii::$app->getView();
}
return $this->_view;
}
/**
* Sets the view object to be used by this controller.
* @param View $view the view object that can be used to render views or view files.
*/
public function setView($view)
{
$this->_view = $view;
} }
/** /**
...@@ -349,31 +406,34 @@ class Controller extends Component ...@@ -349,31 +406,34 @@ class Controller extends Component
return $this->module->getViewPath() . DIRECTORY_SEPARATOR . $this->id; return $this->module->getViewPath() . DIRECTORY_SEPARATOR . $this->id;
} }
/**
* Finds the view file based on the given view name.
* @param string $view the view name or the path alias of the view file. Please refer to [[render()]]
* on how to specify this parameter.
* @return string the view file path. Note that the file may not exist.
*/
protected function findViewFile($view)
{
if (strncmp($view, '@', 1) === 0) {
// e.g. "@app/views/main"
$file = Yii::getAlias($view);
} elseif (strncmp($view, '//', 2) === 0) {
// e.g. "//layouts/main"
$file = Yii::$app->getViewPath() . DIRECTORY_SEPARATOR . ltrim($view, '/');
} elseif (strncmp($view, '/', 1) === 0) {
// e.g. "/site/index"
$file = $this->module->getViewPath() . DIRECTORY_SEPARATOR . ltrim($view, '/');
} else {
$file = $this->getViewPath() . DIRECTORY_SEPARATOR . $view;
}
return FileHelper::getExtension($file) === '' ? $file . '.php' : $file;
}
/** /**
* Finds the applicable layout file. * Finds the applicable layout file.
*
* This method locates an applicable layout file via two steps.
*
* In the first step, it determines the layout name and the context module:
*
* - If [[layout]] is specified as a string, use it as the layout name and [[module]] as the context module;
* - If [[layout]] is null, search through all ancestor modules of this controller and find the first
* module whose [[Module::layout|layout]] is not null. The layout and the corresponding module
* are used as the layout name and the context module, respectively. If such a module is not found
* or the corresponding layout is not a string, it will return false, meaning no applicable layout.
*
* In the second step, it determines the actual layout file according to the previously found layout name
* and context module. The layout name can be
*
* - a path alias (e.g. "@app/views/layouts/main");
* - an absolute path (e.g. "/main"): the layout name starts with a slash. The actual layout file will be
* looked for under the [[Application::layoutPath|layout path]] of the application;
* - a relative path (e.g. "main"): the actual layout layout file will be looked for under the
* [[Module::viewPath|view path]] of the context module.
*
* If the layout name does not contain a file extension, it will use the default one `.php`.
*
* @return string|boolean the layout file path, or false if layout is not needed. * @return string|boolean the layout file path, or false if layout is not needed.
* Please refer to [[render()]] on how to specify this parameter.
* @throws InvalidParamException if an invalid path alias is used to specify the layout * @throws InvalidParamException if an invalid path alias is used to specify the layout
*/ */
protected function findLayoutFile() protected function findLayoutFile()
......
...@@ -148,7 +148,7 @@ class Dictionary extends Object implements \IteratorAggregate, \ArrayAccess, \Co ...@@ -148,7 +148,7 @@ class Dictionary extends Object implements \IteratorAggregate, \ArrayAccess, \Co
* Defaults to false, meaning all items in the dictionary will be cleared directly * Defaults to false, meaning all items in the dictionary will be cleared directly
* without calling [[remove]]. * without calling [[remove]].
*/ */
public function clear($safeClear = false) public function removeAll($safeClear = false)
{ {
if ($safeClear) { if ($safeClear) {
foreach (array_keys($this->_d) as $key) { foreach (array_keys($this->_d) as $key) {
...@@ -164,7 +164,7 @@ class Dictionary extends Object implements \IteratorAggregate, \ArrayAccess, \Co ...@@ -164,7 +164,7 @@ class Dictionary extends Object implements \IteratorAggregate, \ArrayAccess, \Co
* @param mixed $key the key * @param mixed $key the key
* @return boolean whether the dictionary contains an item with the specified key * @return boolean whether the dictionary contains an item with the specified key
*/ */
public function contains($key) public function has($key)
{ {
return isset($this->_d[$key]) || array_key_exists($key, $this->_d); return isset($this->_d[$key]) || array_key_exists($key, $this->_d);
} }
...@@ -188,7 +188,7 @@ class Dictionary extends Object implements \IteratorAggregate, \ArrayAccess, \Co ...@@ -188,7 +188,7 @@ class Dictionary extends Object implements \IteratorAggregate, \ArrayAccess, \Co
{ {
if (is_array($data) || $data instanceof \Traversable) { if (is_array($data) || $data instanceof \Traversable) {
if ($this->_d !== array()) { if ($this->_d !== array()) {
$this->clear(); $this->removeAll();
} }
if ($data instanceof self) { if ($data instanceof self) {
$data = $data->_d; $data = $data->_d;
...@@ -252,7 +252,7 @@ class Dictionary extends Object implements \IteratorAggregate, \ArrayAccess, \Co ...@@ -252,7 +252,7 @@ class Dictionary extends Object implements \IteratorAggregate, \ArrayAccess, \Co
*/ */
public function offsetExists($offset) public function offsetExists($offset)
{ {
return $this->contains($offset); return $this->has($offset);
} }
/** /**
......
...@@ -16,8 +16,6 @@ namespace yii\base; ...@@ -16,8 +16,6 @@ namespace yii\base;
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0 * @since 2.0
*/ */
use yii\helpers\VarDumper;
class ErrorHandler extends Component class ErrorHandler extends Component
{ {
/** /**
...@@ -63,10 +61,10 @@ class ErrorHandler extends Component ...@@ -63,10 +61,10 @@ class ErrorHandler extends Component
$this->clearOutput(); $this->clearOutput();
} }
$this->render($exception); $this->renderException($exception);
} }
protected function render($exception) protected function renderException($exception)
{ {
if ($this->errorAction !== null) { if ($this->errorAction !== null) {
\Yii::$app->runAction($this->errorAction); \Yii::$app->runAction($this->errorAction);
...@@ -84,7 +82,7 @@ class ErrorHandler extends Component ...@@ -84,7 +82,7 @@ class ErrorHandler extends Component
} else { } else {
$viewName = $this->exceptionView; $viewName = $this->exceptionView;
} }
echo $view->render($viewName, array( echo $view->renderFile($viewName, array(
'exception' => $exception, 'exception' => $exception,
), $this); ), $this);
} }
...@@ -255,7 +253,7 @@ class ErrorHandler extends Component ...@@ -255,7 +253,7 @@ class ErrorHandler extends Component
{ {
$view = new View; $view = new View;
$name = !YII_DEBUG || $exception instanceof HttpException ? $this->errorView : $this->exceptionView; $name = !YII_DEBUG || $exception instanceof HttpException ? $this->errorView : $this->exceptionView;
echo $view->render($name, array( echo $view->renderFile($name, array(
'exception' => $exception, 'exception' => $exception,
), $this); ), $this);
} }
......
...@@ -28,7 +28,8 @@ class Event extends \yii\base\Object ...@@ -28,7 +28,8 @@ class Event extends \yii\base\Object
*/ */
public $name; public $name;
/** /**
* @var object the sender of this event * @var object the sender of this event. If not set, this property will be
* set as the object whose "trigger()" method is called.
*/ */
public $sender; public $sender;
/** /**
...@@ -38,21 +39,7 @@ class Event extends \yii\base\Object ...@@ -38,21 +39,7 @@ class Event extends \yii\base\Object
*/ */
public $handled = false; public $handled = false;
/** /**
* @var mixed extra data associated with the event. * @var mixed extra custom data associated with the event.
*/ */
public $data; public $data;
/**
* Constructor.
*
* @param mixed $sender sender of the event
* @param mixed $data extra data associated with the event
* @param array $config name-value pairs that will be used to initialize the object properties
*/
public function __construct($sender = null, $data = null, $config = array())
{
$this->sender = $sender;
$this->data = $data;
parent::__construct($config);
}
} }
...@@ -29,11 +29,12 @@ class HttpException extends UserException ...@@ -29,11 +29,12 @@ class HttpException extends UserException
* @param integer $status HTTP status code, such as 404, 500, etc. * @param integer $status HTTP status code, such as 404, 500, etc.
* @param string $message error message * @param string $message error message
* @param integer $code error code * @param integer $code error code
* @param \Exception $previous The previous exception used for the exception chaining.
*/ */
public function __construct($status, $message = null, $code = 0) public function __construct($status, $message = null, $code = 0, \Exception $previous = null)
{ {
$this->statusCode = $status; $this->statusCode = $status;
parent::__construct($message, $code); parent::__construct($message, $code, $previous);
} }
/** /**
......
...@@ -258,7 +258,7 @@ class Model extends Component implements \IteratorAggregate, \ArrayAccess ...@@ -258,7 +258,7 @@ class Model extends Component implements \IteratorAggregate, \ArrayAccess
*/ */
public function beforeValidate() public function beforeValidate()
{ {
$event = new ModelEvent($this); $event = new ModelEvent;
$this->trigger(self::EVENT_BEFORE_VALIDATE, $event); $this->trigger(self::EVENT_BEFORE_VALIDATE, $event);
return $event->isValid; return $event->isValid;
} }
...@@ -329,7 +329,7 @@ class Model extends Component implements \IteratorAggregate, \ArrayAccess ...@@ -329,7 +329,7 @@ class Model extends Component implements \IteratorAggregate, \ArrayAccess
foreach ($this->rules() as $rule) { foreach ($this->rules() as $rule) {
if ($rule instanceof Validator) { if ($rule instanceof Validator) {
$validators->add($rule); $validators->add($rule);
} elseif (isset($rule[0], $rule[1])) { // attributes, validator type } elseif (is_array($rule) && isset($rule[0], $rule[1])) { // attributes, validator type
$validator = Validator::createValidator($rule[1], $this, $rule[0], array_slice($rule, 2)); $validator = Validator::createValidator($rule[1], $this, $rule[0], array_slice($rule, 2));
$validators->add($validator); $validators->add($validator);
} else { } else {
...@@ -429,9 +429,9 @@ class Model extends Component implements \IteratorAggregate, \ArrayAccess ...@@ -429,9 +429,9 @@ class Model extends Component implements \IteratorAggregate, \ArrayAccess
return array(); return array();
} else { } else {
$errors = array(); $errors = array();
foreach ($this->_errors as $errors) { foreach ($this->_errors as $attributeErrors) {
if (isset($errors[0])) { if (isset($attributeErrors[0])) {
$errors[] = $errors[0]; $errors[] = $attributeErrors[0];
} }
} }
} }
...@@ -541,7 +541,7 @@ class Model extends Component implements \IteratorAggregate, \ArrayAccess ...@@ -541,7 +541,7 @@ class Model extends Component implements \IteratorAggregate, \ArrayAccess
public function onUnsafeAttribute($name, $value) public function onUnsafeAttribute($name, $value)
{ {
if (YII_DEBUG) { if (YII_DEBUG) {
\Yii::info("Failed to set unsafe attribute '$name' in '" . get_class($this) . "'.", __CLASS__); \Yii::info("Failed to set unsafe attribute '$name' in '" . get_class($this) . "'.", __METHOD__);
} }
} }
...@@ -656,13 +656,13 @@ class Model extends Component implements \IteratorAggregate, \ArrayAccess ...@@ -656,13 +656,13 @@ class Model extends Component implements \IteratorAggregate, \ArrayAccess
} }
/** /**
* Unsets the element at the specified offset. * Sets the element value at the specified offset to null.
* This method is required by the SPL interface `ArrayAccess`. * This method is required by the SPL interface `ArrayAccess`.
* It is implicitly called when you use something like `unset($model[$offset])`. * It is implicitly called when you use something like `unset($model[$offset])`.
* @param mixed $offset the offset to unset element * @param mixed $offset the offset to unset element
*/ */
public function offsetUnset($offset) public function offsetUnset($offset)
{ {
unset($this->$offset); $this->$offset = null;
} }
} }
This diff is collapsed.
...@@ -191,7 +191,7 @@ class Vector extends Object implements \IteratorAggregate, \ArrayAccess, \Counta ...@@ -191,7 +191,7 @@ class Vector extends Object implements \IteratorAggregate, \ArrayAccess, \Counta
* Defaults to false, meaning all items in the vector will be cleared directly * Defaults to false, meaning all items in the vector will be cleared directly
* without calling [[removeAt]]. * without calling [[removeAt]].
*/ */
public function clear($safeClear = false) public function removeAll($safeClear = false)
{ {
if ($safeClear) { if ($safeClear) {
for ($i = $this->_c - 1; $i >= 0; --$i) { for ($i = $this->_c - 1; $i >= 0; --$i) {
...@@ -209,7 +209,7 @@ class Vector extends Object implements \IteratorAggregate, \ArrayAccess, \Counta ...@@ -209,7 +209,7 @@ class Vector extends Object implements \IteratorAggregate, \ArrayAccess, \Counta
* @param mixed $item the item * @param mixed $item the item
* @return boolean whether the vector contains the item * @return boolean whether the vector contains the item
*/ */
public function contains($item) public function has($item)
{ {
return $this->indexOf($item) >= 0; return $this->indexOf($item) >= 0;
} }
...@@ -246,7 +246,7 @@ class Vector extends Object implements \IteratorAggregate, \ArrayAccess, \Counta ...@@ -246,7 +246,7 @@ class Vector extends Object implements \IteratorAggregate, \ArrayAccess, \Counta
{ {
if (is_array($data) || $data instanceof \Traversable) { if (is_array($data) || $data instanceof \Traversable) {
if ($this->_c > 0) { if ($this->_c > 0) {
$this->clear(); $this->removeAll();
} }
if ($data instanceof self) { if ($data instanceof self) {
$data = $data->_d; $data = $data->_d;
......
...@@ -79,22 +79,29 @@ class View extends Component ...@@ -79,22 +79,29 @@ class View extends Component
/** /**
* Renders a view. * Renders a view.
* *
* This method will call [[findViewFile()]] to convert the view name into the corresponding view * This method delegates the call to the [[context]] object:
* file path, and it will then call [[renderFile()]] to render the view.
* *
* @param string $view the view name. Please refer to [[findViewFile()]] on how to specify this parameter. * - If [[context]] is a controller, the [[Controller::renderPartial()]] method will be called;
* - If [[context]] is a widget, the [[Widget::render()]] method will be called;
* - Otherwise, an InvalidCallException exception will be thrown.
*
* @param string $view the view name. Please refer to [[Controller::findViewFile()]]
* and [[Widget::findViewFile()]] on how to specify this parameter.
* @param array $params the parameters (name-value pairs) that will be extracted and made available in the view file. * @param array $params the parameters (name-value pairs) that will be extracted and made available in the view file.
* @param object $context the context that the view should use for rendering the view. If null,
* existing [[context]] will be used.
* @return string the rendering result * @return string the rendering result
* @throws InvalidCallException if [[context]] is neither a controller nor a widget.
* @throws InvalidParamException if the view cannot be resolved or the view file does not exist. * @throws InvalidParamException if the view cannot be resolved or the view file does not exist.
* @see renderFile * @see renderFile
* @see findViewFile
*/ */
public function render($view, $params = array(), $context = null) public function render($view, $params = array())
{ {
$viewFile = $this->findViewFile($context, $view); if ($this->context instanceof Controller) {
return $this->renderFile($viewFile, $params, $context); return $this->context->renderPartial($view, $params);
} elseif ($this->context instanceof Widget) {
return $this->context->render($view, $params);
} else {
throw new InvalidCallException('View::render() is not supported for the current context.');
}
} }
/** /**
...@@ -212,49 +219,6 @@ class View extends Component ...@@ -212,49 +219,6 @@ class View extends Component
return eval($statements); return eval($statements);
} }
/**
* Finds the view file based on the given view name.
*
* A view name can be specified in one of the following formats:
*
* - path alias (e.g. "@app/views/site/index");
* - absolute path within application (e.g. "//site/index"): the view name starts with double slashes.
* The actual view file will be looked for under the [[Application::viewPath|view path]] of the application.
* - absolute path within module (e.g. "/site/index"): the view name starts with a single slash.
* The actual view file will be looked for under the [[Module::viewPath|view path]] of the currently
* active module.
* - relative path (e.g. "index"): the actual view file will be looked for under [[Controller::viewPath|viewPath]]
* of the context object, assuming the context is either a [[Controller]] or a [[Widget]].
*
* If the view name does not contain a file extension, it will use the default one `.php`.
*
* @param object $context the view context object
* @param string $view the view name or the path alias of the view file.
* @return string the view file path. Note that the file may not exist.
* @throws InvalidParamException if the view file is an invalid path alias or the context cannot be
* used to determine the actual view file corresponding to the specified view.
*/
protected function findViewFile($context, $view)
{
if (strncmp($view, '@', 1) === 0) {
// e.g. "@app/views/main"
$file = Yii::getAlias($view);
} elseif (strncmp($view, '//', 2) === 0) {
// e.g. "//layouts/main"
$file = Yii::$app->getViewPath() . DIRECTORY_SEPARATOR . ltrim($view, '/');
} elseif (strncmp($view, '/', 1) === 0) {
// e.g. "/site/index"
$file = Yii::$app->controller->module->getViewPath() . DIRECTORY_SEPARATOR . ltrim($view, '/');
} elseif ($context instanceof Controller || $context instanceof Widget) {
/** @var $context Controller|Widget */
$file = $context->getViewPath() . DIRECTORY_SEPARATOR . $view;
} else {
throw new InvalidParamException("Unable to resolve the view file for '$view'.");
}
return FileHelper::getExtension($file) === '' ? $file . '.php' : $file;
}
/** /**
* Creates a widget. * Creates a widget.
* This method will use [[Yii::createObject()]] to create the widget. * This method will use [[Yii::createObject()]] to create the widget.
...@@ -265,7 +229,10 @@ class View extends Component ...@@ -265,7 +229,10 @@ class View extends Component
public function createWidget($class, $properties = array()) public function createWidget($class, $properties = array())
{ {
$properties['class'] = $class; $properties['class'] = $class;
return Yii::createObject($properties, $this->context); if (!isset($properties['view'])) {
$properties['view'] = $this;
}
return Yii::createObject($properties, $this);
} }
/** /**
...@@ -341,7 +308,6 @@ class View extends Component ...@@ -341,7 +308,6 @@ class View extends Component
return $this->beginWidget('yii\widgets\Clip', array( return $this->beginWidget('yii\widgets\Clip', array(
'id' => $id, 'id' => $id,
'renderInPlace' => $renderInPlace, 'renderInPlace' => $renderInPlace,
'view' => $this,
)); ));
} }
...@@ -355,17 +321,25 @@ class View extends Component ...@@ -355,17 +321,25 @@ class View extends Component
/** /**
* Begins the rendering of content that is to be decorated by the specified view. * Begins the rendering of content that is to be decorated by the specified view.
* @param string $view the name of the view that will be used to decorate the content enclosed by this widget. * This method can be used to implement nested layout. For example, a layout can be embedded
* Please refer to [[View::findViewFile()]] on how to set this property. * in another layout file specified as '@app/view/layouts/base' like the following:
*
* ~~~
* <?php $this->beginContent('@app/view/layouts/base'); ?>
* ...layout content here...
* <?php $this->endContent(); ?>
* ~~~
*
* @param string $viewFile the view file that will be used to decorate the content enclosed by this widget.
* This can be specified as either the view file path or path alias.
* @param array $params the variables (name=>value) to be extracted and made available in the decorative view. * @param array $params the variables (name=>value) to be extracted and made available in the decorative view.
* @return \yii\widgets\ContentDecorator the ContentDecorator widget instance * @return \yii\widgets\ContentDecorator the ContentDecorator widget instance
* @see \yii\widgets\ContentDecorator * @see \yii\widgets\ContentDecorator
*/ */
public function beginContent($view, $params = array()) public function beginContent($viewFile, $params = array())
{ {
return $this->beginWidget('yii\widgets\ContentDecorator', array( return $this->beginWidget('yii\widgets\ContentDecorator', array(
'view' => $this, 'viewFile' => $viewFile,
'viewName' => $view,
'params' => $params, 'params' => $params,
)); ));
} }
...@@ -400,7 +374,6 @@ class View extends Component ...@@ -400,7 +374,6 @@ class View extends Component
public function beginCache($id, $properties = array()) public function beginCache($id, $properties = array())
{ {
$properties['id'] = $id; $properties['id'] = $id;
$properties['view'] = $this;
/** @var $cache \yii\widgets\FragmentCache */ /** @var $cache \yii\widgets\FragmentCache */
$cache = $this->beginWidget('yii\widgets\FragmentCache', $properties); $cache = $this->beginWidget('yii\widgets\FragmentCache', $properties);
if ($cache->getCachedContent() !== false) { if ($cache->getCachedContent() !== false) {
......
...@@ -19,9 +19,11 @@ use yii\helpers\FileHelper; ...@@ -19,9 +19,11 @@ use yii\helpers\FileHelper;
class Widget extends Component class Widget extends Component
{ {
/** /**
* @var Widget|Controller the owner/creator of this widget. It could be either a widget or a controller. * @var View the view object that is used to create this widget.
* This property is automatically set by [[View::createWidget()]].
* This property is required by [[render()]] and [[renderFile()]].
*/ */
public $owner; public $view;
/** /**
* @var string id of the widget. * @var string id of the widget.
*/ */
...@@ -31,17 +33,6 @@ class Widget extends Component ...@@ -31,17 +33,6 @@ class Widget extends Component
*/ */
private static $_counter = 0; private static $_counter = 0;
/**
* Constructor.
* @param Widget|Controller $owner owner/creator of this widget.
* @param array $config name-value pairs that will be used to initialize the object properties
*/
public function __construct($owner, $config = array())
{
$this->owner = $owner;
parent::__construct($config);
}
/** /**
* Returns the ID of the widget. * Returns the ID of the widget.
* @param boolean $autoGenerate whether to generate an ID if it is not set previously * @param boolean $autoGenerate whether to generate an ID if it is not set previously
...@@ -73,6 +64,18 @@ class Widget extends Component ...@@ -73,6 +64,18 @@ class Widget extends Component
/** /**
* Renders a view. * Renders a view.
* The view to be rendered can be specified in one of the following formats:
*
* - path alias (e.g. "@app/views/site/index");
* - absolute path within application (e.g. "//site/index"): the view name starts with double slashes.
* The actual view file will be looked for under the [[Application::viewPath|view path]] of the application.
* - absolute path within module (e.g. "/site/index"): the view name starts with a single slash.
* The actual view file will be looked for under the [[Module::viewPath|view path]] of the currently
* active module.
* - relative path (e.g. "index"): the actual view file will be looked for under [[viewPath]].
*
* If the view name does not contain a file extension, it will use the default one `.php`.
* @param string $view the view name. Please refer to [[findViewFile()]] on how to specify a view name. * @param string $view the view name. Please refer to [[findViewFile()]] on how to specify a view name.
* @param array $params the parameters (name-value pairs) that should be made available in the view. * @param array $params the parameters (name-value pairs) that should be made available in the view.
* @return string the rendering result. * @return string the rendering result.
...@@ -80,7 +83,7 @@ class Widget extends Component ...@@ -80,7 +83,7 @@ class Widget extends Component
*/ */
public function render($view, $params = array()) public function render($view, $params = array())
{ {
return Yii::$app->getView()->render($view, $params, $this); return $this->view->render($view, $params, $this);
} }
/** /**
...@@ -92,7 +95,7 @@ class Widget extends Component ...@@ -92,7 +95,7 @@ class Widget extends Component
*/ */
public function renderFile($file, $params = array()) public function renderFile($file, $params = array())
{ {
return Yii::$app->getView()->renderFile($file, $params, $this); return $this->view->renderFile($file, $params, $this);
} }
/** /**
...@@ -106,4 +109,28 @@ class Widget extends Component ...@@ -106,4 +109,28 @@ class Widget extends Component
$class = new \ReflectionClass($className); $class = new \ReflectionClass($className);
return dirname($class->getFileName()) . DIRECTORY_SEPARATOR . 'views'; return dirname($class->getFileName()) . DIRECTORY_SEPARATOR . 'views';
} }
/**
* Finds the view file based on the given view name.
* @param string $view the view name or the path alias of the view file. Please refer to [[render()]]
* on how to specify this parameter.
* @return string the view file path. Note that the file may not exist.
*/
protected function findViewFile($view)
{
if (strncmp($view, '@', 1) === 0) {
// e.g. "@app/views/main"
$file = Yii::getAlias($view);
} elseif (strncmp($view, '//', 2) === 0) {
// e.g. "//layouts/main"
$file = Yii::$app->getViewPath() . DIRECTORY_SEPARATOR . ltrim($view, '/');
} elseif (strncmp($view, '/', 1) === 0 && Yii::$app->controller !== null) {
// e.g. "/site/index"
$file = Yii::$app->controller->module->getViewPath() . DIRECTORY_SEPARATOR . ltrim($view, '/');
} else {
$file = $this->getViewPath() . DIRECTORY_SEPARATOR . ltrim($view, '/');
}
return FileHelper::getExtension($file) === '' ? $file . '.php' : $file;
}
} }
\ No newline at end of file
...@@ -57,7 +57,7 @@ class ChainedDependency extends Dependency ...@@ -57,7 +57,7 @@ class ChainedDependency extends Dependency
if (!$dependency instanceof Dependency) { if (!$dependency instanceof Dependency) {
$dependency = \Yii::createObject($dependency); $dependency = \Yii::createObject($dependency);
} }
$dependency->evalulateDependency(); $dependency->evaluateDependency();
} }
} }
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
namespace yii\caching; namespace yii\caching;
use Yii;
use yii\base\InvalidConfigException; use yii\base\InvalidConfigException;
use yii\db\Connection; use yii\db\Connection;
use yii\db\Query; use yii\db\Query;
...@@ -14,30 +15,20 @@ use yii\db\Query; ...@@ -14,30 +15,20 @@ use yii\db\Query;
/** /**
* DbCache implements a cache application component by storing cached data in a database. * DbCache implements a cache application component by storing cached data in a database.
* *
* DbCache stores cache data in a DB table whose name is specified via [[cacheTableName]]. * By default, DbCache stores session data in a DB table named 'tbl_cache'. This table
* For MySQL database, the table should be created beforehand as follows : * must be pre-created. The table name can be changed by setting [[cacheTable]].
*
* ~~~
* CREATE TABLE tbl_cache (
* id char(128) NOT NULL,
* expire int(11) DEFAULT NULL,
* data LONGBLOB,
* PRIMARY KEY (id),
* KEY expire (expire)
* );
* ~~~
*
* You should replace `LONGBLOB` as follows if you are using a different DBMS:
*
* - PostgreSQL: `BYTEA`
* - SQLite, SQL server, Oracle: `BLOB`
*
* DbCache connects to the database via the DB connection specified in [[connectionID]]
* which must refer to a valid DB application component.
* *
* Please refer to [[Cache]] for common cache operations that are supported by DbCache. * Please refer to [[Cache]] for common cache operations that are supported by DbCache.
* *
* @property Connection $db The DB connection instance. * The following example shows how you can configure the application to use DbCache:
*
* ~~~
* 'cache' => array(
* 'class' => 'yii\caching\DbCache',
* // 'db' => 'mydb',
* // 'cacheTable' => 'my_cache',
* )
* ~~~
* *
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0 * @since 2.0
...@@ -45,50 +36,56 @@ use yii\db\Query; ...@@ -45,50 +36,56 @@ use yii\db\Query;
class DbCache extends Cache class DbCache extends Cache
{ {
/** /**
* @var string the ID of the [[Connection|DB connection]] application component. Defaults to 'db'. * @var Connection|string the DB connection object or the application component ID of the DB connection.
* After the DbCache object is created, if you want to change this property, you should only assign it
* with a DB connection object.
*/ */
public $connectionID = 'db'; public $db = 'db';
/** /**
* @var string name of the DB table to store cache content. Defaults to 'tbl_cache'. * @var string name of the DB table to store cache content.
* The table must be created before using this cache component. * The table should be pre-created as follows:
*
* ~~~
* CREATE TABLE tbl_cache (
* id char(128) NOT NULL PRIMARY KEY,
* expire int(11),
* data BLOB
* );
* ~~~
*
* where 'BLOB' refers to the BLOB-type of your preferred DBMS. Below are the BLOB type
* that can be used for some popular DBMS:
*
* - MySQL: LONGBLOB
* - PostgreSQL: BYTEA
* - MSSQL: BLOB
*
* When using DbCache in a production server, we recommend you create a DB index for the 'expire'
* column in the cache table to improve the performance.
*/ */
public $cacheTableName = 'tbl_cache'; public $cacheTable = 'tbl_cache';
/** /**
* @var integer the probability (parts per million) that garbage collection (GC) should be performed * @var integer the probability (parts per million) that garbage collection (GC) should be performed
* when storing a piece of data in the cache. Defaults to 10, meaning 0.001% chance. * when storing a piece of data in the cache. Defaults to 100, meaning 0.01% chance.
* This number should be between 0 and 1000000. A value 0 meaning no GC will be performed at all. * This number should be between 0 and 1000000. A value 0 meaning no GC will be performed at all.
**/ **/
public $gcProbability = 100; public $gcProbability = 100;
/**
* @var Connection the DB connection instance
*/
private $_db;
/**
* Returns the DB connection instance used for caching purpose.
* @return Connection the DB connection instance
* @throws InvalidConfigException if [[connectionID]] does not point to a valid application component.
*/
public function getDb()
{
if ($this->_db === null) {
$db = \Yii::$app->getComponent($this->connectionID);
if ($db instanceof Connection) {
$this->_db = $db;
} else {
throw new InvalidConfigException("DbCache::connectionID must refer to the ID of a DB application component.");
}
}
return $this->_db;
}
/** /**
* Sets the DB connection used by the cache component. * Initializes the DbCache component.
* @param Connection $value the DB connection instance * This method will initialize the [[db]] property to make sure it refers to a valid DB connection.
* @throws InvalidConfigException if [[db]] is invalid.
*/ */
public function setDb($value) public function init()
{ {
$this->_db = $value; parent::init();
if (is_string($this->db)) {
$this->db = Yii::$app->getComponent($this->db);
}
if (!$this->db instanceof Connection) {
throw new InvalidConfigException("DbCache::db must be either a DB connection instance or the application component ID of a DB connection.");
}
} }
/** /**
...@@ -101,17 +98,16 @@ class DbCache extends Cache ...@@ -101,17 +98,16 @@ class DbCache extends Cache
{ {
$query = new Query; $query = new Query;
$query->select(array('data')) $query->select(array('data'))
->from($this->cacheTableName) ->from($this->cacheTable)
->where('id = :id AND (expire = 0 OR expire >' . time() . ')', array(':id' => $key)); ->where('[[id]] = :id AND ([[expire]] = 0 OR [[expire]] >' . time() . ')', array(':id' => $key));
$db = $this->getDb(); if ($this->db->enableQueryCache) {
if ($db->enableQueryCache) {
// temporarily disable and re-enable query caching // temporarily disable and re-enable query caching
$db->enableQueryCache = false; $this->db->enableQueryCache = false;
$result = $query->createCommand($db)->queryScalar(); $result = $query->createCommand($this->db)->queryScalar();
$db->enableQueryCache = true; $this->db->enableQueryCache = true;
return $result; return $result;
} else { } else {
return $query->createCommand($db)->queryScalar(); return $query->createCommand($this->db)->queryScalar();
} }
} }
...@@ -127,17 +123,16 @@ class DbCache extends Cache ...@@ -127,17 +123,16 @@ class DbCache extends Cache
} }
$query = new Query; $query = new Query;
$query->select(array('id', 'data')) $query->select(array('id', 'data'))
->from($this->cacheTableName) ->from($this->cacheTable)
->where(array('id' => $keys)) ->where(array('id' => $keys))
->andWhere('(expire = 0 OR expire > ' . time() . ')'); ->andWhere('([[expire]] = 0 OR [[expire]] > ' . time() . ')');
$db = $this->getDb(); if ($this->db->enableQueryCache) {
if ($db->enableQueryCache) { $this->db->enableQueryCache = false;
$db->enableQueryCache = false; $rows = $query->createCommand($this->db)->queryAll();
$rows = $query->createCommand($db)->queryAll(); $this->db->enableQueryCache = true;
$db->enableQueryCache = true;
} else { } else {
$rows = $query->createCommand($db)->queryAll(); $rows = $query->createCommand($this->db)->queryAll();
} }
$results = array(); $results = array();
...@@ -161,13 +156,13 @@ class DbCache extends Cache ...@@ -161,13 +156,13 @@ class DbCache extends Cache
*/ */
protected function setValue($key, $value, $expire) protected function setValue($key, $value, $expire)
{ {
$command = $this->getDb()->createCommand(); $command = $this->db->createCommand()
$command->update($this->cacheTableName, array( ->update($this->cacheTable, array(
'expire' => $expire > 0 ? $expire + time() : 0, 'expire' => $expire > 0 ? $expire + time() : 0,
'data' => array($value, \PDO::PARAM_LOB), 'data' => array($value, \PDO::PARAM_LOB),
), array( ), array(
'id' => $key, 'id' => $key,
));; ));
if ($command->execute()) { if ($command->execute()) {
$this->gc(); $this->gc();
...@@ -196,14 +191,13 @@ class DbCache extends Cache ...@@ -196,14 +191,13 @@ class DbCache extends Cache
$expire = 0; $expire = 0;
} }
$command = $this->getDb()->createCommand();
$command->insert($this->cacheTableName, array(
'id' => $key,
'expire' => $expire,
'data' => array($value, \PDO::PARAM_LOB),
));
try { try {
$command->execute(); $this->db->createCommand()
->insert($this->cacheTable, array(
'id' => $key,
'expire' => $expire,
'data' => array($value, \PDO::PARAM_LOB),
))->execute();
return true; return true;
} catch (\Exception $e) { } catch (\Exception $e) {
return false; return false;
...@@ -218,8 +212,9 @@ class DbCache extends Cache ...@@ -218,8 +212,9 @@ class DbCache extends Cache
*/ */
protected function deleteValue($key) protected function deleteValue($key)
{ {
$command = $this->getDb()->createCommand(); $this->db->createCommand()
$command->delete($this->cacheTableName, array('id' => $key))->execute(); ->delete($this->cacheTable, array('id' => $key))
->execute();
return true; return true;
} }
...@@ -231,8 +226,9 @@ class DbCache extends Cache ...@@ -231,8 +226,9 @@ class DbCache extends Cache
public function gc($force = false) public function gc($force = false)
{ {
if ($force || mt_rand(0, 1000000) < $this->gcProbability) { if ($force || mt_rand(0, 1000000) < $this->gcProbability) {
$command = $this->getDb()->createCommand(); $this->db->createCommand()
$command->delete($this->cacheTableName, 'expire > 0 AND expire < ' . time())->execute(); ->delete($this->cacheTable, '[[expire]] > 0 AND [[expire]] < ' . time())
->execute();
} }
} }
...@@ -243,8 +239,9 @@ class DbCache extends Cache ...@@ -243,8 +239,9 @@ class DbCache extends Cache
*/ */
protected function flushValues() protected function flushValues()
{ {
$command = $this->getDb()->createCommand(); $this->db->createCommand()
$command->delete($this->cacheTableName)->execute(); ->delete($this->cacheTable)
->execute();
return true; return true;
} }
} }
...@@ -23,41 +23,28 @@ use yii\db\Connection; ...@@ -23,41 +23,28 @@ use yii\db\Connection;
class DbDependency extends Dependency class DbDependency extends Dependency
{ {
/** /**
* @var string the ID of the [[Connection|DB connection]] application component. Defaults to 'db'. * @var string the application component ID of the DB connection.
*/ */
public $connectionID = 'db'; public $db = 'db';
/** /**
* @var string the SQL query whose result is used to determine if the dependency has been changed. * @var string the SQL query whose result is used to determine if the dependency has been changed.
* Only the first row of the query result will be used. * Only the first row of the query result will be used. This property must be always set, otherwise
* an exception would be raised.
*/ */
public $sql; public $sql;
/** /**
* @var array the parameters (name=>value) to be bound to the SQL statement specified by [[sql]]. * @var array the parameters (name=>value) to be bound to the SQL statement specified by [[sql]].
*/ */
public $params; public $params = array();
/** /**
* Constructor. * Initializes the database dependency object.
* @param string $sql the SQL query whose result is used to determine if the dependency has been changed.
* @param array $params the parameters (name=>value) to be bound to the SQL statement specified by [[sql]].
* @param array $config name-value pairs that will be used to initialize the object properties
*/ */
public function __construct($sql, $params = array(), $config = array()) public function init()
{ {
$this->sql = $sql; if ($this->sql === null) {
$this->params = $params; throw new InvalidConfigException('DbDependency::sql must be set.');
parent::__construct($config); }
}
/**
* PHP sleep magic method.
* This method ensures that the database instance is set null because it contains resource handles.
* @return array
*/
public function __sleep()
{
$this->_db = null;
return array_keys((array)$this);
} }
/** /**
...@@ -67,7 +54,11 @@ class DbDependency extends Dependency ...@@ -67,7 +54,11 @@ class DbDependency extends Dependency
*/ */
protected function generateDependencyData() protected function generateDependencyData()
{ {
$db = $this->getDb(); $db = Yii::$app->getComponent($this->db);
if (!$db instanceof Connection) {
throw new InvalidConfigException("DbDependency::db must be the application component ID of a DB connection.");
}
if ($db->enableQueryCache) { if ($db->enableQueryCache) {
// temporarily disable and re-enable query caching // temporarily disable and re-enable query caching
$db->enableQueryCache = false; $db->enableQueryCache = false;
...@@ -78,36 +69,4 @@ class DbDependency extends Dependency ...@@ -78,36 +69,4 @@ class DbDependency extends Dependency
} }
return $result; return $result;
} }
/**
* @var Connection the DB connection instance
*/
private $_db;
/**
* Returns the DB connection instance used for caching purpose.
* @return Connection the DB connection instance
* @throws InvalidConfigException if [[connectionID]] does not point to a valid application component.
*/
public function getDb()
{
if ($this->_db === null) {
$db = Yii::$app->getComponent($this->connectionID);
if ($db instanceof Connection) {
$this->_db = $db;
} else {
throw new InvalidConfigException("DbCacheDependency::connectionID must refer to the ID of a DB application component.");
}
}
return $this->_db;
}
/**
* Sets the DB connection used by the cache component.
* @param Connection $value the DB connection instance
*/
public function setDb($value)
{
$this->_db = $value;
}
} }
...@@ -22,18 +22,7 @@ class ExpressionDependency extends Dependency ...@@ -22,18 +22,7 @@ class ExpressionDependency extends Dependency
/** /**
* @var string the PHP expression whose result is used to determine the dependency. * @var string the PHP expression whose result is used to determine the dependency.
*/ */
public $expression; public $expression = 'true';
/**
* Constructor.
* @param string $expression the PHP expression whose result is used to determine the dependency.
* @param array $config name-value pairs that will be used to initialize the object properties
*/
public function __construct($expression = 'true', $config = array())
{
$this->expression = $expression;
parent::__construct($config);
}
/** /**
* Generates the data needed to determine if dependency has been changed. * Generates the data needed to determine if dependency has been changed.
......
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
namespace yii\caching; namespace yii\caching;
use yii\base\InvalidConfigException;
/** /**
* FileDependency represents a dependency based on a file's last modification time. * FileDependency represents a dependency based on a file's last modification time.
* *
...@@ -20,19 +22,19 @@ class FileDependency extends Dependency ...@@ -20,19 +22,19 @@ class FileDependency extends Dependency
{ {
/** /**
* @var string the name of the file whose last modification time is used to * @var string the name of the file whose last modification time is used to
* check if the dependency has been changed. * check if the dependency has been changed. This property must be always set,
* otherwise an exception would be raised.
*/ */
public $fileName; public $fileName;
/** /**
* Constructor. * Initializes the database dependency object.
* @param string $fileName name of the file whose change is to be checked.
* @param array $config name-value pairs that will be used to initialize the object properties
*/ */
public function __construct($fileName = null, $config = array()) public function init()
{ {
$this->fileName = $fileName; if ($this->file === null) {
parent::__construct($config); throw new InvalidConfigException('FileDependency::fileName must be set.');
}
} }
/** /**
......
...@@ -24,7 +24,6 @@ use yii\base\InvalidRouteException; ...@@ -24,7 +24,6 @@ use yii\base\InvalidRouteException;
* ~~~ * ~~~
* *
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
*
* @since 2.0 * @since 2.0
*/ */
class Controller extends \yii\base\Controller class Controller extends \yii\base\Controller
...@@ -135,9 +134,13 @@ class Controller extends \yii\base\Controller ...@@ -135,9 +134,13 @@ class Controller extends \yii\base\Controller
/** /**
* Returns the names of the global options for this command. * Returns the names of the global options for this command.
* A global option requires the existence of a global member variable whose * A global option requires the existence of a public member variable whose
* name is the option name. * name is the option name.
* Child classes may override this method to specify possible global options. * Child classes may override this method to specify possible global options.
*
* Note that the values setting via global options are not available
* until [[beforeAction()]] is being called.
*
* @return array the names of the global options for this command. * @return array the names of the global options for this command.
*/ */
public function globalOptions() public function globalOptions()
......
...@@ -9,9 +9,9 @@ namespace yii\console\controllers; ...@@ -9,9 +9,9 @@ namespace yii\console\controllers;
use Yii; use Yii;
use yii\base\Application; use yii\base\Application;
use yii\console\Exception;
use yii\base\InlineAction; use yii\base\InlineAction;
use yii\console\Controller; use yii\console\Controller;
use yii\console\Exception;
use yii\console\Request; use yii\console\Request;
use yii\helpers\StringHelper; use yii\helpers\StringHelper;
...@@ -128,7 +128,7 @@ class HelpController extends Controller ...@@ -128,7 +128,7 @@ class HelpController extends Controller
$files = scandir($module->getControllerPath()); $files = scandir($module->getControllerPath());
foreach ($files as $file) { foreach ($files as $file) {
if(strcmp(substr($file,-14),'Controller.php') === 0 && is_file($file)) { if (strcmp(substr($file, -14), 'Controller.php') === 0) {
$commands[] = $prefix . lcfirst(substr(basename($file), 0, -14)); $commands[] = $prefix . lcfirst(substr(basename($file), 0, -14));
} }
} }
......
...@@ -191,15 +191,12 @@ class ActiveRecord extends Model ...@@ -191,15 +191,12 @@ class ActiveRecord extends Model
*/ */
public static function updateAllCounters($counters, $condition = '', $params = array()) public static function updateAllCounters($counters, $condition = '', $params = array())
{ {
$db = static::getDb();
$n = 0; $n = 0;
foreach ($counters as $name => $value) { foreach ($counters as $name => $value) {
$quotedName = $db->quoteColumnName($name); $counters[$name] = new Expression("[[$name]]+:bp{$n}", array(":bp{$n}" => $value));
$counters[$name] = new Expression("$quotedName+:bp{$n}");
$params[":bp{$n}"] = $value;
$n++; $n++;
} }
$command = $db->createCommand(); $command = static::getDb()->createCommand();
$command->update(static::tableName(), $counters, $condition, $params); $command->update(static::tableName(), $counters, $condition, $params);
return $command->execute(); return $command->execute();
} }
...@@ -279,6 +276,34 @@ class ActiveRecord extends Model ...@@ -279,6 +276,34 @@ class ActiveRecord extends Model
return static::getTableSchema()->primaryKey; return static::getTableSchema()->primaryKey;
} }
/**
* Returns the name of the column that stores the lock version for implementing optimistic locking.
*
* Optimistic locking allows multiple users to access the same record for edits and avoids
* potential conflicts. In case when a user attempts to save the record upon some staled data
* (because another user has modified the data), a [[StaleObjectException]] exception will be thrown,
* and the update or deletion is skipped.
*
* Optimized locking is only supported by [[update()]] and [[delete()]].
*
* To use optimized locking:
*
* 1. Create a column to store the version number of each row. The column type should be `BIGINT DEFAULT 0`.
* Override this method to return the name of this column.
* 2. In the Web form that collects the user input, add a hidden field that stores
* the lock version of the recording being updated.
* 3. In the controller action that does the data updating, try to catch the [[StaleObjectException]]
* and implement necessary business logic (e.g. merging the changes, prompting stated data)
* to resolve the conflict.
*
* @return string the column name that stores the lock version of a table row.
* If null is returned (default implemented), optimistic locking will not be supported.
*/
public function optimisticLock()
{
return null;
}
/** /**
* PHP getter magic method. * PHP getter magic method.
* This method is overridden so that attributes and related objects can be accessed like properties. * This method is overridden so that attributes and related objects can be accessed like properties.
...@@ -530,8 +555,8 @@ class ActiveRecord extends Model ...@@ -530,8 +555,8 @@ class ActiveRecord extends Model
*/ */
public function isAttributeChanged($name) public function isAttributeChanged($name)
{ {
if (isset($this->_attribute[$name], $this->_oldAttributes[$name])) { if (isset($this->_attributes[$name], $this->_oldAttributes[$name])) {
return $this->_attribute[$name] !== $this->_oldAttributes[$name]; return $this->_attributes[$name] !== $this->_oldAttributes[$name];
} else { } else {
return isset($this->_attributes[$name]) || isset($this->_oldAttributes); return isset($this->_attributes[$name]) || isset($this->_oldAttributes);
} }
...@@ -590,7 +615,11 @@ class ActiveRecord extends Model ...@@ -590,7 +615,11 @@ class ActiveRecord extends Model
*/ */
public function save($runValidation = true, $attributes = null) public function save($runValidation = true, $attributes = null)
{ {
return $this->getIsNewRecord() ? $this->insert($runValidation, $attributes) : $this->update($runValidation, $attributes); if ($this->getIsNewRecord()) {
return $this->insert($runValidation, $attributes);
} else {
return $this->update($runValidation, $attributes) !== false;
}
} }
/** /**
...@@ -692,11 +721,26 @@ class ActiveRecord extends Model ...@@ -692,11 +721,26 @@ class ActiveRecord extends Model
* $customer->update(); * $customer->update();
* ~~~ * ~~~
* *
* Note that it is possible the update does not affect any row in the table.
* In this case, this method will return 0. For this reason, you should use the following
* code to check if update() is successful or not:
*
* ~~~
* if ($this->update() !== false) {
* // update successful
* } else {
* // update failed
* }
* ~~~
*
* @param boolean $runValidation whether to perform validation before saving the record. * @param boolean $runValidation whether to perform validation before saving the record.
* If the validation fails, the record will not be inserted into the database. * If the validation fails, the record will not be inserted into the database.
* @param array $attributes list of attributes that need to be saved. Defaults to null, * @param array $attributes list of attributes that need to be saved. Defaults to null,
* meaning all attributes that are loaded from DB will be saved. * meaning all attributes that are loaded from DB will be saved.
* @return boolean whether the attributes are valid and the record is updated successfully. * @return integer|boolean the number of rows affected, or false if validation fails
* or [[beforeSave()]] stops the updating process.
* @throws StaleObjectException if [[optimisticLock|optimistic locking]] is enabled and the data
* being updated is outdated.
*/ */
public function update($runValidation = true, $attributes = null) public function update($runValidation = true, $attributes = null)
{ {
...@@ -706,15 +750,31 @@ class ActiveRecord extends Model ...@@ -706,15 +750,31 @@ class ActiveRecord extends Model
if ($this->beforeSave(false)) { if ($this->beforeSave(false)) {
$values = $this->getDirtyAttributes($attributes); $values = $this->getDirtyAttributes($attributes);
if ($values !== array()) { if ($values !== array()) {
$condition = $this->getOldPrimaryKey(true);
$lock = $this->optimisticLock();
if ($lock !== null) {
if (!isset($values[$lock])) {
$values[$lock] = $this->$lock + 1;
}
$condition[$lock] = $this->$lock;
}
// We do not check the return value of updateAll() because it's possible // We do not check the return value of updateAll() because it's possible
// that the UPDATE statement doesn't change anything and thus returns 0. // that the UPDATE statement doesn't change anything and thus returns 0.
$this->updateAll($values, $this->getOldPrimaryKey(true)); $rows = $this->updateAll($values, $condition);
if ($lock !== null && !$rows) {
throw new StaleObjectException('The object being updated is outdated.');
}
foreach ($values as $name => $value) { foreach ($values as $name => $value) {
$this->_oldAttributes[$name] = $this->_attributes[$name]; $this->_oldAttributes[$name] = $this->_attributes[$name];
} }
$this->afterSave(false); $this->afterSave(false);
return $rows;
} else {
return 0;
} }
return true;
} else { } else {
return false; return false;
} }
...@@ -763,17 +823,28 @@ class ActiveRecord extends Model ...@@ -763,17 +823,28 @@ class ActiveRecord extends Model
* In the above step 1 and 3, events named [[EVENT_BEFORE_DELETE]] and [[EVENT_AFTER_DELETE]] * In the above step 1 and 3, events named [[EVENT_BEFORE_DELETE]] and [[EVENT_AFTER_DELETE]]
* will be raised by the corresponding methods. * will be raised by the corresponding methods.
* *
* @return boolean whether the deletion is successful. * @return integer|boolean the number of rows deleted, or false if the deletion is unsuccessful for some reason.
* Note that it is possible the number of rows deleted is 0, even though the deletion execution is successful.
* @throws StaleObjectException if [[optimisticLock|optimistic locking]] is enabled and the data
* being deleted is outdated.
*/ */
public function delete() public function delete()
{ {
if ($this->beforeDelete()) { if ($this->beforeDelete()) {
// we do not check the return value of deleteAll() because it's possible // we do not check the return value of deleteAll() because it's possible
// the record is already deleted in the database and thus the method will return 0 // the record is already deleted in the database and thus the method will return 0
$this->deleteAll($this->getPrimaryKey(true)); $condition = $this->getOldPrimaryKey(true);
$lock = $this->optimisticLock();
if ($lock !== null) {
$condition[$lock] = $this->$lock;
}
$rows = $this->deleteAll($condition);
if ($lock !== null && !$rows) {
throw new StaleObjectException('The object being deleted is outdated.');
}
$this->_oldAttributes = null; $this->_oldAttributes = null;
$this->afterDelete(); $this->afterDelete();
return true; return $rows;
} else { } else {
return false; return false;
} }
...@@ -847,7 +918,7 @@ class ActiveRecord extends Model ...@@ -847,7 +918,7 @@ class ActiveRecord extends Model
*/ */
public function beforeSave($insert) public function beforeSave($insert)
{ {
$event = new ModelEvent($this); $event = new ModelEvent;
$this->trigger($insert ? self::EVENT_BEFORE_INSERT : self::EVENT_BEFORE_UPDATE, $event); $this->trigger($insert ? self::EVENT_BEFORE_INSERT : self::EVENT_BEFORE_UPDATE, $event);
return $event->isValid; return $event->isValid;
} }
...@@ -887,7 +958,7 @@ class ActiveRecord extends Model ...@@ -887,7 +958,7 @@ class ActiveRecord extends Model
*/ */
public function beforeDelete() public function beforeDelete()
{ {
$event = new ModelEvent($this); $event = new ModelEvent;
$this->trigger(self::EVENT_BEFORE_DELETE, $event); $this->trigger(self::EVENT_BEFORE_DELETE, $event);
return $event->isValid; return $event->isValid;
} }
......
...@@ -7,7 +7,9 @@ ...@@ -7,7 +7,9 @@
namespace yii\db; namespace yii\db;
use Yii;
use yii\base\NotSupportedException; use yii\base\NotSupportedException;
use yii\caching\Cache;
/** /**
* Command represents a SQL statement to be executed against a database. * Command represents a SQL statement to be executed against a database.
...@@ -82,39 +84,51 @@ class Command extends \yii\base\Component ...@@ -82,39 +84,51 @@ class Command extends \yii\base\Component
/** /**
* Specifies the SQL statement to be executed. * Specifies the SQL statement to be executed.
* Any previous execution will be terminated or cancelled. * The previous SQL execution (if any) will be cancelled, and [[params]] will be cleared as well.
* @param string $sql the SQL statement to be set. * @param string $sql the SQL statement to be set.
* @return Command this command instance * @return Command this command instance
*/ */
public function setSql($sql) public function setSql($sql)
{ {
if ($sql !== $this->_sql) { if ($sql !== $this->_sql) {
if ($this->db->enableAutoQuoting && $sql != '') {
$sql = $this->expandSql($sql);
}
$this->cancel(); $this->cancel();
$this->_sql = $sql; $this->_sql = $this->db->quoteSql($sql);
$this->_params = array(); $this->_params = array();
} }
return $this; return $this;
} }
/** /**
* Expands a SQL statement by quoting table and column names and replacing table prefixes. * Returns the raw SQL by inserting parameter values into the corresponding placeholders in [[sql]].
* @param string $sql the SQL to be expanded * Note that the return value of this method should mainly be used for logging purpose.
* @return string the expanded SQL * It is likely that this method returns an invalid SQL due to improper replacement of parameter placeholders.
* @return string the raw SQL
*/ */
protected function expandSql($sql) public function getRawSql()
{ {
$db = $this->db; if ($this->_params === array()) {
return preg_replace_callback('/(\\{\\{(.*?)\\}\\}|\\[\\[(.*?)\\]\\])/', function($matches) use($db) { return $this->_sql;
if (isset($matches[3])) { } else {
return $db->quoteColumnName($matches[3]); $params = array();
foreach ($this->_params as $name => $value) {
if (is_string($value)) {
$params[$name] = $this->db->quoteValue($value);
} elseif ($value === null) {
$params[$name] = 'NULL';
} else {
$params[$name] = $value;
}
}
if (isset($params[1])) {
$sql = '';
foreach (explode('?', $this->_sql) as $i => $part) {
$sql .= (isset($params[$i]) ? $params[$i] : '') . $part;
}
return $sql;
} else { } else {
$name = str_replace('%', $db->tablePrefix, $matches[2]); return strtr($this->_sql, $params);
return $db->quoteTableName($name);
} }
}, $sql); }
} }
/** /**
...@@ -132,7 +146,7 @@ class Command extends \yii\base\Component ...@@ -132,7 +146,7 @@ class Command extends \yii\base\Component
try { try {
$this->pdoStatement = $this->db->pdo->prepare($sql); $this->pdoStatement = $this->db->pdo->prepare($sql);
} catch (\Exception $e) { } catch (\Exception $e) {
\Yii::error($e->getMessage() . "\nFailed to prepare SQL: $sql", __CLASS__); Yii::error($e->getMessage() . "\nFailed to prepare SQL: $sql", __METHOD__);
$errorInfo = $e instanceof \PDOException ? $e->errorInfo : null; $errorInfo = $e instanceof \PDOException ? $e->errorInfo : null;
throw new Exception($e->getMessage(), $errorInfo, (int)$e->getCode()); throw new Exception($e->getMessage(), $errorInfo, (int)$e->getCode());
} }
...@@ -241,6 +255,7 @@ class Command extends \yii\base\Component ...@@ -241,6 +255,7 @@ class Command extends \yii\base\Component
'boolean' => \PDO::PARAM_BOOL, 'boolean' => \PDO::PARAM_BOOL,
'integer' => \PDO::PARAM_INT, 'integer' => \PDO::PARAM_INT,
'string' => \PDO::PARAM_STR, 'string' => \PDO::PARAM_STR,
'resource' => \PDO::PARAM_LOB,
'NULL' => \PDO::PARAM_NULL, 'NULL' => \PDO::PARAM_NULL,
); );
$type = gettype($data); $type = gettype($data);
...@@ -258,21 +273,18 @@ class Command extends \yii\base\Component ...@@ -258,21 +273,18 @@ class Command extends \yii\base\Component
{ {
$sql = $this->getSql(); $sql = $this->getSql();
if ($this->_params === array()) { $rawSql = $this->getRawSql();
$paramLog = '';
} else {
$paramLog = "\nParameters: " . var_export($this->_params, true);
}
\Yii::trace("Executing SQL: {$sql}{$paramLog}", __CLASS__); Yii::trace("Executing SQL: $rawSql", __METHOD__);
if ($sql == '') { if ($sql == '') {
return 0; return 0;
} }
try { try {
$token = "SQL: $sql";
if ($this->db->enableProfiling) { if ($this->db->enableProfiling) {
\Yii::beginProfile(__METHOD__ . "($sql)", __CLASS__); Yii::beginProfile($token, __METHOD__);
} }
$this->prepare(); $this->prepare();
...@@ -280,16 +292,16 @@ class Command extends \yii\base\Component ...@@ -280,16 +292,16 @@ class Command extends \yii\base\Component
$n = $this->pdoStatement->rowCount(); $n = $this->pdoStatement->rowCount();
if ($this->db->enableProfiling) { if ($this->db->enableProfiling) {
\Yii::endProfile(__METHOD__ . "($sql)", __CLASS__); Yii::endProfile($token, __METHOD__);
} }
return $n; return $n;
} catch (\Exception $e) { } catch (\Exception $e) {
if ($this->db->enableProfiling) { if ($this->db->enableProfiling) {
\Yii::endProfile(__METHOD__ . "($sql)", __CLASS__); Yii::endProfile($token, __METHOD__);
} }
$message = $e->getMessage(); $message = $e->getMessage();
\Yii::error("$message\nFailed to execute SQL: {$sql}{$paramLog}", __CLASS__); Yii::error("$message\nFailed to execute SQL: $rawSql", __METHOD__);
$errorInfo = $e instanceof \PDOException ? $e->errorInfo : null; $errorInfo = $e instanceof \PDOException ? $e->errorInfo : null;
throw new Exception($message, $errorInfo, (int)$e->getCode()); throw new Exception($message, $errorInfo, (int)$e->getCode());
...@@ -375,36 +387,32 @@ class Command extends \yii\base\Component ...@@ -375,36 +387,32 @@ class Command extends \yii\base\Component
{ {
$db = $this->db; $db = $this->db;
$sql = $this->getSql(); $sql = $this->getSql();
if ($this->_params === array()) { $rawSql = $this->getRawSql();
$paramLog = '';
} else {
$paramLog = "\nParameters: " . var_export($this->_params, true);
}
\Yii::trace("Querying SQL: {$sql}{$paramLog}", __CLASS__); Yii::trace("Querying SQL: $rawSql", __METHOD__);
/** @var $cache \yii\caching\Cache */ /** @var $cache \yii\caching\Cache */
if ($db->enableQueryCache && $method !== '') { if ($db->enableQueryCache && $method !== '') {
$cache = \Yii::$app->getComponent($db->queryCacheID); $cache = is_string($db->queryCache) ? Yii::$app->getComponent($db->queryCache) : $db->queryCache;
} }
if (isset($cache)) { if (isset($cache) && $cache instanceof Cache) {
$cacheKey = $cache->buildKey(array( $cacheKey = $cache->buildKey(array(
__CLASS__, __CLASS__,
$db->dsn, $db->dsn,
$db->username, $db->username,
$sql, $rawSql,
$paramLog,
)); ));
if (($result = $cache->get($cacheKey)) !== false) { if (($result = $cache->get($cacheKey)) !== false) {
\Yii::trace('Query result found in cache', __CLASS__); Yii::trace('Query result served from cache', __METHOD__);
return $result; return $result;
} }
} }
try { try {
$token = "SQL: $sql";
if ($db->enableProfiling) { if ($db->enableProfiling) {
\Yii::beginProfile(__METHOD__ . "($sql)", __CLASS__); Yii::beginProfile($token, __METHOD__);
} }
$this->prepare(); $this->prepare();
...@@ -421,21 +429,21 @@ class Command extends \yii\base\Component ...@@ -421,21 +429,21 @@ class Command extends \yii\base\Component
} }
if ($db->enableProfiling) { if ($db->enableProfiling) {
\Yii::endProfile(__METHOD__ . "($sql)", __CLASS__); Yii::endProfile($token, __METHOD__);
} }
if (isset($cache, $cacheKey)) { if (isset($cache, $cacheKey) && $cache instanceof Cache) {
$cache->set($cacheKey, $result, $db->queryCacheDuration, $db->queryCacheDependency); $cache->set($cacheKey, $result, $db->queryCacheDuration, $db->queryCacheDependency);
\Yii::trace('Saved query result in cache', __CLASS__); Yii::trace('Saved query result in cache', __METHOD__);
} }
return $result; return $result;
} catch (\Exception $e) { } catch (\Exception $e) {
if ($db->enableProfiling) { if ($db->enableProfiling) {
\Yii::endProfile(__METHOD__ . "($sql)", __CLASS__); Yii::endProfile($token, __METHOD__);
} }
$message = $e->getMessage(); $message = $e->getMessage();
\Yii::error("$message\nCommand::$method() failed: {$sql}{$paramLog}", __CLASS__); Yii::error("$message\nCommand::$method() failed: $rawSql", __METHOD__);
$errorInfo = $e instanceof \PDOException ? $e->errorInfo : null; $errorInfo = $e instanceof \PDOException ? $e->errorInfo : null;
throw new Exception($message, $errorInfo, (int)$e->getCode()); throw new Exception($message, $errorInfo, (int)$e->getCode());
} }
...@@ -539,7 +547,7 @@ class Command extends \yii\base\Component ...@@ -539,7 +547,7 @@ class Command extends \yii\base\Component
*/ */
public function delete($table, $condition = '', $params = array()) public function delete($table, $condition = '', $params = array())
{ {
$sql = $this->db->getQueryBuilder()->delete($table, $condition); $sql = $this->db->getQueryBuilder()->delete($table, $condition, $params);
return $this->setSql($sql)->bindValues($params); return $this->setSql($sql)->bindValues($params);
} }
......
...@@ -10,6 +10,7 @@ namespace yii\db; ...@@ -10,6 +10,7 @@ namespace yii\db;
use yii\base\Component; use yii\base\Component;
use yii\base\InvalidConfigException; use yii\base\InvalidConfigException;
use yii\base\NotSupportedException; use yii\base\NotSupportedException;
use yii\caching\Cache;
/** /**
* Connection represents a connection to a database via [PDO](http://www.php.net/manual/en/ref.pdo.php). * Connection represents a connection to a database via [PDO](http://www.php.net/manual/en/ref.pdo.php).
...@@ -136,10 +137,10 @@ class Connection extends Component ...@@ -136,10 +137,10 @@ class Connection extends Component
/** /**
* @var boolean whether to enable schema caching. * @var boolean whether to enable schema caching.
* Note that in order to enable truly schema caching, a valid cache component as specified * Note that in order to enable truly schema caching, a valid cache component as specified
* by [[schemaCacheID]] must be enabled and [[enableSchemaCache]] must be set true. * by [[schemaCache]] must be enabled and [[enableSchemaCache]] must be set true.
* @see schemaCacheDuration * @see schemaCacheDuration
* @see schemaCacheExclude * @see schemaCacheExclude
* @see schemaCacheID * @see schemaCache
*/ */
public $enableSchemaCache = false; public $enableSchemaCache = false;
/** /**
...@@ -155,20 +156,20 @@ class Connection extends Component ...@@ -155,20 +156,20 @@ class Connection extends Component
*/ */
public $schemaCacheExclude = array(); public $schemaCacheExclude = array();
/** /**
* @var string the ID of the cache application component that is used to cache the table metadata. * @var Cache|string the cache object or the ID of the cache application component that
* Defaults to 'cache'. * is used to cache the table metadata.
* @see enableSchemaCache * @see enableSchemaCache
*/ */
public $schemaCacheID = 'cache'; public $schemaCache = 'cache';
/** /**
* @var boolean whether to enable query caching. * @var boolean whether to enable query caching.
* Note that in order to enable query caching, a valid cache component as specified * Note that in order to enable query caching, a valid cache component as specified
* by [[queryCacheID]] must be enabled and [[enableQueryCache]] must be set true. * by [[queryCache]] must be enabled and [[enableQueryCache]] must be set true.
* *
* Methods [[beginCache()]] and [[endCache()]] can be used as shortcuts to turn on * Methods [[beginCache()]] and [[endCache()]] can be used as shortcuts to turn on
* and off query caching on the fly. * and off query caching on the fly.
* @see queryCacheDuration * @see queryCacheDuration
* @see queryCacheID * @see queryCache
* @see queryCacheDependency * @see queryCacheDependency
* @see beginCache() * @see beginCache()
* @see endCache() * @see endCache()
...@@ -176,7 +177,7 @@ class Connection extends Component ...@@ -176,7 +177,7 @@ class Connection extends Component
public $enableQueryCache = false; public $enableQueryCache = false;
/** /**
* @var integer number of seconds that query results can remain valid in cache. * @var integer number of seconds that query results can remain valid in cache.
* Defaults to 3600, meaning one hour. * Defaults to 3600, meaning 3600 seconds, or one hour.
* Use 0 to indicate that the cached data will never expire. * Use 0 to indicate that the cached data will never expire.
* @see enableQueryCache * @see enableQueryCache
*/ */
...@@ -188,11 +189,11 @@ class Connection extends Component ...@@ -188,11 +189,11 @@ class Connection extends Component
*/ */
public $queryCacheDependency; public $queryCacheDependency;
/** /**
* @var string the ID of the cache application component that is used for query caching. * @var Cache|string the cache object or the ID of the cache application component
* Defaults to 'cache'. * that is used for query caching.
* @see enableQueryCache * @see enableQueryCache
*/ */
public $queryCacheID = 'cache'; public $queryCache = 'cache';
/** /**
* @var string the charset used for database connection. The property is only used * @var string the charset used for database connection. The property is only used
* for MySQL and PostgreSQL databases. Defaults to null, meaning using default charset * for MySQL and PostgreSQL databases. Defaults to null, meaning using default charset
...@@ -222,20 +223,9 @@ class Connection extends Component ...@@ -222,20 +223,9 @@ class Connection extends Component
* @var string the common prefix or suffix for table names. If a table name is given * @var string the common prefix or suffix for table names. If a table name is given
* as `{{%TableName}}`, then the percentage character `%` will be replaced with this * as `{{%TableName}}`, then the percentage character `%` will be replaced with this
* property value. For example, `{{%post}}` becomes `{{tbl_post}}` if this property is * property value. For example, `{{%post}}` becomes `{{tbl_post}}` if this property is
* set as `"tbl_"`. Note that this property is only effective when [[enableAutoQuoting]] * set as `"tbl_"`.
* is true.
* @see enableAutoQuoting
*/ */
public $tablePrefix; public $tablePrefix;
/**
* @var boolean whether to enable automatic quoting of table names and column names.
* Defaults to true. When this property is true, any token enclosed within double curly brackets
* (e.g. `{{post}}`) in a SQL statement will be treated as a table name and will be quoted
* accordingly when the SQL statement is executed; and any token enclosed within double square
* brackets (e.g. `[[name]]`) will be treated as a column name and quoted accordingly.
* @see tablePrefix
*/
public $enableAutoQuoting = true;
/** /**
* @var array mapping between PDO driver names and [[Schema]] classes. * @var array mapping between PDO driver names and [[Schema]] classes.
* The keys of the array are PDO driver names while the values the corresponding * The keys of the array are PDO driver names while the values the corresponding
...@@ -247,15 +237,15 @@ class Connection extends Component ...@@ -247,15 +237,15 @@ class Connection extends Component
* [[Schema]] class to support DBMS that is not supported by Yii. * [[Schema]] class to support DBMS that is not supported by Yii.
*/ */
public $schemaMap = array( public $schemaMap = array(
'pgsql' => 'yii\db\pgsql\Schema', // PostgreSQL 'pgsql' => 'yii\db\pgsql\Schema', // PostgreSQL
'mysqli' => 'yii\db\mysql\Schema', // MySQL 'mysqli' => 'yii\db\mysql\Schema', // MySQL
'mysql' => 'yii\db\mysql\Schema', // MySQL 'mysql' => 'yii\db\mysql\Schema', // MySQL
'sqlite' => 'yii\db\sqlite\Schema', // sqlite 3 'sqlite' => 'yii\db\sqlite\Schema', // sqlite 3
'sqlite2' => 'yii\db\sqlite\Schema', // sqlite 2 'sqlite2' => 'yii\db\sqlite\Schema', // sqlite 2
'mssql' => 'yi\db\dao\mssql\Schema', // Mssql driver on windows hosts 'mssql' => 'yi\db\dao\mssql\Schema', // Mssql driver on windows hosts
'dblib' => 'yii\db\mssql\Schema', // dblib drivers on linux (and maybe others os) hosts 'sqlsrv' => 'yii\db\mssql\Schema', // Mssql
'sqlsrv' => 'yii\db\mssql\Schema', // Mssql 'oci' => 'yii\db\oci\Schema', // Oracle driver
'oci' => 'yii\db\oci\Schema', // Oracle driver 'dblib' => 'yii\db\mssql\Schema', // dblib drivers on linux (and maybe others os) hosts
); );
/** /**
* @var Transaction the currently active transaction * @var Transaction the currently active transaction
...@@ -290,7 +280,7 @@ class Connection extends Component ...@@ -290,7 +280,7 @@ class Connection extends Component
* This method is provided as a shortcut to setting two properties that are related * This method is provided as a shortcut to setting two properties that are related
* with query caching: [[queryCacheDuration]] and [[queryCacheDependency]]. * with query caching: [[queryCacheDuration]] and [[queryCacheDependency]].
* @param integer $duration the number of seconds that query results may remain valid in cache. * @param integer $duration the number of seconds that query results may remain valid in cache.
* See [[queryCacheDuration]] for more details. * If not set, it will use the value of [[queryCacheDuration]]. See [[queryCacheDuration]] for more details.
* @param \yii\caching\Dependency $dependency the dependency for the cached query result. * @param \yii\caching\Dependency $dependency the dependency for the cached query result.
* See [[queryCacheDependency]] for more details. * See [[queryCacheDependency]] for more details.
*/ */
...@@ -323,12 +313,12 @@ class Connection extends Component ...@@ -323,12 +313,12 @@ class Connection extends Component
throw new InvalidConfigException('Connection::dsn cannot be empty.'); throw new InvalidConfigException('Connection::dsn cannot be empty.');
} }
try { try {
\Yii::trace('Opening DB connection: ' . $this->dsn, __CLASS__); \Yii::trace('Opening DB connection: ' . $this->dsn, __METHOD__);
$this->pdo = $this->createPdoInstance(); $this->pdo = $this->createPdoInstance();
$this->initConnection(); $this->initConnection();
} }
catch (\PDOException $e) { catch (\PDOException $e) {
\Yii::error("Failed to open DB connection ({$this->dsn}): " . $e->getMessage(), __CLASS__); \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.'; $message = YII_DEBUG ? 'Failed to open DB connection: ' . $e->getMessage() : 'Failed to open DB connection.';
throw new Exception($message, $e->errorInfo, (int)$e->getCode()); throw new Exception($message, $e->errorInfo, (int)$e->getCode());
} }
...@@ -342,7 +332,7 @@ class Connection extends Component ...@@ -342,7 +332,7 @@ class Connection extends Component
public function close() public function close()
{ {
if ($this->pdo !== null) { if ($this->pdo !== null) {
\Yii::trace('Closing DB connection: ' . $this->dsn, __CLASS__); \Yii::trace('Closing DB connection: ' . $this->dsn, __METHOD__);
$this->pdo = null; $this->pdo = null;
$this->_schema = null; $this->_schema = null;
$this->_transaction = null; $this->_transaction = null;
...@@ -516,6 +506,27 @@ class Connection extends Component ...@@ -516,6 +506,27 @@ class Connection extends Component
return $this->getSchema()->quoteColumnName($name); return $this->getSchema()->quoteColumnName($name);
} }
/**
* Processes a SQL statement by quoting table and column names that are enclosed within double brackets.
* Tokens enclosed within double curly brackets are treated as table names, while
* tokens enclosed within double square brackets are column names. They will be quoted accordingly.
* Also, the percentage character "%" in a table name will be replaced with [[tablePrefix]].
* @param string $sql the SQL to be quoted
* @return string the quoted SQL
*/
public function quoteSql($sql)
{
$db = $this;
return preg_replace_callback('/(\\{\\{([\w\-\. ]+)\\}\\}|\\[\\[([\w\-\. ]+)\\]\\])/',
function($matches) use($db) {
if (isset($matches[3])) {
return $db->quoteColumnName($matches[3]);
} else {
return str_replace('%', $this->tablePrefix, $db->quoteTableName($matches[2]));
}
}, $sql);
}
/** /**
* Returns the name of the DB driver for the current [[dsn]]. * Returns the name of the DB driver for the current [[dsn]].
* @return string name of the DB driver * @return string name of the DB driver
......
This diff is collapsed.
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
namespace yii\db; namespace yii\db;
use Yii;
use yii\base\NotSupportedException; use yii\base\NotSupportedException;
use yii\base\InvalidCallException; use yii\base\InvalidCallException;
use yii\caching\Cache; use yii\caching\Cache;
...@@ -82,23 +83,23 @@ abstract class Schema extends \yii\base\Object ...@@ -82,23 +83,23 @@ abstract class Schema extends \yii\base\Object
} }
$db = $this->db; $db = $this->db;
$realName = $this->getRealTableName($name); $realName = $this->getRawTableName($name);
/** @var $cache Cache */ if ($db->enableSchemaCache && !in_array($name, $db->schemaCacheExclude, true)) {
if ($db->enableSchemaCache && ($cache = \Yii::$app->getComponent($db->schemaCacheID)) !== null && !in_array($name, $db->schemaCacheExclude, true)) { /** @var $cache Cache */
$key = $this->getCacheKey($cache, $name); $cache = is_string($db->schemaCache) ? Yii::$app->getComponent($db->schemaCache) : $db->schemaCache;
if ($refresh || ($table = $cache->get($key)) === false) { if ($cache instanceof Cache) {
$table = $this->loadTableSchema($realName); $key = $this->getCacheKey($cache, $name);
if ($table !== null) { if ($refresh || ($table = $cache->get($key)) === false) {
$cache->set($key, $table, $db->schemaCacheDuration); $table = $this->loadTableSchema($realName);
if ($table !== null) {
$cache->set($key, $table, $db->schemaCacheDuration);
}
} }
return $this->_tables[$name] = $table;
} }
$this->_tables[$name] = $table;
} else {
$this->_tables[$name] = $table = $this->loadTableSchema($realName);
} }
return $this->_tables[$name] = $table = $this->loadTableSchema($realName);
return $table;
} }
/** /**
...@@ -173,8 +174,9 @@ abstract class Schema extends \yii\base\Object ...@@ -173,8 +174,9 @@ abstract class Schema extends \yii\base\Object
*/ */
public function refresh() public function refresh()
{ {
/** @var $cache \yii\caching\Cache */ /** @var $cache Cache */
if ($this->db->enableSchemaCache && ($cache = \Yii::$app->getComponent($this->db->schemaCacheID)) !== null) { $cache = is_string($this->db->schemaCache) ? Yii::$app->getComponent($this->db->schemaCache) : $this->db->schemaCache;
if ($this->db->enableSchemaCache && $cache instanceof Cache) {
foreach ($this->_tables as $name => $table) { foreach ($this->_tables as $name => $table) {
$cache->delete($this->getCacheKey($cache, $name)); $cache->delete($this->getCacheKey($cache, $name));
} }
...@@ -246,7 +248,7 @@ abstract class Schema extends \yii\base\Object ...@@ -246,7 +248,7 @@ abstract class Schema extends \yii\base\Object
/** /**
* Quotes a table name for use in a query. * Quotes a table name for use in a query.
* If the table name contains schema prefix, the prefix will also be properly quoted. * If the table name contains schema prefix, the prefix will also be properly quoted.
* If the table name is already quoted or contains special characters including '(', '[[' and '{{', * If the table name is already quoted or contains '(' or '{{',
* then this method will do nothing. * then this method will do nothing.
* @param string $name table name * @param string $name table name
* @return string the properly quoted table name * @return string the properly quoted table name
...@@ -254,7 +256,7 @@ abstract class Schema extends \yii\base\Object ...@@ -254,7 +256,7 @@ abstract class Schema extends \yii\base\Object
*/ */
public function quoteTableName($name) public function quoteTableName($name)
{ {
if (strpos($name, '(') !== false || strpos($name, '[[') !== false || strpos($name, '{{') !== false) { if (strpos($name, '(') !== false || strpos($name, '{{') !== false) {
return $name; return $name;
} }
if (strpos($name, '.') === false) { if (strpos($name, '.') === false) {
...@@ -271,7 +273,7 @@ abstract class Schema extends \yii\base\Object ...@@ -271,7 +273,7 @@ abstract class Schema extends \yii\base\Object
/** /**
* Quotes a column name for use in a query. * Quotes a column name for use in a query.
* If the column name contains prefix, the prefix will also be properly quoted. * If the column name contains prefix, the prefix will also be properly quoted.
* If the column name is already quoted or contains special characters including '(', '[[' and '{{', * If the column name is already quoted or contains '(', '[[' or '{{',
* then this method will do nothing. * then this method will do nothing.
* @param string $name column name * @param string $name column name
* @return string the properly quoted column name * @return string the properly quoted column name
...@@ -316,15 +318,15 @@ abstract class Schema extends \yii\base\Object ...@@ -316,15 +318,15 @@ abstract class Schema extends \yii\base\Object
} }
/** /**
* Returns the real name of a table name. * Returns the actual name of a given table name.
* This method will strip off curly brackets from the given table name * This method will strip off curly brackets from the given table name
* and replace the percentage character in the name with [[Connection::tablePrefix]]. * and replace the percentage character '%' with [[Connection::tablePrefix]].
* @param string $name the table name to be converted * @param string $name the table name to be converted
* @return string the real name of the given table name * @return string the real name of the given table name
*/ */
public function getRealTableName($name) public function getRawTableName($name)
{ {
if ($this->db->enableAutoQuoting && strpos($name, '{{') !== false) { if (strpos($name, '{{') !== false) {
$name = preg_replace('/\\{\\{(.*?)\\}\\}/', '\1', $name); $name = preg_replace('/\\{\\{(.*?)\\}\\}/', '\1', $name);
return str_replace('%', $this->db->tablePrefix, $name); return str_replace('%', $this->db->tablePrefix, $name);
} else { } else {
......
<?php
/**
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
namespace yii\db;
/**
* @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0
*/
class StaleObjectException extends Exception
{
/**
* @return string the user-friendly name of this exception
*/
public function getName()
{
return \Yii::t('yii|Stale Object Exception');
}
}
\ No newline at end of file
...@@ -66,7 +66,7 @@ class Transaction extends \yii\base\Object ...@@ -66,7 +66,7 @@ class Transaction extends \yii\base\Object
if ($this->db === null) { if ($this->db === null) {
throw new InvalidConfigException('Transaction::db must be set.'); throw new InvalidConfigException('Transaction::db must be set.');
} }
\Yii::trace('Starting transaction', __CLASS__); \Yii::trace('Starting transaction', __METHOD__);
$this->db->open(); $this->db->open();
$this->db->pdo->beginTransaction(); $this->db->pdo->beginTransaction();
$this->_active = true; $this->_active = true;
...@@ -80,7 +80,7 @@ class Transaction extends \yii\base\Object ...@@ -80,7 +80,7 @@ class Transaction extends \yii\base\Object
public function commit() public function commit()
{ {
if ($this->_active && $this->db && $this->db->isActive) { if ($this->_active && $this->db && $this->db->isActive) {
\Yii::trace('Committing transaction', __CLASS__); \Yii::trace('Committing transaction', __METHOD__);
$this->db->pdo->commit(); $this->db->pdo->commit();
$this->_active = false; $this->_active = false;
} else { } else {
...@@ -95,7 +95,7 @@ class Transaction extends \yii\base\Object ...@@ -95,7 +95,7 @@ class Transaction extends \yii\base\Object
public function rollback() public function rollback()
{ {
if ($this->_active && $this->db && $this->db->isActive) { if ($this->_active && $this->db && $this->db->isActive) {
\Yii::trace('Rolling back transaction', __CLASS__); \Yii::trace('Rolling back transaction', __METHOD__);
$this->db->pdo->rollBack(); $this->db->pdo->rollBack();
$this->_active = false; $this->_active = false;
} else { } else {
......
...@@ -949,11 +949,10 @@ class Html ...@@ -949,11 +949,10 @@ class Html
* If the input parameter * If the input parameter
* *
* - is an empty string: the currently requested URL will be returned; * - is an empty string: the currently requested URL will be returned;
* - is a non-empty string: it will be processed by [[Yii::getAlias()]] which, if the string is an alias, * - is a non-empty string: it will be processed by [[Yii::getAlias()]] and returned;
* will be resolved into a URL;
* - is an array: the first array element is considered a route, while the rest of the name-value * - is an array: the first array element is considered a route, while the rest of the name-value
* pairs are considered as the parameters to be used for URL creation using [[\yii\base\Application::createUrl()]]. * pairs are treated as the parameters to be used for URL creation using [[\yii\web\Controller::createUrl()]].
* Here are some examples: `array('post/index', 'page' => 2)`, `array('index')`. * For example: `array('post/index', 'page' => 2)`, `array('index')`.
* *
* @param array|string $url the parameter to be used to generate a valid URL * @param array|string $url the parameter to be used to generate a valid URL
* @return string the normalized URL * @return string the normalized URL
...@@ -963,7 +962,13 @@ class Html ...@@ -963,7 +962,13 @@ class Html
{ {
if (is_array($url)) { if (is_array($url)) {
if (isset($url[0])) { if (isset($url[0])) {
return Yii::$app->createUrl($url[0], array_splice($url, 1)); $route = $url[0];
$params = array_splice($url, 1);
if (Yii::$app->controller !== null) {
return Yii::$app->controller->createUrl($route, $params);
} else {
return Yii::$app->getUrlManager()->createUrl($route, $params);
}
} else { } else {
throw new InvalidParamException('The array specifying a URL must contain at least one element.'); throw new InvalidParamException('The array specifying a URL must contain at least one element.');
} }
......
This diff is collapsed.
...@@ -72,7 +72,7 @@ class PhpMessageSource extends MessageSource ...@@ -72,7 +72,7 @@ class PhpMessageSource extends MessageSource
} }
return $messages; return $messages;
} else { } else {
Yii::error("The message file for category '$category' does not exist: $messageFile", __CLASS__); Yii::error("The message file for category '$category' does not exist: $messageFile", __METHOD__);
return array(); return array();
} }
} }
......
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
<supplementalData>
<version number="$Revision: 6008 $"/>
<generation date="$Date: 2011-07-12 13:18:01 -0500 (Tue, 12 Jul 2011) $"/>
<plurals>
<!-- if locale is known to have no plurals, there are no rules -->
<pluralRules locales="az bm bo dz fa id ig ii hu ja jv ka kde kea km kn ko lo ms my sah ses sg th to tr vi wo yo zh"/>
<pluralRules locales="ar">
<pluralRule count="zero">n is 0</pluralRule>
<pluralRule count="one">n is 1</pluralRule>
<pluralRule count="two">n is 2</pluralRule>
<pluralRule count="few">n mod 100 in 3..10</pluralRule>
<pluralRule count="many">n mod 100 in 11..99</pluralRule>
</pluralRules>
<pluralRules locales="asa af bem bez bg bn brx ca cgg chr da de dv ee el en eo es et eu fi fo fur fy gl gsw gu ha haw he is it jmc kaj kcg kk kl ksb ku lb lg mas ml mn mr nah nb nd ne nl nn no nr ny nyn om or pa pap ps pt rof rm rwk saq seh sn so sq ss ssy st sv sw syr ta te teo tig tk tn ts ur wae ve vun xh xog zu">
<pluralRule count="one">n is 1</pluralRule>
</pluralRules>
<pluralRules locales="ak am bh fil tl guw hi ln mg nso ti wa">
<pluralRule count="one">n in 0..1</pluralRule>
</pluralRules>
<pluralRules locales="ff fr kab">
<pluralRule count="one">n within 0..2 and n is not 2</pluralRule>
</pluralRules>
<pluralRules locales="lv">
<pluralRule count="zero">n is 0</pluralRule>
<pluralRule count="one">n mod 10 is 1 and n mod 100 is not 11</pluralRule>
</pluralRules>
<pluralRules locales="iu kw naq se sma smi smj smn sms">
<pluralRule count="one">n is 1</pluralRule>
<pluralRule count="two">n is 2</pluralRule>
</pluralRules>
<pluralRules locales="ga"> <!-- http://unicode.org/cldr/trac/ticket/3915 -->
<pluralRule count="one">n is 1</pluralRule>
<pluralRule count="two">n is 2</pluralRule>
<pluralRule count="few">n in 3..6</pluralRule>
<pluralRule count="many">n in 7..10</pluralRule>
</pluralRules>
<pluralRules locales="ro mo">
<pluralRule count="one">n is 1</pluralRule>
<pluralRule count="few">n is 0 OR n is not 1 AND n mod 100 in 1..19</pluralRule>
</pluralRules>
<pluralRules locales="lt">
<pluralRule count="one">n mod 10 is 1 and n mod 100 not in 11..19</pluralRule>
<pluralRule count="few">n mod 10 in 2..9 and n mod 100 not in 11..19</pluralRule>
</pluralRules>
<pluralRules locales="be bs hr ru sh sr uk">
<pluralRule count="one">n mod 10 is 1 and n mod 100 is not 11</pluralRule>
<pluralRule count="few">n mod 10 in 2..4 and n mod 100 not in 12..14</pluralRule>
<pluralRule count="many">n mod 10 is 0 or n mod 10 in 5..9 or n mod 100 in 11..14</pluralRule>
<!-- others are fractions -->
</pluralRules>
<pluralRules locales="cs sk">
<pluralRule count="one">n is 1</pluralRule>
<pluralRule count="few">n in 2..4</pluralRule>
</pluralRules>
<pluralRules locales="pl">
<pluralRule count="one">n is 1</pluralRule>
<pluralRule count="few">n mod 10 in 2..4 and n mod 100 not in 12..14</pluralRule>
<pluralRule count="many">n is not 1 and n mod 10 in 0..1 or n mod 10 in 5..9 or n mod 100 in 12..14</pluralRule>
<!-- others are fractions -->
<!-- and n mod 100 not in 22..24 from Tamplin -->
</pluralRules>
<pluralRules locales="sl">
<pluralRule count="one">n mod 100 is 1</pluralRule>
<pluralRule count="two">n mod 100 is 2</pluralRule>
<pluralRule count="few">n mod 100 in 3..4</pluralRule>
</pluralRules>
<pluralRules locales="mt"> <!-- from Tamplin's data -->
<pluralRule count="one">n is 1</pluralRule>
<pluralRule count="few">n is 0 or n mod 100 in 2..10</pluralRule>
<pluralRule count="many">n mod 100 in 11..19</pluralRule>
</pluralRules>
<pluralRules locales="mk"> <!-- from Tamplin's data -->
<pluralRule count="one">n mod 10 is 1 and n is not 11</pluralRule>
</pluralRules>
<pluralRules locales="cy"> <!-- from http://www.saltcymru.org/wordpress/?p=99&lang=en -->
<pluralRule count="zero">n is 0</pluralRule>
<pluralRule count="one">n is 1</pluralRule>
<pluralRule count="two">n is 2</pluralRule>
<pluralRule count="few">n is 3</pluralRule>
<pluralRule count="many">n is 6</pluralRule>
</pluralRules>
<pluralRules locales="lag">
<pluralRule count="zero">n is 0</pluralRule>
<pluralRule count="one">n within 0..2 and n is not 0 and n is not 2</pluralRule>
</pluralRules>
<pluralRules locales="shi">
<pluralRule count="one">n within 0..1</pluralRule>
<pluralRule count="few">n in 2..10</pluralRule>
</pluralRules>
<pluralRules locales="br"> <!-- from http://unicode.org/cldr/trac/ticket/2886 -->
<pluralRule count="one">n mod 10 is 1 and n mod 100 not in 11,71,91</pluralRule>
<pluralRule count="two">n mod 10 is 2 and n mod 100 not in 12,72,92</pluralRule>
<pluralRule count="few">n mod 10 in 3..4,9 and n mod 100 not in 10..19,70..79,90..99</pluralRule>
<pluralRule count="many">n mod 1000000 is 0 and n is not 0</pluralRule>
</pluralRules>
<pluralRules locales="ksh">
<pluralRule count="zero">n is 0</pluralRule>
<pluralRule count="one">n is 1</pluralRule>
</pluralRules>
<pluralRules locales="tzm">
<pluralRule count="one">n in 0..1 or n in 11..99</pluralRule>
</pluralRules>
<pluralRules locales="gv">
<pluralRule count="one">n mod 10 in 1..2 or n mod 20 is 0</pluralRule>
</pluralRules>
</plurals>
</supplementalData>
This diff is collapsed.
...@@ -238,6 +238,7 @@ abstract class Target extends \yii\base\Component ...@@ -238,6 +238,7 @@ abstract class Target extends \yii\base\Component
if (!is_string($text)) { if (!is_string($text)) {
$text = var_export($text, true); $text = var_export($text, true);
} }
return date('Y/m/d H:i:s', $timestamp) . " [$level] [$category] $text\n"; $ip = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '127.0.0.1';
return date('Y/m/d H:i:s', $timestamp) . " [$ip] [$level] [$category] $text\n";
} }
} }
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -530,7 +530,7 @@ class Request extends \yii\base\Request ...@@ -530,7 +530,7 @@ class Request extends \yii\base\Request
* Returns the user IP address. * Returns the user IP address.
* @return string user IP address * @return string user IP address
*/ */
public function getUserHostAddress() public function getUserIP()
{ {
return isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '127.0.0.1'; return isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '127.0.0.1';
} }
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -352,7 +352,7 @@ class NewComponent extends Component ...@@ -352,7 +352,7 @@ class NewComponent extends Component
public function raiseEvent() public function raiseEvent()
{ {
$this->trigger('click', new Event($this)); $this->trigger('click', new Event);
} }
} }
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment