Merge branch 'master' into master-Lisio

Author: samdark

.github/FUNDING.yml

@@ -1,3 +1,5 @@
 # These are supported funding model platforms
 
 open_collective: yiisoft
+github: [yiisoft]
+tidelift: "packagist/yiisoft/yii2-mongodb"

.github/SECURITY.md

@@ -0,0 +1,6 @@
+# Security Policy
+
+Please use the [security issue form](https://www.yiiframework.com/security) to report to us any security issue you find in Yii.
+DO NOT use the issue tracker or discuss it in the public forum as it will cause more damage than help.
+
+Please note that as a non-commerial OpenSource project we are not able to pay bounties at the moment.

.travis.yml

@@ -1,12 +1,23 @@
 language: php
 
-php:
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
+matrix:
+  fast_finish: true
+  include:
+    - php: "7.3"
+
+    - php: "7.2"
+
+    - php: "7.1"
+
+    - php: "7.0"
+
+    - php: "5.6"
+
+    - php: "5.5"
+      dist: trusty
+
+    - php: "5.4"
+      dist: trusty
 
 services:
   - mongodb
@@ -41,3 +52,10 @@ before_script:
 
 script:
   - vendor/bin/phpunit --verbose $PHPUNIT_FLAGS
+  
+after_script:
+  - |
+    if [ $TRAVIS_PHP_VERSION = '5.6' ]; then
+      travis_retry wget https://scrutinizer-ci.com/ocular.phar
+      php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+    fi

CHANGELOG.md

@@ -1,12 +1,24 @@
 Yii Framework 2 mongodb extension Change Log
 ============================================
 
-2.1.8 under development
------------------------
+2.1.10 under development
+------------------------
 
 - no changes in this release.
 
 
+2.1.9 November 19, 2019
+-----------------------
+
+- Bug #286: Fix `Collection::dropAllIndexes()` error when no indexes were dropped (samdark)
+
+
+2.1.8 October 08, 2019
+----------------------
+
+- Bug #285: Fix `sessionWrite` callback fields (related to https://github.com/yiisoft/yii2/issues/17559 and https://github.com/yiisoft/yii2/pull/17188) (lubosdz)
+
+
 2.1.7 March 30, 2018
 --------------------
 

README.md

@@ -14,7 +14,7 @@ Documentation is at [docs/guide/README.md](docs/guide/README.md).
 
 [![Latest Stable Version](https://poser.pugx.org/yiisoft/yii2-mongodb/v/stable.png)](https://packagist.org/packages/yiisoft/yii2-mongodb)
 [![Total Downloads](https://poser.pugx.org/yiisoft/yii2-mongodb/downloads.png)](https://packagist.org/packages/yiisoft/yii2-mongodb)
-[![Build Status](https://travis-ci.org/yiisoft/yii2-mongodb.svg?branch=master)](https://travis-ci.org/yiisoft/yii2-mongodb)
+[![Build Status](https://travis-ci.com/yiisoft/yii2-mongodb.svg?branch=master)](https://travis-ci.com/yiisoft/yii2-mongodb)
 
 
 Installation

docs/guide-ja/topics-migrations.md

@@ -30,3 +30,26 @@ yii mongodb-migrate
 # 最後に適用されたマイグレーションを取り消す
 yii mongodb-migrate/down
 ```
+## 二つ以上の DB エンジンを使用するアプリケーションのための特殊な構成
+
+アプリケーションが複数のデータベースを使う場合の例です。
+
+- MySQL + MongoDB
+
+マイグレーション・コマンドを実行すると、同時に MySQL と MongoDB の両方のマイグレーション・ファイルが対象として扱われます。これは両者が既定では同じフォルダを共有するためです。
+
+**問題: MongoDB が MySQL のマイグレーション・ファイルを実行しようとし、MySQL が MongoDB のマイグレーション・ファイルを実行しようとする。**
+
+この問題を回避するためには、`migrations` フォルダの下に `mongodb` という新しいフォルダを作って、コンソール・アプリケーションを次のようにセットアップすることが出来ます。
+
+```php
+return [
+    // ...
+    'controllerMap' => [
+        'mongodb-migrate' => [
+          'class' => 'yii\mongodb\console\controllers\MigrateController',
+          'migrationPath' => '@app/migrations/mongodb',
+        ],
+    ],
+];
+```

docs/guide/topics-migrations.md

@@ -30,3 +30,26 @@ yii mongodb-migrate
 # reverts the last applied migration
 yii mongodb-migrate/down
 ```
+## Special configuration for an application that uses more than one DB engine
+
+In case your application uses multiple databases, example:  
+
+- MySQL + MongoDB
+
+If you run the migration commands, it will evaluate both MySQL and MongoDB migration files at the same time since both by default share the same folder.
+
+**Problem: MongoDB will try to run MySQL's migration files and the other way around.**
+
+In order to avoid that behavior, you can create a new folder called `mongodb` under your `migrations` folder, and then setup your console application like this:
+
+```php
+return [
+    // ...
+    'controllerMap' => [
+        'mongodb-migrate' => [
+          'class' => 'yii\mongodb\console\controllers\MigrateController',
+          'migrationPath' => '@app/migrations/mongodb',
+        ],
+    ],
+];
+```

src/Collection.php

@@ -206,7 +206,7 @@ public function dropIndex($columns)
     public function dropAllIndexes()
     {
         $result = $this->database->createCommand()->dropIndexes($this->name, '*');
-        return $result['nIndexesWas'];
+        return isset($result['nIndexesWas']) ? $result['nIndexesWas'] : 0;
     }
 
     /**

src/Session.php

@@ -56,6 +56,12 @@ class Session extends MultiFieldSession
      */
     public $sessionCollection = 'session';
 
+    /**
+     * @var array Session fields to be written into session table columns
+     * @since 2.1.8
+     */
+    protected $fields = [];
+
 
     /**
      * Initializes the Session component.
@@ -139,11 +145,35 @@ public function writeSession($id, $data)
         // exception must be caught in session write handler
         // http://us.php.net/manual/en/function.session-set-save-handler.php
         try {
+
+            // ensure backwards compatability, related to:
+            // https://github.com/yiisoft/yii2/pull/17188
+            // https://github.com/yiisoft/yii2/pull/17559
+            if ($this->writeCallback && !$this->fields) {
+                $this->fields = $this->composeFields();
+            }
+
+            // ensure data consistency
+            if (!isset($this->fields['data'])) {
+                $this->fields['data'] = $data;
+            } else {
+                $_SESSION = $this->fields['data'];
+            }
+
+            // ensure 'id' and 'expire' are never affected by [[writeCallback]]
+            $this->fields = array_merge($this->fields, [
+                'id' => $id,
+                'expire' => time() + $this->getTimeout(),
+            ]);
+
             $this->db->getCollection($this->sessionCollection)->update(
                 ['id' => $id],
-                $this->composeFields($id, $data),
+                $this->fields,
                 ['upsert' => true]
             );
+
+            $this->fields = [];
+
         } catch (\Exception $e) {
             Yii::$app->errorHandler->handleException($e);
             return false;

tests/data/travis/README.md

@@ -1,8 +1,8 @@
-This directory contains scripts for automated test runs via the [Travis CI](http://travis-ci.org) build service. They are used for the preparation of worker instances by setting up needed extensions and configuring database access.
+This directory contains scripts for automated test runs via the [Travis CI](http://travis-ci.com) build service. They are used for the preparation of worker instances by setting up needed extensions and configuring database access.
 
 These scripts might be used to configure your own system for test runs. But since their primary purpose remains to support Travis in running the test cases, you would be best advised to stick to the setup notes in the tests themselves.
 
 The scripts are:
 
  - [`mongodb-setup.sh`](mongodb-setup.sh)
-   Enables Mongo DB PHP extension
+   Enables Mongo DB PHP extension