국호 변경 warning 수정

국호 변경 추가
ng_old_generals에 aux 반영
2020-03-05 07:35:01 +09:00 · 2020-03-05 07:33:11 +09:00 · 2020-03-05 06:53:15 +09:00 · 2020-03-05 06:48:15 +09:00 · 2020-03-05 06:39:02 +09:00 · 2020-02-08 23:42:22 +09:00
439 changed files with 14435 additions and 16305 deletions
@@ -6,12 +6,17 @@
       "GPL-2.0-or-later",
       "proprietary"
    ],
+    "config": {
+        "platform": {
+            "php": "7.3"
+        }
+    },
    "require": {
        "brandonwamboldt/utilphp": "^1.1",
        "sergeytsalkov/meekrodb": "^2.3",
        "league/plates": "^3.3",
        "guzzlehttp/guzzle": "^6.3",
-        "leafo/scssphp": "^0.7.5",
+        "scssphp/scssphp": "^1.0",
        "monolog/monolog": "^1.23",
        "firephp/firephp-core": "^0.4.0",
        "vlucas/valitron": "^1.4",
@@ -1,10 +1,10 @@
 {
    "_readme": [
        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "3fceaf3c2925068c7e757ab12036e29e",
+    "content-hash": "b5b5695ed0b1b04fa672f99972d8caad",
    "packages": [
        {
            "name": "brandonwamboldt/utilphp",
@@ -54,16 +54,16 @@
        },
        {
            "name": "catfan/medoo",
-            "version": "v1.5.7",
+            "version": "v1.7.8",
            "source": {
                "type": "git",
                "url": "https://github.com/catfan/Medoo.git",
-                "reference": "8d90cba0e8ff176028847527d0ea76fe41a06ecf"
+                "reference": "dd9d570584cfb1e09ec470608479b86e41d5b60d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/catfan/Medoo/zipball/8d90cba0e8ff176028847527d0ea76fe41a06ecf",
-                "reference": "8d90cba0e8ff176028847527d0ea76fe41a06ecf",
+                "url": "https://api.github.com/repos/catfan/Medoo/zipball/dd9d570584cfb1e09ec470608479b86e41d5b60d",
+                "reference": "dd9d570584cfb1e09ec470608479b86e41d5b60d",
                "shasum": ""
            },
            "require": {
@@ -77,7 +77,7 @@
                "ext-pdo_oci8": "For Oracle version 8 database",
                "ext-pdo_pqsql": "For PostgreSQL database",
                "ext-pdo_sqlite": "For SQLite database",
-                "ext-pdo_sqlsrv": "For MSSQL database"
+                "ext-pdo_sqlsrv": "For MSSQL database on both Window/Liunx platform"
            },
            "type": "framework",
            "autoload": {
@@ -95,10 +95,11 @@
                    "email": "angel@catfan.me"
                }
            ],
-            "description": "The lightest PHP database framework to accelerate development",
+            "description": "The lightweight PHP database framework to accelerate development",
            "homepage": "https://medoo.in",
            "keywords": [
                "database",
+                "database library",
                "lightweight",
                "mariadb",
                "mssql",
@@ -109,27 +110,27 @@
                "sql",
                "sqlite"
            ],
-            "time": "2018-06-14T18:59:08+00:00"
+            "time": "2019-12-19T05:04:34+00:00"
        },
        {
            "name": "ezyang/htmlpurifier",
-            "version": "v4.10.0",
+            "version": "v4.12.0",
            "source": {
                "type": "git",
                "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "d85d39da4576a6934b72480be6978fb10c860021"
+                "reference": "a617e55bc62a87eec73bd456d146d134ad716f03"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/d85d39da4576a6934b72480be6978fb10c860021",
-                "reference": "d85d39da4576a6934b72480be6978fb10c860021",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/a617e55bc62a87eec73bd456d146d134ad716f03",
+                "reference": "a617e55bc62a87eec73bd456d146d134ad716f03",
                "shasum": ""
            },
            "require": {
                "php": ">=5.2"
            },
            "require-dev": {
-                "simpletest/simpletest": "^1.1"
+                "simpletest/simpletest": "dev-master#72de02a7b80c6bb8864ef9bf66d41d2f58f826bd"
            },
            "type": "library",
            "autoload": {
@@ -142,7 +143,7 @@
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
-                "LGPL"
+                "LGPL-2.1-or-later"
            ],
            "authors": [
                {
@@ -156,7 +157,7 @@
            "keywords": [
                "html"
            ],
-            "time": "2018-02-23T01:58:20+00:00"
+            "time": "2019-10-28T03:44:26+00:00"
        },
        {
            "name": "firephp/firephp-core",
@@ -196,44 +197,46 @@
        },
        {
            "name": "guzzlehttp/guzzle",
-            "version": "6.3.3",
+            "version": "6.5.2",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
+                "reference": "43ece0e75098b7ecd8d13918293029e555a50f82"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
-                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/43ece0e75098b7ecd8d13918293029e555a50f82",
+                "reference": "43ece0e75098b7ecd8d13918293029e555a50f82",
                "shasum": ""
            },
            "require": {
+                "ext-json": "*",
                "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.4",
+                "guzzlehttp/psr7": "^1.6.1",
                "php": ">=5.5"
            },
            "require-dev": {
                "ext-curl": "*",
                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
-                "psr/log": "^1.0"
+                "psr/log": "^1.1"
            },
            "suggest": {
+                "ext-intl": "Required for Internationalized Domain Name (IDN) support",
                "psr/log": "Required for using the Log middleware"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "6.3-dev"
+                    "dev-master": "6.5-dev"
                }
            },
            "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
                "psr-4": {
                    "GuzzleHttp\\": "src/"
-                }
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
@@ -257,7 +260,7 @@
                "rest",
                "web service"
            ],
-            "time": "2018-04-22T15:46:56+00:00"
+            "time": "2019-12-23T11:57:10+00:00"
        },
        {
            "name": "guzzlehttp/promises",
@@ -312,32 +315,37 @@
        },
        {
            "name": "guzzlehttp/psr7",
-            "version": "1.4.2",
+            "version": "1.6.1",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/psr7.git",
-                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
+                "reference": "239400de7a173fe9901b9ac7c06497751f00727a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
-                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
+                "reference": "239400de7a173fe9901b9ac7c06497751f00727a",
                "shasum": ""
            },
            "require": {
                "php": ">=5.4.0",
-                "psr/http-message": "~1.0"
+                "psr/http-message": "~1.0",
+                "ralouphie/getallheaders": "^2.0.5 || ^3.0.0"
            },
            "provide": {
                "psr/http-message-implementation": "1.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "~4.0"
+                "ext-zlib": "*",
+                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
+            },
+            "suggest": {
+                "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.4-dev"
+                    "dev-master": "1.6-dev"
                }
            },
            "autoload": {
@@ -367,65 +375,14 @@
            "keywords": [
                "http",
                "message",
+                "psr-7",
                "request",
                "response",
                "stream",
                "uri",
                "url"
            ],
-            "time": "2017-03-20T17:10:46+00:00"
-        },
-        {
-            "name": "leafo/scssphp",
-            "version": "v0.7.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/leafo/scssphp.git",
-                "reference": "1d656f8c02a3a69404bba6b28ec4e06edddf0f49"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/leafo/scssphp/zipball/1d656f8c02a3a69404bba6b28ec4e06edddf0f49",
-                "reference": "1d656f8c02a3a69404bba6b28ec4e06edddf0f49",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.6",
-                "squizlabs/php_codesniffer": "~2.5"
-            },
-            "bin": [
-                "bin/pscss"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Leafo\\ScssPhp\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Leaf Corcoran",
-                    "email": "leafot@gmail.com",
-                    "homepage": "http://leafo.net"
-                }
-            ],
-            "description": "scssphp is a compiler for SCSS written in PHP.",
-            "homepage": "http://leafo.github.io/scssphp/",
-            "keywords": [
-                "css",
-                "less",
-                "sass",
-                "scss",
-                "stylesheet"
-            ],
-            "time": "2018-07-22T01:22:08+00:00"
+            "time": "2019-07-01T23:21:34+00:00"
        },
        {
            "name": "league/plates",
@@ -484,16 +441,16 @@
        },
        {
            "name": "monolog/monolog",
-            "version": "1.23.0",
+            "version": "1.25.3",
            "source": {
                "type": "git",
                "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4"
+                "reference": "fa82921994db851a8becaf3787a9e73c5976b6f1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
-                "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fa82921994db851a8becaf3787a9e73c5976b6f1",
+                "reference": "fa82921994db851a8becaf3787a9e73c5976b6f1",
                "shasum": ""
            },
            "require": {
@@ -558,7 +515,7 @@
                "logging",
                "psr-3"
            ],
-            "time": "2017-06-19T01:22:40+00:00"
+            "time": "2019-12-20T14:15:16+00:00"
        },
        {
            "name": "pguardiario/phpuri",
@@ -720,16 +677,16 @@
        },
        {
            "name": "psr/log",
-            "version": "1.0.2",
+            "version": "1.1.2",
            "source": {
                "type": "git",
                "url": "https://github.com/php-fig/log.git",
-                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+                "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
-                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
+                "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
                "shasum": ""
            },
            "require": {
@@ -738,7 +695,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                }
            },
            "autoload": {
@@ -763,7 +720,108 @@
                "psr",
                "psr-3"
            ],
-            "time": "2016-10-10T12:19:37+00:00"
+            "time": "2019-11-01T11:05:21+00:00"
+        },
+        {
+            "name": "ralouphie/getallheaders",
+            "version": "3.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ralouphie/getallheaders.git",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "require-dev": {
+                "php-coveralls/php-coveralls": "^2.1",
+                "phpunit/phpunit": "^5 || ^6.5"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/getallheaders.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ralph Khattar",
+                    "email": "ralph.khattar@gmail.com"
+                }
+            ],
+            "description": "A polyfill for getallheaders.",
+            "time": "2019-03-08T08:55:37+00:00"
+        },
+        {
+            "name": "scssphp/scssphp",
+            "version": "1.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/scssphp/scssphp.git",
+                "reference": "5b3c9d704950d8f9637f5110c36c281ec47dc13c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/scssphp/scssphp/zipball/5b3c9d704950d8f9637f5110c36c281ec47dc13c",
+                "reference": "5b3c9d704950d8f9637f5110c36c281ec47dc13c",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "ext-json": "*",
+                "php": ">=5.6.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3",
+                "squizlabs/php_codesniffer": "~2.5",
+                "twbs/bootstrap": "~4.3",
+                "zurb/foundation": "~6.5"
+            },
+            "bin": [
+                "bin/pscss"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "ScssPhp\\ScssPhp\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Anthon Pang",
+                    "email": "apang@softwaredevelopment.ca",
+                    "homepage": "https://github.com/robocoder"
+                },
+                {
+                    "name": "Cédric Morin",
+                    "email": "cedric@yterium.com",
+                    "homepage": "https://github.com/Cerdic"
+                }
+            ],
+            "description": "scssphp is a compiler for SCSS written in PHP.",
+            "homepage": "http://scssphp.github.io/scssphp/",
+            "keywords": [
+                "css",
+                "less",
+                "sass",
+                "scss",
+                "stylesheet"
+            ],
+            "time": "2019-12-12T05:00:52+00:00"
        },
        {
            "name": "sergeytsalkov/meekrodb",
@@ -810,29 +868,34 @@
        },
        {
            "name": "symfony/lock",
-            "version": "v4.1.1",
+            "version": "v4.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/lock.git",
-                "reference": "d508b5dd92272cb74300396ecaadde969d0f7976"
+                "reference": "6c4f5b620871cfef5b004fc57f2ca74572ae03b3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/lock/zipball/d508b5dd92272cb74300396ecaadde969d0f7976",
-                "reference": "d508b5dd92272cb74300396ecaadde969d0f7976",
+                "url": "https://api.github.com/repos/symfony/lock/zipball/6c4f5b620871cfef5b004fc57f2ca74572ae03b3",
+                "reference": "6c4f5b620871cfef5b004fc57f2ca74572ae03b3",
                "shasum": ""
            },
            "require": {
                "php": "^7.1.3",
                "psr/log": "~1.0"
            },
+            "conflict": {
+                "doctrine/dbal": "<2.5"
+            },
            "require-dev": {
+                "doctrine/dbal": "~2.5",
+                "mongodb/mongodb": "~1.1",
                "predis/predis": "~1.0"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "4.1-dev"
+                    "dev-master": "4.4-dev"
                }
            },
            "autoload": {
@@ -848,13 +911,13 @@
                "MIT"
            ],
            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                },
                {
                    "name": "Jérémy Derussé",
                    "email": "jeremy@derusse.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                }
            ],
            "description": "Symfony Lock Component",
@@ -867,20 +930,20 @@
                "redlock",
                "semaphore"
            ],
-            "time": "2018-06-21T11:15:46+00:00"
+            "time": "2020-01-04T13:00:46+00:00"
        },
        {
            "name": "vlucas/valitron",
-            "version": "v1.4.3",
+            "version": "v1.4.7",
            "source": {
                "type": "git",
                "url": "https://github.com/vlucas/valitron.git",
-                "reference": "3c5463315bfa23b17f8949b100a960d035234e43"
+                "reference": "a03072bed1679660200766d134507a30193eaf6d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/valitron/zipball/3c5463315bfa23b17f8949b100a960d035234e43",
-                "reference": "3c5463315bfa23b17f8949b100a960d035234e43",
+                "url": "https://api.github.com/repos/vlucas/valitron/zipball/a03072bed1679660200766d134507a30193eaf6d",
+                "reference": "a03072bed1679660200766d134507a30193eaf6d",
                "shasum": ""
            },
            "require": {
@@ -916,28 +979,29 @@
                "validation",
                "validator"
            ],
-            "time": "2018-05-06T10:45:26+00:00"
+            "time": "2019-08-29T19:49:43+00:00"
        },
        {
            "name": "xemlock/htmlpurifier-html5",
-            "version": "v0.1.7",
+            "version": "v0.1.11",
            "source": {
                "type": "git",
                "url": "https://github.com/xemlock/htmlpurifier-html5.git",
-                "reference": "b4b35e51ec75e0207c23035f7d9a354bdcdac359"
+                "reference": "f0d563f9fd4a82a3d759043483f9a94c0d8c2255"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/xemlock/htmlpurifier-html5/zipball/b4b35e51ec75e0207c23035f7d9a354bdcdac359",
-                "reference": "b4b35e51ec75e0207c23035f7d9a354bdcdac359",
+                "url": "https://api.github.com/repos/xemlock/htmlpurifier-html5/zipball/f0d563f9fd4a82a3d759043483f9a94c0d8c2255",
+                "reference": "f0d563f9fd4a82a3d759043483f9a94c0d8c2255",
                "shasum": ""
            },
            "require": {
-                "ezyang/htmlpurifier": "^4.7",
+                "ezyang/htmlpurifier": "^4.8",
                "php": ">=5.2"
            },
            "require-dev": {
-                "phpunit/phpunit": "4.7.*|5.7.*"
+                "php-coveralls/php-coveralls": "^1.1|^2.1",
+                "phpunit/phpunit": ">=4.7 <8.0"
            },
            "type": "library",
            "autoload": {
@@ -955,8 +1019,18 @@
                    "email": "xemlock@gmail.com"
                }
            ],
-            "description": "HTML Purifier definitions for HTML5 elements",
-            "time": "2018-06-07T14:30:17+00:00"
+            "description": "HTML5 element definitions for HTML Purifier",
+            "keywords": [
+                "HTML5",
+                "Purifier",
+                "html",
+                "htmlpurifier",
+                "security",
+                "tidy",
+                "validator",
+                "xss"
+            ],
+            "time": "2019-08-07T17:19:21+00:00"
        }
    ],
    "packages-dev": [],
@@ -966,5 +1040,8 @@
    "prefer-stable": false,
    "prefer-lowest": false,
    "platform": [],
-    "platform-dev": []
+    "platform-dev": [],
+    "platform-overrides": {
+        "php": "7.3"
+    }
 }
@@ -115,6 +115,32 @@
    background-size: 700px 500px;
 }

