Library modified to be compatible with PHP 5.6 or higher

Author: josantonius

CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 1.1.0 - 2017-01-30
+* Compatible with PHP 5.6 or higher.
+
+## 1.0.0 - 2017-01-30
+* Compatible only with PHP 7.0 or higher. In the next versions, the library will be modified to make it compatible with PHP 5.6 or higher.
+
 ## 1.0.0 - 2017-01-09
 * Added `Josantonius\Database\Database` class.
 * Added `Josantonius\Database\Database->__connstruct()` method.

README-ES.md

@@ -40,9 +40,7 @@ Para instalar PHP Database library, simplemente escribe:
 
 ### Requisitos
 
-Esta ĺibrería es soportada por versiones de PHP 7.0 o superiores y es compatible con versiones de HHVM 3.0 o superiores.
-
-Para utilizar esta librería en HHVM (HipHop Virtual Machine) tendrás que activar los tipos escalares. Añade la siguiente ĺínea "hhvm.php7.scalar_types = true" en tu "/etc/hhvm/php.ini".
+Esta ĺibrería es soportada por versiones de PHP 5.6 o superiores y es compatible con versiones de HHVM 3.0 o superiores.
 
 ### Cómo empezar y ejemplos
 

README.md

@@ -40,9 +40,7 @@ To install PHP Database library, simply:
 
 ### Requirements
 
-This library is supported by PHP versions 7.0 or higher and is compatible with HHVM versions 3.0 or higher.
-
-To use this library in HHVM (HipHop Virtual Machine) you will have to activate the scalar types. Add the following line "hhvm.php7.scalar_types = true" in your "/etc/hhvm/php.ini".
+This library is supported by PHP versions 5.6 or higher and is compatible with HHVM versions 3.0 or higher.
 
 ### Quick Start and Examples
 

composer.json

