From adcfcaa1ef1452e24e345d0957385fa221d454e9 Mon Sep 17 00:00:00 2001 From: hide_d Date: Tue, 28 Jan 2020 00:44:38 +0900 Subject: [PATCH] Revert "composer reinstall" This reverts commit d16736132c972e2b5c5029dc4bcea497f2ab2174. --- composer.json | 7 +- composer.lock | 323 +- vendor/.htaccess | 1 + vendor/autoload.php | 2 +- vendor/bin/pscss | 2 +- vendor/bin/pscss.bat | 2 +- .../utilphp/src/utilphp/util.php | 2 +- vendor/catfan/medoo/.github/FUNDING.yml | 3 - .../.github/ISSUE_TEMPLATE/bug_report.md | 19 - vendor/catfan/medoo/LICENSE.md | 2 +- vendor/catfan/medoo/README.md | 10 +- vendor/catfan/medoo/composer.json | 8 +- vendor/catfan/medoo/src/Medoo.php | 712 +--- vendor/composer/autoload_classmap.php | 37 +- vendor/composer/autoload_files.php | 1 - vendor/composer/autoload_psr4.php | 2 +- vendor/composer/autoload_real.php | 14 +- vendor/composer/autoload_static.php | 58 +- vendor/composer/installed.json | 338 +- vendor/ezyang/htmlpurifier/INSTALL | 36 +- vendor/ezyang/htmlpurifier/INSTALL.fr.utf8 | 2 +- vendor/ezyang/htmlpurifier/NEWS | 34 - vendor/ezyang/htmlpurifier/README.md | 2 +- vendor/ezyang/htmlpurifier/VERSION | 2 +- vendor/ezyang/htmlpurifier/WHATSNEW | 15 +- vendor/ezyang/htmlpurifier/composer.json | 4 +- .../library/HTMLPurifier.includes.php | 2 +- .../htmlpurifier/library/HTMLPurifier.php | 16 +- .../HTMLPurifier/AttrDef/HTML/Bool.php | 4 +- .../library/HTMLPurifier/AttrDef/URI/Host.php | 6 +- .../library/HTMLPurifier/CSSDefinition.php | 52 +- .../library/HTMLPurifier/ChildDef/Custom.php | 2 +- .../library/HTMLPurifier/Config.php | 4 +- .../library/HTMLPurifier/ConfigSchema.php | 2 +- .../HTMLPurifier/ConfigSchema/schema.ser | Bin 24124 -> 15923 bytes .../AutoFormat.RemoveEmpty.RemoveNbsp.txt | 2 +- .../schema/Core.AllowParseManyTags.txt | 12 - .../schema/Core.ColorKeywords.txt | 159 +- .../library/HTMLPurifier/Encoder.php | 2 +- .../library/HTMLPurifier/EntityParser.php | 2 +- .../library/HTMLPurifier/HTMLModule.php | 4 +- .../HTMLPurifier/HTMLModule/SafeScripting.php | 4 +- .../Language/messages/en-x-test.php | 2 - .../Language/messages/en-x-testmini.php | 2 - .../library/HTMLPurifier/Lexer/DOMLex.php | 24 +- .../HTMLPurifier/Printer/ConfigForm.php | 4 +- .../HTMLPurifier/TagTransform/Font.php | 2 +- .../library/HTMLPurifier/VarParser.php | 32 +- .../HTMLPurifier/VarParser/Flexible.php | 10 +- .../ezyang/htmlpurifier/maintenance/.htaccess | 8 +- .../ezyang/htmlpurifier/maintenance/flush.php | 30 + .../ezyang/htmlpurifier/maintenance/flush.sh | 8 - .../maintenance/update-config.php | 34 + .../plugins/phorum/config.default.php | 1 - ...update-for-release => release1-update.php} | 2 +- vendor/ezyang/htmlpurifier/release2-tag.php | 22 + vendor/guzzlehttp/guzzle/.php_cs | 23 - vendor/guzzlehttp/guzzle/CHANGELOG.md | 35 - vendor/guzzlehttp/guzzle/Dockerfile | 18 - vendor/guzzlehttp/guzzle/README.md | 23 +- vendor/guzzlehttp/guzzle/composer.json | 43 +- vendor/guzzlehttp/guzzle/src/Client.php | 101 +- .../guzzlehttp/guzzle/src/ClientInterface.php | 7 +- .../guzzle/src/Cookie/CookieJar.php | 8 +- .../guzzle/src/Cookie/CookieJarInterface.php | 6 +- .../guzzle/src/Cookie/FileCookieJar.php | 3 +- .../guzzle/src/Cookie/SessionCookieJar.php | 1 - .../guzzle/src/Cookie/SetCookie.php | 4 +- .../guzzle/src/Exception/ClientException.php | 4 +- .../guzzle/src/Exception/GuzzleException.php | 30 +- .../Exception/InvalidArgumentException.php | 7 - .../guzzle/src/Exception/RequestException.php | 35 +- .../guzzle/src/Exception/ServerException.php | 4 +- .../Exception/TooManyRedirectsException.php | 4 +- .../src/Exception/TransferException.php | 4 +- .../guzzle/src/Handler/CurlFactory.php | 44 +- .../guzzle/src/Handler/CurlMultiHandler.php | 34 +- .../guzzle/src/Handler/MockHandler.php | 10 +- .../guzzle/src/Handler/StreamHandler.php | 24 +- vendor/guzzlehttp/guzzle/src/HandlerStack.php | 14 +- .../guzzle/src/MessageFormatter.php | 5 - vendor/guzzlehttp/guzzle/src/Middleware.php | 7 +- vendor/guzzlehttp/guzzle/src/Pool.php | 15 +- .../guzzle/src/PrepareBodyMiddleware.php | 5 - .../guzzle/src/RedirectMiddleware.php | 28 +- .../guzzlehttp/guzzle/src/RequestOptions.php | 10 +- .../guzzlehttp/guzzle/src/RetryMiddleware.php | 22 +- .../guzzlehttp/guzzle/src/TransferStats.php | 12 +- vendor/guzzlehttp/guzzle/src/functions.php | 73 +- vendor/guzzlehttp/psr7/CHANGELOG.md | 252 +- vendor/guzzlehttp/psr7/README.md | 8 +- vendor/guzzlehttp/psr7/composer.json | 18 +- vendor/guzzlehttp/psr7/src/AppendStream.php | 16 +- vendor/guzzlehttp/psr7/src/FnStream.php | 9 - vendor/guzzlehttp/psr7/src/InflateStream.php | 2 +- vendor/guzzlehttp/psr7/src/LimitStream.php | 2 +- vendor/guzzlehttp/psr7/src/MessageTrait.php | 60 +- vendor/guzzlehttp/psr7/src/Request.php | 13 +- vendor/guzzlehttp/psr7/src/Response.php | 26 +- vendor/guzzlehttp/psr7/src/Rfc7230.php | 18 - vendor/guzzlehttp/psr7/src/ServerRequest.php | 34 +- vendor/guzzlehttp/psr7/src/Stream.php | 68 +- vendor/guzzlehttp/psr7/src/StreamWrapper.php | 46 +- vendor/guzzlehttp/psr7/src/Uri.php | 124 +- vendor/guzzlehttp/psr7/src/functions.php | 131 +- vendor/{scssphp => leafo}/scssphp/LICENSE.md | 2 +- vendor/{scssphp => leafo}/scssphp/README.md | 8 +- vendor/{scssphp => leafo}/scssphp/bin/pscss | 46 +- vendor/leafo/scssphp/composer.json | 41 + .../scssphp/example/Server.php | 70 +- .../{scssphp => leafo}/scssphp/scss.inc.php | 10 +- .../scssphp/src/Base/Range.php | 6 +- .../{scssphp => leafo}/scssphp/src/Block.php | 13 +- .../{scssphp => leafo}/scssphp/src/Colors.php | 75 +- .../scssphp/src/Compiler.php | 3631 ++++------------- .../scssphp/src/Compiler/Environment.php | 15 +- .../src/Exception/CompilerException.php | 6 +- .../scssphp/src/Exception/ParserException.php | 6 +- .../scssphp/src/Exception/RangeException.php | 6 +- .../scssphp/src/Exception/ServerException.php | 6 +- .../scssphp/src/Formatter.php | 114 +- .../scssphp/src/Formatter/Compact.php | 8 +- .../scssphp/src/Formatter/Compressed.php | 29 +- .../scssphp/src/Formatter/Crunched.php | 29 +- .../scssphp/src/Formatter/Debug.php | 10 +- .../scssphp/src/Formatter/Expanded.php | 12 +- vendor/leafo/scssphp/src/Formatter/Nested.php | 201 + .../scssphp/src/Formatter/OutputBlock.php | 8 +- .../{scssphp => leafo}/scssphp/src/Node.php | 6 +- .../scssphp/src/Node/Number.php | 30 +- .../{scssphp => leafo}/scssphp/src/Parser.php | 1404 ++----- .../src/SourceMap/Base64VLQEncoder.php | 217 + .../src/SourceMap/SourceMapGenerator.php | 80 +- .../{scssphp => leafo}/scssphp/src/Type.php | 6 +- .../{scssphp => leafo}/scssphp/src/Util.php | 16 +- .../scssphp/src/Version.php | 8 +- vendor/monolog/monolog/.php_cs | 59 + vendor/monolog/monolog/CHANGELOG.md | 62 - vendor/monolog/monolog/README.md | 3 +- vendor/monolog/monolog/composer.json | 2 +- vendor/monolog/monolog/doc/01-usage.md | 231 ++ .../doc/02-handlers-formatters-processors.md | 157 + vendor/monolog/monolog/doc/03-utilities.md | 13 + vendor/monolog/monolog/doc/04-extending.md | 76 + vendor/monolog/monolog/doc/sockets.md | 39 + vendor/monolog/monolog/phpunit.xml.dist | 19 + .../monolog/src/Monolog/ErrorHandler.php | 13 +- .../Monolog/Formatter/FluentdFormatter.php | 5 +- .../src/Monolog/Formatter/HtmlFormatter.php | 7 +- .../src/Monolog/Formatter/JsonFormatter.php | 32 +- .../src/Monolog/Formatter/LineFormatter.php | 10 +- .../Monolog/Formatter/MongoDBFormatter.php | 8 +- .../Monolog/Formatter/NormalizerFormatter.php | 153 +- .../Monolog/Formatter/WildfireFormatter.php | 4 +- .../src/Monolog/Handler/AbstractHandler.php | 26 +- .../Handler/AbstractProcessingHandler.php | 2 - .../Monolog/Handler/AbstractSyslogHandler.php | 6 +- .../Monolog/Handler/BrowserConsoleHandler.php | 59 +- .../src/Monolog/Handler/BufferHandler.php | 35 +- .../src/Monolog/Handler/ChromePHPHandler.php | 19 +- .../src/Monolog/Handler/CubeHandler.php | 5 +- .../Monolog/Handler/DeduplicationHandler.php | 2 +- .../Monolog/Handler/ElasticSearchHandler.php | 8 +- .../src/Monolog/Handler/ErrorLogHandler.php | 8 +- .../src/Monolog/Handler/FilterHandler.php | 58 +- .../ActivationStrategyInterface.php | 2 +- .../Monolog/Handler/FingersCrossedHandler.php | 98 +- .../src/Monolog/Handler/FirePHPHandler.php | 2 +- .../src/Monolog/Handler/FlowdockHandler.php | 3 +- .../Handler/FormattableHandlerInterface.php | 39 - .../Handler/FormattableHandlerTrait.php | 63 - .../src/Monolog/Handler/GelfHandler.php | 8 + .../src/Monolog/Handler/GroupHandler.php | 19 +- .../src/Monolog/Handler/HandlerInterface.php | 4 +- .../src/Monolog/Handler/HandlerWrapper.php | 10 +- .../src/Monolog/Handler/HipChatHandler.php | 17 - .../src/Monolog/Handler/IFTTTHandler.php | 11 +- .../src/Monolog/Handler/InsightOpsHandler.php | 62 - .../src/Monolog/Handler/LogEntriesHandler.php | 4 +- .../src/Monolog/Handler/MandrillHandler.php | 2 +- .../src/Monolog/Handler/NewRelicHandler.php | 7 +- .../src/Monolog/Handler/PHPConsoleHandler.php | 3 +- .../Handler/ProcessableHandlerInterface.php | 40 - .../Handler/ProcessableHandlerTrait.php | 73 - .../src/Monolog/Handler/PsrHandler.php | 2 +- .../src/Monolog/Handler/PushoverHandler.php | 6 +- .../src/Monolog/Handler/RavenHandler.php | 14 +- .../src/Monolog/Handler/RedisHandler.php | 3 +- .../src/Monolog/Handler/RollbarHandler.php | 12 - .../Monolog/Handler/RotatingFileHandler.php | 18 +- .../src/Monolog/Handler/SamplingHandler.php | 53 +- .../src/Monolog/Handler/Slack/SlackRecord.php | 19 +- .../src/Monolog/Handler/SlackHandler.php | 8 +- .../Monolog/Handler/SlackWebhookHandler.php | 8 +- .../src/Monolog/Handler/SlackbotHandler.php | 8 +- .../src/Monolog/Handler/SocketHandler.php | 47 +- .../src/Monolog/Handler/StreamHandler.php | 7 +- .../Monolog/Handler/SwiftMailerHandler.php | 16 +- .../src/Monolog/Handler/SyslogHandler.php | 10 +- .../src/Monolog/Handler/SyslogUdpHandler.php | 49 +- .../src/Monolog/Handler/TestHandler.php | 29 +- .../Handler/WhatFailureGroupHandler.php | 11 - .../Monolog/Handler/ZendMonitorHandler.php | 46 +- vendor/monolog/monolog/src/Monolog/Logger.php | 250 +- .../src/Monolog/Processor/GitProcessor.php | 2 +- .../Processor/IntrospectionProcessor.php | 2 +- .../src/Monolog/Processor/MemoryProcessor.php | 6 +- .../Monolog/Processor/MercurialProcessor.php | 2 +- .../Monolog/Processor/ProcessIdProcessor.php | 2 +- .../Monolog/Processor/ProcessorInterface.php | 25 - .../Processor/PsrLogMessageProcessor.php | 6 +- .../src/Monolog/Processor/TagProcessor.php | 2 +- .../src/Monolog/Processor/UidProcessor.php | 17 +- .../src/Monolog/Processor/WebProcessor.php | 2 +- .../src/Monolog/ResettableInterface.php | 31 - .../monolog/src/Monolog/SignalHandler.php | 115 - vendor/monolog/monolog/src/Monolog/Utils.php | 159 - .../tests/Monolog/ErrorHandlerTest.php | 31 + .../Formatter/ChromePHPFormatterTest.php | 158 + .../Formatter/ElasticaFormatterTest.php | 79 + .../Formatter/FlowdockFormatterTest.php | 55 + .../Formatter/FluentdFormatterTest.php | 62 + .../Formatter/GelfMessageFormatterTest.php | 258 ++ .../Monolog/Formatter/JsonFormatterTest.php | 183 + .../Monolog/Formatter/LineFormatterTest.php | 222 + .../Monolog/Formatter/LogglyFormatterTest.php | 40 + .../Formatter/LogstashFormatterTest.php | 333 ++ .../Formatter/MongoDBFormatterTest.php | 262 ++ .../Formatter/NormalizerFormatterTest.php | 423 ++ .../Monolog/Formatter/ScalarFormatterTest.php | 110 + .../Formatter/WildfireFormatterTest.php | 142 + .../Monolog/Handler/AbstractHandlerTest.php | 115 + .../Handler/AbstractProcessingHandlerTest.php | 80 + .../tests/Monolog/Handler/AmqpHandlerTest.php | 136 + .../Handler/BrowserConsoleHandlerTest.php | 130 + .../Monolog/Handler/BufferHandlerTest.php | 158 + .../Monolog/Handler/ChromePHPHandlerTest.php | 156 + .../Monolog/Handler/CouchDBHandlerTest.php | 31 + .../Handler/DeduplicationHandlerTest.php | 165 + .../Handler/DoctrineCouchDBHandlerTest.php | 52 + .../Monolog/Handler/DynamoDbHandlerTest.php | 82 + .../Handler/ElasticSearchHandlerTest.php | 239 ++ .../Monolog/Handler/ErrorLogHandlerTest.php | 66 + .../Monolog/Handler/FilterHandlerTest.php | 170 + .../Handler/FingersCrossedHandlerTest.php | 279 ++ .../Monolog/Handler/FirePHPHandlerTest.php | 96 + .../tests/Monolog/Handler/Fixtures/.gitkeep | 0 .../Monolog/Handler/FleepHookHandlerTest.php | 85 + .../Monolog/Handler/FlowdockHandlerTest.php | 88 + .../Monolog/Handler/GelfHandlerLegacyTest.php | 95 + .../tests/Monolog/Handler/GelfHandlerTest.php | 117 + .../Handler/GelfMockMessagePublisher.php | 25 + .../Monolog/Handler/GroupHandlerTest.php | 112 + .../Monolog/Handler/HandlerWrapperTest.php | 130 + .../Monolog/Handler/HipChatHandlerTest.php | 279 ++ .../Monolog/Handler/LogEntriesHandlerTest.php | 84 + .../tests/Monolog/Handler/MailHandlerTest.php | 75 + .../tests/Monolog/Handler/MockRavenClient.php | 27 + .../Monolog/Handler/MongoDBHandlerTest.php | 65 + .../Handler/NativeMailerHandlerTest.php | 111 + .../Monolog/Handler/NewRelicHandlerTest.php | 200 + .../tests/Monolog/Handler/NullHandlerTest.php | 33 + .../Monolog/Handler/PHPConsoleHandlerTest.php | 273 ++ .../tests/Monolog/Handler/PsrHandlerTest.php | 50 + .../Monolog/Handler/PushoverHandlerTest.php | 141 + .../Monolog/Handler/RavenHandlerTest.php | 255 ++ .../Monolog/Handler/RedisHandlerTest.php | 127 + .../Monolog/Handler/RollbarHandlerTest.php | 84 + .../Handler/RotatingFileHandlerTest.php | 211 + .../Monolog/Handler/SamplingHandlerTest.php | 33 + .../Monolog/Handler/Slack/SlackRecordTest.php | 387 ++ .../Monolog/Handler/SlackHandlerTest.php | 155 + .../Handler/SlackWebhookHandlerTest.php | 107 + .../Monolog/Handler/SlackbotHandlerTest.php | 47 + .../Monolog/Handler/SocketHandlerTest.php | 309 ++ .../Monolog/Handler/StreamHandlerTest.php | 184 + .../Handler/SwiftMailerHandlerTest.php | 113 + .../Monolog/Handler/SyslogHandlerTest.php | 44 + .../Monolog/Handler/SyslogUdpHandlerTest.php | 76 + .../tests/Monolog/Handler/TestHandlerTest.php | 70 + .../tests/Monolog/Handler/UdpSocketTest.php | 64 + .../Handler/WhatFailureGroupHandlerTest.php | 121 + .../Handler/ZendMonitorHandlerTest.php | 69 + .../monolog/tests/Monolog/LoggerTest.php | 548 +++ .../Monolog/Processor/GitProcessorTest.php | 29 + .../Processor/IntrospectionProcessorTest.php | 123 + .../MemoryPeakUsageProcessorTest.php | 42 + .../Processor/MemoryUsageProcessorTest.php | 42 + .../Processor/MercurialProcessorTest.php | 41 + .../Processor/ProcessIdProcessorTest.php | 30 + .../Processor/PsrLogMessageProcessorTest.php | 43 + .../Monolog/Processor/TagProcessorTest.php | 49 + .../Monolog/Processor/UidProcessorTest.php | 33 + .../Monolog/Processor/WebProcessorTest.php | 113 + .../tests/Monolog/PsrLogCompatTest.php | 47 + .../monolog/tests/Monolog/RegistryTest.php | 153 + .../monolog/tests/Monolog/TestCase.php | 58 + vendor/psr/log/Psr/Log/LoggerInterface.php | 2 - vendor/psr/log/Psr/Log/LoggerTrait.php | 2 - vendor/psr/log/Psr/Log/NullLogger.php | 2 - .../log/Psr/Log/Test/LoggerInterfaceTest.php | 8 +- vendor/psr/log/Psr/Log/Test/TestLogger.php | 147 - vendor/psr/log/README.md | 13 - vendor/psr/log/composer.json | 2 +- vendor/ralouphie/getallheaders/LICENSE | 21 - vendor/ralouphie/getallheaders/README.md | 27 - vendor/ralouphie/getallheaders/composer.json | 26 - .../getallheaders/src/getallheaders.php | 46 - vendor/scssphp/scssphp/composer.json | 51 - vendor/scssphp/scssphp/src/Cache.php | 239 -- .../scssphp/scssphp/src/Formatter/Nested.php | 228 -- .../scssphp/scssphp/src/SourceMap/Base64.php | 184 - .../scssphp/src/SourceMap/Base64VLQ.php | 146 - vendor/sergeytsalkov/meekrodb/db.class.php | 5 + vendor/symfony/lock/.gitattributes | 3 - vendor/symfony/lock/.gitignore | 3 + .../symfony/lock/BlockingStoreInterface.php | 27 - vendor/symfony/lock/CHANGELOG.md | 16 - .../lock/Exception/ExceptionInterface.php | 2 +- .../lock/Exception/InvalidTtlException.php | 19 - vendor/symfony/lock/Factory.php | 10 +- vendor/symfony/lock/Key.php | 13 +- vendor/symfony/lock/LICENSE | 2 +- vendor/symfony/lock/Lock.php | 68 +- vendor/symfony/lock/LockFactory.php | 33 - .../symfony/lock/PersistingStoreInterface.php | 53 - vendor/symfony/lock/Store/CombinedStore.php | 50 +- .../symfony/lock/Store/ExpiringStoreTrait.php | 30 - vendor/symfony/lock/Store/FlockStore.php | 9 +- vendor/symfony/lock/Store/MemcachedStore.php | 51 +- vendor/symfony/lock/Store/PdoStore.php | 363 -- vendor/symfony/lock/Store/RedisStore.php | 68 +- .../symfony/lock/Store/RetryTillSaveStore.php | 15 +- vendor/symfony/lock/Store/SemaphoreStore.php | 13 +- vendor/symfony/lock/Store/StoreFactory.php | 76 +- vendor/symfony/lock/Store/ZookeeperStore.php | 176 - vendor/symfony/lock/StoreInterface.php | 35 +- vendor/symfony/lock/Tests/FactoryTest.php | 36 + vendor/symfony/lock/Tests/LockTest.php | 268 ++ .../Tests/Store/AbstractRedisStoreTest.php | 45 + .../lock/Tests/Store/AbstractStoreTest.php | 115 + .../Tests/Store/BlockingStoreTestTrait.php | 92 + .../lock/Tests/Store/CombinedStoreTest.php | 356 ++ .../Tests/Store/ExpiringStoreTestTrait.php | 107 + .../lock/Tests/Store/FlockStoreTest.php | 78 + .../lock/Tests/Store/MemcachedStoreTest.php | 60 + .../lock/Tests/Store/PredisStoreTest.php | 36 + .../lock/Tests/Store/RedisArrayStoreTest.php | 38 + .../lock/Tests/Store/RedisStoreTest.php | 36 + .../Tests/Store/RetryTillSaveStoreTest.php | 35 + .../lock/Tests/Store/SemaphoreStoreTest.php | 60 + .../Tests/Strategy/ConsensusStrategyTest.php | 89 + .../Tests/Strategy/UnanimousStrategyTest.php | 89 + vendor/symfony/lock/composer.json | 7 +- vendor/symfony/lock/phpunit.xml.dist | 32 + vendor/vlucas/valitron/.github/FUNDING.yml | 1 - vendor/vlucas/valitron/README.md | 948 +---- vendor/vlucas/valitron/composer.json | 4 +- vendor/vlucas/valitron/lang/ar.php | 1 - vendor/vlucas/valitron/lang/az.php | 1 - vendor/vlucas/valitron/lang/bg.php | 1 - vendor/vlucas/valitron/lang/de.php | 1 - vendor/vlucas/valitron/lang/el.php | 1 - vendor/vlucas/valitron/lang/en.php | 68 +- vendor/vlucas/valitron/lang/es.php | 63 +- vendor/vlucas/valitron/lang/fi.php | 1 - vendor/vlucas/valitron/lang/fr.php | 1 - vendor/vlucas/valitron/lang/id.php | 1 - vendor/vlucas/valitron/lang/it.php | 1 - vendor/vlucas/valitron/lang/ja.php | 1 - vendor/vlucas/valitron/lang/ko.php | 1 - vendor/vlucas/valitron/lang/lt.php | 7 +- vendor/vlucas/valitron/lang/lv.php | 1 - vendor/vlucas/valitron/lang/nb.php | 39 - vendor/vlucas/valitron/lang/nl.php | 1 - vendor/vlucas/valitron/lang/nn.php | 35 - vendor/vlucas/valitron/lang/no.php | 33 +- vendor/vlucas/valitron/lang/pl.php | 1 - vendor/vlucas/valitron/lang/pt-br.php | 65 +- vendor/vlucas/valitron/lang/ro.php | 1 - vendor/vlucas/valitron/lang/ru.php | 65 +- vendor/vlucas/valitron/lang/sk.php | 1 - vendor/vlucas/valitron/lang/sv.php | 1 - vendor/vlucas/valitron/lang/th.php | 1 - vendor/vlucas/valitron/lang/tr.php | 1 - vendor/vlucas/valitron/lang/uk.php | 1 - vendor/vlucas/valitron/lang/vi.php | 1 - vendor/vlucas/valitron/lang/zh-cn.php | 1 - vendor/vlucas/valitron/lang/zh-tw.php | 1 - .../valitron/src/Valitron/Validator.php | 509 +-- vendor/xemlock/htmlpurifier-html5/README.md | 32 +- .../xemlock/htmlpurifier-html5/composer.json | 10 +- .../library/HTMLPurifier/AttrDef/Float.php | 116 - .../HTMLPurifier/AttrDef/HTML5/ARel.php | 148 - .../HTMLPurifier/AttrDef/HTML5/Datetime.php | 360 -- .../HTMLPurifier/AttrDef/HTML5/Duration.php | 173 - .../HTMLPurifier/AttrDef/HTML5/Week.php | 47 - .../AttrDef/HTML5/YearlessDate.php | 41 - .../library/HTMLPurifier/AttrDef/Regexp.php | 48 + .../AttrTransform/HTML5/Dialog.php | 19 - .../AttrTransform/HTML5/Progress.php | 38 - .../AttrTransform/HTML5/Script.php | 23 - .../ChildDef/{HTML5 => }/Details.php | 45 +- .../ChildDef/{HTML5 => }/Figure.php | 25 +- .../HTMLPurifier/ChildDef/HTML5/Abstract.php | 70 - .../HTMLPurifier/ChildDef/HTML5/Fieldset.php | 77 - .../HTMLPurifier/ChildDef/HTML5/Script.php | 81 - .../HTMLPurifier/ChildDef/HTML5/Time.php | 68 - .../ChildDef/{HTML5 => }/Media.php | 4 +- .../ChildDef/{HTML5 => }/Picture.php | 8 +- .../library/HTMLPurifier/HTML5Config.php | 45 +- .../library/HTMLPurifier/HTML5Definition.php | 128 +- .../HTMLPurifier/HTMLModule/HTML5/Bdo.php | 44 - .../HTMLPurifier/HTMLModule/HTML5/Edit.php | 32 - .../HTMLPurifier/HTMLModule/HTML5/Forms.php | 69 - .../HTMLModule/HTML5/Hypertext.php | 31 - .../HTMLPurifier/HTMLModule/HTML5/Iframe.php | 60 - .../HTMLModule/HTML5/Interactive.php | 34 - .../HTMLPurifier/HTMLModule/HTML5/List.php | 30 - .../HTMLPurifier/HTMLModule/HTML5/Media.php | 71 - .../HTMLPurifier/HTMLModule/HTML5/Ruby.php | 36 - .../HTMLModule/HTML5/SafeScripting.php | 46 - .../HTMLModule/HTML5/Scripting.php | 49 - .../HTMLPurifier/HTMLModule/HTML5/Text.php | 91 - 424 files changed, 16288 insertions(+), 14020 deletions(-) create mode 100644 vendor/.htaccess delete mode 100644 vendor/catfan/medoo/.github/FUNDING.yml delete mode 100644 vendor/catfan/medoo/.github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AllowParseManyTags.txt create mode 100644 vendor/ezyang/htmlpurifier/maintenance/flush.php delete mode 100644 vendor/ezyang/htmlpurifier/maintenance/flush.sh create mode 100644 vendor/ezyang/htmlpurifier/maintenance/update-config.php rename vendor/ezyang/htmlpurifier/{update-for-release => release1-update.php} (98%) create mode 100644 vendor/ezyang/htmlpurifier/release2-tag.php delete mode 100644 vendor/guzzlehttp/guzzle/.php_cs delete mode 100644 vendor/guzzlehttp/guzzle/Dockerfile delete mode 100644 vendor/guzzlehttp/guzzle/src/Exception/InvalidArgumentException.php delete mode 100644 vendor/guzzlehttp/psr7/src/Rfc7230.php rename vendor/{scssphp => leafo}/scssphp/LICENSE.md (93%) rename vendor/{scssphp => leafo}/scssphp/README.md (81%) rename vendor/{scssphp => leafo}/scssphp/bin/pscss (73%) create mode 100644 vendor/leafo/scssphp/composer.json rename vendor/{scssphp => leafo}/scssphp/example/Server.php (90%) rename vendor/{scssphp => leafo}/scssphp/scss.inc.php (80%) rename vendor/{scssphp => leafo}/scssphp/src/Base/Range.php (85%) rename vendor/{scssphp => leafo}/scssphp/src/Block.php (75%) rename vendor/{scssphp => leafo}/scssphp/src/Colors.php (74%) rename vendor/{scssphp => leafo}/scssphp/src/Compiler.php (52%) rename vendor/{scssphp => leafo}/scssphp/src/Compiler/Environment.php (58%) rename vendor/{scssphp => leafo}/scssphp/src/Exception/CompilerException.php (65%) rename vendor/{scssphp => leafo}/scssphp/src/Exception/ParserException.php (64%) rename vendor/{scssphp => leafo}/scssphp/src/Exception/RangeException.php (64%) rename vendor/{scssphp => leafo}/scssphp/src/Exception/ServerException.php (64%) rename vendor/{scssphp => leafo}/scssphp/src/Formatter.php (63%) rename vendor/{scssphp => leafo}/scssphp/src/Formatter/Compact.php (81%) rename vendor/{scssphp => leafo}/scssphp/src/Formatter/Compressed.php (64%) rename vendor/{scssphp => leafo}/scssphp/src/Formatter/Crunched.php (61%) rename vendor/{scssphp => leafo}/scssphp/src/Formatter/Debug.php (92%) rename vendor/{scssphp => leafo}/scssphp/src/Formatter/Expanded.php (81%) create mode 100644 vendor/leafo/scssphp/src/Formatter/Nested.php rename vendor/{scssphp => leafo}/scssphp/src/Formatter/OutputBlock.php (80%) rename vendor/{scssphp => leafo}/scssphp/src/Node.php (79%) rename vendor/{scssphp => leafo}/scssphp/src/Node/Number.php (93%) rename vendor/{scssphp => leafo}/scssphp/src/Parser.php (57%) create mode 100644 vendor/leafo/scssphp/src/SourceMap/Base64VLQEncoder.php rename vendor/{scssphp => leafo}/scssphp/src/SourceMap/SourceMapGenerator.php (83%) rename vendor/{scssphp => leafo}/scssphp/src/Type.php (94%) rename vendor/{scssphp => leafo}/scssphp/src/Util.php (78%) rename vendor/{scssphp => leafo}/scssphp/src/Version.php (56%) create mode 100644 vendor/monolog/monolog/.php_cs create mode 100644 vendor/monolog/monolog/doc/01-usage.md create mode 100644 vendor/monolog/monolog/doc/02-handlers-formatters-processors.md create mode 100644 vendor/monolog/monolog/doc/03-utilities.md create mode 100644 vendor/monolog/monolog/doc/04-extending.md create mode 100644 vendor/monolog/monolog/doc/sockets.md create mode 100644 vendor/monolog/monolog/phpunit.xml.dist delete mode 100644 vendor/monolog/monolog/src/Monolog/Handler/FormattableHandlerInterface.php delete mode 100644 vendor/monolog/monolog/src/Monolog/Handler/FormattableHandlerTrait.php delete mode 100644 vendor/monolog/monolog/src/Monolog/Handler/InsightOpsHandler.php delete mode 100644 vendor/monolog/monolog/src/Monolog/Handler/ProcessableHandlerInterface.php delete mode 100644 vendor/monolog/monolog/src/Monolog/Handler/ProcessableHandlerTrait.php delete mode 100644 vendor/monolog/monolog/src/Monolog/Processor/ProcessorInterface.php delete mode 100644 vendor/monolog/monolog/src/Monolog/ResettableInterface.php delete mode 100644 vendor/monolog/monolog/src/Monolog/SignalHandler.php delete mode 100644 vendor/monolog/monolog/src/Monolog/Utils.php create mode 100644 vendor/monolog/monolog/tests/Monolog/ErrorHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Formatter/ChromePHPFormatterTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Formatter/ElasticaFormatterTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Formatter/FlowdockFormatterTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Formatter/FluentdFormatterTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Formatter/GelfMessageFormatterTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Formatter/JsonFormatterTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Formatter/LineFormatterTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Formatter/LogglyFormatterTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Formatter/LogstashFormatterTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Formatter/MongoDBFormatterTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Formatter/NormalizerFormatterTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Formatter/ScalarFormatterTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Formatter/WildfireFormatterTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/AbstractHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/AbstractProcessingHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/AmqpHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/BrowserConsoleHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/BufferHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/ChromePHPHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/CouchDBHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/DeduplicationHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/DynamoDbHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/ElasticSearchHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/ErrorLogHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/FilterHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/FingersCrossedHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/FirePHPHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/Fixtures/.gitkeep create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/FleepHookHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/FlowdockHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/GelfHandlerLegacyTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/GelfHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/GelfMockMessagePublisher.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/GroupHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/HandlerWrapperTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/HipChatHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/LogEntriesHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/MailHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/MockRavenClient.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/MongoDBHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/NativeMailerHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/NewRelicHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/NullHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/PHPConsoleHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/PsrHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/PushoverHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/RedisHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/RollbarHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/RotatingFileHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/SamplingHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/Slack/SlackRecordTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/SlackWebhookHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/SlackbotHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/SocketHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/StreamHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/SwiftMailerHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/SyslogHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/SyslogUdpHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/TestHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/UdpSocketTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/WhatFailureGroupHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Handler/ZendMonitorHandlerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/LoggerTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Processor/GitProcessorTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Processor/IntrospectionProcessorTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Processor/MemoryPeakUsageProcessorTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Processor/MemoryUsageProcessorTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Processor/MercurialProcessorTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Processor/ProcessIdProcessorTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Processor/PsrLogMessageProcessorTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Processor/TagProcessorTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Processor/UidProcessorTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/Processor/WebProcessorTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/PsrLogCompatTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/RegistryTest.php create mode 100644 vendor/monolog/monolog/tests/Monolog/TestCase.php delete mode 100644 vendor/psr/log/Psr/Log/Test/TestLogger.php delete mode 100644 vendor/ralouphie/getallheaders/LICENSE delete mode 100644 vendor/ralouphie/getallheaders/README.md delete mode 100644 vendor/ralouphie/getallheaders/composer.json delete mode 100644 vendor/ralouphie/getallheaders/src/getallheaders.php delete mode 100644 vendor/scssphp/scssphp/composer.json delete mode 100644 vendor/scssphp/scssphp/src/Cache.php delete mode 100644 vendor/scssphp/scssphp/src/Formatter/Nested.php delete mode 100644 vendor/scssphp/scssphp/src/SourceMap/Base64.php delete mode 100644 vendor/scssphp/scssphp/src/SourceMap/Base64VLQ.php delete mode 100644 vendor/symfony/lock/.gitattributes create mode 100644 vendor/symfony/lock/.gitignore delete mode 100644 vendor/symfony/lock/BlockingStoreInterface.php delete mode 100644 vendor/symfony/lock/Exception/InvalidTtlException.php delete mode 100644 vendor/symfony/lock/LockFactory.php delete mode 100644 vendor/symfony/lock/PersistingStoreInterface.php delete mode 100644 vendor/symfony/lock/Store/ExpiringStoreTrait.php delete mode 100644 vendor/symfony/lock/Store/PdoStore.php delete mode 100644 vendor/symfony/lock/Store/ZookeeperStore.php create mode 100644 vendor/symfony/lock/Tests/FactoryTest.php create mode 100644 vendor/symfony/lock/Tests/LockTest.php create mode 100644 vendor/symfony/lock/Tests/Store/AbstractRedisStoreTest.php create mode 100644 vendor/symfony/lock/Tests/Store/AbstractStoreTest.php create mode 100644 vendor/symfony/lock/Tests/Store/BlockingStoreTestTrait.php create mode 100644 vendor/symfony/lock/Tests/Store/CombinedStoreTest.php create mode 100644 vendor/symfony/lock/Tests/Store/ExpiringStoreTestTrait.php create mode 100644 vendor/symfony/lock/Tests/Store/FlockStoreTest.php create mode 100644 vendor/symfony/lock/Tests/Store/MemcachedStoreTest.php create mode 100644 vendor/symfony/lock/Tests/Store/PredisStoreTest.php create mode 100644 vendor/symfony/lock/Tests/Store/RedisArrayStoreTest.php create mode 100644 vendor/symfony/lock/Tests/Store/RedisStoreTest.php create mode 100644 vendor/symfony/lock/Tests/Store/RetryTillSaveStoreTest.php create mode 100644 vendor/symfony/lock/Tests/Store/SemaphoreStoreTest.php create mode 100644 vendor/symfony/lock/Tests/Strategy/ConsensusStrategyTest.php create mode 100644 vendor/symfony/lock/Tests/Strategy/UnanimousStrategyTest.php create mode 100644 vendor/symfony/lock/phpunit.xml.dist delete mode 100644 vendor/vlucas/valitron/.github/FUNDING.yml delete mode 100644 vendor/vlucas/valitron/lang/nb.php delete mode 100644 vendor/vlucas/valitron/lang/nn.php delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrDef/Float.php delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrDef/HTML5/ARel.php delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrDef/HTML5/Datetime.php delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrDef/HTML5/Duration.php delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrDef/HTML5/Week.php delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrDef/HTML5/YearlessDate.php create mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrDef/Regexp.php delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrTransform/HTML5/Dialog.php delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrTransform/HTML5/Progress.php delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/AttrTransform/HTML5/Script.php rename vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/{HTML5 => }/Details.php (65%) rename vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/{HTML5 => }/Figure.php (69%) delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/HTML5/Abstract.php delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/HTML5/Fieldset.php delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/HTML5/Script.php delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/HTML5/Time.php rename vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/{HTML5 => }/Media.php (96%) rename vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/ChildDef/{HTML5 => }/Picture.php (83%) delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Bdo.php delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Edit.php delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Forms.php delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Hypertext.php delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Iframe.php delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Interactive.php delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/List.php delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Media.php delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Ruby.php delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/SafeScripting.php delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Scripting.php delete mode 100644 vendor/xemlock/htmlpurifier-html5/library/HTMLPurifier/HTMLModule/HTML5/Text.php diff --git a/composer.json b/composer.json index 228ccca5..abac4455 100644 --- a/composer.json +++ b/composer.json @@ -6,17 +6,12 @@ "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", - "scssphp/scssphp": "^1.0", + "leafo/scssphp": "^0.7.5", "monolog/monolog": "^1.23", "firephp/firephp-core": "^0.4.0", "vlucas/valitron": "^1.4", diff --git a/composer.lock b/composer.lock index 963989f6..38688521 100644 --- a/composer.lock +++ b/composer.lock @@ -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#installing-dependencies", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "ea00bc0f36d6656e2b3232972db879a7", + "content-hash": "3fceaf3c2925068c7e757ab12036e29e", "packages": [ { "name": "brandonwamboldt/utilphp", @@ -54,16 +54,16 @@ }, { "name": "catfan/medoo", - "version": "v1.7.8", + "version": "v1.5.7", "source": { "type": "git", "url": "https://github.com/catfan/Medoo.git", - "reference": "dd9d570584cfb1e09ec470608479b86e41d5b60d" + "reference": "8d90cba0e8ff176028847527d0ea76fe41a06ecf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/catfan/Medoo/zipball/dd9d570584cfb1e09ec470608479b86e41d5b60d", - "reference": "dd9d570584cfb1e09ec470608479b86e41d5b60d", + "url": "https://api.github.com/repos/catfan/Medoo/zipball/8d90cba0e8ff176028847527d0ea76fe41a06ecf", + "reference": "8d90cba0e8ff176028847527d0ea76fe41a06ecf", "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 on both Window/Liunx platform" + "ext-pdo_sqlsrv": "For MSSQL database" }, "type": "framework", "autoload": { @@ -95,11 +95,10 @@ "email": "angel@catfan.me" } ], - "description": "The lightweight PHP database framework to accelerate development", + "description": "The lightest PHP database framework to accelerate development", "homepage": "https://medoo.in", "keywords": [ "database", - "database library", "lightweight", "mariadb", "mssql", @@ -110,27 +109,27 @@ "sql", "sqlite" ], - "time": "2019-12-19T05:04:34+00:00" + "time": "2018-06-14T18:59:08+00:00" }, { "name": "ezyang/htmlpurifier", - "version": "v4.12.0", + "version": "v4.10.0", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "a617e55bc62a87eec73bd456d146d134ad716f03" + "reference": "d85d39da4576a6934b72480be6978fb10c860021" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/a617e55bc62a87eec73bd456d146d134ad716f03", - "reference": "a617e55bc62a87eec73bd456d146d134ad716f03", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/d85d39da4576a6934b72480be6978fb10c860021", + "reference": "d85d39da4576a6934b72480be6978fb10c860021", "shasum": "" }, "require": { "php": ">=5.2" }, "require-dev": { - "simpletest/simpletest": "dev-master#72de02a7b80c6bb8864ef9bf66d41d2f58f826bd" + "simpletest/simpletest": "^1.1" }, "type": "library", "autoload": { @@ -143,7 +142,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL-2.1-or-later" + "LGPL" ], "authors": [ { @@ -157,7 +156,7 @@ "keywords": [ "html" ], - "time": "2019-10-28T03:44:26+00:00" + "time": "2018-02-23T01:58:20+00:00" }, { "name": "firephp/firephp-core", @@ -197,46 +196,44 @@ }, { "name": "guzzlehttp/guzzle", - "version": "6.5.2", + "version": "6.3.3", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "43ece0e75098b7ecd8d13918293029e555a50f82" + "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/43ece0e75098b7ecd8d13918293029e555a50f82", - "reference": "43ece0e75098b7ecd8d13918293029e555a50f82", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba", + "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba", "shasum": "" }, "require": { - "ext-json": "*", "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.6.1", + "guzzlehttp/psr7": "^1.4", "php": ">=5.5" }, "require-dev": { "ext-curl": "*", "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", - "psr/log": "^1.1" + "psr/log": "^1.0" }, "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.5-dev" + "dev-master": "6.3-dev" } }, "autoload": { - "psr-4": { - "GuzzleHttp\\": "src/" - }, "files": [ "src/functions_include.php" - ] + ], + "psr-4": { + "GuzzleHttp\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -260,7 +257,7 @@ "rest", "web service" ], - "time": "2019-12-23T11:57:10+00:00" + "time": "2018-04-22T15:46:56+00:00" }, { "name": "guzzlehttp/promises", @@ -315,37 +312,32 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.6.1", + "version": "1.4.2", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "239400de7a173fe9901b9ac7c06497751f00727a" + "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a", - "reference": "239400de7a173fe9901b9ac7c06497751f00727a", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c", + "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c", "shasum": "" }, "require": { "php": ">=5.4.0", - "psr/http-message": "~1.0", - "ralouphie/getallheaders": "^2.0.5 || ^3.0.0" + "psr/http-message": "~1.0" }, "provide": { "psr/http-message-implementation": "1.0" }, "require-dev": { - "ext-zlib": "*", - "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8" - }, - "suggest": { - "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses" + "phpunit/phpunit": "~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -375,14 +367,65 @@ "keywords": [ "http", "message", - "psr-7", "request", "response", "stream", "uri", "url" ], - "time": "2019-07-01T23:21:34+00:00" + "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" }, { "name": "league/plates", @@ -441,16 +484,16 @@ }, { "name": "monolog/monolog", - "version": "1.25.3", + "version": "1.23.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "fa82921994db851a8becaf3787a9e73c5976b6f1" + "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fa82921994db851a8becaf3787a9e73c5976b6f1", - "reference": "fa82921994db851a8becaf3787a9e73c5976b6f1", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4", + "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4", "shasum": "" }, "require": { @@ -515,7 +558,7 @@ "logging", "psr-3" ], - "time": "2019-12-20T14:15:16+00:00" + "time": "2017-06-19T01:22:40+00:00" }, { "name": "pguardiario/phpuri", @@ -677,16 +720,16 @@ }, { "name": "psr/log", - "version": "1.1.2", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", + "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", "shasum": "" }, "require": { @@ -695,7 +738,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { @@ -720,108 +763,7 @@ "psr", "psr-3" ], - "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" + "time": "2016-10-10T12:19:37+00:00" }, { "name": "sergeytsalkov/meekrodb", @@ -868,34 +810,29 @@ }, { "name": "symfony/lock", - "version": "v4.4.3", + "version": "v4.1.1", "source": { "type": "git", "url": "https://github.com/symfony/lock.git", - "reference": "6c4f5b620871cfef5b004fc57f2ca74572ae03b3" + "reference": "d508b5dd92272cb74300396ecaadde969d0f7976" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/lock/zipball/6c4f5b620871cfef5b004fc57f2ca74572ae03b3", - "reference": "6c4f5b620871cfef5b004fc57f2ca74572ae03b3", + "url": "https://api.github.com/repos/symfony/lock/zipball/d508b5dd92272cb74300396ecaadde969d0f7976", + "reference": "d508b5dd92272cb74300396ecaadde969d0f7976", "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.4-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -911,13 +848,13 @@ "MIT" ], "authors": [ - { - "name": "Jérémy Derussé", - "email": "jeremy@derusse.com" - }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" + }, + { + "name": "Jérémy Derussé", + "email": "jeremy@derusse.com" } ], "description": "Symfony Lock Component", @@ -930,20 +867,20 @@ "redlock", "semaphore" ], - "time": "2020-01-04T13:00:46+00:00" + "time": "2018-06-21T11:15:46+00:00" }, { "name": "vlucas/valitron", - "version": "v1.4.7", + "version": "v1.4.3", "source": { "type": "git", "url": "https://github.com/vlucas/valitron.git", - "reference": "a03072bed1679660200766d134507a30193eaf6d" + "reference": "3c5463315bfa23b17f8949b100a960d035234e43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/valitron/zipball/a03072bed1679660200766d134507a30193eaf6d", - "reference": "a03072bed1679660200766d134507a30193eaf6d", + "url": "https://api.github.com/repos/vlucas/valitron/zipball/3c5463315bfa23b17f8949b100a960d035234e43", + "reference": "3c5463315bfa23b17f8949b100a960d035234e43", "shasum": "" }, "require": { @@ -979,29 +916,28 @@ "validation", "validator" ], - "time": "2019-08-29T19:49:43+00:00" + "time": "2018-05-06T10:45:26+00:00" }, { "name": "xemlock/htmlpurifier-html5", - "version": "v0.1.11", + "version": "v0.1.7", "source": { "type": "git", "url": "https://github.com/xemlock/htmlpurifier-html5.git", - "reference": "f0d563f9fd4a82a3d759043483f9a94c0d8c2255" + "reference": "b4b35e51ec75e0207c23035f7d9a354bdcdac359" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/xemlock/htmlpurifier-html5/zipball/f0d563f9fd4a82a3d759043483f9a94c0d8c2255", - "reference": "f0d563f9fd4a82a3d759043483f9a94c0d8c2255", + "url": "https://api.github.com/repos/xemlock/htmlpurifier-html5/zipball/b4b35e51ec75e0207c23035f7d9a354bdcdac359", + "reference": "b4b35e51ec75e0207c23035f7d9a354bdcdac359", "shasum": "" }, "require": { - "ezyang/htmlpurifier": "^4.8", + "ezyang/htmlpurifier": "^4.7", "php": ">=5.2" }, "require-dev": { - "php-coveralls/php-coveralls": "^1.1|^2.1", - "phpunit/phpunit": ">=4.7 <8.0" + "phpunit/phpunit": "4.7.*|5.7.*" }, "type": "library", "autoload": { @@ -1019,18 +955,8 @@ "email": "xemlock@gmail.com" } ], - "description": "HTML5 element definitions for HTML Purifier", - "keywords": [ - "HTML5", - "Purifier", - "html", - "htmlpurifier", - "security", - "tidy", - "validator", - "xss" - ], - "time": "2019-08-07T17:19:21+00:00" + "description": "HTML Purifier definitions for HTML5 elements", + "time": "2018-06-07T14:30:17+00:00" } ], "packages-dev": [], @@ -1040,8 +966,5 @@ "prefer-stable": false, "prefer-lowest": false, "platform": [], - "platform-dev": [], - "platform-overrides": { - "php": "7.3" - } + "platform-dev": [] } diff --git a/vendor/.htaccess b/vendor/.htaccess new file mode 100644 index 00000000..698196ae --- /dev/null +++ b/vendor/.htaccess @@ -0,0 +1 @@ +Deny from all \ No newline at end of file diff --git a/vendor/autoload.php b/vendor/autoload.php index 5e4e453c..97db69ce 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit7ffbadbed074ecb378689700522bf644::getLoader(); +return ComposerAutoloaderInit67b09c83b85c3bc0027caefe5bba171a::getLoader(); diff --git a/vendor/bin/pscss b/vendor/bin/pscss index f51e8577..9539281c 100644 --- a/vendor/bin/pscss +++ b/vendor/bin/pscss @@ -1,6 +1,6 @@ #!/usr/bin/env sh -dir=$(cd "${0%[/\\]*}" > /dev/null; cd "../scssphp/scssphp/bin" && pwd) +dir=$(cd "${0%[/\\]*}" > /dev/null; cd "../leafo/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 diff --git a/vendor/bin/pscss.bat b/vendor/bin/pscss.bat index 1e368dc9..cadaeea9 100644 --- a/vendor/bin/pscss.bat +++ b/vendor/bin/pscss.bat @@ -1,4 +1,4 @@ @ECHO OFF setlocal DISABLEDELAYEDEXPANSION -SET BIN_TARGET=%~dp0/../scssphp/scssphp/bin/pscss +SET BIN_TARGET=%~dp0/../leafo/scssphp/bin/pscss php "%BIN_TARGET%" %* diff --git a/vendor/brandonwamboldt/utilphp/src/utilphp/util.php b/vendor/brandonwamboldt/utilphp/src/utilphp/util.php index 0932d7d1..9be380ae 100644 --- a/vendor/brandonwamboldt/utilphp/src/utilphp/util.php +++ b/vendor/brandonwamboldt/utilphp/src/utilphp/util.php @@ -282,7 +282,7 @@ class util * concisely access an index which may or may not exist without * raising a warning. * - * @param array $var Array value to access + * @param mixed $var Array value to access * @param mixed $default Default value to return if the key is not * present in the array * @return mixed diff --git a/vendor/catfan/medoo/.github/FUNDING.yml b/vendor/catfan/medoo/.github/FUNDING.yml deleted file mode 100644 index d3400156..00000000 --- a/vendor/catfan/medoo/.github/FUNDING.yml +++ /dev/null @@ -1,3 +0,0 @@ -# These are supported funding model platforms - -open_collective: medoo diff --git a/vendor/catfan/medoo/.github/ISSUE_TEMPLATE/bug_report.md b/vendor/catfan/medoo/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 160e7e0f..00000000 --- a/vendor/catfan/medoo/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -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. diff --git a/vendor/catfan/medoo/LICENSE.md b/vendor/catfan/medoo/LICENSE.md index e63dae83..a681c880 100644 --- a/vendor/catfan/medoo/LICENSE.md +++ b/vendor/catfan/medoo/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019 Angel Lai +Copyright (c) 2018 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 diff --git a/vendor/catfan/medoo/README.md b/vendor/catfan/medoo/README.md index 5288a756..f31e1d06 100644 --- a/vendor/catfan/medoo/README.md +++ b/vendor/catfan/medoo/README.md @@ -6,11 +6,9 @@ Total Downloads Latest Stable Version License - Backers on Open Collective - Sponsors on Open Collective

