Merge branch '2.0.x' of https://github.com/phalcon/cphalcon into 2.0.x

phalcon · Jun 5, 2015 · e4c390d · e4c390d
2 parents fc8b331 + 5519b17
commit e4c390d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/phalcon/db/dialect.zep b/phalcon/db/dialect.zep
@@ -213,7 +213,7 @@ abstract class Dialect implements DialectInterface
 	/**
 	 * Transforms an intermediate representation for a expression into a database system valid expression
 	 */
-	public function getSqlExpression(array! expression, var escapeChar = null) -> string
+	public function getSqlExpression(array! expression, string escapeChar = null) -> string
 	{
 		var type;
 

diff --git a/phalcon/mvc/model.zep b/phalcon/mvc/model.zep
@@ -4244,7 +4244,7 @@ abstract class Model implements ModelInterface, ResultInterface, InjectionAwareI
 	public static function setup(array! options) -> void
 	{
 		var disableEvents, columnRenaming, notNullValidations,
-			exceptionOnFailedSave, phqlLiterals, virtualForeignKeys;
+			exceptionOnFailedSave, phqlLiterals, virtualForeignKeys, lateStateBinding;
 
 		/**
 		 * Enables/Disables globally the internal events
@@ -4287,6 +4287,13 @@ abstract class Model implements ModelInterface, ResultInterface, InjectionAwareI
 		if fetch phqlLiterals, options["phqlLiterals"] {
 			globals_set("orm.enable_literals", phqlLiterals);
 		}
+
+                /**
+                 * Enables/Disables late state binding on model hydration
+                 */
+                if fetch lateStateBinding, options["lateStateBinding"] {
+                        globals_set("orm.late_state_binding", lateStateBinding);
+                }
 	}
 
 	/**

diff --git a/phalcon/mvc/model/criteria.zep b/phalcon/mvc/model/criteria.zep
@@ -741,7 +741,7 @@ class Criteria implements CriteriaInterface, InjectionAwareInterface
 	public function execute() -> <ResultsetInterface>
 	{
 		var model;
-		let model = this->_model;
+		let model = this->getModelName();
 		if typeof model != "string" {
 			throw new Exception("Model name must be string");
 		}

diff --git a/phalcon/security.zep b/phalcon/security.zep
@@ -196,7 +196,14 @@ class Security implements InjectionAwareInterface
 				}
 
 				break;
-
+			case self::CRYPT_SHA512:
+				let saltBytes = this->getSaltBytes(8);
+				if typeof saltBytes != "string" {
+					throw new Exception("Unable to get random bytes for the salt");
+				}   
+				return crypt(password, "$" . variant . "$"  . saltBytes);
+
+				break;
 			case self::CRYPT_DEFAULT:
 			case self::CRYPT_BLOWFISH:
 			case self::CRYPT_BLOWFISH_X: