cleanup after #4092

extensions/elasticsearch/CHANGELOG.md

@@ -7,6 +7,7 @@ Yii Framework 2 elasticsearch extension Change Log
 - Bug #3587: Fixed an issue with storing empty records (cebe)
 - Enh #3520: Added `unlinkAll()`-method to active record to remove all records of a model relation (NmDimas, samdark, cebe)
 - Enh #3527: Added `highlight` property to Query and ActiveRecord. (Borales)
+- Enh #4086: changedAttributes of afterSave Event now contain old values (dizews)
 - Enh: Make error messages more readable in HTML output (cebe)
 - Chg: asArray in ActiveQuery is now equal to using the normal Query. This means, that the output structure has changed and `with` is supported anymore. (cebe)
 - Chg: Deletion of a record is now also considered successful if the record did not exist. (cebe)

extensions/elasticsearch/Connection.php

@@ -433,23 +433,23 @@ class Connection extends Component
         }
     }
 
-	/**
-	 * Try to decode error information if it is valid json, return it if not.
-	 * @param $body
-	 * @return mixed
-	 */
-	protected function decodeErrorBody($body)
-	{
-		try {
-			$decoded = Json::decode($body);
-			if (isset($decoded['error'])) {
-				$decoded['error'] = preg_replace('/\b\w+?Exception\[/', "<span style=\"color: red;\">\\0</span>\n               ", $decoded['error']);
-			}
-			return $decoded;
-		} catch(InvalidParamException $e) {
-			return $body;
-		}
-	}
+    /**
+     * Try to decode error information if it is valid json, return it if not.
+     * @param $body
+     * @return mixed
+     */
+    protected function decodeErrorBody($body)
+    {
+        try {
+            $decoded = Json::decode($body);
+            if (isset($decoded['error'])) {
+                $decoded['error'] = preg_replace('/\b\w+?Exception\[/', "<span style=\"color: red;\">\\0</span>\n               ", $decoded['error']);
+            }
+            return $decoded;
+        } catch(InvalidParamException $e) {
+            return $body;
+        }
+    }
 
     public function getNodeInfo()
     {

extensions/mongodb/ActiveRecord.php

@@ -264,7 +264,7 @@ abstract class ActiveRecord extends BaseActiveRecord
         $changedAttributes = [];
         foreach ($values as $name => $value) {
             $changedAttributes[$name] = $this->getOldAttribute($name);
-            $this->setOldAttribute($name, $this->getAttribute($name));
+            $this->setOldAttribute($name, $value);
         }
         $this->afterSave(false, $changedAttributes);
 

extensions/mongodb/CHANGELOG.md

@@ -8,6 +8,7 @@ Yii Framework 2 mongodb extension Change Log
 - Enh #3520: Added `unlinkAll()`-method to active record to remove all records of a model relation (NmDimas, samdark, cebe)
 - Enh #3778: Gii generator for Active Record model added (klimov-paul)
 - Enh #3947: Migration support added (klimov-paul)
+- Enh #4086: changedAttributes of afterSave Event now contain old values (dizews)
 
 
 2.0.0-beta April 13, 2014

extensions/mongodb/file/ActiveRecord.php

@@ -200,7 +200,7 @@ abstract class ActiveRecord extends \yii\mongodb\ActiveRecord
         $changedAttributes = [];
         foreach ($values as $name => $value) {
             $changedAttributes[$name] = $this->getOldAttribute($name);
-            $this->setOldAttribute($name, $this->getAttribute($name));
+            $this->setOldAttribute($name, $value);
         }
         $this->afterSave(false, $changedAttributes);
 

extensions/redis/CHANGELOG.md

@@ -5,6 +5,7 @@ Yii Framework 2 redis extension Change Log
 --------------------------
 
 - Enh #3520: Added `unlinkAll()`-method to active record to remove all records of a model relation (NmDimas, samdark, cebe)
+- Enh #4086: changedAttributes of afterSave Event now contain old values (dizews)
 
 
 2.0.0-beta April 13, 2014

extensions/sphinx/ActiveRecord.php

@@ -395,9 +395,9 @@ abstract class ActiveRecord extends BaseActiveRecord
             return false;
         }
 
-		$changedAttributes = array_fill_keys(array_keys($values), null);
-		$this->setOldAttributes($values);
-		$this->afterSave(true, $changedAttributes);
+        $changedAttributes = array_fill_keys(array_keys($values), null);
+        $this->setOldAttributes($values);
+        $this->afterSave(true, $changedAttributes);
 
         return true;
     }
@@ -534,7 +534,7 @@ abstract class ActiveRecord extends BaseActiveRecord
         $changedAttributes = [];
         foreach ($values as $name => $value) {
             $changedAttributes[$name] = $this->getOldAttribute($name);
-            $this->setOldAttribute($name, $this->getAttribute($name));
+            $this->setOldAttribute($name, $value);
         }
         $this->afterSave(false, $changedAttributes);
 

extensions/sphinx/CHANGELOG.md

@@ -6,8 +6,9 @@ Yii Framework 2 sphinx extension Change Log
 
 - Bug #3668: Escaping of the special characters at 'MATCH' statement added (klimov-paul)
 - Bug #4018: AR relation eager loading does not work with db models (klimov-paul)
-- Enh: Added support for using sub-queries when building a DB query with `IN` condition (qiangxue)
 - Enh #3520: Added `unlinkAll()`-method to active record to remove all records of a model relation (NmDimas, samdark, cebe)
+- Enh #4086: changedAttributes of afterSave Event now contain old values (dizews)
+- Enh: Added support for using sub-queries when building a DB query with `IN` condition (qiangxue)
 - Chg #2287: Split `yii\sphinx\ColumnSchema::typecast()` into two methods `phpTypecast()` and `dbTypecast()` to allow specifying PDO type explicitly (cebe)
 
 

