Commit b2af09cf authored by Amin MasterkinG's avatar Amin MasterkinG
Browse files

Update all composer packages.

parent baeca23d
......@@ -8,16 +8,16 @@
"packages": [
{
"name": "catfan/medoo",
"version": "v1.6",
"version": "v1.6.1",
"source": {
"type": "git",
"url": "https://github.com/catfan/Medoo.git",
"reference": "45047e013105d95569c1b66167d788dfd3f1102b"
"reference": "53a02b300d673f716cb06bf0e24fd774ec53939f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/catfan/Medoo/zipball/45047e013105d95569c1b66167d788dfd3f1102b",
"reference": "45047e013105d95569c1b66167d788dfd3f1102b",
"url": "https://api.github.com/repos/catfan/Medoo/zipball/53a02b300d673f716cb06bf0e24fd774ec53939f",
"reference": "53a02b300d673f716cb06bf0e24fd774ec53939f",
"shasum": ""
},
"require": {
......@@ -63,7 +63,7 @@
"sql",
"sqlite"
],
"time": "2018-10-08T07:13:05+00:00"
"time": "2018-12-08T20:24:23+00:00"
},
{
"name": "gregwar/captcha",
......@@ -120,16 +120,16 @@
},
{
"name": "phpmailer/phpmailer",
"version": "v6.0.6",
"version": "v6.0.7",
"source": {
"type": "git",
"url": "https://github.com/PHPMailer/PHPMailer.git",
"reference": "8190d73eb5def11a43cfb020b7f36db65330698c"
"reference": "0c41a36d4508d470e376498c1c0c527aa36a2d59"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/8190d73eb5def11a43cfb020b7f36db65330698c",
"reference": "8190d73eb5def11a43cfb020b7f36db65330698c",
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/0c41a36d4508d470e376498c1c0c527aa36a2d59",
"reference": "0c41a36d4508d470e376498c1c0c527aa36a2d59",
"shasum": ""
},
"require": {
......@@ -182,20 +182,20 @@
}
],
"description": "PHPMailer is a full-featured email creation and transfer class for PHP",
"time": "2018-11-16T00:41:32+00:00"
"time": "2019-02-01T15:04:28+00:00"
},
{
"name": "phpunit/php-timer",
"version": "2.0.0",
"version": "2.1.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-timer.git",
"reference": "8b8454ea6958c3dee38453d3bd571e023108c91f"
"reference": "8b389aebe1b8b0578430bda0c7c95a829608e059"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b8454ea6958c3dee38453d3bd571e023108c91f",
"reference": "8b8454ea6958c3dee38453d3bd571e023108c91f",
"url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b389aebe1b8b0578430bda0c7c95a829608e059",
"reference": "8b389aebe1b8b0578430bda0c7c95a829608e059",
"shasum": ""
},
"require": {
......@@ -207,7 +207,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0-dev"
"dev-master": "2.1-dev"
}
},
"autoload": {
......@@ -231,7 +231,7 @@
"keywords": [
"timer"
],
"time": "2018-02-01T13:07:23+00:00"
"time": "2019-02-20T10:12:59+00:00"
},
{
"name": "rmccue/requests",
......@@ -284,16 +284,16 @@
},
{
"name": "symfony/finder",
"version": "v4.1.8",
"version": "v4.2.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "68fbdcafe915db67adb13fddaec4532e684f6689"
"reference": "267b7002c1b70ea80db0833c3afe05f0fbde580a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/68fbdcafe915db67adb13fddaec4532e684f6689",
"reference": "68fbdcafe915db67adb13fddaec4532e684f6689",
"url": "https://api.github.com/repos/symfony/finder/zipball/267b7002c1b70ea80db0833c3afe05f0fbde580a",
"reference": "267b7002c1b70ea80db0833c3afe05f0fbde580a",
"shasum": ""
},
"require": {
......@@ -302,7 +302,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.1-dev"
"dev-master": "4.2-dev"
}
},
"autoload": {
......@@ -329,20 +329,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
"time": "2018-11-11T19:51:29+00:00"
"time": "2019-02-23T15:42:05+00:00"
},
{
"name": "symfony/polyfill-iconv",
"version": "v1.10.0",
"version": "v1.11.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-iconv.git",
"reference": "97001cfc283484c9691769f51cdf25259037eba2"
"reference": "f037ea22acfaee983e271dd9c3b8bb4150bd8ad7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/97001cfc283484c9691769f51cdf25259037eba2",
"reference": "97001cfc283484c9691769f51cdf25259037eba2",
"url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/f037ea22acfaee983e271dd9c3b8bb4150bd8ad7",
"reference": "f037ea22acfaee983e271dd9c3b8bb4150bd8ad7",
"shasum": ""
},
"require": {
......@@ -354,7 +354,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.11-dev"
}
},
"autoload": {
......@@ -388,20 +388,20 @@
"portable",
"shim"
],
"time": "2018-09-21T06:26:08+00:00"
"time": "2019-02-06T07:57:58+00:00"
},
{
"name": "symfony/polyfill-intl-grapheme",
"version": "v1.10.0",
"version": "v1.11.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
"reference": "378c8743ff5352fe124c9c2b32d5f03e798f33d3"
"reference": "d4b2e06aed3f7a4e3de06f9ad9189cd6a1f0a2ec"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/378c8743ff5352fe124c9c2b32d5f03e798f33d3",
"reference": "378c8743ff5352fe124c9c2b32d5f03e798f33d3",
"url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/d4b2e06aed3f7a4e3de06f9ad9189cd6a1f0a2ec",
"reference": "d4b2e06aed3f7a4e3de06f9ad9189cd6a1f0a2ec",
"shasum": ""
},
"require": {
......@@ -448,20 +448,20 @@
"portable",
"shim"
],
"time": "2018-09-21T06:26:08+00:00"
"time": "2019-01-07T19:39:47+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
"version": "v1.10.0",
"version": "v1.11.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
"reference": "f8ed52909fc049b42a772c64ec1e6b31792abad6"
"reference": "d570b8ea2cb7f33f217832339a181a206cf54a04"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/f8ed52909fc049b42a772c64ec1e6b31792abad6",
"reference": "f8ed52909fc049b42a772c64ec1e6b31792abad6",
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/d570b8ea2cb7f33f217832339a181a206cf54a04",
"reference": "d570b8ea2cb7f33f217832339a181a206cf54a04",
"shasum": ""
},
"require": {
......@@ -511,20 +511,20 @@
"portable",
"shim"
],
"time": "2018-09-21T06:26:08+00:00"
"time": "2019-01-07T19:39:47+00:00"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.10.0",
"version": "v1.11.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "c79c051f5b3a46be09205c73b80b346e4153e494"
"reference": "fe5e94c604826c35a32fa832f35bd036b6799609"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494",
"reference": "c79c051f5b3a46be09205c73b80b346e4153e494",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609",
"reference": "fe5e94c604826c35a32fa832f35bd036b6799609",
"shasum": ""
},
"require": {
......@@ -536,7 +536,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.11-dev"
}
},
"autoload": {
......@@ -570,20 +570,20 @@
"portable",
"shim"
],
"time": "2018-09-21T13:07:52+00:00"
"time": "2019-02-06T07:57:58+00:00"
},
{
"name": "symfony/polyfill-php72",
"version": "v1.10.0",
"version": "v1.11.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
"reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631"
"reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
"reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/ab50dcf166d5f577978419edd37aa2bb8eabce0c",
"reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c",
"shasum": ""
},
"require": {
......@@ -592,7 +592,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.11-dev"
}
},
"autoload": {
......@@ -625,33 +625,33 @@
"portable",
"shim"
],
"time": "2018-09-21T13:07:52+00:00"
"time": "2019-02-06T07:57:58+00:00"
},
{
"name": "voku/anti-xss",
"version": "4.1.3",
"version": "4.1.5",
"source": {
"type": "git",
"url": "https://github.com/voku/anti-xss.git",
"reference": "37675e38d94968336e949497209888b897c6c85b"
"reference": "ce8deec5b8a123655b7f149c54db2d45494783c4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/voku/anti-xss/zipball/37675e38d94968336e949497209888b897c6c85b",
"reference": "37675e38d94968336e949497209888b897c6c85b",
"url": "https://api.github.com/repos/voku/anti-xss/zipball/ce8deec5b8a123655b7f149c54db2d45494783c4",
"reference": "ce8deec5b8a123655b7f149c54db2d45494783c4",
"shasum": ""
},
"require": {
"php": ">=7.0.0",
"voku/portable-utf8": "~5.2"
"voku/portable-utf8": "~5.4.1"
},
"require-dev": {
"phpunit/phpunit": "~6.0|~7.0"
"phpunit/phpunit": "~6.0 || ~7.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.0.x-dev"
"dev-master": "4.1.x-dev"
}
},
"autoload": {
......@@ -682,20 +682,20 @@
"security",
"xss"
],
"time": "2018-10-27T23:41:01+00:00"
"time": "2019-02-13T20:53:48+00:00"
},
{
"name": "voku/portable-utf8",
"version": "5.2.11",
"version": "5.4.3",
"source": {
"type": "git",
"url": "https://github.com/voku/portable-utf8.git",
"reference": "3e5c551d33f1c6c9730872c21349f783d92dbbfa"
"reference": "6b890c1a9acc513eb311c88eede51f1d4e84bc32"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/voku/portable-utf8/zipball/3e5c551d33f1c6c9730872c21349f783d92dbbfa",
"reference": "3e5c551d33f1c6c9730872c21349f783d92dbbfa",
"url": "https://api.github.com/repos/voku/portable-utf8/zipball/6b890c1a9acc513eb311c88eede51f1d4e84bc32",
"reference": "6b890c1a9acc513eb311c88eede51f1d4e84bc32",
"shasum": ""
},
"require": {
......@@ -707,7 +707,7 @@
"symfony/polyfill-php72": "~1.0"
},
"require-dev": {
"phpunit/phpunit": "~6.0|~7.0"
"phpunit/phpunit": "~6.0 || ~7.0"
},
"suggest": {
"ext-ctype": "Use Ctype for e.g. hexadecimal digit detection",
......@@ -720,7 +720,8 @@
"type": "library",
"autoload": {
"psr-4": {
"voku\\": "src/voku/"
"voku\\": "src/voku/",
"voku\\tests\\": "tests/"
},
"files": [
"bootstrap.php"
......@@ -744,7 +745,7 @@
"email": "p@tchwork.com"
}
],
"description": "Portable UTF-8 library with polyfill / shim for Iconv, Intl, Mbstring, Normalizrer etc.",
"description": "Portable UTF-8 library - performance optimized (unicode) string functions for php.",
"homepage": "https://github.com/voku/portable-utf8",
"keywords": [
"UTF",
......@@ -754,7 +755,7 @@
"utf-8",
"utf8"
],
"time": "2018-10-19T20:36:08+00:00"
"time": "2019-03-05T19:40:20+00:00"
}
],
"packages-dev": [],
......
---
name: Bug report
about: Create a report to help us improve
---
**Describe the bug**
A clear and concise description of what the bug is.
**Information**
- Version of Medoo:
- Type of Database (MySQL, MSSQL, SQLite...):
- System (Liunx\Windows\Mac):
**Detail Code**
The detail code causes the problem.
**Expected output**
A clear and concise description of what output you expected.
......@@ -2,7 +2,7 @@
/*!
* Medoo database framework
* https://medoo.in
* Version 1.6
* Version 1.6.1
*
* Copyright 2018, Angel Lai
* Released under the MIT license
......@@ -1066,6 +1066,10 @@ class Medoo
$where = $columns;
}
}
elseif ($raw = $this->buildRaw($column_fn, $map))
{
$column = $raw;
}
else
{
if (empty($columns) || $this->isRaw($columns))
......@@ -1488,13 +1492,20 @@ class Medoo
$map = [];
$column = null;
$query = $this->exec('SELECT EXISTS(' . $this->selectContext($table, $map, $join, $column, $where, 1) . ')', $map);
if ($this->type === 'mssql')
{
$query = $this->exec($this->selectContext($table, $map, $join, $column, $where, Medoo::raw('TOP 1 1')), $map);
}
else
{
$query = $this->exec('SELECT EXISTS(' . $this->selectContext($table, $map, $join, $column, $where, 1) . ')', $map);
}
if ($query)
{
$result = $query->fetchColumn();
return $result === '1' || $result === true;
return $result === '1' || $result === 1 || $result === true;
}
return false;
......@@ -1622,10 +1633,6 @@ class Medoo
{
return 0;
}
elseif ($type === 'mssql')
{
return $this->pdo->query('SELECT SCOPE_IDENTITY()')->fetchColumn();
}
elseif ($type === 'pgsql')
{
return $this->pdo->query('SELECT LASTVAL()')->fetchColumn();
......
......@@ -279,7 +279,7 @@ class ClassLoader
*/
public function setApcuPrefix($apcuPrefix)
{
$this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
$this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
}
/**
......
......@@ -6,6 +6,7 @@ $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
return array(
'voku\\tests\\' => array($vendorDir . '/voku/portable-utf8/tests'),
'voku\\helper\\' => array($vendorDir . '/voku/anti-xss/src/voku/helper'),
'voku\\' => array($vendorDir . '/voku/portable-utf8/src/voku'),
'Symfony\\Polyfill\\Php72\\' => array($vendorDir . '/symfony/polyfill-php72'),
......
......@@ -18,6 +18,7 @@ class ComposerStaticInitde424ad7860a40a14ec11f109060d25d
public static $prefixLengthsPsr4 = array (
'v' =>
array (
'voku\\tests\\' => 11,
'voku\\helper\\' => 12,
'voku\\' => 5,
),
......@@ -45,6 +46,10 @@ class ComposerStaticInitde424ad7860a40a14ec11f109060d25d
);
public static $prefixDirsPsr4 = array (
'voku\\tests\\' =>
array (
0 => __DIR__ . '/..' . '/voku/portable-utf8/tests',
),
'voku\\helper\\' =>
array (
0 => __DIR__ . '/..' . '/voku/anti-xss/src/voku/helper',
......
[
{
"name": "catfan/medoo",
"version": "v1.6",
"version_normalized": "1.6.0.0",
"version": "v1.6.1",
"version_normalized": "1.6.1.0",
"source": {
"type": "git",
"url": "https://github.com/catfan/Medoo.git",
"reference": "45047e013105d95569c1b66167d788dfd3f1102b"
"reference": "53a02b300d673f716cb06bf0e24fd774ec53939f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/catfan/Medoo/zipball/45047e013105d95569c1b66167d788dfd3f1102b",
"reference": "45047e013105d95569c1b66167d788dfd3f1102b",
"url": "https://api.github.com/repos/catfan/Medoo/zipball/53a02b300d673f716cb06bf0e24fd774ec53939f",
"reference": "53a02b300d673f716cb06bf0e24fd774ec53939f",
"shasum": ""
},
"require": {
......@@ -27,7 +27,7 @@
"ext-pdo_sqlite": "For SQLite database",
"ext-pdo_sqlsrv": "For MSSQL database"
},
"time": "2018-10-08T07:13:05+00:00",
"time": "2018-12-08T20:24:23+00:00",
"type": "framework",
"installation-source": "dist",
"autoload": {
......@@ -117,17 +117,17 @@
},
{
"name": "phpmailer/phpmailer",
"version": "v6.0.6",
"version_normalized": "6.0.6.0",
"version": "v6.0.7",
"version_normalized": "6.0.7.0",
"source": {
"type": "git",
"url": "https://github.com/PHPMailer/PHPMailer.git",
"reference": "8190d73eb5def11a43cfb020b7f36db65330698c"
"reference": "0c41a36d4508d470e376498c1c0c527aa36a2d59"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/8190d73eb5def11a43cfb020b7f36db65330698c",
"reference": "8190d73eb5def11a43cfb020b7f36db65330698c",
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/0c41a36d4508d470e376498c1c0c527aa36a2d59",
"reference": "0c41a36d4508d470e376498c1c0c527aa36a2d59",
"shasum": ""
},
"require": {
......@@ -152,7 +152,7 @@
"stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
"symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
},
"time": "2018-11-16T00:41:32+00:00",
"time": "2019-02-01T15:04:28+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
......@@ -185,17 +185,17 @@
},
{
"name": "phpunit/php-timer",
"version": "2.0.0",
"version_normalized": "2.0.0.0",
"version": "2.1.1",
"version_normalized": "2.1.1.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-timer.git",
"reference": "8b8454ea6958c3dee38453d3bd571e023108c91f"
"reference": "8b389aebe1b8b0578430bda0c7c95a829608e059"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b8454ea6958c3dee38453d3bd571e023108c91f",
"reference": "8b8454ea6958c3dee38453d3bd571e023108c91f",
"url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b389aebe1b8b0578430bda0c7c95a829608e059",
"reference": "8b389aebe1b8b0578430bda0c7c95a829608e059",
"shasum": ""
},
"require": {
......@@ -204,11 +204,11 @@
"require-dev": {
"phpunit/phpunit": "^7.0"
},
"time": "2018-02-01T13:07:23+00:00",
"time": "2019-02-20T10:12:59+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0-dev"
"dev-master": "2.1-dev"
}
},
"installation-source": "dist",
......@@ -287,27 +287,27 @@
},
{
"name": "symfony/finder",
"version": "v4.1.8",
"version_normalized": "4.1.8.0",
"version": "v4.2.4",
"version_normalized": "4.2.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "68fbdcafe915db67adb13fddaec4532e684f6689"
"reference": "267b7002c1b70ea80db0833c3afe05f0fbde580a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/68fbdcafe915db67adb13fddaec4532e684f6689",
"reference": "68fbdcafe915db67adb13fddaec4532e684f6689",
"url": "https://api.github.com/repos/symfony/finder/zipball/267b7002c1b70ea80db0833c3afe05f0fbde580a",
"reference": "267b7002c1b70ea80db0833c3afe05f0fbde580a",
"shasum": ""
},
"require": {
"php": "^7.1.3"
},
"time": "2018-11-11T19:51:29+00:00",
"time": "2019-02-23T15:42:05+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.1-dev"
"dev-master": "4.2-dev"
}
},
"installation-source": "dist",
......@@ -338,17 +338,17 @@
},
{
"name": "symfony/polyfill-iconv",
"version": "v1.10.0",
"version_normalized": "1.10.0.0",
"version": "v1.11.0",
"version_normalized": "1.11.0.0",
"source": {
"type": "git",