Permalink
Browse files

Merge branch 'master' of github.com:yiisoft/yii into 1980-better

Conflicts:
	CHANGELOG
  • Loading branch information...
2 parents de416ba + 70190e3 commit 64a6aa85f8ef1dce3644d532e1e693fed2e9e1a2 @resurtm resurtm committed Mar 20, 2013
Showing 1,078 changed files with 10,675 additions and 4,110 deletions.
View
@@ -6,13 +6,10 @@ php:
- 5.4
- 5.5
-services:
- - memcached
-
before_script:
- ./tests/travis/mysql-setup.sh
- ./tests/travis/postgresql-setup.sh
- ./tests/travis/memcache-setup.sh
- cd tests
-script: phpunit --colors --coverage-text --exclude-group mssql,oci framework
+script: phpunit --colors --no-globals-backup --exclude-group mssql,oci framework
View
@@ -3,17 +3,54 @@
Version 1.1.14 work in progress
-------------------------------
+- Bug #135: Fixed wrong CActiveRecord rows count with having (klimov-paul)
- Bug #150: Fixed CWidget was not switching between view paths when using themes (antoncpu)
- Bug #1464: Fixed transparent background for ImageMagick in CCaptchaAction (manuel-84, cebe)
+- Bug #1693: Fixed log file will rotate twice when high performance (monque)
+- Bug #1724: Allow CClientScript registering scripts and script files with the HTML options (klimov-paul)
- Bug #1763: CSqlDataProvider was appending another ORDER BY string to an existing ORDER BY statement when using fieldname with dot (szako)
+- Bug #1895: Fixed erroneous language attributes in french views (located at `framework\views\fr`) (Ragazzo)
- Bug #1915: CDataProviderIterator: fixed init in case of disabled pagination (antoncpu)
- Bug #1941: yiiactiveform.js form reset now uses CHtml::errorCss instead of a hardcoded value (mdomba)
- Bug #1942: CActiveForm client/ajax validation will now remove error class from server side validation (mdomba)
+- Bug #1945: Reference to undefined variable $column in CDbMigration::dropPrimaryKey (paystey)
+- Bug #1955: Some validators used to cause warnings or errors in case non-scalar array typed values being checked (resurtm)
+- Bug #1984: CDbMigration: fix of undeclared variable usage in debug information in dropPrimaryKey (papulovskiy)
+- Bug #1996: Using yiic help for commands with parameters with array as default value resulted in PHP error with latest PHP versions (dInGd0nG, samdark)
+- Bug #1997: Cache key in CGettextMessageSource::loadMessages wasn't specific enough (odevyatkov)
+- Bug #2023: CHttpRequest::stripSlashes() now modifies array keys as well (etienneq)
+- Bug #2030: Fixed problem with MySQL 4.x: Undefined Index: Comment in CMysqlSchema (cebe)
+- Bug #2048: AR now uses alias from CActiveRecord::getTableAlias instead of always using default "t" (s-larionov)
+- Bug #2049: CStatElement relation with join option throw exception when key-field present on joined table (Yiivgeny)
+- Bug #2078: Fixed problem with "undefined" parameter in query string when using CListView or CGridView with enableHistory (Parpaing)
+- Bug #2086: Fixed .hgignore rule for assets folder (GeXu3, Koduc)
+- Bug #2087: CLocale: getLocaleDisplayName() was only returning the language display name, not the full locale display name (brandonkelly)
+- Bug #2112: Fixed broken yiic shell CRUD command (mbischof)
+- Bug #2121: CMssqlSchema::resetSequence() incorrectly resets sequence (resurtm, joewoodhouse)
+- Bug #2123: Fixed error in plural rules handling if locale has no plural rules defined (cebe, stepanselyuk)
+- Bug #2146: CEmailValidator fix when fsockopen() can output uncatched error 'Connection refused (61)' (armab)
+- Bug #2159: Fixed SQL syntax for delete command with join in MySQL (serebrov)
+- Bug #2184: CDbHttpSession now supports MS SQL Server BLOB data type (cheuschober, resurtm)
+- Bug #2216: CDbCommandBuilder::createInCondition() has been updated, allowing to pass array of values with mixed keys for the single type column (klimov-paul)
+- Enh: Better CFileLogRoute performance (Qiang, samdark)
+- Enh: Refactored CHttpRequest::getDelete and CHttpRequest::getPut not to use _restParams directly (samdark)
- Enh #1743: Added CActiveForm::searchField() and CHtml::activeSearchField() to create HTML input field of type SEARCH (njasm)
- Enh #1847: Added COutputCache::varyByLanguage to generate separate cache for different languages (Obramko)
+- Enh #1948: Tidy up and improve html5 input support in CHtml and CActiveForm (phpnode)
+- Enh #1977: CFormatter::normalizeDateValue() now is protected instead of private to enable child classes to override it (etienneq)
+- Enh #2038: CFormatter::formatNtext() method can replace newlines with `<p></p>` not just with `<br />` as it was before (resurtm)
+- Enh #2135: MessageCommand can now handles Yii::t() messages with files in subfolders (firsyura)
+- Enh #2205: CActiveForm::error() now depends on CHtml::$errorContainerTag (malyshev)
+- Enh #2217: Support of the empty option for CHtml::radioButtonList() has been introduced (resurtm)
+- Chg: Upgraded HTMLPurifier to v4.5.0 (samdark)
- Chg #645: CDbConnection now throws CDbException when failed to open DB connection instead of failing with a warning (kidol, eirikhm, samdark, cebe)
- Chg #1891: Changed order of methods in models generated by Gii and yiic, added better description of search method (hijarian, samdark)
+- Chg #2069: Upgraded jQuery BBQ Plugin to 1.4pre to fix jQuery compatibility problems (samdark)
+- Chg #2183: Vendors: phlymail's Net_IDNA was replaced by PEAR Net_IDNA2 (resurtm, DaSourcerer)
+- Chg #2187: Vendors: punycode.js updated from 1.1.1 (June 27, 2012) to 1.2.0 (October 10, 2012) (resurtm)
+- New #575: Yii registering at Packagist, added composer info file (schmunk42)
- New #1785: Added CPasswordHelper (tom--)
+- New #2178: Added Catalan Translation (ArnauAregall)
Version 1.1.13 December 30, 2012
--------------------------------
View
@@ -1,7 +1,7 @@
The Yii framework is free software. It is released under the terms of
the following BSD License.
-Copyright © 2008-2011 by Yii Software LLC (http://www.yiisoft.com)
+Copyright (c) 2008-2013 by Yii Software LLC (http://www.yiisoft.com)
All rights reserved.
Redistribution and use in source and binary forms, with or without
View
16 UPGRADE
@@ -20,6 +20,22 @@ General upgrade instructions
Upgrading from v1.1.13
----------------------
+- CActiveRecord::count() now respects group by and having. If your code relied
+ on ignoring it your application may break and should be updated.
+
+- Vendors: phlymail's Net_IDNA was replaced by PEAR Net_IDNA2. The latter library is better maintained than the former.
+ In case your code relies on bundled phlymail's Net_IDNA you should change it a bit. Old way of encoding IDNs:
+
+ require_once(Yii::getPathOfAlias('system.vendors.idna_convert').DIRECTORY_SEPARATOR.'idna_convert.class.php');
+ $idnaConvert=new idna_convert();
+ $result=$idnaConvert->encode($value);
+
+ New:
+
+ require_once(Yii::getPathOfAlias('system.vendors.Net_IDNA2.Net').DIRECTORY_SEPARATOR.'IDNA2.php');
+ $idna=new Net_IDNA2();
+ $result=$idna->encode($value);
+
Upgrading from v1.1.12
----------------------
- Both jQuery and jQueryUI were updated. Check [jQuery UI upgrade guide](http://jqueryui.com/upgrade-guide/1.9/)
View
@@ -8,7 +8,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008 Yii Software LLC
+ * @copyright 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
View
@@ -7,7 +7,7 @@ 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 Copyright &copy; 2008 Yii Software LLC
+rem @copyright 2008 Yii Software LLC
rem @license http://www.yiiframework.com/license/
rem @version $Id$
rem -------------------------------------------------------------
View
@@ -5,7 +5,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2009 Yii Software LLC
+ * @copyright 2008-2009 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
-->
@@ -4,7 +4,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
Yii::import('application.commands.api.ApiModel');
@@ -4,7 +4,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
@@ -4,7 +4,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
@@ -207,7 +207,7 @@ protected function process($path)
* Copyright © 1991-2007 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
*
- * Copyright © 2008-2011 Yii Software LLC (http://www.yiiframework.com/license/)
+ * @copyright 2008-2013 Yii Software LLC (http://www.yiiframework.com/license/)
*/
return $data;
EOD;
@@ -4,7 +4,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
@@ -58,7 +58,7 @@ public function run($args)
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2012 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
* @license http://www.yiiframework.com/license/
* @version \$Id: \$
* @since 1.0
@@ -4,7 +4,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2012 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
@@ -4,7 +4,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
@@ -21,7 +21,7 @@
</div><!-- end of content -->
<div id="apiFooter">
-Copyright &copy; 2008-2011 by <a href="http://www.yiisoft.com">Yii Software LLC</a><br/>
+&copy; 2008-2013 by <a href="http://www.yiisoft.com">Yii Software LLC</a><br/>
All Rights Reserved.<br/>
</div><!-- end of footer -->
@@ -15,7 +15,7 @@
%\begin{center} \large \today \end{center}
\begin{center}
- Copyright 2008-2012. All Rights Reserved.
+ Copyright 2008-2013. All Rights Reserved.
\end{center}
\vfill
@@ -15,7 +15,7 @@
%\begin{center} \large \today \end{center}
\begin{center}
- Copyright 2008-2012. All Rights Reserved.
+ Copyright 2008-2013. All Rights Reserved.
\end{center}
\vfill
@@ -5,7 +5,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2010 Yii Software LLC
+ * @copyright 2008-2010 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
@@ -6,12 +6,11 @@
$nClassesTotal = 0;
file_put_contents(
- dirname(__FILE__) . '\phpdoc.txt',
- getPhpDocForDir('D:\Web\libs-dev\yii\framework') . getPhpDocStats());
- //getPhpDocForDir('D:\Web\libs\yii\framework') . getPhpDocStats());
-//echo getPhpDocForDir('D:\Web\libs\yii\framework');
-//echo getPhpDocForDir('D:\Web\libs\yii\framework\caching');
-//echo getPhpDocForFile('D:\Web\libs\yii\framework\base\CModel.php');
+ dirname(__FILE__) . '/phpdoc.txt',
+ getPhpDocForDir(dirname(dirname(__FILE__)) . '/framework') . getPhpDocStats()
+// getPhpDocForDir(dirname(dirname(__FILE__)) . '/framework/caching') . getPhpDocStats()
+// getPhpDocForDir(dirname(dirname(__FILE__)) . '/framework/base/CModel.php') . getPhpDocStats()
+);
function getPhpDocStats()
{
@@ -4,7 +4,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
@@ -4,7 +4,7 @@
*
* @author Wei Zhuo <weizho@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
View
@@ -0,0 +1,57 @@
+{
+ "name": "yiisoft/yii",
+ "description": "Yii Web Programming Framework",
+ "keywords": ["yii", "framework"],
+ "homepage": "http://www.yiiframework.com/",
+ "type": "library",
+ "license": "BSD-3-Clause",
+ "authors": [
+ {
+ "name": "Qiang Xue",
+ "email": "qiang.xue@gmail.com",
+ "homepage": "http://www.yiiframework.com/",
+ "role": "Founder and project lead"
+ },
+ {
+ "name": "Alexander Makarov",
+ "email": "sam@rmcreative.ru",
+ "homepage": "http://rmcreative.ru/",
+ "role": "Core framework development"
+ },
+ {
+ "name": "Maurizio Domba",
+ "homepage": "http://mdomba.info/",
+ "role": "Core framework development"
+ },
+ {
+ "name": "Carsten Brandt",
+ "email": "mail@cebe.cc",
+ "homepage": "http://cebe.cc/",
+ "role": "Core framework development"
+ },
+ {
+ "name": "Wei Zhuo",
+ "email": "weizhuo@gmail.com",
+ "role": "Project site maintenance and development"
+ },
+ {
+ "name": "Sebastián Thierer",
+ "role": "Component development"
+ },
+ {
+ "name": "Jeffrey Winesett",
+ "role": "Documentation and marketing"
+ }
+
+ ],
+ "support": {
+ "issues": "https://github.com/yiisoft/yii/issues?state=open",
+ "forum": "http://www.yiiframework.com/forum/",
+ "wiki": "http://www.yiiframework.com/wiki/",
+ "irc": "irc://irc.freenode.net/yii",
+ "source": "https://github.com/yiisoft/yii"
+ },
+ "require": {
+ "php": ">=5.1.0"
+ }
+}
View
@@ -30,7 +30,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2010 Yii Software LLC
+ * @copyright 2008-2010 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
@@ -4,7 +4,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
@@ -60,7 +60,7 @@ http://www.example.com/blog/index.php?r=gii
残りのデータベーステーブル (`tbl_post`, `tbl_comment`, `tbl_tag`, `tbl_lookup`) について、同じ手順を繰り返します。
-> Tip|ヒント: `Table Name`フィールドにアスタリスク '*' を入力することも可能です。これにより一発で、**全ての** データベーステーブルのモデルクラスが生成されます。
+> Tip|ヒント: `Table Name`フィールドにアスタリスク `*` を入力することも可能です。これにより一発で、**全ての** データベーステーブルのモデルクラスが生成されます。
この段階において、以下のファイルが新しく生成されています。
@@ -54,7 +54,7 @@ On the `Model Generator` page, enter `tbl_user` (the user table name) in the `Ta
Repeat the same procedure for the rest of the database tables, including `tbl_post`, `tbl_comment`, `tbl_tag` and `tbl_lookup`.
-> Tip: We can also enter an asterisk character '*' in the `Table Name` field. This will generate a model class for *every* database table in a single shot.
+> Tip: We can also enter an asterisk character `*` in the `Table Name` field. This will generate a model class for *every* database table in a single shot.
At this stage, we will have the following newly created files:
@@ -73,7 +73,7 @@ http://www.example.com/blog/index.php?r=gii
Повторим те же действия для всех остальных таблиц БД, включая
`tbl_post`, `tbl_comment`, `tbl_tag` и `tbl_lookup`.
-> Tip|Подсказка: Также мы можем ввести '\*' в поле `Table Name`. Так мы сгенерируем
+> Tip|Подсказка: Также мы можем ввести `*` в поле `Table Name`. Так мы сгенерируем
модели для *каждой* таблицы БД за один раз.
На данном этапе у нас будут созданы следующие файлы:
Oops, something went wrong.

0 comments on commit 64a6aa8

Please sign in to comment.