change Orm to ActiveRecord

Author: allanfreitas

composer.json

@@ -28,17 +28,17 @@
         "predis/predis": "0.8.*",
         "stack/builder": "1.0.*",
         "swiftmailer/swiftmailer": "5.0.*",
-        "symfony/browser-kit": "2.4.1",
-        "symfony/console": "2.4.1",
-        "symfony/css-selector": "2.4.1",
-        "symfony/debug": "2.4.1",
-        "symfony/dom-crawler": "2.4.1",
-        "symfony/finder": "2.4.1",
-        "symfony/http-foundation": "2.4.1",
-        "symfony/http-kernel": "2.4.1",
-        "symfony/process": "2.4.1",
-        "symfony/routing": "2.4.1",
-        "symfony/translation": "2.4.1"
+        "symfony/browser-kit": "2.4.*",
+        "symfony/console": "2.4.*",
+        "symfony/css-selector": "2.4.*",
+        "symfony/debug": "2.4.*",
+        "symfony/dom-crawler": "2.4.*",
+        "symfony/finder": "2.4.*",
+        "symfony/http-foundation": "2.4.*",
+        "symfony/http-kernel": "2.4.*",
+        "symfony/process": "2.4.*",
+        "symfony/routing": "2.4.*",
+        "symfony/translation": "2.4.*"
     },
     "require-dev": {
         "aws/aws-sdk-php": "2.5.*",

src/Fly/Auth/ActiveRecordUserProvider.php

@@ -0,0 +1,92 @@
+<?php namespace Fly\Auth;
+
+use Fly\Hashing\HasherInterface;
+
+class ActiveRecordUserProvider implements UserProviderInterface {
+
+	/**
+	 * The hasher implementation.
+	 *
+	 * @var \Fly\Hashing\HasherInterface
+	 */
+	protected $hasher;
+
+	/**
+	 * The ActiveRecord user model.
+	 *
+	 * @var string
+	 */
+	protected $model;
+
+	/**
+	 * Create a new database user provider.
+	 *
+	 * @param  \Fly\Hashing\HasherInterface  $hasher
+	 * @param  string  $model
+	 * @return void
+	 */
+	public function __construct(HasherInterface $hasher, $model)
+	{
+		$this->model = $model;
+		$this->hasher = $hasher;
+	}
+
+	/**
+	 * Retrieve a user by their unique identifier.
+	 *
+	 * @param  mixed  $identifier
+	 * @return \Fly\Auth\UserInterface|null
+	 */
+	public function retrieveById($identifier)
+	{
+		return $this->createModel()->newQuery()->find($identifier);
+	}
+
+	/**
+	 * Retrieve a user by the given credentials.
+	 *
+	 * @param  array  $credentials
+	 * @return \Fly\Auth\UserInterface|null
+	 */
+	public function retrieveByCredentials(array $credentials)
+	{
+		// First we will add each credential element to the query as a where clause.
+		// Then we can execute the query and, if we found a user, return it in a
+		// ActiveRecord User "model" that will be utilized by the Guard instances.
+		$query = $this->createModel()->newQuery();
+
+		foreach ($credentials as $key => $value)
+		{
+			if ( ! str_contains($key, 'password')) $query->where($key, $value);
+		}
+
+		return $query->first();
+	}
+
+	/**
+	 * Validate a user against the given credentials.
+	 *
+	 * @param  \Fly\Auth\UserInterface  $user
+	 * @param  array  $credentials
+	 * @return bool
+	 */
+	public function validateCredentials(UserInterface $user, array $credentials)
+	{
+		$plain = $credentials['password'];
+
+		return $this->hasher->check($plain, $user->getAuthPassword());
+	}
+
+	/**
+	 * Create a new instance of the model.
+	 *
+	 * @return \Fly\Database\ActiveRecord\Model
+	 */
+	public function createModel()
+	{
+		$class = '\\'.ltrim($this->model, '\\');
+
+		return new $class;
+	}
+
+}

src/Fly/Auth/AuthManager.php

@@ -61,35 +61,35 @@ protected function createDatabaseProvider()
 		$connection = $this->app['db']->connection();
 
 		// When using the basic database user provider, we need to inject the table we
-		// want to use, since this is not an Eloquent model we will have no way to
+		// want to use, since this is not an ActiveRecord model we will have no way to
 		// know without telling the provider, so we'll inject the config value.
 		$table = $this->app['config']['auth.table'];
 
 		return new DatabaseUserProvider($connection, $this->app['hash'], $table);
 	}
 
 	/**
-	 * Create an instance of the Eloquent driver.
+	 * Create an instance of the ActiveRecord driver.
 	 *
 	 * @return \Fly\Auth\Guard
 	 */
-	public function createEloquentDriver()
+	public function createActiveRecordDriver()
 	{
-		$provider = $this->createEloquentProvider();
+		$provider = $this->createActiveRecordProvider();
 
 		return new Guard($provider, $this->app['session.store']);
 	}
 
 	/**
-	 * Create an instance of the Eloquent user provider.
+	 * Create an instance of the ActiveRecord user provider.
 	 *
-	 * @return \Fly\Auth\EloquentUserProvider
+	 * @return \Fly\Auth\ActiveRecordUserProvider
 	 */
-	protected function createEloquentProvider()
+	protected function createActiveRecordProvider()
 	{
 		$model = $this->app['config']['auth.model'];
 
-		return new OrmUserProvider($this->app['hash'], $model);
+		return new ActiveRecordUserProvider($this->app['hash'], $model);
 	}
 
 	/**