Merge commit 'beafb99e562bf52f2496d106788160b776243bbd' into feature/…

…toolbar-ui-2

Conflicts:
	extensions/debug/Module.php

apps/advanced/frontend/widgets/Alert.php

@@ -16,7 +16,7 @@
  * - \Yii::$app->getSession()->setFlash('info', 'This is the message');
  *
  * @author Kartik Visweswaran <[email protected]>
- * @author Alexander Makarov <sam@rmcerative.ru>
+ * @author Alexander Makarov <sam@rmcreative.ru>
  */
 class Alert extends \yii\bootstrap\Widget
 {

apps/basic/tests/acceptance.suite.yml

@@ -15,10 +15,13 @@ modules:
  - PhpBrowser
 # you can use WebDriver instead of PhpBrowser to test javascript and ajax.
 # This will require you to install selenium. See http:https://codeception.com/docs/04-AcceptanceTests#Selenium
+# "restart" option is used by the WebDriver to start each time per test-file new session and cookies, 
+# it is useful if you want to login in your app in each test.
 # - WebDriver
  config:
  PhpBrowser:
  url: 'http:https://localhost:8080'
 # WebDriver:
 # url: 'http:https://localhost'
 # browser: firefox
+# restart: true

docs/guide/apps-advanced.md

@@ -33,7 +33,7 @@ the installed application. You only need to do these once for all.
  ```
  php /path/to/yii-application/init
  ```
-2. Create a new database and adjust the `components.db` configuration in `common/config/params-local.php` accordingly.
+2. Create a new database and adjust the `components.db` configuration in `common/config/main-local.php` accordingly.
 3. Apply migrations with console command `yii migrate`.
 4. Set document roots of your Web server:
 

extensions/debug/Module.php

@@ -38,13 +38,11 @@ class Module extends \yii\base\Module
  */
  public $logTarget;
  /**
- * @var array|Panel[]
+ * @var array list of debug panels. The array keys are the panel IDs, and values are the corresponding
+ * panel class names or configuration arrays. This will be merged with [[corePanels()]].
+ * You may set a panel to be false to disable a core panel.
  */
  public $panels = [];
- /**
- * @var string postion of the custom configured panels 'begin' or 'end'
- */
- public $panelsPosition = 'end';
  /**
  * @var string the directory storing the debugger data files. This can be specified using a path alias.
  */
@@ -78,15 +76,7 @@ public function init()
  Yii::$app->getView()->on(View::EVENT_END_BODY, [$this, 'renderToolbar']);
  });
 
- switch ($this->panelsPosition) {
- case 'begin':
- $this->panels = ArrayHelper::merge($this->panels, $this->corePanels());
- break;
- case 'end':
- default:
- $this->panels = ArrayHelper::merge($this->corePanels(), $this->panels);
- break;
- }
+ $this->panels = array_filter(ArrayHelper::merge($this->corePanels(), $this->panels));
  foreach ($this->panels as $id => $config) {
  $config['module'] = $this;
  $config['id'] = $id;

extensions/elasticsearch/CHANGELOG.md

@@ -5,6 +5,7 @@ Yii Framework 2 elasticsearch extension Change Log
 ----------------------------
 
 - Bug #1993: afterFind event in AR is now called after relations have been populated (cebe, creocoder)
+- Bug #2324: Fixed QueryBuilder bug when building a query with "query" option (mintao)
 - Enh #1313: made index and type available in `ActiveRecord::instantiate()` to allow creating records based on elasticsearch type when doing cross index/type search (cebe)
 - Enh #1382: Added a debug toolbar panel for elasticsearch (cebe)
 - Enh #1765: Added support for primary key path mapping, pk can now be part of the attributes when mapping is defined (cebe)

extensions/elasticsearch/QueryBuilder.php

@@ -55,8 +55,10 @@ public function build($query)
  $parts['from'] = (int) $query->offset;
  }
 
- if (empty($parts['query'])) {
+ if (empty($query->query)) {
  $parts['query'] = ["match_all" => (object)[]];
+ } else {
+ $parts['query'] = $query->query;
  }
 
  $whereFilter = $this->buildCondition($query->where);

extensions/gii/CHANGELOG.md

@@ -5,6 +5,7 @@ Yii Framework 2 gii extension Change Log
 ----------------------------
 
 - Bug #1405: fixed disambiguation of relation names generated by gii (qiangxue)
+- Bug #1904: Fixed autocomplete to work with underscore inputs "_" (tonydspaniard)
 - Bug #2298: Fixed the bug that Gii controller generator did not allow digit in the controller ID (qiangxue)
 - Bug: fixed controller in crud template to avoid returning query in findModel() (cebe)
 - Enh #1624: generate rules for unique indexes (lucianobaraglia)

extensions/gii/assets/gii.js

@@ -71,6 +71,15 @@ yii.gii = (function ($) {
  };
 
  return {
+ autocomplete: function (counter, data) {
+ var datum = new Bloodhound({
+ datumTokenizer: function(d){return Bloodhound.tokenizers.whitespace(d.word);},
+ queryTokenizer: Bloodhound.tokenizers.whitespace,
+ local: data
+ });
+ datum.initialize();
+ jQuery('.typeahead-'+counter).typeahead(null,{displayKey: 'word', source: datum.ttAdapter()});
+ },
  init: function () {
  initHintBlocks();
  initStickyInputs();