Update namespaces

vanmil · Jan 16, 2014 · ecd4e94 · ecd4e94
1 parent 2462d4d
commit ecd4e94
Show file tree

Hide file tree

Showing 15 changed files with 50 additions and 49 deletions.
diff --git a/Plugin.php b/Plugin.php
@@ -1,7 +1,7 @@
-<?php namespace Plugins\RainLab\User;
+<?php namespace RainLab\User;
 
 use Backend;
-use Modules\System\Classes\PluginBase;
+use System\Classes\PluginBase;
 use October\Rain\Support\FacadeLoader;
 
 class Plugin extends PluginBase
@@ -20,16 +20,17 @@ public function pluginDetails()
     public function register()
     {
         $facade = FacadeLoader::instance();
-        $facade->facade('Auth', 'Plugins\RainLab\User\Facades\Auth');
+        $facade->facade('Auth', 'RainLab\User\Facades\Auth');
     }
 
     public function registerComponents()
     {
         return [
-            'Plugins\RainLab\User\Components\RegisterForm' => 'userRegisterForm',
-            'Plugins\RainLab\User\Components\SignInForm' => 'userSignInForm',
-            'Plugins\RainLab\User\Components\ResetForm' => 'userResetForm',
-            'Plugins\RainLab\User\Components\User' => 'user',
+            'RainLab\User\Components\RegisterForm' => 'userRegisterForm',
+            'RainLab\User\Components\SignInForm' => 'userSignInForm',
+            'RainLab\User\Components\ResetForm' => 'userResetForm',
+            'RainLab\User\Components\UpdateForm' => 'userUpdateForm',
+            'RainLab\User\Components\User' => 'user',
         ];
     }
 

diff --git a/classes/AuthManager.php b/classes/AuthManager.php
@@ -1,14 +1,14 @@
-<?php namespace Plugins\RainLab\User\Classes;
+<?php namespace RainLab\User\Classes;
 
 use October\Rain\Auth\Manager as RainAuthManager;
 
 class AuthManager extends RainAuthManager
 {
     protected static $instance;
 
-    protected $userModel = 'Plugins\RainLab\User\Models\User';
+    protected $userModel = 'RainLab\User\Models\User';
 
-    // protected $groupModel = 'Plugins\RainLab\User\Models\Group';
+    // protected $groupModel = 'RainLab\User\Models\Group';
 
-    protected $throttleModel = 'Plugins\RainLab\User\Models\Throttle';
+    protected $throttleModel = 'RainLab\User\Models\Throttle';
 }
diff --git a/components/RegisterForm.php b/components/RegisterForm.php
@@ -1,10 +1,10 @@
-<?php namespace Plugins\RainLab\User\Components;
+<?php namespace RainLab\User\Components;
 
 use Auth;
 use Input;
 use Redirect;
 use Validator;
-use Modules\Cms\Classes\ComponentBase;
+use Cms\Classes\ComponentBase;
 use October\Rain\Support\ValidationException;
 
 class RegisterForm extends ComponentBase

diff --git a/components/ResetForm.php b/components/ResetForm.php
@@ -1,12 +1,12 @@
-<?php namespace Plugins\RainLab\User\Components;
+<?php namespace RainLab\User\Components;
 
 use Auth;
 use Mail;
 use View;
 use Validator;
-use Modules\Cms\Classes\ComponentBase;
+use Cms\Classes\ComponentBase;
 use October\Rain\Support\ValidationException;
-use Modules\System\Classes\ApplicationException;
+use System\Classes\ApplicationException;
 
 class ResetForm extends ComponentBase
 {
@@ -88,7 +88,7 @@ public function onResetPassword()
             throw new ValidationException(['code' => 'Invalid activation code supplied']);
     }
 
-    public function getCode()
+    public function code()
     {
         $routeParameter = $this->property('code-param');
         return $this->param($routeParameter);

diff --git a/components/SignInForm.php b/components/SignInForm.php
@@ -1,9 +1,9 @@
-<?php namespace Plugins\RainLab\User\Components;
+<?php namespace RainLab\User\Components;
 
 use Auth;
 use Redirect;
 use Validator;
-use Modules\Cms\Classes\ComponentBase;
+use Cms\Classes\ComponentBase;
 use October\Rain\Support\ValidationException;
 
 class SignInForm extends ComponentBase

diff --git a/components/User.php b/components/User.php
@@ -1,8 +1,8 @@
-<?php namespace Plugins\RainLab\User\Components;
+<?php namespace RainLab\User\Components;
 
 use Auth;
 use Redirect;
-use Modules\Cms\Classes\ComponentBase;
+use Cms\Classes\ComponentBase;
 use October\Rain\Support\ValidationException;
 
 class User extends ComponentBase
@@ -21,17 +21,6 @@ public function defineProperties()
         return [];
     }
 