@@ -1,6 +1,6 @@
 {
     "name":        "josantonius/database",
-    "version":     "1.0.0",
+    "version":     "1.1.0",
     "type":        "library",
     "description": "Library for SQL database management to be used by several providers at the same time.",
     "keywords": [
@@ -25,7 +25,7 @@
     "minimum-stability": "dev",
     "prefer-stable" : true,
     "require": {
-        "php" : ">=7.0"
+        "php" : ">=5.6"
     },
     "autoload": {
         "psr-4": {

src/Database.php

@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php
 /**
  * Library for SQL database management to be used by several providers at the same time.
  * 
@@ -8,9 +8,9 @@
  * @author     Josantonius - [email protected]
  * @copyright  Copyright (c) 2017 JST PHP Framework
  * @license    https://opensource.org/licenses/MIT - The MIT License (MIT)
- * @version    1.0.0
+ * @version    1.1.0
  * @link       https://github.com/Josantonius/PHP-Database
- * @since      File available since 1.0.0 - Update: 2017-01-09
+ * @since      File available since 1.0.0 - Update: 2017-01-30
  */
 
 namespace Josantonius\Database;
@@ -184,9 +184,7 @@ class Database {
      * @throws DBException → if the provider class specified does not exist
      * @throws DBException → if there has been no successful connection to the database
      */
-    private function __construct(string $provider, string $host, 
-                                 string $dbUser,   string $dbName, 
-                                 string $pass,     array  $settings) {
+    private function __construct($provider, $host, $dbUser, $dbName, $pass, $settings) {
 
         $providerClass = 'Josantonius\\Database\\Provider\\' . $provider;
 
@@ -226,10 +224,8 @@ private function __construct(string $provider, string $host,
      * 
      * @return object → object with the connection
      */
-    public static function getConnection(string $databaseID, 
-                                         string $provider, string $host, 
-                                         string $dbUser,   string $dbName, 
-                                         string $pass,     array  $settings) {
+    public static function getConnection($databaseID, $provider, $host, $dbUser, 
+                                                      $dbName,   $pass, $settings) {
 
         if (static::$_databaseID !== $databaseID) {
 
@@ -264,7 +260,7 @@ public static function getConnection(string $databaseID,
      * @throws DBException → invalid query type
      * @return mixed       → result as object, array, int...
      */
-    public function query(string $query, array $statements = null, string $result = 'obj') {
+    public function query($query, $statements = null, $result = 'obj') {
 
         $this->_type = explode(" ", $query)[0];
 
@@ -328,7 +324,7 @@ private function _implementQuery() {
      * 
      * @return object
      */
-    public function create(array $data) {
+    public function create($data) {
 
         $this->_type = 'CREATE';
 
@@ -365,7 +361,7 @@ public function select($columns = '*') {
      * 
      * @return object
      */
-    public function insert(array $data, array $statements = null) {
+    public function insert($data, $statements = null) {
 
         $this->_type = 'INSERT';
 
@@ -386,7 +382,7 @@ public function insert(array $data, array $statements = null) {
      * 
      * @return object
      */
-    public function update(array $data, array $statements = null) {
+    public function update($data, $statements = null) {
 
         $this->_type = 'UPDATE';
 
@@ -407,7 +403,7 @@ public function update(array $data, array $statements = null) {
      * 
      * @return object
      */
-    public function replace(array $data, array $statements = null) {
+    public function replace($data, $statements = null) {
 
         $this->_type = 'REPLACE';
 
@@ -469,7 +465,7 @@ public function drop() {
      * 
      * @return object
      */
-    public function in(string $table) {
+    public function in($table) {
 
         $this->_table = $table;
 
@@ -485,7 +481,7 @@ public function in(string $table) {
      * 
      * @return object
      */
-    public function table(string $table) {
+    public function table($table) {
 
         $this->_table = $table;
 
@@ -501,7 +497,7 @@ public function table(string $table) {
      * 
      * @return object
      */
-    public function from(string $table) {
+    public function from($table) {
 
         $this->_table = $table;
 
@@ -518,7 +514,7 @@ public function from(string $table) {
      * 
      * @return object
      */
-    public function where($clauses, array $statements = null) {
+    public function where($clauses, $statements = null) {
 
         $this->_where = $clauses;
 
@@ -543,7 +539,7 @@ public function where($clauses, array $statements = null) {
      * 
      * @return object
      */
-    public function order(string $params) {
+    public function order($params) {
 
         $this->_order = $params;
 
@@ -559,7 +555,7 @@ public function order(string $params) {
      * 
      * @return object
      */
-    public function limit(string $params) {
+    public function limit($params) {
 
         $this->_limit = $params;
 
@@ -594,7 +590,7 @@ private function _reset() {
      * 
      * @return int → number of lines updated or 0 if not updated
      */
-    public function execute(string $result = 'obj') {
+    public function execute($result = 'obj') {
 
         $this->_result = $result;
 
@@ -711,10 +707,10 @@ private function _fetchResponse() {
 
             if ($this->_result === 'id') { # Display last insert Id
 
-                return $this->lastInsertId ?? $this->_provider->lastInsertId() ?? 0;
+                return $this->lastInsertId;
             }
 
-            return $this->rowCount ?? $this->_provider->rowCount($this->_response) ?? 0;
+            return $this->rowCount;
 
         } else if ($this->_type === 'SELECT') {
 

src/Exception/DBException.php

@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php
 /**
  * Falta descripción.
  * 
@@ -8,9 +8,9 @@
  * @author     Josantonius - [email protected]
  * @copyright  Copyright (c) 2016 JST PHP Framework
  * @license    https://opensource.org/licenses/MIT - The MIT License (MIT)
- * @version    1.0.0
+ * @version    1.1.0
  * @link       https://github.com/Josantonius/PHP-Database
- * @since      File available since 1.0.0 - Update: 2016-12-21
+ * @since      File available since 1.0.0 - Update: 2017-01-30
  */
 
 namespace Josantonius\Database\Exception;
@@ -35,7 +35,7 @@ class DBException extends \Exception {
      * @param int    $error  → error code (Optional)
      * @param int    $status → HTTP response status code (Optional)
      */
-    public function __construct(string $msg = '', int $error = 0, int $status = 0) {
+    public function __construct($msg = '', $error = 0, $status = 0) {
 
         $this->message    = $msg;
         $this->code       = $error;

src/Provider/MSSQLprovider.php

@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php
 /**
  * Library for SQL database management to be used by several providers at the same time.
  * 
@@ -8,9 +8,9 @@
  * @author     Josantonius - [email protected]
  * @copyright  Copyright (c) 2017 JST PHP Framework
  * @license    https://opensource.org/licenses/MIT - The MIT License (MIT)
- * @version    1.0.0
+ * @version    1.1.0
  * @link       https://github.com/Josantonius/PHP-Database
- * @since      File available since 1.0.0 - Update: 2017-01-09
+ * @since      File available since 1.0.0 - Update: 2017-01-30
  */
 
 namespace Josantonius\Database\Provider;
@@ -39,12 +39,11 @@ class MSSQLprovider extends Provider {
      * 
      * @return object|null → returns the object with the connection or null
      */
-    public function connect(string $host, string $dbUser, 
-                            string $dbName, string $pass, array $settings = []) {
+    public function connect($host, $dbUser, $dbName, $pass, $settings = []) {
 
         try {
 
-            $port = $settings['port'] ?? '1433';
+            $port = (isset($settings['port']) ? $settings['port'] : '1433';
 
             $this->conn = mssql_connect($host . ':' . $port, $user, $pass);
 
@@ -70,7 +69,7 @@ public function connect(string $host, string $dbUser,
      * 
      * @return object|null → returns the object with the connection or null
      */
-    public function query(string $query, string $type = '') {
+    public function query($query, $type = '') {
 
         try {
 
@@ -95,7 +94,7 @@ public function query(string $query, string $type = '') {
      * 
      * @return object|null → returns the object with the connection or null
      */
-    public function statements(string $query, array $statements) { }
+    public function statements($query, $statements) { }
 
     /**
      * Create table statement.
@@ -107,7 +106,7 @@ public function statements(string $query, array $statements) { }
      * 
      * @return int → 0
      */
-    public function create(string $table, array $data) {
+    public function create($table, $data) {
 
         $query = 'CREATE TABLE IF NOT EXISTS `' . $table . '` (';
 
@@ -194,7 +193,7 @@ public function select($columns, $from, $where, $order, $limit, $statements) {
      * 
      * @return object → query response
      */
-    public function insert(string $table, array $data, $statements) {
+    public function insert($table, $data, $statements) {
 
         $input = ['columns' => '', 
                   'values'  => ''];
@@ -229,7 +228,7 @@ public function insert(string $table, array $data, $statements) {
      * 
      * @return object → query response
      */
-    public function update(string $table, array $data, $statements, $where) {
+    public function update($table, $data, $statements, $where) {
 
         $query = 'UPDATE `' . $table . '`  SET ';
 
@@ -270,7 +269,7 @@ public function update(string $table, array $data, $statements, $where) {
      * 
      * @return object → query response
      */
-    public function replace(string $table, $data, $statements) {
+    public function replace($table, $data, $statements) {
 
         $columns = array_keys($data);
 
@@ -301,7 +300,7 @@ public function replace(string $table, $data, $statements) {
      * 
      * @return object → query response
      */
-    public function delete(string $table, $statements, $where) {
+    public function delete($table, $statements, $where) {
 
         $query = 'DELETE FROM `' . $table . '` ';
 
@@ -331,7 +330,7 @@ public function delete(string $table, $statements, $where) {
      * 
      * @return int → 0
      */
-    public function truncate(string $table) {
+    public function truncate($table) {
 
         $query = 'TRUNCATE TABLE `' . $table .'`';
 
@@ -347,7 +346,7 @@ public function truncate(string $table) {
      * 
      * @return int → 0
      */
-    public function drop(string $table) {
+    public function drop($table) {
 
         $query = 'DROP TABLE IF EXISTS `' . $table .'`';
 
@@ -364,7 +363,7 @@ public function drop(string $table) {
      * 
      * @return object|array → object or array with results
      */
-    public function fetchResponse($response, string $result) {
+    public function fetchResponse($response, $result) {
 
         if ($response) {
 
@@ -388,7 +387,7 @@ public function fetchResponse($response, string $result) {
      * 
      * @return int → last row id modified or added
      */
-    public function lastInsertId(): int { }
+    public function lastInsertId() { }
 
     /**
      * Get rows number.
@@ -399,7 +398,7 @@ public function lastInsertId(): int { }
      *
      * @return int → rows number in query object
      */
-    public function rowCount($response): int { }
+    public function rowCount($response) { }
 
     /**
      * Get errors.
@@ -408,7 +407,7 @@ public function rowCount($response): int { }
      * 
      * @return string → get the message if there has been any error
      */
-    public function getError(): string {
+    public function getError() {
 
         return $this->error;
     }
@@ -420,7 +419,7 @@ public function getError(): string {
      * 
      * @return bool true|false → check the connection and return true or false
      */
-    public function isConnected(): bool {
+    public function isConnected() {
 
         return !is_null($this->conn);
     }