Fix #232: Fix master branch tests (#255)

Author: ArekX

.gitignore

@@ -28,5 +28,4 @@ phpunit.phar
 /phpunit.xml
 
 # local tests files
-/tests/ActiveRecordTestTrait.php
 /tests/data/config.local.php

.travis.yml

@@ -4,6 +4,8 @@ env:
 
 language: php
 
+dist: trusty
+
 php:
   - 5.4
   - 5.5

ActiveRecord.php

@@ -13,11 +13,12 @@
 use yii\base\InvalidConfigException;
 use yii\base\InvalidParamException;
 use yii\base\NotSupportedException;
+use yii\db\ActiveQueryInterface;
+use yii\db\ActiveRecordInterface;
 use yii\db\BaseActiveRecord;
 use yii\db\StaleObjectException;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Inflector;
-use yii\helpers\Json;
 use yii\helpers\StringHelper;
 
 /**
@@ -118,10 +119,10 @@ public static function findAll($condition)
      */
     private static function filterCondition($condition)
     {
-        foreach($condition as $k => $v) {
+        foreach ($condition as $k => $v) {
             if (is_array($v)) {
                 $condition[$k] = array_values($v);
-                foreach($v as $vv) {
+                foreach ($v as $vv) {
                     if (is_array($vv)) {
                         throw new InvalidArgumentException('Nested arrays are not allowed in condition for findAll() and findOne().');
                     }
@@ -358,7 +359,7 @@ public static function populateRecord($record, $row)
         if (isset($row['fields'])) {
             // reset fields in case it is scalar value
             $arrayAttributes = $record->arrayAttributes();
-            foreach($row['fields'] as $key => $value) {
+            foreach ($row['fields'] as $key => $value) {
                 if (!isset($arrayAttributes[$key]) && count($value) === 1) {
                     $row['fields'][$key] = reset($value);
                 }
@@ -528,14 +529,14 @@ public function update($runValidation = true, $attributeNames = null, $options =
     }
 
     /**
-     * @see update()
      * @param array $attributes attributes to update
      * @param array $options options given in this parameter are passed to elasticsearch
      * as request URI parameters. See [[update()]] for details.
      * @return int|false the number of rows affected, or false if [[beforeSave()]] stops the updating process.
      * @throws StaleObjectException if optimistic locking is enabled and the data being updated is outdated.
      * @throws InvalidParamException if no [[version]] is available and optimistic locking is enabled.
      * @throws Exception in case update failed.
+     * @see update()
      */
     protected function updateInternal($attributes = null, $options = [])
     {
@@ -564,7 +565,7 @@ protected function updateInternal($attributes = null, $options = [])
                 $values,
                 $options
             );
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             // HTTP 409 is the response in case of failed optimistic locking
             // http://www.elastic.co/guide/en/elasticsearch/guide/current/optimistic-concurrency-control.html
             if (isset($e->errorInfo['responseCode']) && $e->errorInfo['responseCode'] == 409) {
@@ -629,9 +630,9 @@ protected static function primaryKeysByCondition($condition)
      * @param array $attributes attribute values (name-value pairs) to be saved into the table
      * @param array $condition the conditions that will be passed to the `where()` method when building the query.
      * Please refer to [[ActiveQuery::where()]] on how to specify this parameter.
-     * @see [[ActiveRecord::primaryKeysByCondition()]]
      * @return int the number of rows updated
      * @throws Exception on error.
+     * @see [[ActiveRecord::primaryKeysByCondition()]]
      */
     public static function updateAll($attributes, $condition = [])
     {
@@ -677,9 +678,9 @@ public static function updateAll($attributes, $condition = [])
      * Use negative values if you want to decrement the counters.
      * @param array $condition the conditions that will be passed to the `where()` method when building the query.
      * Please refer to [[ActiveQuery::where()]] on how to specify this parameter.
-     * @see [[ActiveRecord::primaryKeysByCondition()]]
      * @return int the number of rows updated
      * @throws Exception on error.
+     * @see [[ActiveRecord::primaryKeysByCondition()]]
      */
     public static function updateAllCounters($counters, $condition = [])
     {
@@ -767,7 +768,7 @@ public function delete($options = [])
                 $this->getOldPrimaryKey(false),
                 $options
             );
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             // HTTP 409 is the response in case of failed optimistic locking
             // http://www.elastic.co/guide/en/elasticsearch/guide/current/optimistic-concurrency-control.html
             if (isset($e->errorInfo['responseCode']) && $e->errorInfo['responseCode'] == 409) {
@@ -799,9 +800,9 @@ public function delete($options = [])
      *
      * @param array $condition the conditions that will be passed to the `where()` method when building the query.
      * Please refer to [[ActiveQuery::where()]] on how to specify this parameter.
-     * @see [[ActiveRecord::primaryKeysByCondition()]]
      * @return int the number of rows deleted
      * @throws Exception on error.
+     * @see [[ActiveRecord::primaryKeysByCondition()]]
      */
     public static function deleteAll($condition = [])
     {
@@ -857,4 +858,57 @@ public function unlinkAll($name, $delete = false)
     {
         throw new NotSupportedException('unlinkAll() is not supported by elasticsearch, use unlink() instead.');
     }
+
+    public function link($name, $model, $extraColumns = [])
+    {
+        $relation = $this->getRelation($name);
+
+        if ($relation->via === null) {
+            $this->validateViaRelationLink($model, $relation);
+        }
+
+        parent::link($name, $model, $extraColumns);
+    }
+
+    /**
+     * Validates model so that it does not contain array as it's keys while linking.
+     *
+     * @param ActiveRecordInterface $model the model to be linked with the current one.
+     * @param ActiveQueryInterface|ActiveQuery the relational query object.
+     */
+    protected function validateViaRelationLink($model, $relation)
+    {
+        $p1 = $model->isPrimaryKey(array_keys($relation->link));
+        $p2 = static::isPrimaryKey(array_values($relation->link));
+
+        $atLeastOneExists = !$this->getIsNewRecord() || !$model->getIsNewRecord();
+
+        $foreign = null;
+        $link = null;
+
+        if ($p1 && $p2 && $atLeastOneExists) {
+
+            if ($this->getIsNewRecord()) {
+                $foreign = $this;
+                $link = array_flip($relation->link);
+            } else {
+                $foreign = $model;
+                $link = $relation->link;
+            }
+        } elseif ($p1) {
+            $foreign = $this;
+            $link = array_flip($relation->link);
+        } elseif ($p2) {
+            $foreign = $model;
+            $link = $relation->link;
+        }
+
+        if ($foreign && $link) {
+            foreach ($link as $fk => $pk) {
+                if (is_array($foreign->{$fk})) {
+                    throw new InvalidCallException('Unable to link models: foreign model cannot be linked if it\'s property is an array.');
+                }
+            }
+        }
+    }
 }

docs/guide-ru/usage-ar.md

@@ -159,4 +159,4 @@ $aggData = Customer::find()->addAggregation('customers_by_date', 'terms', [
 $customersByDate = ArrayHelper::map($aggData['aggregations']['customers_by_date']['buckets'], 'key', 'doc_count');
 ```
 
-Теперь `$customersByDate` содержит 10 дат, которые соответствуют наибольшему числу зарегистрированных пользователей.
+Теперь `$customersByDate` содержит 10 дат, которые соответствуют наибольшему числу зарегистрированных пользователей.