Merge branch '2.2'

orchestral · Jul 19, 2014 · 67bcbc7 · 67bcbc7
2 parents ee3b235 + f482243
commit 67bcbc7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -2,8 +2,8 @@
 	"name": "orchestra/foundation",
 	"description": "Orchestra Platform 2 Foundation Component",
 	"homepage": "http://orchestraplatform.com/docs/latest/",
-	"keywords": ["orchestra-platform", "orchestral", "laravel"],
 	"license": "MIT",
+	"keywords": ["orchestra-platform", "orchestral", "laravel", "administrator", "admin", "user-management"],
 	"authors": [
 		{
 			"name": "Mior Muhammad Zaki",

diff --git a/docs/changes.md b/docs/changes.md
@@ -5,7 +5,11 @@ title: Foundation Change Log
 
 ## Version 2.2 {#v2-2}
 
-### v2.2.3@dev {#v2.2.3}
+### v2.2.4@dev {#v2-2-4}
+
+* Deprecate `orchestra.validate: user.registration` event and replace it with `orchestra.validate: user.account.register` event.
+
+### v2.2.3 {#v2-2-3}
 
 * Fixed event names on registration.
 * Add new `orchestra.validate: user.registration` event.
@@ -41,7 +45,11 @@ title: Foundation Change Log
 
 ## Version 2.1 {#v2-1}
 
-### v2.1.10@dev {#v2-1-10}
+### v2.1.11@dev {#v2-1-11}
+
+* Deprecate `orchestra.validate: user.registration` event and replace it with `orchestra.validate: user.account.register` event.
+
+### v2.1.10 {#v2-1-10}
 
 * Fixed event names on registration.
 * Add new `orchestra.validate: user.registration` event.

diff --git a/src/Foundation/Validation/Account.php b/src/Foundation/Validation/Account.php
@@ -31,6 +31,7 @@ class Account extends Validator
     protected function onRegister()
     {
         $this->rules['email'] = array('required', 'email', 'unique:users,email');
+        $this->events[] = 'orchestra.validate: user.account.register';
         $this->events[] = 'orchestra.validate: user.registration';
     }