From fedc38fdb61554f161aaf46ed41f718f7e72f4b7 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Fri, 1 Nov 2013 13:08:01 -0400 Subject: [PATCH 01/18] Fixes #1116. --- framework/yii/gii/assets/gii.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/yii/gii/assets/gii.js b/framework/yii/gii/assets/gii.js index b581d3b173..a95221e52f 100644 --- a/framework/yii/gii/assets/gii.js +++ b/framework/yii/gii/assets/gii.js @@ -14,7 +14,7 @@ yii.gii = (function ($) { }; var initStickyInputs = function () { - $('.sticky:not(.error) input[type="text"],select,textarea').each(function () { + $('.sticky:not(.error)').find('input[type="text"],select,textarea').each(function () { var value; if (this.tagName === 'SELECT') { value = this.options[this.selectedIndex].text; From 4b42d78f4ef38666137dd883c1f18fa44c264c32 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Fri, 1 Nov 2013 21:43:33 -0400 Subject: [PATCH 02/18] Fixes #1117: added support to map a single view directory to multiple themed view directories. --- framework/yii/base/Theme.php | 51 +++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/framework/yii/base/Theme.php b/framework/yii/base/Theme.php index ff6780cbc9..b864412d18 100644 --- a/framework/yii/base/Theme.php +++ b/framework/yii/base/Theme.php @@ -13,17 +13,38 @@ use yii\helpers\FileHelper; /** * Theme represents an application theme. * - * A theme is directory consisting of view and layout files which are meant to replace their - * non-themed counterparts. + * When [[View]] renders a view file, it will check the [[Application::theme|active theme]] + * to see if there is a themed version of the view file exists. If so, the themed version will be rendered instead. * - * Theme uses [[pathMap]] to achieve the file replacement. A view or layout file will be replaced - * with its themed version if part of its path matches one of the keys in [[pathMap]]. - * Then the matched part will be replaced with the corresponding array value. + * A theme is directory consisting of view files which are meant to replace their non-themed counterparts. + * + * Theme uses [[pathMap]] to achieve the view file replacement: + * + * 1. It first looks for a key in [[pathMap]] that is a substring of the given view file path; + * 2. If such a key exists, the corresponding value will be used to replace the corresponding part + * in the view file path; + * 3. It will then check if the updated view file exists or not. If so, that file will be used + * to replace the original view file. + * 4. If Step 2 or 3 fails, the original view file will be used. * * For example, if [[pathMap]] is `['/web/views' => '/web/themes/basic']`, * then the themed version for a view file `/web/views/site/index.php` will be * `/web/themes/basic/site/index.php`. * + * It is possible to map a single path to multiple paths. For example, + * + * ~~~ + * 'pathMap' => [ + * '/web/views' => [ + * '/web/themes/christmas', + * '/web/themes/basic', + * ], + * ] + * ~~~ + * + * In this case, the themed version could be either `/web/themes/christmas/site/index.php` or + * `/web/themes/basic/site/index.php`. The former has precedence over the latter if both files exist. + * * To use a theme, you should configure the [[View::theme|theme]] property of the "view" application * component like the following: * @@ -75,16 +96,18 @@ class Theme extends Component if (empty($this->pathMap)) { if ($this->basePath !== null) { $this->basePath = Yii::getAlias($this->basePath); - $this->pathMap = [Yii::$app->getBasePath() => $this->basePath]; + $this->pathMap = [Yii::$app->getBasePath() => [$this->basePath]]; } else { throw new InvalidConfigException('The "basePath" property must be set.'); } } $paths = []; - foreach ($this->pathMap as $from => $to) { + foreach ($this->pathMap as $from => $tos) { $from = FileHelper::normalizePath(Yii::getAlias($from)); - $to = FileHelper::normalizePath(Yii::getAlias($to)); - $paths[$from . DIRECTORY_SEPARATOR] = $to . DIRECTORY_SEPARATOR; + foreach ((array)$tos as $to) { + $to = FileHelper::normalizePath(Yii::getAlias($to)); + $paths[$from . DIRECTORY_SEPARATOR][] = $to . DIRECTORY_SEPARATOR; + } } $this->pathMap = $paths; if ($this->baseUrl === null) { @@ -103,12 +126,14 @@ class Theme extends Component public function applyTo($path) { $path = FileHelper::normalizePath($path); - foreach ($this->pathMap as $from => $to) { + foreach ($this->pathMap as $from => $tos) { if (strpos($path, $from) === 0) { $n = strlen($from); - $file = $to . substr($path, $n); - if (is_file($file)) { - return $file; + foreach ($tos as $to) { + $file = $to . substr($path, $n); + if (is_file($file)) { + return $file; + } } } } From 64641cbd766366941c3da0b059efc42859d09fe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD=20=D0=91=D0=B0=D0=B3=D0=B0=D0=B5?= =?UTF-8?q?=D0=B2?= Date: Sat, 2 Nov 2013 10:42:14 +0500 Subject: [PATCH 03/18] Add batchInsert method to yii\db\Migration --- framework/yii/db/Migration.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/framework/yii/db/Migration.php b/framework/yii/db/Migration.php index 307b02a7b9..37fdf3fd35 100644 --- a/framework/yii/db/Migration.php +++ b/framework/yii/db/Migration.php @@ -157,6 +157,21 @@ class Migration extends \yii\base\Component echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n"; } + /** + * Creates and executes an batch INSERT SQL statement. + * The method will properly escape the column names, and bind the values to be inserted. + * @param string $table the table that new rows will be inserted into. + * @param array $columns the column names. + * @param array $rows the rows to be batch inserted into the table + */ + public function batchInsert($table, $columns, $rows) + { + echo " > insert into $table ..."; + $time = microtime(true); + $this->db->createCommand()->batchInsert($table, $columns, $rows)->execute(); + echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n"; + } + /** * Creates and executes an UPDATE SQL statement. * The method will properly escape the column names and bind the values to be updated. From cc5fe76c9ee421fe75d4e7bd8976ab109deee4a1 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Sat, 2 Nov 2013 16:31:30 +0400 Subject: [PATCH 04/18] Added ability to get all GET, POST, PUT, DELETE or PATCH parameters to Request --- framework/yii/web/Request.php | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/framework/yii/web/Request.php b/framework/yii/web/Request.php index 610e90776c..a6a92faa2a 100644 --- a/framework/yii/web/Request.php +++ b/framework/yii/web/Request.php @@ -290,59 +290,74 @@ class Request extends \yii\base\Request /** * Returns the named GET parameter value. * If the GET parameter does not exist, the second parameter to this method will be returned. - * @param string $name the GET parameter name + * @param string $name the GET parameter name. If not specified, whole $_GET is returned. * @param mixed $defaultValue the default parameter value if the GET parameter does not exist. * @return mixed the GET parameter value * @see getPost */ - public function get($name, $defaultValue = null) + public function get($name = null, $defaultValue = null) { + if ($name === null) { + return $_GET; + } return isset($_GET[$name]) ? $_GET[$name] : $defaultValue; } /** * Returns the named POST parameter value. * If the POST parameter does not exist, the second parameter to this method will be returned. - * @param string $name the POST parameter name + * @param string $name the POST parameter name. If not specified, whole $_POST is returned. * @param mixed $defaultValue the default parameter value if the POST parameter does not exist. * @return mixed the POST parameter value * @see getParam */ - public function getPost($name, $defaultValue = null) + public function getPost($name = null, $defaultValue = null) { + if ($name === null) { + return $_POST; + } return isset($_POST[$name]) ? $_POST[$name] : $defaultValue; } /** * Returns the named DELETE parameter value. - * @param string $name the DELETE parameter name + * @param string $name the DELETE parameter name. If not specified, an array of DELETE parameters is returned. * @param mixed $defaultValue the default parameter value if the DELETE parameter does not exist. * @return mixed the DELETE parameter value */ - public function getDelete($name, $defaultValue = null) + public function getDelete($name = null, $defaultValue = null) { + if ($name === null) { + return $this->getRestParams(); + } return $this->getIsDelete() ? $this->getRestParam($name, $defaultValue) : null; } /** * Returns the named PUT parameter value. - * @param string $name the PUT parameter name + * @param string $name the PUT parameter name. If not specified, an array of PUT parameters is returned. * @param mixed $defaultValue the default parameter value if the PUT parameter does not exist. * @return mixed the PUT parameter value */ - public function getPut($name, $defaultValue = null) + public function getPut($name = null, $defaultValue = null) { + if ($name === null) { + return $this->getRestParams(); + } return $this->getIsPut() ? $this->getRestParam($name, $defaultValue) : null; } /** * Returns the named PATCH parameter value. - * @param string $name the PATCH parameter name + * @param string $name the PATCH parameter name. If not specified, an array of PATCH parameters is returned. * @param mixed $defaultValue the default parameter value if the PATCH parameter does not exist. * @return mixed the PATCH parameter value */ - public function getPatch($name, $defaultValue = null) + public function getPatch($name = null, $defaultValue = null) { + if ($name === null) { + return $this->getRestParams(); + } return $this->getIsPatch() ? $this->getRestParam($name, $defaultValue) : null; } From 62148a2e33ea372198fb3b5b8e2604d25a2487fc Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Sat, 2 Nov 2013 16:39:24 +0400 Subject: [PATCH 05/18] Changed php-diff dependency to use code from master (they haven't tagged changes we need yet) --- framework/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/composer.json b/framework/composer.json index 419b4b7798..05c4360ffb 100644 --- a/framework/composer.json +++ b/framework/composer.json @@ -68,7 +68,7 @@ "yiisoft/yii2-composer": "*", "ext-mbstring": "*", "lib-pcre": "*", - "phpspec/php-diff": "1.0.*", + "phpspec/php-diff": "dev-master", "ezyang/htmlpurifier": "4.5.*" }, "autoload": { From 18fbd7510a1f5c01ece1079f7346dc957812888e Mon Sep 17 00:00:00 2001 From: Alexander Mohorev Date: Sat, 2 Nov 2013 16:12:28 +0300 Subject: [PATCH 06/18] Missing return statement --- framework/yii/db/ActiveRecord.php | 2 ++ framework/yii/db/mssql/Schema.php | 2 ++ framework/yii/i18n/GettextMoFile.php | 2 ++ 3 files changed, 6 insertions(+) diff --git a/framework/yii/db/ActiveRecord.php b/framework/yii/db/ActiveRecord.php index 79d5146791..2c1689cdf0 100644 --- a/framework/yii/db/ActiveRecord.php +++ b/framework/yii/db/ActiveRecord.php @@ -1266,6 +1266,8 @@ class ActiveRecord extends Model $relation = $this->$getter(); if ($relation instanceof ActiveRelation) { return $relation; + } else { + return null; } } catch (UnknownMethodException $e) { throw new InvalidParamException(get_class($this) . ' has no relation named "' . $name . '".', 0, $e); diff --git a/framework/yii/db/mssql/Schema.php b/framework/yii/db/mssql/Schema.php index 0bb5924887..deb92f956f 100644 --- a/framework/yii/db/mssql/Schema.php +++ b/framework/yii/db/mssql/Schema.php @@ -118,6 +118,8 @@ class Schema extends \yii\db\Schema if ($this->findColumns($table)) { $this->findForeignKeys($table); return $table; + } else { + return null; } } diff --git a/framework/yii/i18n/GettextMoFile.php b/framework/yii/i18n/GettextMoFile.php index a92293c23f..4a0a93ca82 100644 --- a/framework/yii/i18n/GettextMoFile.php +++ b/framework/yii/i18n/GettextMoFile.php @@ -203,6 +203,8 @@ class GettextMoFile extends GettextFile { if ($byteCount > 0) { return fread($fileHandle, $byteCount); + } else { + return null; } } From 5860599ef7fc6788203348579c5cb8ca133a7760 Mon Sep 17 00:00:00 2001 From: Alexander Mohorev Date: Sat, 2 Nov 2013 17:03:37 +0300 Subject: [PATCH 07/18] PhpDoc comment --- framework/yii/db/sqlite/QueryBuilder.php | 1 + framework/yii/i18n/GettextMoFile.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/framework/yii/db/sqlite/QueryBuilder.php b/framework/yii/db/sqlite/QueryBuilder.php index 2a6f34573c..4a5407f293 100644 --- a/framework/yii/db/sqlite/QueryBuilder.php +++ b/framework/yii/db/sqlite/QueryBuilder.php @@ -80,6 +80,7 @@ class QueryBuilder extends \yii\db\QueryBuilder * @param boolean $check whether to turn on or off the integrity check. * @param string $schema the schema of the tables. Meaningless for SQLite. * @param string $table the table name. Meaningless for SQLite. + * @return string the SQL statement for checking integrity * @throws NotSupportedException this is not supported by SQLite */ public function checkIntegrity($check = true, $schema = '', $table = '') diff --git a/framework/yii/i18n/GettextMoFile.php b/framework/yii/i18n/GettextMoFile.php index 4a0a93ca82..b4a016de52 100644 --- a/framework/yii/i18n/GettextMoFile.php +++ b/framework/yii/i18n/GettextMoFile.php @@ -54,6 +54,7 @@ class GettextMoFile extends GettextFile * @param string $context message context * @return array message translations. Array keys are source messages and array values are translated messages: * source message => translated message. + * @throws Exception if unable to read the MO file */ public function load($filePath, $context) { @@ -128,6 +129,7 @@ class GettextMoFile extends GettextFile * @param array $messages message translations. Array keys are source messages and array values are * translated messages: source message => translated message. Note if the message has a context, * the message ID must be prefixed with the context with chr(4) as the separator. + * @throws Exception if unable to save the MO file */ public function save($filePath, $messages) { From eee63f172114970a9fd59801ff8b8d074e9f47e2 Mon Sep 17 00:00:00 2001 From: Alexander Mohorev Date: Sat, 2 Nov 2013 17:53:48 +0300 Subject: [PATCH 08/18] Small typos --- docs/api/db/ActiveRecord.md | 2 +- docs/guide/authorization.md | 2 +- docs/guide/i18n.md | 2 +- docs/guide/query-builder.md | 2 +- docs/guide/validation.md | 2 +- docs/guide/view.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/api/db/ActiveRecord.md b/docs/api/db/ActiveRecord.md index 70f171ba3e..ef050d001f 100644 --- a/docs/api/db/ActiveRecord.md +++ b/docs/api/db/ActiveRecord.md @@ -1,6 +1,6 @@ ActiveRecord implements the [Active Record design pattern](http://en.wikipedia.org/wiki/Active_record). The idea is that an ActiveRecord object is associated with a row in a database table -so object properties are mapped to colums of the corresponding database row. +so object properties are mapped to columns of the corresponding database row. For example, a `Customer` object is associated with a row in the `tbl_customer` table. Instead of writing raw SQL statements to access the data in the table, you can call intuitive methods available in the corresponding ActiveRecord class diff --git a/docs/guide/authorization.md b/docs/guide/authorization.md index 47b940932d..b49f1af1df 100644 --- a/docs/guide/authorization.md +++ b/docs/guide/authorization.md @@ -7,7 +7,7 @@ of controlling it. Access control basics --------------------- -Basic acces control is very simple to implement using [[\yii\web\AccessControl]]: +Basic access control is very simple to implement using [[\yii\web\AccessControl]]: ```php class SiteController extends Controller diff --git a/docs/guide/i18n.md b/docs/guide/i18n.md index 33f77588cb..6524801e20 100644 --- a/docs/guide/i18n.md +++ b/docs/guide/i18n.md @@ -121,7 +121,7 @@ extension. After installing and enabling it you will be able to use extended syn that allows you to specify formatting style. Full reference is [available at ICU website](http://icu-project.org/apiref/icu4c/classMessageFormat.html) but since it's -a bit crypric we have our own reference below. +a bit cryptic we have our own reference below. ### Numbers diff --git a/docs/guide/query-builder.md b/docs/guide/query-builder.md index ffc9871df6..7625c0b565 100644 --- a/docs/guide/query-builder.md +++ b/docs/guide/query-builder.md @@ -45,7 +45,7 @@ $query->select(['tbl_user.name AS author', 'tbl_post.title as title']) // <-- sp ->leftJoin('tbl_post', 'tbl_post.user_id = tbl_user.id'); // <-- join with another table ``` -In the code above we've used `leftJoin` method to select from two related tables at the same time. Firsrt parameter +In the code above we've used `leftJoin` method to select from two related tables at the same time. First parameter specifies table name and the second is the join condition. Query builder has the following methods to join tables: - `innerJoin` diff --git a/docs/guide/validation.md b/docs/guide/validation.md index c8c8674d28..59242f589e 100644 --- a/docs/guide/validation.md +++ b/docs/guide/validation.md @@ -8,7 +8,7 @@ Standard Yii validators ----------------------- Standard Yii validators could be specified using aliases instead of referring to class names. Here's the list of all -validators budled with Yii with their most useful properties: +validators bundled with Yii with their most useful properties: ### `boolean`: [[BooleanValidator]] diff --git a/docs/guide/view.md b/docs/guide/view.md index ee469e688c..1069e8922b 100644 --- a/docs/guide/view.md +++ b/docs/guide/view.md @@ -38,7 +38,7 @@ Widgets Widgets are a self-contained building blocks for your views. A widget may contain advanced logic, typically takes some configuration and data and returns HTML. There is a good number of widgets bundled with Yii such as [active form](form.md), -breadcrumbs, menu or [wrappers around bootstrap component framework](boostrap-widgets.md). Additionally there are +breadcrumbs, menu or [wrappers around bootstrap component framework](bootstrap-widgets.md). Additionally there are extensions providing additional widgets such as official one for jQueryUI components. In order to use widget you need to do the following: From 5d17dd06d12a2702a6faeb0e8710c4c88b88a4de Mon Sep 17 00:00:00 2001 From: Alexander Mohorev Date: Sat, 2 Nov 2013 17:57:37 +0300 Subject: [PATCH 09/18] Specify the exact type of the exception. --- framework/yii/base/Module.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/yii/base/Module.php b/framework/yii/base/Module.php index 4bc5351576..b3e28f6927 100644 --- a/framework/yii/base/Module.php +++ b/framework/yii/base/Module.php @@ -241,7 +241,7 @@ abstract class Module extends Component * Sets the directory that contains the controller classes. * @param string $path the directory that contains the controller classes. * This can be either a directory name or a path alias. - * @throws Exception if the directory is invalid + * @throws InvalidParamException if the directory is invalid */ public function setControllerPath($path) { @@ -264,7 +264,7 @@ abstract class Module extends Component /** * Sets the directory that contains the view files. * @param string $path the root directory of view files. - * @throws Exception if the directory is invalid + * @throws InvalidParamException if the directory is invalid */ public function setViewPath($path) { @@ -287,7 +287,7 @@ abstract class Module extends Component /** * Sets the directory that contains the layout files. * @param string $path the root directory of layout files. - * @throws Exception if the directory is invalid + * @throws InvalidParamException if the directory is invalid */ public function setLayoutPath($path) { From 1d092d17555fe76d2656dd5557bfc7bd828d0f35 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Sat, 2 Nov 2013 13:06:04 -0400 Subject: [PATCH 10/18] Changed the exit status to normal. --- apps/advanced/init | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/advanced/init b/apps/advanced/init index c8f7f73f62..4015748636 100755 --- a/apps/advanced/init +++ b/apps/advanced/init @@ -18,7 +18,7 @@ if (empty($params['env'])) { if (!ctype_digit($answer) || !in_array($answer, range(0, count($envs) - 1))) { echo "\n Quit initialization.\n"; - exit(1); + exit(0); } if (isset($envNames[$answer])) { @@ -42,7 +42,7 @@ if (empty($params['env'])) { $answer = trim(fgets(STDIN)); if (strncasecmp($answer, 'y', 1)) { echo "\n Quit initialization.\n"; - exit(1); + exit(0); } } From 13c3123ca8fbfe832c46ae3bf449f2b0eedc1cad Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Sat, 2 Nov 2013 14:16:38 -0400 Subject: [PATCH 11/18] moved mutex back from extensions. --- extensions/mutex/LICENSE.md | 32 -------------- extensions/mutex/README.md | 42 ------------------- extensions/mutex/composer.json | 27 ------------ .../mutex => framework}/yii/mutex/DbMutex.php | 0 .../yii/mutex/FileMutex.php | 0 .../mutex => framework}/yii/mutex/Mutex.php | 0 .../yii/mutex/MysqlMutex.php | 0 7 files changed, 101 deletions(-) delete mode 100644 extensions/mutex/LICENSE.md delete mode 100644 extensions/mutex/README.md delete mode 100644 extensions/mutex/composer.json rename {extensions/mutex => framework}/yii/mutex/DbMutex.php (100%) rename {extensions/mutex => framework}/yii/mutex/FileMutex.php (100%) rename {extensions/mutex => framework}/yii/mutex/Mutex.php (100%) rename {extensions/mutex => framework}/yii/mutex/MysqlMutex.php (100%) diff --git a/extensions/mutex/LICENSE.md b/extensions/mutex/LICENSE.md deleted file mode 100644 index 0bb1a8dca8..0000000000 --- a/extensions/mutex/LICENSE.md +++ /dev/null @@ -1,32 +0,0 @@ -The Yii framework is free software. It is released under the terms of -the following BSD License. - -Copyright © 2008-2013 by Yii Software LLC (http://www.yiisoft.com) -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - * Neither the name of Yii Software LLC nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. diff --git a/extensions/mutex/README.md b/extensions/mutex/README.md deleted file mode 100644 index 161ee8aee9..0000000000 --- a/extensions/mutex/README.md +++ /dev/null @@ -1,42 +0,0 @@ -Yii 2.0 Public Preview - Mutex Extension -======================================== - -Thank you for choosing Yii - a high-performance component-based PHP framework. - -If you are looking for a production-ready PHP framework, please use -[Yii v1.1](https://github.com/yiisoft/yii). - -Yii 2.0 is still under heavy development. We may make significant changes -without prior notices. **Yii 2.0 is not ready for production use yet.** - -[![Build Status](https://secure.travis-ci.org/yiisoft/yii2.png)](http://travis-ci.org/yiisoft/yii2) - -This is the yii2-mutex extension. - - -Installation ------------- - -The prefered way to install this extension is through [composer](http://getcomposer.org/download/). - -Either run -``` -php composer.phar require yiisoft/yii2-mutex "*" -``` - -or add -``` -"yiisoft/yii2-mutex": "*" -``` -to the require section of your composer.json. - - -*Note: You might have to run `php composer.phar selfupdate`* - - -Usage & Documentation ---------------------- - -This component can be used to perform actions similar to the concept of [mutual exclusion](http://en.wikipedia.org/wiki/Mutual_exclusion). - -For concrete examples and advanced usage refer to the yii guide. diff --git a/extensions/mutex/composer.json b/extensions/mutex/composer.json deleted file mode 100644 index e0079eff55..0000000000 --- a/extensions/mutex/composer.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "yiisoft/yii2-mutex", - "description": "Mutual exclusion extension for the Yii framework", - "keywords": ["yii", "mutex"], - "type": "yii2-extension", - "license": "BSD-3-Clause", - "support": { - "issues": "https://github.com/yiisoft/yii2/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/yii2" - }, - "authors": [ - { - "name": "resurtm", - "email": "resurtm@gmail.com" - } - ], - "minimum-stability": "dev", - "require": { - "yiisoft/yii2": "*" - }, - "autoload": { - "psr-0": { "yii\\mutex\\": "" } - } -} diff --git a/extensions/mutex/yii/mutex/DbMutex.php b/framework/yii/mutex/DbMutex.php similarity index 100% rename from extensions/mutex/yii/mutex/DbMutex.php rename to framework/yii/mutex/DbMutex.php diff --git a/extensions/mutex/yii/mutex/FileMutex.php b/framework/yii/mutex/FileMutex.php similarity index 100% rename from extensions/mutex/yii/mutex/FileMutex.php rename to framework/yii/mutex/FileMutex.php diff --git a/extensions/mutex/yii/mutex/Mutex.php b/framework/yii/mutex/Mutex.php similarity index 100% rename from extensions/mutex/yii/mutex/Mutex.php rename to framework/yii/mutex/Mutex.php diff --git a/extensions/mutex/yii/mutex/MysqlMutex.php b/framework/yii/mutex/MysqlMutex.php similarity index 100% rename from extensions/mutex/yii/mutex/MysqlMutex.php rename to framework/yii/mutex/MysqlMutex.php From baf6de3c0caa2ee8525e43e3c26d0d8b0be798c4 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Sat, 2 Nov 2013 14:52:24 -0400 Subject: [PATCH 12/18] Adjusted jui directories. --- extensions/jui/{yii/jui => }/Accordion.php | 0 extensions/jui/{yii/jui => }/AccordionAsset.php | 0 extensions/jui/{yii/jui => }/AutoComplete.php | 0 extensions/jui/{yii/jui => }/AutoCompleteAsset.php | 0 extensions/jui/{yii/jui => }/ButtonAsset.php | 0 extensions/jui/{yii/jui => }/CoreAsset.php | 0 extensions/jui/{yii/jui => }/DatePicker.php | 0 extensions/jui/{yii/jui => }/DatePickerAsset.php | 0 .../jui/{yii/jui => }/DatePickerRegionalAsset.php | 0 extensions/jui/{yii/jui => }/Dialog.php | 0 extensions/jui/{yii/jui => }/DialogAsset.php | 0 extensions/jui/{yii/jui => }/Draggable.php | 0 extensions/jui/{yii/jui => }/DraggableAsset.php | 0 extensions/jui/{yii/jui => }/Droppable.php | 0 extensions/jui/{yii/jui => }/DroppableAsset.php | 0 extensions/jui/{yii/jui => }/EffectAsset.php | 0 extensions/jui/{yii/jui => }/Extension.php | 0 extensions/jui/{yii/jui => }/InputWidget.php | 0 extensions/jui/{yii/jui => }/Menu.php | 0 extensions/jui/{yii/jui => }/MenuAsset.php | 0 extensions/jui/{yii/jui => }/ProgressBar.php | 0 extensions/jui/{yii/jui => }/ProgressBarAsset.php | 0 extensions/jui/{yii/jui => }/Resizable.php | 0 extensions/jui/{yii/jui => }/ResizableAsset.php | 0 extensions/jui/{yii/jui => }/Selectable.php | 0 extensions/jui/{yii/jui => }/SelectableAsset.php | 0 extensions/jui/{yii/jui => }/Slider.php | 0 extensions/jui/{yii/jui => }/SliderAsset.php | 0 extensions/jui/{yii/jui => }/Sortable.php | 0 extensions/jui/{yii/jui => }/SortableAsset.php | 0 extensions/jui/{yii/jui => }/Spinner.php | 0 extensions/jui/{yii/jui => }/SpinnerAsset.php | 0 extensions/jui/{yii/jui => }/Tabs.php | 0 extensions/jui/{yii/jui => }/TabsAsset.php | 0 extensions/jui/{yii/jui => }/ThemeAsset.php | 0 extensions/jui/{yii/jui => }/TooltipAsset.php | 0 extensions/jui/{yii/jui => }/Widget.php | 0 extensions/jui/{yii/jui => }/assets.php | 0 extensions/jui/{yii/jui => }/assets/UPGRADE.md | 0 .../jui/{yii/jui => }/assets/jquery.ui.accordion.js | 0 .../{yii/jui => }/assets/jquery.ui.autocomplete.js | 0 .../jui/{yii/jui => }/assets/jquery.ui.button.js | 0 .../jui/{yii/jui => }/assets/jquery.ui.core.js | 0 .../jui => }/assets/jquery.ui.datepicker-i18n.js | 0 .../{yii/jui => }/assets/jquery.ui.datepicker.js | 0 .../jui/{yii/jui => }/assets/jquery.ui.dialog.js | 0 .../jui/{yii/jui => }/assets/jquery.ui.draggable.js | 0 .../jui/{yii/jui => }/assets/jquery.ui.droppable.js | 0 .../{yii/jui => }/assets/jquery.ui.effect-all.js | 0 .../jui/{yii/jui => }/assets/jquery.ui.menu.js | 0 .../jui/{yii/jui => }/assets/jquery.ui.mouse.js | 0 .../jui/{yii/jui => }/assets/jquery.ui.position.js | 0 .../{yii/jui => }/assets/jquery.ui.progressbar.js | 0 .../jui/{yii/jui => }/assets/jquery.ui.resizable.js | 0 .../{yii/jui => }/assets/jquery.ui.selectable.js | 0 .../jui/{yii/jui => }/assets/jquery.ui.slider.js | 0 .../jui/{yii/jui => }/assets/jquery.ui.sortable.js | 0 .../jui/{yii/jui => }/assets/jquery.ui.spinner.js | 0 .../jui/{yii/jui => }/assets/jquery.ui.tabs.js | 0 .../jui/{yii/jui => }/assets/jquery.ui.tooltip.js | 0 .../jui/{yii/jui => }/assets/jquery.ui.widget.js | 0 .../assets/theme/images/animated-overlay.gif | Bin .../theme/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin .../theme/images/ui-bg_flat_75_ffffff_40x100.png | Bin .../theme/images/ui-bg_glass_55_fbf9ee_1x400.png | Bin .../theme/images/ui-bg_glass_65_ffffff_1x400.png | Bin .../theme/images/ui-bg_glass_75_dadada_1x400.png | Bin .../theme/images/ui-bg_glass_75_e6e6e6_1x400.png | Bin .../theme/images/ui-bg_glass_95_fef1ec_1x400.png | Bin .../images/ui-bg_highlight-soft_75_cccccc_1x100.png | Bin .../assets/theme/images/ui-icons_222222_256x240.png | Bin .../assets/theme/images/ui-icons_2e83ff_256x240.png | Bin .../assets/theme/images/ui-icons_454545_256x240.png | Bin .../assets/theme/images/ui-icons_888888_256x240.png | Bin .../assets/theme/images/ui-icons_cd0a0a_256x240.png | Bin .../jui/{yii/jui => }/assets/theme/jquery.ui.css | 0 extensions/jui/composer.json | 1 + 77 files changed, 1 insertion(+) rename extensions/jui/{yii/jui => }/Accordion.php (100%) rename extensions/jui/{yii/jui => }/AccordionAsset.php (100%) rename extensions/jui/{yii/jui => }/AutoComplete.php (100%) rename extensions/jui/{yii/jui => }/AutoCompleteAsset.php (100%) rename extensions/jui/{yii/jui => }/ButtonAsset.php (100%) rename extensions/jui/{yii/jui => }/CoreAsset.php (100%) rename extensions/jui/{yii/jui => }/DatePicker.php (100%) rename extensions/jui/{yii/jui => }/DatePickerAsset.php (100%) rename extensions/jui/{yii/jui => }/DatePickerRegionalAsset.php (100%) rename extensions/jui/{yii/jui => }/Dialog.php (100%) rename extensions/jui/{yii/jui => }/DialogAsset.php (100%) rename extensions/jui/{yii/jui => }/Draggable.php (100%) rename extensions/jui/{yii/jui => }/DraggableAsset.php (100%) rename extensions/jui/{yii/jui => }/Droppable.php (100%) rename extensions/jui/{yii/jui => }/DroppableAsset.php (100%) rename extensions/jui/{yii/jui => }/EffectAsset.php (100%) rename extensions/jui/{yii/jui => }/Extension.php (100%) rename extensions/jui/{yii/jui => }/InputWidget.php (100%) rename extensions/jui/{yii/jui => }/Menu.php (100%) rename extensions/jui/{yii/jui => }/MenuAsset.php (100%) rename extensions/jui/{yii/jui => }/ProgressBar.php (100%) rename extensions/jui/{yii/jui => }/ProgressBarAsset.php (100%) rename extensions/jui/{yii/jui => }/Resizable.php (100%) rename extensions/jui/{yii/jui => }/ResizableAsset.php (100%) rename extensions/jui/{yii/jui => }/Selectable.php (100%) rename extensions/jui/{yii/jui => }/SelectableAsset.php (100%) rename extensions/jui/{yii/jui => }/Slider.php (100%) rename extensions/jui/{yii/jui => }/SliderAsset.php (100%) rename extensions/jui/{yii/jui => }/Sortable.php (100%) rename extensions/jui/{yii/jui => }/SortableAsset.php (100%) rename extensions/jui/{yii/jui => }/Spinner.php (100%) rename extensions/jui/{yii/jui => }/SpinnerAsset.php (100%) rename extensions/jui/{yii/jui => }/Tabs.php (100%) rename extensions/jui/{yii/jui => }/TabsAsset.php (100%) rename extensions/jui/{yii/jui => }/ThemeAsset.php (100%) rename extensions/jui/{yii/jui => }/TooltipAsset.php (100%) rename extensions/jui/{yii/jui => }/Widget.php (100%) rename extensions/jui/{yii/jui => }/assets.php (100%) rename extensions/jui/{yii/jui => }/assets/UPGRADE.md (100%) rename extensions/jui/{yii/jui => }/assets/jquery.ui.accordion.js (100%) rename extensions/jui/{yii/jui => }/assets/jquery.ui.autocomplete.js (100%) rename extensions/jui/{yii/jui => }/assets/jquery.ui.button.js (100%) rename extensions/jui/{yii/jui => }/assets/jquery.ui.core.js (100%) rename extensions/jui/{yii/jui => }/assets/jquery.ui.datepicker-i18n.js (100%) rename extensions/jui/{yii/jui => }/assets/jquery.ui.datepicker.js (100%) rename extensions/jui/{yii/jui => }/assets/jquery.ui.dialog.js (100%) rename extensions/jui/{yii/jui => }/assets/jquery.ui.draggable.js (100%) rename extensions/jui/{yii/jui => }/assets/jquery.ui.droppable.js (100%) rename extensions/jui/{yii/jui => }/assets/jquery.ui.effect-all.js (100%) rename extensions/jui/{yii/jui => }/assets/jquery.ui.menu.js (100%) rename extensions/jui/{yii/jui => }/assets/jquery.ui.mouse.js (100%) rename extensions/jui/{yii/jui => }/assets/jquery.ui.position.js (100%) rename extensions/jui/{yii/jui => }/assets/jquery.ui.progressbar.js (100%) rename extensions/jui/{yii/jui => }/assets/jquery.ui.resizable.js (100%) rename extensions/jui/{yii/jui => }/assets/jquery.ui.selectable.js (100%) rename extensions/jui/{yii/jui => }/assets/jquery.ui.slider.js (100%) rename extensions/jui/{yii/jui => }/assets/jquery.ui.sortable.js (100%) rename extensions/jui/{yii/jui => }/assets/jquery.ui.spinner.js (100%) rename extensions/jui/{yii/jui => }/assets/jquery.ui.tabs.js (100%) rename extensions/jui/{yii/jui => }/assets/jquery.ui.tooltip.js (100%) rename extensions/jui/{yii/jui => }/assets/jquery.ui.widget.js (100%) rename extensions/jui/{yii/jui => }/assets/theme/images/animated-overlay.gif (100%) rename extensions/jui/{yii/jui => }/assets/theme/images/ui-bg_flat_0_aaaaaa_40x100.png (100%) rename extensions/jui/{yii/jui => }/assets/theme/images/ui-bg_flat_75_ffffff_40x100.png (100%) rename extensions/jui/{yii/jui => }/assets/theme/images/ui-bg_glass_55_fbf9ee_1x400.png (100%) rename extensions/jui/{yii/jui => }/assets/theme/images/ui-bg_glass_65_ffffff_1x400.png (100%) rename extensions/jui/{yii/jui => }/assets/theme/images/ui-bg_glass_75_dadada_1x400.png (100%) rename extensions/jui/{yii/jui => }/assets/theme/images/ui-bg_glass_75_e6e6e6_1x400.png (100%) rename extensions/jui/{yii/jui => }/assets/theme/images/ui-bg_glass_95_fef1ec_1x400.png (100%) rename extensions/jui/{yii/jui => }/assets/theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png (100%) rename extensions/jui/{yii/jui => }/assets/theme/images/ui-icons_222222_256x240.png (100%) rename extensions/jui/{yii/jui => }/assets/theme/images/ui-icons_2e83ff_256x240.png (100%) rename extensions/jui/{yii/jui => }/assets/theme/images/ui-icons_454545_256x240.png (100%) rename extensions/jui/{yii/jui => }/assets/theme/images/ui-icons_888888_256x240.png (100%) rename extensions/jui/{yii/jui => }/assets/theme/images/ui-icons_cd0a0a_256x240.png (100%) rename extensions/jui/{yii/jui => }/assets/theme/jquery.ui.css (100%) diff --git a/extensions/jui/yii/jui/Accordion.php b/extensions/jui/Accordion.php similarity index 100% rename from extensions/jui/yii/jui/Accordion.php rename to extensions/jui/Accordion.php diff --git a/extensions/jui/yii/jui/AccordionAsset.php b/extensions/jui/AccordionAsset.php similarity index 100% rename from extensions/jui/yii/jui/AccordionAsset.php rename to extensions/jui/AccordionAsset.php diff --git a/extensions/jui/yii/jui/AutoComplete.php b/extensions/jui/AutoComplete.php similarity index 100% rename from extensions/jui/yii/jui/AutoComplete.php rename to extensions/jui/AutoComplete.php diff --git a/extensions/jui/yii/jui/AutoCompleteAsset.php b/extensions/jui/AutoCompleteAsset.php similarity index 100% rename from extensions/jui/yii/jui/AutoCompleteAsset.php rename to extensions/jui/AutoCompleteAsset.php diff --git a/extensions/jui/yii/jui/ButtonAsset.php b/extensions/jui/ButtonAsset.php similarity index 100% rename from extensions/jui/yii/jui/ButtonAsset.php rename to extensions/jui/ButtonAsset.php diff --git a/extensions/jui/yii/jui/CoreAsset.php b/extensions/jui/CoreAsset.php similarity index 100% rename from extensions/jui/yii/jui/CoreAsset.php rename to extensions/jui/CoreAsset.php diff --git a/extensions/jui/yii/jui/DatePicker.php b/extensions/jui/DatePicker.php similarity index 100% rename from extensions/jui/yii/jui/DatePicker.php rename to extensions/jui/DatePicker.php diff --git a/extensions/jui/yii/jui/DatePickerAsset.php b/extensions/jui/DatePickerAsset.php similarity index 100% rename from extensions/jui/yii/jui/DatePickerAsset.php rename to extensions/jui/DatePickerAsset.php diff --git a/extensions/jui/yii/jui/DatePickerRegionalAsset.php b/extensions/jui/DatePickerRegionalAsset.php similarity index 100% rename from extensions/jui/yii/jui/DatePickerRegionalAsset.php rename to extensions/jui/DatePickerRegionalAsset.php diff --git a/extensions/jui/yii/jui/Dialog.php b/extensions/jui/Dialog.php similarity index 100% rename from extensions/jui/yii/jui/Dialog.php rename to extensions/jui/Dialog.php diff --git a/extensions/jui/yii/jui/DialogAsset.php b/extensions/jui/DialogAsset.php similarity index 100% rename from extensions/jui/yii/jui/DialogAsset.php rename to extensions/jui/DialogAsset.php diff --git a/extensions/jui/yii/jui/Draggable.php b/extensions/jui/Draggable.php similarity index 100% rename from extensions/jui/yii/jui/Draggable.php rename to extensions/jui/Draggable.php diff --git a/extensions/jui/yii/jui/DraggableAsset.php b/extensions/jui/DraggableAsset.php similarity index 100% rename from extensions/jui/yii/jui/DraggableAsset.php rename to extensions/jui/DraggableAsset.php diff --git a/extensions/jui/yii/jui/Droppable.php b/extensions/jui/Droppable.php similarity index 100% rename from extensions/jui/yii/jui/Droppable.php rename to extensions/jui/Droppable.php diff --git a/extensions/jui/yii/jui/DroppableAsset.php b/extensions/jui/DroppableAsset.php similarity index 100% rename from extensions/jui/yii/jui/DroppableAsset.php rename to extensions/jui/DroppableAsset.php diff --git a/extensions/jui/yii/jui/EffectAsset.php b/extensions/jui/EffectAsset.php similarity index 100% rename from extensions/jui/yii/jui/EffectAsset.php rename to extensions/jui/EffectAsset.php diff --git a/extensions/jui/yii/jui/Extension.php b/extensions/jui/Extension.php similarity index 100% rename from extensions/jui/yii/jui/Extension.php rename to extensions/jui/Extension.php diff --git a/extensions/jui/yii/jui/InputWidget.php b/extensions/jui/InputWidget.php similarity index 100% rename from extensions/jui/yii/jui/InputWidget.php rename to extensions/jui/InputWidget.php diff --git a/extensions/jui/yii/jui/Menu.php b/extensions/jui/Menu.php similarity index 100% rename from extensions/jui/yii/jui/Menu.php rename to extensions/jui/Menu.php diff --git a/extensions/jui/yii/jui/MenuAsset.php b/extensions/jui/MenuAsset.php similarity index 100% rename from extensions/jui/yii/jui/MenuAsset.php rename to extensions/jui/MenuAsset.php diff --git a/extensions/jui/yii/jui/ProgressBar.php b/extensions/jui/ProgressBar.php similarity index 100% rename from extensions/jui/yii/jui/ProgressBar.php rename to extensions/jui/ProgressBar.php diff --git a/extensions/jui/yii/jui/ProgressBarAsset.php b/extensions/jui/ProgressBarAsset.php similarity index 100% rename from extensions/jui/yii/jui/ProgressBarAsset.php rename to extensions/jui/ProgressBarAsset.php diff --git a/extensions/jui/yii/jui/Resizable.php b/extensions/jui/Resizable.php similarity index 100% rename from extensions/jui/yii/jui/Resizable.php rename to extensions/jui/Resizable.php diff --git a/extensions/jui/yii/jui/ResizableAsset.php b/extensions/jui/ResizableAsset.php similarity index 100% rename from extensions/jui/yii/jui/ResizableAsset.php rename to extensions/jui/ResizableAsset.php diff --git a/extensions/jui/yii/jui/Selectable.php b/extensions/jui/Selectable.php similarity index 100% rename from extensions/jui/yii/jui/Selectable.php rename to extensions/jui/Selectable.php diff --git a/extensions/jui/yii/jui/SelectableAsset.php b/extensions/jui/SelectableAsset.php similarity index 100% rename from extensions/jui/yii/jui/SelectableAsset.php rename to extensions/jui/SelectableAsset.php diff --git a/extensions/jui/yii/jui/Slider.php b/extensions/jui/Slider.php similarity index 100% rename from extensions/jui/yii/jui/Slider.php rename to extensions/jui/Slider.php diff --git a/extensions/jui/yii/jui/SliderAsset.php b/extensions/jui/SliderAsset.php similarity index 100% rename from extensions/jui/yii/jui/SliderAsset.php rename to extensions/jui/SliderAsset.php diff --git a/extensions/jui/yii/jui/Sortable.php b/extensions/jui/Sortable.php similarity index 100% rename from extensions/jui/yii/jui/Sortable.php rename to extensions/jui/Sortable.php diff --git a/extensions/jui/yii/jui/SortableAsset.php b/extensions/jui/SortableAsset.php similarity index 100% rename from extensions/jui/yii/jui/SortableAsset.php rename to extensions/jui/SortableAsset.php diff --git a/extensions/jui/yii/jui/Spinner.php b/extensions/jui/Spinner.php similarity index 100% rename from extensions/jui/yii/jui/Spinner.php rename to extensions/jui/Spinner.php diff --git a/extensions/jui/yii/jui/SpinnerAsset.php b/extensions/jui/SpinnerAsset.php similarity index 100% rename from extensions/jui/yii/jui/SpinnerAsset.php rename to extensions/jui/SpinnerAsset.php diff --git a/extensions/jui/yii/jui/Tabs.php b/extensions/jui/Tabs.php similarity index 100% rename from extensions/jui/yii/jui/Tabs.php rename to extensions/jui/Tabs.php diff --git a/extensions/jui/yii/jui/TabsAsset.php b/extensions/jui/TabsAsset.php similarity index 100% rename from extensions/jui/yii/jui/TabsAsset.php rename to extensions/jui/TabsAsset.php diff --git a/extensions/jui/yii/jui/ThemeAsset.php b/extensions/jui/ThemeAsset.php similarity index 100% rename from extensions/jui/yii/jui/ThemeAsset.php rename to extensions/jui/ThemeAsset.php diff --git a/extensions/jui/yii/jui/TooltipAsset.php b/extensions/jui/TooltipAsset.php similarity index 100% rename from extensions/jui/yii/jui/TooltipAsset.php rename to extensions/jui/TooltipAsset.php diff --git a/extensions/jui/yii/jui/Widget.php b/extensions/jui/Widget.php similarity index 100% rename from extensions/jui/yii/jui/Widget.php rename to extensions/jui/Widget.php diff --git a/extensions/jui/yii/jui/assets.php b/extensions/jui/assets.php similarity index 100% rename from extensions/jui/yii/jui/assets.php rename to extensions/jui/assets.php diff --git a/extensions/jui/yii/jui/assets/UPGRADE.md b/extensions/jui/assets/UPGRADE.md similarity index 100% rename from extensions/jui/yii/jui/assets/UPGRADE.md rename to extensions/jui/assets/UPGRADE.md diff --git a/extensions/jui/yii/jui/assets/jquery.ui.accordion.js b/extensions/jui/assets/jquery.ui.accordion.js similarity index 100% rename from extensions/jui/yii/jui/assets/jquery.ui.accordion.js rename to extensions/jui/assets/jquery.ui.accordion.js diff --git a/extensions/jui/yii/jui/assets/jquery.ui.autocomplete.js b/extensions/jui/assets/jquery.ui.autocomplete.js similarity index 100% rename from extensions/jui/yii/jui/assets/jquery.ui.autocomplete.js rename to extensions/jui/assets/jquery.ui.autocomplete.js diff --git a/extensions/jui/yii/jui/assets/jquery.ui.button.js b/extensions/jui/assets/jquery.ui.button.js similarity index 100% rename from extensions/jui/yii/jui/assets/jquery.ui.button.js rename to extensions/jui/assets/jquery.ui.button.js diff --git a/extensions/jui/yii/jui/assets/jquery.ui.core.js b/extensions/jui/assets/jquery.ui.core.js similarity index 100% rename from extensions/jui/yii/jui/assets/jquery.ui.core.js rename to extensions/jui/assets/jquery.ui.core.js diff --git a/extensions/jui/yii/jui/assets/jquery.ui.datepicker-i18n.js b/extensions/jui/assets/jquery.ui.datepicker-i18n.js similarity index 100% rename from extensions/jui/yii/jui/assets/jquery.ui.datepicker-i18n.js rename to extensions/jui/assets/jquery.ui.datepicker-i18n.js diff --git a/extensions/jui/yii/jui/assets/jquery.ui.datepicker.js b/extensions/jui/assets/jquery.ui.datepicker.js similarity index 100% rename from extensions/jui/yii/jui/assets/jquery.ui.datepicker.js rename to extensions/jui/assets/jquery.ui.datepicker.js diff --git a/extensions/jui/yii/jui/assets/jquery.ui.dialog.js b/extensions/jui/assets/jquery.ui.dialog.js similarity index 100% rename from extensions/jui/yii/jui/assets/jquery.ui.dialog.js rename to extensions/jui/assets/jquery.ui.dialog.js diff --git a/extensions/jui/yii/jui/assets/jquery.ui.draggable.js b/extensions/jui/assets/jquery.ui.draggable.js similarity index 100% rename from extensions/jui/yii/jui/assets/jquery.ui.draggable.js rename to extensions/jui/assets/jquery.ui.draggable.js diff --git a/extensions/jui/yii/jui/assets/jquery.ui.droppable.js b/extensions/jui/assets/jquery.ui.droppable.js similarity index 100% rename from extensions/jui/yii/jui/assets/jquery.ui.droppable.js rename to extensions/jui/assets/jquery.ui.droppable.js diff --git a/extensions/jui/yii/jui/assets/jquery.ui.effect-all.js b/extensions/jui/assets/jquery.ui.effect-all.js similarity index 100% rename from extensions/jui/yii/jui/assets/jquery.ui.effect-all.js rename to extensions/jui/assets/jquery.ui.effect-all.js diff --git a/extensions/jui/yii/jui/assets/jquery.ui.menu.js b/extensions/jui/assets/jquery.ui.menu.js similarity index 100% rename from extensions/jui/yii/jui/assets/jquery.ui.menu.js rename to extensions/jui/assets/jquery.ui.menu.js diff --git a/extensions/jui/yii/jui/assets/jquery.ui.mouse.js b/extensions/jui/assets/jquery.ui.mouse.js similarity index 100% rename from extensions/jui/yii/jui/assets/jquery.ui.mouse.js rename to extensions/jui/assets/jquery.ui.mouse.js diff --git a/extensions/jui/yii/jui/assets/jquery.ui.position.js b/extensions/jui/assets/jquery.ui.position.js similarity index 100% rename from extensions/jui/yii/jui/assets/jquery.ui.position.js rename to extensions/jui/assets/jquery.ui.position.js diff --git a/extensions/jui/yii/jui/assets/jquery.ui.progressbar.js b/extensions/jui/assets/jquery.ui.progressbar.js similarity index 100% rename from extensions/jui/yii/jui/assets/jquery.ui.progressbar.js rename to extensions/jui/assets/jquery.ui.progressbar.js diff --git a/extensions/jui/yii/jui/assets/jquery.ui.resizable.js b/extensions/jui/assets/jquery.ui.resizable.js similarity index 100% rename from extensions/jui/yii/jui/assets/jquery.ui.resizable.js rename to extensions/jui/assets/jquery.ui.resizable.js diff --git a/extensions/jui/yii/jui/assets/jquery.ui.selectable.js b/extensions/jui/assets/jquery.ui.selectable.js similarity index 100% rename from extensions/jui/yii/jui/assets/jquery.ui.selectable.js rename to extensions/jui/assets/jquery.ui.selectable.js diff --git a/extensions/jui/yii/jui/assets/jquery.ui.slider.js b/extensions/jui/assets/jquery.ui.slider.js similarity index 100% rename from extensions/jui/yii/jui/assets/jquery.ui.slider.js rename to extensions/jui/assets/jquery.ui.slider.js diff --git a/extensions/jui/yii/jui/assets/jquery.ui.sortable.js b/extensions/jui/assets/jquery.ui.sortable.js similarity index 100% rename from extensions/jui/yii/jui/assets/jquery.ui.sortable.js rename to extensions/jui/assets/jquery.ui.sortable.js diff --git a/extensions/jui/yii/jui/assets/jquery.ui.spinner.js b/extensions/jui/assets/jquery.ui.spinner.js similarity index 100% rename from extensions/jui/yii/jui/assets/jquery.ui.spinner.js rename to extensions/jui/assets/jquery.ui.spinner.js diff --git a/extensions/jui/yii/jui/assets/jquery.ui.tabs.js b/extensions/jui/assets/jquery.ui.tabs.js similarity index 100% rename from extensions/jui/yii/jui/assets/jquery.ui.tabs.js rename to extensions/jui/assets/jquery.ui.tabs.js diff --git a/extensions/jui/yii/jui/assets/jquery.ui.tooltip.js b/extensions/jui/assets/jquery.ui.tooltip.js similarity index 100% rename from extensions/jui/yii/jui/assets/jquery.ui.tooltip.js rename to extensions/jui/assets/jquery.ui.tooltip.js diff --git a/extensions/jui/yii/jui/assets/jquery.ui.widget.js b/extensions/jui/assets/jquery.ui.widget.js similarity index 100% rename from extensions/jui/yii/jui/assets/jquery.ui.widget.js rename to extensions/jui/assets/jquery.ui.widget.js diff --git a/extensions/jui/yii/jui/assets/theme/images/animated-overlay.gif b/extensions/jui/assets/theme/images/animated-overlay.gif similarity index 100% rename from extensions/jui/yii/jui/assets/theme/images/animated-overlay.gif rename to extensions/jui/assets/theme/images/animated-overlay.gif diff --git a/extensions/jui/yii/jui/assets/theme/images/ui-bg_flat_0_aaaaaa_40x100.png b/extensions/jui/assets/theme/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from extensions/jui/yii/jui/assets/theme/images/ui-bg_flat_0_aaaaaa_40x100.png rename to extensions/jui/assets/theme/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/extensions/jui/yii/jui/assets/theme/images/ui-bg_flat_75_ffffff_40x100.png b/extensions/jui/assets/theme/images/ui-bg_flat_75_ffffff_40x100.png similarity index 100% rename from extensions/jui/yii/jui/assets/theme/images/ui-bg_flat_75_ffffff_40x100.png rename to extensions/jui/assets/theme/images/ui-bg_flat_75_ffffff_40x100.png diff --git a/extensions/jui/yii/jui/assets/theme/images/ui-bg_glass_55_fbf9ee_1x400.png b/extensions/jui/assets/theme/images/ui-bg_glass_55_fbf9ee_1x400.png similarity index 100% rename from extensions/jui/yii/jui/assets/theme/images/ui-bg_glass_55_fbf9ee_1x400.png rename to extensions/jui/assets/theme/images/ui-bg_glass_55_fbf9ee_1x400.png diff --git a/extensions/jui/yii/jui/assets/theme/images/ui-bg_glass_65_ffffff_1x400.png b/extensions/jui/assets/theme/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from extensions/jui/yii/jui/assets/theme/images/ui-bg_glass_65_ffffff_1x400.png rename to extensions/jui/assets/theme/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/extensions/jui/yii/jui/assets/theme/images/ui-bg_glass_75_dadada_1x400.png b/extensions/jui/assets/theme/images/ui-bg_glass_75_dadada_1x400.png similarity index 100% rename from extensions/jui/yii/jui/assets/theme/images/ui-bg_glass_75_dadada_1x400.png rename to extensions/jui/assets/theme/images/ui-bg_glass_75_dadada_1x400.png diff --git a/extensions/jui/yii/jui/assets/theme/images/ui-bg_glass_75_e6e6e6_1x400.png b/extensions/jui/assets/theme/images/ui-bg_glass_75_e6e6e6_1x400.png similarity index 100% rename from extensions/jui/yii/jui/assets/theme/images/ui-bg_glass_75_e6e6e6_1x400.png rename to extensions/jui/assets/theme/images/ui-bg_glass_75_e6e6e6_1x400.png diff --git a/extensions/jui/yii/jui/assets/theme/images/ui-bg_glass_95_fef1ec_1x400.png b/extensions/jui/assets/theme/images/ui-bg_glass_95_fef1ec_1x400.png similarity index 100% rename from extensions/jui/yii/jui/assets/theme/images/ui-bg_glass_95_fef1ec_1x400.png rename to extensions/jui/assets/theme/images/ui-bg_glass_95_fef1ec_1x400.png diff --git a/extensions/jui/yii/jui/assets/theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/extensions/jui/assets/theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png similarity index 100% rename from extensions/jui/yii/jui/assets/theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png rename to extensions/jui/assets/theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png diff --git a/extensions/jui/yii/jui/assets/theme/images/ui-icons_222222_256x240.png b/extensions/jui/assets/theme/images/ui-icons_222222_256x240.png similarity index 100% rename from extensions/jui/yii/jui/assets/theme/images/ui-icons_222222_256x240.png rename to extensions/jui/assets/theme/images/ui-icons_222222_256x240.png diff --git a/extensions/jui/yii/jui/assets/theme/images/ui-icons_2e83ff_256x240.png b/extensions/jui/assets/theme/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from extensions/jui/yii/jui/assets/theme/images/ui-icons_2e83ff_256x240.png rename to extensions/jui/assets/theme/images/ui-icons_2e83ff_256x240.png diff --git a/extensions/jui/yii/jui/assets/theme/images/ui-icons_454545_256x240.png b/extensions/jui/assets/theme/images/ui-icons_454545_256x240.png similarity index 100% rename from extensions/jui/yii/jui/assets/theme/images/ui-icons_454545_256x240.png rename to extensions/jui/assets/theme/images/ui-icons_454545_256x240.png diff --git a/extensions/jui/yii/jui/assets/theme/images/ui-icons_888888_256x240.png b/extensions/jui/assets/theme/images/ui-icons_888888_256x240.png similarity index 100% rename from extensions/jui/yii/jui/assets/theme/images/ui-icons_888888_256x240.png rename to extensions/jui/assets/theme/images/ui-icons_888888_256x240.png diff --git a/extensions/jui/yii/jui/assets/theme/images/ui-icons_cd0a0a_256x240.png b/extensions/jui/assets/theme/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from extensions/jui/yii/jui/assets/theme/images/ui-icons_cd0a0a_256x240.png rename to extensions/jui/assets/theme/images/ui-icons_cd0a0a_256x240.png diff --git a/extensions/jui/yii/jui/assets/theme/jquery.ui.css b/extensions/jui/assets/theme/jquery.ui.css similarity index 100% rename from extensions/jui/yii/jui/assets/theme/jquery.ui.css rename to extensions/jui/assets/theme/jquery.ui.css diff --git a/extensions/jui/composer.json b/extensions/jui/composer.json index e7dab28891..89987db957 100644 --- a/extensions/jui/composer.json +++ b/extensions/jui/composer.json @@ -18,6 +18,7 @@ "autoload": { "psr-0": { "yii\\jui\\": "" } }, + "target-dir": "yii/jui", "extra": { "bootstrap": "yii\\jui\\Extension" } From 3fd1cb0c6d714b9c3245f9d0d49addd9cfa484bd Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Sat, 2 Nov 2013 15:34:07 -0400 Subject: [PATCH 13/18] reorganized extension directories. --- extensions/composer/{yii/composer => }/Installer.php | 0 extensions/composer/{yii/composer => }/Plugin.php | 0 extensions/composer/composer.json | 1 + extensions/smarty/{yii/smarty => }/ViewRenderer.php | 0 extensions/smarty/composer.json | 3 ++- extensions/twig/{yii/twig => }/ViewRenderer.php | 0 extensions/twig/composer.json | 3 ++- 7 files changed, 5 insertions(+), 2 deletions(-) rename extensions/composer/{yii/composer => }/Installer.php (100%) rename extensions/composer/{yii/composer => }/Plugin.php (100%) rename extensions/smarty/{yii/smarty => }/ViewRenderer.php (100%) rename extensions/twig/{yii/twig => }/ViewRenderer.php (100%) diff --git a/extensions/composer/yii/composer/Installer.php b/extensions/composer/Installer.php similarity index 100% rename from extensions/composer/yii/composer/Installer.php rename to extensions/composer/Installer.php diff --git a/extensions/composer/yii/composer/Plugin.php b/extensions/composer/Plugin.php similarity index 100% rename from extensions/composer/yii/composer/Plugin.php rename to extensions/composer/Plugin.php diff --git a/extensions/composer/composer.json b/extensions/composer/composer.json index 74295a0923..ff0785c081 100644 --- a/extensions/composer/composer.json +++ b/extensions/composer/composer.json @@ -21,6 +21,7 @@ "autoload": { "psr-0": { "yii\\composer\\": "" } }, + "target-dir": "yii/composer", "extra": { "class": "yii\\composer\\Plugin" }, diff --git a/extensions/smarty/yii/smarty/ViewRenderer.php b/extensions/smarty/ViewRenderer.php similarity index 100% rename from extensions/smarty/yii/smarty/ViewRenderer.php rename to extensions/smarty/ViewRenderer.php diff --git a/extensions/smarty/composer.json b/extensions/smarty/composer.json index 90a154f8c8..566187a316 100644 --- a/extensions/smarty/composer.json +++ b/extensions/smarty/composer.json @@ -24,5 +24,6 @@ }, "autoload": { "psr-0": { "yii\\smarty\\": "" } - } + }, + "target-dir": "yii/smarty" } diff --git a/extensions/twig/yii/twig/ViewRenderer.php b/extensions/twig/ViewRenderer.php similarity index 100% rename from extensions/twig/yii/twig/ViewRenderer.php rename to extensions/twig/ViewRenderer.php diff --git a/extensions/twig/composer.json b/extensions/twig/composer.json index f67cbbd91c..c57c65df3d 100644 --- a/extensions/twig/composer.json +++ b/extensions/twig/composer.json @@ -24,5 +24,6 @@ }, "autoload": { "psr-0": { "yii\\twig\\": "" } - } + }, + "target-dir": "yii/twig" } From e5d5ab565512836f84c5a45059c45630ef6295b3 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Sat, 2 Nov 2013 15:37:25 -0400 Subject: [PATCH 14/18] updated license information. --- LICENSE.md | 4 ++-- apps/advanced/LICENSE.md | 4 ++-- apps/basic/LICENSE.md | 4 ++-- apps/benchmark/LICENSE.md | 4 ++-- extensions/composer/LICENSE.md | 2 +- extensions/jui/LICENSE.md | 2 +- extensions/smarty/LICENSE.md | 2 +- extensions/twig/LICENSE.md | 2 +- framework/LICENSE.md | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 6edcc4f571..e98f03df86 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,7 +1,7 @@ The Yii framework is free software. It is released under the terms of the following BSD License. -Copyright © 2008-2013 by Yii Software LLC (http://www.yiisoft.com) +Copyright © 2008 by Yii Software LLC (http://www.yiisoft.com) All rights reserved. Redistribution and use in source and binary forms, with or without @@ -29,4 +29,4 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +POSSIBILITY OF SUCH DAMAGE. diff --git a/apps/advanced/LICENSE.md b/apps/advanced/LICENSE.md index 6edcc4f571..e98f03df86 100644 --- a/apps/advanced/LICENSE.md +++ b/apps/advanced/LICENSE.md @@ -1,7 +1,7 @@ The Yii framework is free software. It is released under the terms of the following BSD License. -Copyright © 2008-2013 by Yii Software LLC (http://www.yiisoft.com) +Copyright © 2008 by Yii Software LLC (http://www.yiisoft.com) All rights reserved. Redistribution and use in source and binary forms, with or without @@ -29,4 +29,4 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +POSSIBILITY OF SUCH DAMAGE. diff --git a/apps/basic/LICENSE.md b/apps/basic/LICENSE.md index 6edcc4f571..e98f03df86 100644 --- a/apps/basic/LICENSE.md +++ b/apps/basic/LICENSE.md @@ -1,7 +1,7 @@ The Yii framework is free software. It is released under the terms of the following BSD License. -Copyright © 2008-2013 by Yii Software LLC (http://www.yiisoft.com) +Copyright © 2008 by Yii Software LLC (http://www.yiisoft.com) All rights reserved. Redistribution and use in source and binary forms, with or without @@ -29,4 +29,4 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +POSSIBILITY OF SUCH DAMAGE. diff --git a/apps/benchmark/LICENSE.md b/apps/benchmark/LICENSE.md index 6edcc4f571..e98f03df86 100644 --- a/apps/benchmark/LICENSE.md +++ b/apps/benchmark/LICENSE.md @@ -1,7 +1,7 @@ The Yii framework is free software. It is released under the terms of the following BSD License. -Copyright © 2008-2013 by Yii Software LLC (http://www.yiisoft.com) +Copyright © 2008 by Yii Software LLC (http://www.yiisoft.com) All rights reserved. Redistribution and use in source and binary forms, with or without @@ -29,4 +29,4 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +POSSIBILITY OF SUCH DAMAGE. diff --git a/extensions/composer/LICENSE.md b/extensions/composer/LICENSE.md index 0bb1a8dca8..e98f03df86 100644 --- a/extensions/composer/LICENSE.md +++ b/extensions/composer/LICENSE.md @@ -1,7 +1,7 @@ The Yii framework is free software. It is released under the terms of the following BSD License. -Copyright © 2008-2013 by Yii Software LLC (http://www.yiisoft.com) +Copyright © 2008 by Yii Software LLC (http://www.yiisoft.com) All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/extensions/jui/LICENSE.md b/extensions/jui/LICENSE.md index 0bb1a8dca8..e98f03df86 100644 --- a/extensions/jui/LICENSE.md +++ b/extensions/jui/LICENSE.md @@ -1,7 +1,7 @@ The Yii framework is free software. It is released under the terms of the following BSD License. -Copyright © 2008-2013 by Yii Software LLC (http://www.yiisoft.com) +Copyright © 2008 by Yii Software LLC (http://www.yiisoft.com) All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/extensions/smarty/LICENSE.md b/extensions/smarty/LICENSE.md index 0bb1a8dca8..e98f03df86 100644 --- a/extensions/smarty/LICENSE.md +++ b/extensions/smarty/LICENSE.md @@ -1,7 +1,7 @@ The Yii framework is free software. It is released under the terms of the following BSD License. -Copyright © 2008-2013 by Yii Software LLC (http://www.yiisoft.com) +Copyright © 2008 by Yii Software LLC (http://www.yiisoft.com) All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/extensions/twig/LICENSE.md b/extensions/twig/LICENSE.md index 0bb1a8dca8..e98f03df86 100644 --- a/extensions/twig/LICENSE.md +++ b/extensions/twig/LICENSE.md @@ -1,7 +1,7 @@ The Yii framework is free software. It is released under the terms of the following BSD License. -Copyright © 2008-2013 by Yii Software LLC (http://www.yiisoft.com) +Copyright © 2008 by Yii Software LLC (http://www.yiisoft.com) All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/framework/LICENSE.md b/framework/LICENSE.md index 6edcc4f571..e98f03df86 100644 --- a/framework/LICENSE.md +++ b/framework/LICENSE.md @@ -1,7 +1,7 @@ The Yii framework is free software. It is released under the terms of the following BSD License. -Copyright © 2008-2013 by Yii Software LLC (http://www.yiisoft.com) +Copyright © 2008 by Yii Software LLC (http://www.yiisoft.com) All rights reserved. Redistribution and use in source and binary forms, with or without @@ -29,4 +29,4 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +POSSIBILITY OF SUCH DAMAGE. From 59f098639db59a4558d850ab06d8e5fe153b2120 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Sat, 2 Nov 2013 15:58:28 -0400 Subject: [PATCH 15/18] moved extension list under yiisoft. updated read me. --- extensions/composer/Installer.php | 4 +- extensions/composer/README.md | 85 +++++++++++++++++++------------ 2 files changed, 55 insertions(+), 34 deletions(-) diff --git a/extensions/composer/Installer.php b/extensions/composer/Installer.php index 0dda0731ff..3a7767123a 100644 --- a/extensions/composer/Installer.php +++ b/extensions/composer/Installer.php @@ -85,13 +85,13 @@ class Installer extends LibraryInstaller protected function loadExtensions() { - $file = $this->vendorDir . '/yii-extensions.php'; + $file = $this->vendorDir . '/yiisoft/extensions.php'; return is_file($file) ? require($file) : []; } protected function saveExtensions(array $extensions) { - $file = $this->vendorDir . '/yii-extensions.php'; + $file = $this->vendorDir . '/yiisoft/extensions.php'; file_put_contents($file, " Date: Sat, 2 Nov 2013 16:00:23 -0400 Subject: [PATCH 16/18] doc fix. --- extensions/composer/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/composer/README.md b/extensions/composer/README.md index 1f06083671..ab13c0865c 100644 --- a/extensions/composer/README.md +++ b/extensions/composer/README.md @@ -23,7 +23,7 @@ like the following: } ``` -You may specify a bootstrap class in the `extra` section. The class will be executed each time +You may specify a bootstrap class in the `extra` section. The `init()` method of the class will be executed each time the Yii 2 application is responding to a request. For example, ```json From 3caf59b1bf4d213fd278513475a7aca4a89ef2f7 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Sat, 2 Nov 2013 16:04:38 -0400 Subject: [PATCH 17/18] fixed extension list file location. --- apps/advanced/backend/config/main.php | 2 +- apps/advanced/console/config/main.php | 2 +- apps/advanced/frontend/config/main.php | 2 +- apps/basic/config/console.php | 2 +- apps/basic/config/web.php | 2 +- extensions/composer/Plugin.php | 3 ++- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/apps/advanced/backend/config/main.php b/apps/advanced/backend/config/main.php index 9c33d1f4be..cb68bbebb1 100644 --- a/apps/advanced/backend/config/main.php +++ b/apps/advanced/backend/config/main.php @@ -15,7 +15,7 @@ return [ 'preload' => ['log'], 'controllerNamespace' => 'backend\controllers', 'modules' => [], - 'extensions' => require(__DIR__ . '/../../vendor/yii-extensions.php'), + 'extensions' => require(__DIR__ . '/../../vendor/yiisoft/extensions.php'), 'components' => [ 'request' => [ 'enableCsrfValidation' => true, diff --git a/apps/advanced/console/config/main.php b/apps/advanced/console/config/main.php index 17e79c7fcf..8c7459aa29 100644 --- a/apps/advanced/console/config/main.php +++ b/apps/advanced/console/config/main.php @@ -15,7 +15,7 @@ return [ 'controllerNamespace' => 'console\controllers', 'modules' => [ ], - 'extensions' => require(__DIR__ . '/../../vendor/yii-extensions.php'), + 'extensions' => require(__DIR__ . '/../../vendor/yiisoft/extensions.php'), 'components' => [ 'db' => $params['components.db'], 'cache' => $params['components.cache'], diff --git a/apps/advanced/frontend/config/main.php b/apps/advanced/frontend/config/main.php index a6a386190a..f42083240d 100644 --- a/apps/advanced/frontend/config/main.php +++ b/apps/advanced/frontend/config/main.php @@ -16,7 +16,7 @@ return [ 'modules' => [ 'gii' => 'yii\gii\Module' ], - 'extensions' => require(__DIR__ . '/../../vendor/yii-extensions.php'), + 'extensions' => require(__DIR__ . '/../../vendor/yiisoft/extensions.php'), 'components' => [ 'request' => [ 'enableCsrfValidation' => true, diff --git a/apps/basic/config/console.php b/apps/basic/config/console.php index 598316fce3..c70993e85c 100644 --- a/apps/basic/config/console.php +++ b/apps/basic/config/console.php @@ -6,7 +6,7 @@ return [ 'preload' => ['log'], 'controllerPath' => dirname(__DIR__) . '/commands', 'controllerNamespace' => 'app\commands', - 'extensions' => require(__DIR__ . '/../vendor/yii-extensions.php'), + 'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'), 'components' => [ 'cache' => [ 'class' => 'yii\caching\FileCache', diff --git a/apps/basic/config/web.php b/apps/basic/config/web.php index e27754f839..5b9907c5e9 100644 --- a/apps/basic/config/web.php +++ b/apps/basic/config/web.php @@ -3,7 +3,7 @@ $params = require(__DIR__ . '/params.php'); $config = [ 'id' => 'bootstrap', 'basePath' => dirname(__DIR__), - 'extensions' => require(__DIR__ . '/../vendor/yii-extensions.php'), + 'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'), 'components' => [ 'request' => [ 'enableCsrfValidation' => true, diff --git a/extensions/composer/Plugin.php b/extensions/composer/Plugin.php index fb480a3494..fced64301f 100644 --- a/extensions/composer/Plugin.php +++ b/extensions/composer/Plugin.php @@ -26,8 +26,9 @@ class Plugin implements PluginInterface { $installer = new Installer($io, $composer); $composer->getInstallationManager()->addInstaller($installer); - $file = rtrim($composer->getConfig()->get('vendor-dir'), '/') . '/yii-extensions.php'; + $file = rtrim($composer->getConfig()->get('vendor-dir'), '/') . '/yiisoft/extensions.php'; if (!is_file($file)) { + @mkdir(dirname($file)); file_put_contents($file, " Date: Sat, 2 Nov 2013 22:06:26 +0100 Subject: [PATCH 18/18] typo --- framework/yii/base/Theme.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/yii/base/Theme.php b/framework/yii/base/Theme.php index b864412d18..1d8771f7ea 100644 --- a/framework/yii/base/Theme.php +++ b/framework/yii/base/Theme.php @@ -16,7 +16,7 @@ use yii\helpers\FileHelper; * When [[View]] renders a view file, it will check the [[Application::theme|active theme]] * to see if there is a themed version of the view file exists. If so, the themed version will be rendered instead. * - * A theme is directory consisting of view files which are meant to replace their non-themed counterparts. + * A theme is a directory consisting of view files which are meant to replace their non-themed counterparts. * * Theme uses [[pathMap]] to achieve the view file replacement: *