From 10a993a1d69cdb60b7061589b4d1a18a5300cf0d Mon Sep 17 00:00:00 2001 From: topnuomi <1130395124@qq.com> Date: Thu, 28 May 2020 21:12:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E9=A9=B1=E5=8A=A8=E3=80=81=E5=A2=9E=E5=8A=A0=E6=9B=B4=E5=A4=9A?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E9=AB=98=E7=BA=A7=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- framework/Framework.php | 6 +- framework/config/config.php | 2 +- framework/library/Application.php | 72 ++- framework/library/Config.php | 1 - framework/library/Controller.php | 4 + framework/library/Database.php | 296 +++++----- framework/library/Model.php | 183 +++--- framework/library/database/Base.php | 494 ++++++++++++++++ framework/library/database/driver/MySQLi.php | 532 ------------------ framework/library/database/driver/Mysql.php | 45 ++ .../database/driver/ObjectForMySQL.php | 508 ----------------- framework/library/database/driver/Sqlite.php | 51 ++ .../library/database/ifs/DatabaseIfs.php | 69 +-- framework/library/error/BaseError.php | 11 +- .../library/exception/DatabaseException.php | 29 +- .../library/exception/RequestException.php | 11 + .../library/exception/RouteException.php | 23 +- framework/library/functions/functions.php | 280 ++++----- framework/library/http/Request.php | 2 +- framework/traits/Instance.php | 21 +- framework/traits/Json.php | 11 + framework/traits/Magic.php | 47 ++ framework/vendor/composer/autoload_psr4.php | 2 + framework/vendor/composer/autoload_static.php | 16 + framework/vendor/composer/installed.json | 20 +- framework/vendor/firebase/php-jwt/README.md | 8 +- .../vendor/firebase/php-jwt/composer.json | 6 +- .../php-jwt/src/BeforeValidException.php | 1 - .../firebase/php-jwt/src/ExpiredException.php | 1 - framework/vendor/firebase/php-jwt/src/JWK.php | 171 ++++++ framework/vendor/firebase/php-jwt/src/JWT.php | 227 ++++++-- .../php-jwt/src/SignatureInvalidException.php | 1 - 32 files changed, 1475 insertions(+), 1676 deletions(-) create mode 100644 framework/library/database/Base.php delete mode 100644 framework/library/database/driver/MySQLi.php create mode 100644 framework/library/database/driver/Mysql.php delete mode 100644 framework/library/database/driver/ObjectForMySQL.php create mode 100644 framework/library/database/driver/Sqlite.php create mode 100644 framework/traits/Magic.php create mode 100644 framework/vendor/firebase/php-jwt/src/JWK.php diff --git a/framework/Framework.php b/framework/Framework.php index 015777c..d89211b 100644 --- a/framework/Framework.php +++ b/framework/Framework.php @@ -21,9 +21,9 @@ class Framework /** * 框架入口 * @param string $callable - * @param array $namespaceMap + * @param array $autoLoadMap */ - public static function startApp($callable = '', $namespaceMap = []) + public static function startApp($callable = '', $autoLoadMap = []) { (is_callable($callable)) && $callable(self::class); @@ -45,7 +45,7 @@ class Framework !defined('CONFIG_DIR') && define('CONFIG_DIR', APP_PATH . BIND_MODULE . DS . 'config' . DS); require 'library/Application.php'; - Application::run($namespaceMap); + Application::run($autoLoadMap); } else echo '请使用Framework::appPath()指定应用目录'; } diff --git a/framework/config/config.php b/framework/config/config.php index 077a97b..392228a 100644 --- a/framework/config/config.php +++ b/framework/config/config.php @@ -18,7 +18,7 @@ return [ 'prefix' => '', ], 'db' => [ - 'driver' => 'MySQLi', + 'driver' => 'Mysql', 'host' => '127.0.0.1', 'user' => '', 'passwd' => '', diff --git a/framework/library/Application.php b/framework/library/Application.php index 6463ea8..71131e7 100644 --- a/framework/library/Application.php +++ b/framework/library/Application.php @@ -7,24 +7,37 @@ use top\library\exception\BaseException; use top\library\http\Request; use top\library\http\Response; +/** + * Class Application + * @package top\library + */ class Application { + /** + * 已获取到的反射实例 + * @var array + */ private static $reflectionClass = []; + + /** + * 已获取到的反射方法实例 + * @var array + */ private static $reflectionMethod = []; /** * 开始执行程序 - * @param array $namespaceMap + * @param array $autoLoadMap */ - public static function run($namespaceMap = []) + public static function run($autoLoadMap = []) { // 注册框架自动加载 require 'Loader.php'; $loader = new Loader(); $loader->set('top', FRAMEWORK_PATH); $loader->set(APP_NS, APP_PATH); - foreach ($namespaceMap as $prefix => $path) { + foreach ($autoLoadMap as $prefix => $path) { $loader->set($prefix, $path); } $loader->register(); @@ -41,51 +54,22 @@ class Application (PHP_VERSION > 5.6) && set_error_handler([new BaseError(), 'handler']); set_exception_handler([new BaseException(), 'handler']); - // 加载必要文件 - self::loadFiles(); - - // 初始化路由实例 - $router = Router::instance(Request::instance()); - - // 处理请求并得到数据 - $responseData = Response::instance()->header([ - 'X-Powered-By: TOP-Framework' - ])->send($router->execute()); - - // 输出响应内容 - echo $responseData->content; - } - - /** - * 加载必要文件 - */ - private static function loadFiles() - { - // 加载系统函数库 + // 系统函数库 require FRAMEWORK_PATH . 'library' . DS . 'functions' . DS . 'functions.php'; - // 加载用户函数库 + // 用户函数库 $funcFile = APP_PATH . BIND_MODULE . DS . 'functions.php'; (is_file($funcFile)) && require $funcFile; - $configInstance = Config::instance(); - - $sessionConfig = $configInstance->get('session'); + // session目录 + $sessionConfig = Config::instance()->get('session'); if (!empty($sessionConfig) && $sessionConfig['open'] === true) { session_save_path(SESSION_PATH); session_start(); } - // 数据库驱动 - $config = $configInstance->get('db'); - $driver = $config['driver'] ? $config['driver'] : 'MySQLi'; - Register::set('DBDriver', function () use ($driver) { - $class = '\\top\\library\\database\\driver\\' . $driver; - return $class::instance(); - }); - - // 配置文件中配置的注册 - $initRegister = $configInstance->get('register'); + // 配置文件中注册的类 + $initRegister = Config::instance()->get('register'); if (!empty($initRegister)) { foreach ($initRegister as $key => $value) { Register::set($key, function () use ($value) { @@ -93,6 +77,18 @@ class Application }); } } + + // 初始化路由实例 + $router = Router::instance(Request::instance()); + + // 处理请求并得到数据 + $response = Response::instance()->header([ + 'X-Powered-By: TOP-Framework' + ])->send($router->execute()); + + // 响应内容 + echo $response->content; + } /** diff --git a/framework/library/Config.php b/framework/library/Config.php index c9b6479..014249c 100644 --- a/framework/library/Config.php +++ b/framework/library/Config.php @@ -49,7 +49,6 @@ class Config * 获取配置 * @param string $name * @return array|mixed - * @throws \Exception */ public function get($name = '') { diff --git a/framework/library/Controller.php b/framework/library/Controller.php index 84053c2..813ac19 100644 --- a/framework/library/Controller.php +++ b/framework/library/Controller.php @@ -3,6 +3,7 @@ namespace top\library; use top\library\http\Request; +use top\traits\Magic; use top\traits\Json; /** @@ -12,6 +13,8 @@ use top\traits\Json; abstract class Controller { + use Magic; + use Json; /** @@ -133,4 +136,5 @@ abstract class Controller ]); } } + } diff --git a/framework/library/Database.php b/framework/library/Database.php index a71c06b..be907f6 100644 --- a/framework/library/Database.php +++ b/framework/library/Database.php @@ -2,7 +2,8 @@ namespace top\library; -use top\library\database\ifs\DatabaseIfs; +use top\library\database\Base; +use top\library\exception\DatabaseException; /** * 数据库操作类 @@ -12,10 +13,10 @@ class Database { /** - * 数据库驱动 - * @var null + * 数据库连接 + * @var Base */ - private static $driver = null; + private static $connection = null; /** * 当前类实例 @@ -23,12 +24,6 @@ class Database */ private static $instance = []; - /** - * 当前表结构 - * @var array - */ - private static $tableDesc = []; - /** * 数据库配置 * @var array @@ -48,16 +43,16 @@ class Database private $pk = ''; /** - * 多个表（仅delete操作） + * 别名 * @var null */ - private $effect = null; + private $alias = null; /** * 数据去重 * @var null */ - private $distinct = null; + private $distinct = false; /** * 操作的字段 @@ -89,57 +84,30 @@ class Database */ private $join = []; - /** - * 关联 - * @var array - */ - private $on = []; - /** * Database constructor. * @param $table * @param $pk * @param $prefix - * @throws \Exception + * @throws DatabaseException */ private function __construct($table, $pk, $prefix) { - $driver = Register::get('DBDriver'); + // 获取配置 $this->config = Config::instance()->get('db'); + // 当前操作表名 $this->table = $this->getTableName($prefix, $table); + // 当前操作表主键 $this->pk = $pk; - $this->setDriver($driver, $this->config); - } - - /** - * 指定表 - * @param $table - * @param string $pk - * @param string $prefix - * @return mixed - * @throws \Exception - */ - public static function table($table, $pk = '', $prefix = '') - { - $ident = $prefix . $table; - if (!isset(self::$instance[$ident])) { - self::$instance[$ident] = new self($table, $pk, $prefix); + if (!self::$connection) { // 保证只有一个数据库连接 + // 设置数据库驱动 + $driver = $this->config['driver'] ? $this->config['driver'] : 'MySQLi'; + $class = '\\top\\library\\database\\driver\\' . $driver; + if (class_exists($class)) { + // 获取数据库驱动实例 + self::$connection = $class::instance()->connect($this->config); + } else throw new DatabaseException('不存在的数据库驱动：' . $driver); } - return self::$instance[$ident]; - } - - /** - * 指定数据库驱动 - * - * @param DatabaseIfs $driver - * @param array $config - */ - private function setDriver(DatabaseIfs $driver, $config) - { - if (!self::$driver) { - self::$driver = $driver->connect($config); - } - return self::$driver; } /** @@ -162,23 +130,39 @@ class Database } /** - * 指定多张表 - * @param $effect + * 指定表 + * @param $table + * @param string $pk + * @param string $prefix + * @return $this + */ + public static function table($table = '', $pk = '', $prefix = '') + { + $ident = $prefix . $table; + if (!isset(self::$instance[$ident])) { + self::$instance[$ident] = new self($table, $pk, $prefix); + } + return self::$instance[$ident]; + } + + /** + * 设置表别名 + * @param $name * @return \top\library\Database */ - public function effect($effect) + public function alias($name) { - $this->effect = $effect; + $this->alias = $name; return $this; } /** - * @param $field + * @param $flag * @return \top\library\Database */ - public function distinct($field) + public function distinct($flag = true) { - $this->distinct = $field; + $this->distinct = $flag ? true : false; return $this; } @@ -260,12 +244,12 @@ class Database /** * 多表 * + * @param $table + * @param $on * @param string $type - * @param string $table - * @param string $name * @return \top\library\Database */ - public function join($type, $table, $name) + public function join($table, $on, $type = 'INNER') { $tableName = null; if (is_array($table) && isset($table[0]) && isset($table[1])) { @@ -274,24 +258,13 @@ class Database $tableName = $this->config['prefix'] . $table; } $this->join[] = [ - $type, $tableName, - $name + $on, + $type ]; return $this; } - /** - * 多表关联 - * @param string $on - * @return \top\library\Database - */ - public function on($on) - { - $this->on[] = $on; - return $this; - } - /** * 插入记录 * @@ -300,7 +273,7 @@ class Database */ public function insert($data) { - $result = self::$driver->insert($this->table, $data); + $result = self::$connection->insert($this->table, $data); return $result; } @@ -311,17 +284,21 @@ class Database */ public function find($param = false) { - if (is_callable($param)) - $param($this); - $field = $this->getPk(); - $pkWhere = []; - if (!is_bool($param) && !is_callable($param)) - $pkWhere = [$field => $param]; - $result = self::$driver->find([ + (is_callable($param)) && $param($this); + if (!is_bool($param) && !is_callable($param)) { + $this->where = array_merge($this->where, [ + [($this->alias ? $this->alias . '.' : '') . $this->getPk() => $param], + ]); + } + $result = self::$connection->find( $this->table, - !empty($this->join), - $pkWhere - ], $this->distinct, $this->field, $this->join, $this->on, $this->where, $this->order); + $this->alias, + $this->distinct, + $this->field, + $this->join, + $this->where, + $this->order + ); $this->_reset(); return $result; } @@ -334,17 +311,22 @@ class Database */ public function select($param = false) { - if (is_callable($param)) - $param($this); - $field = $this->getPk(); - $pkWhere = []; - if (!is_bool($param) && !is_callable($param)) - $pkWhere = [$field => $param]; - $result = self::$driver->select([ + (is_callable($param)) && $param($this); + if (!is_bool($param) && !is_callable($param)) { + $this->where = array_merge($this->where, [ + [($this->alias ? $this->alias . '.' : '') . $this->getPk() => $param], + ]); + } + $result = self::$connection->select( $this->table, - !empty($this->join), - $pkWhere - ], $this->distinct, $this->field, $this->join, $this->on, $this->where, $this->order, $this->limit); + $this->alias, + $this->distinct, + $this->field, + $this->join, + $this->where, + $this->order, + $this->limit + ); $this->_reset(); foreach ($result as $k => $v) $result[$k] = $v; @@ -360,17 +342,21 @@ class Database */ public function update($data, $param = false) { - if (is_callable($param)) - $param($this); - $field = $this->getPk(); - $pkWhere = []; - if (!is_bool($param) && !is_callable($param)) - $pkWhere = [$field => $param]; - $result = self::$driver->update([ + (is_callable($param)) && $param($this); + if (!is_bool($param) && !is_callable($param)) { + $this->where = array_merge($this->where, [ + [($this->alias ? $this->alias . '.' : '') . $this->getPk() => $param], + ]); + } + $result = self::$connection->update( $this->table, - !empty($this->join), - $pkWhere - ], $this->join, $this->on, $this->where, $this->order, $this->limit, $data); + $this->alias, + $this->join, + $this->where, + $this->order, + $this->limit, + $data + ); $this->_reset(); return $result; } @@ -383,18 +369,20 @@ class Database */ public function delete($param = false) { - if (is_callable($param)) { - $param($this); + (is_callable($param)) && $param($this); + if (!is_bool($param) && !is_callable($param)) { + $this->where = array_merge($this->where, [ + [($this->alias ? $this->alias . '.' : '') . $this->getPk() => $param], + ]); } - $field = $this->getPk(); - $pkWhere = []; - if (!is_bool($param) && !is_callable($param)) - $pkWhere = [$field => $param]; - $result = self::$driver->delete($this->effect, [ + $result = self::$connection->delete( $this->table, - !empty($this->join), - $pkWhere - ], $this->join, $this->on, $this->where, $this->order, $this->limit); + $this->alias, + $this->join, + $this->where, + $this->order, + $this->limit + ); $this->_reset(); return $result; @@ -409,48 +397,32 @@ class Database */ public function common($param, $type) { - if (is_callable($param)) { - $param($this); - } + (is_callable($param)) && $param($this); if (empty($this->field) && $param && !is_callable($param)) { $this->field = $param; } - $result = self::$driver->common([ + $result = self::$connection->common( $this->table, - !empty($this->join), - [] - ], $this->distinct, $this->field, $this->join, $this->on, $this->where, $type); + $this->alias, + $this->field, + $this->join, + $this->where, + $type + ); $this->_reset(); return $result; } - /** - * 获取表结构 - * - * @param string $table - * @return mixed - */ - public function tableDesc($table = '') - { - $table = ($table) ? $table : $this->table; - if (!isset(self::$tableDesc[$table])) { - self::$tableDesc[$table] = self::$driver->tableDesc($table); - } - - return self::$tableDesc[$table]; - } - /** * 执行一条SQL - * - * @param string $query - * @return resource|bool + * @param $query + * @param array $params + * @return bool|\PDOStatement */ - public function query($query) + public function query($query, $params = []) { - $result = self::$driver->query($query); - return $result; + return self::$connection->query($query, $params); } /** @@ -458,7 +430,7 @@ class Database */ public function begin() { - self::$driver->begin(); + self::$connection->begin(); } /** @@ -466,7 +438,7 @@ class Database */ public function commit() { - self::$driver->commit(); + self::$connection->commit(); } /** @@ -474,7 +446,16 @@ class Database */ public function rollback() { - self::$driver->rollback(); + self::$connection->rollback(); + } + + /** + * 返回PDO + * @return \PDO + */ + public function getPDO() + { + return self::$connection->getPDO(); } /** @@ -482,9 +463,9 @@ class Database * * @return string */ - public function _sql() + public function sql() { - return self::$driver->sql(); + return self::$connection->sql(); } /** @@ -492,11 +473,9 @@ class Database */ private function _reset() { - $this->effect = null; - $this->distinct = null; + $this->distinct = false; $this->field = null; $this->join = []; - $this->on = []; $this->where = []; $this->order = null; $this->limit = null; @@ -510,15 +489,8 @@ class Database private function getPk() { if (!$this->pk) { - $tableInfo = $this->tableDesc(); - $pk = ''; - foreach ($tableInfo as $value) { - if ($value['Key'] == 'PRI') { - $pk = $value['Field']; - break; - } - } - return $pk; + $pk = self::$connection->getPk($this->table, $this->config['dbname']); + return ($pk) ? $pk : 'id'; } return $this->pk; } diff --git a/framework/library/Model.php b/framework/library/Model.php index bf3ac4b..8404a99 100644 --- a/framework/library/Model.php +++ b/framework/library/Model.php @@ -8,6 +8,15 @@ use top\library\exception\DatabaseException; /** * 基础模型 * @author topnuomi 2018年11月23日 + * + * @method $this alias($name) + * @method $this distinct(bool $distinct) + * @method $this field(string|array $field) + * @method $this where($field, $condition = null, $value = null) + * @method $this order(string $order) + * @method $this limit(string|array $limit) + * @method $this join(string $table, string $on, string $type = null) + * @method $this sql() */ class Model { @@ -40,7 +49,7 @@ class Model * insert值映射 * @var array */ - protected $inReplace = []; + protected $insertReplace = []; /** * update值映射 @@ -84,42 +93,36 @@ class Model if ($table) { $this->table = $table; } else if (!$this->table) { - $table = get_table_name(get_called_class()); + $table = get_table_name(static::class); $this->table = $table; } - // $this->getDb() = Database::table($this->table, $this->pk); } /** * 获取Database实例 * @return mixed */ - private function getDb() + private function database() { return Database::table($this->table, $this->pk, $this->prefix); } // 可以静态调用的方法--开始 - /** - * 影响的表（仅多表delete） - * @param $effect - * @return $this - */ - private function effect($effect) + private function _alias($name) { - $this->getDb()->effect($effect); + $this->database()->alias($name); return $this; } /** - * 过滤重复值的字段 - * @param $field + * 过滤重复值 + * @param $flag * @return $this */ - private function distinct($field) + private function _distinct($flag = true) { - $this->getDb()->distinct($field); + $this->database()->distinct($flag); return $this; } @@ -128,9 +131,9 @@ class Model * @param $field * @return $this */ - private function field($field) + private function _field($field) { - $this->getDb()->field($field); + $this->database()->field($field); return $this; } @@ -138,10 +141,10 @@ class Model * 查询条件 * @return $this */ - private function where() + private function _where() { call_user_func_array([ - $this->getDb(), + $this->database(), 'where' ], func_get_args()); return $this; @@ -151,10 +154,10 @@ class Model * 排序 * @return $this */ - private function order() + private function _order() { call_user_func_array([ - $this->getDb(), + $this->database(), 'order' ], func_get_args()); return $this; @@ -164,10 +167,10 @@ class Model * 限制 * @return $this */ - private function limit() + private function _limit() { call_user_func_array([ - $this->getDb(), + $this->database(), 'limit' ], func_get_args()); return $this; @@ -175,26 +178,25 @@ class Model /** * 多表 - * @param $type * @param $table - * @param $name + * @param $on + * @param string $type * @return $this */ - private function join($type, $table, $name) + private function _join($table, $on, $type = 'INNER') { - $this->getDb()->join($type, $table, $name); + $this->database()->join($table, $on, $type); return $this; } /** - * 多表 - * @param $on - * @return $this + * 获取最后一次执行的SQL + * + * @return string */ - private function on($on) + private function _sql() { - $this->getDb()->on($on); - return $this; + return $this->database()->sql(); } // 可静态调用的方法--结束 @@ -212,7 +214,7 @@ class Model // 此处取消了数据验证，在$this->>data()方法中验证，减少一次数据库查询 // 入库时最后的数据处理 $data = $this->inHandle($data); - return $this->getDb()->insert($data); + return $this->database()->insert($data); } return false; } @@ -224,7 +226,7 @@ class Model */ public function delete($param = false) { - return $this->getDb()->delete($param); + return $this->database()->delete($param); } /** @@ -241,7 +243,7 @@ class Model // 此处取消了数据验证，在$this->data()方法中验证，减少一次数据库查询 // 入库时最后的数据处理 $data = $this->inHandle($data); - return $this->getDb()->update($data, $param); + return $this->database()->update($data, $param); } return false; } @@ -254,7 +256,7 @@ class Model */ public function find($param = false, $notRaw = true) { - $result = $this->getDb()->find($param); + $result = $this->database()->find($param); if ($notRaw) { if (is_array($result)) { $result = $this->outHandle($result); @@ -271,7 +273,7 @@ class Model */ public function select($param = false, $notRaw = true) { - $result = $this->getDb()->select($param); + $result = $this->database()->select($param); if ($notRaw) { if (is_array($result)) { $result = $this->outHandle($result); @@ -287,7 +289,7 @@ class Model */ public function count($param = null) { - return $this->getDb()->common($param, 'count'); + return $this->database()->common($param, 'count'); } /** @@ -297,7 +299,7 @@ class Model */ public function avg($param = null) { - return $this->getDb()->common($param, 'avg'); + return $this->database()->common($param, 'avg'); } /** @@ -307,7 +309,7 @@ class Model */ public function max($param = null) { - return $this->getDb()->common($param, 'max'); + return $this->database()->common($param, 'max'); } /** @@ -317,7 +319,7 @@ class Model */ public function min($param = null) { - return $this->getDb()->common($param, 'min'); + return $this->database()->common($param, 'min'); } /** @@ -327,27 +329,28 @@ class Model */ public function sum($param = null) { - return $this->getDb()->common($param, 'sum'); + return $this->database()->common($param, 'sum'); } /** * 执行一条SQL * @param $query + * @param array $params * @return mixed */ - public function query($query) + public function query($query, $params = []) { - return $this->getDb()->query($query); + return $this->database()->query($query, $params); } /** * MySQL事务 * @param $action - * @return mixed + * @return bool */ public function transaction($action) { - $db = $this->getDb(); + $db = $this->database(); // 开启事务 $db->begin(); try { @@ -363,44 +366,22 @@ class Model } /** - * 获取最后一次执行的SQL - * - * @return string + * 返回PDO + * @return \PDO */ - public function _sql() + public function getPDO() { - return $this->getDb()->_sql(); + return $this->database()->getPDO(); } /** * 获取表单数据 * @param array $data - * @param bool $notRaw * @return array|bool */ - public function data($data = [], $notRaw = true) + public function data($data = []) { - $mapData = $this->processMapped($data); - if ($mapData) { // 如果正确处理字段映射并且数据验证通过 - if (!$notRaw) { - return $mapData; - } else { - $data = []; - $prefix = $this->prefix ? $this->prefix : Config::instance()->get('db')['prefix']; - $tableDesc = $this->tableDesc($prefix . $this->table); - foreach ($tableDesc as $value) { - if (array_key_exists($value['Field'], $mapData)) { - // 如果表单值为空则赋值为数据库字段默认值 - if (!$mapData[$value['Field']] && !is_numeric($mapData[$value['Field']])) { - $mapData[$value['Field']] = $value['Default']; - } - $data[$value['Field']] = $mapData[$value['Field']]; - } - } - return $data; - } - } - return false; + return $this->processMapped($data); } /** @@ -459,15 +440,14 @@ class Model */ private function inHandle($data) { - $replace = ($this->isInsert) ? $this->inReplace : $this->updateReplace; + $replace = ($this->isInsert) ? $this->insertReplace : $this->updateReplace; foreach ($replace as $key => $value) { - $fieldValue = ''; if (!array_key_exists($key, $data)) { $data[$key] = ''; } if (is_array($value)) { if (isset($value[1]) && $value[1] === true) { - $object = get_called_class(); + $object = static::class; if (method_exists($object, $value[0])) { $methodName = $value[0]; $fieldValue = call_user_func_array([ @@ -476,6 +456,8 @@ class Model ], [ $data[$key] ]); + } else { + throw new Exception('方法' . $object . '->' . $value[0] . '不存在'); } } else if (isset($value[0]) && function_exists($value[0])) { $fieldValue = $value[0]($data[$key]); @@ -592,16 +574,6 @@ class Model return true; } - /** - * 获取表结构 - * @param $table - * @return mixed - */ - public function tableDesc($table) - { - return $this->getDb()->tableDesc($table); - } - /** * 获取信息 * @return string @@ -611,30 +583,6 @@ class Model return $this->message; } - /** - * 某些方法提供以下替代方式 - * @param $name - * @return array|mixed|null - */ - public function __get($name) - { - $data = null; - switch ($name) { - case 'one': - $data = $this->find(); - break; - case 'all': - $data = $this->select(); - break; - case 'sql': - $data = $this->_sql(); - break; - default: - $data = $this->$name(); - } - return $data; - } - /** * 非静态调用连贯操作 * @param string $name @@ -643,8 +591,9 @@ class Model */ public function __call($name, $arguments) { - if (method_exists($this, $name)) { - return $this->{$name}($arguments); + $methodName = '_' . $name; + if (method_exists($this, $methodName)) { + return call_user_func_array([$this, $methodName], $arguments); } else throw new Exception('不存在的方法：' . $name); } @@ -656,10 +605,8 @@ class Model */ public static function __callStatic($name, $arguments) { - $methodName = null; - if (method_exists(static::class, $name)) { - $methodName = $name; - } else { + $methodName = '_' . $name; + if (!method_exists(static::class, $methodName)) { $methodMap = ['all' => 'select', 'get' => 'find']; if (isset($methodMap[$name])) { $methodName = $methodMap[$name]; diff --git a/framework/library/database/Base.php b/framework/library/database/Base.php new file mode 100644 index 0000000..8e87877 --- /dev/null +++ b/framework/library/database/Base.php @@ -0,0 +1,494 @@ +executeInsert($table, $data); + return $this->pdo->lastInsertId(); + } + + /** + * 更新记录 + * @param $table + * @param $alias + * @param $join + * @param $where + * @param $order + * @param $limit + * @param $data + * @return int + * @throws DatabaseException + */ + public function update($table, $alias, $join, $where, $order, $limit, $data) + { + $stmt = $this->executeUpdate($table, $alias, $join, $where, $order, $limit, $data); + return $stmt->rowCount(); + } + + /** + * 查找一条记录 + * @param $table + * @param $alias + * @param $distinct + * @param $field + * @param $join + * @param $where + * @param $order + * @return mixed + * @throws DatabaseException + */ + public function find($table, $alias, $distinct, $field, $join, $where, $order) + { + $stmt = $this->executeSelect($table, $alias, $distinct, $field, $join, $where, $order, '1'); + return $stmt->fetch(\PDO::FETCH_ASSOC); + } + + /** + * 查找全部 + * @param $table + * @param $alias + * @param $distinct + * @param $field + * @param $join + * @param $where + * @param $order + * @param $limit + * @return array|mixed + * @throws DatabaseException + */ + public function select($table, $alias, $distinct, $field, $join, $where, $order, $limit) + { + $stmt = $this->executeSelect($table, $alias, $distinct, $field, $join, $where, $order, $limit); + return $stmt->fetchAll(\PDO::FETCH_ASSOC); + } + + /** + * 删除记录 + * @param $table + * @param $alias + * @param $join + * @param $where + * @param $order + * @param $limit + * @return int|mixed + * @throws DatabaseException + */ + public function delete($table, $alias, $join, $where, $order, $limit) + { + $stmt = $this->executeDelete($table, $alias, $join, $where, $order, $limit); + return $stmt->rowCount(); + } + + /** + * 执行一条SQL + * @param $query + * @param $params + * @return bool|\PDOStatement + * @throws DatabaseException + */ + public function query($query, $params) + { + if (false === ($stmt = $this->pdo->prepare($query))) { + throw new DatabaseException($this->pdo->errorInfo()[2]); + } + $stmt->execute($params); + return $stmt; + } + + /** + * 返回PDO + * @return \PDO + */ + public function getPDO() + { + return $this->pdo; + } + + /** + * 事务 + */ + public function begin() + { + return $this->pdo->beginTransaction(); + } + + /** + * 提交 + */ + public function commit() + { + return $this->pdo->commit(); + } + + /** + * 回滚 + */ + public function rollback() + { + return $this->pdo->rollBack(); + } + + /** + * 公共方法 + * @param $table + * @param $alias + * @param $field + * @param $join + * @param $where + * @param $type + * @return mixed + * @throws DatabaseException + */ + public function common($table, $alias, $field, $join, $where, $type) + { + $where = $this->parseWhere($where); + $field = $type . '(`' . $this->parseField(false, $field) . '`)'; + $sql = str_replace( + ['[field]', '[table]', '[join]', '[where]', '[order]', '[limit]'], + [ + $field, + $this->parseTable($table, $alias), + $this->parseJoin($join), + $where['where'], + '', + '', + ], $this->selectSql + ); + + if (false === ($stmt = $this->pdo->prepare($sql))) { + throw new DatabaseException($this->pdo->errorInfo()[2]); + } + $stmt->execute($where['data']); + return $stmt->fetch(\PDO::FETCH_ASSOC)[$field]; + } + + /** + * 预处理并执行插入操作 + * @param $table + * @param $data + * @return bool|\PDOStatement + * @throws DatabaseException + */ + private function executeInsert($table, $data) + { + $insertData = $this->parseInsertData($data); + $sql = str_replace( + ['[table]', '[field]', '[data]'], + [ + $this->parseTable($table, ''), + $insertData['field'], + $insertData['values'], + ], $this->insertSql + ); + + if (false === ($stmt = $this->pdo->prepare($sql))) { + throw new DatabaseException($this->pdo->errorInfo()[2]); + } + $stmt->execute($insertData['data']); + return $stmt; + } + + /** + * 预处理并执行更新操作 + * @param $table + * @param $alias + * @param $join + * @param $where + * @param $order + * @param $limit + * @param $data + * @return bool|\PDOStatement + * @throws DatabaseException + */ + private function executeUpdate($table, $alias, $join, $where, $order, $limit, $data) + { + $where = $this->parseWhere($where); + $updateData = $this->parseUpdateData($alias, $data); + $sql = str_replace( + ['[table]', '[data]', '[join]', '[where]', '[order]', '[limit]'], + [ + $this->parseTable($table, $alias), + $updateData['field'], + $this->parseJoin($join), + $where['where'], + $this->parseOrder($order), + $this->parseLimit($limit), + ], $this->updateSql + ); + + if (false === ($stmt = $this->pdo->prepare($sql))) { + throw new DatabaseException($this->pdo->errorInfo()[2]); + } + $bindData = array_merge($updateData['data'], $where['data']); + $stmt->execute($bindData); + return $stmt; + } + + /** + * 预处理并执行查询操作 + * @param $table + * @param $alias + * @param $distinct + * @param $field + * @param $join + * @param $where + * @param $order + * @param $limit + * @return bool|\PDOStatement + * @throws DatabaseException + */ + private function executeSelect($table, $alias, $distinct, $field, $join, $where, $order, $limit) + { + $where = $this->parseWhere($where); + + $sql = str_replace( + ['[table]', '[field]', '[join]', '[where]', '[order]', '[limit]'], + [ + $this->parseTable($table, $alias), + $this->parseField($distinct, $field), + $this->parseJoin($join), + $where['where'], + $this->parseOrder($order), + $this->parseLimit($limit), + ], $this->selectSql + ); + + if (false === ($stmt = $this->pdo->prepare($sql))) { + throw new DatabaseException($this->pdo->errorInfo()[2]); + } + $stmt->execute($where['data']); + return $stmt; + } + + /** + * 预处理并执行删除操作 + * @param $table + * @param $alias + * @param $join + * @param $where + * @param $order + * @param $limit + * @return bool|\PDOStatement + * @throws DatabaseException + */ + private function executeDelete($table, $alias, $join, $where, $order, $limit) + { + $where = $this->parseWhere($where); + + $sql = str_replace( + ['[table]', '[join]', '[where]', '[order]', '[limit]'], + [ + $this->parseTable($table, $alias), + $this->parseJoin($join), + $where['where'], + $this->parseOrder($order), + $this->parseLimit($limit), + ], $this->deleteSql); + + if (false === ($stmt = $this->pdo->prepare($sql))) { + throw new DatabaseException($this->pdo->errorInfo()[2]); + } + $stmt->execute($where['data']); + return $stmt; + } + + /** + * 解析table + * @param $table + * @param $alias + * @return string + */ + protected function parseTable($table, $alias) + { + return "`$table`" . ($alias ? ' ' . $alias : ''); + } + + /** + * 解析field + * @param $distinct + * @param $field + * @return string + */ + protected function parseField($distinct, $field) + { + if (is_array($field)) { + $field = implode(',', $field); + } else if (!$field) { + $field = '*'; + } + return ($distinct ? 'DISTINCT ' : '') . $field; + } + + /** + * 解析join + * @param $allJoin + * @return string + */ + protected function parseJoin($allJoin) + { + $joinString = ''; + foreach ($allJoin as $key => $join) { + $joinString .= $join[2] . ' JOIN ' . $join[0] . ' ON ' . $join[1] . ' '; + } + return mb_substr($joinString, 0, mb_strlen($joinString, 'utf-8') - 1, 'utf-8'); + } + + /** + * 解析where + * @param $allWhere + * @return array + */ + protected function parseWhere($allWhere) + { + $whereArray = [ + 'temp' => [], + 'where' => '', + 'data' => [], + ]; + foreach ($allWhere as $key => $item) { + foreach ($item as $field => $value) { + if (is_array($value)) { // 数组 + $whereArray['temp'][] = $field . ' ' . $value[0] . ' ?'; + $whereArray['data'][] = $value[1]; + } else { + $whereArray['temp'][] = $field . ' = ?'; + $whereArray['data'][] = $value; + } + } + } + $whereArray['where'] = (!empty($whereArray['temp'])) ? 'WHERE ' . implode(' AND ', $whereArray['temp']) : ''; + unset($whereArray['temp']); + return $whereArray; + } + + /** + * 解析order + * @param $order + * @return string + */ + protected function parseOrder($order) + { + return ($order) ? ' ORDER BY ' . $order : ''; + } + + /** + * 解析limit + * @param $limit + * @return string + */ + protected function parseLimit($limit) + { + if (is_array($limit)) { + $limit = implode(',', $limit); + } + return ($limit) ? 'LIMIT ' . $limit : ''; + } + + /** + * 解析insert参数 + * @param $data + * @return array + */ + protected function parseInsertData($data) + { + $insertData = [ + 'field' => [], + 'values' => [], + 'data' => [], + ]; + foreach ($data as $field => $value) { + $insertData['field'][] = '`' . $field . '`'; + $insertData['values'][] = '?'; + $insertData['data'][] = $value; + } + $insertData['field'] = implode(',', $insertData['field']); + $insertData['values'] = implode(',', $insertData['values']); + return $insertData; + } + + /** + * 解析update参数 + * @param $alias + * @param $data + * @return array + */ + protected function parseUpdateData($alias, $data) + { + $updateData = [ + 'field' => [], + 'data' => [], + ]; + foreach ($data as $field => $value) { + if (strstr($field, '.')) { + $field = explode('.', $field); + $updateData['field'][] = $field[0] . '.`' . $field[1] . '` = ?'; + } else { + $updateData['field'][] = ($alias ? $alias . '.' : '') . '`' . $field . '` = ?'; + } + $updateData['data'][] = $value; + } + $updateData['field'] = implode(',', $updateData['field']); + return $updateData; + } + + /** + * 返回最后执行的sql + * @return string + */ + public function sql() + { + return $this->sql; + } + + /** + * 关闭数据库连接 + * @return mixed + */ + public function close() + { + // TODO: Implement close() method. + } +} diff --git a/framework/library/database/driver/MySQLi.php b/framework/library/database/driver/MySQLi.php deleted file mode 100644 index 453727e..0000000 --- a/framework/library/database/driver/MySQLi.php +++ /dev/null @@ -1,532 +0,0 @@ -link = @mysqli_connect($config['host'], $config['user'], $config['passwd'], $config['dbname'], $config['port']); - if ($link === false) { - throw new DatabaseException(mysqli_connect_error()); - } - mysqli_query($link, 'set names ' . $config['charset']); - - return $this; - } - - /** - * 插入 - * @param string $table - * @param array $data - * @return int|string - * @throws \Exception - */ - public function insert($table, $data) - { - // TODO Auto-generated method stub - if (count($data) == count($data, 1)) { // 一维数组 - $query = 'insert into ' . $table; - $field = ' (' . implode(',', array_keys($data)) . ')'; - $value = array_values($data); - $value = '(' . implode(',', $this->checkNull($value)) . ')'; - $this->sql = $query .= $field . ' values ' . $value . ';'; - $this->query($query); - } else { // 二维数组 - foreach ($data as $key => $value) { - $query = 'insert into ' . $table; - $allField = ' (' . implode(',', array_keys($value)) . ')'; - $allValue = '(' . implode(',', $this->checkNull($value)) . ')'; - $this->sql = $query .= $allField . ' values ' . $allValue . ';'; - $this->query($query); - } - } - return mysqli_insert_id($this->link); - } - - /** - * 更新 - * @param string $table - * @param array $join - * @param array|string $on - * @param array|string $where - * @param string $order - * @param string $limit - * @param array $data - * @return int - * @throws \Exception - */ - public function update($table, $join, $on, $where, $order, $limit, $data) - { - // TODO Auto-generated method stub - $tableInfo = $this->parseTable($table); - $join = $this->parseJoin($join, $on); - array_push($where, $tableInfo['where']); - $where = $this->parseWhere($where); - $order = $this->parseOrder($order); - $limit = $this->parseLimit($limit); - $query = "update {$tableInfo['table']}{$join} set "; - $updateData = []; - foreach ($data as $key => $value) { - if (!is_numeric($value) && !$value) { - $value = 'NULL'; - } else { - $value = '\'' . mysqli_real_escape_string($this->link, $value) . '\''; - } - $updateData[] = $key . '=' . $value; - } - $this->sql = $query .= implode(',', $updateData) . "{$where}{$order}{$limit}"; - $this->query($query); - return mysqli_affected_rows($this->link); - } - - /** - * 查询一条记录 - * @param string $table - * @param $distinct - * @param array|string $field - * @param array $join - * @param array|string $on - * @param array|string $where - * @param string $order - * @return array|null - * @throws \Exception - */ - public function find($table, $distinct, $field, $join, $on, $where, $order) - { - // TODO Auto-generated method stub - $tableInfo = $this->parseTable($table); - $join = $this->parseJoin($join, $on); - $distinct = $this->parseDistinct($distinct); - if ($distinct) { - $field = $distinct; - } else { - $field = $this->parseField($field); - } - array_push($where, $tableInfo['where']); - $where = $this->parseWhere($where); - $order = $this->parseOrder($order); - $this->sql = "select {$field} from {$tableInfo['table']}{$join}{$where}{$order} limit 1"; - $result = $this->query($this->sql); - return mysqli_fetch_assoc($result); - } - - /** - * 查询所有记录 - * @param string $table - * @param $distinct - * @param array|string $field - * @param array $join - * @param array|string $on - * @param array|string $where - * @param string $order - * @param string $limit - * @return array|null - * @throws \Exception - */ - public function select($table, $distinct, $field, $join, $on, $where, $order, $limit) - { - // TODO Auto-generated method stub - $tableInfo = $this->parseTable($table); - $join = $this->parseJoin($join, $on); - $distinct = $this->parseDistinct($distinct); - if ($distinct) { - $field = $distinct; - } else { - $field = $this->parseField($field); - } - array_push($where, $tableInfo['where']); - $where = $this->parseWhere($where); - $order = $this->parseOrder($order); - $limit = $this->parseLimit($limit); - $this->sql = "select {$field} from {$tableInfo['table']}{$join}{$where}{$order}{$limit}"; - $result = $this->query($this->sql); - return mysqli_fetch_all($result, MYSQLI_ASSOC); - } - - /** - * 删除 - * @param array|string $effect - * @param string $table - * @param array $join - * @param array|string $on - * @param array|string $where - * @param string $order - * @param string $limit - * @return int - * @throws \Exception - */ - public function delete($effect, $table, $join, $on, $where, $order, $limit) - { - // TODO Auto-generated method stub - $tableInfo = $this->parseTable($table); - $effect = $this->parseEffect($effect); - $join = $this->parseJoin($join, $on); - array_push($where, $tableInfo['where']); - $where = $this->parseWhere($where); - $order = $this->parseOrder($order); - $limit = $this->parseLimit($limit); - $this->sql = "delete{$effect} from {$tableInfo['table']}{$join}{$where}{$order}{$limit}"; - $this->query($this->sql); - return mysqli_affected_rows($this->link); - } - - /** - * 获取表结构 - * @param $table - * @return array|bool|null - * @throws \Exception - */ - public function tableDesc($table) - { - $sql = 'desc ' . $table; - if (!$result = $this->query($sql)) { - return false; - } - $data = mysqli_fetch_all($result, MYSQLI_ASSOC); - return $data; - } - - /** - * 公共方法 - * @param $table - * @param $field - * @param $join - * @param $on - * @param $where - * @param $type - * @return bool - * @throws \Exception - */ - public function common($table, $distinct, $field, $join, $on, $where, $type) - { - $tableInfo = $this->parseTable($table); - $distinct = $this->parseDistinct($distinct); - if ($distinct) { - $field = $distinct; - } else { - $field = $this->parseField($field); - } - $join = $this->parseJoin($join, $on); - array_push($where, $tableInfo['where']); - $where = $this->parseWhere($where); - $this->sql = "select {$type}({$field}) from {$tableInfo['table']}{$join}{$where}"; - $result = $this->query($this->sql); - $data = mysqli_fetch_array($result); - if (isset($data[0])) { - return $data[0]; - } else { - return false; - } - } - - /** - * 事务 - */ - public function begin() - { - mysqli_begin_transaction($this->link); - } - - /** - * 提交 - */ - public function commit() - { - mysqli_commit($this->link); - } - - /** - * 回滚 - */ - public function rollback() - { - mysqli_rollback($this->link); - } - - /** - * 执行SQL - * @param string $query - * @return bool|\mysqli_result - * @throws \Exception - */ - public function query($query) - { - $result = mysqli_query($this->link, $query); - if (!$result) { - throw new DatabaseException(mysqli_error($this->link)); - } - $this->writeLogs($result, $query); - return $result; - } - - /** - * 获取执行的最后一条SQL - * - * @return string - */ - public function sql() - { - return trim($this->sql, ' '); - } - - /** - * 解析表信息 - * @param $table - * @return array - */ - private function parseTable($table) - { - $info = []; - // 如果是多表查询，给当前表名别名this - if ($table[1] === true) { - $info['table'] = $table[0] . ' as this'; - $info['where'] = []; - // 如果存在主键的条件，给键名加上别名 - if (!empty($table[2])) { - $field = 'this.' . array_keys($table[2])[0]; - $value = array_values($table[2])[0]; - $info['where'] = [$field => $value]; - } - } else { - $info['table'] = $table[0]; - $info['where'] = $table[2]; - } - return $info; - } - - /** - * 解析多表的删除 - * @param $effect - * @return string - */ - public function parseEffect($effect) - { - if ($effect) { - if (is_array($effect)) { - $effect = implode(',', $effect); - } - return ' ' . $effect; - } - return ''; - } - - /** - * 解析数据去重 - * @param $distinct - * @return string - */ - private function parseDistinct($distinct) - { - if ($distinct) { - if (is_array($distinct)) { - $distinct = implode(',', $distinct); - } - return 'distinct ' . $distinct; - } - return ''; - } - - /** - * 组合字段 - * @param string|array $field - * @return string - */ - private function parseField($field) - { - if (!$field) { - $field = '*'; - } else if (is_array($field)) { - $field = implode(',', $field); - } - return $field; - } - - /** - * 组合where条件 - * @param array $array - * @param string $glue - * @return string - */ - private function parseWhere(array $array, $glue = 'and') - { - $where = []; - foreach ($array as $value) { - if (empty($value)) continue; - if (is_array($value)) { - foreach ($value as $key => $val) { - if (is_array($val)) { - switch (strtolower($val[0])) { - case 'in': - $arr_ = explode(',', $val[1]); - $str = ''; - for ($i = 0; $i < count($arr_); $i++) { - $str .= (($i != 0) ? ',' : '') . $this->checkNull(trim($arr_[$i])); - } - $where[] = $key . ' ' . $val[0] . ' (' . $str . ')'; - break; - case 'like': - $where[] = $key . ' ' . $val[0] . ' \'%' . $val[1] . '%\''; - break; - default: - $where[] = $key . ' ' . $val[0] . ' ' . $this->checkNull($val[1]); - } - } else { - $val = $this->checkNull($val); - $where[] = $key . '=' . $val; - } - } - } else { - $where[] = $value; - } - } - if (empty($where)) { - return ''; - } else { - return ' where ' . implode(' ' . $glue . ' ', $where); - } - } - - /** - * 组合order - * @param string $order - * @return string - */ - private function parseOrder($order = '') - { - if ($order) { - $order = ' order by ' . $order; - } - return $order; - } - - /** - * 组合limit - * @param string $limit - * @return string - */ - private function parseLimit($limit = '') - { - if ($limit) { - if (is_array($limit)) { - $limit = ' limit ' . implode(',', $limit); - } else { - $limit = ' limit ' . $limit; - } - } - return $limit; - } - - /** - * 链接多表（join on） - * @param array $data - * @param string|array $on - * @return string - */ - private function parseJoin($data, $on) - { - $join = []; - for ($i = 0; $i < count($data); $i++) { - $string = null; - if (isset($on[$i])) { - if (is_array($on[$i])) { - $pieces = []; - foreach ($on[$i] as $key => $value) { - $pieces[] = $key . ' = ' . $value; - } - $string = ' on ' . implode(' and ', $pieces); - } else { - $string = ' on ' . $on[$i]; - } - } - $join[] = $data[$i][0] . ' join ' . $data[$i][1] . ($data[$i][2] ? ' as ' . $data[$i][2] : '') . $string; - } - if (!empty($join)) { - return ' ' . implode(' ', $join); - } - return ''; - } - - /** - * 检查并处理空值 - * @param $value - * @return array|string - */ - private function checkNull($value) - { - if (is_array($value)) { - foreach ($value as $k => $v) { - if (!is_numeric($v) && !$v) { - $value[$k] = 'NULL'; - } else { - $value[$k] = '\'' . mysqli_real_escape_string($this->link, $v) . '\''; - } - } - } else { - if (!is_numeric($value) && !$value) { - $value = 'NULL'; - } else { - $value = '\'' . mysqli_real_escape_string($this->link, $value) . '\''; - } - } - return $value; - } - - /** - * SQL存文件 - * @param $result - * @param $query - */ - private function writeLogs($result, $query) - { - if (DEBUG) { - $error = ''; - if (!$result) { - $error = mysqli_error($this->link); - } - $nowTime = date('Y-m-d H:i:s', time()); - $content = "[{$nowTime}] SQL: {$query} {$error}" . PHP_EOL; - file_put_contents('./runtime/database_logs.txt', $content, FILE_APPEND); - } - } - - /** - * 关闭数据库连接 - */ - public function close() - { - if ($this->link) { - if (mysqli_close($this->link)) { - return true; - } - return false; - } - return true; - } - - public function __destruct() - { - $this->close(); - } -} diff --git a/framework/library/database/driver/Mysql.php b/framework/library/database/driver/Mysql.php new file mode 100644 index 0000000..368af3d --- /dev/null +++ b/framework/library/database/driver/Mysql.php @@ -0,0 +1,45 @@ +pdo = new \PDO($dsn, $config['user'], $config['passwd']); + $this->pdo->setAttribute(\PDO::ATTR_EMULATE_PREPARES, false); + // 设置字符集 + $this->pdo->exec('SET NAMES ' . $config['charset']); + + return $this; + } + + /** + * 获取主键 + * @param $table + * @param $database + * @return string + */ + public function getPk($table, $database) + { + $stmt = $this->pdo->query("SELECT COLUMN_NAME,COLUMN_KEY FROM INFORMATION_SCHEMA.COLUMNS WHERE COLUMN_KEY = 'PRI' AND TABLE_NAME='{$table}' AND TABLE_SCHEMA='{$database}'"); + $stmt->execute(); + + $column = $stmt->fetch(\PDO::FETCH_ASSOC); + + return (!empty($column)) ? $column['COLUMN_NAME'] : ''; + } +} diff --git a/framework/library/database/driver/ObjectForMySQL.php b/framework/library/database/driver/ObjectForMySQL.php deleted file mode 100644 index 5a43098..0000000 --- a/framework/library/database/driver/ObjectForMySQL.php +++ /dev/null @@ -1,508 +0,0 @@ -mysqli = new \mysqli($config['host'], $config['user'], $config['passwd'], $config['dbname'], $config['port']); - $this->mysqli->query('set names ' . $config['charset']); - return $this; - } - - /** - * 插入记录 - * @param string $table - * @param array $data - * @return mixed - * @throws DatabaseException - */ - public function insert($table, $data) - { - // TODO Auto-generated method stub - if (count($data) == count($data, 1)) { // 一维数组 - $query = 'insert into ' . $table; - $field = ' (' . implode(',', array_keys($data)) . ')'; - $value = array_values($data); - $value = '(' . implode(',', $this->checkNull($value)) . ')'; - $this->sql = $query .= $field . ' values ' . $value . ';'; - $this->query($query); - } else { // 二维数组 - foreach ($data as $key => $value) { - $query = 'insert into ' . $table; - $allField = ' (' . implode(',', array_keys($value)) . ')'; - $allValue = '(' . implode(',', $this->checkNull($value)) . ')'; - $this->sql = $query .= $allField . ' values ' . $allValue . ';'; - $this->query($query); - } - } - return $this->mysqli->insert_id; - } - - /** - * 更新记录 - * @param string $table - * @param array $join - * @param array|string $on - * @param array|string $where - * @param string $order - * @param string $limit - * @param array $data - * @return int|mixed - * @throws DatabaseException - */ - public function update($table, $join, $on, $where, $order, $limit, $data) - { - // TODO Auto-generated method stub - $tableInfo = $this->parseTable($table); - $join = $this->parseJoin($join, $on); - array_push($where, $tableInfo['where']); - $where = $this->parseWhere($where); - $order = $this->parseOrder($order); - $limit = $this->parseLimit($limit); - $query = 'update ' . $tableInfo['table'] . "{$join} set "; - $updateData = []; - foreach ($data as $key => $value) { - if (!is_numeric($value) && !$value) { - $value = 'NULL'; - } else { - $value = '\'' . mysqli_real_escape_string($this->link, $value) . '\''; - } - $updateData[] = $key . '=' . $value; - } - $this->sql = $query .= implode(',', $updateData) . "{$where}{$order}{$limit}"; - $this->query($query); - return $this->mysqli->affected_rows; - } - - /** - * 查询一条记录 - * @param string $table - * @param $distinct - * @param array|string $field - * @param array $join - * @param array|string $on - * @param array|string $where - * @param string $order - * @return array|mixed|null - * @throws DatabaseException - */ - public function find($table, $distinct, $field, $join, $on, $where, $order) - { - // TODO Auto-generated method stub - $tableInfo = $this->parseTable($table); - $join = $this->parseJoin($join, $on); - $distinct = $this->parseDistinct($distinct); - if ($distinct) { - $field = $distinct; - } else { - $field = $this->parseField($field); - } - array_push($where, $tableInfo['where']); - $where = $this->parseWhere($where); - $order = $this->parseOrder($order); - $this->sql = "select {$field} from {$tableInfo['table']}{$join}{$where}{$order} limit 1"; - $result = $this->query($this->sql); - return $result->fetch_assoc(); - } - - /** - * 查询所有记录 - * @param string $table - * @param $distinct - * @param array|string $field - * @param array $join - * @param array|string $on - * @param array|string $where - * @param string $order - * @param string $limit - * @return array|mixed|null - * @throws DatabaseException - */ - public function select($table, $distinct, $field, $join, $on, $where, $order, $limit) - { - // TODO Auto-generated method stub - $tableInfo = $this->parseTable($table); - $join = $this->parseJoin($join, $on); - $distinct = $this->parseDistinct($distinct); - if ($distinct) { - $field = $distinct; - } else { - $field = $this->parseField($field); - } - array_push($where, $tableInfo['where']); - $where = $this->parseWhere($where); - $order = $this->parseOrder($order); - $limit = $this->parseLimit($limit); - $this->sql = "select {$field} from {$tableInfo['table']}{$join}{$where}{$order}{$limit}"; - $result = $this->query($this->sql); - return $result->fetch_all(MYSQLI_ASSOC); - } - - /** - * 删除记录 - * @param array|string $effect - * @param string $table - * @param array $join - * @param array|string $on - * @param array|string $where - * @param string $order - * @param string $limit - * @return int|mixed - * @throws DatabaseException - */ - public function delete($effect, $table, $join, $on, $where, $order, $limit) - { - // TODO Auto-generated method stub - $tableInfo = $this->parseTable($table); - $effect = $this->parseEffect($effect); - $join = $this->parseJoin($join, $on); - array_push($where, $tableInfo['where']); - $where = $this->parseWhere($where); - $order = $this->parseOrder($order); - $limit = $this->parseLimit($limit); - $this->sql = "delete{$effect} from {$tableInfo['table']}{$join}{$where}{$order}{$limit}"; - $this->query($this->sql); - return $this->mysqli->affected_rows; - } - - /** - * 获取表结构 - * @param $table - * @return bool|mixed - * @throws DatabaseException - */ - public function tableDesc($table) - { - $sql = 'desc ' . $table; - if (!$result = $this->query($sql)) { - return false; - } - $data = $result->fetch_all(MYSQLI_ASSOC); - return $data; - } - - /** - * 公共方法 - * @param $table - * @param $distinct - * @param $field - * @param $join - * @param $on - * @param $where - * @param $type - * @return bool - * @throws DatabaseException - */ - public function common($table, $distinct, $field, $join, $on, $where, $type) - { - $tableInfo = $this->parseTable($table); - $distinct = $this->parseDistinct($distinct); - if ($distinct) { - $field = $distinct; - } else { - $field = $this->parseField($field); - } - $join = $this->parseJoin($join, $on); - array_push($where, $tableInfo['where']); - $where = $this->parseWhere($where); - $this->sql = "select {$type}({$field}) from {$tableInfo['table']}{$join}{$where}"; - $result = $this->query($this->sql); - $data = $result->fetch_array(); - if (isset($data[0])) { - return $data[0]; - } else { - return false; - } - } - - /** - * 开启事务 - */ - public function begin() - { - $this->mysqli->begin_transaction(); - } - - /** - * 提交 - */ - public function commit() - { - $this->mysqli->commit(); - } - - /** - * 回滚 - */ - public function rollback() - { - $this->mysqli->rollback(); - } - - /** - * 执行SQL - * @param string $query - * @return mixed - * @throws DatabaseException - */ - public function query($query) - { - $result = $this->mysqli->query($query); - if (!$result) { - throw new DatabaseException($this->mysqli->error); - } - return $result; - } - - /** - * 获取执行的最后一条SQL - * - * @return string - */ - public function sql() - { - return trim($this->sql, ' '); - } - - /** - * 解析表信息 - * @param $table - * @return array - */ - private function parseTable($table) - { - $info = []; - // 如果是多表查询，给当前表名别名this - if ($table[1] === true) { - $info['table'] = $table[0] . ' as this'; - $info['where'] = []; - // 如果存在主键的条件，给键名加上别名 - if (!empty($table[2])) { - $field = 'this.' . array_keys($table[2])[0]; - $value = array_values($table[2])[0]; - $info['where'] = [$field => $value]; - } - } else { - $info['table'] = $table[0]; - $info['where'] = $table[2]; - } - return $info; - } - - /** - * 解析多表的删除 - * @param $effect - * @return string - */ - public function parseEffect($effect) - { - if ($effect) { - if (is_array($effect)) { - $effect = implode(',', $effect); - } - return ' ' . $effect; - } - return ''; - } - - /** - * 解析数据去重 - * @param $distinct - * @return string - */ - private function parseDistinct($distinct) - { - if ($distinct) { - if (is_array($distinct)) { - $distinct = implode(',', $distinct); - } - return 'distinct ' . $distinct; - } - return ''; - } - - /** - * 组合字段 - * @param string|array $field - * @return string - */ - private function parseField($field) - { - if (!$field) { - $field = '*'; - } else if (is_array($field)) { - $field = implode(',', $field); - } - return $field; - } - - /** - * 组合where条件 - * @param array $array - * @param string $glue - * @return string - */ - private function parseWhere(array $array, $glue = 'and') - { - $where = []; - foreach ($array as $value) { - if (empty($value)) continue; - if (is_array($value)) { - foreach ($value as $key => $val) { - if (is_array($val)) { - switch (strtolower($val[0])) { - case 'in': - $arr_ = (is_array($val[1])) ? $val[1] : explode(',', $val[1]); - $str = ''; - for ($i = 0; $i < count($arr_); $i++) { - $str .= (($i != 0) ? ',' : '') . $this->checkNull(trim($arr_[$i])); - } - $where[] = $key . ' ' . $val[0] . ' (' . $str . ')'; - break; - case 'like': - $where[] = $key . ' ' . $val[0] . ' \'%' . $val[1] . '%\''; - break; - default: - $where[] = $key . ' ' . $val[0] . ' ' . $this->checkNull($val[1]); - } - } else { - $val = $this->checkNull($val); - $where[] = $key . '=' . $val; - } - } - } else { - $where[] = $value; - } - } - if (empty($where)) { - return ''; - } else { - return ' where ' . implode(' ' . $glue . ' ', $where); - } - } - - /** - * 组合order - * @param string $order - * @return string - */ - private function parseOrder($order = '') - { - if ($order) { - $order = ' order by ' . $order; - } - return $order; - } - - /** - * 组合limit - * @param string $limit - * @return string - */ - private function parseLimit($limit = '') - { - if ($limit) { - if (is_array($limit)) { - $limit = ' limit ' . implode(',', $limit); - } else { - $limit = ' limit ' . $limit; - } - } - return $limit; - } - - /** - * 链接多表（join on） - * @param array $data - * @param string|array $on - * @return string - */ - private function parseJoin($data, $on) - { - $join = []; - for ($i = 0; $i < count($data); $i++) { - $string = null; - if (isset($on[$i])) { - if (is_array($on[$i])) { - $pieces = []; - foreach ($on[$i] as $key => $value) { - $pieces[] = $key . ' = ' . $value; - } - $string = ' on ' . implode(' and ', $pieces); - } else { - $string = ' on ' . $on[$i]; - } - } - $join[] = $data[$i][0] . ' join ' . $data[$i][1] . ($data[$i][2] ? ' as ' . $data[$i][2] : '') . $string; - } - if (!empty($join)) { - return ' ' . implode(' ', $join); - } - return ''; - } - - /** - * 检查并处理空值 - * @param $value - * @return array|string - */ - private function checkNull($value) - { - if (is_array($value)) { - foreach ($value as $k => $v) { - if (!is_numeric($v) && !$v) { - $value[$k] = 'NULL'; - } else { - $value[$k] = '\'' . $this->mysqli->real_escape_string($v) . '\''; - } - } - } else { - if (!is_numeric($value) && !$value) { - $value = 'NULL'; - } else { - $value = '\'' . $this->mysqli->real_escape_string($value) . '\''; - } - } - return $value; - } - - /** - * 关闭数据库连接 - */ - public function close() - { - if ($this->mysqli->close()) { - return true; - } - return false; - } - - public function __destruct() - { - $this->close(); - } -} diff --git a/framework/library/database/driver/Sqlite.php b/framework/library/database/driver/Sqlite.php new file mode 100644 index 0000000..1eb7d57 --- /dev/null +++ b/framework/library/database/driver/Sqlite.php @@ -0,0 +1,51 @@ +pdo = new \PDO($dsn); + $this->pdo->setAttribute(\PDO::ATTR_EMULATE_PREPARES, false); + // 设置字符集 + $this->pdo->exec('SET NAMES ' . $config['charset']); + + return $this; + } + + /** + * 获取主键 + * @param $table + * @param $database + * @return string + */ + public function getPk($table, $database) + { + $stmt = $this->pdo->query("PRAGMA TABLE_INFO('$table')"); + $stmt->execute(); + + $columns = $stmt->fetchAll(\PDO::FETCH_ASSOC); + $pk = ''; + foreach ($columns as $column) { + if ($column['pk'] == 1) { + $pk = $column['name']; + break; + } + } + return $pk; + } +} diff --git a/framework/library/database/ifs/DatabaseIfs.php b/framework/library/database/ifs/DatabaseIfs.php index b69b2fe..576bddd 100644 --- a/framework/library/database/ifs/DatabaseIfs.php +++ b/framework/library/database/ifs/DatabaseIfs.php @@ -11,76 +11,17 @@ interface DatabaseIfs /** * 连接数据库 - * @param array $config + * @param $config + * @return mixed */ public function connect($config); /** - * 插入记录 - * @param string $table - * @param array $data - */ - public function insert($table, $data); - - /** - * 更新记录 - * @param string $table - * @param array $join - * @param string|array $on - * @param string|array $where - * @param string $order - * @param string $limit - * @param array $data - */ - public function update($table, $join, $on, $where, $order, $limit, $data); - - /** - * 查找一条记录 + * 获取主键 * @param $table - * @param $distinct - * @param $field - * @param $join - * @param $on - * @param $where - * @param $order + * @param $database * @return mixed */ - public function find($table, $distinct, $field, $join, $on, $where, $order); + public function getPk($table, $database); - /** - * 查找全部 - * @param $table - * @param $distinct - * @param $field - * @param $join - * @param $on - * @param $where - * @param $order - * @param $limit - * @return mixed - */ - public function select($table, $distinct, $field, $join, $on, $where, $order, $limit); - - /** - * 删除记录 - * @param string|array $effect - * @param string $table - * @param array $join - * @param string|array $on - * @param string|array $where - * @param string $order - * @param string $limit - */ - public function delete($effect, $table, $join, $on, $where, $order, $limit); - - /** - * 执行一条SQL - * @param string $query - */ - public function query($query); - - /** - * 关闭数据库连接 - */ - public function close(); } diff --git a/framework/library/error/BaseError.php b/framework/library/error/BaseError.php index 469986c..60aa442 100644 --- a/framework/library/error/BaseError.php +++ b/framework/library/error/BaseError.php @@ -3,6 +3,7 @@ namespace top\library\error; use Throwable; +use top\library\exception\BaseException; class BaseError extends \Error { @@ -17,15 +18,11 @@ class BaseError extends \Error * @param $errstr * @param $errfile * @param $errline + * @throws BaseException */ public function handler($errno, $errstr, $errfile, $errline) { - if (DEBUG) { - $content = $errstr . '
' . $errfile . ' 第' . $errline . '行'; - } else { - $content = $errstr; - } - // throw new BaseException($errstr, 0, null, $errfile, $errline); - echo '

' . $content . '

'; + throw new BaseException($errstr, 0, null, $errfile, $errline); + // echo '

' . $content . '

'; } } diff --git a/framework/library/exception/DatabaseException.php b/framework/library/exception/DatabaseException.php index 6c77614..5bbe084 100644 --- a/framework/library/exception/DatabaseException.php +++ b/framework/library/exception/DatabaseException.php @@ -2,40 +2,15 @@ namespace top\library\exception; -use Throwable; - class DatabaseException extends BaseException { - public function __construct($message = "", $code = 0, Throwable $previous = null) + public function __construct($message = "", $code = 0, \Throwable $previous = null) { - $message = $this->processMessage($message); - parent::__construct($message, $code, $previous); + parent::__construct('[DatabaseException]' . $message, $code, $previous); } public function handler($exception = null) { parent::handler($this); // TODO: Change the autogenerated stub } - - private function processMessage($message) - { - $message = str_ireplace([ - 'database', - 'table', - 'doesn\'t exist', - 'unknown', - 'column', - 'field', - 'list' - ], [ - '数据库: ', - '表', - '不存在', - '未知', - '列', - '字段', - '列表' - ], $message); - return $message; - } } diff --git a/framework/library/exception/RequestException.php b/framework/library/exception/RequestException.php index 88ce980..7bc8508 100644 --- a/framework/library/exception/RequestException.php +++ b/framework/library/exception/RequestException.php @@ -4,5 +4,16 @@ namespace top\library\exception; class RequestException extends BaseException { + public function __construct($message = "", $code = 0, \Throwable $previous = null) + { + parent::__construct('[RequestException]' . $message, $code, $previous); + } + /** + * @param \Exception $exception + */ + public function handler($exception = null) + { + parent::handler($this); // TODO: Change the autogenerated stub + } } \ No newline at end of file diff --git a/framework/library/exception/RouteException.php b/framework/library/exception/RouteException.php index 0c5584b..9d3dbb1 100644 --- a/framework/library/exception/RouteException.php +++ b/framework/library/exception/RouteException.php @@ -2,14 +2,11 @@ namespace top\library\exception; -use Throwable; - class RouteException extends BaseException { - public function __construct($message = "", $code = 0, Throwable $previous = null) + public function __construct($message = "", $code = 0, \Throwable $previous = null) { - $message = $this->processMessage($message); - parent::__construct($message, $code, $previous); + parent::__construct('[DatabaseException]' . $message, $code, $previous); } /** @@ -19,20 +16,4 @@ class RouteException extends BaseException { parent::handler($this); // TODO: Change the autogenerated stub } - - private function processMessage($message) - { - $message = str_replace([ - 'Module', - 'Controller', - 'function', - 'doesn\'t exist', - ], [ - '模块', - '控制器', - '方法', - '不存在', - ], $message); - return $message; - } } diff --git a/framework/library/functions/functions.php b/framework/library/functions/functions.php index 4e98850..0f8fbc7 100644 --- a/framework/library/functions/functions.php +++ b/framework/library/functions/functions.php @@ -1,49 +1,5 @@ $value) { - $data[strtolower($key)] = $value; - } - unset($headers); - return $data; - } else { - $server = $_SERVER; - $headers = []; - foreach ($server as $key => $value) { - if ('http_' == strtolower(substr($key, 0, 5))) { - $headers[strtolower(substr($key, 5))] = $value; - } - } - unset($server); - return $headers; - } -} - -/** - * 过滤数组 - * @param array $array - * @param string $filter - * @param array $result - */ -function filterArray($array = [], $filter = 'filter', &$result = []) -{ - foreach ($array as $key => $value) { - if (is_array($value)) { - filterArray($value, $result[$key]); - } else { - $result[$key] = (!$filter) ? $value : $filter($value); - } - } -} - /** * 获取/设置配置 * @param $key @@ -65,11 +21,6 @@ function config($key, $value = '__NULL__VALUE__') */ function request() { - /*static $instance; - if (!$instance) { - $instance = new \top\library\http\Request(); - } - return $instance;*/ return \top\library\http\Request::instance(); } @@ -79,32 +30,59 @@ function request() */ function response() { - /*static $instance; - if (!$instance) { - $instance = new \top\library\http\Response(); - } - return $instance;*/ return \top\library\http\Response::instance(); } /** * 调用模型 - * @param $class - * @return mixed + * @param $name + * @return \top\library\Model */ -function model($class) +function model($name) { static $model = []; + $class = class_full_name($name, 'model'); if (!isset($model[$class])) { + // 模型类存在则直接实例化 + // 模型类不存在则直接将传入的模型名当作表名处理 if (class_exists($class)) { $model[$class] = new $class(); } else { - $model[$class] = new \top\library\Model($class); + $model[$class] = new \top\library\Model($name); } } return $model[$class]; } +/** + * 调用逻辑 + * @param $name + * @return mixed + */ +function logic($name) +{ + static $logic = []; + $class = class_full_name($name, 'logic'); + if (!isset($logic[$class])) { + // 实例化逻辑类 + $logic[$class] = new $class(); + } + return $logic[$class]; +} + +/** + * 获取类全限定名 + * @param $name + * @param string $type + * @return string + */ +function class_full_name($name, $type = 'model') +{ + if (!strstr($name, '\\')) { // 不是类全限定名，则直接拼接全限定名 + return APP_NS . '\\' . BIND_MODULE . '\\' . $type . '\\' . $name; + } else return $name; +} + /** * 拼接链接（暂时先这样 * @param string $url @@ -124,6 +102,16 @@ function url($url, $param = '') return '/' . $url . $param . '.html'; } +/** + * 获取当前视图文件的缓存标识 + * @return string + */ +function view_cache_ident() +{ + $ident = md5($_SERVER['REQUEST_URI'] . request()->requestMethod()); + return $ident; +} + /** * 设置视图缓存时间 * @param $sec @@ -155,6 +143,76 @@ function view($file = '', $param = [], $cache = false) return \top\library\View::instance()->fetch($file, $param, $cache); } +/** + * 页面跳转 + * @param $url + * @return false|string + */ +function redirect($url) +{ + if (request()->is('ajax')) { + return json_encode([ + 'redirect' => $url, + ]); + } else { + header('location: ' . $url); + } +} + +/** + * 框架session操作 + * @param $name + * @param string $value + * @return bool + * @throws Exception + */ +function session($name, $value = '') +{ + $config = \top\library\Config::instance()->get('session'); + if (empty($config) || !$config['prefix']) { + $prefix = request()->module(); + } else { + $prefix = $config['prefix']; + } + if ($value === '') { + if (isset($_SESSION[$prefix][$name])) { + return $_SESSION[$prefix][$name]; + } + return false; + } else if ($value === false) { + unset($_SESSION[$prefix][$name]); + } else { + $_SESSION[$prefix][$name] = $value; + } +} + +/** + * 获取headers + * @return array|false + */ +function get_header() +{ + if (PHP_SAPI === 'apache2handler') { + $headers = getallheaders(); + $data = []; + foreach ($headers as $key => $value) { + $data[strtolower($key)] = $value; + } + unset($headers); + return $data; + } else { + $server = $_SERVER; + $headers = []; + foreach ($server as $key => $value) { + if ('http_' == strtolower(substr($key, 0, 5))) { + $headers[strtolower(substr($key, 5))] = $value; + } + } + unset($server); + return $headers; + } +} + /** * 获取表名 * @param $classname @@ -175,37 +233,6 @@ function get_table_name($classname) return strtolower($table); } -/** - * 创建HTTP请求 - * @param $url - * @param array $data - * @param array $header - * @return bool|mixed - */ -function create_http_request($url, $data = [], $header = []) -{ - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, $url); - if (!empty($data)) { - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $data); - } - curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); - curl_setopt($curl, CURLOPT_HEADER, $header); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - $response = curl_exec($curl); - if (!empty($header)) { - $headerSize = curl_getinfo($curl, CURLINFO_HEADER_SIZE); - $response = substr($response, $headerSize); - } - curl_close($curl); - if ($response) { - return $response; - } - return false; -} - /** * 获取客户端IP * @param int $type @@ -246,19 +273,34 @@ function get_client_ip($type = 0, $client = true) } /** - * 页面跳转 + * 创建HTTP请求 * @param $url - * @return false|string + * @param array $data + * @param array $header + * @return bool|mixed */ -function redirect($url) +function create_http_request($url, $data = [], $header = []) { - if (request()->is('ajax')) { - return json_encode([ - 'redirect' => $url, - ]); - } else { - header('location: ' . $url); + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, $url); + if (!empty($data)) { + curl_setopt($curl, CURLOPT_POST, true); + curl_setopt($curl, CURLOPT_POSTFIELDS, $data); } + curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); + curl_setopt($curl, CURLOPT_HEADER, $header); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); + curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); + $response = curl_exec($curl); + if (!empty($header)) { + $headerSize = curl_getinfo($curl, CURLINFO_HEADER_SIZE); + $response = substr($response, $headerSize); + } + curl_close($curl); + if ($response) { + return $response; + } + return false; } /** @@ -299,29 +341,19 @@ function filter($str) } /** - * 框架session操作 - * @param $name - * @param string $value - * @return bool - * @throws Exception + * 过滤数组 + * @param array $array + * @param string $filter + * @param array $result */ -function session($name, $value = '') +function filter_array($array = [], $filter = 'filter', &$result = []) { - $config = \top\library\Config::instance()->get('session'); - if (empty($config) || !$config['prefix']) { - $prefix = request()->module(); - } else { - $prefix = $config['prefix']; - } - if ($value === '') { - if (isset($_SESSION[$prefix][$name])) { - return $_SESSION[$prefix][$name]; + foreach ($array as $key => $value) { + if (is_array($value)) { + filter_array($value, $result[$key]); + } else { + $result[$key] = (!$filter) ? $value : $filter($value); } - return false; - } else if ($value === false) { - unset($_SESSION[$prefix][$name]); - } else { - $_SESSION[$prefix][$name] = $value; } } @@ -479,16 +511,6 @@ function is_mobile() return false; } -/** - * 获取当前视图文件的缓存标识 - * @return string - */ -function view_cache_ident() -{ - $ident = md5($_SERVER['REQUEST_URI'] . request()->requestMethod()); - return $ident; -} - // 模型自动验证函数 /** @@ -533,7 +555,7 @@ function notEqual($value, $value1) * @param int $max * @return boolean */ -function isBetween($value, $min, $max) +function length($value, $min, $max) { $length = mb_strlen($value, 'utf8'); if ($length < $min || $length > $max) { diff --git a/framework/library/http/Request.php b/framework/library/http/Request.php index e616e3d..5adb2d3 100644 --- a/framework/library/http/Request.php +++ b/framework/library/http/Request.php @@ -263,7 +263,7 @@ class Request // 重置except的值 $this->except = []; - filterArray($data, $filter, $data); + filter_array($data, $filter, $data); if ($name) { if (isset($data[$name])) { diff --git a/framework/traits/Instance.php b/framework/traits/Instance.php index 2d2e467..59b81bc 100644 --- a/framework/traits/Instance.php +++ b/framework/traits/Instance.php @@ -2,11 +2,23 @@ namespace top\traits; - +/** + * Trait Instance + * @package top\traits + */ trait Instance { + /** + * 实例 + * @var object + */ private static $instance; + /** + * 获取类实例 + * @param null $param + * @return static + */ public static function instance($param = null) { if (!self::$instance) { @@ -15,10 +27,17 @@ trait Instance return self::$instance; } + /** + * 私有化构造方法 + * Instance constructor. + */ private function __construct() { } + /** + * 私有化克隆方法 + */ private function __clone() { // TODO: Implement __clone() method. diff --git a/framework/traits/Json.php b/framework/traits/Json.php index c1e2108..7355f1e 100644 --- a/framework/traits/Json.php +++ b/framework/traits/Json.php @@ -2,8 +2,19 @@ namespace top\traits; +/** + * Trait Json + * @package top\traits + */ trait Json { + /** + * 格式化数据为json + * @param $msg + * @param int $code + * @param array $data + * @return false|string + */ public function returnJson($msg, $code = 0, $data = []) { if (is_array($msg)) { diff --git a/framework/traits/Magic.php b/framework/traits/Magic.php new file mode 100644 index 0000000..8269b8d --- /dev/null +++ b/framework/traits/Magic.php @@ -0,0 +1,47 @@ + 64 && $ord < 91 && $i != 0) { // 找大写字母 + $start = $i; + break; + } + $prefix .= $stringArray[$i]; + } + if ($prefix != '' && $start > 0) { // 存在前缀，并且存在大写字母 + $value = substr($name, $start, $length); + switch ($prefix) { + case 'model': + self::$magicParameters[$name] = model($value); + break; + case 'logic': + self::$magicParameters[$name] = logic($value); + break; + } + } else { + // 无法被处理，抛出异常 + throw new \Exception('变量' . $name . '不存在'); + } + } + + return self::$magicParameters[$name]; + } +} diff --git a/framework/vendor/composer/autoload_psr4.php b/framework/vendor/composer/autoload_psr4.php index 91d582b..ca4015b 100644 --- a/framework/vendor/composer/autoload_psr4.php +++ b/framework/vendor/composer/autoload_psr4.php @@ -6,5 +6,7 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname(dirname($vendorDir)); return array( + 'top\\' => array($baseDir . '/framework'), + 'app\\' => array($baseDir . '/application'), 'Firebase\\JWT\\' => array($vendorDir . '/firebase/php-jwt/src'), ); diff --git a/framework/vendor/composer/autoload_static.php b/framework/vendor/composer/autoload_static.php index 66720b4..c33613f 100644 --- a/framework/vendor/composer/autoload_static.php +++ b/framework/vendor/composer/autoload_static.php @@ -7,6 +7,14 @@ namespace Composer\Autoload; class ComposerStaticInit7b44678ec2aea793416a22dbbbba76ef { public static $prefixLengthsPsr4 = array ( + 't' => + array ( + 'top\\' => 4, + ), + 'a' => + array ( + 'app\\' => 4, + ), 'F' => array ( 'Firebase\\JWT\\' => 13, @@ -14,6 +22,14 @@ class ComposerStaticInit7b44678ec2aea793416a22dbbbba76ef ); public static $prefixDirsPsr4 = array ( + 'top\\' => + array ( + 0 => __DIR__ . '/../../..' . '/framework', + ), + 'app\\' => + array ( + 0 => __DIR__ . '/../../..' . '/application', + ), 'Firebase\\JWT\\' => array ( 0 => __DIR__ . '/..' . '/firebase/php-jwt/src', diff --git a/framework/vendor/composer/installed.json b/framework/vendor/composer/installed.json index 5b2924c..73464c8 100644 --- a/framework/vendor/composer/installed.json +++ b/framework/vendor/composer/installed.json @@ -1,26 +1,26 @@ [ { "name": "firebase/php-jwt", - "version": "v5.0.0", - "version_normalized": "5.0.0.0", + "version": "v5.2.0", + "version_normalized": "5.2.0.0", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "9984a4d3a32ae7673d6971ea00bae9d0a1abba0e" + "reference": "feb0e820b8436873675fd3aca04f3728eb2185cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/9984a4d3a32ae7673d6971ea00bae9d0a1abba0e", - "reference": "9984a4d3a32ae7673d6971ea00bae9d0a1abba0e", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/feb0e820b8436873675fd3aca04f3728eb2185cb", + "reference": "feb0e820b8436873675fd3aca04f3728eb2185cb", "shasum": "" }, "require": { "php": ">=5.3.0" }, "require-dev": { - "phpunit/phpunit": " 4.8.35" + "phpunit/phpunit": ">=4.8 <=9" }, - "time": "2017-06-27T22:17:23+00:00", + "time": "2020-03-25T18:49:23+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -45,6 +45,10 @@ } ], "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.", - "homepage": "https://github.com/firebase/php-jwt" + "homepage": "https://github.com/firebase/php-jwt", + "keywords": [ + "jwt", + "php" + ] } ] diff --git a/framework/vendor/firebase/php-jwt/README.md b/framework/vendor/firebase/php-jwt/README.md index b1a7a3a..9c8b545 100644 --- a/framework/vendor/firebase/php-jwt/README.md +++ b/framework/vendor/firebase/php-jwt/README.md @@ -23,7 +23,7 @@ Example use \Firebase\JWT\JWT; $key = "example_key"; -$token = array( +$payload = array( "iss" => "http://example.org", "aud" => "http://example.com", "iat" => 1356999524, @@ -36,7 +36,7 @@ $token = array( * https://tools.ietf.org/html/draft-ietf-jose-json-web-algorithms-40 * for a list of spec-compliant algorithms. */ -$jwt = JWT::encode($token, $key); +$jwt = JWT::encode($payload, $key); $decoded = JWT::decode($jwt, $key, array('HS256')); print_r($decoded); @@ -93,14 +93,14 @@ ehde/zUxo6UvS7UrBQIDAQAB -----END PUBLIC KEY----- EOD; -$token = array( +$payload = array( "iss" => "example.org", "aud" => "example.com", "iat" => 1356999524, "nbf" => 1357000000 ); -$jwt = JWT::encode($token, $privateKey, 'RS256'); +$jwt = JWT::encode($payload, $privateKey, 'RS256'); echo "Encode:\n" . print_r($jwt, true) . "\n"; $decoded = JWT::decode($jwt, $publicKey, array('RS256')); diff --git a/framework/vendor/firebase/php-jwt/composer.json b/framework/vendor/firebase/php-jwt/composer.json index b76ffd1..25d1cfa 100644 --- a/framework/vendor/firebase/php-jwt/composer.json +++ b/framework/vendor/firebase/php-jwt/composer.json @@ -2,6 +2,10 @@ "name": "firebase/php-jwt", "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.", "homepage": "https://github.com/firebase/php-jwt", + "keywords": [ + "php", + "jwt" + ], "authors": [ { "name": "Neuman Vong", @@ -24,6 +28,6 @@ } }, "require-dev": { - "phpunit/phpunit": " 4.8.35" + "phpunit/phpunit": ">=4.8 <=9" } } diff --git a/framework/vendor/firebase/php-jwt/src/BeforeValidException.php b/framework/vendor/firebase/php-jwt/src/BeforeValidException.php index a6ee2f7..fdf82bd 100644 --- a/framework/vendor/firebase/php-jwt/src/BeforeValidException.php +++ b/framework/vendor/firebase/php-jwt/src/BeforeValidException.php @@ -3,5 +3,4 @@ namespace Firebase\JWT; class BeforeValidException extends \UnexpectedValueException { - } diff --git a/framework/vendor/firebase/php-jwt/src/ExpiredException.php b/framework/vendor/firebase/php-jwt/src/ExpiredException.php index 3597370..7f7d056 100644 --- a/framework/vendor/firebase/php-jwt/src/ExpiredException.php +++ b/framework/vendor/firebase/php-jwt/src/ExpiredException.php @@ -3,5 +3,4 @@ namespace Firebase\JWT; class ExpiredException extends \UnexpectedValueException { - } diff --git a/framework/vendor/firebase/php-jwt/src/JWK.php b/framework/vendor/firebase/php-jwt/src/JWK.php new file mode 100644 index 0000000..1d27391 --- /dev/null +++ b/framework/vendor/firebase/php-jwt/src/JWK.php @@ -0,0 +1,171 @@ + + * @license http://opensource.org/licenses/BSD-3-Clause 3-clause BSD + * @link https://github.com/firebase/php-jwt + */ +class JWK +{ + /** + * Parse a set of JWK keys + * + * @param array $jwks The JSON Web Key Set as an associative array + * + * @return array An associative array that represents the set of keys + * + * @throws InvalidArgumentException Provided JWK Set is empty + * @throws UnexpectedValueException Provided JWK Set was invalid + * @throws DomainException OpenSSL failure + * + * @uses parseKey + */ + public static function parseKeySet(array $jwks) + { + $keys = array(); + + if (!isset($jwks['keys'])) { + throw new UnexpectedValueException('"keys" member must exist in the JWK Set'); + } + if (empty($jwks['keys'])) { + throw new InvalidArgumentException('JWK Set did not contain any keys'); + } + + foreach ($jwks['keys'] as $k => $v) { + $kid = isset($v['kid']) ? $v['kid'] : $k; + if ($key = self::parseKey($v)) { + $keys[$kid] = $key; + } + } + + if (0 === \count($keys)) { + throw new UnexpectedValueException('No supported algorithms found in JWK Set'); + } + + return $keys; + } + + /** + * Parse a JWK key + * + * @param array $jwk An individual JWK + * + * @return resource|array An associative array that represents the key + * + * @throws InvalidArgumentException Provided JWK is empty + * @throws UnexpectedValueException Provided JWK was invalid + * @throws DomainException OpenSSL failure + * + * @uses createPemFromModulusAndExponent + */ + private static function parseKey(array $jwk) + { + if (empty($jwk)) { + throw new InvalidArgumentException('JWK must not be empty'); + } + if (!isset($jwk['kty'])) { + throw new UnexpectedValueException('JWK must contain a "kty" parameter'); + } + + switch ($jwk['kty']) { + case 'RSA': + if (\array_key_exists('d', $jwk)) { + throw new UnexpectedValueException('RSA private keys are not supported'); + } + if (!isset($jwk['n']) || !isset($jwk['e'])) { + throw new UnexpectedValueException('RSA keys must contain values for both "n" and "e"'); + } + + $pem = self::createPemFromModulusAndExponent($jwk['n'], $jwk['e']); + $publicKey = \openssl_pkey_get_public($pem); + if (false === $publicKey) { + throw new DomainException( + 'OpenSSL error: ' . \openssl_error_string() + ); + } + return $publicKey; + default: + // Currently only RSA is supported + break; + } + } + + /** + * Create a public key represented in PEM format from RSA modulus and exponent information + * + * @param string $n The RSA modulus encoded in Base64 + * @param string $e The RSA exponent encoded in Base64 + * + * @return string The RSA public key represented in PEM format + * + * @uses encodeLength + */ + private static function createPemFromModulusAndExponent($n, $e) + { + $modulus = JWT::urlsafeB64Decode($n); + $publicExponent = JWT::urlsafeB64Decode($e); + + $components = array( + 'modulus' => \pack('Ca*a*', 2, self::encodeLength(\strlen($modulus)), $modulus), + 'publicExponent' => \pack('Ca*a*', 2, self::encodeLength(\strlen($publicExponent)), $publicExponent) + ); + + $rsaPublicKey = \pack( + 'Ca*a*a*', + 48, + self::encodeLength(\strlen($components['modulus']) + \strlen($components['publicExponent'])), + $components['modulus'], + $components['publicExponent'] + ); + + // sequence(oid(1.2.840.113549.1.1.1), null)) = rsaEncryption. + $rsaOID = \pack('H*', '300d06092a864886f70d0101010500'); // hex version of MA0GCSqGSIb3DQEBAQUA + $rsaPublicKey = \chr(0) . $rsaPublicKey; + $rsaPublicKey = \chr(3) . self::encodeLength(\strlen($rsaPublicKey)) . $rsaPublicKey; + + $rsaPublicKey = \pack( + 'Ca*a*', + 48, + self::encodeLength(\strlen($rsaOID . $rsaPublicKey)), + $rsaOID . $rsaPublicKey + ); + + $rsaPublicKey = "-----BEGIN PUBLIC KEY-----\r\n" . + \chunk_split(\base64_encode($rsaPublicKey), 64) . + '-----END PUBLIC KEY-----'; + + return $rsaPublicKey; + } + + /** + * DER-encode the length + * + * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4. See + * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information. + * + * @param int $length + * @return string + */ + private static function encodeLength($length) + { + if ($length <= 0x7F) { + return \chr($length); + } + + $temp = \ltrim(\pack('N', $length), \chr(0)); + + return \pack('Ca*', 0x80 | \strlen($temp), $temp); + } +} diff --git a/framework/vendor/firebase/php-jwt/src/JWT.php b/framework/vendor/firebase/php-jwt/src/JWT.php index 22a67e3..4860028 100644 --- a/framework/vendor/firebase/php-jwt/src/JWT.php +++ b/framework/vendor/firebase/php-jwt/src/JWT.php @@ -1,6 +1,7 @@ array('openssl', 'SHA256'), 'HS256' => array('hash_hmac', 'SHA256'), - 'HS512' => array('hash_hmac', 'SHA512'), 'HS384' => array('hash_hmac', 'SHA384'), + 'HS512' => array('hash_hmac', 'SHA512'), 'RS256' => array('openssl', 'SHA256'), 'RS384' => array('openssl', 'SHA384'), 'RS512' => array('openssl', 'SHA512'), @@ -49,11 +54,11 @@ class JWT /** * Decodes a JWT string into a PHP object. * - * @param string $jwt The JWT - * @param string|array $key The key, or map of keys. - * If the algorithm used is asymmetric, this is the public key - * @param array $allowed_algs List of supported verification algorithms - * Supported algorithms are 'HS256', 'HS384', 'HS512' and 'RS256' + * @param string $jwt The JWT + * @param string|array|resource $key The key, or map of keys. + * If the algorithm used is asymmetric, this is the public key + * @param array $allowed_algs List of supported verification algorithms + * Supported algorithms are 'ES256', 'HS256', 'HS384', 'HS512', 'RS256', 'RS384', and 'RS512' * * @return object The JWT's payload as a PHP object * @@ -68,13 +73,13 @@ class JWT */ public static function decode($jwt, $key, array $allowed_algs = array()) { - $timestamp = is_null(static::$timestamp) ? time() : static::$timestamp; + $timestamp = \is_null(static::$timestamp) ? \time() : static::$timestamp; if (empty($key)) { throw new InvalidArgumentException('Key may not be empty'); } - $tks = explode('.', $jwt); - if (count($tks) != 3) { + $tks = \explode('.', $jwt); + if (\count($tks) != 3) { throw new UnexpectedValueException('Wrong number of segments'); } list($headb64, $bodyb64, $cryptob64) = $tks; @@ -93,10 +98,15 @@ class JWT if (empty(static::$supported_algs[$header->alg])) { throw new UnexpectedValueException('Algorithm not supported'); } - if (!in_array($header->alg, $allowed_algs)) { + if (!\in_array($header->alg, $allowed_algs)) { throw new UnexpectedValueException('Algorithm not allowed'); } - if (is_array($key) || $key instanceof \ArrayAccess) { + if ($header->alg === 'ES256') { + // OpenSSL expects an ASN.1 DER sequence for ES256 signatures + $sig = self::signatureToDER($sig); + } + + if (\is_array($key) || $key instanceof \ArrayAccess) { if (isset($header->kid)) { if (!isset($key[$header->kid])) { throw new UnexpectedValueException('"kid" invalid, unable to lookup correct key'); @@ -112,11 +122,11 @@ class JWT throw new SignatureInvalidException('Signature verification failed'); } - // Check if the nbf if it is defined. This is the time that the + // Check the nbf if it is defined. This is the time that the // token can actually be used. If it's not yet that time, abort. if (isset($payload->nbf) && $payload->nbf > ($timestamp + static::$leeway)) { throw new BeforeValidException( - 'Cannot handle token prior to ' . date(DateTime::ISO8601, $payload->nbf) + 'Cannot handle token prior to ' . \date(DateTime::ISO8601, $payload->nbf) ); } @@ -125,7 +135,7 @@ class JWT // correctly used the nbf claim). if (isset($payload->iat) && $payload->iat > ($timestamp + static::$leeway)) { throw new BeforeValidException( - 'Cannot handle token prior to ' . date(DateTime::ISO8601, $payload->iat) + 'Cannot handle token prior to ' . \date(DateTime::ISO8601, $payload->iat) ); } @@ -144,7 +154,7 @@ class JWT * @param string $key The secret key. * If the algorithm used is asymmetric, this is the private key * @param string $alg The signing algorithm. - * Supported algorithms are 'HS256', 'HS384', 'HS512' and 'RS256' + * Supported algorithms are 'ES256', 'HS256', 'HS384', 'HS512', 'RS256', 'RS384', and 'RS512' * @param mixed $keyId * @param array $head An array with header elements to attach * @@ -159,18 +169,18 @@ class JWT if ($keyId !== null) { $header['kid'] = $keyId; } - if ( isset($head) && is_array($head) ) { - $header = array_merge($head, $header); + if (isset($head) && \is_array($head)) { + $header = \array_merge($head, $header); } $segments = array(); $segments[] = static::urlsafeB64Encode(static::jsonEncode($header)); $segments[] = static::urlsafeB64Encode(static::jsonEncode($payload)); - $signing_input = implode('.', $segments); + $signing_input = \implode('.', $segments); $signature = static::sign($signing_input, $key, $alg); $segments[] = static::urlsafeB64Encode($signature); - return implode('.', $segments); + return \implode('.', $segments); } /** @@ -179,7 +189,7 @@ class JWT * @param string $msg The message to sign * @param string|resource $key The secret key * @param string $alg The signing algorithm. - * Supported algorithms are 'HS256', 'HS384', 'HS512' and 'RS256' + * Supported algorithms are 'ES256', 'HS256', 'HS384', 'HS512', 'RS256', 'RS384', and 'RS512' * * @return string An encrypted message * @@ -191,15 +201,18 @@ class JWT throw new DomainException('Algorithm not supported'); } list($function, $algorithm) = static::$supported_algs[$alg]; - switch($function) { + switch ($function) { case 'hash_hmac': - return hash_hmac($algorithm, $msg, $key, true); + return \hash_hmac($algorithm, $msg, $key, true); case 'openssl': $signature = ''; - $success = openssl_sign($msg, $signature, $key, $algorithm); + $success = \openssl_sign($msg, $signature, $key, $algorithm); if (!$success) { throw new DomainException("OpenSSL unable to sign data"); } else { + if ($alg === 'ES256') { + $signature = self::signatureFromDER($signature, 256); + } return $signature; } } @@ -225,9 +238,9 @@ class JWT } list($function, $algorithm) = static::$supported_algs[$alg]; - switch($function) { + switch ($function) { case 'openssl': - $success = openssl_verify($msg, $signature, $key, $algorithm); + $success = \openssl_verify($msg, $signature, $key, $algorithm); if ($success === 1) { return true; } elseif ($success === 0) { @@ -235,19 +248,19 @@ class JWT } // returns 1 on success, 0 on failure, -1 on error. throw new DomainException( - 'OpenSSL error: ' . openssl_error_string() + 'OpenSSL error: ' . \openssl_error_string() ); case 'hash_hmac': default: - $hash = hash_hmac($algorithm, $msg, $key, true); - if (function_exists('hash_equals')) { - return hash_equals($signature, $hash); + $hash = \hash_hmac($algorithm, $msg, $key, true); + if (\function_exists('hash_equals')) { + return \hash_equals($signature, $hash); } - $len = min(static::safeStrlen($signature), static::safeStrlen($hash)); + $len = \min(static::safeStrlen($signature), static::safeStrlen($hash)); $status = 0; for ($i = 0; $i < $len; $i++) { - $status |= (ord($signature[$i]) ^ ord($hash[$i])); + $status |= (\ord($signature[$i]) ^ \ord($hash[$i])); } $status |= (static::safeStrlen($signature) ^ static::safeStrlen($hash)); @@ -266,23 +279,23 @@ class JWT */ public static function jsonDecode($input) { - if (version_compare(PHP_VERSION, '5.4.0', '>=') && !(defined('JSON_C_VERSION') && PHP_INT_SIZE > 4)) { + if (\version_compare(PHP_VERSION, '5.4.0', '>=') && !(\defined('JSON_C_VERSION') && PHP_INT_SIZE > 4)) { /** In PHP >=5.4.0, json_decode() accepts an options parameter, that allows you * to specify that large ints (like Steam Transaction IDs) should be treated as * strings, rather than the PHP default behaviour of converting them to floats. */ - $obj = json_decode($input, false, 512, JSON_BIGINT_AS_STRING); + $obj = \json_decode($input, false, 512, JSON_BIGINT_AS_STRING); } else { /** Not all servers will support that, however, so for older versions we must * manually detect large ints in the JSON string and quote them (thus converting *them to strings) before decoding, hence the preg_replace() call. */ - $max_int_length = strlen((string) PHP_INT_MAX) - 1; - $json_without_bigints = preg_replace('/:\s*(-?\d{'.$max_int_length.',})/', ': "$1"', $input); - $obj = json_decode($json_without_bigints); + $max_int_length = \strlen((string) PHP_INT_MAX) - 1; + $json_without_bigints = \preg_replace('/:\s*(-?\d{'.$max_int_length.',})/', ': "$1"', $input); + $obj = \json_decode($json_without_bigints); } - if (function_exists('json_last_error') && $errno = json_last_error()) { + if ($errno = \json_last_error()) { static::handleJsonError($errno); } elseif ($obj === null && $input !== 'null') { throw new DomainException('Null result with non-null input'); @@ -301,8 +314,8 @@ class JWT */ public static function jsonEncode($input) { - $json = json_encode($input); - if (function_exists('json_last_error') && $errno = json_last_error()) { + $json = \json_encode($input); + if ($errno = \json_last_error()) { static::handleJsonError($errno); } elseif ($json === 'null' && $input !== null) { throw new DomainException('Null result with non-null input'); @@ -319,12 +332,12 @@ class JWT */ public static function urlsafeB64Decode($input) { - $remainder = strlen($input) % 4; + $remainder = \strlen($input) % 4; if ($remainder) { $padlen = 4 - $remainder; - $input .= str_repeat('=', $padlen); + $input .= \str_repeat('=', $padlen); } - return base64_decode(strtr($input, '-_', '+/')); + return \base64_decode(\strtr($input, '-_', '+/')); } /** @@ -336,7 +349,7 @@ class JWT */ public static function urlsafeB64Encode($input) { - return str_replace('=', '', strtr(base64_encode($input), '+/', '-_')); + return \str_replace('=', '', \strtr(\base64_encode($input), '+/', '-_')); } /** @@ -365,15 +378,135 @@ class JWT /** * Get the number of bytes in cryptographic strings. * - * @param string + * @param string $str * * @return int */ private static function safeStrlen($str) { - if (function_exists('mb_strlen')) { - return mb_strlen($str, '8bit'); + if (\function_exists('mb_strlen')) { + return \mb_strlen($str, '8bit'); } - return strlen($str); + return \strlen($str); + } + + /** + * Convert an ECDSA signature to an ASN.1 DER sequence + * + * @param string $sig The ECDSA signature to convert + * @return string The encoded DER object + */ + private static function signatureToDER($sig) + { + // Separate the signature into r-value and s-value + list($r, $s) = \str_split($sig, (int) (\strlen($sig) / 2)); + + // Trim leading zeros + $r = \ltrim($r, "\x00"); + $s = \ltrim($s, "\x00"); + + // Convert r-value and s-value from unsigned big-endian integers to + // signed two's complement + if (\ord($r[0]) > 0x7f) { + $r = "\x00" . $r; + } + if (\ord($s[0]) > 0x7f) { + $s = "\x00" . $s; + } + + return self::encodeDER( + self::ASN1_SEQUENCE, + self::encodeDER(self::ASN1_INTEGER, $r) . + self::encodeDER(self::ASN1_INTEGER, $s) + ); + } + + /** + * Encodes a value into a DER object. + * + * @param int $type DER tag + * @param string $value the value to encode + * @return string the encoded object + */ + private static function encodeDER($type, $value) + { + $tag_header = 0; + if ($type === self::ASN1_SEQUENCE) { + $tag_header |= 0x20; + } + + // Type + $der = \chr($tag_header | $type); + + // Length + $der .= \chr(\strlen($value)); + + return $der . $value; + } + + /** + * Encodes signature from a DER object. + * + * @param string $der binary signature in DER format + * @param int $keySize the number of bits in the key + * @return string the signature + */ + private static function signatureFromDER($der, $keySize) + { + // OpenSSL returns the ECDSA signatures as a binary ASN.1 DER SEQUENCE + list($offset, $_) = self::readDER($der); + list($offset, $r) = self::readDER($der, $offset); + list($offset, $s) = self::readDER($der, $offset); + + // Convert r-value and s-value from signed two's compliment to unsigned + // big-endian integers + $r = \ltrim($r, "\x00"); + $s = \ltrim($s, "\x00"); + + // Pad out r and s so that they are $keySize bits long + $r = \str_pad($r, $keySize / 8, "\x00", STR_PAD_LEFT); + $s = \str_pad($s, $keySize / 8, "\x00", STR_PAD_LEFT); + + return $r . $s; + } + + /** + * Reads binary DER-encoded data and decodes into a single object + * + * @param string $der the binary data in DER format + * @param int $offset the offset of the data stream containing the object + * to decode + * @return array [$offset, $data] the new offset and the decoded object + */ + private static function readDER($der, $offset = 0) + { + $pos = $offset; + $size = \strlen($der); + $constructed = (\ord($der[$pos]) >> 5) & 0x01; + $type = \ord($der[$pos++]) & 0x1f; + + // Length + $len = \ord($der[$pos++]); + if ($len & 0x80) { + $n = $len & 0x1f; + $len = 0; + while ($n-- && $pos < $size) { + $len = ($len << 8) | \ord($der[$pos++]); + } + } + + // Value + if ($type == self::ASN1_BIT_STRING) { + $pos++; // Skip the first contents octet (padding indicator) + $data = \substr($der, $pos, $len - 1); + $pos += $len - 1; + } elseif (!$constructed) { + $data = \substr($der, $pos, $len); + $pos += $len; + } else { + $data = null; + } + + return array($pos, $data); } } diff --git a/framework/vendor/firebase/php-jwt/src/SignatureInvalidException.php b/framework/vendor/firebase/php-jwt/src/SignatureInvalidException.php index 27332b2..87cb34d 100644 --- a/framework/vendor/firebase/php-jwt/src/SignatureInvalidException.php +++ b/framework/vendor/firebase/php-jwt/src/SignatureInvalidException.php @@ -3,5 +3,4 @@ namespace Firebase\JWT; class SignatureInvalidException extends \UnexpectedValueException { - }