Setting driver wide collection options for safe, fsync and timeout.

.travis.yml

@@ -0,0 +1,48 @@
+language: php
+
+php:
+  - 5.6
+  - 7.0
+
+env:
+  global:
+    - PLUGIN_NAME=MongoDBLib
+    - DATASOURCE_NAME=MongodbSource
+    - REQUIRE=""
+
+  matrix:
+    - CAKE_VERSION=2.8
+    - CAKE_VERSION=2.9
+
+addons:
+  apt:
+    sources:
+      - mongodb-upstart
+      - mongodb-3.2-precise
+    packages:
+      - mongodb-org-server
+      - mongodb-org-shell
+
+matrix:
+  include:
+    - php: 5.6
+      env:
+        - CAKE_VERSION=2.8
+        - CODECOVERAGE=1
+    - php: 5.6
+      env:
+        - PHPCS=1
+
+before_script:
+  - if [[ $TRAVIS_PHP_VERSION =~ 5.6 ]] ; then echo yes | pecl install mongodb; fi;
+  - echo "extension=mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - git clone -b master https://github.com/FriendsOfCake/travis.git --depth 1 ../travis
+  - travis_wait ../travis/before_script.sh
+  - travis_retry composer install
+  - echo "require APP . 'vendor' . DS . 'autoload.php';" >> ../cakephp/app/Config/bootstrap.php
+
+script:
+  - if [ -d ../cakephp/app ]; then cd ../cakephp/app; fi; ./Console/cake test $PLUGIN_NAME Datasource/$DATASOURCE_NAME
+
+notifications:
+  email: false

models/behaviors/schemaless.php → Model/Behavior/SchemalessBehavior.php

@@ -68,7 +68,7 @@ class SchemalessBehavior extends ModelBehavior {
  * @return void
  * @access public
  */
-	public function setup(&$Model, $config = array()) {
+	public function setup(Model $Model, $config = array()) {
 		//$this->settings[$Model->alias] = array_merge($this->_defaultSettings, $config);
 	}
 
@@ -81,7 +81,7 @@ public function setup(&$Model, $config = array()) {
  * @return void
  * @access public
  */
-	public function beforeSave(&$Model) {
+	public function beforeSave(Model $Model, $options = array()) {
 		$Model->cacheSources = false;
 		$Model->schema(true);
 		return true;

models/behaviors/sql_compatible.php → Model/Behavior/SqlCompatibleBehavior.php

@@ -78,7 +78,7 @@ class SqlCompatibleBehavior extends ModelBehavior {
  * @return void
  * @access public
  */
-	public function setup(&$Model, $config = array()) {
+	public function setup(Model $Model, $config = array()) {
 		$this->settings[$Model->alias] = array_merge($this->_defaultSettings, $config);
 	}
 
@@ -91,7 +91,7 @@ public function setup(&$Model, $config = array()) {
  * @return void
  * @access public
  */
-	public function afterFind(&$Model, $results, $primary) {
+	public function afterFind(Model $Model, $results, $primary=false) {
 		if ($this->settings[$Model->alias]['convertDates']) {
 			$this->convertDates($results);
 		}
@@ -108,30 +108,55 @@ public function afterFind(&$Model, $results, $primary) {
  * @return void
  * @access public
  */
-	public function beforeFind(&$Model, $query) {
+	public function beforeFind(Model $Model, $query) {
+		if (is_array($query['order'])) {
+			$this->_translateOrders($Model, $query['order']);
+		}
 		if (is_array($query['conditions']) && $this->_translateConditions($Model, $query['conditions'])) {
 			return $query;
 		}
-		return true;
+		return $query;
 	}
 
 /**
  * Convert MongoDate objects to strings for the purpose of view simplicity
  *
  * @param mixed $results
  * @return void
- * @access public
+ * @access protected
  */
-	public function convertDates(&$results) {
+	protected function convertDates(&$results) {
 		if (is_array($results)) {
 			foreach($results as &$row) {
 				$this->convertDates($row);
 			}
-		} elseif (is_a($results, 'MongoDate')) {
-			$results = date('Y-M-d h:i:s', $results->sec);
+		} elseif (is_a($results, 'MongoDB\BSON\UTCDateTime')) {
+			$results = date('Y-M-d h:i:s', $results->toDateTime()->getTimestamp());
+		}
+	}
+
+
+/**
+ * translateOrders method
+ * change order syntax from SQL style to Mongo style
+ *
+ * @param mixed $Model
+ * @param mixed $orders
+ * @return void
+ * @access protected
+ */
+	protected function _translateOrders(Model &$Model, &$orders) {
+		if(!empty($orders[0])) {
+			foreach($orders[0] as $key => $val) {
+				if(preg_match('/^(.+) (ASC|DESC)$/i', $val, $match)) {
+					$orders[0][$match[1]] = $match[2];
+					unset($orders[0][$key]);
+				}
+			}
 		}
 	}
 
+
 /**
  * translateConditions method
  *
@@ -142,7 +167,7 @@ public function convertDates(&$results) {
  * @return void
  * @access protected
  */
-	protected function _translateConditions(&$Model, &$conditions) {
+	protected function _translateConditions(Model &$Model, &$conditions) {
 		$return = false;
 		foreach($conditions as $key => &$value) {
 			$uKey = strtoupper($key);
@@ -261,7 +286,7 @@ protected function _translateConditions(&$Model, &$conditions) {
  * @return string
  * @access protected
  */
-	protected function _translateOperator($Model, $operator) {
+	protected function _translateOperator(Model $Model, $operator) {
 		if (!empty($this->settings[$Model->alias]['operators'][$operator])) {
 			return $this->settings[$Model->alias]['operators'][$operator];
 		}