-> The lightweight PHP database framework to accelerate development +> The Lightest PHP database framework to accelerate development ## Features @@ -28,7 +26,7 @@ ## Requirement -PHP 5.4+ and PDO extension installed, recommend PHP 7.0+ +PHP 5.4+ and PDO extension installed ## Get Started @@ -36,7 +34,7 @@ PHP 5.4+ and PDO extension installed, recommend PHP 7.0+ Add Medoo to composer.json configuration file. ``` -$ composer require catfan/medoo +$ composer require catfan/Medoo ``` And update the composer @@ -45,7 +43,7 @@ $ composer update ``` ```php -// If you installed via composer, just use this code to require autoloader on the top of your projects. +// If you installed via composer, just use this code to requrie autoloader on the top of your projects. require 'vendor/autoload.php'; // Using Medoo namespace diff --git a/vendor/catfan/medoo/composer.json b/vendor/catfan/medoo/composer.json index 2bb0d08f..39c1a9de 100644 --- a/vendor/catfan/medoo/composer.json +++ b/vendor/catfan/medoo/composer.json @@ -1,8 +1,8 @@ { "name": "catfan/medoo", "type": "framework", - "description": "The lightweight PHP database framework to accelerate development", - "keywords": ["database", "database library", "lightweight", "PHP framework", "SQL", "MySQL", "MSSQL", "SQLite", "PostgreSQL", "MariaDB", "Oracle"], + "description": "The lightest PHP database framework to accelerate development", + "keywords": ["database", "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 on both Window/Liunx platform", + "ext-pdo_sqlsrv": "For MSSQL database", "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" }, diff --git a/vendor/catfan/medoo/src/Medoo.php b/vendor/catfan/medoo/src/Medoo.php index ae3cf41e..b97b8b8c 100644 --- a/vendor/catfan/medoo/src/Medoo.php +++ b/vendor/catfan/medoo/src/Medoo.php @@ -2,9 +2,9 @@ /*! * Medoo database framework * https://medoo.in - * Version 1.7.8 + * Version 1.5.7 * - * Copyright 2019, Angel Lai + * Copyright 2018, Angel Lai * Released under the MIT license */ @@ -13,7 +13,6 @@ namespace Medoo; use PDO; use Exception; use PDOException; -use InvalidArgumentException; class Raw { public $map; @@ -30,7 +29,7 @@ class Medoo protected $statement; - protected $dsn; + protected $option = []; protected $logs = []; @@ -40,18 +39,16 @@ class Medoo protected $guid = 0; - protected $errorInfo = null; - - public function __construct(array $options) + public function __construct($options = null) { + if (!is_array($options)) + { + return false; + } + if (isset($options[ 'database_type' ])) { $this->type = strtolower($options[ 'database_type' ]); - - if ($this->type === 'mariadb') - { - $this->type = 'mysql'; - } } if (isset($options[ 'prefix' ])) @@ -59,47 +56,23 @@ 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' ]; } - $option = isset($options[ 'option' ]) ? $options[ 'option' ] : []; - $commands = (isset($options[ 'command' ]) && is_array($options[ 'command' ])) ? $options[ 'command' ] : []; - - switch ($this->type) + if (isset($options[ 'command' ]) && is_array($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; + $commands = $options[ 'command' ]; } - - if (isset($options[ 'pdo' ])) + else { - 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; + $commands = []; } if (isset($options[ 'dsn' ])) @@ -110,7 +83,7 @@ class Medoo } else { - throw new InvalidArgumentException('Invalid DSN option supplied'); + return false; } } else @@ -127,6 +100,7 @@ class Medoo switch ($this->type) { + case 'mariadb': case 'mysql': $attr = [ 'driver' => 'mysql', @@ -147,6 +121,8 @@ class Medoo } } + // Make MySQL using standard quoted identifier + $commands[] = 'SET SQL_MODE=ANSI_QUOTES'; break; case 'pgsql': @@ -200,16 +176,6 @@ 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 { @@ -218,46 +184,13 @@ 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': @@ -270,18 +203,8 @@ 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 = []; @@ -291,27 +214,22 @@ class Medoo $stack[] = is_int($key) ? $value : $key . '=' . $value; } - $dsn = $driver . ':' . implode(';', $stack); + $dsn = $driver . ':' . implode($stack, ';'); if ( - in_array($this->type, ['mysql', 'pgsql', 'sybase', 'mssql']) && + in_array($this->type, ['mariadb', 'mysql', 'pgsql', 'sybase', 'mssql']) && isset($options[ 'charset' ]) ) { - $commands[] = "SET NAMES '{$options[ 'charset' ]}'" . ( - $this->type === 'mysql' && isset($options[ 'collation' ]) ? - " COLLATE '{$options[ 'collation' ]}'" : '' - ); + $commands[] = "SET NAMES '" . $options[ 'charset' ] . "'"; } - $this->dsn = $dsn; - try { $this->pdo = new PDO( $dsn, isset($options[ 'username' ]) ? $options[ 'username' ] : null, isset($options[ 'password' ]) ? $options[ 'password' ] : null, - $option + $this->option ); foreach ($commands as $value) @@ -324,6 +242,18 @@ 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); @@ -335,8 +265,6 @@ class Medoo public function exec($query, $map = []) { - $this->statement = null; - if ($this->debug_mode) { echo $this->generate($query, $map); @@ -357,37 +285,28 @@ class Medoo $statement = $this->pdo->prepare($query); - if (!$statement) + if ($statement) { - $this->errorInfo = $this->pdo->errorInfo(); - $this->statement = null; + foreach ($map as $key => $value) + { + $statement->bindValue($key, $value[ 0 ], $value[ 1 ]); + } - return false; + $statement->execute(); + + $this->statement = $statement; + + return $statement; } - $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; + return false; } protected function generate($query, $map) { $identifier = [ 'mysql' => '`$1`', + 'mariadb' => '`$1`', 'mssql' => '[$1]' ]; @@ -477,11 +396,6 @@ 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 . '"'; } @@ -516,11 +430,6 @@ 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) . '"'; @@ -529,7 +438,7 @@ class Medoo return '"' . $string . '"'; } - protected function columnPush(&$columns, &$map, $root, $is_join = false) + protected function columnPush(&$columns, &$map) { if ($columns === '*') { @@ -545,34 +454,23 @@ class Medoo foreach ($columns as $key => $value) { - if (!is_int($key) && is_array($value) && $root && count(array_keys($columns)) === 1) + if (is_array($value)) { - $stack[] = $this->columnQuote($key); - - $stack[] = $this->columnPush($value, $map, false, $is_join); - } - elseif (is_array($value)) - { - $stack[] = $this->columnPush($value, $map, false, $is_join); + $stack[] = $this->columnPush($value, $map); } elseif (!is_int($key) && $raw = $this->buildRaw($value, $map)) { preg_match('/(?[a-zA-Z0-9_\.]+)(\s*\[(?(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('/(?[a-zA-Z0-9_\.]+)(?:\s*\((?[a-zA-Z0-9_]+)\))?(?:\s*\[(?(?: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' ]; @@ -583,12 +481,12 @@ class Medoo } else { - $stack[] = $this->columnQuote($match[ 'column' ]); + $stack[] = $this->columnQuote( $match[ 'column' ] ); } } } - return implode(',', $stack); + return implode($stack, ','); } protected function arrayQuote($array) @@ -600,7 +498,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) @@ -662,7 +560,7 @@ class Medoo if (is_numeric($value)) { $condition .= $map_key; - $map[ $map_key ] = [$value, is_float($value) ? PDO::PARAM_STR : PDO::PARAM_INT]; + $map[ $map_key ] = [$value, PDO::PARAM_INT]; } elseif ($raw = $this->buildRaw($value, $map)) { @@ -689,10 +587,8 @@ class Medoo foreach ($value as $index => $item) { - $stack_key = $map_key . $index . '_i'; - - $placeholders[] = $stack_key; - $map[ $stack_key ] = $this->typeMap($item, gettype($item)); + $placeholders[] = $map_key . $index . '_i'; + $map[ $map_key . $index . '_i' ] = $this->typeMap($item, gettype($item)); } $stack[] = $column . ' NOT IN (' . implode(', ', $placeholders) . ')'; @@ -739,7 +635,7 @@ class Medoo { $item = strval($item); - if (!preg_match('/(\[.+\]|[\*\?\!\%#^-_]|%.+|.+%)/', $item)) + if (!preg_match('/(\[.+\]|_|%.+|.+%)/', $item)) { $item = '%' . $item . '%'; } @@ -786,10 +682,8 @@ class Medoo foreach ($value as $index => $item) { - $stack_key = $map_key . $index . '_i'; - - $placeholders[] = $stack_key; - $map[ $stack_key ] = $this->typeMap($item, gettype($item)); + $placeholders[] = $map_key . $index . '_i'; + $map[ $map_key . $index . '_i' ] = $this->typeMap($item, gettype($item)); } $stack[] = $column . ' IN (' . implode(', ', $placeholders) . ')'; @@ -834,7 +728,7 @@ class Medoo $where_clause = ' WHERE ' . $this->dataImplode($conditions, $map, ' AND'); } - if (isset($where[ 'MATCH' ]) && $this->type === 'mysql') + if (isset($where[ 'MATCH' ])) { $MATCH = $where[ 'MATCH' ]; @@ -854,7 +748,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]; @@ -875,7 +769,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)) { @@ -923,7 +817,7 @@ class Medoo } } - $where_clause .= ' ORDER BY ' . implode(',', $stack); + $where_clause .= ' ORDER BY ' . implode($stack, ','); } elseif ($raw = $this->buildRaw($ORDER, $map)) { @@ -1000,7 +894,6 @@ class Medoo $table_query = $table; } - $is_join = false; $join_key = is_array($join) ? array_keys($join) : null; if ( @@ -1008,8 +901,67 @@ class Medoo strpos($join_key[ 0 ], '[') === 0 ) { - $is_join = true; - $table_query .= ' ' . $this->buildJoin($table, $join); + $table_join = []; + + $join_array = [ + '>' => 'LEFT', + '<' => 'RIGHT', + '<>' => 'FULL', + '><' => 'INNER' + ]; + + foreach($join as $sub_table => $relation) + { + preg_match('/(\[(?\<\>?|\>\[a-zA-Z0-9_]+)\s?(\((?[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, ' '); } else { @@ -1047,10 +999,6 @@ class Medoo $where = $columns; } } - elseif ($raw = $this->buildRaw($column_fn, $map)) - { - $column = $raw; - } else { if (empty($columns) || $this->isRaw($columns)) @@ -1059,83 +1007,18 @@ class Medoo $where = $join; } - $column = $column_fn . '(' . $this->columnPush($columns, $map, true) . ')'; + $column = $column_fn . '(' . $this->columnPush($columns, $map) . ')'; } } else { - $column = $this->columnPush($columns, $map, true, $is_join); + $column = $this->columnPush($columns, $map); } return 'SELECT ' . $column . ' FROM ' . $table_query . $this->whereClause($where, $map); } - protected function buildJoin($table, $join) - { - $table_join = []; - - $join_array = [ - '>' => 'LEFT', - '<' => 'RIGHT', - '<>' => 'FULL', - '><' => 'INNER' - ]; - - foreach($join as $sub_table => $relation) - { - preg_match('/(\[(?\<\>?|\>\[a-zA-Z0-9_]+)\s?(\((?[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) + protected function columnMap($columns, &$stack) { if ($columns === '*') { @@ -1178,52 +1061,15 @@ class Medoo } elseif (!is_int($key) && is_array($value)) { - if ($root && count(array_keys($columns)) === 1) - { - $stack[ $key ] = [$key, 'String']; - } - - $this->columnMap($value, $stack, false); + $this->columnMap($value, $stack); } } return $stack; } - protected function dataMap($data, $columns, $column_map, &$stack, $root, &$result) + protected function dataMap($data, $columns, $column_map, &$stack) { - 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); @@ -1234,7 +1080,7 @@ class Medoo $column_key = $map[ 0 ]; - $item = $data[ $column_key ]; + $result = $data[ $column_key ]; if (isset($map[ 1 ])) { @@ -1243,7 +1089,7 @@ class Medoo continue; } - if (is_null($item)) + if (is_null($result)) { $stack[ $column_key ] = null; continue; @@ -1252,103 +1098,50 @@ class Medoo switch ($map[ 1 ]) { case 'Number': - $stack[ $column_key ] = (double) $item; + $stack[ $column_key ] = (double) $result; break; case 'Int': - $stack[ $column_key ] = (int) $item; + $stack[ $column_key ] = (int) $result; break; case 'Bool': - $stack[ $column_key ] = (bool) $item; + $stack[ $column_key ] = (bool) $result; break; case 'Object': - $stack[ $column_key ] = unserialize($item); + $stack[ $column_key ] = unserialize($result); break; case 'JSON': - $stack[ $column_key ] = json_decode($item, true); + $stack[ $column_key ] = json_decode($result, true); break; case 'String': - $stack[ $column_key ] = $item; + $stack[ $column_key ] = $result; break; } } else { - $stack[ $column_key ] = $item; + $stack[ $column_key ] = $result; } } else { $current_stack = []; - $this->dataMap($data, $value, $column_map, $current_stack, false, $result); + $this->dataMap($data, $value, $column_map, $current_stack); $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 = []; - $result = []; + $stack = []; $column_map = []; $index = 0; @@ -1359,9 +1152,9 @@ class Medoo $query = $this->exec($this->selectContext($table, $map, $join, $columns, $where), $map); - $this->columnMap($columns, $column_map, true); + $this->columnMap($columns, $column_map); - if (!$this->statement) + if (!$query) { return false; } @@ -1371,27 +1164,23 @@ 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, true, $result); + $this->dataMap($data, $columns, $column_map, $current_stack); + + $stack[ $index ] = $current_stack; + + $index++; } - 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; + return $stack; } public function insert($table, $datas) @@ -1428,7 +1217,7 @@ class Medoo continue; } - $map_key = $this->mapKey(); + $map_key =$this->mapKey(); $values[] = $map_key; @@ -1468,7 +1257,7 @@ class Medoo } } - $stack[] = '(' . implode(', ', $values) . ')'; + $stack[] = '(' . implode($values, ', ') . ')'; } foreach ($columns as $key) @@ -1584,9 +1373,8 @@ class Medoo public function get($table, $join = null, $columns = null, $where = null) { $map = []; - $result = []; + $stack = []; $column_map = []; - $current_stack = []; if ($where === null) { @@ -1603,31 +1391,33 @@ class Medoo $query = $this->exec($this->selectContext($table, $map, $join, $columns, $where) . ' LIMIT 1', $map); - if (!$this->statement) + if ($query) { + $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; } - $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 ]; - } + return false; } public function has($table, $join, $where = null) @@ -1635,66 +1425,16 @@ class Medoo $map = []; $column = null; - if ($this->type === 'mssql') + $query = $this->exec('SELECT EXISTS(' . $this->selectContext($table, $map, $join, $column, $where, 1) . ')', $map); + + if ($query) { - $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); + $result = $query->fetchColumn(); + + return $result === '1' || $result === true; } - 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); + return false; } private function aggregate($type, $table, $join = null, $column = null, $where = null) @@ -1703,39 +1443,14 @@ class Medoo $query = $this->exec($this->selectContext($table, $map, $join, $column, $where, strtoupper($type)), $map); - if (!$this->statement) + if ($query) { - return false; + $number = $query->fetchColumn(); + + return is_numeric($number) ? $number + 0 : $number; } - $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); + return false; } public function action($actions) @@ -1770,30 +1485,22 @@ 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(); } - $lastId = $this->pdo->lastInsertId(); - - if ($lastId != "0" && $lastId != "") - { - return $lastId; - } - - return null; + return $this->pdo->lastInsertId(); } public function debug() @@ -1805,7 +1512,7 @@ class Medoo public function error() { - return $this->errorInfo; + return $this->statement ? $this->statement->errorInfo() : null; } public function last() @@ -1840,8 +1547,7 @@ class Medoo $output[ $key ] = @$this->pdo->getAttribute(constant('PDO::ATTR_' . $value)); } - $output[ 'dsn' ] = $this->dsn; - return $output; } -} \ No newline at end of file +} +?> \ No newline at end of file diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 13991c13..f698c3fd 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -11,40 +11,19 @@ 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_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_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_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', 'WhereClause' => $vendorDir . '/sergeytsalkov/meekrodb/db.class.php', + 'kakao\\KakaoKey' => $baseDir . '/d_setting/KakaoKey.php', + 'sammo\\RootDB' => $baseDir . '/d_setting/RootDB.php', + 'sammo\\ServConfig' => $baseDir . '/d_setting/ServConfig.php', ); diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php index e8faaee3..c61c1246 100644 --- a/vendor/composer/autoload_files.php +++ b/vendor/composer/autoload_files.php @@ -6,7 +6,6 @@ $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', diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index 9f668b24..9bd88669 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -10,7 +10,6 @@ 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'), @@ -18,6 +17,7 @@ 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'), diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 35cd8ea2..74abef3a 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit7ffbadbed074ecb378689700522bf644 +class ComposerAutoloaderInit67b09c83b85c3bc0027caefe5bba171a { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInit7ffbadbed074ecb378689700522bf644 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit7ffbadbed074ecb378689700522bf644', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit67b09c83b85c3bc0027caefe5bba171a', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit7ffbadbed074ecb378689700522bf644', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit67b09c83b85c3bc0027caefe5bba171a', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { require_once __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit7ffbadbed074ecb378689700522bf644::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit67b09c83b85c3bc0027caefe5bba171a::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInit7ffbadbed074ecb378689700522bf644 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit7ffbadbed074ecb378689700522bf644::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit67b09c83b85c3bc0027caefe5bba171a::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire7ffbadbed074ecb378689700522bf644($fileIdentifier, $file); + composerRequire67b09c83b85c3bc0027caefe5bba171a($fileIdentifier, $file); } return $loader; } } -function composerRequire7ffbadbed074ecb378689700522bf644($fileIdentifier, $file) +function composerRequire67b09c83b85c3bc0027caefe5bba171a($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index e5284d0f..85e66636 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,10 +4,9 @@ namespace Composer\Autoload; -class ComposerStaticInit7ffbadbed074ecb378689700522bf644 +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', @@ -32,7 +31,6 @@ class ComposerStaticInit7ffbadbed074ecb378689700522bf644 'S' => array ( 'Symfony\\Component\\Lock\\' => 23, - 'ScssPhp\\ScssPhp\\' => 16, ), 'P' => array ( @@ -49,6 +47,7 @@ class ComposerStaticInit7ffbadbed074ecb378689700522bf644 'L' => array ( 'League\\Plates\\' => 14, + 'Leafo\\ScssPhp\\' => 14, ), 'G' => array ( @@ -75,10 +74,6 @@ class ComposerStaticInit7ffbadbed074ecb378689700522bf644 array ( 0 => __DIR__ . '/..' . '/symfony/lock', ), - 'ScssPhp\\ScssPhp\\' => - array ( - 0 => __DIR__ . '/..' . '/scssphp/scssphp/src', - ), 'Psr\\Log\\' => array ( 0 => __DIR__ . '/..' . '/psr/log/Psr/Log', @@ -107,6 +102,10 @@ class ComposerStaticInit7ffbadbed074ecb378689700522bf644 array ( 0 => __DIR__ . '/..' . '/league/plates/src', ), + 'Leafo\\ScssPhp\\' => + array ( + 0 => __DIR__ . '/..' . '/leafo/scssphp/src', + ), 'GuzzleHttp\\Psr7\\' => array ( 0 => __DIR__ . '/..' . '/guzzlehttp/psr7/src', @@ -144,51 +143,30 @@ class ComposerStaticInit7ffbadbed074ecb378689700522bf644 '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_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_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_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', 'WhereClause' => __DIR__ . '/..' . '/sergeytsalkov/meekrodb/db.class.php', + 'kakao\\KakaoKey' => __DIR__ . '/../..' . '/d_setting/KakaoKey.php', + 'sammo\\RootDB' => __DIR__ . '/../..' . '/d_setting/RootDB.php', + 'sammo\\ServConfig' => __DIR__ . '/../..' . '/d_setting/ServConfig.php', ); public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit7ffbadbed074ecb378689700522bf644::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit7ffbadbed074ecb378689700522bf644::$prefixDirsPsr4; - $loader->prefixesPsr0 = ComposerStaticInit7ffbadbed074ecb378689700522bf644::$prefixesPsr0; - $loader->classMap = ComposerStaticInit7ffbadbed074ecb378689700522bf644::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit67b09c83b85c3bc0027caefe5bba171a::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit67b09c83b85c3bc0027caefe5bba171a::$prefixDirsPsr4; + $loader->prefixesPsr0 = ComposerStaticInit67b09c83b85c3bc0027caefe5bba171a::$prefixesPsr0; + $loader->classMap = ComposerStaticInit67b09c83b85c3bc0027caefe5bba171a::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index dd219e8c..7b29a9ee 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -49,17 +49,17 @@ }, { "name": "catfan/medoo", - "version": "v1.7.8", - "version_normalized": "1.7.8.0", + "version": "v1.5.7", + "version_normalized": "1.5.7.0", "source": { "type": "git", "url": "https://github.com/catfan/Medoo.git", - "reference": "dd9d570584cfb1e09ec470608479b86e41d5b60d" + "reference": "8d90cba0e8ff176028847527d0ea76fe41a06ecf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/catfan/Medoo/zipball/dd9d570584cfb1e09ec470608479b86e41d5b60d", - "reference": "dd9d570584cfb1e09ec470608479b86e41d5b60d", + "url": "https://api.github.com/repos/catfan/Medoo/zipball/8d90cba0e8ff176028847527d0ea76fe41a06ecf", + "reference": "8d90cba0e8ff176028847527d0ea76fe41a06ecf", "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 on both Window/Liunx platform" + "ext-pdo_sqlsrv": "For MSSQL database" }, - "time": "2019-12-19T05:04:34+00:00", + "time": "2018-06-14T18:59:08+00:00", "type": "framework", "installation-source": "dist", "autoload": { @@ -93,11 +93,10 @@ "email": "angel@catfan.me" } ], - "description": "The lightweight PHP database framework to accelerate development", + "description": "The lightest PHP database framework to accelerate development", "homepage": "https://medoo.in", "keywords": [ "database", - "database library", "lightweight", "mariadb", "mssql", @@ -111,26 +110,26 @@ }, { "name": "ezyang/htmlpurifier", - "version": "v4.12.0", - "version_normalized": "4.12.0.0", + "version": "v4.10.0", + "version_normalized": "4.10.0.0", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "a617e55bc62a87eec73bd456d146d134ad716f03" + "reference": "d85d39da4576a6934b72480be6978fb10c860021" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/a617e55bc62a87eec73bd456d146d134ad716f03", - "reference": "a617e55bc62a87eec73bd456d146d134ad716f03", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/d85d39da4576a6934b72480be6978fb10c860021", + "reference": "d85d39da4576a6934b72480be6978fb10c860021", "shasum": "" }, "require": { "php": ">=5.2" }, "require-dev": { - "simpletest/simpletest": "dev-master#72de02a7b80c6bb8864ef9bf66d41d2f58f826bd" + "simpletest/simpletest": "^1.1" }, - "time": "2019-10-28T03:44:26+00:00", + "time": "2018-02-23T01:58:20+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -143,7 +142,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL-2.1-or-later" + "LGPL" ], "authors": [ { @@ -198,49 +197,47 @@ }, { "name": "guzzlehttp/guzzle", - "version": "6.5.2", - "version_normalized": "6.5.2.0", + "version": "6.3.3", + "version_normalized": "6.3.3.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "43ece0e75098b7ecd8d13918293029e555a50f82" + "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/43ece0e75098b7ecd8d13918293029e555a50f82", - "reference": "43ece0e75098b7ecd8d13918293029e555a50f82", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba", + "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba", "shasum": "" }, "require": { - "ext-json": "*", "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.6.1", + "guzzlehttp/psr7": "^1.4", "php": ">=5.5" }, "require-dev": { "ext-curl": "*", "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", - "psr/log": "^1.1" + "psr/log": "^1.0" }, "suggest": { - "ext-intl": "Required for Internationalized Domain Name (IDN) support", "psr/log": "Required for using the Log middleware" }, - "time": "2019-12-23T11:57:10+00:00", + "time": "2018-04-22T15:46:56+00:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "6.5-dev" + "dev-master": "6.3-dev" } }, "installation-source": "dist", "autoload": { - "psr-4": { - "GuzzleHttp\\": "src/" - }, "files": [ "src/functions_include.php" - ] + ], + "psr-4": { + "GuzzleHttp\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -320,39 +317,34 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.6.1", - "version_normalized": "1.6.1.0", + "version": "1.4.2", + "version_normalized": "1.4.2.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "239400de7a173fe9901b9ac7c06497751f00727a" + "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a", - "reference": "239400de7a173fe9901b9ac7c06497751f00727a", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c", + "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c", "shasum": "" }, "require": { "php": ">=5.4.0", - "psr/http-message": "~1.0", - "ralouphie/getallheaders": "^2.0.5 || ^3.0.0" + "psr/http-message": "~1.0" }, "provide": { "psr/http-message-implementation": "1.0" }, "require-dev": { - "ext-zlib": "*", - "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8" + "phpunit/phpunit": "~4.0" }, - "suggest": { - "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses" - }, - "time": "2019-07-01T23:21:34+00:00", + "time": "2017-03-20T17:10:46+00:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6-dev" + "dev-master": "1.4-dev" } }, "installation-source": "dist", @@ -383,7 +375,6 @@ "keywords": [ "http", "message", - "psr-7", "request", "response", "stream", @@ -391,6 +382,60 @@ "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", @@ -450,17 +495,17 @@ }, { "name": "monolog/monolog", - "version": "1.25.3", - "version_normalized": "1.25.3.0", + "version": "1.23.0", + "version_normalized": "1.23.0.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "fa82921994db851a8becaf3787a9e73c5976b6f1" + "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fa82921994db851a8becaf3787a9e73c5976b6f1", - "reference": "fa82921994db851a8becaf3787a9e73c5976b6f1", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4", + "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4", "shasum": "" }, "require": { @@ -496,7 +541,7 @@ "ruflin/elastica": "Allow sending log messages to an Elastic Search server", "sentry/sentry": "Allow sending log messages to a Sentry server" }, - "time": "2019-12-20T14:15:16+00:00", + "time": "2017-06-19T01:22:40+00:00", "type": "library", "extra": { "branch-alias": { @@ -696,27 +741,27 @@ }, { "name": "psr/log", - "version": "1.1.2", - "version_normalized": "1.1.2.0", + "version": "1.0.2", + "version_normalized": "1.0.2.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", + "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", "shasum": "" }, "require": { "php": ">=5.3.0" }, - "time": "2019-11-01T11:05:21+00:00", + "time": "2016-10-10T12:19:37+00:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "1.0.x-dev" } }, "installation-source": "dist", @@ -743,111 +788,6 @@ "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", @@ -895,36 +835,31 @@ }, { "name": "symfony/lock", - "version": "v4.4.3", - "version_normalized": "4.4.3.0", + "version": "v4.1.1", + "version_normalized": "4.1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/lock.git", - "reference": "6c4f5b620871cfef5b004fc57f2ca74572ae03b3" + "reference": "d508b5dd92272cb74300396ecaadde969d0f7976" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/lock/zipball/6c4f5b620871cfef5b004fc57f2ca74572ae03b3", - "reference": "6c4f5b620871cfef5b004fc57f2ca74572ae03b3", + "url": "https://api.github.com/repos/symfony/lock/zipball/d508b5dd92272cb74300396ecaadde969d0f7976", + "reference": "d508b5dd92272cb74300396ecaadde969d0f7976", "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": "2020-01-04T13:00:46+00:00", + "time": "2018-06-21T11:15:46+00:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "4.1-dev" } }, "installation-source": "dist", @@ -941,13 +876,13 @@ "MIT" ], "authors": [ - { - "name": "Jérémy Derussé", - "email": "jeremy@derusse.com" - }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" + }, + { + "name": "Jérémy Derussé", + "email": "jeremy@derusse.com" } ], "description": "Symfony Lock Component", @@ -963,17 +898,17 @@ }, { "name": "vlucas/valitron", - "version": "v1.4.7", - "version_normalized": "1.4.7.0", + "version": "v1.4.3", + "version_normalized": "1.4.3.0", "source": { "type": "git", "url": "https://github.com/vlucas/valitron.git", - "reference": "a03072bed1679660200766d134507a30193eaf6d" + "reference": "3c5463315bfa23b17f8949b100a960d035234e43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/valitron/zipball/a03072bed1679660200766d134507a30193eaf6d", - "reference": "a03072bed1679660200766d134507a30193eaf6d", + "url": "https://api.github.com/repos/vlucas/valitron/zipball/3c5463315bfa23b17f8949b100a960d035234e43", + "reference": "3c5463315bfa23b17f8949b100a960d035234e43", "shasum": "" }, "require": { @@ -985,7 +920,7 @@ "suggest": { "ext-mbstring": "It can support the multiple bytes string length." }, - "time": "2019-08-29T19:49:43+00:00", + "time": "2018-05-06T10:45:26+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -1014,28 +949,27 @@ }, { "name": "xemlock/htmlpurifier-html5", - "version": "v0.1.11", - "version_normalized": "0.1.11.0", + "version": "v0.1.7", + "version_normalized": "0.1.7.0", "source": { "type": "git", "url": "https://github.com/xemlock/htmlpurifier-html5.git", - "reference": "f0d563f9fd4a82a3d759043483f9a94c0d8c2255" + "reference": "b4b35e51ec75e0207c23035f7d9a354bdcdac359" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/xemlock/htmlpurifier-html5/zipball/f0d563f9fd4a82a3d759043483f9a94c0d8c2255", - "reference": "f0d563f9fd4a82a3d759043483f9a94c0d8c2255", + "url": "https://api.github.com/repos/xemlock/htmlpurifier-html5/zipball/b4b35e51ec75e0207c23035f7d9a354bdcdac359", + "reference": "b4b35e51ec75e0207c23035f7d9a354bdcdac359", "shasum": "" }, "require": { - "ezyang/htmlpurifier": "^4.8", + "ezyang/htmlpurifier": "^4.7", "php": ">=5.2" }, "require-dev": { - "php-coveralls/php-coveralls": "^1.1|^2.1", - "phpunit/phpunit": ">=4.7 <8.0" + "phpunit/phpunit": "4.7.*|5.7.*" }, - "time": "2019-08-07T17:19:21+00:00", + "time": "2018-06-07T14:30:17+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -1053,16 +987,6 @@ "email": "xemlock@gmail.com" } ], - "description": "HTML5 element definitions for HTML Purifier", - "keywords": [ - "HTML5", - "Purifier", - "html", - "htmlpurifier", - "security", - "tidy", - "validator", - "xss" - ] + "description": "HTML Purifier definitions for HTML5 elements" } ] diff --git a/vendor/ezyang/htmlpurifier/INSTALL b/vendor/ezyang/htmlpurifier/INSTALL index 5f6a965f..e6dd02af 100644 --- a/vendor/ezyang/htmlpurifier/INSTALL +++ b/vendor/ezyang/htmlpurifier/INSTALL @@ -15,7 +15,7 @@ with these contents. --------------------------------------------------------------------------- 1. Compatibility -HTML Purifier is PHP 5 and PHP 7, and is actively tested from PHP 5.3 +HTML Purifier is PHP 5 and PHP 7, and is actively tested from PHP 5.0.5 and up. It has no core dependencies with other libraries. These optional extensions can enhance the capabilities of HTML Purifier: @@ -101,6 +101,31 @@ 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 @@ -113,6 +138,11 @@ 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 ---------------------- @@ -174,7 +204,9 @@ For advanced users HTMLPurifier.autoload.php Registers our autoload handler HTMLPurifier_Bootstrap::autoload($class). - You can do these operations by yourself, if you like. + 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). --------------------------------------------------------------------------- diff --git a/vendor/ezyang/htmlpurifier/INSTALL.fr.utf8 b/vendor/ezyang/htmlpurifier/INSTALL.fr.utf8 index 629387e2..95164abb 100644 --- a/vendor/ezyang/htmlpurifier/INSTALL.fr.utf8 +++ b/vendor/ezyang/htmlpurifier/INSTALL.fr.utf8 @@ -11,7 +11,7 @@ pied de page, mais je recommande de lire le document. 1. Compatibilité -HTML Purifier fonctionne avec PHP 5. PHP 5.3 est la dernière version testée. +HTML Purifier fonctionne avec PHP 5. PHP 5.0.5 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 diff --git a/vendor/ezyang/htmlpurifier/NEWS b/vendor/ezyang/htmlpurifier/NEWS index 35283501..9b6e1023 100644 --- a/vendor/ezyang/htmlpurifier/NEWS +++ b/vendor/ezyang/htmlpurifier/NEWS @@ -9,40 +9,6 @@ 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 - for reporting. -! New directive %Core.AllowParseManyTags which allows parsing of many nested tags. - Thanks M. Suzuki for contributing the patch. -! purifyArray now supports multidimensional arrays. Thanks - Sandro Miguel Marques for contributing this patch. -! initial and inherit settings available for width, height, and the min-/max- - versions thereof. Thanks Michael Kliewe 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 ) and removal of - reserved words in our constants (thanks Darko Hrgovic -- 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