framework/CHANGELOG.md

@@ -122,7 +122,7 @@ Yii Framework 2 Change Log
     - Added note about the fact that intl is required for non-latin languages to requirements checker.
 - Enh #4028: Added ability to `yii\widgets\Menu` to encode each item's label separately (creocoder, umneeq)
 - Enh #4080: Added proper handling and support of the symlinked directories in `FileHelper`, added $options parameter in `FileHelper::removeDirectory()` (resurtm)
-- Enh #4086: changedAttributes of AfterSaveEvent contain an old values (dizews)
+- Enh #4086: changedAttributes of afterSave Event now contain old values (dizews)
 - Enh: Added support for using sub-queries when building a DB query with `IN` condition (qiangxue)
 - Enh: Supported adding a new response formatter without the need to reconfigure existing formatters (qiangxue)
 - Enh: Added `yii\web\UrlManager::addRules()` to simplify adding new URL rules (qiangxue)

framework/UPGRADE.md

@@ -61,7 +61,7 @@ Upgrade from Yii 2.0 Beta
 * The behavior and signature of `ActiveRecord::afterSave()` has changed. `ActiveRecord::$isNewRecord` will now always be
   false in afterSave and also dirty attributes are not available. This change has been made to have a more consistent and
   expected behavior. The changed attributes are now available in the new parameter of afterSave() `$changedAttributes`.
-  The `$changedAttributes` contain an old values of attributes that had changed and were saved.
+  `$changedAttributes` contains the old values of attributes that had changed and were saved.
 
 * `ActiveRecord::updateAttributes()` has been changed to not trigger events and not respect optimistic locking anymore to
   differentiate it more from calling `update(false)` and to ensure it can be used in `afterSave()` without triggering infinite

framework/db/BaseActiveRecord.php

@@ -717,7 +717,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
         $changedAttributes = [];
         foreach ($values as $name => $value) {
             $changedAttributes[$name] = $this->_oldAttributes[$name];
-            $this->_oldAttributes[$name] = $this->_attributes[$name];
+            $this->_oldAttributes[$name] = $value;
         }
         $this->afterSave(false, $changedAttributes);
 
@@ -878,6 +878,10 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
      * @param boolean $insert whether this method called while inserting a record.
      * If false, it means the method is called while updating a record.
      * @param array $changedAttributes The old values of attributes that had changed and were saved.
+     * You can use this parameter to take action based on the changes made for example send an email
+     * when the password had changed or implement audit trail that tracks all the changes.
+     * `$changedAttributes` gives you the old attribute values while the active record (`$this`) has
+     * already the new, updated values.
      */
     public function afterSave($insert, $changedAttributes)
     {

framework/db/cubrid/Schema.php

@@ -298,27 +298,27 @@ class Schema extends \yii\db\Schema
         return isset($typeMap[$type]) ? $typeMap[$type] : \PDO::PARAM_STR;
     }
 
-	/**
-	 * @inheritdoc
-	 * @see http://www.cubrid.org/manual/91/en/sql/transaction.html#database-concurrency
-	 */
-	public function setTransactionIsolationLevel($level)
-	{
-		// translate SQL92 levels to CUBRID levels:
-		switch ($level) {
-			case Transaction::SERIALIZABLE:
-				$level = '6'; // SERIALIZABLE
-				break;
-			case Transaction::REPEATABLE_READ:
-				$level = '5'; // REPEATABLE READ CLASS with REPEATABLE READ INSTANCES
-				break;
-			case Transaction::READ_COMMITTED:
-				$level = '4'; // REPEATABLE READ CLASS with READ COMMITTED INSTANCES
-				break;
-			case Transaction::READ_UNCOMMITTED:
-				$level = '3'; // REPEATABLE READ CLASS with READ UNCOMMITTED INSTANCES
-				break;
-		}
-		parent::setTransactionIsolationLevel($level);
-	}
+    /**
+     * @inheritdoc
+     * @see http://www.cubrid.org/manual/91/en/sql/transaction.html#database-concurrency
+     */
+    public function setTransactionIsolationLevel($level)
+    {
+        // translate SQL92 levels to CUBRID levels:
+        switch ($level) {
+            case Transaction::SERIALIZABLE:
+                $level = '6'; // SERIALIZABLE
+                break;
+            case Transaction::REPEATABLE_READ:
+                $level = '5'; // REPEATABLE READ CLASS with REPEATABLE READ INSTANCES
+                break;
+            case Transaction::READ_COMMITTED:
+                $level = '4'; // REPEATABLE READ CLASS with READ COMMITTED INSTANCES
+                break;
+            case Transaction::READ_UNCOMMITTED:
+                $level = '3'; // REPEATABLE READ CLASS with READ UNCOMMITTED INSTANCES
+                break;
+        }
+        parent::setTransactionIsolationLevel($level);
+    }
 }

tests/unit/framework/ar/ActiveRecordTestTrait.php

@@ -827,12 +827,14 @@ trait ActiveRecordTestTrait
         $customerClass = $this->getCustomerClass();
         /* @var $this TestCase|ActiveRecordTestTrait */
         // save
+        /* @var $customer Customer */
         $customer = $customerClass::findOne(2);
         $this->assertTrue($customer instanceof $customerClass);
         $this->assertEquals('user2', $customer->name);
         $this->assertFalse($customer->isNewRecord);
         static::$afterSaveNewRecord = null;
         static::$afterSaveInsert = null;
+        $this->assertEmpty($customer->dirtyAttributes);
 
         $customer->name = 'user2x';
         $customer->save();