+/*미니체 지도*/
+.map_theme_miniche_clean.map_spring .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_spring.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_clean.map_summer .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_summer.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_clean.map_fall .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_fall.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_clean.map_winter .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_winter.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_clean .map_bgroad{
+    background: url('_tK_gameImagePath_/map/che/miniche_road.png') no-repeat;
+    background-size: 700px 500px;
+}
+
 /*루드라사움 지도*/
 .map_theme_ludo_rathowm .map_bglayer1{
    background: url('_tK_gameImagePath_/map/ludo_rathowm/back.jpg') no-repeat;
@@ -106,6 +106,31 @@ if($command == 61) {
    die();
 } 

+// 국호변경
+if($command == 82) {
+    $query = "select no,nation,level from general where owner='{$userID}'";
+    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $me = MYDB_fetch_array($result);
+    
+    $name = StringUtil::neutralize($name);
+    if($name == "") { $name = "무명"; }
+
+    $db->update('general', [
+        'makenation'=>$name
+    ], 'owner=%i', $userID);
+
+    $count = count($turn);
+    $str = "type=type";
+    for($i=0; $i < $count; $i++) {
+        $str .= ",l{$me['level']}turn{$turn[$i]}='{$comStr}'";
+    }
+    $query = "update nation set {$str} where nation='{$me['nation']}'";
+    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    
+    header('location:b_chiefcenter.php', true, 303);
+    die();
+}
+
 //포상, 몰수, 발령, 항복권고, 원조
 //선전포고, 종전, 파기, 초토화, 천도, 증축, 감축
 //백성동원, 수몰, 허보, 피장파장, 의병모집, 이호경식, 급습
@@ -130,6 +155,8 @@ if($command == 23 || $command == 24 || $command == 27 || $command == 51 || $comm
    die();  
 }

+
+
 //일반 턴
 $query = [];
 foreach($turn as $turnIdx){
@@ -271,6 +271,11 @@ function myNationInfo() {
    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
    $nation = MYDB_fetch_array($result);

+    if(!$nation){
+        $nation = getNationStaticInfo(0);
+        $nation['tech'] = 0;
+    }
+
    $query = "select COUNT(*) as cnt, SUM(pop) as totpop, SUM(pop2) as maxpop from city where nation='{$nation['nation']}'"; // 도시 이름 목록
    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
    $city = MYDB_fetch_array($result);
@@ -341,6 +346,7 @@ function myNationInfo() {

    $techCall = getTechCall($nation['tech']);

+    
    if(TechLimit($admin['startyear'], $admin['year'], $nation['tech'])) { $nation['tech'] = "<font color=magenta>{$nation['tech']}</font>"; }
    else { $nation['tech'] = "<font color=limegreen>{$nation['tech']}</font>"; }

@@ -657,6 +663,8 @@ function commandTable() {
    }
    commandGroup("", 1);
    commandGroup("======= 개 인 ========");
+    addCommand("내정 특기 초기화(3턴, 1회만)", 38);
+    addCommand("전투 특기 초기화(3턴, 1회만)", 39);
    if($me['level'] >= 1) {
        addCommand("단련(자금$develcost, 군량$develcost)", 41);
        addCommand("숙련전환(통솔경험, 자금$develcost, 군량$develcost)", 58);
@@ -751,9 +759,10 @@ function CoreCommandTable() {
    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
    $me = MYDB_fetch_array($result);

-    $query = "select level,can_change_flag from nation where nation='{$me['nation']}'";
+    $query = "select level,can_change_flag,aux from nation where nation='{$me['nation']}'";
    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
    $nation = MYDB_fetch_array($result);
+    $nationAux = Json::decode($nation['aux']);

    $query = "select no from general where nation='{$me['nation']}'";
    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -794,7 +803,7 @@ function CoreCommandTable() {
    commandGroup("====== 특 수 ======");
    addCommand("초토화", 65, $valid);
    addCommand("천도/3턴(금쌀{$develcost}0)", 66, $valid);
-    $cost = $develcost * 500 + 60000;   // 7만~13만
+    $cost = $develcost * GameConst::$expandCityCostCoef + GameConst::$expandCityDefaultCost;   // 7만~13만
    addCommand("증축/6턴(금쌀{$cost})", 67, $valid);
    addCommand("감축/6턴", 68, $valid);
    commandGroup("", 1);
@@ -823,6 +832,12 @@ function CoreCommandTable() {
    } else {
        addCommand("국기 변경", 81, 0);
    }
+    if($nation['level']==7 && !($nationAux['used_82']??0)){
+        addCommand("국호 변경", 82, 1);
+    }
+    else{
+        addCommand("국호 변경", 82, 0);
+    }
    commandGroup("", 1);
    echo "
 </select>
@@ -170,6 +170,13 @@ function getTurn(array $general, $type, $font=1) {
                $str[$i] = "【{$city['name']}】에 선동 실행";
                break;

+                case 38: //내특 초기화
+                    $str[$i] = "내정 특기를 초기화";
+                    break;
+                case 39: //전특 초기화
+                    $str[$i] = "전투 특기를 초기화";
+                    break;
+    
            case 41: //단련
                $str[$i] = "숙련도를 단련";
                break;
@@ -469,6 +476,9 @@ function getCoreTurn($nation, $level) {

                $str[$i] = "【<font color={$color}>국기</font>】를 변경";
                break;
+            case 82: //국호변경
+                $str[$i] = "국호를 변경";
+                break;
            default:
                $str[$i] = "????";
                break;
@@ -489,7 +499,7 @@ function processCommand($no, $reduceTurn) {
    $gameStor = KVStorage::getStorage($db, 'game_env');
    $connect=$db->get();

-    $general = $db->queryFirstRow('SELECT npc,no,name,picture,imgsvr,nation,nations,city,troop,injury,affinity,leader,leader2,power,power2,intel,intel2,experience,dedication,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,makenation,makelimit,killturn,block,dedlevel,explevel,age,belong,personal,special,special2,term,turn0,dex0,dex10,dex20,dex30,dex40,warnum,killnum,deathnum,killcrew,deathcrew,recwar,myset from general where no = %i', $no);
+    $general = $db->queryFirstRow('SELECT npc,no,name,picture,imgsvr,nation,nations,city,troop,injury,affinity,leader,leader2,power,power2,intel,intel2,experience,dedication,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,makenation,makelimit,killturn,block,dedlevel,explevel,age,belong,personal,special,special2,term,turn0,dex0,dex10,dex20,dex30,dex40,warnum,killnum,deathnum,killcrew,deathcrew,recwar,myset,aux from general where no = %i', $no);
    
    list($month, $killturn) = $gameStor->getValuesAsArray(['month', 'killturn']);
    $log = [];
@@ -545,11 +555,12 @@ function processCommand($no, $reduceTurn) {
                case 77: process_77($general); break; //이호경식
                case 78: process_78($general); break; //급습
                case 81: process_81($general); break; //국기변경
+                case 82: process_82($general); break; //국호변경
                case 99: break; //수뇌부휴식
            }

            //장수정보 재로드
-            $query = "select npc,no,name,picture,imgsvr,nation,nations,city,troop,injury,affinity,leader,leader2,power,power2,intel,intel2,experience,dedication,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,makenation,makelimit,killturn,block,dedlevel,explevel,age,belong,personal,special,special2,term,turn0,dex0,dex10,dex20,dex30,dex40,warnum,killnum,deathnum,killcrew,deathcrew,recwar,myset from general where no='$no'";
+            $query = "select npc,no,name,picture,imgsvr,nation,nations,city,troop,injury,affinity,leader,leader2,power,power2,intel,intel2,experience,dedication,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,makenation,makelimit,killturn,block,dedlevel,explevel,age,belong,personal,special,special2,term,turn0,dex0,dex10,dex20,dex30,dex40,warnum,killnum,deathnum,killcrew,deathcrew,recwar,myset,aux from general where no='$no'";
            $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
            $general = MYDB_fetch_array($result);
        }
@@ -621,6 +632,9 @@ function processCommand($no, $reduceTurn) {
            case 34: process_34($general); break; //파괴
            case 35: process_35($general); break; //선동

+            case 38: process_38($general, '내정 특기', 'special', 'specage'); break; //내특 초기화
+            case 39: process_38($general, '전투 특기', 'special2', 'specage2'); break; //내특 초기화
+
            case 41: process_41($general); break; //단련
            case 42: process_42($general); break; //견문
            case 43: process_43($general); break; //증여
@@ -1015,6 +1015,7 @@ function updateNationState() {
                    $josaUl = JosaUtil::pick(getNationLevel($nationlevel), '을');
                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<Y><b>【작위】</b></><D><b>{$nation['name']}</b></>의 군주가 <Y>".getNationLevel($nationlevel)."</>{$josaUl} 자칭하였습니다.";
                    pushNationHistory($nation, "<C>●</>{$admin['year']}년 {$admin['month']}월:<D><b>{$nation['name']}</b></>의 군주가 <Y>".getNationLevel($nationlevel)."</>{$josaUl} 자칭");
+                    $db->update('nation', ['can_change_flag'=>1], 'nation=%i', $nation['nation']);
                    break;
                case 6:
                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<Y><b>【작위】</b></><D><b>{$nation['name']}</b></>의 군주가 <Y>".getNationLevel($nationlevel)."</>에 등극하였습니다.";
@@ -1316,6 +1317,7 @@ function convForOldGeneral(array $general, int $year, int $month){
 function storeOldGeneral(int $no, int $year, int $month){
    $db = DB::db();
    $general = $db->queryFirstRow('SELECT * FROM general WHERE `no` = %i', $no);
+    $general['aux'] = Json::decode($general['aux']);
    if(!$general){
        return;
    }
@@ -58,12 +58,10 @@ class AIAllowedAction{
                $this->recruit_high = true;
            case 'recruit': 
                $this->recruit = true;
-                $this->changeWarCondition = true;
                break;
            case 'train':
                $this->train = true;
                $this->atmos = true;
-                $this->changeWarCondition = true;
                break;
            case 'battle':
                $this->battle = true;
@@ -457,18 +455,9 @@ function processAI($no, &$reduce_turn) {
    $tech = getTechCost($nation['tech']);
    $resrc = $tech * 700;//XXX: 왜 700이지?

-    if($allowedAction->changeWarCondition){
-        if($general['atmos'] >= 90 && $general['train'] >= 90) {
-            if($general['mode'] == 0) {
-                $query = "update general set mode=1 where no='{$general['no']}'";
-                MYDB_query($query, $connect) or Error("processAI05 ".MYDB_error($connect),"");
-            }
-        } else {
-            if($general['mode'] == 1) {
-                $query = "update general set mode=0 where no='{$general['no']}'";
-                MYDB_query($query, $connect) or Error("processAI05 ".MYDB_error($connect),"");
-            }
-        }
+    if($allowedAction->changeWarCondition && $general['mode'] != 2){
+        $query = "update general set mode=2 where no='{$general['no']}'";
+        MYDB_query($query, $connect) or Error("processAI05 ".MYDB_error($connect),"");
    }
    

@@ -952,16 +941,8 @@ function processAI($no, &$reduce_turn) {
                    }
                }
            } elseif($general['crew'] >= 1000 && $general['train'] < 90 && $allowedAction->train) {
-                if($general['atmos'] >= 90 && $general['train'] >= 60 && $general['mode'] == 0) {
-                    $query = "update general set mode=1 where no='{$general['no']}'";
-                    MYDB_query($query, $connect) or Error("processAI05 ".MYDB_error($connect),"");
-                }
                $command = EncodeCommand(0, 0, 0, 13);  //훈련
            } elseif($general['crew'] >= 1000 && $general['atmos'] < 90 && $allowedAction->atmos) {
-                if($general['atmos'] >= 60 && $general['train'] >= 90 && $general['mode'] == 0) {
-                    $query = "update general set mode=1 where no='{$general['no']}'";
-                    MYDB_query($query, $connect) or Error("processAI05 ".MYDB_error($connect),"");
-                }
                $command = EncodeCommand(0, 0, 0, 14);  //사기진작
            } elseif($dipState <= 3) {
                $command = EncodeCommand(0, 0, 0, (rand()%2)*8 + 1);   // 준비는 됐으나 아직 선포중이면 내정, 조달
@@ -1006,7 +987,7 @@ function processAI($no, &$reduce_turn) {
                        $cityCnt = $db->queryFirstField('SELECT count(city) FROM city WHERE nation=%i AND supply=1', $general['nation']);
                        $citySelect = Util::randRangeInt(0, Util::toInt($cityCnt/5));

-                        $selCity = $db->queryFirstField('SELECT city, ,(def+wall)/(def2+wall2) as dev from city where nation=%i and supply=1 order by dev limit %i,1',$general['nation'], $citySelect);
+                        $selCity = $db->queryFirstField('SELECT city, (def+wall)/(def2+wall2) as dev from city where nation=%i and supply=1 order by dev limit %i,1',$general['nation'], $citySelect);
                    }

                    if($general['city'] != $selCity) {
@@ -1858,6 +1858,55 @@ function process_31(&$general) {
    pushGenLog($general, $log);
 }

+function process_38(&$general, string $specName, string $specTypeKey, string $specAgeKey) {
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    $connect=$db->get();
+
+    $log = [];
+    $date = substr($general['turntime'],11,5);
+
+    $admin = $gameStor->getValues(['year', 'month']);
+
+    $genAux = Json::decode($general['aux']);
+
+    
+    if($general['term']%100 == 38) {
+        $term = intdiv($general['term'], 100) + 1;
+        $code = $term * 100 + 38;
+    } else {
+        $term = 1;
+        $code = 100 + 38;
+    }
+
+    if($genAux['used_38_'.$specTypeKey]??0){
+        $log[] = "<C>●</>{$admin['month']}월:이미 {$specName}을 초기화했습니다. {$specName} 초기화 실패. <1>$date</>";
+    }
+    else if(!$general[$specTypeKey]) {
+        $log[] = "<C>●</>{$admin['month']}월:{$specName}를 갖고 있지 않습니다. {$specName} 초기화 실패. <1>$date</>";
+    } elseif($term < 3) {
+        $log[] = "<C>●</>{$admin['month']}월:새로운 적성을 찾는 중... ({$term}/3) <1>$date</>";
+
+        $query = "update general set resturn='ONGOING',term={$code} where no='{$general['no']}'";
+        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    } else {
+        
+        $genAux['used_38_'.$specTypeKey] = 1;
+        $general[$specAgeKey]=20;
+        $db->update('general', [
+            'resturn'=>'SUCCESS',
+            'term'=>0,
+            $specTypeKey=>0,
+            $specAgeKey=>$db->sqleval('age+1'),
+            'aux'=>Json::encode($genAux)
+        ], 'no = %i', $general['no']);
+
+        $log[] = "<C>●</>{$admin['month']}월:새로운 {$specName}를 가질 준비가 되었습니다. <1>$date</>";
+    }
+
+    pushGenLog($general, $log);
+}
+
 function process_41(&$general) {
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -1078,7 +1078,7 @@ function process_67(&$general) {
    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
    $destcity = MYDB_fetch_array($result);

-    $amount = $admin['develcost'] * 500 + 60000;   // 7만~13만
+    $amount = $admin['develcost'] * GameConst::$expandCityCostCoef + GameConst::$expandCityDefaultCost;   // 7만~13만

    $code = $nation["l{$general['level']}term"];
    if($code%100 == 67) {
@@ -1180,7 +1180,7 @@ function process_68(&$general) {
    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
    $destcity = MYDB_fetch_array($result);

-    $amount = $admin['develcost'] * 500 + 30000;   // 4만~10만
+    $amount = $admin['develcost'] * GameConst::$expandCityCostCoef + GameConst::$expandCityDefaultCost / 2;   // 4만~10만

    $code = $nation["l{$general['level']}term"];
    if($code%100 == 68) {
@@ -2477,3 +2477,83 @@ function process_81(&$general) {
    pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
    pushGenLog($general, $log);
 }
+
+function process_82(&$general) {
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    $connect=$db->get();
+
+    $log = [];
+    $alllog = [];
+    $history = [];
+    
+    $date = substr($general['turntime'],11,5);
+
+    $admin = $gameStor->getValues(['year','month']);
+
+    $query = "select nation from city where city='{$general['city']}'";
+    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $city = MYDB_fetch_array($result);
+
+    $query = "select nation,name,type,sabotagelimit,aux from nation where nation='{$general['nation']}'";
+    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $nation = MYDB_fetch_array($result);
+    $nationAux = Json::decode($nation['aux']??'{}');
+    $newNationName = $general['makenation'];
+
+    $nationExists = $db->queryFirstField('SELECT nation FROM nation WHERE name = %s', $newNationName);
+    
+    if($nationExists){
+        $log[] = "<C>●</>{$admin['month']}월:이미 같은 국호를 가진 곳이 있습니다. 국호변경 실패. <1>$date</>";
+    }
+    else if($city['nation'] != $general['nation']) {
+        $log[] = "<C>●</>{$admin['month']}월:아국이 아닙니다. 국호변경 실패. <1>$date</>";
+    } elseif($general['level'] < 5) {
+        $log[] = "<C>●</>{$admin['month']}월:수뇌부가 아닙니다. 국호변경 실패. <1>$date</>";
+    } elseif($nationAux['used_82']??0) {
+        $log[] = "<C>●</>{$admin['month']}월:더이상 변경이 불가능합니다. 국호변경 실패. <1>$date</>";
+    } else {
+        $josaRo = JosaUtil::pick($newNationName, '로');
+        $log[] = "<C>●</>{$admin['month']}월:국호를 <D><b>{$newNationName}{$josaRo}</b></> 변경합니다. <1>$date</>";
+        $exp = 10;
+        $ded = 10;
+
+        // 성격 보정
+        $exp = CharExperience($exp, $general['personal']);
+        $ded = CharDedication($ded, $general['personal']);
+
+        $josaYi = JosaUtil::pick($general['name'], '이');
+        $josaYiNation = JosaUtil::pick($nation['name'], '이');
+
+        $query = "select no,name from general where nation='{$general['nation']}' and no!='{$general['no']}'";
+        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $cnt = MYDB_num_rows($result);
+        $genlog = ["<C>●</><Y>{$general['name']}</>{$josaYi} 국호를 <D><b>{$newNationName}</b></>{$josaRo} 변경합니다."];
+        for($i=0; $i < $cnt; $i++) {
+            $gen = MYDB_fetch_array($result);
+            pushGenLog($gen, $genlog);
+        }
+
+        $alllog[] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 국호를 <D><b>{$newNationName}</b></>{$josaRo} 변경합니다.";
+        $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<L><b>【국호변경】</b></><D><b>{$nation['name']}</b></>{$josaYiNation} 국호를 <D><b>{$newNationName}</b></>{$josaRo} 변경합니다.";
+        pushGeneralHistory($general, "<C>●</>{$admin['year']}년 {$admin['month']}월:국호를 <D><b>{$newNationName}</b></>{$josaRo} 변경");
+        pushNationHistory($nation, "<C>●</>{$admin['year']}년 {$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 국호를 <D><b>{$newNationName}</b></>{$josaRo} 변경");
+
+        $nationAux['used_82'] = 1;
+        //국기변경
+        $db->update('nation', [
+            'name'=>$newNationName,
+            'aux'=>Json::encode($nationAux)
+        ], 'nation=%i', $nation['nation']);
+
+        //경험치, 공헌치
+        $query = "update general set dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'";
+        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+
+        refreshNationStaticInfo();
+    }
+
+    pushWorldHistory($history, $admin['year'], $admin['month']);
+    pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
+    pushGenLog($general, $log);
+}
@@ -82,6 +82,9 @@ switch($commandtype) {
 //    case 34: command_34($turn, 34); break; //파괴
 //    case 35: command_35($turn, 35); break; //선동

+    case 38: command_Single($turn, 38); break; //내특 초기화
+    case 39: command_Single($turn, 39); break; //전특 초기화
+
    case 41: command_Single($turn, 41); break; //단련
    case 42: command_Single($turn, 42); break; //견문
 //    case 43: command_43(    $turn, 43); break; //증여
@@ -121,6 +124,7 @@ switch($commandtype) {
 //    case 78: command_78($turn, 78); break; //급습

 //    case 81: command_81($turn, 81); break; //국기변경
+//    case 82: command_82($turn, 82); break; //국호변경

 //    case 99: command_99($turn); break; //수뇌부 후식
    default: command_Other($turn, $commandtype); break;
@@ -77,6 +77,9 @@ switch($commandtype) {
    case 34: command_34($turn, 34); break; //파괴
    case 35: command_35($turn, 35); break; //선동

+    case 38: command_Single($turn, 38); break; //내특 초기화
+    case 39: command_Single($turn, 39); break; //전특 초기화
+
    case 41: command_Single($turn, 41); break; //단련
    case 42: command_Single($turn, 42); break; //견문
    case 43: command_43(    $turn, 43); break; //증여
@@ -114,6 +117,7 @@ switch($commandtype) {
    case 77: command_77($turn, 77); break; //이호경식
    case 78: command_78($turn, 78); break; //급습
    case 81: command_81($turn, 81); break; //국기변경
+    case 82: command_82($turn, 82); break; //국호변경
    case 99: command_99($turn); break; //수뇌부 휴식
    
    default:command_Single($turn, 0); break; //휴식
@@ -244,9 +248,8 @@ function command_11($turn, $command, bool $is모병 = false) {
        
        foreach(GameUnitConst::byType($armType) as $unit){
            $crewObj = new \stdClass;
-            if(!$unit->isValid($ownCities, $ownRegions, $relativeYear, $tech)){
-                continue; //TODO: 불가능한 병종도 보여줄 필요가 있음.
-            }
+            $crewObj->showDefault = 'true';
+            

            $crewObj->id = $unit->id;
            
@@ -256,6 +259,11 @@ function command_11($turn, $command, bool $is모병 = false) {
            else{
                $crewObj->bgcolor = 'limegreen';
            }
+
+            if(!$unit->isValid($ownCities, $ownRegions, $relativeYear, $tech)){
+                $crewObj->showDefault = 'false';
+                $crewObj->bgcolor = 'red';
+            }
    
            $crewObj->baseRice = $unit->rice * getTechCost($tech);
            $crewObj->baseCost = CharCost($unit->costWithTech($tech), $me['personal']);
@@ -2613,3 +2621,36 @@ function command_81($turn, $command) {
 ";
    ender(1);
 }
+
+function command_82($turn, $command) {
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    $connect=$db->get();
+
+    $userID = Session::getUserID();
+    $nationID = $db->queryFirstField('SELECT nation FROM general WHERE owner = %i', $userID);
+    $nation = $db->queryFirstRow('SELECT level,aux FROM nation WHERE nation = %i', $nationID);
+    $nationAux = Json::decode($nation['aux']??'{}');
+
+    starter("국호변경");
+
+    if($nation && $nation['level'] == 7 && !($nationAux['used_82']??0)){
+?>
+나라의 이름을 바꿉니다. 황제가 된 후 1회 가능합니다.<br>
+
+<form name=form1 action=c_double.php method=post>
+국명 : <input type=text name=name size=18 maxlength=9 style=text-align:right;color:white;background-color:black>
+
+<input type=submit value='국호 변경'>
+<input type=hidden name=command value=<?=$command?>>
+<?php
+        for($i=0; $i < count($turn); $i++) {
+            echo "<input type=hidden name=turn[] value=$turn[$i]>";
+        }
+
+        echo "</form>";
+    } else {
+        echo "국호 변경이 불가능합니다.<br>";
+    }
+    ender();
+}
@@ -82,6 +82,10 @@ class GameConstBase
    public static $expandCityDevelIncreaseAmount = 2000;
    /** @var int 증축시 성벽 증가량 */
    public static $expandCityWallIncreaseAmount = 2000;
+    /** @var int 증축시 최소 비용 */
+    public static $expandCityDefaultCost = 60000;
+    /** @var int 증축시 비용 계수 */
+    public static $expandCityCostCoef = 500;

    /** @var int 초기 제한시 장수 제한 */
    public static $initialNationGenLimitForRandInit = 3;
@@ -336,7 +336,9 @@ class GameUnitConstBase{
    }

    
-
+    /**
+     * @return \sammo\GameUnitDetail[]
+     */
    public static function byType(int $type): array{
        static::_generate();
        if(!key_exists($type, static::$constType)){
@@ -0,0 +1,87 @@
+<?php
+
+namespace sammo;
+
+class CityConst extends CityConstBase{
+    protected static $initCity = [
+        //id, 도시,   규모,    상, 치, 성, 수,(x100)지역, x,  y, 연결도시
+        [1,  '낙양',   '소', 4163, 57, 60, 40, 61, 64, '중원', 285, 176, ['하내', '홍농', '호로']], 
+        [2,  '성도',   '소', 3247, 63, 65, 40, 65, 63, '서촉',  30, 285, ['덕양', '강주']], 
+        [3,  '건업',   '소', 3178, 56, 63, 40, 55, 59, '오월', 507, 303, ['광릉', '합비', '오']], 
+        [4,  '업',     '소', 3087, 65, 53, 40, 57, 62, '하북', 355, 135, ['하내', '거록', '남피', '제남', '진류']], 
+        [5,  '장안',   '소', 2946, 56, 63, 40, 60, 58, '서북', 162, 173, ['안정', '오장원', '한중', '홍농']], 
+        [6,  '허창',   '소', 2923, 61, 64, 40, 57, 65, '중원', 325, 218, ['호로', '진류', '초', '여남', '완']], 
+        [7,  '양양',   '소', 2903, 60, 66, 40, 55, 57, '초',   259, 295, ['신야', '강릉', '강하']], 
+        [8,  '시상',   '소', 3116, 58, 60, 40, 59, 56, '오월', 357, 357, ['적벽', '여강', '단양', '상동', '장사']], 
+        [9,  '수춘',   '소', 3061, 59, 56, 40, 59, 55, '중원', 385, 270, ['여남', '초', '하비', '합비']], 
+        [10, '한중',   '소', 3058, 56, 61, 40, 62, 63, '서촉', 130, 218, ['무도', '오장원', '장안', '상용', '자동']], 
+        [11, '남피',   '소', 3006, 59, 61, 40, 61, 65, '하북', 410,  93, ['계', '북평', '평원', '업', '거록']], 
+        [12, '위례',   '소', 2953, 60, 53, 40, 58, 63, '동이', 618, 140, ['평양', '북해', '웅진', '계림']], 
+        [13, '북평',   '소', 2921, 62, 55, 40, 63, 59, '하북', 442,  53, ['계', '요동', '남피']], 
+        [14, '강릉',   '소', 2915, 65, 56, 40, 55, 56, '초',   245, 330, ['이릉', '양양', '적벽', '장사', '무릉']], 
+        [15, '완',     '소', 2852, 63, 60, 40, 61, 59, '중원', 275, 235, ['허창', '여남', '신야']], 
+        [16, '장사',   '소', 2845, 57, 59, 40, 60, 65, '초',   258, 373, ['강릉', '시상', '계양', '무릉']], 
+        [17, '오',     '소', 3172, 57, 61, 40, 57, 56, '오월', 515, 340, ['건업', '단양', '회계', '탐라']], 
+        [18, '하비',   '소', 3134, 65, 63, 40, 62, 58, '중원', 460, 240, ['패', '북해', '광릉', '수춘']], 
+        [19, '복양',   '소', 3087, 60, 63, 40, 62, 60, '중원', 412, 170, ['제남', '진류', '패']], 
+        [20, '웅진',   '소', 3073, 57, 59, 40, 58, 60, '동이', 615, 205, ['위례', '계림', '탐라']], 
+        [21, '강주',   '소', 3058, 59, 60, 40, 64, 61, '서촉',  75, 305, ['성도', '덕양', '영안', '주제', '월수']], 
+        [22, '무도',   '소', 3008, 57, 64, 40, 60, 65, '서촉',  55, 191, ['저', '한중', '자동']], 
+        [23, '국내',   '소', 2986, 58, 60, 40, 63, 58, '동이', 596,  48, ['요동', '오환', '평양']], 
+        [24, '진류',   '소', 2973, 62, 60, 40, 60, 63, '중원', 370, 175, ['업', '복양', '패', '초', '허창', '호로']], 
+        [25, '계양',   '소', 2972, 63, 60, 40, 61, 57, '초',   242, 408, ['영릉', '장사', '상동']], 
+        [26, '계림',   '소', 2950, 60, 54, 40, 61, 58, '동이', 660, 195, ['위례', '웅진', '왜']], 
+        [27, '계',     '소', 2937, 55, 60, 40, 58, 61, '하북', 386,  55, ['진양', '북평', '남피']], 
+        [28, '무위',   '소', 2932, 57, 59, 40, 63, 60, '서북',  56,  76, ['강', '안정', '천수', '저']], 
+        [29, '제남',   '소', 2910, 57, 61, 40, 64, 57, '하북', 402, 132, ['업', '평원', '복양']], 
+        [30, '남해',   '소', 2896, 62, 56, 40, 60, 61, '오월', 270, 474, ['상동', '산월', '교지']], 
+        [31, '덕양',   '소', 2896, 61, 64, 40, 59, 57, '서촉',  73, 276, ['자동', '영안', '강주', '성도']], 
+        [32, '하내',   '소', 2863, 57, 61, 40, 61, 60, '하북', 295, 140, ['진양', '업', '낙양', '하동']], 
+        [33, '상용',   '소', 2838, 58, 56, 40, 57, 61, '서촉', 190, 220, ['한중', '신야']], 
+        [34, '초',     '소', 3286, 60, 62, 40, 62, 57, '중원', 375, 225, ['허창', '진류', '패', '수춘', '여남']], 
+        [35, '운남',   '소', 3258, 62, 60, 40, 64, 61, '남중',  45, 405, ['월수', '건녕', '남만']], 
+        [36, '대',     '소', 3256, 60, 62, 40, 57, 60, '오월', 450, 470, ['산월', '회계', '왜']], 
+        [37, '하동',   '소', 3208, 60, 60, 40, 62, 55, '서북', 240, 140, ['흉노', '진양', '하내', '홍농']], 
+        [38, '무릉',   '소', 3196, 58, 63, 40, 63, 58, '초',   195, 352, ['강릉', '장사', '영릉']], 
+        [39, '교지',   '소', 3195, 58, 59, 40, 58, 59, '남중', 136, 480, ['남만', '남해']], 
+        [40, '단양',   '소', 3183, 62, 64, 40, 58, 57, '오월', 440, 350, ['여강', '오', '건안', '시상']], 
+        [41, '영안',   '소', 3153, 62, 59, 40, 58, 59, '서촉', 116, 282, ['덕양', '이릉', '강주']], 
+        [42, '북해',   '소', 3146, 55, 63, 40, 63, 58, '하북', 470, 150, ['평원', '위례', '하비']], 
+        [43, '합비',   '진',  998, 20, 19, 20, 39, 41, '중원', 420, 294, ['수춘', '건업', '여강']], 
+        [44, '이릉',   '진',  968, 18, 19, 20, 39, 41, '초',   188, 275, ['영안', '강릉']], 
+        [45, '건녕',   '소', 3082, 58, 59, 40, 63, 56, '남중',  85, 390, ['주제', '장가', '운남']], 
+        [46, '강하',   '소', 3074, 55, 56, 40, 57, 60, '초',   320, 299, ['양양', '적벽', '여강']], 
+        [47, '진양',   '소', 3074, 56, 59, 40, 64, 59, '하북', 310,  75, ['흉노', '하동', '하내', '거록', '계']], 
+        [48, '평원',   '소', 3074, 62, 65, 40, 61, 63, '하북', 445, 110, ['남피', '제남', '북해']], 
+        [49, '회계',   '소', 3005, 64, 59, 40, 62, 64, '오월', 485, 390, ['오', '건안', '대']], 
+        [50, '천수',   '소', 2985, 59, 64, 40, 60, 58, '서북',  76, 140, ['무위', '안정', '오장원', '저']], 
+        [51, '평양',   '소', 2939, 55, 59, 40, 60, 58, '동이', 606,  97, ['국내', '위례']], 
+        [52, '요동',   '소', 2937, 63, 59, 40, 59, 63, '동이', 549,  26, ['북평', '오환', '국내']], 
+        [53, '거록',   '소', 2936, 61, 57, 40, 64, 58, '하북', 355,  95, ['진양', '남피', '업']], 
+        [54, '여강',   '소', 2905, 56, 58, 40, 60, 55, '오월', 392, 325, ['합비', '단양', '시상', '강하']], 
+        [55, '패',     '소', 2877, 64, 58, 40, 58, 59, '중원', 425, 210, ['진류', '복양', '하비', '초']], 
+        [56, '자동',   '소', 2870, 57, 55, 40, 60, 58, '서촉',  62, 240, ['무도', '한중', '덕양']], 
+        [57, '광릉',   '소', 2867, 61, 55, 40, 60, 62, '오월', 478, 270, ['하비', '건업']], 
+        [58, '장가',   '소', 2853, 59, 62, 40, 58, 57, '남중', 136, 395, ['건녕', '영릉', '남만']], 
+        [59, '영릉',   '소', 2849, 62, 58, 40, 62, 62, '초',   197, 390, ['무릉', '계양', '장가']], 
+        [60, '월수',   '소', 2828, 60, 59, 40, 58, 63, '남중',  39, 349, ['강주', '주제', '운남']], 
+        [61, '건안',   '소', 2802, 57, 62, 40, 58, 63, '오월', 440, 420, ['단양', '회계', '산월']], 
+        [62, '신야',   '소', 2786, 60, 62, 40, 58, 55, '초',   245, 255, ['상용', '완', '양양']], 
+        [63, '탐라',   '수', 1130, 22, 21, 20, 43, 41, '동이', 614, 259, ['웅진', '왜', '오']], 
+        [64, '상동',   '소', 2767, 58, 59, 40, 62, 58, '초',   285, 405, ['계양', '시상', '남해']], 
+        [65, '안정',   '소', 2764, 57, 59, 40, 57, 62, '서북', 135, 130, ['강', '무위', '천수', '장안']], 
+        [66, '여남',   '소', 2749, 63, 56, 40, 64, 64, '중원', 335, 255, ['완', '허창', '초', '수춘']], 
+        [67, '홍농',   '소', 2748, 57, 63, 40, 58, 63, '서북', 220, 170, ['하동', '낙양', '장안']], 
+        [68, '주제',   '소', 2746, 58, 61, 40, 61, 58, '남중',  93, 357, ['강주', '월수', '건녕']], 
+        [69, '남만',   '이', 2378, 40, 42, 20, 43, 45, '남중',  90, 454, ['운남', '장가', '교지']], 
+        [70, '산월',   '이', 2275, 40, 37, 20, 43, 38, '오월', 373, 447, ['건안', '대', '남해']], 
+        [71, '오환',   '이', 2153, 42, 37, 20, 43, 40, '동이', 628,  19, ['요동', '국내']], 
+        [72, '강',     '이', 2095, 40, 42, 20, 43, 40, '서북', 154,  70, ['무위', '안정']], 
+        [73, '왜',     '이', 2065, 39, 37, 20, 43, 41, '동이', 681, 292, ['계림', '탐라', '대']], 
+        [74, '흉노',   '이', 2064, 40, 41, 20, 40, 38, '서북', 227,  79, ['진양', '하동']], 
+        [75, '저',     '이', 1957, 40, 42, 20, 43, 42, '서북',  24, 123, ['무위', '천수', '무도']], 
+        [76, '호로',   '관',  958, 17, 19, 20, 95, 96, '중원', 317, 182, ['낙양', '진류', '허창']], 
+        [77, '오장원', '진', 1005, 19, 18, 20, 41, 40, '서북', 104, 175, ['천수', '장안', '한중']], 
+        [78, '적벽',   '수', 1117, 23, 21, 20, 42, 41, '오월', 335, 330, ['강하', '강릉', '시상']], 
+    ];
+}
@@ -0,0 +1,13 @@
+{
+    "title":"【공백지】 무주공산",
+    "startYear":180,
+    "map":{
+        "mapName":"miniche_clean"
+    },
+    "history":[
+    ],
+    "const": {
+        "expandCityDefaultCost": 30000,
+        "expandCityCostCoef": 250
+    }
+}
@@ -152,6 +152,7 @@ CREATE TABLE `general` (
 	`recturn` VARCHAR(50) NULL DEFAULT '[0,0,0,0]',
 	`resturn` VARCHAR(30) NULL DEFAULT '',
 	`penalty` TEXT NULL DEFAULT '',
+	`aux` TEXT NOT NULL DEFAULT '{}',
 	PRIMARY KEY (`no`),
 	INDEX `nation` (`nation`, `npc`),
 	INDEX `city` (`city`),
@@ -11,9 +11,11 @@

 <table class='tb_layout' style='margin:auto;'>
 <thead>
+    <tr><td colspan=11><div style='float:right'><input type='checkbox' id="show_unavailable_troops">불가능한 병종 표시</input></div>
    <?php if($commandName=='모병'): ?>
-    <tr><td align=center colspan=11>모병은 가격 2배의 자금이 소요됩니다.</td></tr>
+    <div style='text-align:center;'>모병은 가격 2배의 자금이 소요됩니다.</div>
    <?php endif; ?>
+    </td></tr>
    <tr>
        <td colspan=11 align=center class='bg2'>
            현재 기술력 : <?=$techLevelText?>
@@ -43,6 +45,7 @@
    <?php foreach($armTypeCrews as $crewObj): ?>
        <tr 
            id="crewType<?=$crewObj->id?>"
+            class="show_default_<?=$crewObj->showDefault?>"
            style='height:64px;background-color:<?=$crewObj->bgcolor?>' 
            data-rice="<?=$crewObj->baseRice?>"
            data-cost="<?=$crewObj->baseCost?>"
@@ -177,5 +180,16 @@ $(function(){
    });

    $('.btn_fill').click();
+
+    $('#show_unavailable_troops').change(function(){
+        var show = $('#show_unavailable_troops').is(":checked");
+        if(show){
+            $('.show_default_false').show();
+        }
+        else{
+            $('.show_default_false').hide();
+        }
+    });
+    $('.show_default_false').hide();
 });
 </script>
@@ -183,19 +183,19 @@ class StringUtil
    }

    public static function uniord(string $c) {
-        if (ord($c{0}) >=0 && ord($c{0}) <= 127)
-            return ord($c{0});
-        if (ord($c{0}) >= 192 && ord($c{0}) <= 223)
-            return (ord($c{0})-192)*64 + (ord($c{1})-128);
-        if (ord($c{0}) >= 224 && ord($c{0}) <= 239)
-            return (ord($c{0})-224)*4096 + (ord($c{1})-128)*64 + (ord($c{2})-128);
-        if (ord($c{0}) >= 240 && ord($c{0}) <= 247)
-            return (ord($c{0})-240)*262144 + (ord($c{1})-128)*4096 + (ord($c{2})-128)*64 + (ord($c{3})-128);
-        if (ord($c{0}) >= 248 && ord($c{0}) <= 251)
-            return (ord($c{0})-248)*16777216 + (ord($c{1})-128)*262144 + (ord($c{2})-128)*4096 + (ord($c{3})-128)*64 + (ord($c{4})-128);
-        if (ord($c{0}) >= 252 && ord($c{0}) <= 253)
-            return (ord($c{0})-252)*1073741824 + (ord($c{1})-128)*16777216 + (ord($c{2})-128)*262144 + (ord($c{3})-128)*4096 + (ord($c{4})-128)*64 + (ord($c{5})-128);
-        if (ord($c{0}) >= 254 && ord($c{0}) <= 255)    //  error
+        if (ord($c[0]) >=0 && ord($c[0]) <= 127)
+            return ord($c[0]);
+        if (ord($c[0]) >= 192 && ord($c[0]) <= 223)
+            return (ord($c[0])-192)*64 + (ord($c[1])-128);
+        if (ord($c[0]) >= 224 && ord($c[0]) <= 239)
+            return (ord($c[0])-224)*4096 + (ord($c[1])-128)*64 + (ord($c[2])-128);
+        if (ord($c[0]) >= 240 && ord($c[0]) <= 247)
+            return (ord($c[0])-240)*262144 + (ord($c[1])-128)*4096 + (ord($c[2])-128)*64 + (ord($c[3])-128);
+        if (ord($c[0]) >= 248 && ord($c[0]) <= 251)
+            return (ord($c[0])-248)*16777216 + (ord($c[1])-128)*262144 + (ord($c[2])-128)*4096 + (ord($c[3])-128)*64 + (ord($c[4])-128);
+        if (ord($c[0]) >= 252 && ord($c[0]) <= 253)
+            return (ord($c[0])-252)*1073741824 + (ord($c[1])-128)*16777216 + (ord($c[2])-128)*262144 + (ord($c[3])-128)*4096 + (ord($c[4])-128)*64 + (ord($c[5])-128);
+        if (ord($c[0]) >= 254 && ord($c[0]) <= 255)    //  error
            return FALSE;
        return 0;
    }
@@ -1,10 +1,14 @@
 #!/usr/bin/env sh

-dir=$(cd "${0%[/\\]*}" > /dev/null; cd "../leafo/scssphp/bin" && pwd)
+dir=$(cd "${0%[/\\]*}" > /dev/null; cd "../scssphp/scssphp/bin" && pwd)

-if [ -d /proc/cygdrive ] && [[ $(which php) == $(readlink -n /proc/cygdrive)/* ]]; then
-   # We are in Cgywin using Windows php, so the path must be translated
-   dir=$(cygpath -m "$dir");
+if [ -d /proc/cygdrive ]; then
+    case $(which php) in
+        $(readlink -n /proc/cygdrive)/*)
+            # We are in Cygwin using Windows php, so the path must be translated
+            dir=$(cygpath -m "$dir");
+            ;;
+    esac
 fi

 "${dir}/pscss" "$@"
@@ -1,4 +1,4 @@
@ECHO OFF
 setlocal DISABLEDELAYEDEXPANSION
-SET BIN_TARGET=%~dp0/../leafo/scssphp/bin/pscss
+SET BIN_TARGET=%~dp0/../scssphp/scssphp/bin/pscss
 php "%BIN_TARGET%" %*
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+open_collective: medoo
@@ -0,0 +1,19 @@
+---
+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.
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2018 Angel Lai
+Copyright (c) 2019 Angel Lai

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -6,9 +6,11 @@
    <a href="https://packagist.org/packages/catfan/medoo"><img alt="Total Downloads" src="https://poser.pugx.org/catfan/medoo/downloads"></a>
    <a href="https://packagist.org/packages/catfan/medoo"><img alt="Latest Stable Version" src="https://poser.pugx.org/catfan/medoo/v/stable"></a>
    <a href="https://packagist.org/packages/catfan/medoo"><img alt="License" src="https://poser.pugx.org/catfan/medoo/license"></a>
+    <a href="https://opencollective.com/medoo"><img alt="Backers on Open Collective" src="https://opencollective.com/Medoo/backers/badge.svg"></a>
+    <a href="https://opencollective.com/medoo"><img alt="Sponsors on Open Collective" src="https://opencollective.com/Medoo/sponsors/badge.svg"> </a>
 </p>

-> The Lightest PHP database framework to accelerate development
+> The lightweight PHP database framework to accelerate development

 ## Features

@@ -26,7 +28,7 @@

 ## Requirement

-PHP 5.4+ and PDO extension installed
+PHP 5.4+ and PDO extension installed, recommend PHP 7.0+

 ## Get Started

@@ -34,7 +36,7 @@ PHP 5.4+ and PDO extension installed

 Add Medoo to composer.json configuration file.
 ```
-$ composer require catfan/Medoo
+$ composer require catfan/medoo
 ```

 And update the composer
@@ -43,7 +45,7 @@ $ composer update
 ```

 ```php
-// If you installed via composer, just use this code to requrie autoloader on the top of your projects.
+// If you installed via composer, just use this code to require autoloader on the top of your projects.
 require 'vendor/autoload.php';

 // Using Medoo namespace
@@ -1,8 +1,8 @@
 {
 	"name": "catfan/medoo",
 	"type": "framework",
-	"description": "The lightest PHP database framework to accelerate development",
-	"keywords": ["database", "lightweight", "PHP framework", "SQL", "MySQL", "MSSQL", "SQLite", "PostgreSQL", "MariaDB", "Oracle"],
+	"description": "The lightweight PHP database framework to accelerate development",
+	"keywords": ["database", "database library", "lightweight", "PHP framework", "SQL", "MySQL", "MSSQL", "SQLite", "PostgreSQL", "MariaDB", "Oracle"],
 	"homepage": "https://medoo.in",
 	"license": "MIT",
 	"support": {
@@ -18,10 +18,10 @@
 	},
 	"suggest": {
 		"ext-pdo_mysql": "For MySQL or MariaDB database",
-		"ext-pdo_sqlsrv": "For MSSQL database",
+		"ext-pdo_sqlsrv": "For MSSQL database on both Window/Liunx platform",
 		"ext-pdo_dblib": "For MSSQL or Sybase database on Linux/UNIX platform",
 		"ext-pdo_oci": "For Oracle database",
-		"ext-pdo_oci8": "For Oracle version 8 database",		
+		"ext-pdo_oci8": "For Oracle version 8 database",
 		"ext-pdo_pqsql": "For PostgreSQL database",
 		"ext-pdo_sqlite": "For SQLite database"
 	},
@@ -2,9 +2,9 @@
 /*!
 * Medoo database framework
 * https://medoo.in
- * Version 1.5.7
+ * Version 1.7.8
 *
- * Copyright 2018, Angel Lai
+ * Copyright 2019, Angel Lai
 * Released under the MIT license
 */

@@ -13,6 +13,7 @@ namespace Medoo;
 use PDO;
 use Exception;
 use PDOException;
+use InvalidArgumentException;

 class Raw {
 	public $map;
@@ -29,7 +30,7 @@ class Medoo

 	protected $statement;

-	protected $option = [];
+	protected $dsn;

 	protected $logs = [];

@@ -39,16 +40,18 @@ class Medoo

 	protected $guid = 0;

-	public function __construct($options = null)
-	{
-		if (!is_array($options))
-		{
-			return false;
-		}
+	protected $errorInfo = null;

+	public function __construct(array $options)
+	{
 		if (isset($options[ 'database_type' ]))
 		{
 			$this->type = strtolower($options[ 'database_type' ]);
+
+			if ($this->type === 'mariadb')
+			{
+				$this->type = 'mysql';
+			}
 		}

 		if (isset($options[ 'prefix' ]))
@@ -56,23 +59,47 @@ class Medoo
 			$this->prefix = $options[ 'prefix' ];
 		}

-		if (isset($options[ 'option' ]))
-		{
-			$this->option = $options[ 'option' ];
-		}
-
 		if (isset($options[ 'logging' ]) && is_bool($options[ 'logging' ]))
 		{
 			$this->logging = $options[ 'logging' ];
 		}

-		if (isset($options[ 'command' ]) && is_array($options[ 'command' ]))
+		$option = isset($options[ 'option' ]) ? $options[ 'option' ] : [];
+		$commands = (isset($options[ 'command' ]) && is_array($options[ 'command' ])) ? $options[ 'command' ] : [];
+
+		switch ($this->type)
 		{
-			$commands = $options[ 'command' ];
+			case 'mysql':
+				// Make MySQL using standard quoted identifier
+				$commands[] = 'SET SQL_MODE=ANSI_QUOTES';
+
+				break;
+
+			case 'mssql':
+				// Keep MSSQL QUOTED_IDENTIFIER is ON for standard quoting
+				$commands[] = 'SET QUOTED_IDENTIFIER ON';
+
+				// Make ANSI_NULLS is ON for NULL value
+				$commands[] = 'SET ANSI_NULLS ON';
+
+				break;
 		}
-		else
+
+		if (isset($options[ 'pdo' ]))
 		{
-			$commands = [];
+			if (!$options[ 'pdo' ] instanceof PDO)
+			{
+				throw new InvalidArgumentException('Invalid PDO object supplied');
+			}
+
+			$this->pdo = $options[ 'pdo' ];
+
+			foreach ($commands as $value)
+			{
+				$this->pdo->exec($value);
+			}
+
+			return;
 		}

 		if (isset($options[ 'dsn' ]))
@@ -83,7 +110,7 @@ class Medoo
 			}
 			else
 			{
-				return false;
+				throw new InvalidArgumentException('Invalid DSN option supplied');
 			}
 		}
 		else
@@ -100,7 +127,6 @@ class Medoo

 			switch ($this->type)
 			{
-				case 'mariadb':
 				case 'mysql':
 					$attr = [
 						'driver' => 'mysql',
@@ -121,8 +147,6 @@ class Medoo
 						}
 					}

-					// Make MySQL using standard quoted identifier
-					$commands[] = 'SET SQL_MODE=ANSI_QUOTES';
 					break;

 				case 'pgsql':
@@ -176,6 +200,16 @@ class Medoo
 							'host' => $options[ 'server' ] . ($is_port ? ':' . $port : ''),
 							'dbname' => $options[ 'database_name' ]
 						];
+
+						if (isset($options[ 'appname' ]))
+						{
+							$attr[ 'appname' ] = $options[ 'appname' ];
+						}
+
+						if (isset($options[ 'charset' ]))
+						{
+							$attr[ 'charset' ] = $options[ 'charset' ];
+						}
 					}
 					else
 					{
@@ -184,13 +218,46 @@ class Medoo
 							'Server' => $options[ 'server' ] . ($is_port ? ',' . $port : ''),
 							'Database' => $options[ 'database_name' ]
 						];
+
+						if (isset($options[ 'appname' ]))
+						{
+							$attr[ 'APP' ] = $options[ 'appname' ];
+						}
+
+						$config = [
+							'ApplicationIntent',
+							'AttachDBFileName',
+							'Authentication',
+							'ColumnEncryption',
+							'ConnectionPooling',
+							'Encrypt',
+							'Failover_Partner',
+							'KeyStoreAuthentication',
+							'KeyStorePrincipalId',
+							'KeyStoreSecret',
+							'LoginTimeout',
+							'MultipleActiveResultSets',
+							'MultiSubnetFailover',
+							'Scrollable',
+							'TraceFile',
+							'TraceOn',
+							'TransactionIsolation',
+							'TransparentNetworkIPResolution',
+							'TrustServerCertificate',
+							'WSID',
+						];
+
+						foreach ($config as $value)
+						{
+							$keyname = strtolower(preg_replace(['/([a-z\d])([A-Z])/', '/([^_])([A-Z][a-z])/'], '$1_$2', $value));
+
+							if (isset($options[ $keyname ]))
+							{
+								$attr[ $value ] = $options[ $keyname ];
+							}
+						}
 					}

-					// Keep MSSQL QUOTED_IDENTIFIER is ON for standard quoting
-					$commands[] = 'SET QUOTED_IDENTIFIER ON';
-
-					// Make ANSI_NULLS is ON for NULL value
-					$commands[] = 'SET ANSI_NULLS ON';
 					break;

 				case 'sqlite':
@@ -203,8 +270,18 @@ class Medoo
 			}
 		}

+		if (!isset($attr))
+		{
+			throw new InvalidArgumentException('Incorrect connection options');
+		}
+
 		$driver = $attr[ 'driver' ];

+		if (!in_array($driver, PDO::getAvailableDrivers()))
+		{
+			throw new InvalidArgumentException("Unsupported PDO driver: {$driver}");
+		}
+
 		unset($attr[ 'driver' ]);

 		$stack = [];
@@ -214,22 +291,27 @@ class Medoo
 			$stack[] = is_int($key) ? $value : $key . '=' . $value;
 		}

-		$dsn = $driver . ':' . implode($stack, ';');
+		$dsn = $driver . ':' . implode(';', $stack);

 		if (
-			in_array($this->type, ['mariadb', 'mysql', 'pgsql', 'sybase', 'mssql']) &&
+			in_array($this->type, ['mysql', 'pgsql', 'sybase', 'mssql']) &&
 			isset($options[ 'charset' ])
 		)
 		{
-			$commands[] = "SET NAMES '" . $options[ 'charset' ] . "'";
+			$commands[] = "SET NAMES '{$options[ 'charset' ]}'" . (
+				$this->type === 'mysql' && isset($options[ 'collation' ]) ?
+				" COLLATE '{$options[ 'collation' ]}'" : ''
+			);
 		}

+		$this->dsn = $dsn;
+
 		try {
 			$this->pdo = new PDO(
 				$dsn,
 				isset($options[ 'username' ]) ? $options[ 'username' ] : null,
 				isset($options[ 'password' ]) ? $options[ 'password' ] : null,
-				$this->option
+				$option
 			);

 			foreach ($commands as $value)
@@ -242,18 +324,6 @@ class Medoo
 		}
 	}

-	public function __call($name, $arguments)
-	{
-		$aggregation = ['avg', 'count', 'max', 'min', 'sum'];
-
-		if (in_array($name, $aggregation))
-		{
-			array_unshift($arguments, $name);
-
-			return call_user_func_array([$this, 'aggregate'], $arguments);
-		}
-	}
-
 	public function query($query, $map = [])
 	{
 		$raw = $this->raw($query, $map);
@@ -265,6 +335,8 @@ class Medoo

 	public function exec($query, $map = [])
 	{
+		$this->statement = null;
+
 		if ($this->debug_mode)
 		{
 			echo $this->generate($query, $map);
@@ -285,28 +357,37 @@ class Medoo

 		$statement = $this->pdo->prepare($query);

-		if ($statement)
+		if (!$statement)
 		{
-			foreach ($map as $key => $value)
-			{
-				$statement->bindValue($key, $value[ 0 ], $value[ 1 ]);
-			}
+			$this->errorInfo = $this->pdo->errorInfo();
+			$this->statement = null;

-			$statement->execute();
-
-			$this->statement = $statement;
-
-			return $statement;
+			return false;
 		}

-		return false;
+		$this->statement = $statement;
+
+		foreach ($map as $key => $value)
+		{
+			$statement->bindValue($key, $value[ 0 ], $value[ 1 ]);
+		}
+
+		$execute = $statement->execute();
+
+		$this->errorInfo = $statement->errorInfo();
+
+		if (!$execute)
+		{
+			$this->statement = null;
+		}
+
+		return $statement;
 	}

 	protected function generate($query, $map)
 	{
 		$identifier = [
 			'mysql' => '`$1`',
-			'mariadb' => '`$1`',
 			'mssql' => '[$1]'
 		];

@@ -396,6 +477,11 @@ class Medoo

 	protected function tableQuote($table)
 	{
+		if (!preg_match('/^[a-zA-Z0-9_]+$/i', $table))
+		{
+			throw new InvalidArgumentException("Incorrect table name \"$table\"");
+		}
+
 		return '"' . $this->prefix . $table . '"';
 	}

@@ -430,6 +516,11 @@ class Medoo

 	protected function columnQuote($string)
 	{
+		if (!preg_match('/^[a-zA-Z0-9_]+(\.?[a-zA-Z0-9_]+)?$/i', $string))
+		{
+			throw new InvalidArgumentException("Incorrect column name \"$string\"");
+		}
+
 		if (strpos($string, '.') !== false)
 		{
 			return '"' . $this->prefix . str_replace('.', '"."', $string) . '"';
@@ -438,7 +529,7 @@ class Medoo
 		return '"' . $string . '"';
 	}

-	protected function columnPush(&$columns, &$map)
+	protected function columnPush(&$columns, &$map, $root, $is_join = false)
 	{
 		if ($columns === '*')
 		{
@@ -454,23 +545,34 @@ class Medoo

 		foreach ($columns as $key => $value)
 		{
-			if (is_array($value))
+			if (!is_int($key) && is_array($value) && $root && count(array_keys($columns)) === 1)
 			{
-				$stack[] = $this->columnPush($value, $map);
+				$stack[] = $this->columnQuote($key);
+
+				$stack[] = $this->columnPush($value, $map, false, $is_join);
+			}
+			elseif (is_array($value))
+			{
+				$stack[] = $this->columnPush($value, $map, false, $is_join);
 			}
 			elseif (!is_int($key) && $raw = $this->buildRaw($value, $map))
 			{
 				preg_match('/(?<column>[a-zA-Z0-9_\.]+)(\s*\[(?<type>(String|Bool|Int|Number))\])?/i', $key, $match);

-				$stack[] = $raw . ' AS ' . $this->columnQuote( $match[ 'column' ] );
+				$stack[] = $raw . ' AS ' . $this->columnQuote($match[ 'column' ]);
 			}
 			elseif (is_int($key) && is_string($value))
 			{
+				if ($is_join && strpos($value, '*') !== false)
+				{
+					throw new InvalidArgumentException('Cannot use table.* to select all columns while joining table');
+				}
+
 				preg_match('/(?<column>[a-zA-Z0-9_\.]+)(?:\s*\((?<alias>[a-zA-Z0-9_]+)\))?(?:\s*\[(?<type>(?:String|Bool|Int|Number|Object|JSON))\])?/i', $value, $match);

 				if (!empty($match[ 'alias' ]))
 				{
-					$stack[] = $this->columnQuote( $match[ 'column' ] ) . ' AS ' . $this->columnQuote( $match[ 'alias' ] );
+					$stack[] = $this->columnQuote($match[ 'column' ]) . ' AS ' . $this->columnQuote($match[ 'alias' ]);

 					$columns[ $key ] = $match[ 'alias' ];

@@ -481,12 +583,12 @@ class Medoo
 				}
 				else
 				{
-					$stack[] = $this->columnQuote( $match[ 'column' ] );
+					$stack[] = $this->columnQuote($match[ 'column' ]);
 				}
 			}
 		}

-		return implode($stack, ',');
+		return implode(',', $stack);
 	}

 	protected function arrayQuote($array)
@@ -498,7 +600,7 @@ class Medoo
 			$stack[] = is_int($value) ? $value : $this->pdo->quote($value);
 		}

-		return implode($stack, ',');
+		return implode(',', $stack);
 	}

 	protected function innerConjunct($data, $map, $conjunctor, $outer_conjunctor)
@@ -560,7 +662,7 @@ class Medoo
 						if (is_numeric($value))
 						{
 							$condition .= $map_key;
-							$map[ $map_key ] = [$value, PDO::PARAM_INT];
+							$map[ $map_key ] = [$value, is_float($value) ? PDO::PARAM_STR : PDO::PARAM_INT];
 						}
 						elseif ($raw = $this->buildRaw($value, $map))
 						{
@@ -587,8 +689,10 @@ class Medoo

 								foreach ($value as $index => $item)
 								{
-									$placeholders[] = $map_key . $index . '_i';
-									$map[ $map_key . $index . '_i' ] = $this->typeMap($item, gettype($item));
+									$stack_key = $map_key . $index . '_i';
+
+									$placeholders[] = $stack_key;
+									$map[ $stack_key ] = $this->typeMap($item, gettype($item));
 								}

 								$stack[] = $column . ' NOT IN (' . implode(', ', $placeholders) . ')';
@@ -635,7 +739,7 @@ class Medoo
 						{
 							$item = strval($item);

-							if (!preg_match('/(\[.+\]|_|%.+|.+%)/', $item))
+							if (!preg_match('/(\[.+\]|[\*\?\!\%#^-_]|%.+|.+%)/', $item))
 							{
 								$item = '%' . $item . '%';
 							}
@@ -682,8 +786,10 @@ class Medoo

 							foreach ($value as $index => $item)
 							{
-								$placeholders[] = $map_key . $index . '_i';
-								$map[ $map_key . $index . '_i' ] = $this->typeMap($item, gettype($item));
+								$stack_key = $map_key . $index . '_i';
+
+								$placeholders[] = $stack_key;
+								$map[ $stack_key ] = $this->typeMap($item, gettype($item));
 							}

 							$stack[] = $column . ' IN (' . implode(', ', $placeholders) . ')';
@@ -728,7 +834,7 @@ class Medoo
 				$where_clause = ' WHERE ' . $this->dataImplode($conditions, $map, ' AND');
 			}

-			if (isset($where[ 'MATCH' ]))
+			if (isset($where[ 'MATCH' ]) && $this->type === 'mysql')
 			{
 				$MATCH = $where[ 'MATCH' ];

@@ -748,7 +854,7 @@ class Medoo
 						$mode = ' ' . $mode_array[ $MATCH[ 'mode' ] ];
 					}

-					$columns = implode(array_map([$this, 'columnQuote'], $MATCH[ 'columns' ]), ', ');
+					$columns = implode(', ', array_map([$this, 'columnQuote'], $MATCH[ 'columns' ]));
 					$map_key = $this->mapKey();
 					$map[ $map_key ] = [$MATCH[ 'keyword' ], PDO::PARAM_STR];

@@ -769,7 +875,7 @@ class Medoo
 						$stack[] = $this->columnQuote($value);
 					}

-					$where_clause .= ' GROUP BY ' . implode($stack, ',');
+					$where_clause .= ' GROUP BY ' . implode(',', $stack);
 				}
 				elseif ($raw = $this->buildRaw($GROUP, $map))
 				{
@@ -817,7 +923,7 @@ class Medoo
 						}
 					}

-					$where_clause .= ' ORDER BY ' . implode($stack, ',');
+					$where_clause .= ' ORDER BY ' . implode(',', $stack);
 				}
 				elseif ($raw = $this->buildRaw($ORDER, $map))
 				{
@@ -894,6 +1000,7 @@ class Medoo
 			$table_query = $table;
 		}

+		$is_join = false;
 		$join_key = is_array($join) ? array_keys($join) : null;

 		if (
@@ -901,67 +1008,8 @@ class Medoo
 			strpos($join_key[ 0 ], '[') === 0
 		)
 		{
-			$table_join = [];
-
-			$join_array = [
-				'>' => 'LEFT',
-				'<' => 'RIGHT',
-				'<>' => 'FULL',
-				'><' => 'INNER'
-			];
-
-			foreach($join as $sub_table => $relation)
-			{
-				preg_match('/(\[(?<join>\<\>?|\>\<?)\])?(?<table>[a-zA-Z0-9_]+)\s?(\((?<alias>[a-zA-Z0-9_]+)\))?/', $sub_table, $match);
-
-				if ($match[ 'join' ] !== '' && $match[ 'table' ] !== '')
-				{
-					if (is_string($relation))
-					{
-						$relation = 'USING ("' . $relation . '")';
-					}
-
-					if (is_array($relation))
-					{
-						// For ['column1', 'column2']
-						if (isset($relation[ 0 ]))
-						{
-							$relation = 'USING ("' . implode($relation, '", "') . '")';
-						}
-						else
-						{
-							$joins = [];
-
-							foreach ($relation as $key => $value)
-							{
-								$joins[] = (
-									strpos($key, '.') > 0 ?
-										// For ['tableB.column' => 'column']
-										$this->columnQuote($key) :
-
-										// For ['column1' => 'column2']
-										$table . '."' . $key . '"'
-								) .
-								' = ' .
-								$this->tableQuote(isset($match[ 'alias' ]) ? $match[ 'alias' ] : $match[ 'table' ]) . '."' . $value . '"';
-							}
-
-							$relation = 'ON ' . implode($joins, ' AND ');
-						}
-					}
-
-					$table_name = $this->tableQuote($match[ 'table' ]) . ' ';
-
-					if (isset($match[ 'alias' ]))
-					{
-						$table_name .= 'AS ' . $this->tableQuote($match[ 'alias' ]) . ' ';
-					}
-
-					$table_join[] = $join_array[ $match[ 'join' ] ] . ' JOIN ' . $table_name . $relation;
-				}
-			}
-
-			$table_query .= ' ' . implode($table_join, ' ');
+			$is_join = true;
+			$table_query .= ' ' . $this->buildJoin($table, $join);
 		}
 		else
 		{
@@ -999,6 +1047,10 @@ class Medoo
 					$where = $columns;
 				}
 			}
+			elseif ($raw = $this->buildRaw($column_fn, $map))
+			{
+				$column = $raw;
+			}
 			else
 			{
 				if (empty($columns) || $this->isRaw($columns))
@@ -1007,18 +1059,83 @@ class Medoo
 					$where = $join;
 				}

-				$column = $column_fn . '(' . $this->columnPush($columns, $map) . ')';
+				$column = $column_fn . '(' . $this->columnPush($columns, $map, true) . ')';
 			}
 		}
 		else
 		{
-			$column = $this->columnPush($columns, $map);
+			$column = $this->columnPush($columns, $map, true, $is_join);
 		}

 		return 'SELECT ' . $column . ' FROM ' . $table_query . $this->whereClause($where, $map);
 	}

-	protected function columnMap($columns, &$stack)
+	protected function buildJoin($table, $join)
+	{
+		$table_join = [];
+
+		$join_array = [
+			'>' => 'LEFT',
+			'<' => 'RIGHT',
+			'<>' => 'FULL',
+			'><' => 'INNER'
+		];
+
+		foreach($join as $sub_table => $relation)
+		{
+			preg_match('/(\[(?<join>\<\>?|\>\<?)\])?(?<table>[a-zA-Z0-9_]+)\s?(\((?<alias>[a-zA-Z0-9_]+)\))?/', $sub_table, $match);
+
+			if ($match[ 'join' ] !== '' && $match[ 'table' ] !== '')
+			{
+				if (is_string($relation))
+				{
+					$relation = 'USING ("' . $relation . '")';
+				}
+
+				if (is_array($relation))
+				{
+					// For ['column1', 'column2']
+					if (isset($relation[ 0 ]))
+					{
+						$relation = 'USING ("' . implode('", "', $relation) . '")';
+					}
+					else
+					{
+						$joins = [];
+
+						foreach ($relation as $key => $value)
+						{
+							$joins[] = (
+								strpos($key, '.') > 0 ?
+									// For ['tableB.column' => 'column']
+									$this->columnQuote($key) :
+
+									// For ['column1' => 'column2']
+									$table . '."' . $key . '"'
+							) .
+							' = ' .
+							$this->tableQuote(isset($match[ 'alias' ]) ? $match[ 'alias' ] : $match[ 'table' ]) . '."' . $value . '"';
+						}
+
+						$relation = 'ON ' . implode(' AND ', $joins);
+					}
+				}
+
+				$table_name = $this->tableQuote($match[ 'table' ]) . ' ';
+
+				if (isset($match[ 'alias' ]))
+				{
+					$table_name .= 'AS ' . $this->tableQuote($match[ 'alias' ]) . ' ';
+				}
+
+				$table_join[] = $join_array[ $match[ 'join' ] ] . ' JOIN ' . $table_name . $relation;
+			}
+		}
+
+		return implode(' ', $table_join);
+	}
+
+	protected function columnMap($columns, &$stack, $root)
 	{
 		if ($columns === '*')
 		{
@@ -1061,15 +1178,52 @@ class Medoo
 			}
 			elseif (!is_int($key) && is_array($value))
 			{
-				$this->columnMap($value, $stack);
+				if ($root && count(array_keys($columns)) === 1)
+				{
+					$stack[ $key ] = [$key, 'String'];
+				}
+
+				$this->columnMap($value, $stack, false);
 			}
 		}

 		return $stack;
 	}

-	protected function dataMap($data, $columns, $column_map, &$stack)
+	protected function dataMap($data, $columns, $column_map, &$stack, $root, &$result)
 	{
+		if ($root)
+		{
+			$columns_key = array_keys($columns);
+
+			if (count($columns_key) === 1 && is_array($columns[$columns_key[0]]))
+			{
+				$index_key = array_keys($columns)[0];
+				$data_key = preg_replace("/^[a-zA-Z0-9_]+\./i", "", $index_key);
+
+				$current_stack = [];
+
+				foreach ($data as $item)
+				{
+					$this->dataMap($data, $columns[ $index_key ], $column_map, $current_stack, false, $result);
+
+					$index = $data[ $data_key ];
+
+					$result[ $index ] = $current_stack;
+				}
+			}
+			else
+			{
+				$current_stack = [];
+				
+				$this->dataMap($data, $columns, $column_map, $current_stack, false, $result);
+
+				$result[] = $current_stack;
+			}
+
+			return;
+		}
+
 		foreach ($columns as $key => $value)
 		{
 			$isRaw = $this->isRaw($value);
@@ -1080,7 +1234,7 @@ class Medoo

 				$column_key = $map[ 0 ];

-				$result = $data[ $column_key ];
+				$item = $data[ $column_key ];

 				if (isset($map[ 1 ]))
 				{
@@ -1089,7 +1243,7 @@ class Medoo
 						continue;
 					}

-					if (is_null($result))
+					if (is_null($item))
 					{
 						$stack[ $column_key ] = null;
 						continue;
@@ -1098,50 +1252,103 @@ class Medoo
 					switch ($map[ 1 ])
 					{
 						case 'Number':
-							$stack[ $column_key ] = (double) $result;
+							$stack[ $column_key ] = (double) $item;
 							break;

 						case 'Int':
-							$stack[ $column_key ] = (int) $result;
+							$stack[ $column_key ] = (int) $item;
 							break;

 						case 'Bool':
-							$stack[ $column_key ] = (bool) $result;
+							$stack[ $column_key ] = (bool) $item;
 							break;

 						case 'Object':
-							$stack[ $column_key ] = unserialize($result);
+							$stack[ $column_key ] = unserialize($item);
 							break;

 						case 'JSON':
-							$stack[ $column_key ] = json_decode($result, true);
+							$stack[ $column_key ] = json_decode($item, true);
 							break;

 						case 'String':
-							$stack[ $column_key ] = $result;
+							$stack[ $column_key ] = $item;
 							break;
 					}
 				}
 				else
 				{
-					$stack[ $column_key ] = $result;
+					$stack[ $column_key ] = $item;
 				}
 			}
 			else
 			{
 				$current_stack = [];

-				$this->dataMap($data, $value, $column_map, $current_stack);
+				$this->dataMap($data, $value, $column_map, $current_stack, false, $result);

 				$stack[ $key ] = $current_stack;
 			}
 		}
 	}

+	public function create($table, $columns, $options = null)
+	{
+		$stack = [];
+
+		$tableName = $this->prefix . $table;
+
+		foreach ($columns as $name => $definition)
+		{
+			if (is_int($name))
+			{
+				$stack[] = preg_replace('/\<([a-zA-Z0-9_]+)\>/i', '"$1"', $definition);
+			}
+			elseif (is_array($definition))
+			{
+				$stack[] = $name . ' ' . implode(' ', $definition);
+			}
+			elseif (is_string($definition))
+			{
+				$stack[] = $name . ' ' . $this->query($definition);
+			}
+		}
+
+		$table_option = '';
+
+		if (is_array($options))
+		{
+			$option_stack = [];
+
+			foreach ($options as $key => $value)
+			{
+				if (is_string($value) || is_int($value))
+				{
+					$option_stack[] = "$key = $value";
+				}
+			}
+
+			$table_option = ' ' . implode(', ', $option_stack);
+		}
+		elseif (is_string($options))
+		{
+			$table_option = ' ' . $options;
+		}
+
+		return $this->exec("CREATE TABLE IF NOT EXISTS $tableName (" . implode(', ', $stack) . ")$table_option");
+	}
+
+	public function drop($table)
+	{
+		$tableName = $this->prefix . $table;
+
+		return $this->exec("DROP TABLE IF EXISTS $tableName");
+	}
+
 	public function select($table, $join, $columns = null, $where = null)
 	{
 		$map = [];
-		$stack = [];
+		$result = [];
 		$column_map = [];

 		$index = 0;
@@ -1152,9 +1359,9 @@ class Medoo

 		$query = $this->exec($this->selectContext($table, $map, $join, $columns, $where), $map);

-		$this->columnMap($columns, $column_map);
+		$this->columnMap($columns, $column_map, true);

-		if (!$query)
+		if (!$this->statement)
 		{
 			return false;
 		}
@@ -1164,23 +1371,27 @@ class Medoo
 			return $query->fetchAll(PDO::FETCH_ASSOC);
 		}

-		if ($is_single)
-		{
-			return $query->fetchAll(PDO::FETCH_COLUMN);
-		}
-
 		while ($data = $query->fetch(PDO::FETCH_ASSOC))
 		{
 			$current_stack = [];

-			$this->dataMap($data, $columns, $column_map, $current_stack);
-
-			$stack[ $index ] = $current_stack;
-
-			$index++;
+			$this->dataMap($data, $columns, $column_map, $current_stack, true, $result);
 		}

-		return $stack;
+		if ($is_single)
+		{
+			$single_result = [];
+			$result_key = $column_map[ $column ][ 0 ];
+
+			foreach ($result as $item)
+			{
+				$single_result[] = $item[ $result_key ];
+			}
+
+			return $single_result;
+		}
+
+		return $result;
 	}

 	public function insert($table, $datas)
@@ -1217,7 +1428,7 @@ class Medoo
 					continue;
 				}

-				$map_key =$this->mapKey();
+				$map_key = $this->mapKey();

 				$values[] = $map_key;

@@ -1257,7 +1468,7 @@ class Medoo
 				}
 			}

-			$stack[] = '(' . implode($values, ', ') . ')';
+			$stack[] = '(' . implode(', ', $values) . ')';
 		}

 		foreach ($columns as $key)
@@ -1373,8 +1584,9 @@ class Medoo
 	public function get($table, $join = null, $columns = null, $where = null)
 	{
 		$map = [];
-		$stack = [];
+		$result = [];
 		$column_map = [];
+		$current_stack = [];

 		if ($where === null)
 		{
@@ -1391,33 +1603,31 @@ class Medoo

 		$query = $this->exec($this->selectContext($table, $map, $join, $columns, $where) . ' LIMIT 1', $map);

-		if ($query)
+		if (!$this->statement)
 		{
-			$data = $query->fetchAll(PDO::FETCH_ASSOC);
-
-			if (isset($data[ 0 ]))
-			{
-				if ($column === '*')
-				{
-					return $data[ 0 ];
-				}
-
-				$this->columnMap($columns, $column_map);
-
-				$this->dataMap($data[ 0 ], $columns, $column_map, $stack);
-
-				if ($is_single)
-				{
-					return $stack[ $column_map[ $column ][ 0 ] ];
-				}
-
-				return $stack;
-			}
-
 			return false;
 		}

-		return false;
+		$data = $query->fetchAll(PDO::FETCH_ASSOC);
+
+		if (isset($data[ 0 ]))
+		{
+			if ($column === '*')
+			{
+				return $data[ 0 ];
+			}
+
+			$this->columnMap($columns, $column_map, true);
+
+			$this->dataMap($data[ 0 ], $columns, $column_map, $current_stack, true, $result);
+
+			if ($is_single)
+			{
+				return $result[ 0 ][ $column_map[ $column ][ 0 ] ];
+			}
+
+			return $result[ 0 ];
+		}
 	}

 	public function has($table, $join, $where = null)
@@ -1425,16 +1635,66 @@ class Medoo
 		$map = [];
 		$column = null;

-		$query = $this->exec('SELECT EXISTS(' . $this->selectContext($table, $map, $join, $column, $where, 1) . ')', $map);
-
-		if ($query)
+		if ($this->type === 'mssql')
 		{
-			$result = $query->fetchColumn();
-
-			return $result === '1' || $result === true;
+			$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);
 		}

-		return false;
+		if (!$this->statement)
+		{
+			return false;
+		}
+
+		$result = $query->fetchColumn();
+
+		return $result === '1' || $result === 1 || $result === true;
+	}
+
+	public function rand($table, $join = null, $columns = null, $where = null)
+	{
+		$type = $this->type;
+
+		$order = 'RANDOM()';
+
+		if ($type === 'mysql')
+		{
+			$order = 'RAND()';
+		}
+		elseif ($type === 'mssql')
+		{
+			$order = 'NEWID()';
+		}
+
+		$order_raw = $this->raw($order);
+
+		if ($where === null)
+		{
+			if ($columns === null)
+			{
+				$columns = [
+					'ORDER'  => $order_raw
+				];
+			}
+			else
+			{
+				$column = $join;
+				unset($columns[ 'ORDER' ]);
+
+				$columns[ 'ORDER' ] = $order_raw;
+			}
+		}
+		else
+		{
+			unset($where[ 'ORDER' ]);
+
+			$where[ 'ORDER' ] = $order_raw;
+		}
+
+		return $this->select($table, $join, $columns, $where);
 	}

 	private function aggregate($type, $table, $join = null, $column = null, $where = null)
@@ -1443,14 +1703,39 @@ class Medoo

 		$query = $this->exec($this->selectContext($table, $map, $join, $column, $where, strtoupper($type)), $map);

-		if ($query)
+		if (!$this->statement)
 		{
-			$number = $query->fetchColumn();
-
-			return is_numeric($number) ? $number + 0 : $number;
+			return false;
 		}

-		return false;
+		$number = $query->fetchColumn();
+
+		return is_numeric($number) ? $number + 0 : $number;
+	}
+
+	public function count($table, $join = null, $column = null, $where = null)
+	{
+		return $this->aggregate('count', $table, $join, $column, $where);
+	}
+
+	public function avg($table, $join, $column = null, $where = null)
+	{
+		return $this->aggregate('avg', $table, $join, $column, $where);
+	}
+
+	public function max($table, $join, $column = null, $where = null)
+	{
+		return $this->aggregate('max', $table, $join, $column, $where);
+	}
+
+	public function min($table, $join, $column = null, $where = null)
+	{
+		return $this->aggregate('min', $table, $join, $column, $where);
+	}
+
+	public function sum($table, $join, $column = null, $where = null)
+	{
+		return $this->aggregate('sum', $table, $join, $column, $where);
 	}

 	public function action($actions)
@@ -1485,22 +1770,30 @@ class Medoo

 	public function id()
 	{
+		if ($this->statement == null)
+		{
+			return null;
+		}
+
 		$type = $this->type;

 		if ($type === 'oracle')
 		{
 			return 0;
 		}
-		elseif ($type === 'mssql')
-		{
-			return $this->pdo->query('SELECT SCOPE_IDENTITY()')->fetchColumn();
-		}
 		elseif ($type === 'pgsql')
 		{
 			return $this->pdo->query('SELECT LASTVAL()')->fetchColumn();
 		}

-		return $this->pdo->lastInsertId();
+		$lastId = $this->pdo->lastInsertId();
+
+		if ($lastId != "0" && $lastId != "")
+		{
+			return $lastId;
+		}
+
+		return null;
 	}

 	public function debug()
@@ -1512,7 +1805,7 @@ class Medoo

 	public function error()
 	{
-		return $this->statement ? $this->statement->errorInfo() : null;
+		return $this->errorInfo;
 	}

 	public function last()
@@ -1547,7 +1840,8 @@ class Medoo
 			$output[ $key ] = @$this->pdo->getAttribute(constant('PDO::ATTR_' . $value));
 		}

+		$output[ 'dsn' ] = $this->dsn;
+
 		return $output;
 	}
-}
-?>
+}
@@ -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;
    }

    /**
@@ -377,7 +377,7 @@ class ClassLoader
            $subPath = $class;
            while (false !== $lastPos = strrpos($subPath, '\\')) {
                $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath.'\\';
+                $search = $subPath . '\\';
                if (isset($this->prefixDirsPsr4[$search])) {
                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
@@ -11,14 +11,38 @@ return array(
    'DBTransaction' => $vendorDir . '/sergeytsalkov/meekrodb/db.class.php',
    'FB' => $vendorDir . '/firephp/firephp-core/lib/FirePHPCore/fb.php',
    'FirePHP' => $vendorDir . '/firephp/firephp-core/lib/FirePHPCore/FirePHP.class.php',
+    'HTMLPurifier_AttrDef_Float' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrDef/Float.php',
+    'HTMLPurifier_AttrDef_HTML5_ARel' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrDef/HTML5/ARel.php',
+    'HTMLPurifier_AttrDef_HTML5_Datetime' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrDef/HTML5/Datetime.php',
+    'HTMLPurifier_AttrDef_HTML5_Duration' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrDef/HTML5/Duration.php',
+    'HTMLPurifier_AttrDef_HTML5_Week' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrDef/HTML5/Week.php',
+    'HTMLPurifier_AttrDef_HTML5_YearlessDate' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrDef/HTML5/YearlessDate.php',
    'HTMLPurifier_AttrDef_HTML_Bool2' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrDef/HTML/Bool2.php',
-    'HTMLPurifier_AttrDef_Regexp' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrDef/Regexp.php',
-    'HTMLPurifier_ChildDef_Details' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/Details.php',
-    'HTMLPurifier_ChildDef_Figure' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/Figure.php',
-    'HTMLPurifier_ChildDef_Media' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/Media.php',
-    'HTMLPurifier_ChildDef_Picture' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/Picture.php',
+    'HTMLPurifier_AttrTransform_HTML5_Dialog' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrTransform/HTML5/Dialog.php',
+    'HTMLPurifier_AttrTransform_HTML5_Progress' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrTransform/HTML5/Progress.php',
+    'HTMLPurifier_AttrTransform_HTML5_Script' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrTransform/HTML5/Script.php',
+    'HTMLPurifier_ChildDef_HTML5_Abstract' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/HTML5/Abstract.php',
+    'HTMLPurifier_ChildDef_HTML5_Details' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/HTML5/Details.php',
+    'HTMLPurifier_ChildDef_HTML5_Fieldset' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/HTML5/Fieldset.php',
+    'HTMLPurifier_ChildDef_HTML5_Figure' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/HTML5/Figure.php',
+    'HTMLPurifier_ChildDef_HTML5_Media' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/HTML5/Media.php',
+    'HTMLPurifier_ChildDef_HTML5_Picture' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/HTML5/Picture.php',
+    'HTMLPurifier_ChildDef_HTML5_Script' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/HTML5/Script.php',
+    'HTMLPurifier_ChildDef_HTML5_Time' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/HTML5/Time.php',
    'HTMLPurifier_HTML5Config' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTML5Config.php',
    'HTMLPurifier_HTML5Definition' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTML5Definition.php',
+    'HTMLPurifier_HTMLModule_HTML5_Bdo' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Bdo.php',
+    'HTMLPurifier_HTMLModule_HTML5_Edit' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Edit.php',
+    'HTMLPurifier_HTMLModule_HTML5_Forms' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Forms.php',
+    'HTMLPurifier_HTMLModule_HTML5_Hypertext' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Hypertext.php',
+    'HTMLPurifier_HTMLModule_HTML5_Iframe' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Iframe.php',
+    'HTMLPurifier_HTMLModule_HTML5_Interactive' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Interactive.php',
+    'HTMLPurifier_HTMLModule_HTML5_List' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/List.php',
+    'HTMLPurifier_HTMLModule_HTML5_Media' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Media.php',
+    'HTMLPurifier_HTMLModule_HTML5_Ruby' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Ruby.php',
+    'HTMLPurifier_HTMLModule_HTML5_SafeScripting' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/SafeScripting.php',
+    'HTMLPurifier_HTMLModule_HTML5_Scripting' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Scripting.php',
+    'HTMLPurifier_HTMLModule_HTML5_Text' => $vendorDir . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Text.php',
    'MeekroDB' => $vendorDir . '/sergeytsalkov/meekrodb/db.class.php',
    'MeekroDBEval' => $vendorDir . '/sergeytsalkov/meekrodb/db.class.php',
    'MeekroDBException' => $vendorDir . '/sergeytsalkov/meekrodb/db.class.php',
@@ -6,6 +6,7 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);

 return array(
+    '7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php',
    '2cffec82183ee1cea088009cef9a6fc3' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php',
    'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php',
    'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php',
@@ -10,6 +10,7 @@ return array(
    'kakao\\' => array($baseDir . '/src/kakao'),
    'Valitron\\' => array($vendorDir . '/vlucas/valitron/src/Valitron'),
    'Symfony\\Component\\Lock\\' => array($vendorDir . '/symfony/lock'),
+    'ScssPhp\\ScssPhp\\' => array($vendorDir . '/scssphp/scssphp/src'),
    'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
    'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src'),
    'PhpExtended\\Tail\\' => array($vendorDir . '/php-extended/php-tail/src'),
@@ -17,7 +18,6 @@ return array(
    'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
    'Medoo\\' => array($vendorDir . '/catfan/medoo/src'),
    'League\\Plates\\' => array($vendorDir . '/league/plates/src'),
-    'Leafo\\ScssPhp\\' => array($vendorDir . '/leafo/scssphp/src'),
    'GuzzleHttp\\Psr7\\' => array($vendorDir . '/guzzlehttp/psr7/src'),
    'GuzzleHttp\\Promise\\' => array($vendorDir . '/guzzlehttp/promises/src'),
    'GuzzleHttp\\' => array($vendorDir . '/guzzlehttp/guzzle/src'),
@@ -7,6 +7,7 @@ namespace Composer\Autoload;
 class ComposerStaticInit67b09c83b85c3bc0027caefe5bba171a
 {
    public static $files = array (
+        '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php',
        '2cffec82183ee1cea088009cef9a6fc3' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php',
        'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php',
        'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php',
@@ -31,6 +32,7 @@ class ComposerStaticInit67b09c83b85c3bc0027caefe5bba171a
        'S' => 
        array (
            'Symfony\\Component\\Lock\\' => 23,
+            'ScssPhp\\ScssPhp\\' => 16,
        ),
        'P' => 
        array (
@@ -47,7 +49,6 @@ class ComposerStaticInit67b09c83b85c3bc0027caefe5bba171a
        'L' => 
        array (
            'League\\Plates\\' => 14,
-            'Leafo\\ScssPhp\\' => 14,
        ),
        'G' => 
        array (
@@ -74,6 +75,10 @@ class ComposerStaticInit67b09c83b85c3bc0027caefe5bba171a
        array (
            0 => __DIR__ . '/..' . '/symfony/lock',
        ),
+        'ScssPhp\\ScssPhp\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/scssphp/scssphp/src',
+        ),
        'Psr\\Log\\' => 
        array (
            0 => __DIR__ . '/..' . '/psr/log/Psr/Log',
@@ -102,10 +107,6 @@ class ComposerStaticInit67b09c83b85c3bc0027caefe5bba171a
        array (
            0 => __DIR__ . '/..' . '/league/plates/src',
        ),
-        'Leafo\\ScssPhp\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/leafo/scssphp/src',
-        ),
        'GuzzleHttp\\Psr7\\' => 
        array (
            0 => __DIR__ . '/..' . '/guzzlehttp/psr7/src',
@@ -143,14 +144,38 @@ class ComposerStaticInit67b09c83b85c3bc0027caefe5bba171a
        'DBTransaction' => __DIR__ . '/..' . '/sergeytsalkov/meekrodb/db.class.php',
        'FB' => __DIR__ . '/..' . '/firephp/firephp-core/lib/FirePHPCore/fb.php',
        'FirePHP' => __DIR__ . '/..' . '/firephp/firephp-core/lib/FirePHPCore/FirePHP.class.php',
+        'HTMLPurifier_AttrDef_Float' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrDef/Float.php',
+        'HTMLPurifier_AttrDef_HTML5_ARel' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrDef/HTML5/ARel.php',
+        'HTMLPurifier_AttrDef_HTML5_Datetime' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrDef/HTML5/Datetime.php',
+        'HTMLPurifier_AttrDef_HTML5_Duration' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrDef/HTML5/Duration.php',
+        'HTMLPurifier_AttrDef_HTML5_Week' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrDef/HTML5/Week.php',
+        'HTMLPurifier_AttrDef_HTML5_YearlessDate' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrDef/HTML5/YearlessDate.php',
        'HTMLPurifier_AttrDef_HTML_Bool2' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrDef/HTML/Bool2.php',
-        'HTMLPurifier_AttrDef_Regexp' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrDef/Regexp.php',
-        'HTMLPurifier_ChildDef_Details' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/Details.php',
-        'HTMLPurifier_ChildDef_Figure' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/Figure.php',
-        'HTMLPurifier_ChildDef_Media' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/Media.php',
-        'HTMLPurifier_ChildDef_Picture' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/Picture.php',
+        'HTMLPurifier_AttrTransform_HTML5_Dialog' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrTransform/HTML5/Dialog.php',
+        'HTMLPurifier_AttrTransform_HTML5_Progress' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrTransform/HTML5/Progress.php',
+        'HTMLPurifier_AttrTransform_HTML5_Script' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrTransform/HTML5/Script.php',
+        'HTMLPurifier_ChildDef_HTML5_Abstract' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/HTML5/Abstract.php',
+        'HTMLPurifier_ChildDef_HTML5_Details' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/HTML5/Details.php',
+        'HTMLPurifier_ChildDef_HTML5_Fieldset' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/HTML5/Fieldset.php',
+        'HTMLPurifier_ChildDef_HTML5_Figure' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/HTML5/Figure.php',
+        'HTMLPurifier_ChildDef_HTML5_Media' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/HTML5/Media.php',
+        'HTMLPurifier_ChildDef_HTML5_Picture' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/HTML5/Picture.php',
+        'HTMLPurifier_ChildDef_HTML5_Script' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/HTML5/Script.php',
+        'HTMLPurifier_ChildDef_HTML5_Time' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/HTML5/Time.php',
        'HTMLPurifier_HTML5Config' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTML5Config.php',
        'HTMLPurifier_HTML5Definition' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTML5Definition.php',
+        'HTMLPurifier_HTMLModule_HTML5_Bdo' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Bdo.php',
+        'HTMLPurifier_HTMLModule_HTML5_Edit' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Edit.php',
+        'HTMLPurifier_HTMLModule_HTML5_Forms' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Forms.php',
+        'HTMLPurifier_HTMLModule_HTML5_Hypertext' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Hypertext.php',
+        'HTMLPurifier_HTMLModule_HTML5_Iframe' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Iframe.php',
+        'HTMLPurifier_HTMLModule_HTML5_Interactive' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Interactive.php',
+        'HTMLPurifier_HTMLModule_HTML5_List' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/List.php',
+        'HTMLPurifier_HTMLModule_HTML5_Media' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Media.php',
+        'HTMLPurifier_HTMLModule_HTML5_Ruby' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Ruby.php',
+        'HTMLPurifier_HTMLModule_HTML5_SafeScripting' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/SafeScripting.php',
+        'HTMLPurifier_HTMLModule_HTML5_Scripting' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Scripting.php',
+        'HTMLPurifier_HTMLModule_HTML5_Text' => __DIR__ . '/..' . '/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Text.php',
        'MeekroDB' => __DIR__ . '/..' . '/sergeytsalkov/meekrodb/db.class.php',
        'MeekroDBEval' => __DIR__ . '/..' . '/sergeytsalkov/meekrodb/db.class.php',
        'MeekroDBException' => __DIR__ . '/..' . '/sergeytsalkov/meekrodb/db.class.php',
@@ -49,17 +49,17 @@
    },
    {
        "name": "catfan/medoo",
-        "version": "v1.5.7",
-        "version_normalized": "1.5.7.0",
+        "version": "v1.7.8",
+        "version_normalized": "1.7.8.0",
        "source": {
            "type": "git",
            "url": "https://github.com/catfan/Medoo.git",
-            "reference": "8d90cba0e8ff176028847527d0ea76fe41a06ecf"
+            "reference": "dd9d570584cfb1e09ec470608479b86e41d5b60d"
        },
        "dist": {
            "type": "zip",
-            "url": "https://api.github.com/repos/catfan/Medoo/zipball/8d90cba0e8ff176028847527d0ea76fe41a06ecf",
-            "reference": "8d90cba0e8ff176028847527d0ea76fe41a06ecf",
+            "url": "https://api.github.com/repos/catfan/Medoo/zipball/dd9d570584cfb1e09ec470608479b86e41d5b60d",
+            "reference": "dd9d570584cfb1e09ec470608479b86e41d5b60d",
            "shasum": ""
        },
        "require": {
@@ -73,9 +73,9 @@
            "ext-pdo_oci8": "For Oracle version 8 database",
            "ext-pdo_pqsql": "For PostgreSQL database",
            "ext-pdo_sqlite": "For SQLite database",
-            "ext-pdo_sqlsrv": "For MSSQL database"
+            "ext-pdo_sqlsrv": "For MSSQL database on both Window/Liunx platform"
        },
-        "time": "2018-06-14T18:59:08+00:00",
+        "time": "2019-12-19T05:04:34+00:00",
        "type": "framework",
        "installation-source": "dist",
        "autoload": {
@@ -93,10 +93,11 @@
                "email": "angel@catfan.me"
            }
        ],
-        "description": "The lightest PHP database framework to accelerate development",
+        "description": "The lightweight PHP database framework to accelerate development",
        "homepage": "https://medoo.in",
        "keywords": [
            "database",
+            "database library",
            "lightweight",
            "mariadb",
            "mssql",
@@ -110,26 +111,26 @@
    },
    {
        "name": "ezyang/htmlpurifier",
-        "version": "v4.10.0",
-        "version_normalized": "4.10.0.0",
+        "version": "v4.12.0",
+        "version_normalized": "4.12.0.0",
        "source": {
            "type": "git",
            "url": "https://github.com/ezyang/htmlpurifier.git",
-            "reference": "d85d39da4576a6934b72480be6978fb10c860021"
+            "reference": "a617e55bc62a87eec73bd456d146d134ad716f03"
        },
        "dist": {
            "type": "zip",
-            "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/d85d39da4576a6934b72480be6978fb10c860021",
-            "reference": "d85d39da4576a6934b72480be6978fb10c860021",
+            "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/a617e55bc62a87eec73bd456d146d134ad716f03",
+            "reference": "a617e55bc62a87eec73bd456d146d134ad716f03",
            "shasum": ""
        },
        "require": {
            "php": ">=5.2"
        },
        "require-dev": {
-            "simpletest/simpletest": "^1.1"
+            "simpletest/simpletest": "dev-master#72de02a7b80c6bb8864ef9bf66d41d2f58f826bd"
        },
-        "time": "2018-02-23T01:58:20+00:00",
+        "time": "2019-10-28T03:44:26+00:00",
        "type": "library",
        "installation-source": "dist",
        "autoload": {
@@ -142,7 +143,7 @@
        },
        "notification-url": "https://packagist.org/downloads/",
        "license": [
-            "LGPL"
+            "LGPL-2.1-or-later"
        ],
        "authors": [
            {
@@ -197,47 +198,49 @@
    },
    {
        "name": "guzzlehttp/guzzle",
-        "version": "6.3.3",
-        "version_normalized": "6.3.3.0",
+        "version": "6.5.2",
+        "version_normalized": "6.5.2.0",
        "source": {
            "type": "git",
            "url": "https://github.com/guzzle/guzzle.git",
-            "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
+            "reference": "43ece0e75098b7ecd8d13918293029e555a50f82"
        },
        "dist": {
            "type": "zip",
-            "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
-            "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+            "url": "https://api.github.com/repos/guzzle/guzzle/zipball/43ece0e75098b7ecd8d13918293029e555a50f82",
+            "reference": "43ece0e75098b7ecd8d13918293029e555a50f82",
            "shasum": ""
        },
        "require": {
+            "ext-json": "*",
            "guzzlehttp/promises": "^1.0",
-            "guzzlehttp/psr7": "^1.4",
+            "guzzlehttp/psr7": "^1.6.1",
            "php": ">=5.5"
        },
        "require-dev": {
            "ext-curl": "*",
            "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
-            "psr/log": "^1.0"
+            "psr/log": "^1.1"
        },
        "suggest": {
+            "ext-intl": "Required for Internationalized Domain Name (IDN) support",
            "psr/log": "Required for using the Log middleware"
        },
-        "time": "2018-04-22T15:46:56+00:00",
+        "time": "2019-12-23T11:57:10+00:00",
        "type": "library",
        "extra": {
            "branch-alias": {
-                "dev-master": "6.3-dev"
+                "dev-master": "6.5-dev"
            }
        },
        "installation-source": "dist",
        "autoload": {
-            "files": [
-                "src/functions_include.php"
-            ],
            "psr-4": {
                "GuzzleHttp\\": "src/"
-            }
+            },
+            "files": [
+                "src/functions_include.php"
+            ]
        },
        "notification-url": "https://packagist.org/downloads/",
        "license": [
@@ -317,34 +320,39 @@
    },
    {
        "name": "guzzlehttp/psr7",
-        "version": "1.4.2",
-        "version_normalized": "1.4.2.0",
+        "version": "1.6.1",
+        "version_normalized": "1.6.1.0",
        "source": {
            "type": "git",
            "url": "https://github.com/guzzle/psr7.git",
-            "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
+            "reference": "239400de7a173fe9901b9ac7c06497751f00727a"
        },
        "dist": {
            "type": "zip",
-            "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
-            "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
+            "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
+            "reference": "239400de7a173fe9901b9ac7c06497751f00727a",
            "shasum": ""
        },
        "require": {
            "php": ">=5.4.0",
-            "psr/http-message": "~1.0"
+            "psr/http-message": "~1.0",
+            "ralouphie/getallheaders": "^2.0.5 || ^3.0.0"
        },
        "provide": {
            "psr/http-message-implementation": "1.0"
        },
        "require-dev": {
-            "phpunit/phpunit": "~4.0"
+            "ext-zlib": "*",
+            "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
        },
-        "time": "2017-03-20T17:10:46+00:00",
+        "suggest": {
+            "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
+        },
+        "time": "2019-07-01T23:21:34+00:00",
        "type": "library",
        "extra": {
            "branch-alias": {
-                "dev-master": "1.4-dev"
+                "dev-master": "1.6-dev"
            }
        },
        "installation-source": "dist",
@@ -375,6 +383,7 @@
        "keywords": [
            "http",
            "message",
+            "psr-7",
            "request",
            "response",
            "stream",
@@ -382,60 +391,6 @@
            "url"
        ]
    },
-    {
-        "name": "leafo/scssphp",
-        "version": "v0.7.7",
-        "version_normalized": "0.7.7.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/leafo/scssphp.git",
-            "reference": "1d656f8c02a3a69404bba6b28ec4e06edddf0f49"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/leafo/scssphp/zipball/1d656f8c02a3a69404bba6b28ec4e06edddf0f49",
-            "reference": "1d656f8c02a3a69404bba6b28ec4e06edddf0f49",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.4.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.6",
-            "squizlabs/php_codesniffer": "~2.5"
-        },
-        "time": "2018-07-22T01:22:08+00:00",
-        "bin": [
-            "bin/pscss"
-        ],
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Leafo\\ScssPhp\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Leaf Corcoran",
-                "email": "leafot@gmail.com",
-                "homepage": "http://leafo.net"
-            }
-        ],
-        "description": "scssphp is a compiler for SCSS written in PHP.",
-        "homepage": "http://leafo.github.io/scssphp/",
-        "keywords": [
-            "css",
-            "less",
-            "sass",
-            "scss",
-            "stylesheet"
-        ]
-    },
    {
        "name": "league/plates",
        "version": "3.3.0",
@@ -495,17 +450,17 @@
    },
    {
        "name": "monolog/monolog",
-        "version": "1.23.0",
-        "version_normalized": "1.23.0.0",
+        "version": "1.25.3",
+        "version_normalized": "1.25.3.0",
        "source": {
            "type": "git",
            "url": "https://github.com/Seldaek/monolog.git",
-            "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4"
+            "reference": "fa82921994db851a8becaf3787a9e73c5976b6f1"
        },
        "dist": {
            "type": "zip",
-            "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
-            "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
+            "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fa82921994db851a8becaf3787a9e73c5976b6f1",
+            "reference": "fa82921994db851a8becaf3787a9e73c5976b6f1",
            "shasum": ""
        },
        "require": {
@@ -541,7 +496,7 @@
            "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
            "sentry/sentry": "Allow sending log messages to a Sentry server"
        },
-        "time": "2017-06-19T01:22:40+00:00",
+        "time": "2019-12-20T14:15:16+00:00",
        "type": "library",
        "extra": {
            "branch-alias": {
@@ -741,27 +696,27 @@
    },
    {
        "name": "psr/log",
-        "version": "1.0.2",
-        "version_normalized": "1.0.2.0",
+        "version": "1.1.2",
+        "version_normalized": "1.1.2.0",
        "source": {
            "type": "git",
            "url": "https://github.com/php-fig/log.git",
-            "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+            "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
        },
        "dist": {
            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
-            "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+            "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
+            "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
            "shasum": ""
        },
        "require": {
            "php": ">=5.3.0"
        },
-        "time": "2016-10-10T12:19:37+00:00",
+        "time": "2019-11-01T11:05:21+00:00",
        "type": "library",
        "extra": {
            "branch-alias": {
-                "dev-master": "1.0.x-dev"
+                "dev-master": "1.1.x-dev"
            }
        },
        "installation-source": "dist",
@@ -788,6 +743,111 @@
            "psr-3"
        ]
    },
+    {
+        "name": "ralouphie/getallheaders",
+        "version": "3.0.3",
+        "version_normalized": "3.0.3.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/ralouphie/getallheaders.git",
+            "reference": "120b605dfeb996808c31b6477290a714d356e822"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
+            "reference": "120b605dfeb996808c31b6477290a714d356e822",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.6"
+        },
+        "require-dev": {
+            "php-coveralls/php-coveralls": "^2.1",
+            "phpunit/phpunit": "^5 || ^6.5"
+        },
+        "time": "2019-03-08T08:55:37+00:00",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "files": [
+                "src/getallheaders.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Ralph Khattar",
+                "email": "ralph.khattar@gmail.com"
+            }
+        ],
+        "description": "A polyfill for getallheaders."
+    },
+    {
+        "name": "scssphp/scssphp",
+        "version": "1.0.6",
+        "version_normalized": "1.0.6.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/scssphp/scssphp.git",
+            "reference": "5b3c9d704950d8f9637f5110c36c281ec47dc13c"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/scssphp/scssphp/zipball/5b3c9d704950d8f9637f5110c36c281ec47dc13c",
+            "reference": "5b3c9d704950d8f9637f5110c36c281ec47dc13c",
+            "shasum": ""
+        },
+        "require": {
+            "ext-ctype": "*",
+            "ext-json": "*",
+            "php": ">=5.6.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3",
+            "squizlabs/php_codesniffer": "~2.5",
+            "twbs/bootstrap": "~4.3",
+            "zurb/foundation": "~6.5"
+        },
+        "time": "2019-12-12T05:00:52+00:00",
+        "bin": [
+            "bin/pscss"
+        ],
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "ScssPhp\\ScssPhp\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Anthon Pang",
+                "email": "apang@softwaredevelopment.ca",
+                "homepage": "https://github.com/robocoder"
+            },
+            {
+                "name": "Cédric Morin",
+                "email": "cedric@yterium.com",
+                "homepage": "https://github.com/Cerdic"
+            }
+        ],
+        "description": "scssphp is a compiler for SCSS written in PHP.",
+        "homepage": "http://scssphp.github.io/scssphp/",
+        "keywords": [
+            "css",
+            "less",
+            "sass",
+            "scss",
+            "stylesheet"
+        ]
+    },
    {
        "name": "sergeytsalkov/meekrodb",
        "version": "v2.3",
@@ -835,31 +895,36 @@
    },
    {
        "name": "symfony/lock",
-        "version": "v4.1.1",
-        "version_normalized": "4.1.1.0",
+        "version": "v4.4.3",
+        "version_normalized": "4.4.3.0",
        "source": {
            "type": "git",
            "url": "https://github.com/symfony/lock.git",
-            "reference": "d508b5dd92272cb74300396ecaadde969d0f7976"
+            "reference": "6c4f5b620871cfef5b004fc57f2ca74572ae03b3"
        },
        "dist": {
            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/lock/zipball/d508b5dd92272cb74300396ecaadde969d0f7976",
-            "reference": "d508b5dd92272cb74300396ecaadde969d0f7976",
+            "url": "https://api.github.com/repos/symfony/lock/zipball/6c4f5b620871cfef5b004fc57f2ca74572ae03b3",
+            "reference": "6c4f5b620871cfef5b004fc57f2ca74572ae03b3",
            "shasum": ""
        },
        "require": {
            "php": "^7.1.3",
            "psr/log": "~1.0"
        },
+        "conflict": {
+            "doctrine/dbal": "<2.5"
+        },
        "require-dev": {
+            "doctrine/dbal": "~2.5",
+            "mongodb/mongodb": "~1.1",
            "predis/predis": "~1.0"
        },
-        "time": "2018-06-21T11:15:46+00:00",
+        "time": "2020-01-04T13:00:46+00:00",
        "type": "library",
        "extra": {
            "branch-alias": {
-                "dev-master": "4.1-dev"
+                "dev-master": "4.4-dev"
            }
        },
        "installation-source": "dist",
@@ -876,13 +941,13 @@
            "MIT"
        ],
        "authors": [
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            },
            {
                "name": "Jérémy Derussé",
                "email": "jeremy@derusse.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
            }
        ],
        "description": "Symfony Lock Component",
@@ -898,17 +963,17 @@
    },
    {
        "name": "vlucas/valitron",
-        "version": "v1.4.3",
-        "version_normalized": "1.4.3.0",
+        "version": "v1.4.7",
+        "version_normalized": "1.4.7.0",
        "source": {
            "type": "git",
            "url": "https://github.com/vlucas/valitron.git",
-            "reference": "3c5463315bfa23b17f8949b100a960d035234e43"
+            "reference": "a03072bed1679660200766d134507a30193eaf6d"
        },
        "dist": {
            "type": "zip",
-            "url": "https://api.github.com/repos/vlucas/valitron/zipball/3c5463315bfa23b17f8949b100a960d035234e43",
-            "reference": "3c5463315bfa23b17f8949b100a960d035234e43",
+            "url": "https://api.github.com/repos/vlucas/valitron/zipball/a03072bed1679660200766d134507a30193eaf6d",
+            "reference": "a03072bed1679660200766d134507a30193eaf6d",
            "shasum": ""
        },
        "require": {
@@ -920,7 +985,7 @@
        "suggest": {
            "ext-mbstring": "It can support the multiple bytes string length."
        },
-        "time": "2018-05-06T10:45:26+00:00",
+        "time": "2019-08-29T19:49:43+00:00",
        "type": "library",
        "installation-source": "dist",
        "autoload": {
@@ -949,27 +1014,28 @@
    },
    {
        "name": "xemlock/htmlpurifier-html5",
-        "version": "v0.1.7",
-        "version_normalized": "0.1.7.0",
+        "version": "v0.1.11",
+        "version_normalized": "0.1.11.0",
        "source": {
            "type": "git",
            "url": "https://github.com/xemlock/htmlpurifier-html5.git",
-            "reference": "b4b35e51ec75e0207c23035f7d9a354bdcdac359"
+            "reference": "f0d563f9fd4a82a3d759043483f9a94c0d8c2255"
        },
        "dist": {
            "type": "zip",
-            "url": "https://api.github.com/repos/xemlock/htmlpurifier-html5/zipball/b4b35e51ec75e0207c23035f7d9a354bdcdac359",
-            "reference": "b4b35e51ec75e0207c23035f7d9a354bdcdac359",
+            "url": "https://api.github.com/repos/xemlock/htmlpurifier-html5/zipball/f0d563f9fd4a82a3d759043483f9a94c0d8c2255",
+            "reference": "f0d563f9fd4a82a3d759043483f9a94c0d8c2255",
            "shasum": ""
        },
        "require": {
-            "ezyang/htmlpurifier": "^4.7",
+            "ezyang/htmlpurifier": "^4.8",
            "php": ">=5.2"
        },
        "require-dev": {
-            "phpunit/phpunit": "4.7.*|5.7.*"
+            "php-coveralls/php-coveralls": "^1.1|^2.1",
+            "phpunit/phpunit": ">=4.7 <8.0"
        },
-        "time": "2018-06-07T14:30:17+00:00",
+        "time": "2019-08-07T17:19:21+00:00",
        "type": "library",
        "installation-source": "dist",
        "autoload": {
@@ -987,6 +1053,16 @@
                "email": "xemlock@gmail.com"
            }
        ],
-        "description": "HTML Purifier definitions for HTML5 elements"
+        "description": "HTML5 element definitions for HTML Purifier",
+        "keywords": [
+            "HTML5",
+            "Purifier",
+            "html",
+            "htmlpurifier",
+            "security",
+            "tidy",
+            "validator",
+            "xss"
+        ]
    }
 ]
@@ -15,7 +15,7 @@ with these contents.
 ---------------------------------------------------------------------------
 1.  Compatibility

-HTML Purifier is PHP 5 and PHP 7, and is actively tested from PHP 5.0.5
+HTML Purifier is PHP 5 and PHP 7, and is actively tested from PHP 5.3
 and up. It has no core dependencies with other libraries.

 These optional extensions can enhance the capabilities of HTML Purifier:
@@ -101,31 +101,6 @@ Autoload compatibility
    autoloader, but there are some cases where you will need to change
    your own code to accomodate HTML Purifier. These are those cases:

-    PHP VERSION IS LESS THAN 5.1.2, AND YOU'VE DEFINED __autoload
-        Because spl_autoload_register() doesn't exist in early versions
-        of PHP 5, HTML Purifier has no way of adding itself to the autoload
-        stack. Modify your __autoload function to test
-        HTMLPurifier_Bootstrap::autoload($class)
-
-        For example, suppose your autoload function looks like this:
-
-            function __autoload($class) {
-                require str_replace('_', '/', $class) . '.php';
-                return true;
-            }
-
-        A modified version with HTML Purifier would look like this:
-
-            function __autoload($class) {
-                if (HTMLPurifier_Bootstrap::autoload($class)) return true;
-                require str_replace('_', '/', $class) . '.php';
-                return true;
-            }
-
-        Note that there *is* some custom behavior in our autoloader; the
-        original autoloader in our example would work for 99% of the time,
-        but would fail when including language files.
-
    AN __autoload FUNCTION IS DECLARED AFTER OUR AUTOLOADER IS REGISTERED
        spl_autoload_register() has the curious behavior of disabling
        the existing __autoload() handler. Users need to explicitly
@@ -138,11 +113,6 @@ Autoload compatibility

            spl_autoload_register('__autoload')

-    Users should also be on guard if they use a version of PHP previous
-    to 5.1.2 without an autoloader--HTML Purifier will define __autoload()
-    for you, which can collide with an autoloader that was added by *you*
-    later.
-

 For better performance
 ----------------------
@@ -204,9 +174,7 @@ For advanced users
        HTMLPurifier.autoload.php
            Registers our autoload handler HTMLPurifier_Bootstrap::autoload($class).

-    You can do these operations by yourself--in fact, you must modify your own
-    autoload handler if you are using a version of PHP earlier than PHP 5.1.2
-    (See "Autoload compatibility" above).
+    You can do these operations by yourself, if you like.


 ---------------------------------------------------------------------------
@@ -11,7 +11,7 @@ pied de page, mais je recommande de lire le document.

 1.  Compatibilité

-HTML Purifier fonctionne avec PHP 5. PHP 5.0.5 est la dernière version testée.
+HTML Purifier fonctionne avec PHP 5. PHP 5.3 est la dernière version testée.
 Il ne dépend pas d'autres librairies.

 Les extensions optionnelles sont iconv (généralement déjà installée) et tidy
@@ -9,6 +9,40 @@ NEWS ( CHANGELOG and HISTORY )                                     HTMLPurifier
    . Internal change
 ==========================

+4.12.0, released 2019-10-27
+! PHP 7.4 is supported, thank you Witold Wasiczko, Mateuz Turcza and
+  Edi Modrić
+- PHPDocs for HTMLModule::addElement() and Bool attr are fixed (thanks
+  Mateusz)
+
+4.11.0, released 2019-07-14
+# SafeScripting now matches case-sensitively against its whitelist (previously it was
+  case-insensitive.)  Thanks Dimitri Gritsajuk <gritsajuk.dimitri@gmail.com>
+  for reporting.
+! New directive %Core.AllowParseManyTags which allows parsing of many nested tags.
+  Thanks M. Suzuki <msuzuki1986@gmail.com> for contributing the patch.
+! purifyArray now supports multidimensional arrays.  Thanks
+  Sandro Miguel Marques <sandromiguel@sandromiguel.com> for contributing this patch.
+! initial and inherit settings available for width, height, and the min-/max-
+  versions thereof.  Thanks Michael Kliewe <info@phpgansta.de> for contributing
+  this patch.
+! More color names are supported.  Thanks Daijobou for contributing.
+- Compatibility fixes for PHP 7.3, including new CI for PHP 7.3
+  (thank you Lukas Neumann <lksnmnn@gmail.com>) and removal of
+  reserved words in our constants (thanks Darko Hrgovic <darko@darkodev.com>
+- Compatibility fixes for HHVM.  Thanks Mateusz Turcza for contributing
+  this fix.
+- HTML Purifier now never defines __autoload, fixing #196.  Thanks
+  Michael Kliewe for reporting.
+- In some situations, Config.php would report an undefined index: class
+  error; this has been fixed.  Thanks DiLong Fa for contributing
+  this fix.
+- We no longer produce <script /> tags; we always explicitly write
+  out the open and close tag.  Thanks Dimitri Gritsajuk
+  <gritsajuk.dimitri@gmail.com> for contributing this fix.
+- Better compatibility when IDNA constants are not present.  Thanks
+  Mateusz Turcza <xemlock@gmail.com> for contributing this fix.
+
 4.10.0, released 2018-02-22
 # PHP 5.3 is no longer officially supported by HTML Purifier
  (we did not specifically break support, but we are no longer
@@ -26,4 +26,4 @@ Package available on [Composer](https://packagist.org/packages/ezyang/htmlpurifi

 If you're using Composer to manage dependencies, you can use

-    $ composer require "ezyang/htmlpurifier":"dev-master"
+    $ composer require ezyang/htmlpurifier
@@ -1 +1 @@
-4.10.0
+4.12.0
@@ -1,13 +1,2 @@
-HTML Purifier 4.9.x is a maintenance release, collecting a year
-of accumulated bug fixes plus a few new features.  New features
-include support for min/max-width/height CSS, and rgba/hsl/hsla
-in color specifications.  Major bugfixes include improvements
-in the Serializer cache to avoid chmod'ing directories, better
-entity decoding (we won't accidentally encode entities that occur
-in URLs) and rel="noopener" on links with target attributes,
-to prevent them from overwriting the original frame.
-
-4.9.3 works around an infinite loop bug in PHP 7.1 with the opcode
-cache (and has one other, minor bugfix, avoiding using autoloading
-when testing for DOMDocument presence).  If these bugs do not
-affect you, you do not need to upgrade.
+HTML Purifier 4.12.x is a maintenance release which makes
+compatibility fixes for PHP 7.4.
@@ -4,7 +4,7 @@
    "type": "library",
    "keywords": ["html"],
    "homepage": "http://htmlpurifier.org/",
-    "license": "LGPL",
+    "license": "LGPL-2.1-or-later",
    "authors": [
        {
            "name": "Edward Z. Yang",
@@ -16,7 +16,7 @@
        "php": ">=5.2"
    },
    "require-dev": {
-        "simpletest/simpletest": "^1.1"
+        "simpletest/simpletest": "dev-master#72de02a7b80c6bb8864ef9bf66d41d2f58f826bd"
    },
    "autoload": {
        "psr-0": { "HTMLPurifier": "library/" },
@@ -7,7 +7,7 @@
 * primary concern and you are using an opcode cache. PLEASE DO NOT EDIT THIS
 * FILE, changes will be overwritten the next time the script is run.
 *
- * @version 4.10.0
+ * @version 4.12.0
 *
 * @warning
 *      You must *not* include any other HTML Purifier files before this file,
@@ -19,7 +19,7 @@
 */

 /*
-    HTML Purifier 4.10.0 - Standards Compliant HTML Filtering
+    HTML Purifier 4.12.0 - Standards Compliant HTML Filtering
    Copyright (C) 2006-2008 Edward Z. Yang

    This library is free software; you can redistribute it and/or
@@ -58,12 +58,12 @@ class HTMLPurifier
     * Version of HTML Purifier.
     * @type string
     */
-    public $version = '4.10.0';
+    public $version = '4.12.0';

    /**
     * Constant with version of HTML Purifier.
     */
-    const VERSION = '4.10.0';
+    const VERSION = '4.12.0';

    /**
     * Global configuration object.
@@ -240,12 +240,16 @@ class HTMLPurifier
    public function purifyArray($array_of_html, $config = null)
    {
        $context_array = array();
-        foreach ($array_of_html as $key => $html) {
-            $array_of_html[$key] = $this->purify($html, $config);
+        foreach($array_of_html as $key=>$value){
+            if (is_array($value)) {
+                $array[$key] = $this->purifyArray($value, $config);
+            } else {
+                $array[$key] = $this->purify($value, $config);
+            }
            $context_array[$key] = $this->context;
        }
        $this->context = $context_array;
-        return $array_of_html;
+        return $array;
    }

    /**
@@ -7,7 +7,7 @@ class HTMLPurifier_AttrDef_HTML_Bool extends HTMLPurifier_AttrDef
 {

    /**
-     * @type bool
+     * @type string
     */
    protected $name;

@@ -17,7 +17,7 @@ class HTMLPurifier_AttrDef_HTML_Bool extends HTMLPurifier_AttrDef
    public $minimized = true;

    /**
-     * @param bool $name
+     * @param bool|string $name
     */
    public function __construct($name = false)
    {
@@ -97,7 +97,11 @@ class HTMLPurifier_AttrDef_URI_Host extends HTMLPurifier_AttrDef

        // PHP 5.3 and later support this functionality natively
        if (function_exists('idn_to_ascii')) {
-            $string = idn_to_ascii($string, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
+            if (defined('IDNA_NONTRANSITIONAL_TO_ASCII') && defined('INTL_IDNA_VARIANT_UTS46')) {
+                $string = idn_to_ascii($string, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
+            } else {
+                $string = idn_to_ascii($string);
+            }

        // If we have Net_IDNA2 support, we can support IRIs by
        // punycoding them. (This is the most portable thing to do,
@@ -220,15 +220,25 @@ class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition
            array(
                new HTMLPurifier_AttrDef_CSS_Length('0'),
                new HTMLPurifier_AttrDef_CSS_Percentage(true),
-                new HTMLPurifier_AttrDef_Enum(array('auto'))
+                new HTMLPurifier_AttrDef_Enum(array('auto', 'initial', 'inherit'))
+            )
+        );
+        $trusted_min_wh = new HTMLPurifier_AttrDef_CSS_Composite(
+            array(
+                new HTMLPurifier_AttrDef_CSS_Length('0'),
+                new HTMLPurifier_AttrDef_CSS_Percentage(true),
+                new HTMLPurifier_AttrDef_Enum(array('initial', 'inherit'))
+            )
+        );
+        $trusted_max_wh = new HTMLPurifier_AttrDef_CSS_Composite(
+            array(
+                new HTMLPurifier_AttrDef_CSS_Length('0'),
+                new HTMLPurifier_AttrDef_CSS_Percentage(true),
+                new HTMLPurifier_AttrDef_Enum(array('none', 'initial', 'inherit'))
            )
        );
        $max = $config->get('CSS.MaxImgLength');

-        $this->info['min-width'] =
-        $this->info['max-width'] =
-        $this->info['min-height'] =
-        $this->info['max-height'] =
        $this->info['width'] =
        $this->info['height'] =
            $max === null ?
@@ -245,6 +255,38 @@ class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition
                    // For everyone else:
                    $trusted_wh
                );
+        $this->info['min-width'] =
+        $this->info['min-height'] =
+            $max === null ?
+                $trusted_min_wh :
+                new HTMLPurifier_AttrDef_Switch(
+                    'img',
+                    // For img tags:
+                    new HTMLPurifier_AttrDef_CSS_Composite(
+                        array(
+                            new HTMLPurifier_AttrDef_CSS_Length('0', $max),
+                            new HTMLPurifier_AttrDef_Enum(array('initial', 'inherit'))
+                        )
+                    ),
+                    // For everyone else:
+                    $trusted_min_wh
+                );
+        $this->info['max-width'] =
+        $this->info['max-height'] =
+            $max === null ?
+                $trusted_max_wh :
+                new HTMLPurifier_AttrDef_Switch(
+                    'img',
+                    // For img tags:
+                    new HTMLPurifier_AttrDef_CSS_Composite(
+                        array(
+                            new HTMLPurifier_AttrDef_CSS_Length('0', $max),
+                            new HTMLPurifier_AttrDef_Enum(array('none', 'initial', 'inherit'))
+                        )
+                    ),
+                    // For everyone else:
+                    $trusted_max_wh
+                );

        $this->info['text-decoration'] = new HTMLPurifier_AttrDef_CSS_TextDecoration();

@@ -45,7 +45,7 @@ class HTMLPurifier_ChildDef_Custom extends HTMLPurifier_ChildDef
    protected function _compileRegex()
    {
        $raw = str_replace(' ', '', $this->dtd_regex);
-        if ($raw{0} != '(') {
+        if ($raw[0] != '(') {
            $raw = "($raw)";
        }
        $el = '[#a-zA-Z0-9_.-]+';
@@ -21,7 +21,7 @@ class HTMLPurifier_Config
     * HTML Purifier's version
     * @type string
     */
-    public $version = '4.10.0';
+    public $version = '4.12.0';

    /**
     * Whether or not to automatically finalize
@@ -890,7 +890,7 @@ class HTMLPurifier_Config
            // zip(tail(trace), trace) -- but PHP is not Haskell har har
            for ($i = 0, $c = count($trace); $i < $c - 1; $i++) {
                // XXX this is not correct on some versions of HTML Purifier
-                if ($trace[$i + 1]['class'] === 'HTMLPurifier_Config') {
+                if (isset($trace[$i + 1]['class']) && $trace[$i + 1]['class'] === 'HTMLPurifier_Config') {
                    continue;
                }
                $frame = $trace[$i];
@@ -100,7 +100,7 @@ class HTMLPurifier_ConfigSchema
     * @param string $key Name of directive
     * @param mixed $default Default value of directive
     * @param string $type Allowed type of the directive. See
-     *      HTMLPurifier_DirectiveDef::$type for allowed values
+     *      HTMLPurifier_VarParser::$types for allowed values
     * @param bool $allow_null Whether or not to allow null values
     */
    public function add($key, $default, $type, $allow_null)
@@ -6,7 +6,7 @@ DEFAULT: false
 <p>
  When enabled, HTML Purifier will treat any elements that contain only
  non-breaking spaces as well as regular whitespace as empty, and remove
-  them when %AutoForamt.RemoveEmpty is enabled.
+  them when %AutoFormat.RemoveEmpty is enabled.
 </p>
 <p>
  See %AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions for a list of elements
@@ -0,0 +1,12 @@
+Core.AllowParseManyTags
+TYPE: bool
+DEFAULT: false
+VERSION: 4.10.1
+--DESCRIPTION--
+<p>
+    This directive allows parsing of many nested tags.
+    If you set true, relaxes any hardcoded limit from the parser.
+    However, in that case it may cause a Dos attack.
+    Be careful when enabling it.
+</p>
+--# vim: et sw=4 sts=4
@@ -3,23 +3,154 @@ TYPE: hash
 VERSION: 2.0.0
 --DEFAULT--
 array (
-  'maroon' => '#800000',
-  'red' => '#FF0000',
-  'orange' => '#FFA500',
-  'yellow' => '#FFFF00',
-  'olive' => '#808000',
-  'purple' => '#800080',
-  'fuchsia' => '#FF00FF',
-  'white' => '#FFFFFF',
-  'lime' => '#00FF00',
-  'green' => '#008000',
-  'navy' => '#000080',
-  'blue' => '#0000FF',
+  'aliceblue' => '#F0F8FF',
+  'antiquewhite' => '#FAEBD7',
  'aqua' => '#00FFFF',
-  'teal' => '#008080',
+  'aquamarine' => '#7FFFD4',
+  'azure' => '#F0FFFF',
+  'beige' => '#F5F5DC',
+  'bisque' => '#FFE4C4',
  'black' => '#000000',
-  'silver' => '#C0C0C0',
+  'blanchedalmond' => '#FFEBCD',
+  'blue' => '#0000FF',
+  'blueviolet' => '#8A2BE2',
+  'brown' => '#A52A2A',
+  'burlywood' => '#DEB887',
+  'cadetblue' => '#5F9EA0',
+  'chartreuse' => '#7FFF00',
+  'chocolate' => '#D2691E',
+  'coral' => '#FF7F50',
+  'cornflowerblue' => '#6495ED',
+  'cornsilk' => '#FFF8DC',
+  'crimson' => '#DC143C',
+  'cyan' => '#00FFFF',
+  'darkblue' => '#00008B',
+  'darkcyan' => '#008B8B',
+  'darkgoldenrod' => '#B8860B',
+  'darkgray' => '#A9A9A9',
+  'darkgrey' => '#A9A9A9',
+  'darkgreen' => '#006400',
+  'darkkhaki' => '#BDB76B',
+  'darkmagenta' => '#8B008B',
+  'darkolivegreen' => '#556B2F',
+  'darkorange' => '#FF8C00',
+  'darkorchid' => '#9932CC',
+  'darkred' => '#8B0000',
+  'darksalmon' => '#E9967A',
+  'darkseagreen' => '#8FBC8F',
+  'darkslateblue' => '#483D8B',
+  'darkslategray' => '#2F4F4F',
+  'darkslategrey' => '#2F4F4F',
+  'darkturquoise' => '#00CED1',
+  'darkviolet' => '#9400D3',
+  'deeppink' => '#FF1493',
+  'deepskyblue' => '#00BFFF',
+  'dimgray' => '#696969',
+  'dimgrey' => '#696969',
+  'dodgerblue' => '#1E90FF',
+  'firebrick' => '#B22222',
+  'floralwhite' => '#FFFAF0',
+  'forestgreen' => '#228B22',
+  'fuchsia' => '#FF00FF',
+  'gainsboro' => '#DCDCDC',
+  'ghostwhite' => '#F8F8FF',
+  'gold' => '#FFD700',
+  'goldenrod' => '#DAA520',
  'gray' => '#808080',
+  'grey' => '#808080',
+  'green' => '#008000',
+  'greenyellow' => '#ADFF2F',
+  'honeydew' => '#F0FFF0',
+  'hotpink' => '#FF69B4',
+  'indianred' => '#CD5C5C',
+  'indigo' => '#4B0082',
+  'ivory' => '#FFFFF0',
+  'khaki' => '#F0E68C',
+  'lavender' => '#E6E6FA',
+  'lavenderblush' => '#FFF0F5',
+  'lawngreen' => '#7CFC00',
+  'lemonchiffon' => '#FFFACD',
+  'lightblue' => '#ADD8E6',
+  'lightcoral' => '#F08080',
+  'lightcyan' => '#E0FFFF',
+  'lightgoldenrodyellow' => '#FAFAD2',
+  'lightgray' => '#D3D3D3',
+  'lightgrey' => '#D3D3D3',
+  'lightgreen' => '#90EE90',
+  'lightpink' => '#FFB6C1',
+  'lightsalmon' => '#FFA07A',
+  'lightseagreen' => '#20B2AA',
+  'lightskyblue' => '#87CEFA',
+  'lightslategray' => '#778899',
+  'lightslategrey' => '#778899',
+  'lightsteelblue' => '#B0C4DE',
+  'lightyellow' => '#FFFFE0',
+  'lime' => '#00FF00',
+  'limegreen' => '#32CD32',
+  'linen' => '#FAF0E6',
+  'magenta' => '#FF00FF',
+  'maroon' => '#800000',
+  'mediumaquamarine' => '#66CDAA',
+  'mediumblue' => '#0000CD',
+  'mediumorchid' => '#BA55D3',
+  'mediumpurple' => '#9370DB',
+  'mediumseagreen' => '#3CB371',
+  'mediumslateblue' => '#7B68EE',
+  'mediumspringgreen' => '#00FA9A',
+  'mediumturquoise' => '#48D1CC',
+  'mediumvioletred' => '#C71585',
+  'midnightblue' => '#191970',
+  'mintcream' => '#F5FFFA',
+  'mistyrose' => '#FFE4E1',
+  'moccasin' => '#FFE4B5',
+  'navajowhite' => '#FFDEAD',
+  'navy' => '#000080',
+  'oldlace' => '#FDF5E6',
+  'olive' => '#808000',
+  'olivedrab' => '#6B8E23',
+  'orange' => '#FFA500',
+  'orangered' => '#FF4500',
+  'orchid' => '#DA70D6',
+  'palegoldenrod' => '#EEE8AA',
+  'palegreen' => '#98FB98',
+  'paleturquoise' => '#AFEEEE',
+  'palevioletred' => '#DB7093',
+  'papayawhip' => '#FFEFD5',
+  'peachpuff' => '#FFDAB9',
+  'peru' => '#CD853F',
+  'pink' => '#FFC0CB',
+  'plum' => '#DDA0DD',
+  'powderblue' => '#B0E0E6',
+  'purple' => '#800080',
+  'rebeccapurple' => '#663399',
+  'red' => '#FF0000',
+  'rosybrown' => '#BC8F8F',
+  'royalblue' => '#4169E1',
+  'saddlebrown' => '#8B4513',
+  'salmon' => '#FA8072',
+  'sandybrown' => '#F4A460',
+  'seagreen' => '#2E8B57',
+  'seashell' => '#FFF5EE',
+  'sienna' => '#A0522D',
+  'silver' => '#C0C0C0',
+  'skyblue' => '#87CEEB',
+  'slateblue' => '#6A5ACD',
+  'slategray' => '#708090',
+  'slategrey' => '#708090',
+  'snow' => '#FFFAFA',
+  'springgreen' => '#00FF7F',
+  'steelblue' => '#4682B4',
+  'tan' => '#D2B48C',
+  'teal' => '#008080',
+  'thistle' => '#D8BFD8',
+  'tomato' => '#FF6347',
+  'turquoise' => '#40E0D0',
+  'violet' => '#EE82EE',
+  'wheat' => '#F5DEB3',
+  'white' => '#FFFFFF',
+  'whitesmoke' => '#F5F5F5',
+  'yellow' => '#FFFF00',
+  'yellowgreen' => '#9ACD32'
 )
 --DESCRIPTION--

@@ -159,7 +159,7 @@ class HTMLPurifier_Encoder

        $len = strlen($str);
        for ($i = 0; $i < $len; $i++) {
-            $in = ord($str{$i});
+            $in = ord($str[$i]);
            $char .= $str[$i]; // append byte to char
            if (0 == $mState) {
                // When mState is zero we expect either a US-ASCII character
@@ -118,7 +118,7 @@ class HTMLPurifier_EntityParser
        $entity = $matches[0];
        $hex_part = @$matches[1];
        $dec_part = @$matches[2];
-        $named_part = empty($matches[3]) ? @$matches[4] : $matches[3];
+        $named_part = empty($matches[3]) ? (empty($matches[4]) ? "" : $matches[4]) : $matches[3];
        if ($hex_part !== NULL && $hex_part !== "") {
            return HTMLPurifier_Encoder::unichr(hexdec($hex_part));
        } elseif ($dec_part !== NULL && $dec_part !== "") {
@@ -132,9 +132,9 @@ class HTMLPurifier_HTMLModule
     * @param string $element Name of element to add
     * @param string|bool $type What content set should element be registered to?
     *              Set as false to skip this step.
-     * @param string $contents Allowed children in form of:
+     * @param string|HTMLPurifier_ChildDef $contents Allowed children in form of:
     *              "$content_model_type: $content_model"
-     * @param array $attr_includes What attribute collections to register to
+     * @param array|string $attr_includes What attribute collections to register to
     *              element?
     * @param array $attr What unique attributes does the element define?
     * @see HTMLPurifier_ElementDef:: for in-depth descriptions of these parameters.
@@ -23,13 +23,13 @@ class HTMLPurifier_HTMLModule_SafeScripting extends HTMLPurifier_HTMLModule
        $script = $this->addElement(
            'script',
            'Inline',
-            'Empty',
+            'Optional:', // Not `Empty` to not allow to autoclose the <script /> tag @see https://www.w3.org/TR/html4/interact/scripts.html
            null,
            array(
                // While technically not required by the spec, we're forcing
                // it to this value.
                'type' => 'Enum#text/javascript',
-                'src*' => new HTMLPurifier_AttrDef_Enum(array_keys($allowed))
+                'src*' => new HTMLPurifier_AttrDef_Enum(array_keys($allowed), /*case sensitive*/ true)
            )
        );
        $script->attr_transform_pre[] =
@@ -8,4 +8,6 @@ $messages = array(
    'HTMLPurifier' => 'HTML Purifier X'
 );

+$errorNames = array();
+
 // vim: et sw=4 sts=4
@@ -9,4 +9,6 @@ $messages = array(
    'HTMLPurifier' => 'HTML Purifier XNone'
 );

+$errorNames = array();
+
 // vim: et sw=4 sts=4
@@ -68,8 +68,18 @@ class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
        $doc = new DOMDocument();
        $doc->encoding = 'UTF-8'; // theoretically, the above has this covered

+        $options = 0;
+        if ($config->get('Core.AllowParseManyTags') && defined('LIBXML_PARSEHUGE')) {
+            $options |= LIBXML_PARSEHUGE;
+        }
+
        set_error_handler(array($this, 'muteErrorHandler'));
-        $doc->loadHTML($html);
+        // loadHTML() fails on PHP 5.3 when second parameter is given
+        if ($options) {
+            $doc->loadHTML($html, $options);
+        } else {
+            $doc->loadHTML($html);
+        }
        restore_error_handler();

        $body = $doc->getElementsByTagName('html')->item(0)-> // <html>
@@ -133,11 +143,11 @@ class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
     */
    protected function getTagName($node)
    {
-        if (property_exists($node, 'tagName')) {
+        if (isset($node->tagName)) {
            return $node->tagName;
-        } else if (property_exists($node, 'nodeName')) {
+        } else if (isset($node->nodeName)) {
            return $node->nodeName;
-        } else if (property_exists($node, 'localName')) {
+        } else if (isset($node->localName)) {
            return $node->localName;
        }
        return null;
@@ -150,11 +160,11 @@ class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
     */
    protected function getData($node)
    {
-        if (property_exists($node, 'data')) {
+        if (isset($node->data)) {
            return $node->data;
-        } else if (property_exists($node, 'nodeValue')) {
+        } else if (isset($node->nodeValue)) {
            return $node->nodeValue;
-        } else if (property_exists($node, 'textContent')) {
+        } else if (isset($node->textContent)) {
            return $node->textContent;
        }
        return null;
@@ -48,7 +48,7 @@ class HTMLPurifier_Printer_ConfigForm extends HTMLPurifier_Printer
        $this->compress = $compress;
        // initialize sub-printers
        $this->fields[0] = new HTMLPurifier_Printer_ConfigForm_default();
-        $this->fields[HTMLPurifier_VarParser::BOOL] = new HTMLPurifier_Printer_ConfigForm_bool();
+        $this->fields[HTMLPurifier_VarParser::C_BOOL] = new HTMLPurifier_Printer_ConfigForm_bool();
    }

    /**
@@ -339,7 +339,7 @@ class HTMLPurifier_Printer_ConfigForm_default extends HTMLPurifier_Printer
                    $value = '';
            }
        }
-        if ($type === HTMLPurifier_VarParser::MIXED) {
+        if ($type === HTMLPurifier_VarParser::C_MIXED) {
            return 'Not supported';
            $value = serialize($value);
        }
@@ -75,7 +75,7 @@ class HTMLPurifier_TagTransform_Font extends HTMLPurifier_TagTransform
        if (isset($attr['size'])) {
            // normalize large numbers
            if ($attr['size'] !== '') {
-                if ($attr['size']{0} == '+' || $attr['size']{0} == '-') {
+                if ($attr['size'][0] == '+' || $attr['size'][0] == '-') {
                    $size = (int)$attr['size'];
                    if ($size < -2) {
                        $attr['size'] = '-2';
@@ -7,34 +7,34 @@
 class HTMLPurifier_VarParser
 {

-    const STRING = 1;
+    const C_STRING = 1;
    const ISTRING = 2;
    const TEXT = 3;
    const ITEXT = 4;
-    const INT = 5;
-    const FLOAT = 6;
-    const BOOL = 7;
+    const C_INT = 5;
+    const C_FLOAT = 6;
+    const C_BOOL = 7;
    const LOOKUP = 8;
    const ALIST = 9;
    const HASH = 10;
-    const MIXED = 11;
+    const C_MIXED = 11;

    /**
     * Lookup table of allowed types. Mainly for backwards compatibility, but
     * also convenient for transforming string type names to the integer constants.
     */
    public static $types = array(
-        'string' => self::STRING,
+        'string' => self::C_STRING,
        'istring' => self::ISTRING,
        'text' => self::TEXT,
        'itext' => self::ITEXT,
-        'int' => self::INT,
-        'float' => self::FLOAT,
-        'bool' => self::BOOL,
+        'int' => self::C_INT,
+        'float' => self::C_FLOAT,
+        'bool' => self::C_BOOL,
        'lookup' => self::LOOKUP,
        'list' => self::ALIST,
        'hash' => self::HASH,
-        'mixed' => self::MIXED
+        'mixed' => self::C_MIXED
    );

    /**
@@ -42,7 +42,7 @@ class HTMLPurifier_VarParser
     * allowed value lists.
     */
    public static $stringTypes = array(
-        self::STRING => true,
+        self::C_STRING => true,
        self::ISTRING => true,
        self::TEXT => true,
        self::ITEXT => true,
@@ -74,7 +74,7 @@ class HTMLPurifier_VarParser
        // These are basic checks, to make sure nothing horribly wrong
        // happened in our implementations.
        switch ($type) {
-            case (self::STRING):
+            case (self::C_STRING):
            case (self::ISTRING):
            case (self::TEXT):
            case (self::ITEXT):
@@ -85,17 +85,17 @@ class HTMLPurifier_VarParser
                    $var = strtolower($var);
                }
                return $var;
-            case (self::INT):
+            case (self::C_INT):
                if (!is_int($var)) {
                    break;
                }
                return $var;
-            case (self::FLOAT):
+            case (self::C_FLOAT):
                if (!is_float($var)) {
                    break;
                }
                return $var;
-            case (self::BOOL):
+            case (self::C_BOOL):
                if (!is_bool($var)) {
                    break;
                }
@@ -119,7 +119,7 @@ class HTMLPurifier_VarParser
                    }
                }
                return $var;
-            case (self::MIXED):
+            case (self::C_MIXED):
                return $var;
            default:
                $this->errorInconsistent(get_class($this), $type);
@@ -23,23 +23,23 @@ class HTMLPurifier_VarParser_Flexible extends HTMLPurifier_VarParser
            // Note: if code "breaks" from the switch, it triggers a generic
            // exception to be thrown. Specific errors can be specifically
            // done here.
-            case self::MIXED:
+            case self::C_MIXED:
            case self::ISTRING:
-            case self::STRING:
+            case self::C_STRING:
            case self::TEXT:
            case self::ITEXT:
                return $var;
-            case self::INT:
+            case self::C_INT:
                if (is_string($var) && ctype_digit($var)) {
                    $var = (int)$var;
                }
                return $var;
-            case self::FLOAT:
+            case self::C_FLOAT:
                if ((is_string($var) && is_numeric($var)) || is_int($var)) {
                    $var = (float)$var;
                }
                return $var;
-            case self::BOOL:
+            case self::C_BOOL:
                if (is_int($var) && ($var === 0 || $var === 1)) {
                    $var = (bool)$var;
                } elseif (is_string($var)) {
@@ -1 +1,7 @@
-Deny from all
+<IfModule mod_authz_core.c>
+    Require all denied
+</IfModule>
+
+<IfModule !mod_authz_core.c>
+    Deny from all
+</ifModule>
@@ -1,30 +0,0 @@
-#!/usr/bin/php
-<?php
-
-chdir(dirname(__FILE__));
-require_once 'common.php';
-assertCli();
-
-/**
- * @file
- * Runs all generation/flush cache scripts to ensure that somewhat volatile
- * generated files are up-to-date.
- */
-
-function e($cmd)
-{
-    echo "\$ $cmd\n";
-    passthru($cmd, $status);
-    echo "\n";
-    if ($status) exit($status);
-}
-
-$php = empty($_SERVER['argv'][1]) ? 'php' : $_SERVER['argv'][1];
-
-e($php . ' generate-includes.php');
-e($php . ' generate-schema-cache.php');
-e($php . ' flush-definition-cache.php');
-e($php . ' generate-standalone.php');
-e($php . ' config-scanner.php');
-
-// vim: et sw=4 sts=4
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -ex
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+php "$DIR/generate-includes.php"
+php "$DIR/generate-schema-cache.php"
+php "$DIR/flush-definition-cache.php"
+php "$DIR/generate-standalone.php"
+php "$DIR/config-scanner.php"
@@ -1,34 +0,0 @@
-#!/usr/bin/php
-<?php
-
-chdir(dirname(__FILE__));
-require_once 'common.php';
-assertCli();
-
-/**
- * @file
- * Converts all instances of $config->set and $config->get to the new
- * format, as described by docs/dev-config-bcbreaks.txt
- */
-
-$FS = new FSTools();
-chdir(dirname(__FILE__) . '/..');
-$raw_files = $FS->globr('.', '*.php');
-foreach ($raw_files as $file) {
-    $file = substr($file, 2); // rm leading './'
-    if (strpos($file, 'library/standalone/') === 0) continue;
-    if (strpos($file, 'maintenance/update-config.php') === 0) continue;
-    if (strpos($file, 'test-settings.php') === 0) continue;
-    if (substr_count($file, '.') > 1) continue; // rm meta files
-    // process the file
-    $contents = file_get_contents($file);
-    $contents = preg_replace(
-        "#config->(set|get)\('(.+?)', '(.+?)'#",
-        "config->\\1('\\2.\\3'",
-        $contents
-    );
-    if ($contents === '') continue;
-    file_put_contents($file, $contents);
-}
-
-// vim: et sw=4 sts=4
@@ -53,5 +53,6 @@ $config->set('Core.Encoding', $GLOBALS['PHORUM']['DATA']['CHARSET']); // we'll c
 if (strtolower($GLOBALS['PHORUM']['DATA']['CHARSET']) !== 'utf-8') {
  $config->set('Core.EscapeNonASCIICharacters', true);
 }
+$config->set('Core.AllowParseManyTags', false);

 // vim: et sw=4 sts=4
@@ -1,22 +0,0 @@
-<?php
-
-// Tags releases
-
-if (php_sapi_name() != 'cli') {
-    echo 'Release script cannot be called from web-browser.';
-    exit;
-}
-
-require 'svn.php';
-
-$svn_info = my_svn_info('.');
-
-$version = trim(file_get_contents('VERSION'));
-
-$trunk_url  = $svn_info['Repository Root'] . '/htmlpurifier/trunk';
-$trunk_tag_url  = $svn_info['Repository Root'] . '/htmlpurifier/tags/' . $version;
-
-echo "Tagging trunk to tags/$version...";
-passthru("svn copy --message \"Tag $version release.\" $trunk_url $trunk_tag_url");
-
-// vim: et sw=4 sts=4
@@ -102,7 +102,7 @@ if (!$c) {
 }
 file_put_contents('library/HTMLPurifier/Config.php', $config_c);

-passthru('php maintenance/flush.php');
+passthru('maintenance/flush.sh');

 if ($is_dev) echo "Review changes, write something in WHATSNEW and FOCUS, and then commit with log 'Release $version.'" . PHP_EOL;
 else echo "Numbers updated to dev, no other modifications necessary!";
@@ -0,0 +1,23 @@
+<?php
+
+$config = PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@PSR2' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'declare_strict_types' => false,
+        'concat_space' => ['spacing'=>'one'],
+        'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
+        'ordered_imports' => true,
+        // 'phpdoc_align' => ['align'=>'vertical'],
+        // 'native_function_invocation' => true,
+    ])
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in(__DIR__.'/src')
+            ->in(__DIR__.'/tests')
+            ->name('*.php')
+    )
+;
+
+return $config;
@@ -1,5 +1,40 @@
 # Change Log

+## 6.5.2 - 2019-12-23
+
+* idn_to_ascii() fix for old PHP versions [#2489](https://github.com/guzzle/guzzle/pull/2489)
+
+## 6.5.1 - 2019-12-21
+
+* Better defaults for PHP installations with old ICU lib [#2454](https://github.com/guzzle/guzzle/pull/2454)
+* IDN support for redirects [#2424](https://github.com/guzzle/guzzle/pull/2424)
+
+## 6.5.0 - 2019-12-07
+
+* Improvement: Added support for reset internal queue in MockHandler. [#2143](https://github.com/guzzle/guzzle/pull/2143)
+* Improvement: Added support to pass arbitrary options to `curl_multi_init`. [#2287](https://github.com/guzzle/guzzle/pull/2287)
+* Fix: Gracefully handle passing `null` to the `header` option. [#2132](https://github.com/guzzle/guzzle/pull/2132)
+* Fix: `RetryMiddleware` did not do exponential delay between retires due unit mismatch. [#2132](https://github.com/guzzle/guzzle/pull/2132)
+* Fix: Prevent undefined offset when using array for ssl_key options. [#2348](https://github.com/guzzle/guzzle/pull/2348)
+* Deprecated `ClientInterface::VERSION`
+
+## 6.4.1 - 2019-10-23
+
+* No `guzzle.phar` was created in 6.4.0 due expired API token. This release will fix that 
+* Added `parent::__construct()` to `FileCookieJar` and `SessionCookieJar`
+
+## 6.4.0 - 2019-10-23
+
+* Improvement: Improved error messages when using curl < 7.21.2 [#2108](https://github.com/guzzle/guzzle/pull/2108)
+* Fix: Test if response is readable before returning a summary in `RequestException::getResponseBodySummary()` [#2081](https://github.com/guzzle/guzzle/pull/2081)
+* Fix: Add support for GUZZLE_CURL_SELECT_TIMEOUT environment variable [#2161](https://github.com/guzzle/guzzle/pull/2161)
+* Improvement: Added `GuzzleHttp\Exception\InvalidArgumentException` [#2163](https://github.com/guzzle/guzzle/pull/2163)
+* Improvement: Added `GuzzleHttp\_current_time()` to use `hrtime()` if that function exists. [#2242](https://github.com/guzzle/guzzle/pull/2242)
+* Improvement: Added curl's `appconnect_time` in `TransferStats` [#2284](https://github.com/guzzle/guzzle/pull/2284)
+* Improvement: Make GuzzleException extend Throwable wherever it's available [#2273](https://github.com/guzzle/guzzle/pull/2273)
+* Fix: Prevent concurrent writes to file when saving `CookieJar` [#2335](https://github.com/guzzle/guzzle/pull/2335)
+* Improvement: Update `MockHandler` so we can test transfer time [#2362](https://github.com/guzzle/guzzle/pull/2362)
+
 ## 6.3.3 - 2018-04-22

 * Fix: Default headers when decode_content is specified
@@ -0,0 +1,18 @@
+FROM composer:latest as setup
+
+RUN mkdir /guzzle
+
+WORKDIR /guzzle
+
+RUN set -xe \
+    && composer init --name=guzzlehttp/test --description="Simple project for testing Guzzle scripts" --author="Márk Sági-Kazár <mark.sagikazar@gmail.com>" --no-interaction \
+    && composer require guzzlehttp/guzzle
+
+
+FROM php:7.3
+
+RUN mkdir /guzzle
+
+WORKDIR /guzzle
+
+COPY --from=setup /guzzle /guzzle
@@ -21,19 +21,18 @@ trivial to integrate with web services.

 ```php
 $client = new \GuzzleHttp\Client();
-$res = $client->request('GET', 'https://api.github.com/repos/guzzle/guzzle');
-echo $res->getStatusCode();
-// 200
-echo $res->getHeaderLine('content-type');
-// 'application/json; charset=utf8'
-echo $res->getBody();
-// '{"id": 1420053, "name": "guzzle", ...}'
+$response = $client->request('GET', 'https://api.github.com/repos/guzzle/guzzle');

-// Send an asynchronous request.
+echo $response->getStatusCode(); # 200
+echo $response->getHeaderLine('content-type'); # 'application/json; charset=utf8'
+echo $response->getBody(); # '{"id": 1420053, "name": "guzzle", ...}'
+
+# Send an asynchronous request.
 $request = new \GuzzleHttp\Psr7\Request('GET', 'http://httpbin.org');
 $promise = $client->sendAsync($request)->then(function ($response) {
    echo 'I completed! ' . $response->getBody();
 });
+
 $promise->wait();
 ```

@@ -57,7 +56,7 @@ curl -sS https://getcomposer.org/installer | php
 Next, run the Composer command to install the latest stable version of Guzzle:

 ```bash
-php composer.phar require guzzlehttp/guzzle
+composer require guzzlehttp/guzzle
 ```

 After installing, you need to require Composer's autoloader:
@@ -69,7 +68,7 @@ require 'vendor/autoload.php';
 You can then later update Guzzle using composer:

 ```bash
-composer.phar update
+composer update
 ```


@@ -79,13 +78,13 @@ composer.phar update
 |---------|------------|---------------------|--------------|---------------------|---------------------|-------|-------------|
 | 3.x     | EOL        | `guzzle/guzzle`     | `Guzzle`     | [v3][guzzle-3-repo] | [v3][guzzle-3-docs] | No    | >= 5.3.3    |
 | 4.x     | EOL        | `guzzlehttp/guzzle` | `GuzzleHttp` | [v4][guzzle-4-repo] | N/A                 | No    | >= 5.4      |
-| 5.x     | Maintained | `guzzlehttp/guzzle` | `GuzzleHttp` | [v5][guzzle-5-repo] | [v5][guzzle-5-docs] | No    | >= 5.4      |
+| 5.x     | EOL        | `guzzlehttp/guzzle` | `GuzzleHttp` | [v5][guzzle-5-repo] | [v5][guzzle-5-docs] | No    | >= 5.4      |
 | 6.x     | Latest     | `guzzlehttp/guzzle` | `GuzzleHttp` | [v6][guzzle-6-repo] | [v6][guzzle-6-docs] | Yes   | >= 5.5      |

 [guzzle-3-repo]: https://github.com/guzzle/guzzle3
 [guzzle-4-repo]: https://github.com/guzzle/guzzle/tree/4.x
 [guzzle-5-repo]: https://github.com/guzzle/guzzle/tree/5.3
 [guzzle-6-repo]: https://github.com/guzzle/guzzle
-[guzzle-3-docs]: http://guzzle3.readthedocs.org/en/latest/
+[guzzle-3-docs]: http://guzzle3.readthedocs.org
 [guzzle-5-docs]: http://guzzle.readthedocs.org/en/5.3/
 [guzzle-6-docs]: http://guzzle.readthedocs.org/en/latest/
@@ -2,7 +2,15 @@
    "name": "guzzlehttp/guzzle",
    "type": "library",
    "description": "Guzzle is a PHP HTTP client library",
-    "keywords": ["framework", "http", "rest", "web service", "curl", "client", "HTTP client"],
+    "keywords": [
+        "framework",
+        "http",
+        "rest",
+        "web service",
+        "curl",
+        "client",
+        "HTTP client"
+    ],
    "homepage": "http://guzzlephp.org/",
    "license": "MIT",
    "authors": [
@@ -14,31 +22,38 @@
    ],
    "require": {
        "php": ">=5.5",
-        "guzzlehttp/psr7": "^1.4",
-        "guzzlehttp/promises": "^1.0"
+        "ext-json": "*",
+        "guzzlehttp/promises": "^1.0",
+        "guzzlehttp/psr7": "^1.6.1"
    },
    "require-dev": {
        "ext-curl": "*",
        "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
-        "psr/log": "^1.0"
+        "psr/log": "^1.1"
+    },
+    "suggest": {
+        "psr/log": "Required for using the Log middleware",
+        "ext-intl": "Required for Internationalized Domain Name (IDN) support"
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "6.5-dev"
+        }
    },
    "autoload": {
-        "files": ["src/functions_include.php"],
        "psr-4": {
            "GuzzleHttp\\": "src/"
-        }
+        },
+        "files": [
+            "src/functions_include.php"
+        ]
    },
    "autoload-dev": {
        "psr-4": {
            "GuzzleHttp\\Tests\\": "tests/"
        }
-    },
-    "suggest": {
-        "psr/log": "Required for using the Log middleware"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "6.3-dev"
-        }
    }
 }
@@ -2,11 +2,12 @@
 namespace GuzzleHttp;

 use GuzzleHttp\Cookie\CookieJar;
+use GuzzleHttp\Exception\InvalidArgumentException;
 use GuzzleHttp\Promise;
 use GuzzleHttp\Psr7;
-use Psr\Http\Message\UriInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\UriInterface;

 /**
 * @method ResponseInterface get(string|UriInterface $uri, array $options = [])
@@ -75,6 +76,12 @@ class Client implements ClientInterface
        $this->configureDefaults($config);
    }

+    /**
+     * @param string $method
+     * @param array  $args
+     *
+     * @return Promise\PromiseInterface
+     */
    public function __call($method, $args)
    {
        if (count($args) < 1) {
@@ -89,6 +96,14 @@ class Client implements ClientInterface
            : $this->request($method, $uri, $opts);
    }

+    /**
+     * Asynchronously send an HTTP request.
+     *
+     * @param array $options Request options to apply to the given
+     *                       request and to the transfer. See \GuzzleHttp\RequestOptions.
+     *
+     * @return Promise\PromiseInterface
+     */
    public function sendAsync(RequestInterface $request, array $options = [])
    {
        // Merge the base URI into the request URI if needed.
@@ -100,12 +115,35 @@ class Client implements ClientInterface
        );
    }

+    /**
+     * Send an HTTP request.
+     *
+     * @param array $options Request options to apply to the given
+     *                       request and to the transfer. See \GuzzleHttp\RequestOptions.
+     *
+     * @return ResponseInterface
+     * @throws GuzzleException
+     */
    public function send(RequestInterface $request, array $options = [])
    {
        $options[RequestOptions::SYNCHRONOUS] = true;
        return $this->sendAsync($request, $options)->wait();
    }

+    /**
+     * Create and send an asynchronous HTTP request.
+     *
+     * Use an absolute path to override the base path of the client, or a
+     * relative path to append to the base path of the client. The URL can
+     * contain the query string as well. Use an array to provide a URL
+     * template and additional variables to use in the URL template expansion.
+     *
+     * @param string              $method  HTTP method
+     * @param string|UriInterface $uri     URI object or string.
+     * @param array               $options Request options to apply. See \GuzzleHttp\RequestOptions.
+     *
+     * @return Promise\PromiseInterface
+     */
    public function requestAsync($method, $uri = '', array $options = [])
    {
        $options = $this->prepareDefaults($options);
@@ -125,12 +163,37 @@ class Client implements ClientInterface
        return $this->transfer($request, $options);
    }

+    /**
+     * Create and send an HTTP request.
+     *
+     * Use an absolute path to override the base path of the client, or a
+     * relative path to append to the base path of the client. The URL can
+     * contain the query string as well.
+     *
+     * @param string              $method  HTTP method.
+     * @param string|UriInterface $uri     URI object or string.
+     * @param array               $options Request options to apply. See \GuzzleHttp\RequestOptions.
+     *
+     * @return ResponseInterface
+     * @throws GuzzleException
+     */
    public function request($method, $uri = '', array $options = [])
    {
        $options[RequestOptions::SYNCHRONOUS] = true;
        return $this->requestAsync($method, $uri, $options)->wait();
    }

+    /**
+     * Get a client configuration option.
+     *
+     * These options include default request options of the client, a "handler"
+     * (if utilized by the concrete client), and a "base_uri" if utilized by
+     * the concrete client.
+     *
+     * @param string|null $option The config option to retrieve.
+     *
+     * @return mixed
+     */
    public function getConfig($option = null)
    {
        return $option === null
@@ -138,6 +201,11 @@ class Client implements ClientInterface
            : (isset($this->config[$option]) ? $this->config[$option] : null);
    }

+    /**
+     * @param  string|null $uri
+     *
+     * @return UriInterface
+     */
    private function buildUri($uri, array $config)
    {
        // for BC we accept null which would otherwise fail in uri_for
@@ -147,6 +215,11 @@ class Client implements ClientInterface
            $uri = Psr7\UriResolver::resolve(Psr7\uri_for($config['base_uri']), $uri);
        }

+        if (isset($config['idn_conversion']) && ($config['idn_conversion'] !== false)) {
+            $idnOptions = ($config['idn_conversion'] === true) ? IDNA_DEFAULT : $config['idn_conversion'];
+            $uri = _idn_uri_convert($uri, $idnOptions);
+        }
+
        return $uri->getScheme() === '' && $uri->getHost() !== '' ? $uri->withScheme('http') : $uri;
    }

@@ -154,6 +227,7 @@ class Client implements ClientInterface
     * Configures the default options for a client.
     *
     * @param array $config
+     * @return void
     */
    private function configureDefaults(array $config)
    {
@@ -165,12 +239,22 @@ class Client implements ClientInterface
            'cookies'         => false
        ];

+        // idn_to_ascii() is a part of ext-intl and might be not available
+        $defaults['idn_conversion'] = function_exists('idn_to_ascii')
+            // Old ICU versions don't have this constant, so we are basically stuck (see https://github.com/guzzle/guzzle/pull/2424
+            // and https://github.com/guzzle/guzzle/issues/2448 for details)
+            && (
+                defined('INTL_IDNA_VARIANT_UTS46')
+                ||
+                PHP_VERSION_ID < 70200
+            );
+
        // Use the standard Linux HTTP_PROXY and HTTPS_PROXY if set.

        // We can only trust the HTTP_PROXY environment variable in a CLI
        // process due to the fact that PHP has no reliable mechanism to
        // get environment variables that start with "HTTP_".
-        if (php_sapi_name() == 'cli' && getenv('HTTP_PROXY')) {
+        if (php_sapi_name() === 'cli' && getenv('HTTP_PROXY')) {
            $defaults['proxy']['http'] = getenv('HTTP_PROXY');
        }

@@ -210,7 +294,7 @@ class Client implements ClientInterface
     *
     * @return array
     */
-    private function prepareDefaults($options)
+    private function prepareDefaults(array $options)
    {
        $defaults = $this->config;

@@ -225,7 +309,7 @@ class Client implements ClientInterface
        if (array_key_exists('headers', $options)) {
            // Allows default headers to be unset.
            if ($options['headers'] === null) {
-                $defaults['_conditional'] = null;
+                $defaults['_conditional'] = [];
                unset($options['headers']);
            } elseif (!is_array($options['headers'])) {
                throw new \InvalidArgumentException('headers must be an array');
@@ -251,8 +335,7 @@ class Client implements ClientInterface
     * The URI of the request is not modified and the request options are used
     * as-is without merging in default options.
     *
-     * @param RequestInterface $request
-     * @param array            $options
+     * @param array $options See \GuzzleHttp\RequestOptions.
     *
     * @return Promise\PromiseInterface
     */
@@ -271,6 +354,7 @@ class Client implements ClientInterface
        }

        $request = $this->applyOptions($request, $options);
+        /** @var HandlerStack $handler */
        $handler = $options['handler'];

        try {
@@ -411,6 +495,11 @@ class Client implements ClientInterface
        return $request;
    }

+    /**
+     * Throw Exception with pre-set message.
+     * @return void
+     * @throws InvalidArgumentException Invalid body.
+     */
    private function invalidBody()
    {
        throw new \InvalidArgumentException('Passing in the "body" request '
@@ -1,8 +1,8 @@
 <?php
 namespace GuzzleHttp;

-use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Promise\PromiseInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\UriInterface;
@@ -12,7 +12,10 @@ use Psr\Http\Message\UriInterface;
 */
 interface ClientInterface
 {
-    const VERSION = '6.3.3';
+    /**
+     * @deprecated Will be removed in Guzzle 7.0.0
+     */
+    const VERSION = '6.5.1';

    /**
     * Send an HTTP request.
@@ -94,8 +94,8 @@ class CookieJar implements CookieJarInterface
     */
    public function getCookieByName($name)
    {
-        // don't allow a null name
-        if ($name === null) {
+        // don't allow a non string name
+        if ($name === null || !is_scalar($name)) {
            return null;
        }
        foreach ($this->cookies as $cookie) {
@@ -103,6 +103,8 @@ class CookieJar implements CookieJarInterface
                return $cookie;
            }
        }
+
+        return null;
    }

    public function toArray()
@@ -120,7 +122,7 @@ class CookieJar implements CookieJarInterface
        } elseif (!$path) {
            $this->cookies = array_filter(
                $this->cookies,
-                function (SetCookie $cookie) use ($path, $domain) {
+                function (SetCookie $cookie) use ($domain) {
                    return !$cookie->matchesDomain($domain);
                }
            );
@@ -58,9 +58,9 @@ interface CookieJarInterface extends \Countable, \IteratorAggregate
     * arguments, then the cookie with the specified name, path and domain is
     * removed.
     *
-     * @param string $domain Clears cookies matching a domain
-     * @param string $path   Clears cookies matching a domain and path
-     * @param string $name   Clears cookies matching a domain, path, and name
+     * @param string|null $domain Clears cookies matching a domain
+     * @param string|null $path   Clears cookies matching a domain and path
+     * @param string|null $name   Clears cookies matching a domain, path, and name
     *
     * @return CookieJarInterface
     */
@@ -23,6 +23,7 @@ class FileCookieJar extends CookieJar
     */
    public function __construct($cookieFile, $storeSessionCookies = false)
    {
+        parent::__construct();
        $this->filename = $cookieFile;
        $this->storeSessionCookies = $storeSessionCookies;

@@ -56,7 +57,7 @@ class FileCookieJar extends CookieJar
        }

        $jsonStr = \GuzzleHttp\json_encode($json);
-        if (false === file_put_contents($filename, $jsonStr)) {
+        if (false === file_put_contents($filename, $jsonStr, LOCK_EX)) {
            throw new \RuntimeException("Unable to save file {$filename}");
        }
    }
@@ -22,6 +22,7 @@ class SessionCookieJar extends CookieJar
     */
    public function __construct($sessionKey, $storeSessionCookies = false)
    {
+        parent::__construct();
        $this->sessionKey = $sessionKey;
        $this->storeSessionCookies = $storeSessionCookies;
        $this->load();
@@ -227,7 +227,7 @@ class SetCookie
    /**
     * Get whether or not this is a secure cookie
     *
-     * @return null|bool
+     * @return bool|null
     */
    public function getSecure()
    {
@@ -247,7 +247,7 @@ class SetCookie
    /**
     * Get whether or not this is a session cookie
     *
-     * @return null|bool
+     * @return bool|null
     */
    public function getDiscard()
    {
@@ -4,4 +4,6 @@ namespace GuzzleHttp\Exception;
 /**
 * Exception when a client error is encountered (4xx codes)
 */
-class ClientException extends BadResponseException {}
+class ClientException extends BadResponseException
+{
+}
@@ -1,13 +1,23 @@
 <?php
 namespace GuzzleHttp\Exception;

-/**
- * @method string getMessage()
- * @method \Throwable|null getPrevious()
- * @method mixed getCode()
- * @method string getFile()
- * @method int getLine()
- * @method array getTrace()
- * @method string getTraceAsString()
- */
-interface GuzzleException {}
+use Throwable;
+
+if (interface_exists(Throwable::class)) {
+    interface GuzzleException extends Throwable
+    {
+    }
+} else {
+    /**
+     * @method string getMessage()
+     * @method \Throwable|null getPrevious()
+     * @method mixed getCode()
+     * @method string getFile()
+     * @method int getLine()
+     * @method array getTrace()
+     * @method string getTraceAsString()
+     */
+    interface GuzzleException
+    {
+    }
+}
@@ -0,0 +1,7 @@
+<?php
+
+namespace GuzzleHttp\Exception;
+
+final class InvalidArgumentException extends \InvalidArgumentException implements GuzzleException
+{
+}
@@ -1,9 +1,9 @@
 <?php
 namespace GuzzleHttp\Exception;

+use GuzzleHttp\Promise\PromiseInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
-use GuzzleHttp\Promise\PromiseInterface;
 use Psr\Http\Message\UriInterface;

 /**
@@ -14,7 +14,7 @@ class RequestException extends TransferException
    /** @var RequestInterface */
    private $request;

-    /** @var ResponseInterface */
+    /** @var ResponseInterface|null */
    private $response;

    /** @var array */
@@ -124,42 +124,17 @@ class RequestException extends TransferException
     */
    public static function getResponseBodySummary(ResponseInterface $response)
    {
-        $body = $response->getBody();
-
-        if (!$body->isSeekable()) {
-            return null;
-        }
-
-        $size = $body->getSize();
-
-        if ($size === 0) {
-            return null;
-        }
-
-        $summary = $body->read(120);
-        $body->rewind();
-
-        if ($size > 120) {
-            $summary .= ' (truncated...)';
-        }
-
-        // Matches any printable character, including unicode characters:
-        // letters, marks, numbers, punctuation, spacing, and separators.
-        if (preg_match('/[^\pL\pM\pN\pP\pS\pZ\n\r\t]/', $summary)) {
-            return null;
-        }
-
-        return $summary;
+        return \GuzzleHttp\Psr7\get_message_body_summary($response);
    }

    /**
-     * Obfuscates URI if there is an username and a password present
+     * Obfuscates URI if there is a username and a password present
     *
     * @param UriInterface $uri
     *
     * @return UriInterface
     */
-    private static function obfuscateUri($uri)
+    private static function obfuscateUri(UriInterface $uri)
    {
        $userInfo = $uri->getUserInfo();

@@ -4,4 +4,6 @@ namespace GuzzleHttp\Exception;
 /**
 * Exception when a server error is encountered (5xx codes)
 */
-class ServerException extends BadResponseException {}
+class ServerException extends BadResponseException
+{
+}
@@ -1,4 +1,6 @@
 <?php
 namespace GuzzleHttp\Exception;

-class TooManyRedirectsException extends RequestException {}
+class TooManyRedirectsException extends RequestException
+{
+}
@@ -1,4 +1,6 @@
 <?php
 namespace GuzzleHttp\Exception;

-class TransferException extends \RuntimeException implements GuzzleException {}
+class TransferException extends \RuntimeException implements GuzzleException
+{
+}
@@ -1,8 +1,8 @@
 <?php
 namespace GuzzleHttp\Handler;

-use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Exception\ConnectException;
+use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Promise\FulfilledPromise;
 use GuzzleHttp\Psr7;
 use GuzzleHttp\Psr7\LazyOpenStream;
@@ -14,6 +14,9 @@ use Psr\Http\Message\RequestInterface;
 */
 class CurlFactory implements CurlFactoryInterface
 {
+    const CURL_VERSION_STR = 'curl_version';
+    const LOW_CURL_VERSION_NUMBER = '7.21.2';
+
    /** @var array */
    private $handles = [];

@@ -117,6 +120,7 @@ class CurlFactory implements CurlFactoryInterface
    private static function invokeStats(EasyHandle $easy)
    {
        $curlStats = curl_getinfo($easy->handle);
+        $curlStats['appconnect_time'] = curl_getinfo($easy->handle, CURLINFO_APPCONNECT_TIME);
        $stats = new TransferStats(
            $easy->request,
            $easy->response,
@@ -136,7 +140,9 @@ class CurlFactory implements CurlFactoryInterface
        $ctx = [
            'errno' => $easy->errno,
            'error' => curl_error($easy->handle),
+            'appconnect_time' => curl_getinfo($easy->handle, CURLINFO_APPCONNECT_TIME),
        ] + curl_getinfo($easy->handle);
+        $ctx[self::CURL_VERSION_STR] = curl_version()['version'];
        $factory->release($easy);

        // Retry when nothing is present or when curl failed to rewind.
@@ -172,13 +178,22 @@ class CurlFactory implements CurlFactoryInterface
                )
            );
        }
-
-        $message = sprintf(
-            'cURL error %s: %s (%s)',
-            $ctx['errno'],
-            $ctx['error'],
-            'see http://curl.haxx.se/libcurl/c/libcurl-errors.html'
-        );
+        if (version_compare($ctx[self::CURL_VERSION_STR], self::LOW_CURL_VERSION_NUMBER)) {
+            $message = sprintf(
+                'cURL error %s: %s (%s)',
+                $ctx['errno'],
+                $ctx['error'],
+                'see https://curl.haxx.se/libcurl/c/libcurl-errors.html'
+            );
+        } else {
+            $message = sprintf(
+                'cURL error %s: %s (%s) for %s',
+                $ctx['errno'],
+                $ctx['error'],
+                'see https://curl.haxx.se/libcurl/c/libcurl-errors.html',
+                $easy->request->getUri()
+            );
+        }

        // Create a connection exception if it was a specific error code.
        $error = isset($connectionErrors[$easy->errno])
@@ -439,11 +454,16 @@ class CurlFactory implements CurlFactoryInterface
        }

        if (isset($options['ssl_key'])) {
-            $sslKey = $options['ssl_key'];
-            if (is_array($sslKey)) {
-                $conf[CURLOPT_SSLKEYPASSWD] = $sslKey[1];
-                $sslKey = $sslKey[0];
+            if (is_array($options['ssl_key'])) {
+                if (count($options['ssl_key']) === 2) {
+                    list($sslKey, $conf[CURLOPT_SSLKEYPASSWD]) = $options['ssl_key'];
+                } else {
+                    list($sslKey) = $options['ssl_key'];
+                }
            }
+
+            $sslKey = isset($sslKey) ? $sslKey: $options['ssl_key'];
+
            if (!file_exists($sslKey)) {
                throw new \InvalidArgumentException(
                    "SSL private key not found: {$sslKey}"
@@ -1,9 +1,9 @@
 <?php
 namespace GuzzleHttp\Handler;

+use GuzzleHttp\Exception\InvalidArgumentException;
 use GuzzleHttp\Promise as P;
 use GuzzleHttp\Promise\Promise;
-use GuzzleHttp\Psr7;
 use Psr\Http\Message\RequestInterface;

 /**
@@ -23,6 +23,7 @@ class CurlMultiHandler
    private $active;
    private $handles = [];
    private $delays = [];
+    private $options = [];

    /**
     * This handler accepts the following options:
@@ -30,6 +31,8 @@ class CurlMultiHandler
     * - handle_factory: An optional factory  used to create curl handles
     * - select_timeout: Optional timeout (in seconds) to block before timing
     *   out while selecting curl handles. Defaults to 1 second.
+     * - options: An associative array of CURLMOPT_* options and
+     *   corresponding values for curl_multi_setopt()
     *
     * @param array $options
     */
@@ -37,14 +40,31 @@ class CurlMultiHandler
    {
        $this->factory = isset($options['handle_factory'])
            ? $options['handle_factory'] : new CurlFactory(50);
-        $this->selectTimeout = isset($options['select_timeout'])
-            ? $options['select_timeout'] : 1;
+
+        if (isset($options['select_timeout'])) {
+            $this->selectTimeout = $options['select_timeout'];
+        } elseif ($selectTimeout = getenv('GUZZLE_CURL_SELECT_TIMEOUT')) {
+            $this->selectTimeout = $selectTimeout;
+        } else {
+            $this->selectTimeout = 1;
+        }
+
+        $this->options = isset($options['options']) ? $options['options'] : [];
    }

    public function __get($name)
    {
        if ($name === '_mh') {
-            return $this->_mh = curl_multi_init();
+            $this->_mh = curl_multi_init();
+
+            foreach ($this->options as $option => $value) {
+                // A warning is raised in case of a wrong option.
+                curl_multi_setopt($this->_mh, $option, $value);
+            }
+
+            // Further calls to _mh will return the value directly, without entering the
+            // __get() method at all.
+            return $this->_mh;
        }

        throw new \BadMethodCallException();
@@ -82,7 +102,7 @@ class CurlMultiHandler
    {
        // Add any delayed handles if needed.
        if ($this->delays) {
-            $currentTime = microtime(true);
+            $currentTime = \GuzzleHttp\_current_time();
            foreach ($this->delays as $id => $delay) {
                if ($currentTime >= $delay) {
                    unset($this->delays[$id]);
@@ -134,7 +154,7 @@ class CurlMultiHandler
        if (empty($easy->options['delay'])) {
            curl_multi_add_handle($this->_mh, $easy->handle);
        } else {
-            $this->delays[$id] = microtime(true) + ($easy->options['delay'] / 1000);
+            $this->delays[$id] = \GuzzleHttp\_current_time() + ($easy->options['delay'] / 1000);
        }
    }

@@ -186,7 +206,7 @@ class CurlMultiHandler

    private function timeToNext()
    {
-        $currentTime = microtime(true);
+        $currentTime = \GuzzleHttp\_current_time();
        $nextTime = PHP_INT_MAX;
        foreach ($this->delays as $time) {
            if ($time < $nextTime) {
@@ -66,7 +66,7 @@ class MockHandler implements \Countable
            throw new \OutOfBoundsException('Mock queue is empty');
        }

-        if (isset($options['delay'])) {
+        if (isset($options['delay']) && is_numeric($options['delay'])) {
            usleep($options['delay'] * 1000);
        }

@@ -175,6 +175,11 @@ class MockHandler implements \Countable
        return count($this->queue);
    }

+    public function reset()
+    {
+        $this->queue = [];
+    }
+
    private function invokeStats(
        RequestInterface $request,
        array $options,
@@ -182,7 +187,8 @@ class MockHandler implements \Countable
        $reason = null
    ) {
        if (isset($options['on_stats'])) {
-            $stats = new TransferStats($request, $response, 0, $reason);
+            $transferTime = isset($options['transfer_time']) ? $options['transfer_time'] : 0;
+            $stats = new TransferStats($request, $response, $transferTime, $reason);
            call_user_func($options['on_stats'], $stats);
        }
    }
@@ -1,8 +1,8 @@
 <?php
 namespace GuzzleHttp\Handler;

-use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Exception\ConnectException;
+use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Promise\FulfilledPromise;
 use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\Psr7;
@@ -33,7 +33,7 @@ class StreamHandler
            usleep($options['delay'] * 1000);
        }

-        $startTime = isset($options['on_stats']) ? microtime(true) : null;
+        $startTime = isset($options['on_stats']) ? \GuzzleHttp\_current_time() : null;

        try {
            // Does not support the expect header.
@@ -42,7 +42,7 @@ class StreamHandler
            // Append a content-length header if body size is zero to match
            // cURL's behavior.
            if (0 === $request->getBody()->getSize()) {
-                $request = $request->withHeader('Content-Length', 0);
+                $request = $request->withHeader('Content-Length', '0');
            }

            return $this->createResponse(
@@ -82,7 +82,7 @@ class StreamHandler
            $stats = new TransferStats(
                $request,
                $response,
-                microtime(true) - $startTime,
+                \GuzzleHttp\_current_time() - $startTime,
                $error,
                []
            );
@@ -343,13 +343,25 @@ class StreamHandler
            if ('v4' === $options['force_ip_resolve']) {
                $records = dns_get_record($uri->getHost(), DNS_A);
                if (!isset($records[0]['ip'])) {
-                    throw new ConnectException(sprintf("Could not resolve IPv4 address for host '%s'", $uri->getHost()), $request);
+                    throw new ConnectException(
+                        sprintf(
+                            "Could not resolve IPv4 address for host '%s'",
+                            $uri->getHost()
+                        ),
+                        $request
+                    );
                }
                $uri = $uri->withHost($records[0]['ip']);
            } elseif ('v6' === $options['force_ip_resolve']) {
                $records = dns_get_record($uri->getHost(), DNS_AAAA);
                if (!isset($records[0]['ipv6'])) {
-                    throw new ConnectException(sprintf("Could not resolve IPv6 address for host '%s'", $uri->getHost()), $request);
+                    throw new ConnectException(
+                        sprintf(
+                            "Could not resolve IPv6 address for host '%s'",
+                            $uri->getHost()
+                        ),
+                        $request
+                    );
                }
                $uri = $uri->withHost('[' . $records[0]['ipv6'] . ']');
            }
@@ -1,7 +1,9 @@
 <?php
 namespace GuzzleHttp;

+use GuzzleHttp\Promise\PromiseInterface;
 use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;

 /**
 * Creates a composed Guzzle handler function by stacking middlewares on top of
@@ -9,7 +11,7 @@ use Psr\Http\Message\RequestInterface;
 */
 class HandlerStack
 {
-    /** @var callable */
+    /** @var callable|null */
    private $handler;

    /** @var array */
@@ -59,6 +61,8 @@ class HandlerStack
     *
     * @param RequestInterface $request
     * @param array            $options
+     *
+     * @return ResponseInterface|PromiseInterface
     */
    public function __invoke(RequestInterface $request, array $options)
    {
@@ -206,7 +210,7 @@ class HandlerStack
    }

    /**
-     * @param $name
+     * @param string $name
     * @return int
     */
    private function findByName($name)
@@ -223,10 +227,10 @@ class HandlerStack
    /**
     * Splices a function into the middleware list at a specific position.
     *
-     * @param          $findName
-     * @param          $withName
+     * @param string   $findName
+     * @param string   $withName
     * @param callable $middleware
-     * @param          $before
+     * @param bool     $before
     */
    private function splice($findName, $withName, callable $middleware, $before)
    {
@@ -168,6 +168,11 @@ class MessageFormatter
        );
    }

+    /**
+     * Get headers from message as string
+     *
+     * @return string
+     */
    private function headers(MessageInterface $message)
    {
        $result = '';
@@ -7,7 +7,6 @@ use GuzzleHttp\Promise\RejectedPromise;
 use GuzzleHttp\Psr7;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Log\LoggerInterface;
-use Psr\Log\LogLevel;

 /**
 * Functions used to create and wrap handlers with handler middleware.
@@ -39,7 +38,7 @@ final class Middleware
                            $cookieJar->extractCookies($request, $response);
                            return $response;
                        }
-                );
+                    );
            };
        };
    }
@@ -58,7 +57,7 @@ final class Middleware
                    return $handler($request, $options);
                }
                return $handler($request, $options)->then(
-                    function (ResponseInterface $response) use ($request, $handler) {
+                    function (ResponseInterface $response) use ($request) {
                        $code = $response->getStatusCode();
                        if ($code < 400) {
                            return $response;
@@ -183,7 +182,7 @@ final class Middleware
     *
     * @return callable Returns a function that accepts the next handler.
     */
-    public static function log(LoggerInterface $logger, MessageFormatter $formatter, $logLevel = LogLevel::INFO)
+    public static function log(LoggerInterface $logger, MessageFormatter $formatter, $logLevel = 'info' /* \Psr\Log\LogLevel::INFO */)
    {
        return function (callable $handler) use ($logger, $formatter, $logLevel) {
            return function ($request, array $options) use ($handler, $logger, $formatter, $logLevel) {
@@ -1,12 +1,13 @@
 <?php
 namespace GuzzleHttp;

+use GuzzleHttp\Promise\EachPromise;
+use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\Promise\PromisorInterface;
 use Psr\Http\Message\RequestInterface;
-use GuzzleHttp\Promise\EachPromise;

 /**
- * Sends and iterator of requests concurrently using a capped pool size.
+ * Sends an iterator of requests concurrently using a capped pool size.
 *
 * The pool will read from an iterator until it is cancelled or until the
 * iterator is consumed. When a request is yielded, the request is sent after
@@ -69,6 +70,11 @@ class Pool implements PromisorInterface
        $this->each = new EachPromise($requests(), $config);
    }

+    /**
+     * Get promise
+     *
+     * @return PromiseInterface
+     */
    public function promise()
    {
        return $this->each->promise();
@@ -106,6 +112,11 @@ class Pool implements PromisorInterface
        return $res;
    }

+    /**
+     * Execute callback(s)
+     *
+     * @return void
+     */
    private static function cmpCallback(array &$options, $name, array &$results)
    {
        if (!isset($options[$name])) {
@@ -66,6 +66,11 @@ class PrepareBodyMiddleware
        return $fn(Psr7\modify_request($request, $modify), $options);
    }

+    /**
+     * Add expect header
+     *
+     * @return void
+     */
    private function addExpectHeader(
        RequestInterface $request,
        array $options,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Hide_D	4357fb3874	국호 변경 warning 수정	2020-03-05 07:35:01 +09:00
Hide_D	225c356b2d	국호 변경 추가	2020-03-05 07:33:11 +09:00
Hide_D	0bb45979df	ng_old_generals에 aux 반영	2020-03-05 06:53:15 +09:00
Hide_D	b28ac27fba	내특 전특 초기화 추가	2020-03-05 06:48:15 +09:00
Hide_D	017d1b5dd9	general에 aux 추가	2020-03-05 06:39:02 +09:00
Hide_D	a7b22748cd	miniche_clean	2020-02-08 23:42:22 +09:00
Hide_D	4f2c08918a	핫픽스 효율 향상	2020-02-08 14:10:36 +09:00
Hide_D	d2f6df270b	NPC가 함부러 전쟁 상태를 바꾸지 않도록 변경	2020-02-08 14:10:32 +09:00
Hide_D	64b14b0c5d	'대' 도시 이름 버그 수정	2020-01-30 16:34:07 +09:00
Hide_D	8394c9780c	테스트 기수용 맵 추가, 증축 비용 상수값 추가	2020-01-28 02:59:06 +09:00
Hide_D	a5b404298b	징병에서는 기능 안뜨는 문제 수정	2020-01-28 02:18:58 +09:00
Hide_D	ab48082bb8	징병 불가능한 병종도 표기	2020-01-28 02:15:51 +09:00
Hide_D	9094434c16	{} 참조 제거	2020-01-28 01:25:52 +09:00
Hide_D	ddb971e41e	재 업데이트	2020-01-28 01:17:00 +09:00
Hide_D	a8b3befca9	composer update	2020-01-28 01:16:04 +09:00
Hide_D	e5bed62ca9	Medoo 수정	2020-01-28 01:11:59 +09:00
Hide_D	76b8a59f39	Revert "medoo only" This reverts commit `2c31de1d6a`.	2020-01-28 00:56:16 +09:00
Hide_D	4dbe30bb2b	medoo only	2020-01-28 00:55:57 +09:00
Hide_D	adcfcaa1ef	Revert "composer reinstall" This reverts commit `d16736132c`.	2020-01-28 00:44:38 +09:00
Hide_D	da32f0067a	composer reinstall	2020-01-28 00:43:48 +09:00
Hide_D	19be0c4560	Revert "package update 재도전" This reverts commit `595ab6d7e5`.	2020-01-28 00:31:53 +09:00
Hide_D	f6e53746b2	package update 재도전	2020-01-28 00:30:41 +09:00
Hide_D	9cd40b213d	Revert "composer package update" This reverts commit `e979959219`.	2020-01-28 00:23:38 +09:00
Hide_D	ed69eb5d7b	composer package update	2020-01-28 00:22:43 +09:00
Hide_D	ed95d5e933	버그 수정	2020-01-04 04:40:27 +09:00
@@ -1 +1 @@
 .10.0
 .12.0