Browse Source

Merge branch 'master' of github.com:yiisoft/yii2 into mongo

tags/2.0.0-beta
Paul Klimov 11 years ago
parent
commit
ee0c9ed61e
  1. 4
      .gitignore
  2. 12
      .travis.yml
  3. 10
      apps/advanced/backend/views/layouts/main.php
  4. 2
      apps/advanced/common/config/params.php
  5. 24
      apps/advanced/common/mails/layouts/html.php
  6. 0
      apps/advanced/common/mails/passwordResetToken.php
  7. 18
      apps/advanced/console/migrations/m130524_201442_init.php
  8. 16
      apps/advanced/frontend/controllers/SiteController.php
  9. 10
      apps/advanced/frontend/views/layouts/main.php
  10. 10
      apps/basic/views/layouts/main.php
  11. 2
      build/build
  12. 43
      build/controllers/PhpDocController.php
  13. 2
      docs/guide/controller.md
  14. 16
      docs/guide/form.md
  15. 25
      docs/guide/template.md
  16. 10
      docs/guide/view.md
  17. 2
      extensions/bootstrap/composer.json
  18. 8
      extensions/composer/Installer.php
  19. 2
      extensions/composer/Plugin.php
  20. 2
      extensions/debug/composer.json
  21. 10
      extensions/debug/views/layouts/main.php
  22. 199
      extensions/elasticsearch/ActiveQuery.php
  23. 474
      extensions/elasticsearch/ActiveRecord.php
  24. 61
      extensions/elasticsearch/ActiveRelation.php
  25. 403
      extensions/elasticsearch/Command.php
  26. 346
      extensions/elasticsearch/Connection.php
  27. 43
      extensions/elasticsearch/Exception.php
  28. 32
      extensions/elasticsearch/LICENSE.md
  29. 506
      extensions/elasticsearch/Query.php
  30. 349
      extensions/elasticsearch/QueryBuilder.php
  31. 148
      extensions/elasticsearch/README.md
  32. 28
      extensions/elasticsearch/composer.json
  33. 4
      extensions/gii/Generator.php
  34. 8
      extensions/gii/GiiAsset.php
  35. 6
      extensions/gii/Module.php
  36. 2
      extensions/gii/composer.json
  37. 20
      extensions/gii/generators/controller/Generator.php
  38. 6
      extensions/gii/generators/crud/Generator.php
  39. 2
      extensions/gii/generators/crud/templates/search.php
  40. 18
      extensions/gii/generators/form/Generator.php
  41. 18
      extensions/gii/generators/model/Generator.php
  42. 6
      extensions/gii/generators/model/templates/model.php
  43. 16
      extensions/gii/generators/module/Generator.php
  44. 10
      extensions/gii/views/layouts/main.php
  45. 2
      extensions/jui/composer.json
  46. 2
      extensions/redis/ActiveQuery.php
  47. 16
      extensions/redis/ActiveRecord.php
  48. 45
      extensions/redis/Cache.php
  49. 125
      extensions/redis/README.md
  50. 157
      extensions/redis/Session.php
  51. 4
      extensions/redis/composer.json
  52. 2
      extensions/smarty/composer.json
  53. 2
      extensions/sphinx/ActiveQuery.php
  54. 93
      extensions/sphinx/ActiveRecord.php
  55. 39
      extensions/sphinx/Command.php
  56. 9
      extensions/sphinx/Connection.php
  57. 2
      extensions/sphinx/Query.php
  58. 5
      extensions/sphinx/QueryBuilder.php
  59. 8
      extensions/sphinx/Schema.php
  60. 2
      extensions/sphinx/composer.json
  61. 6
      extensions/swiftmailer/Mailer.php
  62. 45
      extensions/swiftmailer/Message.php
  63. 2
      extensions/swiftmailer/composer.json
  64. 2
      extensions/twig/composer.json
  65. 2
      framework/yii/base/Application.php
  66. 27
      framework/yii/base/Controller.php
  67. 25
      framework/yii/base/ErrorException.php
  68. 4
      framework/yii/base/Model.php
  69. 6
      framework/yii/base/View.php
  70. 2
      framework/yii/caching/Cache.php
  71. 8
      framework/yii/data/ActiveDataProvider.php
  72. 6
      framework/yii/data/ArrayDataProvider.php
  73. 1
      framework/yii/db/ActiveQuery.php
  74. 42
      framework/yii/db/ActiveRecord.php
  75. 8
      framework/yii/db/Command.php
  76. 2
      framework/yii/db/Query.php
  77. 13
      framework/yii/db/QueryBuilder.php
  78. 4
      framework/yii/db/cubrid/QueryBuilder.php
  79. 10
      framework/yii/db/mssql/QueryBuilder.php
  80. 2
      framework/yii/db/mysql/QueryBuilder.php
  81. 2
      framework/yii/db/pgsql/Schema.php
  82. 2
      framework/yii/db/sqlite/QueryBuilder.php
  83. 2
      framework/yii/helpers/BaseHtml.php
  84. 2
      framework/yii/mail/BaseMessage.php
  85. 2
      framework/yii/validators/SafeValidator.php
  86. 5
      framework/yii/validators/UniqueValidator.php
  87. 2
      framework/yii/validators/Validator.php
  88. 2
      framework/yii/web/Controller.php
  89. 31
      framework/yii/web/VerbFilter.php
  90. 6
      framework/yii/widgets/DetailView.php
  91. 2
      tests/unit/VendorTestCase.php
  92. 5
      tests/unit/bootstrap.php
  93. 9
      tests/unit/data/ar/Customer.php
  94. 16
      tests/unit/data/ar/Order.php
  95. 32
      tests/unit/data/ar/elasticsearch/ActiveRecord.php
  96. 43
      tests/unit/data/ar/elasticsearch/Customer.php
  97. 18
      tests/unit/data/ar/elasticsearch/Item.php
  98. 68
      tests/unit/data/ar/elasticsearch/Order.php
  99. 29
      tests/unit/data/ar/elasticsearch/OrderItem.php
  100. 11
      tests/unit/data/ar/redis/Customer.php
  101. Some files were not shown because too many files have changed in this diff Show More

4
.gitignore vendored

@ -13,10 +13,12 @@ nbproject
Thumbs.db Thumbs.db
# composer vendor dir # composer vendor dir
/yii/vendor /vendor
# composer itself is not needed # composer itself is not needed
composer.phar composer.phar
# composer.lock should not be committed as we always want the latest versions
/composer.lock
# Mac DS_Store Files # Mac DS_Store Files
.DS_Store .DS_Store

12
.travis.yml

@ -7,18 +7,22 @@ php:
services: services:
- redis-server - redis-server
- memcached - memcached
- elasticsearch
before_script: before_script:
- composer self-update && composer --version - composer self-update && composer --version
- composer require satooshi/php-coveralls 0.6.* --dev --prefer-dist - composer require satooshi/php-coveralls 0.6.* --dev --prefer-dist
- mysql -e 'CREATE DATABASE yiitest;'; - mysql -e 'CREATE DATABASE yiitest;';
- mysql -D yiitest -u travis < /home/travis/build/yiisoft/yii2/tests/unit/data/sphinx/source.sql
- psql -U postgres -c 'CREATE DATABASE yiitest;'; - psql -U postgres -c 'CREATE DATABASE yiitest;';
- echo 'elasticsearch version ' && curl http://localhost:9200/
- tests/unit/data/travis/apc-setup.sh - tests/unit/data/travis/apc-setup.sh
- tests/unit/data/travis/memcache-setup.sh - tests/unit/data/travis/memcache-setup.sh
- tests/unit/data/travis/cubrid-setup.sh - tests/unit/data/travis/cubrid-setup.sh
- tests/unit/data/travis/sphinx-setup.sh
script: #script:
- phpunit --coverage-clover tests/unit/runtime/coveralls/clover.xml --verbose --exclude-group mssql,oci,wincache,xcache,zenddata,vendor,sphinx # - phpunit --coverage-clover tests/unit/runtime/coveralls/clover.xml --verbose --exclude-group mssql,oci,wincache,xcache,zenddata,vendor,sphinx
after_script: #after_script:
- php vendor/bin/coveralls # - php vendor/bin/coveralls

10
apps/advanced/backend/views/layouts/main.php

