Merge pull request #10 from Maykonn/psr4

Fixed autoload psr-4 and bug fix

.gitignore

@@ -0,0 +1,3 @@
+.idea/
+test/
+vendor/

composer.json

@@ -2,7 +2,7 @@
     "name": "maykonn/rapid-authorization",
     "type": "library",
     "description": "RapidAuthorization is a PHP framework for Access Control, based in Role-based Access Control (RBAC)",
-    "keywords": ["access control", "role-based access control", "role based access control", "rbac", "framework"],
+    "keywords": ["PHP", "access control", "role-based access control", "role based access control", "rbac", "framework"],
     "homepage": "https://github.com/Maykonn/RapidAuthorization",
     "license": "MIT",
     "authors": [
@@ -15,8 +15,8 @@
         "php": ">=5.3.0"
     },
     "autoload": {
-        "psr-0": {
-            "RapidAuthorization": ""
+        "psr-4": {
+            "RapidAuthorization\\": "src/"
         }
     }
 }

src/AbstractEntity.php

@@ -0,0 +1,126 @@
+<?php
+
+/**
+ * Entity
+ *
+ * @author Maykonn Welington Candido<[email protected]>
+ */
+
+namespace RapidAuthorization;
+
+use \PDO;
+use \ArrayObject;
+
+abstract class AbstractEntity implements IEntity
+{
+	/**
+	 * @var ClientPreferences
+	 */
+	protected $preferences;
+
+	/**
+	 * @var ArrayObject
+	 */
+	protected $preferencesList;
+
+	/**
+	 * @var $this
+	 */
+	protected static $instance;
+
+
+	/**
+	 * @var PDO
+	 */
+	protected $db;
+
+	public $id = 0;
+	public $name = '';
+	public $business_name = '';
+	public $description = null;
+
+	protected function __construct(ClientPreferences $preferences, PDO $pdo)
+	{
+		$this->preferences = $preferences;
+		$this->preferencesList = $this->preferences->getPreferencesList();
+		$this->db = $pdo;
+	}
+
+	public static function getInstance()
+	{
+		return self::$instance;
+	}
+
+	public function create($businessName, $name = null, $description = null)
+	{
+		$this->name = $name;
+		$this->business_name = $businessName;
+		$this->description = $description;
+
+		return $this->save();
+	}
+
+	/**
+	 * <p>Set '' to $description to set NULL on database</p>
+	 */
+	public function update($id, $businessName, $name = null, $description = null)
+	{
+		if ($this->populateById($id)) {
+			$this->id = $id;
+			$this->business_name = $businessName;
+
+			if ($name !== null) {
+				$this->name = $name;
+			}
+
+			if ($description !== null) {
+				$this->description = $description;
+			}
+
+			return $this->save();
+		}
+
+		return 0;
+	}
+
+	/**
+	 * <p>Populate object with values from record on database</p>
+	 */
+	private function populateById($roleId)
+	{
+		$task = $this->findById($roleId);
+
+		if ($task) {
+			$this->id = (int) $task['id'];
+			$this->name = $task['name'];
+			$this->business_name = $task['business_name'];
+			$this->description = $task['description'];
+
+			return true;
+		}
+
+		return false;
+	}
+
+	protected function saveFromSQL($sql)
+	{
+		$stmt = $this->db->prepare($sql);
+		$stmt->bindParam(':id', $this->id, PDO::PARAM_INT);
+		$stmt->bindParam(':businessName', $this->business_name, PDO::PARAM_STR);
+
+		$name = ($this->name ? $this->name : null);
+		$stmt->bindParam(':name', $name);
+
+		$description = ($this->description ? $this->description : null);
+		$stmt->bindParam(':description', $description);
+
+		$stmt->execute();
+
+		if ( ! $this->id) {
+			$this->id = (int) $this->db->lastInsertId();
+		}
+
+		return $this->id = (int) $this->id;
+	}
+
+}

src/IEntity.php

@@ -0,0 +1,13 @@
+<?php
+/**
+ * IEntity
+ *
+ * @author Maykonn Welington Candido<[email protected]>
+ */
+
+namespace RapidAuthorization;
+
+interface IEntity
+{
+	public static function instance(ClientPreferences $preferences, \PDO $pdo);
+}

Operation.php → src/Operation.php

@@ -11,20 +11,22 @@
 use \Exception;
 use RapidAuthorization\Database\MySQL;
 
-class Operation extends Entity
+class Operation extends AbstractEntity
 {
-
-    public $id = 0;
-    public $name = '';
-    public $business_name = '';
-    public $description = null;
-
     /**
      * Verify if needs to check the authorization, see Operation::populateById()
      * @var Enum '1', '0'
      */
     public $needs_authorization = '1';
 
+    /**
+	 * @return $this
+	 */
+	public static function instance(ClientPreferences $preferences, PDO $pdo)
+	{
+		return self::$instance = new self($preferences, $pdo);
+	}
+
     /**
      * <p>An Operation can be, e.g. Create Product or Edit Customer</p>
      */

RapidAuthorization.php → src/RapidAuthorization.php

@@ -8,10 +8,10 @@
 namespace RapidAuthorization;
 
 // Necessárias antes do Autoload
-require_once 'ClientPreferences.php';
+/*require_once 'ClientPreferences.php';
 require_once 'AvailablePreferences.php';
 require_once 'Autoload.php';
-
+*/
 use RapidAuthorization\Database\MySQL;
 use RapidAuthorization\Database\MySQLSchemaHandler;
 

Role.php → src/Role.php

@@ -11,8 +11,16 @@
 use \Exception;
 use RapidAuthorization\Database\MySQL;
 
-class Role extends Entity
+class Role extends AbstractEntity
 {
+	/**
+	 * @return $this
+	 */
+	public static function instance(ClientPreferences $preferences, PDO $pdo)
+	{
+		return self::$instance = new self($preferences, $pdo);
+	}
+
     public function delete($id)
     {
         if($this->findById($id)) {

Task.php → src/Task.php

@@ -11,8 +11,16 @@
 use \Exception;
 use RapidAuthorization\Database\MySQL;
 
-class Task extends Entity
+class Task extends AbstractEntity
 {
+	/**
+	 * @return $this
+	 */
+	public static function instance(ClientPreferences $preferences, PDO $pdo)
+	{
+		return self::$instance = new self($preferences, $pdo);
+	}
+
     public function delete($id)
     {
         if($this->findById($id)) {