made createQuery() config param optional

switchy · Feb 20, 2014 · 3b40d44 · 3b40d44
1 parent 1708a36
commit 3b40d44
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 29 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -36,7 +36,7 @@ before_script:
 
 script:
 # - vendor/bin/phpunit --coverage-clover tests/unit/runtime/coveralls/clover.xml --verbose --exclude-group mssql,oci,wincache,xcache,zenddata,vendor
- - vendor/bin/phpunit --verbose --exclude-group mssql,oci,wincache,xcache,zenddata,vendor
+ - vendor/bin/phpunit --verbose --exclude-group mssql,oci,wincache,xcache,zenddata
  - cd apps/basic && php vendor/bin/codecept run
 
 #after_script:

diff --git a/composer.json b/composer.json
@@ -80,7 +80,9 @@
  "require-dev": {
  "phpunit/phpunit": "3.7.*",
  "twig/twig": "*",
- "smarty/smarty": "*"
+ "smarty/smarty": "*",
+ "imagine/imagine": "v0.5.0",
+ "swiftmailer/swiftmailer": "*"
  },
  "suggest": {
  "phpdocumentor/reflection": "required by yii2-apidoc extension",

diff --git a/extensions/elasticsearch/ActiveRecord.php b/extensions/elasticsearch/ActiveRecord.php
@@ -148,9 +148,9 @@ public static function mget($primaryKeys, $options = [])
  * You may also define default conditions that should apply to all queries unless overridden:
  *
  * ```php
- * public static function createQuery()
+ * public static function createQuery($config = [])
  * {
- * return parent::createQuery()->where(['deleted' => false]);
+ * return parent::createQuery($config)->where(['deleted' => false]);
  * }
  * ```
  *
@@ -160,7 +160,7 @@ public static function mget($primaryKeys, $options = [])
  * @param array $config the configuration passed to the ActiveRelation class.
  * @return ActiveQuery the newly created [[ActiveQuery]] instance.
  */
- public static function createQuery($config)
+ public static function createQuery($config = [])
  {
  $config['modelClass'] = get_called_class();
  return new ActiveQuery($config);

diff --git a/extensions/mongodb/ActiveRecord.php b/extensions/mongodb/ActiveRecord.php
@@ -102,9 +102,9 @@ public static function deleteAll($condition = [], $options = [])
  * You may also define default conditions that should apply to all queries unless overridden:
  *
  * ```php
- * public static function createQuery()
+ * public static function createQuery($config = [])
  * {
- * return parent::createQuery()->where(['deleted' => false]);
+ * return parent::createQuery($config)->where(['deleted' => false]);
  * }
  * ```
  *
@@ -114,7 +114,7 @@ public static function deleteAll($condition = [], $options = [])
  * @param array $config the configuration passed to the ActiveRelation class.
  * @return ActiveQuery the newly created [[ActiveQuery]] instance.
  */
- public static function createQuery($config)
+ public static function createQuery($config = [])
  {
  $config['modelClass'] = get_called_class();
  return new ActiveQuery($config);

diff --git a/extensions/mongodb/file/ActiveRecord.php b/extensions/mongodb/file/ActiveRecord.php
@@ -55,9 +55,9 @@ abstract class ActiveRecord extends \yii\mongodb\ActiveRecord
  * You may also define default conditions that should apply to all queries unless overridden:
  *
  * ```php
- * public static function createQuery()
+ * public static function createQuery($config = [])
  * {
- * return parent::createQuery()->where(['deleted' => false]);
+ * return parent::createQuery($config)->where(['deleted' => false]);
  * }
  * ```
  *
@@ -67,7 +67,7 @@ abstract class ActiveRecord extends \yii\mongodb\ActiveRecord
  * @param array $config the configuration passed to the ActiveRelation class.
  * @return ActiveQuery the newly created [[ActiveQuery]] instance.
  */
- public static function createQuery($config)
+ public static function createQuery($config = [])
  {
  $config['modelClass'] = get_called_class();
  return new ActiveQuery($config);

diff --git a/extensions/redis/ActiveRecord.php b/extensions/redis/ActiveRecord.php
@@ -59,9 +59,9 @@ public static function getDb()
  * You may also define default conditions that should apply to all queries unless overridden:
  *
  * ```php
- * public static function createQuery()
+ * public static function createQuery($config= [])
  * {
- * return parent::createQuery()->where(['deleted' => false]);
+ * return parent::createQuery($config)->where(['deleted' => false]);
  * }
  * ```
  *
@@ -71,7 +71,7 @@ public static function getDb()
  * @param array $config the configuration passed to the ActiveRelation class.
  * @return ActiveQuery the newly created [[ActiveQuery]] instance.
  */
- public static function createQuery($config)
+ public static function createQuery($config = [])
  {
  $config['modelClass'] = get_called_class();
  return new ActiveQuery($config);

diff --git a/extensions/sphinx/ActiveRecord.php b/extensions/sphinx/ActiveRecord.php
@@ -144,9 +144,9 @@ public static function deleteAll($condition = '', $params = [])
  * You may also define default conditions that should apply to all queries unless overridden:
  *
  * ```php
- * public static function createQuery()
+ * public static function createQuery($config = [])
  * {
- * return parent::createQuery()->where(['deleted' => false]);
+ * return parent::createQuery($config)->where(['deleted' => false]);
  * }
  * ```
  *
@@ -156,7 +156,7 @@ public static function deleteAll($condition = '', $params = [])
  * @param array $config the configuration passed to the ActiveRelation class.
  * @return ActiveQuery the newly created [[ActiveQuery]] instance.
  */
- public static function createQuery($config)
+ public static function createQuery($config = [])
  {
  $config['modelClass'] = get_called_class();
  return new ActiveQuery($config);

diff --git a/framework/db/ActiveRecord.php b/framework/db/ActiveRecord.php
@@ -159,9 +159,9 @@ public static function deleteAll($condition = '', $params = [])
  * You may also define default conditions that should apply to all queries unless overridden:
  *
  * ```php
- * public static function createQuery()
+ * public static function createQuery($config = [])
  * {
- * return parent::createQuery()->where(['deleted' => false]);
+ * return parent::createQuery($config)->where(['deleted' => false]);
  * }
  * ```
  *
@@ -171,7 +171,7 @@ public static function deleteAll($condition = '', $params = [])
  * @param array $config the configuration passed to the ActiveRelation class.
  * @return ActiveQuery the newly created [[ActiveQuery]] instance.
  */
- public static function createQuery($config)
+ public static function createQuery($config = [])
  {
  $config['modelClass'] = get_called_class();
  return new ActiveQuery($config);

diff --git a/framework/db/ActiveRecordInterface.php b/framework/db/ActiveRecordInterface.php
@@ -122,9 +122,9 @@ public static function find($q = null);
  * You may also define default conditions that should apply to all queries unless overridden:
  *
  * ```php
- * public static function createQuery()
+ * public static function createQuery($config = [])
  * {
- * return parent::createQuery()->where(['deleted' => false]);
+ * return parent::createQuery($config)->where(['deleted' => false]);
  * }
  * ```
  *
@@ -134,7 +134,7 @@ public static function find($q = null);
  * @param array $config the configuration passed to the ActiveRelation class.
  * @return ActiveQueryInterface the newly created [[ActiveQueryInterface|ActiveQuery]] instance.
  */
- public static function createQuery($config);
+ public static function createQuery($config = []);
 
  /**
  * Updates records using the provided attribute values and conditions.

diff --git a/tests/unit/data/ar/Customer.php b/tests/unit/data/ar/Customer.php
@@ -41,7 +41,7 @@ public function afterSave($insert)
  parent::afterSave($insert);
  }
 
- public static function createQuery($config)
+ public static function createQuery($config = [])
  {
  $config['modelClass'] = get_called_class();
  return new CustomerQuery($config);

diff --git a/tests/unit/data/ar/elasticsearch/Customer.php b/tests/unit/data/ar/elasticsearch/Customer.php
@@ -63,7 +63,7 @@ public static function setUpMapping($command, $statusIsBoolean = false)
 
  }
 
- public static function createQuery($config)
+ public static function createQuery($config = [])
  {
  $config['modelClass'] = get_called_class();
  return new CustomerQuery($config);

diff --git a/tests/unit/data/ar/mongodb/Customer.php b/tests/unit/data/ar/mongodb/Customer.php
@@ -25,7 +25,7 @@ public function getOrders()
  return $this->hasMany(CustomerOrder::className(), ['customer_id' => '_id']);
  }
 
- public static function createQuery($config)
+ public static function createQuery($config = [])
  {
  $config['modelClass'] = get_called_class();
  return new CustomerQuery($config);

diff --git a/tests/unit/data/ar/mongodb/file/CustomerFile.php b/tests/unit/data/ar/mongodb/file/CustomerFile.php
@@ -20,7 +20,7 @@ public function attributes()
  );
  }
 
- public static function createQuery($config)
+ public static function createQuery($config = [])
  {
  $config['modelClass'] = get_called_class();
  return new CustomerFileQuery($config);

diff --git a/tests/unit/data/ar/redis/Customer.php b/tests/unit/data/ar/redis/Customer.php
@@ -31,7 +31,7 @@ public function afterSave($insert)
  parent::afterSave($insert);
  }
 
- public static function createQuery($config)
+ public static function createQuery($config = [])
  {
  $config['modelClass'] = get_called_class();
  return new CustomerQuery($config);

diff --git a/tests/unit/data/ar/sphinx/ArticleIndex.php b/tests/unit/data/ar/sphinx/ArticleIndex.php
@@ -25,7 +25,7 @@ public function getSnippetSource()
  return $this->source->content;
  }
 
- public static function createQuery($config)
+ public static function createQuery($config = [])
  {
  $config['modelClass'] = get_called_class();
  return new ArticleIndexQuery($config);