@ -11,16 +11,16 @@ use yii\widgets\Breadcrumbs;
*/ */
AppAsset::register($this); AppAsset::register($this);
?> ?>
<?php $this->beginPage(); ?> <?php $this->beginPage() ?>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="<?= Yii::$app->language ?>"> <html lang="<?= Yii::$app->language ?>">
<head> <head>
<meta charset="<?= Yii::$app->charset ?>"/> <meta charset="<?= Yii::$app->charset ?>"/>
<title><?= Html::encode($this->title) ?></title> <title><?= Html::encode($this->title) ?></title>
<?php $this->head(); ?> <?php $this->head() ?>
</head> </head>
<body> <body>
<?php $this->beginBody(); ?> <?php $this->beginBody() ?>
<?php <?php
NavBar::begin([ NavBar::begin([
'brandLabel' => 'My Company', 'brandLabel' => 'My Company',
@ -58,7 +58,7 @@ AppAsset::register($this);
</div> </div>
</footer> </footer>
<?php $this->endBody(); ?> <?php $this->endBody() ?>
</body> </body>
</html> </html>
<?php $this->endPage(); ?> <?php $this->endPage() ?>

2
apps/advanced/common/config/params.php

@ -3,6 +3,7 @@
Yii::setAlias('common', realpath(__DIR__ . '/../')); Yii::setAlias('common', realpath(__DIR__ . '/../'));
Yii::setAlias('frontend', realpath(__DIR__ . '/../../frontend')); Yii::setAlias('frontend', realpath(__DIR__ . '/../../frontend'));
Yii::setAlias('backend', realpath(__DIR__ . '/../../backend')); Yii::setAlias('backend', realpath(__DIR__ . '/../../backend'));
Yii::setAlias('console', realpath(__DIR__ . '/../../console'));
return [ return [
'adminEmail' => 'admin@example.com', 'adminEmail' => 'admin@example.com',
@ -14,6 +15,7 @@ return [
'components.mail' => [ 'components.mail' => [
'class' => 'yii\swiftmailer\Mailer', 'class' => 'yii\swiftmailer\Mailer',
'viewPath' => '@common/mails',
], ],
'components.db' => [ 'components.db' => [

24
apps/advanced/common/mails/layouts/html.php

@ -0,0 +1,24 @@
<?php
use yii\helpers\Html;
use yii\mail\BaseMessage;
/**
* @var \yii\web\View $this
* @var BaseMessage $content
*/
?>
<?php $this->beginPage() ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=<?= Yii::$app->charset ?>" />
<title><?= Html::encode($this->title) ?></title>
<?php $this->head() ?>
</head>
<body>
<?php $this->beginBody() ?>
<?= $content ?>
<?php $this->endBody() ?>
</body>
</html>
<?php $this->endPage() ?>

0
apps/advanced/frontend/views/emails/passwordResetToken.php → apps/advanced/common/mails/passwordResetToken.php

18
apps/advanced/console/migrations/m130524_201442_init.php

@ -6,19 +6,21 @@ class m130524_201442_init extends \yii\db\Migration
{ {
public function up() public function up()
{ {
// MySQL-specific table options. Adjust if you plan working with another DBMS $tableOptions = null;
if ($this->db->driverName === 'mysql') {
$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE=InnoDB'; $tableOptions = 'CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE=InnoDB';
}
$this->createTable('tbl_user', [ $this->createTable('tbl_user', [
'id' => Schema::TYPE_PK, 'id' => Schema::TYPE_PK,
'username' => Schema::TYPE_STRING.' NOT NULL', 'username' => Schema::TYPE_STRING . ' NOT NULL',
'auth_key' => Schema::TYPE_STRING.'(32) NOT NULL', 'auth_key' => Schema::TYPE_STRING . '(32) NOT NULL',
'password_hash' => Schema::TYPE_STRING.' NOT NULL', 'password_hash' => Schema::TYPE_STRING . ' NOT NULL',
'password_reset_token' => Schema::TYPE_STRING.'(32)', 'password_reset_token' => Schema::TYPE_STRING . '(32)',
'email' => Schema::TYPE_STRING.' NOT NULL', 'email' => Schema::TYPE_STRING . ' NOT NULL',
'role' => 'tinyint NOT NULL DEFAULT 10', 'role' => Schema::TYPE_SMALLINT . ' NOT NULL DEFAULT 10',
'status' => 'tinyint NOT NULL DEFAULT 10', 'status' => Schema::TYPE_SMALLINT . ' NOT NULL DEFAULT 10',
'create_time' => Schema::TYPE_INTEGER.' NOT NULL', 'create_time' => Schema::TYPE_INTEGER.' NOT NULL',
'update_time' => Schema::TYPE_INTEGER.' NOT NULL', 'update_time' => Schema::TYPE_INTEGER.' NOT NULL',
], $tableOptions); ], $tableOptions);

16
apps/advanced/frontend/controllers/SiteController.php

@ -159,17 +159,11 @@ class SiteController extends Controller
$user->password_reset_token = Security::generateRandomKey(); $user->password_reset_token = Security::generateRandomKey();
if ($user->save(false)) { if ($user->save(false)) {
// todo: refactor it with mail component. pay attention to the arrangement of mail view files return \Yii::$app->mail->compose('passwordResetToken', ['user' => $user])
$fromEmail = \Yii::$app->params['supportEmail']; ->setFrom([\Yii::$app->params['supportEmail'] => \Yii::$app->name . ' robot'])
$name = '=?UTF-8?B?' . base64_encode(\Yii::$app->name . ' robot') . '?='; ->setTo($email)
$subject = '=?UTF-8?B?' . base64_encode('Password reset for ' . \Yii::$app->name) . '?='; ->setSubject('Password reset for ' . \Yii::$app->name)
$body = $this->renderPartial('/emails/passwordResetToken', [ ->send();
'user' => $user,
]);
$headers = "From: $name <{$fromEmail}>\r\n" .
"MIME-Version: 1.0\r\n" .
"Content-type: text/plain; charset=UTF-8";
return mail($email, $subject, $body, $headers);
} }
return false; return false;

10
apps/advanced/frontend/views/layouts/main.php

@ -12,16 +12,16 @@ use frontend\widgets\Alert;
*/ */
AppAsset::register($this); AppAsset::register($this);
?> ?>
<?php $this->beginPage(); ?> <?php $this->beginPage() ?>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="<?= Yii::$app->language ?>"> <html lang="<?= Yii::$app->language ?>">
<head> <head>
<meta charset="<?= Yii::$app->charset ?>"/> <meta charset="<?= Yii::$app->charset ?>"/>
<title><?= Html::encode($this->title) ?></title> <title><?= Html::encode($this->title) ?></title>
<?php $this->head(); ?> <?php $this->head() ?>
</head> </head>
<body> <body>
<?php $this->beginBody(); ?> <?php $this->beginBody() ?>
<?php <?php
NavBar::begin([ NavBar::begin([
'brandLabel' => 'My Company', 'brandLabel' => 'My Company',
@ -63,7 +63,7 @@ AppAsset::register($this);
</div> </div>
</footer> </footer>
<?php $this->endBody(); ?> <?php $this->endBody() ?>
</body> </body>
</html> </html>
<?php $this->endPage(); ?> <?php $this->endPage() ?>

10
apps/basic/views/layouts/main.php

@ -11,16 +11,16 @@ use app\assets\AppAsset;
*/ */
AppAsset::register($this); AppAsset::register($this);
?> ?>
<?php $this->beginPage(); ?> <?php $this->beginPage() ?>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="<?= Yii::$app->language ?>"> <html lang="<?= Yii::$app->language ?>">
<head> <head>
<meta charset="<?= Yii::$app->charset ?>"/> <meta charset="<?= Yii::$app->charset ?>"/>
<title><?= Html::encode($this->title) ?></title> <title><?= Html::encode($this->title) ?></title>
<?php $this->head(); ?> <?php $this->head() ?>
</head> </head>
<body> <body>
<?php $this->beginBody(); ?> <?php $this->beginBody() ?>
<?php <?php
NavBar::begin([ NavBar::begin([
'brandLabel' => 'My Company', 'brandLabel' => 'My Company',
@ -59,7 +59,7 @@ AppAsset::register($this);
</div> </div>
</footer> </footer>
<?php $this->endBody(); ?> <?php $this->endBody() ?>
</body> </body>
</html> </html>
<?php $this->endPage(); ?> <?php $this->endPage() ?>

2
build/build

@ -11,6 +11,8 @@
// fcgi doesn't have STDIN defined by default // fcgi doesn't have STDIN defined by default
defined('STDIN') or define('STDIN', fopen('php://stdin', 'r')); defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
define('YII_DEBUG', true);
require(__DIR__ . '/../framework/yii/Yii.php'); require(__DIR__ . '/../framework/yii/Yii.php');
$application = new yii\console\Application([ $application = new yii\console\Application([

43
build/controllers/PhpDocController.php

@ -7,6 +7,7 @@
namespace yii\build\controllers; namespace yii\build\controllers;
use Yii;
use yii\console\Controller; use yii\console\Controller;
use yii\helpers\Console; use yii\helpers\Console;
use yii\helpers\FileHelper; use yii\helpers\FileHelper;
@ -38,10 +39,30 @@ class PhpDocController extends Controller
* *
* @param null $root the directory to parse files from. Defaults to YII_PATH. * @param null $root the directory to parse files from. Defaults to YII_PATH.
*/ */
public function actionProperty($root=null) public function actionProperty($root = null)
{ {
$except = [];
if ($root === null) { if ($root === null) {
$root = YII_PATH; $root = dirname(dirname(YII_PATH));
Yii::setAlias('@yii/bootstrap', $root . '/extensions/bootstrap');
Yii::setAlias('@yii/debug', $root . '/extensions/debug');
Yii::setAlias('@yii/elasticsearch', $root . '/extensions/elasticsearch');
Yii::setAlias('@yii/gii', $root . '/extensions/gii');
Yii::setAlias('@yii/jui', $root . '/extensions/jui');
Yii::setAlias('@yii/redis', $root . '/extensions/redis');
Yii::setAlias('@yii/smarty', $root . '/extensions/smarty');
Yii::setAlias('@yii/sphinx', $root . '/extensions/sphinx');
Yii::setAlias('@yii/swiftmailer', $root . '/extensions/swiftmailer');
Yii::setAlias('@yii/twig', $root . '/extensions/twig');
$except = [
'/apps/',
'/build/',
'/docs/',
'/extensions/composer/',
'/tests/',
'/vendor/',
];
} }
$root = FileHelper::normalizePath($root); $root = FileHelper::normalizePath($root);
$options = [ $options = [
@ -55,14 +76,13 @@ class PhpDocController extends Controller
return null; return null;
}, },
'only' => ['.php'], 'only' => ['.php'],
'except' => [ 'except' => array_merge($except, [
'BaseYii.php', 'BaseYii.php',
'Yii.php', 'Yii.php',
'/debug/views/', '/views/',
'/requirements/', '/requirements/',
'/gii/views/',
'/gii/generators/', '/gii/generators/',
], ]),
]; ];
$files = FileHelper::findFiles($root, $options); $files = FileHelper::findFiles($root, $options);
$nFilesTotal = 0; $nFilesTotal = 0;
@ -216,21 +236,28 @@ class PhpDocController extends Controller
$ns = $this->match('#\nnamespace (?<name>[\w\\\\]+);\n#', $file); $ns = $this->match('#\nnamespace (?<name>[\w\\\\]+);\n#', $file);
$namespace = reset($ns); $namespace = reset($ns);
$namespace = $namespace['name']; $namespace = $namespace['name'];
$classes = $this->match('#\n(?:abstract )?class (?<name>\w+)( |\n)(extends )?.+\{(?<content>.*)\n\}(\n|$)#', $file); $classes = $this->match('#\n(?:abstract )?class (?<name>\w+)( extends .+)?( implements .+)?\n\{(?<content>.*)\n\}(\n|$)#', $file);
if (count($classes) > 1) { if (count($classes) > 1) {
$this->stderr("[ERR] There should be only one class in a file: $fileName\n", Console::FG_RED); $this->stderr("[ERR] There should be only one class in a file: $fileName\n", Console::FG_RED);
return false; return false;
} }
if (count($classes) < 1) { if (count($classes) < 1) {
$interfaces = $this->match('#\ninterface (?<name>\w+)\n\{(?<content>.+)\n\}(\n|$)#', $file); $interfaces = $this->match('#\ninterface (?<name>\w+)( extends .+)?\n\{(?<content>.+)\n\}(\n|$)#', $file);
if (count($interfaces) == 1) { if (count($interfaces) == 1) {
return false; return false;
} elseif (count($interfaces) > 1) { } elseif (count($interfaces) > 1) {
$this->stderr("[ERR] There should be only one interface in a file: $fileName\n", Console::FG_RED); $this->stderr("[ERR] There should be only one interface in a file: $fileName\n", Console::FG_RED);
} else { } else {
$traits = $this->match('#\ntrait (?<name>\w+)\n\{(?<content>.+)\n\}(\n|$)#', $file);
if (count($traits) == 1) {
return false;
} elseif (count($traits) > 1) {
$this->stderr("[ERR] There should be only one class/trait/interface in a file: $fileName\n", Console::FG_RED);
} else {
$this->stderr("[ERR] No class in file: $fileName\n", Console::FG_RED); $this->stderr("[ERR] No class in file: $fileName\n", Console::FG_RED);
} }
}
return false; return false;
} }

2
docs/guide/controller.md

@ -167,7 +167,7 @@ public SiteController extends \yii\web\Controller
{ {
return [ return [
'about' => [ 'about' => [
'class' => '@app/actions/Page', 'class' => 'app\actions\Page',
'view' => 'about', 'view' => 'about',
], ],
]; ];

16
docs/guide/form.md

@ -88,3 +88,19 @@ customize the output, you can chain additional methods to this call:
<?= $form->field($model, 'username')->textInput()->hint('Please enter your name')->label('Name') ?> <?= $form->field($model, 'username')->textInput()->hint('Please enter your name')->label('Name') ?>
``` ```
This will create all the `<label>`, `<input>` and other tags according to the template defined by the form field.
To add these tags yourself you can use the `Html` helper class. The following is equivalent to the code above:
```php
<?= Html::activeLabel($model, 'password') ?>
<?= Html::activePasswordInput($model, 'password') ?>
<?= Html::error($model, 'password') ?>
or
<?= Html::activeLabel($model, 'username', ['label' => 'name']) ?>
<?= Html::activeTextInput($model, 'username') ?>
<?= Html::error($model, 'username') ?>
<div class="hint-block">Please enter your name</div>
```

25
docs/guide/template.md

@ -1,10 +1,11 @@
Using template engines Using template engines
====================== ======================
By default Yii uses PHP as template language, but you can configure it to support other rendering engines, such as [Twig](http://twig.sensiolabs.org/) or [Smarty](http://www.smarty.net/). By default Yii uses PHP as template language, but you can configure it to support other rendering engines, such as
[Twig](http://twig.sensiolabs.org/) or [Smarty](http://www.smarty.net/).
The `view` component is responsible for rendering views. You can add The `view` component is responsible for rendering views. You can add a custom template engines by reconfiguring this
a custom template engines by reconfiguring this component's behavior: component's behavior:
```php ```php
[ [
@ -13,11 +14,13 @@ a custom template engines by reconfiguring this component's behavior:
'class' => 'yii\web\View', 'class' => 'yii\web\View',
'renderers' => [ 'renderers' => [
'tpl' => [ 'tpl' => [
'class' => 'yii\renderers\SmartyViewRenderer', 'class' => 'yii\smarty\ViewRenderer',
//'cachePath' => '@runtime/Smarty/cache',
], ],
'twig' => [ 'twig' => [
'class' => 'yii\renderers\TwigViewRenderer', 'class' => 'yii\twig\ViewRenderer',
'twigPath' => '@app/vendors/Twig', //'cachePath' => '@runtime/Twig/cache',
//'options' => [], /* Array of twig options */
], ],
// ... // ...
], ],
@ -26,7 +29,15 @@ a custom template engines by reconfiguring this component's behavior:
] ]
``` ```
Note that the Smarty and Twig packages themselves are not bundled with Yii. You must download them yourself. Then unpack the packages and place the resulting files in a logical location, such as the application's `protected/vendor` folder. Finally, specify the correct `smartyPath` or `twigPath`, as in the code above (for Twig). In the config above we're using Smarty and Twig. In order to get these extensions in your project you need to modify
your `composer.json` to include
```
"yiisoft/yii2-smarty": "*",
"yiisoft/yii2-twig": "*",
```
in `require` section and then run `composer update`.
Twig Twig
---- ----

10
docs/guide/view.md

@ -254,24 +254,24 @@ basic one without any widgets or extra markup.
<?php <?php
use yii\helpers\Html; use yii\helpers\Html;
?> ?>
<?php $this->beginPage(); ?> <?php $this->beginPage() ?>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="<?= Yii::$app->language ?>"> <html lang="<?= Yii::$app->language ?>">
<head> <head>
<meta charset="<?= Yii::$app->charset ?>"/> <meta charset="<?= Yii::$app->charset ?>"/>
<title><?= Html::encode($this->title) ?></title> <title><?= Html::encode($this->title) ?></title>
<?php $this->head(); ?> <?php $this->head() ?>
</head> </head>
<body> <body>
<?php $this->beginBody(); ?> <?php $this->beginBody() ?>
<div class="container"> <div class="container">
<?= $content ?> <?= $content ?>
</div> </div>
<footer class="footer">© 2013 me :)</footer> <footer class="footer">© 2013 me :)</footer>
<?php $this->endBody(); ?> <?php $this->endBody() ?>
</body> </body>
</html> </html>
<?php $this->endPage(); ?> <?php $this->endPage() ?>
``` ```
In the markup above there's some code. First of all, `$content` is a variable that will contain result of views rendered In the markup above there's some code. First of all, `$content` is a variable that will contain result of views rendered

2
extensions/bootstrap/composer.json

@ -5,7 +5,7 @@
"type": "yii2-extension", "type": "yii2-extension",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"support": { "support": {
"issues": "https://github.com/yiisoft/yii2/issues?state=open", "issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Abootstrap",
"forum": "http://www.yiiframework.com/forum/", "forum": "http://www.yiiframework.com/forum/",
"wiki": "http://www.yiiframework.com/wiki/", "wiki": "http://www.yiiframework.com/wiki/",
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",

8
extensions/composer/Installer.php

@ -26,7 +26,7 @@ class Installer extends LibraryInstaller
const EXTENSION_FILE = 'yiisoft/extensions.php'; const EXTENSION_FILE = 'yiisoft/extensions.php';
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function supports($packageType) public function supports($packageType)
{ {
@ -34,7 +34,7 @@ class Installer extends LibraryInstaller
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function install(InstalledRepositoryInterface $repo, PackageInterface $package) public function install(InstalledRepositoryInterface $repo, PackageInterface $package)
{ {
@ -49,7 +49,7 @@ class Installer extends LibraryInstaller
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function update(InstalledRepositoryInterface $repo, PackageInterface $initial, PackageInterface $target) public function update(InstalledRepositoryInterface $repo, PackageInterface $initial, PackageInterface $target)
{ {
@ -63,7 +63,7 @@ class Installer extends LibraryInstaller
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function uninstall(InstalledRepositoryInterface $repo, PackageInterface $package) public function uninstall(InstalledRepositoryInterface $repo, PackageInterface $package)
{ {

2
extensions/composer/Plugin.php

@ -20,7 +20,7 @@ use Composer\Plugin\PluginInterface;
class Plugin implements PluginInterface class Plugin implements PluginInterface
{ {
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function activate(Composer $composer, IOInterface $io) public function activate(Composer $composer, IOInterface $io)
{ {

2
extensions/debug/composer.json

@ -5,7 +5,7 @@
"type": "yii2-extension", "type": "yii2-extension",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"support": { "support": {
"issues": "https://github.com/yiisoft/yii2/issues?state=open", "issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Adebug",
"forum": "http://www.yiiframework.com/forum/", "forum": "http://www.yiiframework.com/forum/",
"wiki": "http://www.yiiframework.com/wiki/", "wiki": "http://www.yiiframework.com/wiki/",
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",

10
extensions/debug/views/layouts/main.php

@ -9,15 +9,15 @@ yii\debug\DebugAsset::register($this);
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<?php $this->beginPage(); ?> <?php $this->beginPage() ?>
<head> <head>
<title><?= Html::encode($this->title) ?></title> <title><?= Html::encode($this->title) ?></title>
<?php $this->head(); ?> <?php $this->head() ?>
</head> </head>
<body> <body>
<?php $this->beginBody(); ?> <?php $this->beginBody() ?>
<?= $content ?> <?= $content ?>
<?php $this->endBody(); ?> <?php $this->endBody() ?>
</body> </body>
<?php $this->endPage(); ?> <?php $this->endPage() ?>
</html> </html>

199
extensions/elasticsearch/ActiveQuery.php

@ -0,0 +1,199 @@
<?php
/**
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
namespace yii\elasticsearch;
use yii\db\ActiveQueryInterface;
use yii\db\ActiveQueryTrait;
/**
* ActiveQuery represents a [[Query]] associated with an [[ActiveRecord]] class.
*
* ActiveQuery instances are usually created by [[ActiveRecord::find()]].
*
* ActiveQuery mainly provides the following methods to retrieve the query results:
*
* - [[one()]]: returns a single record populated with the first row of data.
* - [[all()]]: returns all records based on the query results.
* - [[count()]]: returns the number of records.
* - [[scalar()]]: returns the value of the first column in the first row of the query result.
* - [[column()]]: returns the value of the first column in the query result.
* - [[exists()]]: returns a value indicating whether the query result has data or not.
*
* Because ActiveQuery extends from [[Query]], one can use query methods, such as [[where()]],
* [[orderBy()]] to customize the query options.
*
* ActiveQuery also provides the following additional query options:
*
* - [[with()]]: list of relations that this query should be performed with.
* - [[indexBy()]]: the name of the column by which the query result should be indexed.
* - [[asArray()]]: whether to return each record as an array.
*
* These options can be configured using methods of the same name. For example:
*
* ~~~
* $customers = Customer::find()->with('orders')->asArray()->all();
* ~~~
*
* @author Carsten Brandt <mail@cebe.cc>
* @since 2.0
*/
class ActiveQuery extends Query implements ActiveQueryInterface
{
use ActiveQueryTrait;
/**
* Creates a DB command that can be used to execute this query.
* @param Connection $db the DB connection used to create the DB command.
* If null, the DB connection returned by [[modelClass]] will be used.
* @return Command the created DB command instance.
*/
public function createCommand($db = null)
{
/** @var ActiveRecord $modelClass */
$modelClass = $this->modelClass;
if ($db === null) {
$db = $modelClass::getDb();
}
if ($this->type === null) {
$this->type = $modelClass::type();
}
if ($this->index === null) {
$this->index = $modelClass::index();
$this->type = $modelClass::type();
}
$commandConfig = $db->getQueryBuilder()->build($this);
return $db->createCommand($commandConfig);
}
/**
* Executes query and returns all results as an array.
* @param Connection $db the DB connection used to create the DB command.
* If null, the DB connection returned by [[modelClass]] will be used.
* @return array the query results. If the query results in nothing, an empty array will be returned.
*/
public function all($db = null)
{
$result = $this->createCommand($db)->search();
if (empty($result['hits']['hits'])) {
return [];
}
if ($this->fields !== null) {
foreach ($result['hits']['hits'] as &$row) {
$row['_source'] = isset($row['fields']) ? $row['fields'] : [];
unset($row['fields']);
}
unset($row);
}
if ($this->asArray && $this->indexBy) {
foreach ($result['hits']['hits'] as &$row) {
$row['_source'][ActiveRecord::PRIMARY_KEY_NAME] = $row['_id'];
$row = $row['_source'];
}
}
$models = $this->createModels($result['hits']['hits']);
if ($this->asArray && !$this->indexBy) {
foreach($models as $key => $model) {
$model['_source'][ActiveRecord::PRIMARY_KEY_NAME] = $model['_id'];
$models[$key] = $model['_source'];
}
}
if (!empty($this->with)) {
$this->findWith($this->with, $models);
}
return $models;
}
/**
* Executes query and returns a single row of result.
* @param Connection $db the DB connection used to create the DB command.
* If null, the DB connection returned by [[modelClass]] will be used.
* @return ActiveRecord|array|null a single row of query result. Depending on the setting of [[asArray]],
* the query result may be either an array or an ActiveRecord object. Null will be returned
* if the query results in nothing.
*/
public function one($db = null)
{
if (($result = parent::one($db)) === false) {
return null;
}
if ($this->asArray) {
$model = $result['_source'];
$model[ActiveRecord::PRIMARY_KEY_NAME] = $result['_id'];
} else {
/** @var ActiveRecord $class */
$class = $this->modelClass;
$model = $class::create($result);
}
if (!empty($this->with)) {
$models = [$model];
$this->findWith($this->with, $models);
$model = $models[0];
}
return $model;
}
/**
* {@inheritdoc}
*/
public function search($db = null, $options = [])
{
$result = $this->createCommand($db)->search($options);
if (!empty($result['hits']['hits'])) {
$models = $this->createModels($result['hits']['hits']);
if ($this->asArray) {
foreach($models as $key => $model) {
$model['_source'][ActiveRecord::PRIMARY_KEY_NAME] = $model['_id'];
$models[$key] = $model['_source'];
}
}
if (!empty($this->with)) {
$this->findWith($this->with, $models);
}
$result['hits']['hits'] = $models;
}
return $result;
}
/**
* {@inheritdoc}
*/
public function scalar($field, $db = null)
{
$record = parent::one($db);
if ($record !== false) {
if ($field == ActiveRecord::PRIMARY_KEY_NAME) {
return $record['_id'];
} elseif (isset($record['_source'][$field])) {
return $record['_source'][$field];
}
}
return null;
}
/**
* {@inheritdoc}
*/
public function column($field, $db = null)
{
if ($field == ActiveRecord::PRIMARY_KEY_NAME) {
$command = $this->createCommand($db);
$command->queryParts['fields'] = [];
$result = $command->search();
if (empty($result['hits']['hits'])) {
return [];
}
$column = [];
foreach ($result['hits']['hits'] as $row) {
$column[] = $row['_id'];
}
return $column;
}
return parent::column($field, $db);
}
}

474
extensions/elasticsearch/ActiveRecord.php

@ -0,0 +1,474 @@
<?php
/**
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
namespace yii\elasticsearch;
use yii\base\InvalidCallException;
use yii\base\InvalidConfigException;
use yii\base\NotSupportedException;
use yii\helpers\Inflector;
use yii\helpers\Json;
use yii\helpers\StringHelper;
/**
* ActiveRecord is the base class for classes representing relational data in terms of objects.
*
* This class implements the ActiveRecord pattern for the fulltext search and data storage
* [elasticsearch](http://www.elasticsearch.org/).
*
* For defining a record a subclass should at least implement the [[attributes()]] method to define
* attributes.
* The primary key (the `_id` field in elasticsearch terms) is represented by `getId()` and `setId()`.
* The primary key is not part of the attributes.
*
* The following is an example model called `Customer`:
*
* ```php
* class Customer extends \yii\elasticsearch\ActiveRecord
* {
* public function attributes()
* {
* return ['id', 'name', 'address', 'registration_date'];
* }
* }
* ```
*
* You may override [[index()]] and [[type()]] to define the index and type this record represents.
*
* @author Carsten Brandt <mail@cebe.cc>
* @since 2.0
*/
class ActiveRecord extends \yii\db\ActiveRecord
{
const PRIMARY_KEY_NAME = 'id';
private $_id;
private $_version;
/**
* Returns the database connection used by this AR class.
* By default, the "elasticsearch" application component is used as the database connection.
* You may override this method if you want to use a different database connection.
* @return Connection the database connection used by this AR class.
*/
public static function getDb()
{
return \Yii::$app->getComponent('elasticsearch');
}
/**
* {@inheritdoc}
*/
public static function find($q = null)
{
$query = static::createQuery();
if (is_array($q)) {
if (count($q) == 1 && (array_key_exists(ActiveRecord::PRIMARY_KEY_NAME, $q))) {
$pk = $q[ActiveRecord::PRIMARY_KEY_NAME];
if (is_array($pk)) {
return static::mget($pk);
} else {
return static::get($pk);
}
}
return $query->where($q)->one();
} elseif ($q !== null) {
return static::get($q);
}
return $query;
}
/**
* Gets a record by its primary key.
*
* @param mixed $primaryKey the primaryKey value
* @param array $options options given in this parameter are passed to elasticsearch
* as request URI parameters.
* Please refer to the [elasticsearch documentation](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-get.html)
* for more details on these options.
* @return static|null The record instance or null if it was not found.
*/
public static function get($primaryKey, $options = [])
{
if ($primaryKey === null) {
return null;
}
$command = static::getDb()->createCommand();
$result = $command->get(static::index(), static::type(), $primaryKey, $options);
if ($result['exists']) {
return static::create($result);
}
return null;
}
/**
* Gets a list of records by its primary keys.
*
* @param array $primaryKeys an array of primaryKey values
* @param array $options options given in this parameter are passed to elasticsearch
* as request URI parameters.
*
* Please refer to the [elasticsearch documentation](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-get.html)
* for more details on these options.
* @return static|null The record instance or null if it was not found.
*/
public static function mget($primaryKeys, $options = [])
{
if (empty($primaryKeys)) {
return [];
}
$command = static::getDb()->createCommand();
$result = $command->mget(static::index(), static::type(), $primaryKeys, $options);
$models = [];
foreach($result['docs'] as $doc) {
if ($doc['exists']) {
$models[] = static::create($doc);
}
}
return $models;
}
// TODO add more like this feature http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-more-like-this.html
// TODO add percolate functionality http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-percolate.html
/**
* {@inheritdoc}
*/
public static function createQuery()
{
return new ActiveQuery(['modelClass' => get_called_class()]);
}
/**
* {@inheritdoc}
*/
public static function createActiveRelation($config = [])
{
return new ActiveRelation($config);
}
// TODO implement copy and move as pk change is not possible
public function getId()
{
return $this->_id;
}
/**
* Sets the primary key
* @param mixed $value
* @throws \yii\base\InvalidCallException when record is not new
*/
public function setId($value)
{
if ($this->isNewRecord) {
$this->_id = $value;
} else {
throw new InvalidCallException('Changing the primaryKey of an already saved record is not allowed.');
}
}
/**
* {@inheritdoc}
*/
public function getPrimaryKey($asArray = false)
{
if ($asArray) {
return [ActiveRecord::PRIMARY_KEY_NAME => $this->_id];
} else {
return $this->_id;
}
}
/**
* {@inheritdoc}
*/
public function getOldPrimaryKey($asArray = false)
{
$id = $this->isNewRecord ? null : $this->_id;
if ($asArray) {
return [ActiveRecord::PRIMARY_KEY_NAME => $id];
} else {
return $this->_id;
}
}
/**
* This method defines the primary.
*
* The primaryKey for elasticsearch documents is always `primaryKey`. It can not be changed.
*
* @return string[] the primary keys of this record.
*/
public static function primaryKey()
{
return [ActiveRecord::PRIMARY_KEY_NAME];
}
/**
* Returns the list of all attribute names of the model.
* This method must be overridden by child classes to define available attributes.
* @return array list of attribute names.
*/
public function attributes()
{
throw new InvalidConfigException('The attributes() method of elasticsearch ActiveRecord has to be implemented by child classes.');
}
/**
* @return string the name of the index this record is stored in.
*/
public static function index()
{
return Inflector::pluralize(Inflector::camel2id(StringHelper::basename(get_called_class()), '-'));
}
/**
* @return string the name of the type of this record.
*/
public static function type()
{
return Inflector::camel2id(StringHelper::basename(get_called_class()), '-');
}
/**
* Creates an active record object using a row of data.
* This method is called by [[ActiveQuery]] to populate the query results
* into Active Records. It is not meant to be used to create new records.
* @param array $row attribute values (name => value)
* @return ActiveRecord the newly created active record.
*/
public static function create($row)
{
$row['_source'][ActiveRecord::PRIMARY_KEY_NAME] = $row['_id'];
$record = parent::create($row['_source']);
return $record;
}
/**
* Inserts a document into the associated index using the attribute values of this record.
*
* This method performs the following steps in order:
*
* 1. call [[beforeValidate()]] when `$runValidation` is true. If validation
* fails, it will skip the rest of the steps;
* 2. call [[afterValidate()]] when `$runValidation` is true.
* 3. call [[beforeSave()]]. If the method returns false, it will skip the
* rest of the steps;
* 4. insert the record into database. If this fails, it will skip the rest of the steps;
* 5. call [[afterSave()]];
*
* In the above step 1, 2, 3 and 5, events [[EVENT_BEFORE_VALIDATE]],
* [[EVENT_BEFORE_INSERT]], [[EVENT_AFTER_INSERT]] and [[EVENT_AFTER_VALIDATE]]
* will be raised by the corresponding methods.
*
* Only the [[dirtyAttributes|changed attribute values]] will be inserted into database.
*
* If the [[primaryKey|primary key]] is not set (null) during insertion,
* it will be populated with a
* [randomly generated value](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-index_.html#_automatic_id_generation)
* after insertion.
*
* For example, to insert a customer record:
*
* ~~~
* $customer = new Customer;
* $customer->name = $name;
* $customer->email = $email;
* $customer->insert();
* ~~~
*
* @param boolean $runValidation whether to perform validation before saving the record.
* 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,
* meaning all attributes will be saved.
* @param array $options options given in this parameter are passed to elasticsearch
* as request URI parameters. These are among others:
*
* - `routing` define shard placement of this record.
* - `parent` by giving the primaryKey of another record this defines a parent-child relation
* - `timestamp` specifies the timestamp to store along with the document. Default is indexing time.
*
* Please refer to the [elasticsearch documentation](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-index_.html)
* for more details on these options.
*
* By default the `op_type` is set to `create`.
* @return boolean whether the attributes are valid and the record is inserted successfully.
*/
public function insert($runValidation = true, $attributes = null, $options = ['op_type' => 'create'])
{
if ($runValidation && !$this->validate($attributes)) {
return false;
}
if ($this->beforeSave(true)) {
$values = $this->getDirtyAttributes($attributes);
$response = static::getDb()->createCommand()->insert(
static::index(),
static::type(),
$values,
$this->getPrimaryKey(),
$options
);
if (!$response['ok']) {
return false;
}
$this->_id = $response['_id'];
$this->_version = $response['_version'];
$this->setOldAttributes($values);
$this->afterSave(true);
return true;
}
return false;
}
/**
* Updates all records whos primary keys are given.
* For example, to change the status to be 1 for all customers whose status is 2:
*
* ~~~
* Customer::updateAll(array('status' => 1), array(2, 3, 4));
* ~~~
*
* @param array $attributes attribute values (name-value pairs) to be saved into the table
* @param array $condition the conditions that will be put in the WHERE part of the UPDATE SQL.
* Please refer to [[ActiveQuery::where()]] on how to specify this parameter.
* @param array $params this parameter is ignored in elasticsearch implementation.
* @return integer the number of rows updated
*/
public static function updateAll($attributes, $condition = [], $params = [])
{
if (count($condition) == 1 && isset($condition[ActiveRecord::PRIMARY_KEY_NAME])) {
$primaryKeys = (array) $condition[ActiveRecord::PRIMARY_KEY_NAME];
} else {
$primaryKeys = static::find()->where($condition)->column(ActiveRecord::PRIMARY_KEY_NAME);
}
if (empty($primaryKeys)) {
return 0;
}
$bulk = '';
foreach((array) $primaryKeys as $pk) {
$action = Json::encode([
"update" => [
"_id" => $pk,
"_type" => static::type(),
"_index" => static::index(),
],
]);
$data = Json::encode(array(
"doc" => $attributes
));
$bulk .= $action . "\n" . $data . "\n";
}
// TODO do this via command
$url = [static::index(), static::type(), '_bulk'];
$response = static::getDb()->post($url, [], $bulk);
$n=0;
foreach($response['items'] as $item) {
if ($item['update']['ok']) {
$n++;
}
}
return $n;
}
/**
* Deletes rows in the table using the provided conditions.
* WARNING: If you do not specify any condition, this method will delete ALL rows in the table.
*
* For example, to delete all customers whose status is 3:
*
* ~~~
* Customer::deleteAll('status = 3');
* ~~~
*
* @param array $condition the conditions that will be put in the WHERE part of the DELETE SQL.
* Please refer to [[ActiveQuery::where()]] on how to specify this parameter.
* @param array $params this parameter is ignored in elasticsearch implementation.
* @return integer the number of rows deleted
*/
public static function deleteAll($condition = [], $params = [])
{
if (count($condition) == 1 && isset($condition[ActiveRecord::PRIMARY_KEY_NAME])) {
$primaryKeys = (array) $condition[ActiveRecord::PRIMARY_KEY_NAME];
} else {
$primaryKeys = static::find()->where($condition)->column(ActiveRecord::PRIMARY_KEY_NAME);
}
if (empty($primaryKeys)) {
return 0;
}
$bulk = '';
foreach((array) $primaryKeys as $pk) {
$bulk .= Json::encode([
"delete" => [
"_id" => $pk,
"_type" => static::type(),
"_index" => static::index(),
],
]) . "\n";
}
// TODO do this via command
$url = [static::index(), static::type(), '_bulk'];
$response = static::getDb()->post($url, [], $bulk);
$n=0;
foreach($response['items'] as $item) {
if ($item['delete']['found'] && $item['delete']['ok']) {
$n++;
}
}
return $n;
}
/**
* {@inheritdoc}
*/
public static function updateAllCounters($counters, $condition = null, $params = [])
{
throw new NotSupportedException('Update Counters is not supported by elasticsearch ActiveRecord.');
}
/**
* {@inheritdoc}
*/
public static function getTableSchema()
{
throw new NotSupportedException('getTableSchema() is not supported by elasticsearch ActiveRecord.');
}
/**
* {@inheritdoc}
*/
public static function tableName()
{
return static::index() . '/' . static::type();
}
/**
* {@inheritdoc}
*/
public static function findBySql($sql, $params = [])
{
throw new NotSupportedException('findBySql() is not supported by elasticsearch ActiveRecord.');
}
/**
* Returns a value indicating whether the specified operation is transactional in the current [[scenario]].
* This method will always return false as transactional operations are not supported by elasticsearch.
* @param integer $operation the operation to check. Possible values are [[OP_INSERT]], [[OP_UPDATE]] and [[OP_DELETE]].
* @return boolean whether the specified operation is transactional in the current [[scenario]].
*/
public function isTransactional($operation)
{
return false;
}
}

61
extensions/elasticsearch/ActiveRelation.php

@ -0,0 +1,61 @@
<?php
/**
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
namespace yii\elasticsearch;
use yii\db\ActiveRelationInterface;
use yii\db\ActiveRelationTrait;
/**
* ActiveRelation represents a relation between two Active Record classes.
*
* ActiveRelation instances are usually created by calling [[ActiveRecord::hasOne()]] and
* [[ActiveRecord::hasMany()]]. An Active Record class declares a relation by defining
* a getter method which calls one of the above methods and returns the created ActiveRelation object.
*
* A relation is specified by [[link]] which represents the association between columns
* of different tables; and the multiplicity of the relation is indicated by [[multiple]].
*
* If a relation involves a pivot table, it may be specified by [[via()]] method.
*
* @author Carsten Brandt <mail@cebe.cc>
* @since 2.0
*/
class ActiveRelation extends ActiveQuery implements ActiveRelationInterface
{
use ActiveRelationTrait;
/**
* Creates a DB command that can be used to execute this query.
* @param Connection $db the DB connection used to create the DB command.
* If null, the DB connection returned by [[modelClass]] will be used.
* @return Command the created DB command instance.
*/
public function createCommand($db = null)
{
if ($this->primaryModel !== null) {
// lazy loading
if (is_array($this->via)) {
// via relation
/** @var ActiveRelation $viaQuery */
list($viaName, $viaQuery) = $this->via;
if ($viaQuery->multiple) {
$viaModels = $viaQuery->all();
$this->primaryModel->populateRelation($viaName, $viaModels);
} else {
$model = $viaQuery->one();
$this->primaryModel->populateRelation($viaName, $model);
$viaModels = $model === null ? [] : [$model];
}
$this->filterByModels($viaModels);
} else {
$this->filterByModels([$this->primaryModel]);
}
}
return parent::createCommand($db);
}
}

403
extensions/elasticsearch/Command.php

@ -0,0 +1,403 @@
<?php
/**
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
namespace yii\elasticsearch;
use yii\base\Component;
use yii\helpers\Json;
/**
* The Command class implements the API for accessing the elasticsearch REST API.
*
* Check the [elasticsearch guide](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/index.html)
* for details on these commands.
*
* @author Carsten Brandt <mail@cebe.cc>
* @since 2.0
*/
class Command extends Component
{
/**
* @var Connection
*/
public $db;
/**
* @var string|array the indexes to execute the query on. Defaults to null meaning all indexes
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search.html#search-multi-index
*/
public $index;
/**
* @var string|array the types to execute the query on. Defaults to null meaning all types
*/
public $type;
/**
* @var array list of arrays or json strings that become parts of a query
*/
public $queryParts;
public $options = [];
/**
* @param array $options
* @return mixed
*/
public function search($options = [])
{
$query = $this->queryParts;
if (empty($query)) {
$query = '{}';
}
if (is_array($query)) {
$query = Json::encode($query);
}
$url = [
$this->index !== null ? $this->index : '_all',
$this->type !== null ? $this->type : '_all',
'_search'
];
return $this->db->get($url, array_merge($this->options, $options), $query);
}
/**
* Inserts a document into an index
* @param string $index
* @param string $type
* @param string|array $data json string or array of data to store
* @param null $id the documents id. If not specified Id will be automatically choosen
* @param array $options
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-index_.html
*/
public function insert($index, $type, $data, $id = null, $options = [])
{
$body = is_array($data) ? Json::encode($data) : $data;
if ($id !== null) {
return $this->db->put([$index, $type, $id], $options, $body);
} else {
return $this->db->post([$index, $type], $options, $body);
}
}
/**
* gets a document from the index
* @param $index
* @param $type
* @param $id
* @param array $options
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-get.html
*/
public function get($index, $type, $id, $options = [])
{
return $this->db->get([$index, $type, $id], $options, null, [200, 404]);
}
/**
* gets multiple documents from the index
*
* TODO allow specifying type and index + fields
* @param $index
* @param $type
* @param $ids
* @param array $options
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-multi-get.html
*/
public function mget($index, $type, $ids, $options = [])
{
$body = Json::encode(['ids' => array_values($ids)]);
return $this->db->get([$index, $type, '_mget'], $options, $body);
}
/**
* gets a documents _source from the index (>=v0.90.1)
* @param $index
* @param $type
* @param $id
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-get.html#_source
*/
public function getSource($index, $type, $id)
{
return $this->db->get([$index, $type, $id]);
}
/**
* gets a document from the index
* @param $index
* @param $type
* @param $id
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-get.html
*/
public function exists($index, $type, $id)
{
return $this->db->head([$index, $type, $id]);
}
/**
* deletes a document from the index
* @param $index
* @param $type
* @param $id
* @param array $options
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-delete.html
*/
public function delete($index, $type, $id, $options = [])
{
return $this->db->delete([$index, $type, $id], $options);
}
/**
* updates a document
* @param $index
* @param $type
* @param $id
* @param array $options
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-update.html
*/
// public function update($index, $type, $id, $data, $options = [])
// {
// // TODO implement
//// return $this->db->delete([$index, $type, $id], $options);
// }
// TODO bulk http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-bulk.html
/**
* creates an index
* @param $index
* @param array $configuration
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-create-index.html
*/
public function createIndex($index, $configuration = null)
{
$body = $configuration !== null ? Json::encode($configuration) : null;
return $this->db->put([$index], $body);
}
/**
* deletes an index
* @param $index
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-delete-index.html
*/
public function deleteIndex($index)
{
return $this->db->delete([$index]);
}
/**
* deletes all indexes
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-delete-index.html
*/
public function deleteAllIndexes()
{
return $this->db->delete(['_all']);
}
/**
* checks whether an index exists
* @param $index
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-exists.html
*/
public function indexExists($index)
{
return $this->db->head([$index]);
}
/**
* @param $index
* @param $type
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-types-exists.html
*/
public function typeExists($index, $type)
{
return $this->db->head([$index, $type]);
}
// TODO http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-aliases.html
// TODO http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-update-settings.html
// TODO http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-get-settings.html
// TODO http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-warmers.html
/**
* @param $index
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-open-close.html
*/
public function openIndex($index)
{
return $this->db->post([$index, '_open']);
}
/**
* @param $index
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-open-close.html
*/
public function closeIndex($index)
{
return $this->db->post([$index, '_close']);
}
/**
* @param $index
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-status.html
*/
public function getIndexStatus($index = '_all')
{
return $this->db->get([$index, '_status']);
}
// TODO http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-stats.html
// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-segments.html
/**
* @param $index
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-clearcache.html
*/
public function clearIndexCache($index)
{
return $this->db->post([$index, '_cache', 'clear']);
}
/**
* @param $index
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-flush.html
*/
public function flushIndex($index = '_all')
{
return $this->db->post([$index, '_flush']);
}
/**
* @param $index
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-refresh.html
*/
public function refreshIndex($index)
{
return $this->db->post([$index, '_refresh']);
}
// TODO http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-optimize.html
// TODO http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-gateway-snapshot.html
/**
* @param $index
* @param $type
* @param $mapping
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-put-mapping.html
*/
public function setMapping($index, $type, $mapping)
{
$body = $mapping !== null ? Json::encode($mapping) : null;
return $this->db->put([$index, $type, '_mapping'], $body);
}
/**
* @param string $index
* @param string $type
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-get-mapping.html
*/
public function getMapping($index = '_all', $type = '_all')
{
return $this->db->get([$index, $type, '_mapping']);
}
/**
* @param $index
* @param $type
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-put-mapping.html
*/
public function deleteMapping($index, $type)
{
return $this->db->delete([$index, $type]);
}
/**
* @param $index
* @param string $type
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-get-field-mapping.html
*/
public function getFieldMapping($index, $type = '_all')
{
return $this->db->put([$index, $type, '_mapping']);
}
/**
* @param $options
* @param $index
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-analyze.html
*/
// public function analyze($options, $index = null)
// {
// // TODO implement
//// return $this->db->put([$index]);
// }
/**
* @param $name
* @param $pattern
* @param $settings
* @param $mappings
* @param int $order
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-templates.html
*/
public function createTemplate($name, $pattern, $settings, $mappings, $order = 0)
{
$body = Json::encode([
'template' => $pattern,
'order' => $order,
'settings' => (object) $settings,
'mappings' => (object) $mappings,
]);
return $this->db->put(['_template', $name], $body);
}
/**
* @param $name
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-templates.html
*/
public function deleteTemplate($name)
{
return $this->db->delete(['_template', $name]);
}
/**
* @param $name
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-templates.html
*/
public function getTemplate($name)
{
return $this->db->get(['_template', $name]);
}
}

346
extensions/elasticsearch/Connection.php

@ -0,0 +1,346 @@
<?php
/**
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
namespace yii\elasticsearch;
use Yii;
use yii\base\Component;
use yii\base\InvalidConfigException;
use yii\helpers\Json;
/**
* elasticsearch Connection is used to connect to an elasticsearch cluster version 0.20 or higher
*
* @author Carsten Brandt <mail@cebe.cc>
* @since 2.0
*/
class Connection extends Component
{
/**
* @event Event an event that is triggered after a DB connection is established
*/
const EVENT_AFTER_OPEN = 'afterOpen';
/**
* @var bool whether to autodetect available cluster nodes on [[open()]]
*/
public $autodetectCluster = true;
/**
* @var array cluster nodes
* This is populated with the result of a cluster nodes request when [[autodetectCluster]] is true.
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/cluster-nodes-info.html#cluster-nodes-info
*/
public $nodes = [
['http_address' => 'inet[/127.0.0.1:9200]'],
];
/**
* @var array the active node. key of [[nodes]]. Will be randomly selected on [[open()]].
*/
public $activeNode;
// TODO http://www.elasticsearch.org/guide/en/elasticsearch/client/php-api/current/_configuration.html#_example_configuring_http_basic_auth
public $auth = [];
/**
* @var float timeout to use for connecting to an elasticsearch node.
* This value will be used to configure the curl `CURLOPT_CONNECTTIMEOUT` option.
* If not set, no explicit timeout will be set for curl.
*/
public $connectionTimeout = null;
/**
* @var float timeout to use when reading the response from an elasticsearch node.
* This value will be used to configure the curl `CURLOPT_TIMEOUT` option.
* If not set, no explicit timeout will be set for curl.
*/
public $dataTimeout = null;
public function init()
{
foreach($this->nodes as $node) {
if (!isset($node['http_address'])) {
throw new InvalidConfigException('Elasticsearch node needs at least a http_address configured.');
}
}
}
/**
* Closes the connection when this component is being serialized.
* @return array
*/
public function __sleep()
{
$this->close();
return array_keys(get_object_vars($this));
}
/**
* Returns a value indicating whether the DB connection is established.
* @return boolean whether the DB connection is established
*/
public function getIsActive()
{
return $this->activeNode !== null;
}
/**
* Establishes a DB connection.
* It does nothing if a DB connection has already been established.
* @throws Exception if connection fails
*/
public function open()
{
if ($this->activeNode !== null) {
return;
}
if (empty($this->nodes)) {
throw new InvalidConfigException('elasticsearch needs at least one node to operate.');
}
if ($this->autodetectCluster) {
$node = reset($this->nodes);
$host = $node['http_address'];
if (strncmp($host, 'inet[/', 6) == 0) {
$host = substr($host, 6, -1);
}
$response = $this->httpRequest('GET', 'http://' . $host . '/_cluster/nodes');
$this->nodes = $response['nodes'];
if (empty($this->nodes)) {
throw new Exception('cluster autodetection did not find any active node.');
}
}
$this->selectActiveNode();
Yii::trace('Opening connection to elasticsearch. Nodes in cluster: ' . count($this->nodes)
. ', active node: ' . $this->nodes[$this->activeNode]['http_address'], __CLASS__);
$this->initConnection();
}
/**
* select active node randomly
*/
protected function selectActiveNode()
{
$keys = array_keys($this->nodes);
$this->activeNode = $keys[rand(0, count($keys) - 1)];
}
/**
* Closes the currently active DB connection.
* It does nothing if the connection is already closed.
*/
public function close()
{
Yii::trace('Closing connection to elasticsearch. Active node was: '
. $this->nodes[$this->activeNode]['http_address'], __CLASS__);
$this->activeNode = null;
}
/**
* Initializes the DB connection.
* This method is invoked right after the DB connection is established.
* The default implementation triggers an [[EVENT_AFTER_OPEN]] event.
*/
protected function initConnection()
{
$this->trigger(self::EVENT_AFTER_OPEN);
}
/**
* Returns the name of the DB driver for the current [[dsn]].
* @return string name of the DB driver
*/
public function getDriverName()
{
return 'elasticsearch';
}
/**
* Creates a command for execution.
* @param array $config the configuration for the Command class
* @return Command the DB command
*/
public function createCommand($config = [])
{
$this->open();
$config['db'] = $this;
$command = new Command($config);
return $command;
}
public function getQueryBuilder()
{
return new QueryBuilder($this);
}
public function get($url, $options = [], $body = null)
{
$this->open();
return $this->httpRequest('GET', $this->createUrl($url, $options), $body);
}
public function head($url, $options = [], $body = null)
{
$this->open();
return $this->httpRequest('HEAD', $this->createUrl($url, $options), $body);
}
public function post($url, $options = [], $body = null)
{
$this->open();
return $this->httpRequest('POST', $this->createUrl($url, $options), $body);
}
public function put($url, $options = [], $body = null)
{
$this->open();
return $this->httpRequest('PUT', $this->createUrl($url, $options), $body);
}
public function delete($url, $options = [], $body = null)
{
$this->open();
return $this->httpRequest('DELETE', $this->createUrl($url, $options), $body);
}
private function createUrl($path, $options = [])
{
$url = implode('/', array_map(function($a) {
return urlencode(is_array($a) ? implode(',', $a) : $a);
}, $path));
if (!empty($options)) {
$url .= '?' . http_build_query($options);
}
return [$this->nodes[$this->activeNode]['http_address'], $url];
}
protected function httpRequest($method, $url, $requestBody = null)
{
$method = strtoupper($method);
// response body and headers
$headers = [];
$body = '';
$options = [
CURLOPT_USERAGENT => 'Yii2 Framework ' . __CLASS__,
CURLOPT_RETURNTRANSFER => false,
CURLOPT_HEADER => false,
// http://www.php.net/manual/en/function.curl-setopt.php#82418
CURLOPT_HTTPHEADER => ['Expect:'],
CURLOPT_WRITEFUNCTION => function($curl, $data) use (&$body) {
$body .= $data;
return mb_strlen($data, '8bit');
},
CURLOPT_HEADERFUNCTION => function($curl, $data) use (&$headers) {
foreach(explode("\r\n", $data) as $row) {
if (($pos = strpos($row, ':')) !== false) {
$headers[strtolower(substr($row, 0, $pos))] = trim(substr($row, $pos + 1));
}
}
return mb_strlen($data, '8bit');
},
CURLOPT_CUSTOMREQUEST => $method,
];
if ($this->connectionTimeout !== null) {
$options[CURLOPT_CONNECTTIMEOUT] = $this->connectionTimeout;
}
if ($this->dataTimeout !== null) {
$options[CURLOPT_TIMEOUT] = $this->dataTimeout;
}
if ($requestBody !== null) {
$options[CURLOPT_POSTFIELDS] = $requestBody;
}
if ($method == 'HEAD') {
$options[CURLOPT_NOBODY] = true;
unset($options[CURLOPT_WRITEFUNCTION]);
}
if (is_array($url)) {
list($host, $q) = $url;
if (strncmp($host, 'inet[/', 6) == 0) {
$host = substr($host, 6, -1);
}
$profile = $q . $requestBody;
$url = 'http://' . $host . '/' . $q;
} else {
$profile = false;
}
Yii::trace("Sending request to elasticsearch node: $url\n$requestBody", __METHOD__);
if ($profile !== false) {
Yii::beginProfile($profile, __METHOD__);
}
$curl = curl_init($url);
curl_setopt_array($curl, $options);
if (curl_exec($curl) === false) {
throw new Exception('Elasticsearch request failed: ' . curl_errno($curl) . ' - ' . curl_error($curl), [
'requestMethod' => $method,
'requestUrl' => $url,
'requestBody' => $requestBody,
'responseHeaders' => $headers,
'responseBody' => $body,
]);
}
$responseCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
curl_close($curl);
if ($profile !== false) {
Yii::endProfile($profile, __METHOD__);
}
if ($responseCode >= 200 && $responseCode < 300) {
if ($method == 'HEAD') {
return true;
} else {
if (isset($headers['content-length']) && ($len = mb_strlen($body, '8bit')) < $headers['content-length']) {
throw new Exception("Incomplete data received from elasticsearch: $len < {$headers['content-length']}", [
'requestMethod' => $method,
'requestUrl' => $url,
'requestBody' => $requestBody,
'responseCode' => $responseCode,
'responseHeaders' => $headers,
'responseBody' => $body,
]);
}
if (isset($headers['content-type']) && !strncmp($headers['content-type'], 'application/json', 16)) {
return Json::decode($body);
}
throw new Exception('Unsupported data received from elasticsearch: ' . $headers['content-type'], [
'requestMethod' => $method,
'requestUrl' => $url,
'requestBody' => $requestBody,
'responseCode' => $responseCode,
'responseHeaders' => $headers,
'responseBody' => $body,
]);
}
} elseif ($responseCode == 404) {
return false;
} else {
throw new Exception("Elasticsearch request failed with code $responseCode.", [
'requestMethod' => $method,
'requestUrl' => $url,
'requestBody' => $requestBody,
'responseCode' => $responseCode,
'responseHeaders' => $headers,
'responseBody' => $body,
]);
}
}
public function getNodeInfo()
{
return $this->get([]);
}
public function getClusterState()
{
return $this->get(['_cluster', 'state']);
}
}

43
extensions/elasticsearch/Exception.php

@ -0,0 +1,43 @@
<?php
/**
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
namespace yii\elasticsearch;
/**
* Exception represents an exception that is caused by elasticsearch-related operations.
*
* @author Carsten Brandt <mail@cebe.cc>
* @since 2.0
*/
class Exception extends \yii\db\Exception
{
/**
* @var array additional information about the http request that caused the error.
*/
public $errorInfo = [];
/**
* Constructor.
* @param string $message error message
* @param array $errorInfo error info
* @param integer $code error code
* @param \Exception $previous The previous exception used for the exception chaining.
*/
public function __construct($message, $errorInfo = [], $code = 0, \Exception $previous = null)
{
$this->errorInfo = $errorInfo;
parent::__construct($message, $code, $previous);
}
/**
* @return string the user-friendly name of this exception
*/
public function getName()
{
return \Yii::t('yii', 'Elasticsearch Database Exception');
}
}

32
extensions/elasticsearch/LICENSE.md

@ -0,0 +1,32 @@
The Yii framework is free software. It is released under the terms of
the following BSD License.
Copyright © 2008 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.

506
extensions/elasticsearch/Query.php

@ -0,0 +1,506 @@
<?php
/**
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
namespace yii\elasticsearch;
use Yii;
use yii\base\Component;
use yii\base\NotSupportedException;
use yii\db\QueryInterface;
use yii\db\QueryTrait;
/**
* Query represents a query to the search API of elasticsearch.
*
* Query provides a set of methods to facilitate the specification of different parameters of the query.
* These methods can be chained together.
*
* By calling [[createCommand()]], we can get a [[Command]] instance which can be further
* used to perform/execute the DB query against a database.
*
* For example,
*
* ~~~
* $query = new Query;
* $query->fields('id, name')
* ->from('myindex', 'users')
* ->limit(10);
* // build and execute the query
* $command = $query->createCommand();
* $rows = $command->search(); // this way you get the raw output of elasticsearch.
* ~~~
*
* You would normally call `$query->search()` instead of creating a command as this method
* adds the `indexBy()` feature and also removes some inconsistencies from the response.
*
* Query also provides some methods to easier get some parts of the result only:
*
* - [[one()]]: returns a single record populated with the first row of data.
* - [[all()]]: returns all records based on the query results.
* - [[count()]]: returns the number of records.
* - [[scalar()]]: returns the value of the first column in the first row of the query result.
* - [[column()]]: returns the value of the first column in the query result.
* - [[exists()]]: returns a value indicating whether the query result has data or not.
*
* @author Carsten Brandt <mail@cebe.cc>
* @since 2.0
*/
class Query extends Component implements QueryInterface
{
use QueryTrait;
/**
* @var array the fields being retrieved from the documents. For example, `['id', 'name']`.
* If not set, it means retrieving all fields. An empty array will result in no fields being
* retrieved. This means that only the primaryKey of a record will be available in the result.
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-fields.html#search-request-fields
* @see fields()
*/
public $fields;
/**
* @var string|array The index to retrieve data from. This can be a string representing a single index
* or a an array of multiple indexes. If this is not set, indexes are being queried.
* @see from()
*/
public $index;
/**
* @var string|array The type to retrieve data from. This can be a string representing a single type
* or a an array of multiple types. If this is not set, all types are being queried.
* @see from()
*/
public $type;
/**
* @var integer A search timeout, bounding the search request to be executed within the specified time value
* and bail with the hits accumulated up to that point when expired. Defaults to no timeout.
* @see timeout()
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-body.html#_parameters_3
*/
public $timeout;
/**
* @var array|string The query part of this search query. This is an array or json string that follows the format of
* the elasticsearch [Query DSL](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl.html).
*/
public $query;
/**
* @var array|string The filter part of this search query. This is an array or json string that follows the format of
* the elasticsearch [Query DSL](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl.html).
*/
public $filter;
public $facets = [];
public function init()
{
parent::init();
// setting the default limit according to elasticsearch defaults
// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-body.html#_parameters_3
if ($this->limit === null) {
$this->limit = 10;
}
}
/**
* Creates a DB command that can be used to execute this query.
* @param Connection $db the database connection used to execute the query.
* If this parameter is not given, the `elasticsearch` application component will be used.
* @return Command the created DB command instance.
*/
public function createCommand($db = null)
{
if ($db === null) {
$db = Yii::$app->getComponent('elasticsearch');
}
$commandConfig = $db->getQueryBuilder()->build($this);
return $db->createCommand($commandConfig);
}
/**
* Executes the query and returns all results as an array.
* @param Connection $db the database connection used to execute the query.
* If this parameter is not given, the `elasticsearch` application component will be used.
* @return array the query results. If the query results in nothing, an empty array will be returned.
*/
public function all($db = null)
{
$result = $this->createCommand($db)->search();
if (empty($result['hits']['hits'])) {
return [];
}
$rows = $result['hits']['hits'];
if ($this->indexBy === null && $this->fields === null) {
return $rows;
}
$models = [];
foreach ($rows as $key => $row) {
if ($this->fields !== null) {
$row['_source'] = isset($row['fields']) ? $row['fields'] : [];
unset($row['fields']);
}
if ($this->indexBy !== null) {
if (is_string($this->indexBy)) {
$key = $row['_source'][$this->indexBy];
} else {
$key = call_user_func($this->indexBy, $row);
}
}
$models[$key] = $row;
}
return $models;
}
/**
* Executes the query and returns a single row of result.
* @param Connection $db the database connection used to execute the query.
* If this parameter is not given, the `elasticsearch` application component will be used.
* @return array|boolean the first row (in terms of an array) of the query result. False is returned if the query
* results in nothing.
*/
public function one($db = null)
{
$options['size'] = 1;
$result = $this->createCommand($db)->search($options);
if (empty($result['hits']['hits'])) {
return false;
}
$record = reset($result['hits']['hits']);
if ($this->fields !== null) {
$record['_source'] = isset($record['fields']) ? $record['fields'] : [];
unset($record['fields']);
}
return $record;
}
/**
* Executes the query and returns the complete search result including e.g. hits, facets, totalCount.
* @param Connection $db the database connection used to execute the query.
* If this parameter is not given, the `elasticsearch` application component will be used.
* @param array $options The options given with this query. Possible options are:
* - [routing](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search.html#search-routing)
* - [search_type](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-search-type.html)
* @return array the query results.
*/
public function search($db = null, $options = [])
{
$result = $this->createCommand($db)->search($options);
if (!empty($result['hits']['hits']) && ($this->indexBy === null || $this->fields === null)) {
$rows = [];
foreach ($result['hits']['hits'] as $key => $row) {
if ($this->fields !== null) {
$row['_source'] = isset($row['fields']) ? $row['fields'] : [];
unset($row['fields']);
}
if ($this->indexBy !== null) {
if (is_string($this->indexBy)) {
$key = $row['_source'][$this->indexBy];
} else {
$key = call_user_func($this->indexBy, $row);
}
}
$rows[$key] = $row;
}
$result['hits']['hits'] = $rows;
}
return $result;
}
// TODO add query stats http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search.html#stats-groups
// TODO add scroll/scan http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-search-type.html#scan
/**
* Executes the query and deletes all matching documents.
*
* This will not run facet queries.
*
* @param Connection $db the database connection used to execute the query.
* If this parameter is not given, the `elasticsearch` application component will be used.
* @return array the query results. If the query results in nothing, an empty array will be returned.
*/
public function delete($db = null)
{
// TODO implement http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-delete-by-query.html
throw new NotSupportedException('Delete by query is not implemented yet.');
}
/**
* Returns the query result as a scalar value.
* The value returned will be the specified field in the first document of the query results.
* @param string $field name of the attribute to select
* @param Connection $db the database connection used to execute the query.
* If this parameter is not given, the `elasticsearch` application component will be used.
* @return string the value of the specified attribute in the first record of the query result.
* Null is returned if the query result is empty or the field does not exist.
*/
public function scalar($field, $db = null)
{
$record = self::one($db); // TODO limit fields to the one required
if ($record !== false && isset($record['_source'][$field])) {
return $record['_source'][$field];
} else {
return null;
}
}
/**
* Executes the query and returns the first column of the result.
* @param string $field the field to query over
* @param Connection $db the database connection used to execute the query.
* If this parameter is not given, the `elasticsearch` application component will be used.
* @return array the first column of the query result. An empty array is returned if the query results in nothing.
*/
public function column($field, $db = null)
{
$command = $this->createCommand($db);
$command->queryParts['fields'] = [$field];
$result = $command->search();
if (empty($result['hits']['hits'])) {
return [];
}
$column = [];
foreach ($result['hits']['hits'] as $row) {
$column[] = isset($row['fields'][$field]) ? $row['fields'][$field] : null;
}
return $column;
}
/**
* Returns the number of records.
* @param string $q the COUNT expression. This parameter is ignored by this implementation.
* @param Connection $db the database connection used to execute the query.
* If this parameter is not given, the `elasticsearch` application component will be used.
* @return integer number of records
*/
public function count($q = '*', $db = null)
{
// TODO consider sending to _count api instead of _search for performance
// only when no facety are registerted.
// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-count.html
$options = [];
$options['search_type'] = 'count';
$count = $this->createCommand($db)->search($options)['hits']['total'];
if ($this->limit === null && $this->offset === null) {
return $count;
} elseif ($this->offset !== null) {
$count = $this->offset < $count ? $count - $this->offset : 0;
}
return $this->limit === null ? $count : ($this->limit > $count ? $count : $this->limit);
}
/**
* Returns a value indicating whether the query result contains any row of data.
* @param Connection $db the database connection used to execute the query.
* If this parameter is not given, the `elasticsearch` application component will be used.
* @return boolean whether the query result contains any row of data.
*/
public function exists($db = null)
{
return self::one($db) !== false;
}
/**
* Adds a facet search to this query.
* @param string $name the name of this facet
* @param string $type the facet type. e.g. `terms`, `range`, `histogram`...
* @param string|array $options the configuration options for this facet. Can be an array or a json string.
* @return static
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-facets-query-facet.html
*/
public function addFacet($name, $type, $options)
{
$this->facets[$name] = [$type => $options];
return $this;
}
/**
* The `terms facet` allow to specify field facets that return the N most frequent terms.
* @param string $name the name of this facet
* @param array $options additional option. Please refer to the elasticsearch documentation for details.
* @return static
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-facets-terms-facet.html
*/
public function addTermFacet($name, $options)
{
return $this->addFacet($name, 'terms', $options);
}
/**
* Range facet allows to specify a set of ranges and get both the number of docs (count) that fall
* within each range, and aggregated data either based on the field, or using another field.
* @param string $name the name of this facet
* @param array $options additional option. Please refer to the elasticsearch documentation for details.
* @return static
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-facets-range-facet.html
*/
public function addRangeFacet($name, $options)
{
return $this->addFacet($name, 'range', $options);
}
/**
* The histogram facet works with numeric data by building a histogram across intervals of the field values.
* Each value is "rounded" into an interval (or placed in a bucket), and statistics are provided per
* interval/bucket (count and total).
* @param string $name the name of this facet
* @param array $options additional option. Please refer to the elasticsearch documentation for details.
* @return static
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-facets-histogram-facet.html
*/
public function addHistogramFacet($name, $options)
{
return $this->addFacet($name, 'histogram', $options);
}
/**
* A specific histogram facet that can work with date field types enhancing it over the regular histogram facet.
* @param string $name the name of this facet
* @param array $options additional option. Please refer to the elasticsearch documentation for details.
* @return static
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-facets-date-histogram-facet.html
*/
public function addDateHistogramFacet($name, $options)
{
return $this->addFacet($name, 'date_histogram', $options);
}
/**
* A filter facet (not to be confused with a facet filter) allows you to return a count of the hits matching the filter.
* The filter itself can be expressed using the Query DSL.
* @param string $name the name of this facet
* @param string $filter the query in Query DSL
* @return static
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-facets-filter-facet.html
*/
public function addFilterFacet($name, $filter)
{
return $this->addFacet($name, 'filter', $filter);
}
/**
* A facet query allows to return a count of the hits matching the facet query.
* The query itself can be expressed using the Query DSL.
* @param string $name the name of this facet
* @param string $query the query in Query DSL
* @return static
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-facets-query-facet.html
*/
public function addQueryFacet($name, $query)
{
return $this->addFacet($name, 'query', $query);
}
/**
* Statistical facet allows to compute statistical data on a numeric fields. The statistical data include count,
* total, sum of squares, mean (average), minimum, maximum, variance, and standard deviation.
* @param string $name the name of this facet
* @param array $options additional option. Please refer to the elasticsearch documentation for details.
* @return static
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-facets-statistical-facet.html
*/
public function addStatisticalFacet($name, $options)
{
return $this->addFacet($name, 'statistical', $options);
}
/**
* The `terms_stats` facet combines both the terms and statistical allowing to compute stats computed on a field,
* per term value driven by another field.
* @param string $name the name of this facet
* @param array $options additional option. Please refer to the elasticsearch documentation for details.
* @return static
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-facets-terms-stats-facet.html
*/
public function addTermsStatsFacet($name, $options)
{
return $this->addFacet($name, 'terms_stats', $options);
}
/**
* The `geo_distance` facet is a facet providing information for ranges of distances from a provided `geo_point`
* including count of the number of hits that fall within each range, and aggregation information (like `total`).
* @param string $name the name of this facet
* @param array $options additional option. Please refer to the elasticsearch documentation for details.
* @return static
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-facets-geo-distance-facet.html
*/
public function addGeoDistanceFacet($name, $options)
{
return $this->addFacet($name, 'geo_distance', $options);
}
// TODO add suggesters http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-suggesters.html
// TODO add validate query http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-validate.html
// TODO support multi query via static method http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-multi-search.html
/**
* Sets the querypart of this search query.
* @param string $query
* @return static
*/
public function query($query)
{
$this->query = $query;
return $this;
}
/**
* Sets the filter part of this search query.
* @param string $filter
* @return static
*/
public function filter($filter)
{
$this->filter = $filter;
return $this;
}
/**
* Sets the index and type to retrieve documents from.
* @param string|array $index The index to retrieve data from. This can be a string representing a single index
* or a an array of multiple indexes. If this is `null` it means that all indexes are being queried.
* @param string|array $type The type to retrieve data from. This can be a string representing a single type
* or a an array of multiple types. If this is `null` it means that all types are being queried.
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-search.html#search-multi-index-type
*/
public function from($index, $type = null)
{
$this->index = $index;
$this->type = $type;
}
/**
* Sets the fields to retrieve from the documents.
* @param array $fields the fields to be selected.
* @return static the query object itself
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-fields.html
*/
public function fields($fields)
{
if (is_array($fields) || $fields === null) {
$this->fields = $fields;
} else {
$this->fields = func_get_args();
}
return $this;
}
/**
* Sets the search timeout.
* @param integer $timeout A search timeout, bounding the search request to be executed within the specified time value
* and bail with the hits accumulated up to that point when expired. Defaults to no timeout.
* @return static the query object itself
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-body.html#_parameters_3
*/
public function timeout($timeout)
{
$this->timeout = $timeout;
return $this;
}
}

349
extensions/elasticsearch/QueryBuilder.php

@ -0,0 +1,349 @@
<?php
/**
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
namespace yii\elasticsearch;
use yii\base\InvalidParamException;
use yii\base\NotSupportedException;
use yii\helpers\Json;
/**
* QueryBuilder builds an elasticsearch query based on the specification given as a [[Query]] object.
*
*
* @author Carsten Brandt <mail@cebe.cc>
* @since 2.0
*/
class QueryBuilder extends \yii\base\Object
{
/**
* @var Connection the database connection.
*/
public $db;
/**
* Constructor.
* @param Connection $connection the database connection.
* @param array $config name-value pairs that will be used to initialize the object properties
*/
public function __construct($connection, $config = [])
{
$this->db = $connection;
parent::__construct($config);
}
/**
* Generates query from a [[Query]] object.
* @param Query $query the [[Query]] object from which the query will be generated
* @return array the generated SQL statement (the first array element) and the corresponding
* parameters to be bound to the SQL statement (the second array element).
*/
public function build($query)
{
$parts = [];
if ($query->fields !== null) {
$parts['fields'] = (array) $query->fields;
}
if ($query->limit !== null && $query->limit >= 0) {
$parts['size'] = $query->limit;
}
if ($query->offset > 0) {
$parts['from'] = (int) $query->offset;
}
if (empty($parts['query'])) {
$parts['query'] = ["match_all" => (object)[]];
}
$whereFilter = $this->buildCondition($query->where);
if (is_string($query->filter)) {
if (empty($whereFilter)) {
$parts['filter'] = $query->filter;
} else {
$parts['filter'] = '{"and": [' . $query->filter . ', ' . Json::encode($whereFilter) . ']}';
}
} elseif ($query->filter !== null) {
if (empty($whereFilter)) {
$parts['filter'] = $query->filter;
} else {
$parts['filter'] = ['and' => [$query->filter, $whereFilter]];
}
} elseif (!empty($whereFilter)) {
$parts['filter'] = $whereFilter;
}
$sort = $this->buildOrderBy($query->orderBy);
if (!empty($sort)) {
$parts['sort'] = $sort;
}
if (!empty($query->facets)) {
$parts['facets'] = $query->facets;
}
$options = [];
if ($query->timeout !== null) {
$options['timeout'] = $query->timeout;
}
return [
'queryParts' => $parts,
'index' => $query->index,
'type' => $query->type,
'options' => $options,
];
}
/**
* adds order by condition to the query
*/
public function buildOrderBy($columns)
{
if (empty($columns)) {
return [];
}
$orders = [];
foreach ($columns as $name => $direction) {
if (is_string($direction)) {
$column = $direction;
$direction = SORT_ASC;
} else {
$column = $name;
}
if ($column == ActiveRecord::PRIMARY_KEY_NAME) {
$column = '_uid';
}
// allow elasticsearch extended syntax as described in http://www.elasticsearch.org/guide/reference/api/search/sort/
if (is_array($direction)) {
$orders[] = [$column => $direction];
} else {
$orders[] = [$column => ($direction === SORT_DESC ? 'desc' : 'asc')];
}
}
return $orders;
}
/**
* Parses the condition specification and generates the corresponding SQL expression.
* @param string|array $condition the condition specification. Please refer to [[Query::where()]]
* on how to specify a condition.
* @param array $params the binding parameters to be populated
* @return string the generated SQL expression
* @throws \yii\db\Exception if the condition is in bad format
*/
public function buildCondition($condition)
{
static $builders = array(
'and' => 'buildAndCondition',
'or' => 'buildAndCondition',
'between' => 'buildBetweenCondition',
'not between' => 'buildBetweenCondition',
'in' => 'buildInCondition',
'not in' => 'buildInCondition',
'like' => 'buildLikeCondition',
'not like' => 'buildLikeCondition',
'or like' => 'buildLikeCondition',
'or not like' => 'buildLikeCondition',
);
if (empty($condition)) {
return [];
}
if (!is_array($condition)) {
throw new NotSupportedException('String conditions in where() are not supported by elasticsearch.');
}
if (isset($condition[0])) { // operator format: operator, operand 1, operand 2, ...
$operator = strtolower($condition[0]);
if (isset($builders[$operator])) {
$method = $builders[$operator];
array_shift($condition);
return $this->$method($operator, $condition);
} else {
throw new InvalidParamException('Found unknown operator in query: ' . $operator);
}
} else { // hash format: 'column1' => 'value1', 'column2' => 'value2', ...
return $this->buildHashCondition($condition);
}
}
private function buildHashCondition($condition)
{
$parts = [];
foreach($condition as $attribute => $value) {
if ($attribute == ActiveRecord::PRIMARY_KEY_NAME) {
if ($value == null) { // there is no null pk
$parts[] = ['script' => ['script' => '0==1']];
} else {
$parts[] = ['ids' => ['values' => is_array($value) ? $value : [$value]]];
}
} else {
if (is_array($value)) { // IN condition
$parts[] = ['in' => [$attribute => $value]];
} else {
if ($value === null) {
$parts[] = ['missing' => ['field' => $attribute, 'existence' => true, 'null_value' => true]];
} else {
$parts[] = ['term' => [$attribute => $value]];
}
}
}
}
return count($parts) === 1 ? $parts[0] : ['and' => $parts];
}
private function buildAndCondition($operator, $operands)
{
$parts = [];
foreach ($operands as $operand) {
if (is_array($operand)) {
$operand = $this->buildCondition($operand);
}
if (!empty($operand)) {
$parts[] = $operand;
}
}
if (!empty($parts)) {
return [$operator => $parts];
} else {
return [];
}
}
private function buildBetweenCondition($operator, $operands)
{
if (!isset($operands[0], $operands[1], $operands[2])) {
throw new InvalidParamException("Operator '$operator' requires three operands.");
}
list($column, $value1, $value2) = $operands;
if ($column == ActiveRecord::PRIMARY_KEY_NAME) {
throw new NotSupportedException('Between condition is not supported for primaryKey.');
}
$filter = ['range' => [$column => ['gte' => $value1, 'lte' => $value2]]];
if ($operator == 'not between') {
$filter = ['not' => $filter];
}
return $filter;
}
private function buildInCondition($operator, $operands)
{
if (!isset($operands[0], $operands[1])) {
throw new InvalidParamException("Operator '$operator' requires two operands.");
}
list($column, $values) = $operands;
$values = (array)$values;
if (empty($values) || $column === []) {
return $operator === 'in' ? ['script' => ['script' => '0==1']] : [];
}
if (count($column) > 1) {
return $this->buildCompositeInCondition($operator, $column, $values, $params);
} elseif (is_array($column)) {
$column = reset($column);
}
$canBeNull = false;
foreach ($values as $i => $value) {
if (is_array($value)) {
$values[$i] = $value = isset($value[$column]) ? $value[$column] : null;
}
if ($value === null) {
$canBeNull = true;
unset($values[$i]);
}
}
if ($column == ActiveRecord::PRIMARY_KEY_NAME) {
if (empty($values) && $canBeNull) { // there is no null pk
$filter = ['script' => ['script' => '0==1']];
} else {
$filter = ['ids' => ['values' => array_values($values)]];
if ($canBeNull) {
$filter = ['or' => [$filter, ['missing' => ['field' => $column, 'existence' => true, 'null_value' => true]]]];
}
}
} else {
if (empty($values) && $canBeNull) {
$filter = ['missing' => ['field' => $column, 'existence' => true, 'null_value' => true]];
} else {
$filter = ['in' => [$column => array_values($values)]];
if ($canBeNull) {
$filter = ['or' => [$filter, ['missing' => ['field' => $column, 'existence' => true, 'null_value' => true]]]];
}
}
}
if ($operator == 'not in') {
$filter = ['not' => $filter];
}
return $filter;
}
protected function buildCompositeInCondition($operator, $columns, $values)
{
throw new NotSupportedException('composite in is not supported by elasticsearch.');
$vss = array();
foreach ($values as $value) {
$vs = array();
foreach ($columns as $column) {
if (isset($value[$column])) {
$phName = self::PARAM_PREFIX . count($params);
$params[$phName] = $value[$column];
$vs[] = $phName;
} else {
$vs[] = 'NULL';
}
}
$vss[] = '(' . implode(', ', $vs) . ')';
}
foreach ($columns as $i => $column) {
if (strpos($column, '(') === false) {
$columns[$i] = $this->db->quoteColumnName($column);
}
}
return '(' . implode(', ', $columns) . ") $operator (" . implode(', ', $vss) . ')';
}
private function buildLikeCondition($operator, $operands)
{
throw new NotSupportedException('like conditions is not supported by elasticsearch.');
if (!isset($operands[0], $operands[1])) {
throw new Exception("Operator '$operator' requires two operands.");
}
list($column, $values) = $operands;
$values = (array)$values;
if (empty($values)) {
return $operator === 'LIKE' || $operator === 'OR LIKE' ? '0==1' : '';
}
if ($operator === 'LIKE' || $operator === 'NOT LIKE') {
$andor = ' AND ';
} else {
$andor = ' OR ';
$operator = $operator === 'OR LIKE' ? 'LIKE' : 'NOT LIKE';
}
if (strpos($column, '(') === false) {
$column = $this->db->quoteColumnName($column);
}
$parts = array();
foreach ($values as $value) {
$phName = self::PARAM_PREFIX . count($params);
$params[$phName] = $value;
$parts[] = "$column $operator $phName";
}
return implode($andor, $parts);
}
}

148
extensions/elasticsearch/README.md

@ -0,0 +1,148 @@
Elasticsearch Query and ActiveRecord for Yii 2
==============================================
This extension provides the [elasticsearch](http://www.elasticsearch.org/) integration for the Yii2 framework.
It includes basic querying/search support and also implements the `ActiveRecord` pattern that allows you to store active
records in elasticsearch.
To use this extension, you have to configure the Connection class in your application configuration:
```php
return [
//....
'components' => [
'elasticsearch' => [
'class' => 'yii\elasticsearch\Connection',
'nodes' => [
['http_address' => '127.0.0.1:9200'],
// configure more hosts if you have a cluster
],
],
]
];
```
Installation
------------
The preferred way to install this extension is through [composer](http://getcomposer.org/download/).
Either run
```
php composer.phar require yiisoft/yii2-elasticsearch "*"
```
or add
```json
"yiisoft/yii2-elasticsearch": "*"
```
to the require section of your composer.json.
Using the Query
---------------
TBD
Using the ActiveRecord
----------------------
For general information on how to use yii's ActiveRecord please refer to the [guide](https://github.com/yiisoft/yii2/blob/master/docs/guide/active-record.md).
For defining an elasticsearch ActiveRecord class your record class needs to extend from `yii\elasticsearch\ActiveRecord` and
implement at least the `attributes()` method to define the attributes of the record.
The primary key (the `_id` field in elasticsearch terms) is represented by `getId()` and `setId()` and can not be changed.
The primary key is not part of the attributes.
primary key can be defined via [[primaryKey()]] which defaults to `id` if not specified.
The primaryKey needs to be part of the attributes so make sure you have an `id` attribute defined if you do
not specify your own primary key.
The following is an example model called `Customer`:
```php
class Customer extends \yii\elasticsearch\ActiveRecord
{
/**
* @return array the list of attributes for this record
*/
public function attributes()
{
return ['id', 'name', 'address', 'registration_date'];
}
/**
* @return ActiveRelation defines a relation to the Order record (can be in other database, e.g. redis or sql)
*/
public function getOrders()
{
return $this->hasMany(Order::className(), ['customer_id' => 'id'])->orderBy('id');
}
/**
* Defines a scope that modifies the `$query` to return only active(status = 1) customers
*/
public static function active($query)
{
$query->andWhere(array('status' => 1));
}
}
```
You may override [[index()]] and [[type()]] to define the index and type this record represents.
The general usage of elasticsearch ActiveRecord is very similar to the database ActiveRecord as described in the
[guide](https://github.com/yiisoft/yii2/blob/master/docs/guide/active-record.md).
It supports the same interface and features except the following limitations and additions(*!*):
- As elasticsearch does not support SQL, the query API does not support `join()`, `groupBy()`, `having()` and `union()`.
Sorting, limit, offset and conditional where are all supported.
- `from()` does not select the tables, but the [index](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/glossary.html#glossary-index)
and [type](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/glossary.html#glossary-type) to query against.
- `select()` has been replaced with `fields()` which basically does the same but `fields` is more elasticsearch terminology.
It defines the fields to retrieve from a document.
- `via`-relations can not be defined via a table as there are not tables in elasticsearch. You can only define relations via other records.
- As elasticsearch is a data storage and search engine there is of course support added for search your records.
There are `query()`, `filter()` and `addFacets()` methods that allows to compose an elasticsearch query.
See the usage example below on how they work and check out the [Query DSL](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl.html)
on how to compose `query` and `filter` parts.
- It is also possible to define relations from elasticsearch ActiveRecords to normal ActiveRecord classes and vice versa.
Elasticsearch separates primary key from attributes. You need to set the `id` property of the record to set its primary key.
Usage example:
```php
$customer = new Customer();
$customer->id = 1;
$customer->attributes = ['name' => 'test'];
$customer->save();
$customer = Customer::get(1); // get a record by pk
$customers = Customer::get([1,2,3]); // get a records multiple by pk
$customer = Customer::find()->where(['name' => 'test'])->one(); // find by query
$customers = Customer::find()->active()->all(); // find all by query (using the `active` scope)
// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-field-query.html
$result = Article::find()->query(["field" => ["title" => "yii"]])->all(); // articles whose title contains "yii"
// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-flt-query.html
$query = Article::find()->query([
"fuzzy_like_this" => [
"fields" => ["title", "description"],
"like_text" => "This query will return articles that are similar to this text :-)",
"max_query_terms" : 12
]
]);
$query->all(); // gives you all the documents
// you can add facets to your search:
$query->addStatisticalFacet('click_stats', ['field' => 'visit_count']);
$query->search(); // gives you all the records + stats about the visit_count field. e.g. mean, sum, min, max etc...
```
And there is so much more in it. "it’s endless what you can build"[¹](http://www.elasticsearch.org/)

28
extensions/elasticsearch/composer.json

@ -0,0 +1,28 @@
{
"name": "yiisoft/yii2-elasticsearch",
"description": "Elasticsearch integration and ActiveRecord for the Yii framework",
"keywords": ["yii", "elasticsearch", "active-record", "search", "fulltext"],
"type": "yii2-extension",
"license": "BSD-3-Clause",
"support": {
"issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Aelasticsearch",
"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": "Carsten Brandt",
"email": "mail@cebe.cc"
}
],
"require": {
"yiisoft/yii2": "*",
"ext-curl": "*"
},
"autoload": {
"psr-0": { "yii\\elasticsearch\\": "" }
},
"target-dir": "yii/elasticsearch"
}

4
extensions/gii/Generator.php

@ -63,7 +63,7 @@ abstract class Generator extends Model
abstract public function generate(); abstract public function generate();
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function init() public function init()
{ {
@ -164,7 +164,7 @@ abstract class Generator extends Model
} }
/** /**
* @inheritdoc * {@inheritdoc}
* *
* Child classes should override this method like the following so that the parent * Child classes should override this method like the following so that the parent
* rules are included: * rules are included:

8
extensions/gii/GiiAsset.php

@ -18,25 +18,25 @@ use yii\web\AssetBundle;
class GiiAsset extends AssetBundle class GiiAsset extends AssetBundle
{ {
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public $sourcePath = '@yii/gii/assets'; public $sourcePath = '@yii/gii/assets';
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public $css = [ public $css = [
'main.css', 'main.css',
'typeahead.js-bootstrap.css', 'typeahead.js-bootstrap.css',
]; ];
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public $js = [ public $js = [
'gii.js', 'gii.js',
'typeahead.js', 'typeahead.js',
]; ];
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public $depends = [ public $depends = [
'yii\web\YiiAsset', 'yii\web\YiiAsset',

6
extensions/gii/Module.php

@ -54,7 +54,7 @@ use yii\web\HttpException;
class Module extends \yii\base\Module class Module extends \yii\base\Module
{ {
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public $controllerNamespace = 'yii\gii\controllers'; public $controllerNamespace = 'yii\gii\controllers';
/** /**
@ -92,7 +92,7 @@ class Module extends \yii\base\Module
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function init() public function init()
{ {
@ -103,7 +103,7 @@ class Module extends \yii\base\Module
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function beforeAction($action) public function beforeAction($action)
{ {

2
extensions/gii/composer.json

@ -5,7 +5,7 @@
"type": "yii2-extension", "type": "yii2-extension",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"support": { "support": {
"issues": "https://github.com/yiisoft/yii2/issues?state=open", "issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Agii",
"forum": "http://www.yiiframework.com/forum/", "forum": "http://www.yiiframework.com/forum/",
"wiki": "http://www.yiiframework.com/wiki/", "wiki": "http://www.yiiframework.com/wiki/",
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",

20
extensions/gii/generators/controller/Generator.php

@ -38,7 +38,7 @@ class Generator extends \yii\gii\Generator
public $actions = 'index'; public $actions = 'index';
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function init() public function init()
{ {
@ -47,7 +47,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getName() public function getName()
{ {
@ -55,7 +55,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getDescription() public function getDescription()
{ {
@ -64,7 +64,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function rules() public function rules()
{ {
@ -79,7 +79,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function attributeLabels() public function attributeLabels()
{ {
@ -92,7 +92,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function requiredTemplates() public function requiredTemplates()
{ {
@ -103,7 +103,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function stickyAttributes() public function stickyAttributes()
{ {
@ -111,7 +111,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function hints() public function hints()
{ {
@ -134,7 +134,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function successMessage() public function successMessage()
{ {
@ -149,7 +149,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function generate() public function generate()
{ {

6
extensions/gii/generators/crud/Generator.php

@ -69,7 +69,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function hints() public function hints()
{ {
@ -95,7 +95,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function stickyAttributes() public function stickyAttributes()
{ {
@ -123,7 +123,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function generate() public function generate()
{ {

2
extensions/gii/generators/crud/templates/search.php

@ -40,7 +40,7 @@ class <?= $searchModelClass ?> extends Model
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function attributeLabels() public function attributeLabels()
{ {

18
extensions/gii/generators/form/Generator.php

@ -26,7 +26,7 @@ class Generator extends \yii\gii\Generator
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getName() public function getName()
{ {
@ -34,7 +34,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getDescription() public function getDescription()
{ {
@ -42,7 +42,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function generate() public function generate()
{ {
@ -55,7 +55,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function rules() public function rules()
{ {
@ -72,7 +72,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function attributeLabels() public function attributeLabels()
{ {
@ -85,7 +85,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function requiredTemplates() public function requiredTemplates()
{ {
@ -93,7 +93,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function stickyAttributes() public function stickyAttributes()
{ {
@ -101,7 +101,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function hints() public function hints()
{ {
@ -114,7 +114,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function successMessage() public function successMessage()
{ {

18
extensions/gii/generators/model/Generator.php

@ -32,7 +32,7 @@ class Generator extends \yii\gii\Generator
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getName() public function getName()
{ {
@ -40,7 +40,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getDescription() public function getDescription()
{ {
@ -48,7 +48,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function rules() public function rules()
{ {
@ -68,7 +68,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function attributeLabels() public function attributeLabels()
{ {
@ -84,7 +84,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function hints() public function hints()
{ {
@ -111,7 +111,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function autoCompleteData() public function autoCompleteData()
{ {
@ -128,7 +128,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function requiredTemplates() public function requiredTemplates()
{ {
@ -136,7 +136,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function stickyAttributes() public function stickyAttributes()
{ {
@ -144,7 +144,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function generate() public function generate()
{ {

6
extensions/gii/generators/model/templates/model.php

@ -33,7 +33,7 @@ namespace <?= $generator->ns ?>;
class <?= $className ?> extends <?= '\\' . ltrim($generator->baseClass, '\\') . "\n" ?> class <?= $className ?> extends <?= '\\' . ltrim($generator->baseClass, '\\') . "\n" ?>
{ {
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public static function tableName() public static function tableName()
{ {
@ -41,7 +41,7 @@ class <?= $className ?> extends <?= '\\' . ltrim($generator->baseClass, '\\') .
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function rules() public function rules()
{ {
@ -49,7 +49,7 @@ class <?= $className ?> extends <?= '\\' . ltrim($generator->baseClass, '\\') .
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function attributeLabels() public function attributeLabels()
{ {

16
extensions/gii/generators/module/Generator.php

@ -24,7 +24,7 @@ class Generator extends \yii\gii\Generator
public $moduleID; public $moduleID;
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getName() public function getName()
{ {
@ -32,7 +32,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getDescription() public function getDescription()
{ {
@ -40,7 +40,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function rules() public function rules()
{ {
@ -54,7 +54,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function attributeLabels() public function attributeLabels()
{ {
@ -65,7 +65,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function hints() public function hints()
{ {
@ -76,7 +76,7 @@ class Generator extends \yii\gii\Generator
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function successMessage() public function successMessage()
{ {
@ -104,7 +104,7 @@ EOD;
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function requiredTemplates() public function requiredTemplates()
{ {
@ -112,7 +112,7 @@ EOD;
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function generate() public function generate()
{ {

10
extensions/gii/views/layouts/main.php

@ -9,16 +9,16 @@ use yii\helpers\Html;
*/ */
$asset = yii\gii\GiiAsset::register($this); $asset = yii\gii\GiiAsset::register($this);
?> ?>
<?php $this->beginPage(); ?> <?php $this->beginPage() ?>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<title><?= Html::encode($this->title) ?></title> <title><?= Html::encode($this->title) ?></title>
<?php $this->head(); ?> <?php $this->head() ?>
</head> </head>
<body> <body>
<?php $this->beginBody(); ?> <?php $this->beginBody() ?>
<?php <?php
NavBar::begin([ NavBar::begin([
'brandLabel' => Html::img($asset->baseUrl . '/logo.png'), 'brandLabel' => Html::img($asset->baseUrl . '/logo.png'),
@ -47,7 +47,7 @@ NavBar::end();
</div> </div>
</footer> </footer>
<?php $this->endBody(); ?> <?php $this->endBody() ?>
</body> </body>
</html> </html>
<?php $this->endPage(); ?> <?php $this->endPage() ?>

2
extensions/jui/composer.json

@ -5,7 +5,7 @@
"type": "yii2-extension", "type": "yii2-extension",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"support": { "support": {
"issues": "https://github.com/yiisoft/yii2/issues?state=open", "issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Ajui",
"forum": "http://www.yiiframework.com/forum/", "forum": "http://www.yiiframework.com/forum/",
"wiki": "http://www.yiiframework.com/wiki/", "wiki": "http://www.yiiframework.com/wiki/",
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",

2
extensions/redis/ActiveQuery.php

@ -226,7 +226,7 @@ class ActiveQuery extends \yii\base\Component implements ActiveQueryInterface
{ {
$record = $this->one($db); $record = $this->one($db);
if ($record !== null) { if ($record !== null) {
return $record->$attribute; return $record->hasAttribute($attribute) ? $record->$attribute : null;
} else { } else {
return null; return null;
} }

16
extensions/redis/ActiveRecord.php

@ -48,7 +48,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
} }
/** /**
* @inheritDoc * {@inheritdoc}
*/ */
public static function createQuery() public static function createQuery()
{ {
@ -56,7 +56,7 @@ class ActiveRecord extends \yii\db\ActiveRecord
} }
/** /**
* @inheritDoc * {@inheritdoc}
*/ */
public static function createActiveRelation($config = []) public static function createActiveRelation($config = [])
{ {
@ -81,13 +81,13 @@ class ActiveRecord extends \yii\db\ActiveRecord
* This method must be overridden by child classes to define available attributes. * This method must be overridden by child classes to define available attributes.
* @return array list of attribute names. * @return array list of attribute names.
*/ */
public static function attributes() public function attributes()
{ {
throw new InvalidConfigException('The attributes() method of redis ActiveRecord has to be implemented by child classes.'); throw new InvalidConfigException('The attributes() method of redis ActiveRecord has to be implemented by child classes.');
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
public function insert($runValidation = true, $attributes = null) public function insert($runValidation = true, $attributes = null)
{ {
@ -294,19 +294,19 @@ class ActiveRecord extends \yii\db\ActiveRecord
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public static function getTableSchema() public static function getTableSchema()
{ {
throw new NotSupportedException('getTableSchema() is not supported by redis ActiveRecord'); throw new NotSupportedException('getTableSchema() is not supported by redis ActiveRecord.');
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public static function findBySql($sql, $params = []) public static function findBySql($sql, $params = [])
{ {
throw new NotSupportedException('findBySql() is not supported by redis ActiveRecord'); throw new NotSupportedException('findBySql() is not supported by redis ActiveRecord.');
} }
/** /**

45
extensions/redis/Cache.php

@ -30,18 +30,28 @@ use yii\base\InvalidConfigException;
* 'components' => [ * 'components' => [
* 'cache' => [ * 'cache' => [
* 'class' => 'yii\redis\Cache', * 'class' => 'yii\redis\Cache',
* ],
* 'redis' => [ * 'redis' => [
* 'class' => 'yii\redis\Connection',
* 'hostname' => 'localhost', * 'hostname' => 'localhost',
* 'port' => 6379, * 'port' => 6379,
* 'database' => 0, * 'database' => 0,
* ] * ]
* ], * ],
* ],
* ] * ]
* ~~~ * ~~~
* *
* @property Connection $connection The redis connection object. This property is read-only. * Or if you have configured the redis [[Connection]] as an application component, the following is sufficient:
*
* ~~~
* [
* 'components' => [
* 'cache' => [
* 'class' => 'yii\redis\Cache',
* // 'redis' => 'redis' // id of the connection application component
* ],
* ],
* ]
* ~~~
* *
* @author Carsten Brandt <mail@cebe.cc> * @author Carsten Brandt <mail@cebe.cc>
* @since 2.0 * @since 2.0
@ -49,7 +59,9 @@ use yii\base\InvalidConfigException;
class Cache extends \yii\caching\Cache class Cache extends \yii\caching\Cache
{ {
/** /**
* @var Connection|string the Redis [[Connection]] object or the application component ID of the Redis [[Connection]]. * @var Connection|string|array the Redis [[Connection]] object or the application component ID of the Redis [[Connection]].
* This can also be an array that is used to create a redis [[Connection]] instance in case you do not want do configure
* redis connection as an application component.
* After the Cache object is created, if you want to change this property, you should only assign it * After the Cache object is created, if you want to change this property, you should only assign it
* with a Redis [[Connection]] object. * with a Redis [[Connection]] object.
*/ */
@ -57,15 +69,20 @@ class Cache extends \yii\caching\Cache
/** /**
* Initializes the DbCache component. * Initializes the redis Cache component.
* This method will initialize the [[db]] property to make sure it refers to a valid DB connection. * This method will initialize the [[redis]] property to make sure it refers to a valid redis connection.
* @throws InvalidConfigException if [[db]] is invalid. * @throws InvalidConfigException if [[redis]] is invalid.
*/ */
public function init() public function init()
{ {
parent::init(); parent::init();
if (is_string($this->redis)) { if (is_string($this->redis)) {
$this->redis = Yii::$app->getComponent($this->redis); $this->redis = Yii::$app->getComponent($this->redis);
} else if (is_array($this->redis)) {
if (!isset($this->redis['class'])) {
$this->redis['class'] = Connection::className();
}
$this->redis = Yii::createObject($this->redis);
} }
if (!$this->redis instanceof Connection) { if (!$this->redis instanceof Connection) {
throw new InvalidConfigException("Cache::redis must be either a Redis connection instance or the application component ID of a Redis connection."); throw new InvalidConfigException("Cache::redis must be either a Redis connection instance or the application component ID of a Redis connection.");
@ -88,7 +105,7 @@ class Cache extends \yii\caching\Cache
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
protected function getValue($key) protected function getValue($key)
{ {
@ -96,7 +113,7 @@ class Cache extends \yii\caching\Cache
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
protected function getValues($keys) protected function getValues($keys)
{ {
@ -110,7 +127,7 @@ class Cache extends \yii\caching\Cache
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
protected function setValue($key, $value, $expire) protected function setValue($key, $value, $expire)
{ {
@ -123,7 +140,7 @@ class Cache extends \yii\caching\Cache
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
protected function setValues($data, $expire) protected function setValues($data, $expire)
{ {
@ -157,7 +174,7 @@ class Cache extends \yii\caching\Cache
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
protected function addValue($key, $value, $expire) protected function addValue($key, $value, $expire)
{ {
@ -170,7 +187,7 @@ class Cache extends \yii\caching\Cache
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
protected function deleteValue($key) protected function deleteValue($key)
{ {
@ -178,7 +195,7 @@ class Cache extends \yii\caching\Cache
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
protected function flushValues() protected function flushValues()
{ {

125
extensions/redis/README.md

@ -1,9 +1,9 @@
Redis Cache and ActiveRecord for Yii 2 Redis Cache, Session and ActiveRecord for Yii 2
====================================== ===============================================
This extension provides the [redis](http://redis.io/) key-value store support for the Yii2 framework. This extension provides the [redis](http://redis.io/) key-value store support for the Yii2 framework.
It includes a `Cache` class and implents the `ActiveRecord` pattern that allows you to store active It includes a `Cache` and `Session` storage handler and implents the `ActiveRecord` pattern that allows
records in redis. you to store active records in redis.
To use this extension, you have to configure the Connection class in your application configuration: To use this extension, you have to configure the Connection class in your application configuration:
@ -21,7 +21,31 @@ return [
]; ];
``` ```
To use the `Cache` component, you also have to configure the `cache` component to be `yii\redis\Cache`: Installation
------------
The preferred way to install this extension is through [composer](http://getcomposer.org/download/).
Either run
```
php composer.phar require yiisoft/yii2-redis "*"
```
or add
```json
"yiisoft/yii2-redis": "*"
```
to the require section of your composer.json.
Using the Cache component
-------------------------
To use the `Cache` component, in addtition to configuring the connection as described above,
you also have to configure the `cache` component to be `yii\redis\Cache`:
```php ```php
return [ return [
@ -35,26 +59,64 @@ return [
]; ];
``` ```
If you only use the redis cache, you can also configure the parameters of the connection within the
cache component (no connection application component needs to be configured in this case):
Installation ```php
------------ return [
//....
'components' => [
// ...
'cache' => [
'class' => 'yii\redis\Cache',
'redis' => [
'hostname' => 'localhost',
'port' => 6379,
'database' => 0,
],
],
]
];
```
The preferred way to install this extension is through [composer](http://getcomposer.org/download/). Using the Session component
---------------------------
Either run To use the `Session` component, in addtition to configuring the connection as described above,
you also have to configure the `session` component to be `yii\redis\Session`:
``` ```php
php composer.phar require yiisoft/yii2-redis "*" return [
//....
'components' => [
// ...
'session' => [
'class' => 'yii\redis\Session',
],
]
];
``` ```
or add If you only use the redis session, you can also configure the parameters of the connection within the
cache component (no connection application component needs to be configured in this case):
```json ```php
"yiisoft/yii2-redis": "*" return [
//....
'components' => [
// ...
'session' => [
'class' => 'yii\redis\Session',
'redis' => [
'hostname' => 'localhost',
'port' => 6379,
'database' => 0,
],
],
]
];
``` ```
to the require section of your composer.json.
Using the redis ActiveRecord Using the redis ActiveRecord
---------------------------- ----------------------------
@ -72,10 +134,29 @@ The following is an example model called `Customer`:
```php ```php
class Customer extends \yii\redis\ActiveRecord class Customer extends \yii\redis\ActiveRecord
{ {
/**
* @return array the list of attributes for this record
*/
public function attributes() public function attributes()
{ {
return ['id', 'name', 'address', 'registration_date']; return ['id', 'name', 'address', 'registration_date'];
} }
/**
* @return ActiveRelation defines a relation to the Order record (can be in other database, e.g. elasticsearch or sql)
*/
public function getOrders()
{
return $this->hasMany(Order::className(), ['customer_id' => 'id']);
}
/**
* Defines a scope that modifies the `$query` to return only active(status = 1) customers
*/
public static function active($query)
{
$query->andWhere(array('status' => 1));
}
} }
``` ```
@ -89,3 +170,15 @@ It supports the same interface and features except the following limitations:
- `via`-relations can not be defined via a table as there are not tables in redis. You can only define relations via other records. - `via`-relations can not be defined via a table as there are not tables in redis. You can only define relations via other records.
It is also possible to define relations from redis ActiveRecords to normal ActiveRecord classes and vice versa. It is also possible to define relations from redis ActiveRecords to normal ActiveRecord classes and vice versa.
Usage example:
```php
$customer = new Customer();
$customer->attributes = ['name' => 'test'];
$customer->save();
echo $customer->id; // id will automatically be incremented if not set explicitly
$customer = Customer::find()->where(['name' => 'test'])->one(); // find by query
$customer = Customer::find()->active()->all(); // find all by query (using the `active` scope)
```

157
extensions/redis/Session.php

@ -0,0 +1,157 @@
<?php
/**
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
namespace yii\redis;
use Yii;
use yii\base\InvalidConfigException;
/**
* Redis Session implements a session component using [redis](http://redis.io/) as the storage medium.
*
* Redis Session requires redis version 2.6.12 or higher to work properly.
*
* It needs to be configured with a redis [[Connection]] that is also configured as an application component.
* By default it will use the `redis` application component.
*
* To use redis Session as the session application component, configure the application as follows,
*
* ~~~
* [
* 'components' => [
* 'session' => [
* 'class' => 'yii\redis\Session',
* 'redis' => [
* 'hostname' => 'localhost',
* 'port' => 6379,
* 'database' => 0,
* ]
* ],
* ],
* ]
* ~~~
*
* Or if you have configured the redis [[Connection]] as an application component, the following is sufficient:
*
* ~~~
* [
* 'components' => [
* 'session' => [
* 'class' => 'yii\redis\Session',
* // 'redis' => 'redis' // id of the connection application component
* ],
* ],
* ]
* ~~~
*
* @property boolean $useCustomStorage Whether to use custom storage. This property is read-only.
*
* @author Carsten Brandt <mail@cebe.cc>
* @since 2.0
*/
class Session extends \yii\web\Session
{
/**
* @var Connection|string|array the Redis [[Connection]] object or the application component ID of the Redis [[Connection]].
* This can also be an array that is used to create a redis [[Connection]] instance in case you do not want do configure
* redis connection as an application component.
* After the Session object is created, if you want to change this property, you should only assign it
* with a Redis [[Connection]] object.
*/
public $redis = 'redis';
/**
* @var string a string prefixed to every cache key so that it is unique. If not set,
* it will use a prefix generated from [[Application::id]]. You may set this property to be an empty string
* if you don't want to use key prefix. It is recommended that you explicitly set this property to some
* static value if the cached data needs to be shared among multiple applications.
*
* To ensure interoperability, only alphanumeric characters should be used.
*/
public $keyPrefix;
/**
* Initializes the redis Session component.
* This method will initialize the [[redis]] property to make sure it refers to a valid redis connection.
* @throws InvalidConfigException if [[redis]] is invalid.
*/
public function init()
{
if (is_string($this->redis)) {
$this->redis = Yii::$app->getComponent($this->redis);
} else if (is_array($this->redis)) {
if (!isset($this->redis['class'])) {
$this->redis['class'] = Connection::className();
}
$this->redis = Yii::createObject($this->redis);
}
if (!$this->redis instanceof Connection) {
throw new InvalidConfigException("Session::redis must be either a Redis connection instance or the application component ID of a Redis connection.");
}
if ($this->keyPrefix === null) {
$this->keyPrefix = substr(md5(Yii::$app->id), 0, 5);
} elseif (!ctype_alnum($this->keyPrefix)) {
throw new InvalidConfigException(get_class($this) . '::keyPrefix should only contain alphanumeric characters.');
}
parent::init();
}
/**
* Returns a value indicating whether to use custom session storage.
* This method overrides the parent implementation and always returns true.
* @return boolean whether to use custom storage.
*/
public function getUseCustomStorage()
{
return true;
}
/**
* Session read handler.
* Do not call this method directly.
* @param string $id session ID
* @return string the session data
*/
public function readSession($id)
{
$data = $this->redis->executeCommand('GET', [$this->calculateKey($id)]);
return $data === false ? '' : $data;
}
/**
* Session write handler.
* Do not call this method directly.
* @param string $id session ID
* @param string $data session data
* @return boolean whether session write is successful
*/
public function writeSession($id, $data)
{
return (bool) $this->redis->executeCommand('SET', [$this->calculateKey($id), $data, 'EX', $this->getTimeout()]);
}
/**
* Session destroy handler.
* Do not call this method directly.
* @param string $id session ID
* @return boolean whether session is destroyed successfully
*/
public function destroySession($id)
{
return (bool) $this->redis->executeCommand('DEL', [$this->calculateKey($id)]);
}
/**
* Generates a unique key used for storing session data in cache.
* @param string $id session variable name
* @return string a safe cache key associated with the session variable name
*/
protected function calculateKey($id)
{
return $this->keyPrefix . md5(json_encode([__CLASS__, $id]));
}
}

4
extensions/redis/composer.json

@ -1,7 +1,7 @@
{ {
"name": "yiisoft/yii2-redis", "name": "yiisoft/yii2-redis",
"description": "Redis Cache and ActiveRecord for the Yii framework", "description": "Redis Cache, Session and ActiveRecord for the Yii framework",
"keywords": ["yii", "redis", "active-record", "cache"], "keywords": ["yii", "redis", "active-record", "cache", "session"],
"type": "yii2-extension", "type": "yii2-extension",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"support": { "support": {

2
extensions/smarty/composer.json

@ -5,7 +5,7 @@
"type": "yii2-extension", "type": "yii2-extension",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"support": { "support": {
"issues": "https://github.com/yiisoft/yii2/issues?state=open", "issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Asmarty",
"forum": "http://www.yiiframework.com/forum/", "forum": "http://www.yiiframework.com/forum/",
"wiki": "http://www.yiiframework.com/wiki/", "wiki": "http://www.yiiframework.com/wiki/",
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",

2
extensions/sphinx/ActiveQuery.php

@ -176,7 +176,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
protected function defaultConnection() protected function defaultConnection()
{ {

93
extensions/sphinx/ActiveRecord.php

@ -26,11 +26,16 @@ use Yii;
* read-only. * read-only.
* @property boolean $isNewRecord Whether the record is new and should be inserted when calling [[save()]]. * @property boolean $isNewRecord Whether the record is new and should be inserted when calling [[save()]].
* @property array $oldAttributes The old attribute values (name-value pairs). * @property array $oldAttributes The old attribute values (name-value pairs).
* @property integer $oldPrimaryKey The old primary key value. This property is read-only. * @property mixed $oldPrimaryKey The old primary key value. An array (column name => column value) is
* returned if the primary key is composite. A string is returned otherwise (null will be returned if the key
* value is null). This property is read-only.
* @property array $populatedRelations An array of relation data indexed by relation names. This property is * @property array $populatedRelations An array of relation data indexed by relation names. This property is
* read-only. * read-only.
* @property integer $primaryKey The primary key value. This property is read-only. * @property mixed $primaryKey The primary key value. An array (column name => column value) is returned if
* @property string $snippet current snippet value for this Active Record instance.. * the primary key is composite. A string is returned otherwise (null will be returned if the key value is null).
* This property is read-only.
* @property string $snippet Snippet value.
* @property string $snippetSource Snippet source string. This property is read-only.
* *
* @author Paul Klimov <klimov.paul@gmail.com> * @author Paul Klimov <klimov.paul@gmail.com>
* @since 2.0 * @since 2.0
@ -421,7 +426,7 @@ abstract class ActiveRecord extends Model
* 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.
* @param string $name property name * @param string $name property name
* @return mixed property value * @return mixed property value
* @see getAttribute * @see getAttribute()
*/ */
public function __get($name) public function __get($name)
{ {
@ -493,7 +498,7 @@ abstract class ActiveRecord extends Model
/** /**
* Declares a `has-one` relation. * Declares a `has-one` relation.
* The declaration is returned in terms of an [[ActiveRelationInterface]] instance * The declaration is returned in terms of an [[ActiveRelation]] instance
* through which the related record can be queried and retrieved back. * through which the related record can be queried and retrieved back.
* *
* A `has-one` relation means that there is at most one related record matching * A `has-one` relation means that there is at most one related record matching
@ -513,21 +518,18 @@ abstract class ActiveRecord extends Model
* in the related class `ArticleContent`, while the 'id' value refers to an attribute name * in the related class `ArticleContent`, while the 'id' value refers to an attribute name
* in the current AR class. * in the current AR class.
* *
* @param string $type relation type or class name. * Call methods declared in [[ActiveRelation]] to further customize the relation.
* - if value contains backslash ("\"), it is treated as full active relation class name, *
* for example: "app\mydb\ActiveRelation"
* - if value does not contain backslash ("\"), the active relation class name will be composed
* by pattern: "yii\{type}\ActiveRelation", for example: type "db" refers "yii\db\ActiveRelation",
* type "sphinx" - "yii\sphinx\ActiveRelation"
* @param string $class the class name of the related record * @param string $class the class name of the related record
* @param array $link the primary-foreign key constraint. The keys of the array refer to * @param array $link the primary-foreign key constraint. The keys of the array refer to
* the attributes in the `$class` model, while the values of the array refer to the corresponding * the attributes in the `$class` model, while the values of the array refer to the corresponding
* attributes in the index associated with this AR class. * attributes in the index associated with this AR class.
* @return ActiveRelationInterface the relation object. * @return ActiveRelationInterface the relation object.
*/ */
public function hasOne($type, $class, $link) public function hasOne($class, $link)
{ {
return $this->createActiveRelation($type, [ /** @var ActiveRecord $class */
return $class::createActiveRelation([
'modelClass' => $class, 'modelClass' => $class,
'primaryModel' => $this, 'primaryModel' => $this,
'link' => $link, 'link' => $link,
@ -557,21 +559,16 @@ abstract class ActiveRecord extends Model
* an attribute name in the related class `Tag`, while the 'tag_id' value refers to * an attribute name in the related class `Tag`, while the 'tag_id' value refers to
* a multi value attribute name in the current AR class. * a multi value attribute name in the current AR class.
* *
* @param string $type relation type or class name.
* - if value contains backslash ("\"), it is treated as full active relation class name,
* for example: "app\mydb\ActiveRelation"
* - if value does not contain backslash ("\"), the active relation class name will be composed
* by pattern: "yii\{type}\ActiveRelation", for example: type "db" refers "yii\db\ActiveRelation",
* type "sphinx" - "yii\sphinx\ActiveRelation"
* @param string $class the class name of the related record * @param string $class the class name of the related record
* @param array $link the primary-foreign key constraint. The keys of the array refer to * @param array $link the primary-foreign key constraint. The keys of the array refer to
* the columns in the table associated with the `$class` model, while the values of the * the columns in the table associated with the `$class` model, while the values of the
* array refer to the corresponding columns in the table associated with this AR class. * array refer to the corresponding columns in the table associated with this AR class.
* @return ActiveRelationInterface the relation object. * @return ActiveRelationInterface the relation object.
*/ */
public function hasMany($type, $class, $link) public function hasMany($class, $link)
{ {
return $this->createActiveRelation($type, [ /** @var ActiveRecord $class */
return $class::createActiveRelation([
'modelClass' => $class, 'modelClass' => $class,
'primaryModel' => $this, 'primaryModel' => $this,
'link' => $link, 'link' => $link,
@ -583,19 +580,12 @@ abstract class ActiveRecord extends Model
* Creates an [[ActiveRelationInterface]] instance. * Creates an [[ActiveRelationInterface]] instance.
* This method is called by [[hasOne()]] and [[hasMany()]] to create a relation instance. * This method is called by [[hasOne()]] and [[hasMany()]] to create a relation instance.
* You may override this method to return a customized relation. * You may override this method to return a customized relation.
* @param string $type relation type or class name.
* @param array $config the configuration passed to the ActiveRelation class. * @param array $config the configuration passed to the ActiveRelation class.
* @return ActiveRelationInterface the newly created [[ActiveRelation]] instance. * @return ActiveRelationInterface the newly created [[ActiveRelation]] instance.
*/ */
protected function createActiveRelation($type, $config = []) public static function createActiveRelation($config = [])
{ {
if (strpos($type, '\\') === false) { return new ActiveRelation($config);
$class = "yii\\{$type}\\ActiveRelation";
} else {
$class = $type;
}
$config['class'] = $class;
return Yii::createObject($config);
} }
/** /**
@ -635,7 +625,7 @@ abstract class ActiveRecord extends Model
*/ */
public function attributes() public function attributes()
{ {
return array_keys($this->getIndexSchema()->columns); return array_keys(static::getIndexSchema()->columns);
} }
/** /**
@ -645,7 +635,7 @@ abstract class ActiveRecord extends Model
*/ */
public function hasAttribute($name) public function hasAttribute($name)
{ {
return isset($this->_attributes[$name]) || isset($this->getIndexSchema()->columns[$name]); return isset($this->_attributes[$name]) || in_array($name, $this->attributes());
} }
/** /**
@ -654,7 +644,7 @@ abstract class ActiveRecord extends Model
* null will be returned. * null will be returned.
* @param string $name the attribute name * @param string $name the attribute name
* @return mixed the attribute value. Null if the attribute is not set or does not exist. * @return mixed the attribute value. Null if the attribute is not set or does not exist.
* @see hasAttribute * @see hasAttribute()
*/ */
public function getAttribute($name) public function getAttribute($name)
{ {
@ -666,7 +656,7 @@ abstract class ActiveRecord extends Model
* @param string $name the attribute name * @param string $name the attribute name
* @param mixed $value the attribute value. * @param mixed $value the attribute value.
* @throws InvalidParamException if the named attribute does not exist. * @throws InvalidParamException if the named attribute does not exist.
* @see hasAttribute * @see hasAttribute()
*/ */
public function setAttribute($name, $value) public function setAttribute($name, $value)
{ {
@ -703,7 +693,7 @@ abstract class ActiveRecord extends Model
* @param string $name the attribute name * @param string $name the attribute name
* @return mixed the old attribute value. Null if the attribute is not loaded before * @return mixed the old attribute value. Null if the attribute is not loaded before
* or does not exist. * or does not exist.
* @see hasAttribute * @see hasAttribute()
*/ */
public function getOldAttribute($name) public function getOldAttribute($name)
{ {
@ -715,7 +705,7 @@ abstract class ActiveRecord extends Model
* @param string $name the attribute name * @param string $name the attribute name
* @param mixed $value the old attribute value. * @param mixed $value the old attribute value.
* @throws InvalidParamException if the named attribute does not exist. * @throws InvalidParamException if the named attribute does not exist.
* @see hasAttribute * @see hasAttribute()
*/ */
public function setOldAttribute($name, $value) public function setOldAttribute($name, $value)
{ {
@ -1091,7 +1081,7 @@ abstract class ActiveRecord extends Model
/** /**
* Sets the value indicating whether the record is new. * Sets the value indicating whether the record is new.
* @param boolean $value whether the record is new and should be inserted when calling [[save()]]. * @param boolean $value whether the record is new and should be inserted when calling [[save()]].
* @see getIsNewRecord * @see getIsNewRecord()
*/ */
public function setIsNewRecord($value) public function setIsNewRecord($value)
{ {
@ -1215,7 +1205,7 @@ abstract class ActiveRecord extends Model
return false; return false;
} }
foreach ($this->attributes() as $name) { foreach ($this->attributes() as $name) {
$this->_attributes[$name] = $record->_attributes[$name]; $this->_attributes[$name] = isset($record->_attributes[$name]) ? $record->_attributes[$name] : null;
} }
$this->_oldAttributes = $this->_attributes; $this->_oldAttributes = $this->_attributes;
$this->_related = []; $this->_related = [];
@ -1225,20 +1215,28 @@ abstract class ActiveRecord extends Model
/** /**
* Returns a value indicating whether the given active record is the same as the current one. * Returns a value indicating whether the given active record is the same as the current one.
* The comparison is made by comparing the index names and the primary key values of the two active records. * The comparison is made by comparing the index names and the primary key values of the two active records.
* If one of the records [[isNewRecord|is new]] they are also considered not equal.
* @param ActiveRecord $record record to compare to * @param ActiveRecord $record record to compare to
* @return boolean whether the two active records refer to the same row in the same index. * @return boolean whether the two active records refer to the same row in the same index.
*/ */
public function equals($record) public function equals($record)
{ {
if ($this->isNewRecord || $record->isNewRecord) {
return false;
}
return $this->indexName() === $record->indexName() && $this->getPrimaryKey() === $record->getPrimaryKey(); return $this->indexName() === $record->indexName() && $this->getPrimaryKey() === $record->getPrimaryKey();
} }
/** /**
* Returns the primary key value. * Returns the primary key value(s).
* @param boolean $asArray whether to return the primary key value as an array. If true, * @param boolean $asArray whether to return the primary key value as an array. If true,
* the return value will be an array with column names as keys and column values as values. * the return value will be an array with column names as keys and column values as values.
* @return mixed the primary key value. An array (column name => column value) is returned * Note that for composite primary keys, an array will always be returned regardless of this parameter value.
* if `$asArray` is true. A string is returned otherwise (null will be returned if * @property mixed The primary key value. An array (column name => column value) is returned if
* the primary key is composite. A string is returned otherwise (null will be returned if
* the key value is null).
* @return mixed the primary key value. An array (column name => column value) is returned if the primary key
* is composite or `$asArray` is true. A string is returned otherwise (null will be returned if
* the key value is null). * the key value is null).
*/ */
public function getPrimaryKey($asArray = false) public function getPrimaryKey($asArray = false)
@ -1256,15 +1254,18 @@ abstract class ActiveRecord extends Model
} }
/** /**
* Returns the old primary key value. * Returns the old primary key value(s).
* This refers to the primary key value that is populated into the record * This refers to the primary key value that is populated into the record
* after executing a find method (e.g. find(), findAll()). * after executing a find method (e.g. find(), findAll()).
* The value remains unchanged even if the primary key attribute is manually assigned with a different value. * The value remains unchanged even if the primary key attribute is manually assigned with a different value.
* @param boolean $asArray whether to return the primary key value as an array. If true, * @param boolean $asArray whether to return the primary key value as an array. If true,
* the return value will be an array with column name as key and column value as value. * the return value will be an array with column name as key and column value as value.
* If this is false (default), a scalar value will be returned. * If this is false (default), a scalar value will be returned for non-composite primary key.
* @return mixed the old primary key value. An array (column name => column value) is returned if * @property mixed The old primary key value. An array (column name => column value) is
* `$asArray` is true. A string is returned otherwise (null will be returned if * returned if the primary key is composite. A string is returned otherwise (null will be
* returned if the key value is null).
* @return mixed the old primary key value. An array (column name => column value) is returned if the primary key
* is composite or `$asArray` is true. A string is returned otherwise (null will be returned if
* the key value is null). * the key value is null).
*/ */
public function getOldPrimaryKey($asArray = false) public function getOldPrimaryKey($asArray = false)
@ -1348,7 +1349,7 @@ abstract class ActiveRecord extends Model
if ($relation instanceof ActiveRelationInterface) { if ($relation instanceof ActiveRelationInterface) {
return $relation; return $relation;
} else { } else {
return null; throw new InvalidParamException(get_class($this) . ' has no relation named "' . $name . '".');
} }
} catch (UnknownMethodException $e) { } catch (UnknownMethodException $e) {
throw new InvalidParamException(get_class($this) . ' has no relation named "' . $name . '".', 0, $e); throw new InvalidParamException(get_class($this) . ' has no relation named "' . $name . '".', 0, $e);

39
extensions/sphinx/Command.php

@ -39,14 +39,17 @@ use yii\base\NotSupportedException;
* *
* To build SELECT SQL statements, please use [[Query]] and [[QueryBuilder]] instead. * To build SELECT SQL statements, please use [[Query]] and [[QueryBuilder]] instead.
* *
* @property \yii\sphinx\Connection $db the Sphinx connection that this command is associated with.
*
* @author Paul Klimov <klimov.paul@gmail.com> * @author Paul Klimov <klimov.paul@gmail.com>
* @since 2.0 * @since 2.0
*/ */
class Command extends \yii\db\Command class Command extends \yii\db\Command
{ {
/** /**
* @var \yii\sphinx\Connection the Sphinx connection that this command is associated with.
*/
public $db;
/**
* Creates a batch INSERT command. * Creates a batch INSERT command.
* For example, * For example,
* *
@ -194,7 +197,7 @@ class Command extends \yii\db\Command
// Not Supported : // Not Supported :
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function createTable($table, $columns, $options = null) public function createTable($table, $columns, $options = null)
{ {
@ -202,7 +205,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function renameTable($table, $newName) public function renameTable($table, $newName)
{ {
@ -210,7 +213,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function dropTable($table) public function dropTable($table)
{ {
@ -218,7 +221,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function truncateTable($table) public function truncateTable($table)
{ {
@ -226,7 +229,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function addColumn($table, $column, $type) public function addColumn($table, $column, $type)
{ {
@ -234,7 +237,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function dropColumn($table, $column) public function dropColumn($table, $column)
{ {
@ -242,7 +245,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function renameColumn($table, $oldName, $newName) public function renameColumn($table, $oldName, $newName)
{ {
@ -250,7 +253,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function alterColumn($table, $column, $type) public function alterColumn($table, $column, $type)
{ {
@ -258,7 +261,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function addPrimaryKey($name, $table, $columns) public function addPrimaryKey($name, $table, $columns)
{ {
@ -266,7 +269,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function dropPrimaryKey($name, $table) public function dropPrimaryKey($name, $table)
{ {
@ -274,7 +277,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function addForeignKey($name, $table, $columns, $refTable, $refColumns, $delete = null, $update = null) public function addForeignKey($name, $table, $columns, $refTable, $refColumns, $delete = null, $update = null)
{ {
@ -282,7 +285,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function dropForeignKey($name, $table) public function dropForeignKey($name, $table)
{ {
@ -290,7 +293,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function createIndex($name, $table, $columns, $unique = false) public function createIndex($name, $table, $columns, $unique = false)
{ {
@ -298,7 +301,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function dropIndex($name, $table) public function dropIndex($name, $table)
{ {
@ -306,7 +309,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function resetSequence($table, $value = null) public function resetSequence($table, $value = null)
{ {
@ -314,7 +317,7 @@ class Command extends \yii\db\Command
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function checkIntegrity($check = true, $schema = '') public function checkIntegrity($check = true, $schema = '')
{ {

9
extensions/sphinx/Connection.php

@ -47,11 +47,14 @@ use yii\base\NotSupportedException;
* *
* Note: while this class extends "yii\db\Connection" some of its methods are not supported. * Note: while this class extends "yii\db\Connection" some of its methods are not supported.
* *
* @method \yii\sphinx\Schema getSchema() The schema information for this Sphinx connection
* @method \yii\sphinx\QueryBuilder getQueryBuilder() the query builder for this Sphinx connection
*
* @property string $lastInsertID The row ID of the last row inserted, or the last value retrieved from the
* sequence object. This property is read-only.
* @property Schema $schema The schema information for this Sphinx connection. This property is read-only. * @property Schema $schema The schema information for this Sphinx connection. This property is read-only.
* @property \yii\sphinx\QueryBuilder $queryBuilder The query builder for this Sphinx connection. This property is * @property \yii\sphinx\QueryBuilder $queryBuilder The query builder for this Sphinx connection. This property is
* read-only. * read-only.
* @method \yii\sphinx\Schema getSchema() The schema information for this Sphinx connection
* @method \yii\sphinx\QueryBuilder getQueryBuilder() the query builder for this Sphinx connection
* *
* @author Paul Klimov <klimov.paul@gmail.com> * @author Paul Klimov <klimov.paul@gmail.com>
* @since 2.0 * @since 2.0
@ -59,7 +62,7 @@ use yii\base\NotSupportedException;
class Connection extends \yii\db\Connection class Connection extends \yii\db\Connection
{ {
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public $schemaMap = [ public $schemaMap = [
'mysqli' => 'yii\sphinx\Schema', // MySQL 'mysqli' => 'yii\sphinx\Schema', // MySQL

2
extensions/sphinx/Query.php

@ -41,6 +41,8 @@ use yii\db\QueryTrait;
* *
* Warning: even if you do not set any query limit, implicit LIMIT 0,20 is present by default! * Warning: even if you do not set any query limit, implicit LIMIT 0,20 is present by default!
* *
* @property Connection $connection Sphinx connection instance.
*
* @author Paul Klimov <klimov.paul@gmail.com> * @author Paul Klimov <klimov.paul@gmail.com>
* @since 2.0 * @since 2.0
*/ */

5
extensions/sphinx/QueryBuilder.php

@ -7,6 +7,7 @@
namespace yii\sphinx; namespace yii\sphinx;
use yii\base\InvalidParamException;
use yii\base\Object; use yii\base\Object;
use yii\db\Exception; use yii\db\Exception;
use yii\db\Expression; use yii\db\Expression;
@ -760,12 +761,12 @@ class QueryBuilder extends Object
* operator is `LIKE` or `OR LIKE` and empty if operator is `NOT LIKE` or `OR NOT LIKE`. * operator is `LIKE` or `OR LIKE` and empty if operator is `NOT LIKE` or `OR NOT LIKE`.
* @param array $params the binding parameters to be populated * @param array $params the binding parameters to be populated
* @return string the generated SQL expression * @return string the generated SQL expression
* @throws Exception if wrong number of operands have been given. * @throws InvalidParamException if wrong number of operands have been given.
*/ */
public function buildLikeCondition($indexes, $operator, $operands, &$params) public function buildLikeCondition($indexes, $operator, $operands, &$params)
{ {
if (!isset($operands[0], $operands[1])) { if (!isset($operands[0], $operands[1])) {
throw new Exception("Operator '$operator' requires two operands."); throw new InvalidParamException("Operator '$operator' requires two operands.");
} }
list($column, $values) = $operands; list($column, $values) = $operands;

8
extensions/sphinx/Schema.php

@ -15,12 +15,12 @@ use yii\caching\GroupDependency;
/** /**
* Schema represents the Sphinx schema information. * Schema represents the Sphinx schema information.
* *
* @property QueryBuilder $queryBuilder The query builder for this connection. This property is read-only.
* @property string[] $indexNames All index names in the Sphinx. This property is read-only. * @property string[] $indexNames All index names in the Sphinx. This property is read-only.
* @property string[] $indexTypes ALL index types in the Sphinx (index name => index type). * @property IndexSchema[] $indexSchemas The metadata for all indexes in the Sphinx. Each array element is an
* This property is read-only.
* @property IndexSchema[] $tableSchemas The metadata for all indexes in the Sphinx. Each array element is an
* instance of [[IndexSchema]] or its child class. This property is read-only. * instance of [[IndexSchema]] or its child class. This property is read-only.
* @property array $indexTypes All index types in the Sphinx in format: index name => index type. This
* property is read-only.
* @property QueryBuilder $queryBuilder The query builder for this connection. This property is read-only.
* *
* @author Paul Klimov <klimov.paul@gmail.com> * @author Paul Klimov <klimov.paul@gmail.com>
* @since 2.0 * @since 2.0

2
extensions/sphinx/composer.json

@ -5,7 +5,7 @@
"type": "yii2-extension", "type": "yii2-extension",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"support": { "support": {
"issues": "https://github.com/yiisoft/yii2/issues?state=open", "issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Asphinx",
"forum": "http://www.yiiframework.com/forum/", "forum": "http://www.yiiframework.com/forum/",
"wiki": "http://www.yiiframework.com/wiki/", "wiki": "http://www.yiiframework.com/wiki/",
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",

6
extensions/swiftmailer/Mailer.php

@ -66,6 +66,10 @@ use yii\mail\BaseMailer;
* *
* @see http://swiftmailer.org * @see http://swiftmailer.org
* *
* @property array|\Swift_Mailer $swiftMailer Swift mailer instance or array configuration. This property is
* read-only.
* @property array|\Swift_Transport $transport This property is read-only.
*
* @author Paul Klimov <klimov.paul@gmail.com> * @author Paul Klimov <klimov.paul@gmail.com>
* @since 2.0 * @since 2.0
*/ */
@ -119,7 +123,7 @@ class Mailer extends BaseMailer
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
protected function sendMessage($message) protected function sendMessage($message)
{ {

45
extensions/swiftmailer/Message.php

@ -16,7 +16,8 @@ use yii\mail\BaseMessage;
* @see Mailer * @see Mailer
* *
* @method Mailer getMailer() returns mailer instance. * @method Mailer getMailer() returns mailer instance.
* @property \Swift_Message $swiftMessage vendor message instance. *
* @property \Swift_Message $swiftMessage Swift message instance. This property is read-only.
* *
* @author Paul Klimov <klimov.paul@gmail.com> * @author Paul Klimov <klimov.paul@gmail.com>
* @since 2.0 * @since 2.0
@ -40,7 +41,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getCharset() public function getCharset()
{ {
@ -48,7 +49,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function setCharset($charset) public function setCharset($charset)
{ {
@ -57,7 +58,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getFrom() public function getFrom()
{ {
@ -65,7 +66,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function setFrom($from) public function setFrom($from)
{ {
@ -74,7 +75,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getReplyTo() public function getReplyTo()
{ {
@ -82,7 +83,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function setReplyTo($replyTo) public function setReplyTo($replyTo)
{ {
@ -91,7 +92,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getTo() public function getTo()
{ {
@ -99,7 +100,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function setTo($to) public function setTo($to)
{ {
@ -108,7 +109,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getCc() public function getCc()
{ {
@ -116,7 +117,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function setCc($cc) public function setCc($cc)
{ {
@ -125,7 +126,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getBcc() public function getBcc()
{ {
@ -133,7 +134,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function setBcc($bcc) public function setBcc($bcc)
{ {
@ -142,7 +143,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function getSubject() public function getSubject()
{ {
@ -150,7 +151,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function setSubject($subject) public function setSubject($subject)
{ {
@ -159,7 +160,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function setTextBody($text) public function setTextBody($text)
{ {
@ -168,7 +169,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function setHtmlBody($html) public function setHtmlBody($html)
{ {
@ -221,7 +222,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function attach($fileName, array $options = []) public function attach($fileName, array $options = [])
{ {
@ -237,7 +238,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function attachContent($content, array $options = []) public function attachContent($content, array $options = [])
{ {
@ -253,7 +254,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function embed($fileName, array $options = []) public function embed($fileName, array $options = [])
{ {
@ -268,7 +269,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function embedContent($content, array $options = []) public function embedContent($content, array $options = [])
{ {
@ -283,7 +284,7 @@ class Message extends BaseMessage
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function toString() public function toString()
{ {

2
extensions/swiftmailer/composer.json

@ -5,7 +5,7 @@
"type": "yii2-extension", "type": "yii2-extension",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"support": { "support": {
"issues": "https://github.com/yiisoft/yii2/issues?state=open", "issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Aswiftmailer",
"forum": "http://www.yiiframework.com/forum/", "forum": "http://www.yiiframework.com/forum/",
"wiki": "http://www.yiiframework.com/wiki/", "wiki": "http://www.yiiframework.com/wiki/",
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",

2
extensions/twig/composer.json

@ -5,7 +5,7 @@
"type": "yii2-extension", "type": "yii2-extension",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"support": { "support": {
"issues": "https://github.com/yiisoft/yii2/issues?state=open", "issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Atwig",
"forum": "http://www.yiiframework.com/forum/", "forum": "http://www.yiiframework.com/forum/",
"wiki": "http://www.yiiframework.com/wiki/", "wiki": "http://www.yiiframework.com/wiki/",
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",

2
framework/yii/base/Application.php

@ -199,7 +199,7 @@ abstract class Application extends Module
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function init() public function init()
{ {

27
framework/yii/base/Controller.php

@ -87,9 +87,9 @@ class Controller extends Component implements ViewContextInterface
* *
* ~~~ * ~~~
* return [ * return [
* 'action1' => '@app/components/Action1', * 'action1' => 'app\components\Action1',
* 'action2' => [ * 'action2' => [
* 'class' => '@app/components/Action2', * 'class' => 'app\components\Action2',
* 'property1' => 'value1', * 'property1' => 'value1',
* 'property2' => 'value2', * 'property2' => 'value2',
* ], * ],
@ -305,7 +305,7 @@ class Controller extends Component implements ViewContextInterface
public function render($view, $params = []) public function render($view, $params = [])
{ {
$output = $this->getView()->render($view, $params, $this); $output = $this->getView()->render($view, $params, $this);
$layoutFile = $this->findLayoutFile(); $layoutFile = $this->findLayoutFile($this->getView());
if ($layoutFile !== false) { if ($layoutFile !== false) {
return $this->getView()->renderFile($layoutFile, ['content' => $output], $this); return $this->getView()->renderFile($layoutFile, ['content' => $output], $this);
} else { } else {
@ -386,38 +386,39 @@ class Controller extends Component implements ViewContextInterface
/** /**
* Finds the applicable layout file. * Finds the applicable layout file.
* @param View $view the view object to render the layout file
* @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. * 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($view)
{ {
$module = $this->module; $module = $this->module;
if (is_string($this->layout)) { if (is_string($this->layout)) {
$view = $this->layout; $layout = $this->layout;
} elseif ($this->layout === null) { } elseif ($this->layout === null) {
while ($module !== null && $module->layout === null) { while ($module !== null && $module->layout === null) {
$module = $module->module; $module = $module->module;
} }
if ($module !== null && is_string($module->layout)) { if ($module !== null && is_string($module->layout)) {
$view = $module->layout; $layout = $module->layout;
} }
} }
if (!isset($view)) { if (!isset($layout)) {
return false; return false;
} }
if (strncmp($view, '@', 1) === 0) { if (strncmp($layout, '@', 1) === 0) {
$file = Yii::getAlias($view); $file = Yii::getAlias($layout);
} elseif (strncmp($view, '/', 1) === 0) { } elseif (strncmp($layout, '/', 1) === 0) {
$file = Yii::$app->getLayoutPath() . DIRECTORY_SEPARATOR . $view; $file = Yii::$app->getLayoutPath() . DIRECTORY_SEPARATOR . $layout;
} else { } else {
$file = $module->getLayoutPath() . DIRECTORY_SEPARATOR . $view; $file = $module->getLayoutPath() . DIRECTORY_SEPARATOR . $layout;
} }
if (pathinfo($file, PATHINFO_EXTENSION) === '') { if (pathinfo($file, PATHINFO_EXTENSION) === '') {
$file .= '.php'; $file .= $view->defaultExtension;
} }
return $file; return $file;
} }

25
framework/yii/base/ErrorException.php

@ -20,7 +20,7 @@ class ErrorException extends Exception
protected $severity; protected $severity;
/** /**
* Constructs the exception * Constructs the exception.
* @link http://php.net/manual/en/errorexception.construct.php * @link http://php.net/manual/en/errorexception.construct.php
* @param $message [optional] * @param $message [optional]
* @param $code [optional] * @param $code [optional]
@ -51,7 +51,6 @@ class ErrorException extends Exception
} }
// XDebug has a different key name // XDebug has a different key name
$frame['args'] = [];
if (isset($frame['params']) && !isset($frame['args'])) { if (isset($frame['params']) && !isset($frame['args'])) {
$frame['args'] = $frame['params']; $frame['args'] = $frame['params'];
} }
@ -64,17 +63,7 @@ class ErrorException extends Exception
} }
/** /**
* Gets the exception severity * Returns if error is one of fatal type.
* @link http://php.net/manual/en/errorexception.getseverity.php
* @return int the severity level of the exception.
*/
final public function getSeverity()
{
return $this->severity;
}
/**
* Returns if error is one of fatal type
* *
* @param array $error error got from error_get_last() * @param array $error error got from error_get_last()
* @return bool if error is one of fatal type * @return bool if error is one of fatal type
@ -85,6 +74,16 @@ class ErrorException extends Exception
} }
/** /**
* Gets the exception severity.
* @link http://php.net/manual/en/errorexception.getseverity.php
* @return int the severity level of the exception.
*/
final public function getSeverity()
{
return $this->severity;
}
/**
* @return string the user-friendly name of this exception * @return string the user-friendly name of this exception
*/ */
public function getName() public function getName()

4
framework/yii/base/Model.php

@ -249,9 +249,9 @@ class Model extends Component implements IteratorAggregate, ArrayAccess
* You may override this method to change the default behavior. * You may override this method to change the default behavior.
* @return array list of attribute names. * @return array list of attribute names.
*/ */
public static function attributes() public function attributes()
{ {
$class = new ReflectionClass(get_called_class()); $class = new ReflectionClass($this);
$names = []; $names = [];
foreach ($class->getProperties(\ReflectionProperty::IS_PUBLIC) as $property) { foreach ($class->getProperties(\ReflectionProperty::IS_PUBLIC) as $property) {
if (!$property->isStatic()) { if (!$property->isStatic()) {

6
framework/yii/base/View.php

@ -65,6 +65,10 @@ class View extends Component
*/ */
public $renderers; public $renderers;
/** /**
* @var string the default view file extension. This will be appended to view file names if they don't have file extensions.
*/
public $defaultExtension = '.php';
/**
* @var Theme|array the theme object or the configuration array for creating the theme object. * @var Theme|array the theme object or the configuration array for creating the theme object.
* If not set, it means theming is not enabled. * If not set, it means theming is not enabled.
*/ */
@ -167,7 +171,7 @@ class View extends Component
} }
} }
return pathinfo($file, PATHINFO_EXTENSION) === '' ? $file . '.php' : $file; return pathinfo($file, PATHINFO_EXTENSION) === '' ? $file . $this->defaultExtension : $file;
} }
/** /**

2
framework/yii/caching/Cache.php

@ -58,7 +58,7 @@ abstract class Cache extends Component implements \ArrayAccess
* if you don't want to use key prefix. It is recommended that you explicitly set this property to some * if you don't want to use key prefix. It is recommended that you explicitly set this property to some
* static value if the cached data needs to be shared among multiple applications. * static value if the cached data needs to be shared among multiple applications.
* *
* To ensure interoperability, only use alphanumeric characters should be used. * To ensure interoperability, only alphanumeric characters should be used.
*/ */
public $keyPrefix; public $keyPrefix;
/** /**

8
framework/yii/data/ActiveDataProvider.php

@ -93,7 +93,7 @@ class ActiveDataProvider extends BaseDataProvider
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
protected function prepareModels() protected function prepareModels()
{ {
@ -111,7 +111,7 @@ class ActiveDataProvider extends BaseDataProvider
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
protected function prepareKeys($models) protected function prepareKeys($models)
{ {
@ -150,7 +150,7 @@ class ActiveDataProvider extends BaseDataProvider
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
protected function prepareTotalCount() protected function prepareTotalCount()
{ {
@ -162,7 +162,7 @@ class ActiveDataProvider extends BaseDataProvider
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function setSort($value) public function setSort($value)
{ {

6
framework/yii/data/ArrayDataProvider.php

@ -66,7 +66,7 @@ class ArrayDataProvider extends BaseDataProvider
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
protected function prepareModels() protected function prepareModels()
{ {
@ -87,7 +87,7 @@ class ArrayDataProvider extends BaseDataProvider
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
protected function prepareKeys($models) protected function prepareKeys($models)
{ {
@ -107,7 +107,7 @@ class ArrayDataProvider extends BaseDataProvider
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
protected function prepareTotalCount() protected function prepareTotalCount()
{ {

1
framework/yii/db/ActiveQuery.php

@ -23,6 +23,7 @@ namespace yii\db;
* - [[min()]]: returns the min over the specified column. * - [[min()]]: returns the min over the specified column.
* - [[max()]]: returns the max over the specified column. * - [[max()]]: returns the max over the specified column.
* - [[scalar()]]: returns the value of the first column in the first row of the query result. * - [[scalar()]]: returns the value of the first column in the first row of the query result.
* - [[column()]]: returns the value of the first column in the query result.
* - [[exists()]]: returns a value indicating whether the query result has data or not. * - [[exists()]]: returns a value indicating whether the query result has data or not.
* *
* Because ActiveQuery extends from [[Query]], one can use query methods, such as [[where()]], * Because ActiveQuery extends from [[Query]], one can use query methods, such as [[where()]],

42
framework/yii/db/ActiveRecord.php

@ -27,13 +27,13 @@ use yii\helpers\Inflector;
* @property boolean $isNewRecord Whether the record is new and should be inserted when calling [[save()]]. * @property boolean $isNewRecord Whether the record is new and should be inserted when calling [[save()]].
* @property array $oldAttributes The old attribute values (name-value pairs). * @property array $oldAttributes The old attribute values (name-value pairs).
* @property mixed $oldPrimaryKey The old primary key value. An array (column name => column value) is * @property mixed $oldPrimaryKey The old primary key value. An array (column name => column value) is
* returned if the primary key is composite or `$asArray` is true. A string is returned otherwise (null will be * returned if the primary key is composite. A string is returned otherwise (null will be returned if the key
* returned if the key value is null). This property is read-only. * value is null). This property is read-only.
* @property array $populatedRelations An array of relation data indexed by relation names. This property is * @property array $populatedRelations An array of relation data indexed by relation names. This property is
* read-only. * read-only.
* @property mixed $primaryKey The primary key value. An array (column name => column value) is returned if * @property mixed $primaryKey The primary key value. An array (column name => column value) is returned if
* the primary key is composite or `$asArray` is true. A string is returned otherwise (null will be returned if * the primary key is composite. A string is returned otherwise (null will be returned if the key value is null).
* the key value is null). This property is read-only. * This property is read-only.
* *
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @author Carsten Brandt <mail@cebe.cc> * @author Carsten Brandt <mail@cebe.cc>
@ -316,9 +316,9 @@ class ActiveRecord extends Model
* (because another user has modified the data), a [[StaleObjectException]] exception will be thrown, * (because another user has modified the data), a [[StaleObjectException]] exception will be thrown,
* and the update or deletion is skipped. * and the update or deletion is skipped.
* *
* Optimized locking is only supported by [[update()]] and [[delete()]]. * Optimistic locking is only supported by [[update()]] and [[delete()]].
* *
* To use optimized locking: * To use Optimistic locking:
* *
* 1. Create a column to store the version number of each row. The column type should be `BIGINT DEFAULT 0`. * 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. * Override this method to return the name of this column.
@ -469,9 +469,9 @@ class ActiveRecord extends Model
* *
* @param string $class the class name of the related record * @param string $class the class name of the related record
* @param array $link the primary-foreign key constraint. The keys of the array refer to * @param array $link the primary-foreign key constraint. The keys of the array refer to
* the columns in the table associated with the `$class` model, while the values of the * the attributes of the record associated with the `$class` model, while the values of the
* array refer to the corresponding columns in the table associated with this AR class. * array refer to the corresponding attributes in **this** AR class.
* @return ActiveRelation the relation object. * @return ActiveRelationInterface the relation object.
*/ */
public function hasOne($class, $link) public function hasOne($class, $link)
{ {
@ -508,9 +508,9 @@ class ActiveRecord extends Model
* *
* @param string $class the class name of the related record * @param string $class the class name of the related record
* @param array $link the primary-foreign key constraint. The keys of the array refer to * @param array $link the primary-foreign key constraint. The keys of the array refer to
* the columns in the table associated with the `$class` model, while the values of the * the attributes of the record associated with the `$class` model, while the values of the
* array refer to the corresponding columns in the table associated with this AR class. * array refer to the corresponding attributes in **this** AR class.
* @return ActiveRelation the relation object. * @return ActiveRelationInterface the relation object.
*/ */
public function hasMany($class, $link) public function hasMany($class, $link)
{ {
@ -570,7 +570,7 @@ class ActiveRecord extends Model
* The default implementation will return all column names of the table associated with this AR class. * The default implementation will return all column names of the table associated with this AR class.
* @return array list of attribute names. * @return array list of attribute names.
*/ */
public static function attributes() public function attributes()
{ {
return array_keys(static::getTableSchema()->columns); return array_keys(static::getTableSchema()->columns);
} }
@ -754,7 +754,7 @@ class ActiveRecord extends Model
* [[EVENT_BEFORE_INSERT]], [[EVENT_AFTER_INSERT]] and [[EVENT_AFTER_VALIDATE]] * [[EVENT_BEFORE_INSERT]], [[EVENT_AFTER_INSERT]] and [[EVENT_AFTER_VALIDATE]]
* will be raised by the corresponding methods. * will be raised by the corresponding methods.
* *
* Only the [[changedAttributes|changed attribute values]] will be inserted into database. * Only the [[dirtyAttributes|changed attribute values]] will be inserted into database.
* *
* If the table's primary key is auto-incremental and is null during insertion, * If the table's primary key is auto-incremental and is null during insertion,
* it will be populated with the actual value after insertion. * it will be populated with the actual value after insertion.
@ -1169,7 +1169,7 @@ class ActiveRecord extends Model
return false; return false;
} }
foreach ($this->attributes() as $name) { foreach ($this->attributes() as $name) {
$this->_attributes[$name] = $record->_attributes[$name]; $this->_attributes[$name] = isset($record->_attributes[$name]) ? $record->_attributes[$name] : null;
} }
$this->_oldAttributes = $this->_attributes; $this->_oldAttributes = $this->_attributes;
$this->_related = []; $this->_related = [];
@ -1179,11 +1179,15 @@ class ActiveRecord extends Model
/** /**
* Returns a value indicating whether the given active record is the same as the current one. * Returns a value indicating whether the given active record is the same as the current one.
* The comparison is made by comparing the table names and the primary key values of the two active records. * The comparison is made by comparing the table names and the primary key values of the two active records.
* If one of the records [[isNewRecord|is new]] they are also considered not equal.
* @param ActiveRecord $record record to compare to * @param ActiveRecord $record record to compare to
* @return boolean whether the two active records refer to the same row in the same database table. * @return boolean whether the two active records refer to the same row in the same database table.
*/ */
public function equals($record) public function equals($record)
{ {
if ($this->isNewRecord || $record->isNewRecord) {
return false;
}
return $this->tableName() === $record->tableName() && $this->getPrimaryKey() === $record->getPrimaryKey(); return $this->tableName() === $record->tableName() && $this->getPrimaryKey() === $record->getPrimaryKey();
} }
@ -1192,6 +1196,9 @@ class ActiveRecord extends Model
* @param boolean $asArray whether to return the primary key value as an array. If true, * @param boolean $asArray whether to return the primary key value as an array. If true,
* the return value will be an array with column names as keys and column values as values. * the return value will be an array with column names as keys and column values as values.
* Note that for composite primary keys, an array will always be returned regardless of this parameter value. * Note that for composite primary keys, an array will always be returned regardless of this parameter value.
* @property mixed The primary key value. An array (column name => column value) is returned if
* the primary key is composite. A string is returned otherwise (null will be returned if
* the key value is null).
* @return mixed the primary key value. An array (column name => column value) is returned if the primary key * @return mixed the primary key value. An array (column name => column value) is returned if the primary key
* is composite or `$asArray` is true. A string is returned otherwise (null will be returned if * is composite or `$asArray` is true. A string is returned otherwise (null will be returned if
* the key value is null). * the key value is null).
@ -1218,6 +1225,9 @@ class ActiveRecord extends Model
* @param boolean $asArray whether to return the primary key value as an array. If true, * @param boolean $asArray whether to return the primary key value as an array. If true,
* the return value will be an array with column name as key and column value as value. * the return value will be an array with column name as key and column value as value.
* If this is false (default), a scalar value will be returned for non-composite primary key. * If this is false (default), a scalar value will be returned for non-composite primary key.
* @property mixed The old primary key value. An array (column name => column value) is
* returned if the primary key is composite. A string is returned otherwise (null will be
* returned if the key value is null).
* @return mixed the old primary key value. An array (column name => column value) is returned if the primary key * @return mixed the old primary key value. An array (column name => column value) is returned if the primary key
* is composite or `$asArray` is true. A string is returned otherwise (null will be returned if * is composite or `$asArray` is true. A string is returned otherwise (null will be returned if
* the key value is null). * the key value is null).
@ -1246,7 +1256,7 @@ class ActiveRecord extends Model
public static function create($row) public static function create($row)
{ {
$record = static::instantiate($row); $record = static::instantiate($row);
$columns = array_flip(static::attributes()); $columns = array_flip($record->attributes());
foreach ($row as $name => $value) { foreach ($row as $name => $value) {
if (isset($columns[$name])) { if (isset($columns[$name])) {
$record->_attributes[$name] = $value; $record->_attributes[$name] = $value;

8
framework/yii/db/Command.php

@ -278,11 +278,15 @@ class Command extends \yii\base\Component
return $n; return $n;
} catch (\Exception $e) { } catch (\Exception $e) {
Yii::endProfile($token, __METHOD__); Yii::endProfile($token, __METHOD__);
if ($e instanceof Exception) {
throw $e;
} else {
$message = $e->getMessage() . "\nThe SQL being executed was: $rawSql"; $message = $e->getMessage() . "\nThe SQL being executed was: $rawSql";
$errorInfo = $e instanceof \PDOException ? $e->errorInfo : null; $errorInfo = $e instanceof \PDOException ? $e->errorInfo : null;
throw new Exception($message, $errorInfo, (int)$e->getCode(), $e); throw new Exception($message, $errorInfo, (int)$e->getCode(), $e);
} }
} }
}
/** /**
* Executes the SQL statement and returns query result. * Executes the SQL statement and returns query result.
@ -411,11 +415,15 @@ class Command extends \yii\base\Component
return $result; return $result;
} catch (\Exception $e) { } catch (\Exception $e) {
Yii::endProfile($token, __METHOD__); Yii::endProfile($token, __METHOD__);
if ($e instanceof Exception) {
throw $e;
} else {
$message = $e->getMessage() . "\nThe SQL being executed was: $rawSql"; $message = $e->getMessage() . "\nThe SQL being executed was: $rawSql";
$errorInfo = $e instanceof \PDOException ? $e->errorInfo : null; $errorInfo = $e instanceof \PDOException ? $e->errorInfo : null;
throw new Exception($message, $errorInfo, (int)$e->getCode(), $e); throw new Exception($message, $errorInfo, (int)$e->getCode(), $e);
} }
} }
}
/** /**
* Creates an INSERT command. * Creates an INSERT command.

2
framework/yii/db/Query.php

@ -42,7 +42,7 @@ class Query extends Component implements QueryInterface
/** /**
* @var array the columns being selected. For example, `['id', 'name']`. * @var array the columns being selected. For example, `['id', 'name']`.
* This is used to construct the SELECT clause in a SQL statement. If not set, if means selecting all columns. * This is used to construct the SELECT clause in a SQL statement. If not set, it means selecting all columns.
* @see select() * @see select()
*/ */
public $select; public $select;

13
framework/yii/db/QueryBuilder.php

@ -7,6 +7,7 @@
namespace yii\db; namespace yii\db;
use yii\base\InvalidParamException;
use yii\base\NotSupportedException; use yii\base\NotSupportedException;
/** /**
@ -782,7 +783,7 @@ class QueryBuilder extends \yii\base\Object
* on how to specify a condition. * on how to specify a condition.
* @param array $params the binding parameters to be populated * @param array $params the binding parameters to be populated
* @return string the generated SQL expression * @return string the generated SQL expression
* @throws \yii\db\Exception if the condition is in bad format * @throws InvalidParamException if the condition is in bad format
*/ */
public function buildCondition($condition, &$params) public function buildCondition($condition, &$params)
{ {
@ -811,7 +812,7 @@ class QueryBuilder extends \yii\base\Object
array_shift($condition); array_shift($condition);
return $this->$method($operator, $condition, $params); return $this->$method($operator, $condition, $params);
} else { } else {
throw new Exception('Found unknown operator in query: ' . $operator); throw new InvalidParamException('Found unknown operator in query: ' . $operator);
} }
} else { // hash format: 'column1' => 'value1', 'column2' => 'value2', ... } else { // hash format: 'column1' => 'value1', 'column2' => 'value2', ...
return $this->buildHashCondition($condition, $params); return $this->buildHashCondition($condition, $params);
@ -883,12 +884,12 @@ class QueryBuilder extends \yii\base\Object
* describe the interval that column value should be in. * describe the interval that column value should be in.
* @param array $params the binding parameters to be populated * @param array $params the binding parameters to be populated
* @return string the generated SQL expression * @return string the generated SQL expression
* @throws Exception if wrong number of operands have been given. * @throws InvalidParamException if wrong number of operands have been given.
*/ */
public function buildBetweenCondition($operator, $operands, &$params) public function buildBetweenCondition($operator, $operands, &$params)
{ {
if (!isset($operands[0], $operands[1], $operands[2])) { if (!isset($operands[0], $operands[1], $operands[2])) {
throw new Exception("Operator '$operator' requires three operands."); throw new InvalidParamException("Operator '$operator' requires three operands.");
} }
list($column, $value1, $value2) = $operands; list($column, $value1, $value2) = $operands;
@ -998,12 +999,12 @@ class QueryBuilder extends \yii\base\Object
* operator is `LIKE` or `OR LIKE` and empty if operator is `NOT LIKE` or `OR NOT LIKE`. * operator is `LIKE` or `OR LIKE` and empty if operator is `NOT LIKE` or `OR NOT LIKE`.
* @param array $params the binding parameters to be populated * @param array $params the binding parameters to be populated
* @return string the generated SQL expression * @return string the generated SQL expression
* @throws Exception if wrong number of operands have been given. * @throws InvalidParamException if wrong number of operands have been given.
*/ */
public function buildLikeCondition($operator, $operands, &$params) public function buildLikeCondition($operator, $operands, &$params)
{ {
if (!isset($operands[0], $operands[1])) { if (!isset($operands[0], $operands[1])) {
throw new Exception("Operator '$operator' requires two operands."); throw new InvalidParamException("Operator '$operator' requires two operands.");
} }
list($column, $values) = $operands; list($column, $values) = $operands;

4
framework/yii/db/cubrid/QueryBuilder.php

@ -69,7 +69,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
public function buildLimit($limit, $offset) public function buildLimit($limit, $offset)
{ {
@ -83,7 +83,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
$sql .= ' OFFSET ' . (int)$offset; $sql .= ' OFFSET ' . (int)$offset;
} }
} elseif ($offset > 0) { } elseif ($offset > 0) {
$sql = 'LIMIT ' . (int)$offset . ', 18446744073709551615'; // 2^64-1 $sql = 'LIMIT 9223372036854775807 OFFSET ' . (int)$offset; // 2^63-1
} }
return $sql; return $sql;
} }

10
framework/yii/db/mssql/QueryBuilder.php

@ -25,17 +25,17 @@ class QueryBuilder extends \yii\db\QueryBuilder
Schema::TYPE_BIGPK => 'bigint IDENTITY PRIMARY KEY', Schema::TYPE_BIGPK => 'bigint IDENTITY PRIMARY KEY',
Schema::TYPE_STRING => 'varchar(255)', Schema::TYPE_STRING => 'varchar(255)',
Schema::TYPE_TEXT => 'text', Schema::TYPE_TEXT => 'text',
Schema::TYPE_SMALLINT => 'smallint(6)', Schema::TYPE_SMALLINT => 'smallint',
Schema::TYPE_INTEGER => 'int(11)', Schema::TYPE_INTEGER => 'int',
Schema::TYPE_BIGINT => 'bigint(20)', Schema::TYPE_BIGINT => 'bigint',
Schema::TYPE_FLOAT => 'float', Schema::TYPE_FLOAT => 'float',
Schema::TYPE_DECIMAL => 'decimal(10,0)', Schema::TYPE_DECIMAL => 'decimal',
Schema::TYPE_DATETIME => 'datetime', Schema::TYPE_DATETIME => 'datetime',
Schema::TYPE_TIMESTAMP => 'timestamp', Schema::TYPE_TIMESTAMP => 'timestamp',
Schema::TYPE_TIME => 'time', Schema::TYPE_TIME => 'time',
Schema::TYPE_DATE => 'date', Schema::TYPE_DATE => 'date',
Schema::TYPE_BINARY => 'binary', Schema::TYPE_BINARY => 'binary',
Schema::TYPE_BOOLEAN => 'tinyint(1)', Schema::TYPE_BOOLEAN => 'bit',
Schema::TYPE_MONEY => 'decimal(19,4)', Schema::TYPE_MONEY => 'decimal(19,4)',
]; ];

2
framework/yii/db/mysql/QueryBuilder.php

@ -142,7 +142,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
public function buildLimit($limit, $offset) public function buildLimit($limit, $offset)
{ {

2
framework/yii/db/pgsql/Schema.php

@ -225,7 +225,7 @@ SQL;
} }
$citem = [$foreignTable]; $citem = [$foreignTable];
foreach ($columns as $idx => $column) { foreach ($columns as $idx => $column) {
$citem[$fcolumns[$idx]] = $column; $citem[$column] = $fcolumns[$idx];
} }
$table->foreignKeys[] = $citem; $table->foreignKeys[] = $citem;
} }

2
framework/yii/db/sqlite/QueryBuilder.php

@ -255,7 +255,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
} }
/** /**
* @inheritDocs * {@inheritdoc}
*/ */
public function buildLimit($limit, $offset) public function buildLimit($limit, $offset)
{ {

2
framework/yii/helpers/BaseHtml.php

@ -191,7 +191,9 @@ class BaseHtml
*/ */
public static function cssFile($url, $options = []) public static function cssFile($url, $options = [])
{ {
if (!isset($options['rel'])) {
$options['rel'] = 'stylesheet'; $options['rel'] = 'stylesheet';
}
$options['href'] = static::url($url); $options['href'] = static::url($url);
return static::tag('link', '', $options); return static::tag('link', '', $options);
} }

2
framework/yii/mail/BaseMessage.php

@ -34,7 +34,7 @@ abstract class BaseMessage extends Object implements MessageInterface
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function send() public function send()
{ {

2
framework/yii/validators/SafeValidator.php

@ -16,7 +16,7 @@ namespace yii\validators;
class SafeValidator extends Validator class SafeValidator extends Validator
{ {
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function validateAttribute($object, $attribute) public function validateAttribute($object, $attribute)
{ {

5
framework/yii/validators/UniqueValidator.php

@ -64,11 +64,6 @@ class UniqueValidator extends Validator
$className = $this->className === null ? get_class($object) : $this->className; $className = $this->className === null ? get_class($object) : $this->className;
$attributeName = $this->attributeName === null ? $attribute : $this->attributeName; $attributeName = $this->attributeName === null ? $attribute : $this->attributeName;
$attributes = $className::attributes();
if (!in_array($attributeName, $attributes)) {
throw new InvalidConfigException("'$className' does not have an attribute named '$attributeName'.");
}
$query = $className::find(); $query = $className::find();
$query->where([$attributeName => $value]); $query->where([$attributeName => $value]);

2
framework/yii/validators/Validator.php

@ -159,7 +159,7 @@ abstract class Validator extends Component
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function init() public function init()
{ {

2
framework/yii/web/Controller.php

@ -86,7 +86,7 @@ class Controller extends \yii\base\Controller
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
public function beforeAction($action) public function beforeAction($action)
{ {

31
framework/yii/web/VerbFilter.php

@ -51,6 +51,20 @@ class VerbFilter extends Behavior
* you add an entry with the action id as array key and an array of * you add an entry with the action id as array key and an array of
* allowed methods (e.g. GET, HEAD, PUT) as the value. * allowed methods (e.g. GET, HEAD, PUT) as the value.
* If an action is not listed all request methods are considered allowed. * If an action is not listed all request methods are considered allowed.
*
* You can use '*' to stand for all actions. When an action is explicitly
* specified, it takes precedence over the specification given by '*'.
*
* For example,
*
* ~~~
* [
* 'create' => ['get', 'post'],
* 'update' => ['get', 'put', 'post'],
* 'delete' => ['post', 'delete'],
* '*' => ['get'],
* ]
* ~~~
*/ */
public $actions = []; public $actions = [];
@ -73,15 +87,24 @@ class VerbFilter extends Behavior
{ {
$action = $event->action->id; $action = $event->action->id;
if (isset($this->actions[$action])) { if (isset($this->actions[$action])) {
$verbs = $this->actions[$action];
} elseif (isset($this->actions['*'])) {
$verbs = $this->actions['*'];
} else {
return $event->isValid;
}
$verb = Yii::$app->getRequest()->getMethod(); $verb = Yii::$app->getRequest()->getMethod();
$allowed = array_map('strtoupper', $this->actions[$action]); $allowed = array_map('strtoupper', $verbs);
if (!in_array($verb, $allowed)) { if (!in_array($verb, array_map('strtoupper', $verbs))) {
$event->isValid = false; $event->isValid = false;
// http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.7 // http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.7
Yii::$app->getResponse()->getHeaders()->set('Allow', implode(', ', $allowed)); Yii::$app->getResponse()->getHeaders()->set('Allow', implode(', ', $allowed));
throw new HttpException(405, 'Method Not Allowed. This url can only handle the following request methods: ' . implode(', ', $allowed)); throw new HttpException(405, Yii::t('yii', 'Method Not Allowed. This url can only handle the following request methods: {methods}.', [
} 'methods' => implode(', ', $allowed),
]));
} }
return $event->isValid; return $event->isValid;
} }
} }

6
framework/yii/widgets/DetailView.php

@ -70,7 +70,7 @@ class DetailView extends Widget
* according to the "format" option. * according to the "format" option.
* - format: the type of the value that determines how the value would be formatted into a displayable text. * - format: the type of the value that determines how the value would be formatted into a displayable text.
* Please refer to [[Formatter]] for supported types. * Please refer to [[Formatter]] for supported types.
* - visible: whether the attribute is visible. If set to `false`, the attribute will be displayed. * - visible: whether the attribute is visible. If set to `false`, the attribute will NOT be displayed.
*/ */
public $attributes; public $attributes;
/** /**
@ -186,6 +186,10 @@ class DetailView extends Widget
throw new InvalidConfigException('The attribute configuration must be an array.'); throw new InvalidConfigException('The attribute configuration must be an array.');
} }
if (isset($attribute['visible']) && !$attribute['visible']) {
continue;
}
if (!isset($attribute['format'])) { if (!isset($attribute['format'])) {
$attribute['format'] = 'text'; $attribute['format'] = 'text';
} }

2
tests/unit/VendorTestCase.php

@ -18,7 +18,7 @@ class VendorTestCase extends TestCase
*/ */
public static function setUpBeforeClass() public static function setUpBeforeClass()
{ {
$vendorDir = __DIR__ . '/vendor'; $vendorDir = __DIR__ . '/../../vendor';
Yii::setAlias('@vendor', $vendorDir); Yii::setAlias('@vendor', $vendorDir);
$vendorAutoload = $vendorDir . '/autoload.php'; $vendorAutoload = $vendorDir . '/autoload.php';
if (file_exists($vendorAutoload)) { if (file_exists($vendorAutoload)) {

5
tests/unit/bootstrap.php

@ -8,6 +8,11 @@ define('YII_DEBUG', true);
$_SERVER['SCRIPT_NAME'] = '/' . __DIR__; $_SERVER['SCRIPT_NAME'] = '/' . __DIR__;
$_SERVER['SCRIPT_FILENAME'] = __FILE__; $_SERVER['SCRIPT_FILENAME'] = __FILE__;
// require composer autoloader if available
$composerAutoload = __DIR__ . '/../../vendor/autoload.php';
if (is_file($composerAutoload)) {
require_once($composerAutoload);
}
require_once(__DIR__ . '/../../framework/yii/Yii.php'); require_once(__DIR__ . '/../../framework/yii/Yii.php');
Yii::setAlias('@yiiunit', __DIR__); Yii::setAlias('@yiiunit', __DIR__);

9
tests/unit/data/ar/Customer.php

@ -1,6 +1,8 @@
<?php <?php
namespace yiiunit\data\ar; namespace yiiunit\data\ar;
use yiiunit\framework\db\ActiveRecordTest;
/** /**
* Class Customer * Class Customer
* *
@ -17,9 +19,6 @@ class Customer extends ActiveRecord
public $status2; public $status2;
public static $afterSaveInsert = null;
public static $afterSaveNewRecord = null;
public static function tableName() public static function tableName()
{ {
return 'tbl_customer'; return 'tbl_customer';
@ -37,8 +36,8 @@ class Customer extends ActiveRecord
public function afterSave($insert) public function afterSave($insert)
{ {
static::$afterSaveInsert = $insert; ActiveRecordTest::$afterSaveInsert = $insert;
static::$afterSaveNewRecord = $this->isNewRecord; ActiveRecordTest::$afterSaveNewRecord = $this->isNewRecord;
parent::afterSave($insert); parent::afterSave($insert);
} }
} }

16
tests/unit/data/ar/Order.php

@ -35,6 +35,22 @@ class Order extends ActiveRecord
})->orderBy('id'); })->orderBy('id');
} }
public function getItemsInOrder1()
{
return $this->hasMany(Item::className(), ['id' => 'item_id'])
->via('orderItems', function ($q) {
$q->orderBy(['subtotal' => SORT_ASC]);
})->orderBy('name');
}
public function getItemsInOrder2()
{
return $this->hasMany(Item::className(), ['id' => 'item_id'])
->via('orderItems', function ($q) {
$q->orderBy(['subtotal' => SORT_DESC]);
})->orderBy('name');
}
public function getBooks() public function getBooks()
{ {
return $this->hasMany(Item::className(), ['id' => 'item_id']) return $this->hasMany(Item::className(), ['id' => 'item_id'])

32
tests/unit/data/ar/elasticsearch/ActiveRecord.php

@ -0,0 +1,32 @@
<?php
/**
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
namespace yiiunit\data\ar\elasticsearch;
/**
* ActiveRecord is ...
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0
*/
class ActiveRecord extends \yii\elasticsearch\ActiveRecord
{
public static $db;
/**
* @return \yii\elasticsearch\Connection
*/
public static function getDb()
{
return self::$db;
}
public static function index()
{
return 'yiitest';
}
}

43
tests/unit/data/ar/elasticsearch/Customer.php

@ -0,0 +1,43 @@
<?php
namespace yiiunit\data\ar\elasticsearch;
use yiiunit\extensions\elasticsearch\ActiveRecordTest;
/**
* Class Customer
*
* @property integer $id
* @property string $name
* @property string $email
* @property string $address
* @property integer $status
*/
class Customer extends ActiveRecord
{
const STATUS_ACTIVE = 1;
const STATUS_INACTIVE = 2;
public $status2;
public function attributes()
{
return ['name', 'email', 'address', 'status'];
}
public function getOrders()
{
return $this->hasMany(Order::className(), array('customer_id' => ActiveRecord::PRIMARY_KEY_NAME))->orderBy('create_time');
}
public static function active($query)
{
$query->andWhere(array('status' => 1));
}
public function afterSave($insert)
{
ActiveRecordTest::$afterSaveInsert = $insert;
ActiveRecordTest::$afterSaveNewRecord = $this->isNewRecord;
parent::afterSave($insert);
}
}

18
tests/unit/data/ar/elasticsearch/Item.php

@ -0,0 +1,18 @@
<?php
namespace yiiunit\data\ar\elasticsearch;
/**
* Class Item
*
* @property integer $id
* @property string $name
* @property integer $category_id
*/
class Item extends ActiveRecord
{
public function attributes()
{
return ['name', 'category_id'];
}
}

68
tests/unit/data/ar/elasticsearch/Order.php

@ -0,0 +1,68 @@
<?php
namespace yiiunit\data\ar\elasticsearch;
/**
* Class Order
*
* @property integer $id
* @property integer $customer_id
* @property integer $create_time
* @property string $total
*/
class Order extends ActiveRecord
{
public function attributes()
{
return ['customer_id', 'create_time', 'total'];
}
public function getCustomer()
{
return $this->hasOne(Customer::className(), [ActiveRecord::PRIMARY_KEY_NAME => 'customer_id']);
}
public function getOrderItems()
{
return $this->hasMany(OrderItem::className(), ['order_id' => ActiveRecord::PRIMARY_KEY_NAME]);
}
public function getItems()
{
return $this->hasMany(Item::className(), [ActiveRecord::PRIMARY_KEY_NAME => 'item_id'])
->via('orderItems')->orderBy('id');
}
public function getItemsInOrder1()
{
return $this->hasMany(Item::className(), ['id' => 'item_id'])
->via('orderItems', function ($q) {
$q->orderBy(['subtotal' => SORT_ASC]);
})->orderBy('name');
}
public function getItemsInOrder2()
{
return $this->hasMany(Item::className(), ['id' => 'item_id'])
->via('orderItems', function ($q) {
$q->orderBy(['subtotal' => SORT_DESC]);
})->orderBy('name');
}
// public function getBooks()
// {
// return $this->hasMany('Item', [ActiveRecord::PRIMARY_KEY_NAME => 'item_id'])
// ->viaTable('tbl_order_item', ['order_id' => ActiveRecord::PRIMARY_KEY_NAME])
// ->where(['category_id' => 1]);
// }
public function beforeSave($insert)
{
if (parent::beforeSave($insert)) {
// $this->create_time = time();
return true;
} else {
return false;
}
}
}

29
tests/unit/data/ar/elasticsearch/OrderItem.php

@ -0,0 +1,29 @@
<?php
namespace yiiunit\data\ar\elasticsearch;
/**
* Class OrderItem
*
* @property integer $order_id
* @property integer $item_id
* @property integer $quantity
* @property string $subtotal
*/
class OrderItem extends ActiveRecord
{
public function attributes()
{
return ['order_id', 'item_id', 'quantity', 'subtotal'];
}
public function getOrder()
{
return $this->hasOne(Order::className(), [ActiveRecord::PRIMARY_KEY_NAME => 'order_id']);
}
public function getItem()
{
return $this->hasOne(Item::className(), [ActiveRecord::PRIMARY_KEY_NAME => 'item_id']);
}
}

11
tests/unit/data/ar/redis/Customer.php

@ -2,6 +2,8 @@
namespace yiiunit\data\ar\redis; namespace yiiunit\data\ar\redis;
use yiiunit\extensions\redis\ActiveRecordTest;
class Customer extends ActiveRecord class Customer extends ActiveRecord
{ {
const STATUS_ACTIVE = 1; const STATUS_ACTIVE = 1;
@ -9,7 +11,7 @@ class Customer extends ActiveRecord
public $status2; public $status2;
public static function attributes() public function attributes()
{ {
return ['id', 'email', 'name', 'address', 'status']; return ['id', 'email', 'name', 'address', 'status'];
} }
@ -26,4 +28,11 @@ class Customer extends ActiveRecord
{ {
$query->andWhere(['status' => 1]); $query->andWhere(['status' => 1]);
} }
public function afterSave($insert)
{
ActiveRecordTest::$afterSaveInsert = $insert;
ActiveRecordTest::$afterSaveNewRecord = $this->isNewRecord;
parent::afterSave($insert);
}
} }

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save