New Configuration style

Author: supremacia

Config/Lib/Database.php Config/Database.phpConfig/Lib/Database.php renamed to Config/Database.php

@@ -12,7 +12,7 @@
  * @link      http://paulorocha.tk/devbr
  */
 
-namespace Config\Lib;
+namespace Config\Devbr;
 
 /**
  * Config\Database Class
@@ -34,7 +34,7 @@ class Database
             ];
     static $default = 'mysql';
 
-    //Configuração da tabela de usuário | Lib\User
+    //Configuração da tabela de usuário | Devbr\User
     static $userTable = ['table'=>'usuario',
                          'id'=>'id',
                          'name'=>'nome',

Db.php Database.phpDb.php renamed to Database.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Lib\Db
+ * Devbr\Database
  * PHP version 7
  *
  * @category  Database
@@ -12,20 +12,20 @@
  * @link      http://paulorocha.tk/devbr
  */
 
-namespace Lib;
+namespace Devbr;
 
 use PDO;
 
 /**
- * Db Class
+ * Database Class
  *
  * @category Database
  * @package  Data
  * @author   Bill Rocha <[email protected]>
  * @license  <https://opensource.org/licenses/MIT> MIT
  * @link     http://paulorocha.tk/devbr
  */
-class Db
+class Database
 {
     private $config =   null;
 
@@ -46,8 +46,8 @@ function __construct($config = null)
     {
         if (is_array($config)) {
             $this->config = $config;
-        } elseif (method_exists('Config\Lib\Database', 'get')) {
-            $this->config = \Config\Lib\Database::get($config);
+        } elseif (method_exists('Config\Devbr\Database\Database', 'get')) {
+            $this->config = \Config\Devbr\Database\Database::get($config);
         } else {
             trigger_error('DataBase configurations not found!');
         }
@@ -99,7 +99,7 @@ function query($sql, $parms = array(), $alias = null)
         $this->error[$sql] = $sth->errorInfo();
 
         if ($sth->columnCount() > 0) {
-            return $this->result = $sth->fetchAll(PDO::FETCH_CLASS, "Lib\Row", [$this->sql, $parms]);
+            return $this->result = $sth->fetchAll(PDO::FETCH_CLASS, "Devbr\Row", [$this->sql, $parms]);
         } else {
             $this->result = false;
             return $this->rows;

README.md

@@ -13,14 +13,14 @@ Uma simples utilização do Database:
 ```php
 $cfg = [];
 
-$db = new Lib\Db($cfg);
+$db = new Devbr\Database($cfg);
 print_r($db->query('SELECT * FROM TABELA'));
 ```
 
 Se você estiver usando o 'devbr/website' como base do seu projeto é possível extender a configuração na classe 'Config\Database', ficando mais simples o uso:
 
 ```php
-$db = new Lib\Db;
+$db = new Devbr\Database;
 
 $db->query('SELECT * FROM TABELA');
 

User.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Lib\User
+ * Devbr\User
  * PHP version 7
  *
  * @category  Database
@@ -12,9 +12,9 @@
  * @link      http://paulorocha.tk/devbr
  */
 
-namespace Lib;
+namespace Devbr;
 
-use Lib\Db;
+use Devbr\Database;
 
 /**
  * User Class
@@ -63,11 +63,11 @@ public function __construct($config = null)
                     $this->_dbConfig[$i] = $d;
                 }
             }
-        } elseif (method_exists('Config\Lib\Database', 'getUserConfig')) {
-            $this->_dbConfig = \Config\Lib\Database::getUserConfig();
+        } elseif (method_exists('Config\Devbr\Database\Database', 'getUserConfig')) {
+            $this->_dbConfig = \Config\Devbr\Database\Database::getUserConfig();
         }
 
-        $this->_db = new Db;
+        $this->_db = new Database;
     }
 
     /**

composer.json

@@ -19,6 +19,6 @@
         "php": ">=5.6.28"
     },
     "autoload": {
-        "psr-4": {"Lib\\": ""}
+        "psr-4": {"Devbr\\": ""}
     }
 }

install.php

@@ -1,25 +1,119 @@
 <?php
 
-if (php_sapi_name() !== 'cli' || !defined('_CONFIG')) {
-    exit("\n\tI can not run out of system!\n");
+if (php_sapi_name() !== 'cli') {
+    ret('It only runs in CLI mode!');
 }
 
+$composer_psr4 = dirname(dirname(__DIR__)).'/composer/autoload_psr4.php';
+if (!file_exists($composer_psr4)) {
+    ret("I can't find Composer data!");
+}
+
+$composer = require_once $composer_psr4;
+if (!isset($composer['Config\\'][0])) {
+    ret("I can't find Composer data!");
+}
+
+//load composer.json and get the "name" of pack 
+$namespace = @json_decode(file_get_contents(__DIR__.'/composer.json'))->name;
+$appConfig = $composer['Config\\'][0].'/'.$namespace.'/';
+
 $thisConfig = __DIR__.'/Config/';
+//exit("\n\n\---> $appConfig\n");
 
 if (!is_dir($thisConfig)) {
-    return;
+    ret("I can't find 'Config' directory in this pack!");
 }
 
-$namespace = @json_decode(file_get_contents(__DIR__.'/composer.json'))->name;
-/* OPTIONAL
- * load composer.json and get the "name" of pack 
- * $appConfig = _CONFIG.$namespace;
- */
- 
-$appConfig = _CONFIG;
+if (is_dir($appConfig)) {
+    ret("Configuration already exists - ignored.");
+}
 
 //Coping all files (and directorys) in /Config
-$copy = \Lib\Cli\Main::copyDirectoryContents($thisConfig, $appConfig);
+$copy = copyDirectoryContents($thisConfig, $appConfig);
 
 //Return to application installer
-return "\n---".($copy === true ? " $namespace instaled!" : $copy);
+ret($copy === true ? " $namespace instaled!" : $copy);
+
+// THE END ...
+
+
+
+/**
+ * Check or create a directory
+ *
+ * @param  string  $dir    path of the directory
+ * @param  boolean $create False/true for create
+ * @param  string  $perm   indiucates a permission - default 0777
+ *
+ * @return bool          status of directory (exists/created = false or true)
+ */
+function checkAndOrCreateDir($dir, $create = false, $perm = 0777)
+{
+    if (is_dir($dir) && is_writable($dir)) {
+        return true;
+    } elseif ($create === false) {
+        return false;
+    }
+
+    @mkdir($dir, $perm, true);
+    @chmod($dir, $perm);
+
+    if (is_writable($dir)) {
+        return true;
+    }
+    return false;
+}
+
+/**
+ * Copy entire content of the $dir[ectory]
+ *
+ * @param  string $dir    Origin
+ * @param  string $target Destination
+ *
+ * @return bool         True/false success
+ */
+function copyDirectoryContents($dir, $target)
+{
+    $dir = rtrim($dir, "\\/ ").'/';
+    $target = rtrim($target, "\\/ ").'/';
+
+    if (!checkAndOrCreateDir($target, true, 0777)) {
+        return "ERROR: can't create directory '$taget'!";
+    }
+
+    foreach (scandir($dir) as $file) {
+        if ($file == '.' || $file == '..') {
+            continue;
+        }
+
+        if (is_dir($dir.$file)) {
+            if (!checkAndOrCreateDir($target.$file, true, 0777)) {
+                return "ERROR: can't create directory '$taget$file'!";
+            } else {
+                $copy = copyDirectoryContents($dir.$file, $target.$file);
+                if ($copy !== true) {
+                    return $copy;
+                }
+            }
+        } elseif (is_file($dir.$file)) {
+            if (!copy($dir.$file, $target.$file)) {
+                echo "\n ERROR: can't copy '$target$file'!";
+            }
+        }
+    }
+    return true;
+}
+
+/**
+ * Return with message
+ *
+ * @param string $msg message
+ *
+ * @return void print and exit
+ */
+function ret($msg)
+{
+    echo "\n - $msg";
+    return true;
+}