-    /**
-     * Returns the logged in user, if available
-     */
-    public function active()
-    {
-        if (!Auth::check())
-            return null;
-
-        return Auth::getUser();
-    }
-
     /**
      * Log out the user
      *
@@ -44,4 +33,15 @@ public function onLogout()
         return Redirect::to('/');
     }
 
+    /**
+     * Returns the logged in user, if available
+     */
+    public function active()
+    {
+        if (!Auth::check())
+            return null;
+
+        return Auth::getUser();
+    }
+
 }
diff --git a/components/registerform/default.htm b/components/registerform/default.htm
@@ -1,8 +1,8 @@
 <form
     data-request="{{ __SELF__}}::onRegister">
     <div class="form-group">
-        <label for="userRegisterName">Name</label>
-        <input name="name" type="text" class="form-control" id="userRegisterEmail" placeholder="Enter your name">
+        <label for="userRegisterName">Full Name</label>
+        <input name="name" type="text" class="form-control" id="userRegisterEmail" placeholder="Enter your full name">
     </div>
 
     <div class="form-group">

diff --git a/controllers/Users.php b/controllers/Users.php
@@ -1,15 +1,15 @@
-<?php namespace Plugins\RainLab\User\Controllers;
+<?php namespace RainLab\User\Controllers;
 
 use Session;
 use BackendMenu;
 use BackendAuth;
-use Modules\Backend\Classes\BackendController;
+use Backend\Classes\BackendController;
 
 class Users extends BackendController
 {
     public $implement = [
-        'Modules.Backend.Behaviors.FormController',
-        'Modules.Backend.Behaviors.ListController'
+        'Backend.Behaviors.FormController',
+        'Backend.Behaviors.ListController'
     ];
 
     public $formConfig = 'form_config.yaml';

diff --git a/controllers/users/form_config.yaml b/controllers/users/form_config.yaml
@@ -4,7 +4,7 @@
 
 name: User
 form: /plugins/rainlab/user/models/user/form_fields.yaml
-model-class: Plugins\RainLab\User\Models\User
+model-class: RainLab\User\Models\User
 default-redirect: rainlab/user/users
 
 create:

diff --git a/controllers/users/list_config.yaml b/controllers/users/list_config.yaml
@@ -4,7 +4,7 @@
 
 title: Manage Users
 list: /plugins/rainlab/user/models/user/list_columns.yaml
-model-class: Plugins\RainLab\User\Models\User
+model-class: RainLab\User\Models\User
 record-url: rainlab/user/users/update/:id
 no-records-message: backend::lang.list.no_records
 records-per-page: 5

diff --git a/facades/Auth.php b/facades/Auth.php
@@ -1,4 +1,4 @@
-<?php namespace Plugins\RainLab\User\Facades;
+<?php namespace RainLab\User\Facades;
 
 use October\Rain\Support\Facade;
 
@@ -8,5 +8,5 @@ class Auth extends Facade
      * Get the class name this facade is acting on behalf of.
      * @return string
      */
-    protected static function getFacadeAccessor() { return 'Plugins\RainLab\User\Classes\AuthManager'; }
+    protected static function getFacadeAccessor() { return 'RainLab\User\Classes\AuthManager'; }
 }
diff --git a/models/Throttle.php b/models/Throttle.php
@@ -1,4 +1,4 @@
-<?php namespace Plugins\RainLab\User\Models;
+<?php namespace RainLab\User\Models;
 
 use October\Rain\Auth\Models\Throttle as ThrottleBase;
 
@@ -13,6 +13,6 @@ class Throttle extends ThrottleBase
      * @var array Relations
      */
     public $belongsTo = [
-        'user' => ['Plugins\RainLab\User\Models\User', 'foreignKey' => 'user_id']
+        'user' => ['RainLab\User\Models\User', 'foreignKey' => 'user_id']
     ];
 }
diff --git a/models/User.php b/models/User.php
@@ -1,4 +1,4 @@
-<?php namespace Plugins\RainLab\User\Models;
+<?php namespace RainLab\User\Models;
 
 use October\Rain\Auth\Models\User as UserBase;
 
@@ -22,11 +22,11 @@ class User extends UserBase
      * Relations
      */
     // public $belongsToMany = [
-    //     'groups' => ['Plugins\RainLab\User\Models\Group', 'table' => 'user_groups']
+    //     'groups' => ['RainLab\User\Models\Group', 'table' => 'user_groups']
     // ];
 
     public $morphOne = [
-        'avatar' => ['Modules\System\Models\File', 'name' => 'attachment']
+        'avatar' => ['System\Models\File', 'name' => 'attachment']
     ];
 
     /**

diff --git a/updates/create_throttle_table.php b/updates/create_throttle_table.php
@@ -1,4 +1,4 @@
-<?php namespace Plugins\RainLab\User\Updates;
+<?php namespace RainLab\User\Updates;
 
 use Schema;
 use October\Rain\Database\Updates\Migration;

diff --git a/updates/create_users_table.php b/updates/create_users_table.php
@@ -1,4 +1,4 @@
-<?php namespace Plugins\RainLab\User\Updates;
+<?php namespace RainLab\User\Updates;
 
 use Schema;
 use October\Rain\Database\Updates\Migration;