diff --git a/application/app/Http/Controllers/InstallController.php b/application/app/Http/Controllers/InstallController.php index 51bf0f4..aa8287e 100644 --- a/application/app/Http/Controllers/InstallController.php +++ b/application/app/Http/Controllers/InstallController.php @@ -1,5 +1,7 @@ 'required|url', - 'locale' => 'required', - 'timezone' => 'required', - 'key' => 'required|min:32|max:32', + public function install(Request $request) { - 'name' => 'required|min:3|max:255', - 'email' => 'required|email|max:255', //unique:users removed, as user table does not yet exist - 'password' => 'required|confirmed|min:6', - ]; + $this->validate($request, [ + 'host' => 'required|custom_url', + 'locale' => 'required', + 'timezone' => 'required', + 'key' => 'required|min:32|max:32', - $validator = \Validator::make(\Input::all(), $rules); - - if($validator->fails()) { - return redirect('/install/config') - ->withErrors($validator) - ->withInput(\Input::except('password')); - } + 'name' => 'required|min:3|max:255', + 'email' => 'required|email|max:255', //unique:users removed, as user table does not yet exist + 'password' => 'required|confirmed|min:6', + ]); echo view('install.run'); try { define('STDIN', fopen("php://stdin","r")); - //\Artisan::call('migrate:install'); - \Artisan::call('migrate', [ + \Artisan::call('migrate:refresh', [ '--path' => 'database/migrations', '--env' => 'install', - '--quiet' => true, + '--quiet' => true, '--force' => true ]); } catch(\Exception $e) { diff --git a/application/app/Providers/AppServiceProvider.php b/application/app/Providers/AppServiceProvider.php index 8f2e405..1090816 100644 --- a/application/app/Providers/AppServiceProvider.php +++ b/application/app/Providers/AppServiceProvider.php @@ -1,6 +1,7 @@ http://symfony.com + */ + $pattern = '~^ + (aaa|aaas|about|acap|acct|acd|acr|adiumxtra|adt|afp|afs|aim|amss|android|appdata|apt|ark|attachment|aw|barion|beshare|bitcoin|bitcoincash|blob|bolo|browserext|calculator|callto|cap|cast|casts|chrome|chrome-extension|cid|coap|coap\+tcp|coap\+ws|coaps|coaps\+tcp|coaps\+ws|com-eventbrite-attendee|content|conti|crid|cvs|dab|data|dav|diaspora|dict|did|dis|dlna-playcontainer|dlna-playsingle|dns|dntp|dpp|drm|drop|dtn|dvb|ed2k|elsi|example|facetime|fax|feed|feedready|file|filesystem|finger|first-run-pen-experience|fish|fm|ftp|fuchsia-pkg|geo|gg|git|gizmoproject|go|gopher|graph|gtalk|h323|ham|hcap|hcp|http|https|hxxp|hxxps|hydrazone|iax|icap|icon|im|imap|info|iotdisco|ipn|ipp|ipps|irc|irc6|ircs|iris|iris\.beep|iris\.lwz|iris\.xpc|iris\.xpcs|isostore|itms|jabber|jar|jms|keyparc|lastfm|ldap|ldaps|leaptofrogans|lorawan|lvlt|magnet|mailserver|mailto|maps|market|message|mid|mms|modem|mongodb|moz|ms-access|ms-browser-extension|ms-calculator|ms-drive-to|ms-enrollment|ms-excel|ms-eyecontrolspeech|ms-gamebarservices|ms-gamingoverlay|ms-getoffice|ms-help|ms-infopath|ms-inputapp|ms-lockscreencomponent-config|ms-media-stream-id|ms-mixedrealitycapture|ms-mobileplans|ms-officeapp|ms-people|ms-project|ms-powerpoint|ms-publisher|ms-restoretabcompanion|ms-screenclip|ms-screensketch|ms-search|ms-search-repair|ms-secondary-screen-controller|ms-secondary-screen-setup|ms-settings|ms-settings-airplanemode|ms-settings-bluetooth|ms-settings-camera|ms-settings-cellular|ms-settings-cloudstorage|ms-settings-connectabledevices|ms-settings-displays-topology|ms-settings-emailandaccounts|ms-settings-language|ms-settings-location|ms-settings-lock|ms-settings-nfctransactions|ms-settings-notifications|ms-settings-power|ms-settings-privacy|ms-settings-proximity|ms-settings-screenrotation|ms-settings-wifi|ms-settings-workplace|ms-spd|ms-sttoverlay|ms-transit-to|ms-useractivityset|ms-virtualtouchpad|ms-visio|ms-walk-to|ms-whiteboard|ms-whiteboard-cmd|ms-word|msnim|msrp|msrps|mss|mtqp|mumble|mupdate|mvn|news|nfs|ni|nih|nntp|notes|ocf|oid|onenote|onenote-cmd|opaquelocktoken|openpgp4fpr|pack|palm|paparazzi|payto|pkcs11|platform|pop|pres|prospero|proxy|pwid|psyc|pttp|qb|query|redis|rediss|reload|res|resource|rmi|rsync|rtmfp|rtmp|rtsp|rtsps|rtspu|s3|secondlife|service|session|sftp|sgn|shttp|sieve|simpleledger|sip|sips|skype|smb|sms|smtp|snews|snmp|soap\.beep|soap\.beeps|soldat|spiffe|spotify|ssh|steam|stun|stuns|submit|svn|tag|teamspeak|tel|teliaeid|telnet|tftp|things|thismessage|tip|tn3270|tool|turn|turns|tv|udp|unreal|urn|ut2004|v-event|vemmi|ventrilo|videotex|vnc|view-source|wais|webcal|wpid|ws|wss|wtai|wyciwyg|xcon|xcon-userid|xfire|xmlrpc\.beep|xmlrpc\.beeps|xmpp|xri|ymsgr|z39\.50|z39\.50r|z39\.50s):// # protocol + (((?:[\_\.\pL\pN-]|%[0-9A-Fa-f]{2})+:)?((?:[\_\.\pL\pN-]|%[0-9A-Fa-f]{2})+)@)? # basic auth + ( + ([\pL\pN\pS\-\_\.])+(\.?([\pL\pN]|xn\-\-[\pL\pN-]+)+\.?) # a domain name + | # or + \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} # an IP address + | # or + \[ + (?:(?:(?:(?:(?:(?:(?:[0-9a-f]{1,4})):){6})(?:(?:(?:(?:(?:[0-9a-f]{1,4})):(?:(?:[0-9a-f]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:::(?:(?:(?:[0-9a-f]{1,4})):){5})(?:(?:(?:(?:(?:[0-9a-f]{1,4})):(?:(?:[0-9a-f]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:[0-9a-f]{1,4})))?::(?:(?:(?:[0-9a-f]{1,4})):){4})(?:(?:(?:(?:(?:[0-9a-f]{1,4})):(?:(?:[0-9a-f]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-f]{1,4})):){0,1}(?:(?:[0-9a-f]{1,4})))?::(?:(?:(?:[0-9a-f]{1,4})):){3})(?:(?:(?:(?:(?:[0-9a-f]{1,4})):(?:(?:[0-9a-f]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-f]{1,4})):){0,2}(?:(?:[0-9a-f]{1,4})))?::(?:(?:(?:[0-9a-f]{1,4})):){2})(?:(?:(?:(?:(?:[0-9a-f]{1,4})):(?:(?:[0-9a-f]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-f]{1,4})):){0,3}(?:(?:[0-9a-f]{1,4})))?::(?:(?:[0-9a-f]{1,4})):)(?:(?:(?:(?:(?:[0-9a-f]{1,4})):(?:(?:[0-9a-f]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-f]{1,4})):){0,4}(?:(?:[0-9a-f]{1,4})))?::)(?:(?:(?:(?:(?:[0-9a-f]{1,4})):(?:(?:[0-9a-f]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-f]{1,4})):){0,5}(?:(?:[0-9a-f]{1,4})))?::)(?:(?:[0-9a-f]{1,4})))|(?:(?:(?:(?:(?:(?:[0-9a-f]{1,4})):){0,6}(?:(?:[0-9a-f]{1,4})))?::)))) + \] # an IPv6 address + ) + (:[0-9]+)? # a port (optional) + (?:/ (?:[\pL\pN\-._\~!$&\'()*+,;=:@]|%[0-9A-Fa-f]{2})* )* # a path + (?:\? (?:[\pL\pN\-._\~!$&\'\[\]()*+,;=:@/?]|%[0-9A-Fa-f]{2})* )? # a query (optional) + (?:\# (?:[\pL\pN\-._\~!$&\'()*+,;=:@/?]|%[0-9A-Fa-f]{2})* )? # a fragment (optional) + $~ixu'; + + return preg_match($pattern, $value) > 0; + }); } /** diff --git a/application/composer.lock b/application/composer.lock index 73b2377..1092d6a 100644 --- a/application/composer.lock +++ b/application/composer.lock @@ -674,16 +674,16 @@ }, { "name": "league/mime-type-detection", - "version": "1.4.0", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "fda190b62b962d96a069fcc414d781db66d65b69" + "reference": "353f66d7555d8a90781f6f5e7091932f9a4250aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/fda190b62b962d96a069fcc414d781db66d65b69", - "reference": "fda190b62b962d96a069fcc414d781db66d65b69", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/353f66d7555d8a90781f6f5e7091932f9a4250aa", + "reference": "353f66d7555d8a90781f6f5e7091932f9a4250aa", "shasum": "" }, "require": { @@ -721,7 +721,7 @@ "type": "tidelift" } ], - "time": "2020-08-09T10:34:01+00:00" + "time": "2020-10-18T11:50:25+00:00" }, { "name": "monolog/monolog", @@ -1307,16 +1307,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v3.4.44", + "version": "v3.4.46", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "a0f6858fbf7a524747e87a4c336cab7d0b67c802" + "reference": "31fde73757b6bad247c54597beef974919ec6860" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a0f6858fbf7a524747e87a4c336cab7d0b67c802", - "reference": "a0f6858fbf7a524747e87a4c336cab7d0b67c802", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/31fde73757b6bad247c54597beef974919ec6860", + "reference": "31fde73757b6bad247c54597beef974919ec6860", "shasum": "" }, "require": { @@ -1328,6 +1328,7 @@ "require-dev": { "psr/log": "~1.0", "symfony/config": "~2.8|~3.0|~4.0", + "symfony/debug": "~3.4|~4.4", "symfony/dependency-injection": "~3.3|~4.0", "symfony/expression-language": "~2.8|~3.0|~4.0", "symfony/stopwatch": "~2.8|~3.0|~4.0" @@ -1337,11 +1338,6 @@ "symfony/http-kernel": "" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\EventDispatcher\\": "" @@ -1380,7 +1376,7 @@ "type": "tidelift" } ], - "time": "2020-08-12T14:55:37+00:00" + "time": "2020-10-24T10:57:07+00:00" }, { "name": "symfony/finder", @@ -1568,20 +1564,20 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.18.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "1c302646f6efc070cd46856e600e5e0684d6b454" + "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454", - "reference": "1c302646f6efc070cd46856e600e5e0684d6b454", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f4ba089a5b6366e453971d3aad5fe8e897b37f41", + "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "suggest": { "ext-ctype": "For best performance" @@ -1589,7 +1585,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1640,24 +1636,24 @@ "type": "tidelift" } ], - "time": "2020-07-14T12:35:20+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.18.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a" + "reference": "39d483bdf39be819deabf04ec872eb0b2410b531" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a", - "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/39d483bdf39be819deabf04ec872eb0b2410b531", + "reference": "39d483bdf39be819deabf04ec872eb0b2410b531", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "suggest": { "ext-mbstring": "For best performance" @@ -1665,7 +1661,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1717,44 +1713,35 @@ "type": "tidelift" } ], - "time": "2020-07-14T12:35:20+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/polyfill-php56", - "version": "v1.18.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "13df84e91cd168f247c2f2ec82cc0fa24901c011" + "reference": "54b8cd7e6c1643d78d011f3be89f3ef1f9f4c675" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/13df84e91cd168f247c2f2ec82cc0fa24901c011", - "reference": "13df84e91cd168f247c2f2ec82cc0fa24901c011", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/54b8cd7e6c1643d78d011f3be89f3ef1f9f4c675", + "reference": "54b8cd7e6c1643d78d011f3be89f3ef1f9f4c675", "shasum": "" }, "require": { - "php": ">=5.3.3", - "symfony/polyfill-util": "~1.0" + "php": ">=7.1" }, - "type": "library", + "type": "metapackage", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" } }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php56\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" @@ -1791,77 +1778,7 @@ "type": "tidelift" } ], - "time": "2020-07-14T12:35:20+00:00" - }, - { - "name": "symfony/polyfill-util", - "version": "v1.18.1", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-util.git", - "reference": "46b910c71e9828f8ec2aa7a0314de1130d9b295a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/46b910c71e9828f8ec2aa7a0314de1130d9b295a", - "reference": "46b910c71e9828f8ec2aa7a0314de1130d9b295a", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.18-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Util\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony utilities for portability of PHP codes", - "homepage": "https://symfony.com", - "keywords": [ - "compat", - "compatibility", - "polyfill", - "shim" - ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-07-14T12:35:20+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/process", @@ -2190,27 +2107,22 @@ "packages-dev": [ { "name": "symfony/css-selector", - "version": "v3.4.44", + "version": "v3.4.46", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "9ccf6e78077a3fc1596e6c7b5958008965a11518" + "reference": "da3d9da2ce0026771f5fe64cb332158f1bd2bc33" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/9ccf6e78077a3fc1596e6c7b5958008965a11518", - "reference": "9ccf6e78077a3fc1596e6c7b5958008965a11518", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/da3d9da2ce0026771f5fe64cb332158f1bd2bc33", + "reference": "da3d9da2ce0026771f5fe64cb332158f1bd2bc33", "shasum": "" }, "require": { "php": "^5.5.9|>=7.0.8" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\CssSelector\\": "" @@ -2253,20 +2165,20 @@ "type": "tidelift" } ], - "time": "2020-03-16T08:31:04+00:00" + "time": "2020-10-24T10:57:07+00:00" }, { "name": "symfony/dom-crawler", - "version": "v3.4.44", + "version": "v3.4.46", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "702ee651db23dc452bf1fd6dea6ca2f671ed2681" + "reference": "ef97bcfbae5b384b4ca6c8d57b617722f15241a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/702ee651db23dc452bf1fd6dea6ca2f671ed2681", - "reference": "702ee651db23dc452bf1fd6dea6ca2f671ed2681", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/ef97bcfbae5b384b4ca6c8d57b617722f15241a6", + "reference": "ef97bcfbae5b384b4ca6c8d57b617722f15241a6", "shasum": "" }, "require": { @@ -2281,11 +2193,6 @@ "symfony/css-selector": "" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\DomCrawler\\": "" @@ -2324,7 +2231,7 @@ "type": "tidelift" } ], - "time": "2020-08-09T09:13:53+00:00" + "time": "2020-10-24T10:57:07+00:00" } ], "aliases": [], diff --git a/application/resources/lang/de/validation.php b/application/resources/lang/de/validation.php index 5bfed4a..ef3cc59 100644 --- a/application/resources/lang/de/validation.php +++ b/application/resources/lang/de/validation.php @@ -72,6 +72,7 @@ ], "unique" => ":attribute wird bereits verwendet.", "url" => ":attribute ist ungültig.", + "custom_url" => ":attribute ist ungültig.", "timezone" => ":attribute muss eine gültige Zeitzone sein.", "role" => ":attribute muss eine gültige Benutzer-Rolle sein.", "future" => ":attribute muss eine gültige Zeit bzw. Datum sein.", diff --git a/application/resources/lang/en/validation.php b/application/resources/lang/en/validation.php index 18ea218..97b30b3 100644 --- a/application/resources/lang/en/validation.php +++ b/application/resources/lang/en/validation.php @@ -72,6 +72,7 @@ ], "unique" => "The :attribute has already been taken.", "url" => "The :attribute format is invalid.", + "custom_url" => "The :attribute format is invalid.", "timezone" => "The :attribute must be a valid zone.", "role" => "The :attribute has to be a valid user role.", "future" => "The :attribute has to be a valid expire datetime.", diff --git a/application/vendor/composer/ClassLoader.php b/application/vendor/composer/ClassLoader.php index fce8549..03b9bb9 100644 --- a/application/vendor/composer/ClassLoader.php +++ b/application/vendor/composer/ClassLoader.php @@ -60,7 +60,7 @@ class ClassLoader public function getPrefixes() { if (!empty($this->prefixesPsr0)) { - return call_user_func_array('array_merge', $this->prefixesPsr0); + return call_user_func_array('array_merge', array_values($this->prefixesPsr0)); } return array(); diff --git a/application/vendor/composer/autoload_classmap.php b/application/vendor/composer/autoload_classmap.php index cb692c7..c70e648 100644 --- a/application/vendor/composer/autoload_classmap.php +++ b/application/vendor/composer/autoload_classmap.php @@ -1696,15 +1696,6 @@ 'Symfony\\Component\\VarDumper\\VarDumper' => $vendorDir . '/symfony/var-dumper/VarDumper.php', 'Symfony\\Polyfill\\Ctype\\Ctype' => $vendorDir . '/symfony/polyfill-ctype/Ctype.php', 'Symfony\\Polyfill\\Mbstring\\Mbstring' => $vendorDir . '/symfony/polyfill-mbstring/Mbstring.php', - 'Symfony\\Polyfill\\Php56\\Php56' => $vendorDir . '/symfony/polyfill-php56/Php56.php', - 'Symfony\\Polyfill\\Util\\Binary' => $vendorDir . '/symfony/polyfill-util/Binary.php', - 'Symfony\\Polyfill\\Util\\BinaryNoFuncOverload' => $vendorDir . '/symfony/polyfill-util/BinaryNoFuncOverload.php', - 'Symfony\\Polyfill\\Util\\BinaryOnFuncOverload' => $vendorDir . '/symfony/polyfill-util/BinaryOnFuncOverload.php', - 'Symfony\\Polyfill\\Util\\TestListener' => $vendorDir . '/symfony/polyfill-util/TestListener.php', - 'Symfony\\Polyfill\\Util\\TestListenerForV5' => $vendorDir . '/symfony/polyfill-util/TestListenerForV5.php', - 'Symfony\\Polyfill\\Util\\TestListenerForV6' => $vendorDir . '/symfony/polyfill-util/TestListenerForV6.php', - 'Symfony\\Polyfill\\Util\\TestListenerForV7' => $vendorDir . '/symfony/polyfill-util/TestListenerForV7.php', - 'Symfony\\Polyfill\\Util\\TestListenerTrait' => $vendorDir . '/symfony/polyfill-util/TestListenerTrait.php', 'UpdateHelper\\ComposerPlugin' => $vendorDir . '/kylekatarnls/update-helper/src/UpdateHelper/ComposerPlugin.php', 'UpdateHelper\\NotUpdateInterfaceInstanceException' => $vendorDir . '/kylekatarnls/update-helper/src/UpdateHelper/NotUpdateInterfaceInstanceException.php', 'UpdateHelper\\UpdateHelper' => $vendorDir . '/kylekatarnls/update-helper/src/UpdateHelper/UpdateHelper.php', diff --git a/application/vendor/composer/autoload_files.php b/application/vendor/composer/autoload_files.php index ec7f990..142dc6f 100644 --- a/application/vendor/composer/autoload_files.php +++ b/application/vendor/composer/autoload_files.php @@ -10,7 +10,6 @@ '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php', '667aeda72477189d0494fecd327c3641' => $vendorDir . '/symfony/var-dumper/Resources/functions/dump.php', '2c102faa651ef8ea5874edb585946bce' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php', - 'bd9634f2d41831496de0d3dfe4c94881' => $vendorDir . '/symfony/polyfill-php56/bootstrap.php', '5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php', 'e7223560d890eab89cda23685e711e2c' => $vendorDir . '/psy/psysh/src/Psy/functions.php', 'f0906e6318348a765ffb6eb24e0d0938' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/helpers.php', diff --git a/application/vendor/composer/autoload_psr4.php b/application/vendor/composer/autoload_psr4.php index 3b9b161..0d0670d 100644 --- a/application/vendor/composer/autoload_psr4.php +++ b/application/vendor/composer/autoload_psr4.php @@ -7,8 +7,6 @@ return array( 'XdgBaseDir\\' => array($vendorDir . '/dnoegel/php-xdg-base-dir/src'), - 'Symfony\\Polyfill\\Util\\' => array($vendorDir . '/symfony/polyfill-util'), - 'Symfony\\Polyfill\\Php56\\' => array($vendorDir . '/symfony/polyfill-php56'), 'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'), 'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'), 'Symfony\\Component\\VarDumper\\' => array($vendorDir . '/symfony/var-dumper'), diff --git a/application/vendor/composer/autoload_static.php b/application/vendor/composer/autoload_static.php index e114cdc..5d4a9d7 100644 --- a/application/vendor/composer/autoload_static.php +++ b/application/vendor/composer/autoload_static.php @@ -11,7 +11,6 @@ class ComposerStaticInitf78e08ce03e899835ef37b4c3f44d248 '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php', '667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php', '2c102faa651ef8ea5874edb585946bce' => __DIR__ . '/..' . '/swiftmailer/swiftmailer/lib/swift_required.php', - 'bd9634f2d41831496de0d3dfe4c94881' => __DIR__ . '/..' . '/symfony/polyfill-php56/bootstrap.php', '5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php', 'e7223560d890eab89cda23685e711e2c' => __DIR__ . '/..' . '/psy/psysh/src/Psy/functions.php', 'f0906e6318348a765ffb6eb24e0d0938' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/helpers.php', @@ -26,8 +25,6 @@ class ComposerStaticInitf78e08ce03e899835ef37b4c3f44d248 ), 'S' => array ( - 'Symfony\\Polyfill\\Util\\' => 22, - 'Symfony\\Polyfill\\Php56\\' => 23, 'Symfony\\Polyfill\\Mbstring\\' => 26, 'Symfony\\Polyfill\\Ctype\\' => 23, 'Symfony\\Component\\VarDumper\\' => 28, @@ -90,14 +87,6 @@ class ComposerStaticInitf78e08ce03e899835ef37b4c3f44d248 array ( 0 => __DIR__ . '/..' . '/dnoegel/php-xdg-base-dir/src', ), - 'Symfony\\Polyfill\\Util\\' => - array ( - 0 => __DIR__ . '/..' . '/symfony/polyfill-util', - ), - 'Symfony\\Polyfill\\Php56\\' => - array ( - 0 => __DIR__ . '/..' . '/symfony/polyfill-php56', - ), 'Symfony\\Polyfill\\Mbstring\\' => array ( 0 => __DIR__ . '/..' . '/symfony/polyfill-mbstring', @@ -1932,15 +1921,6 @@ class ComposerStaticInitf78e08ce03e899835ef37b4c3f44d248 'Symfony\\Component\\VarDumper\\VarDumper' => __DIR__ . '/..' . '/symfony/var-dumper/VarDumper.php', 'Symfony\\Polyfill\\Ctype\\Ctype' => __DIR__ . '/..' . '/symfony/polyfill-ctype/Ctype.php', 'Symfony\\Polyfill\\Mbstring\\Mbstring' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/Mbstring.php', - 'Symfony\\Polyfill\\Php56\\Php56' => __DIR__ . '/..' . '/symfony/polyfill-php56/Php56.php', - 'Symfony\\Polyfill\\Util\\Binary' => __DIR__ . '/..' . '/symfony/polyfill-util/Binary.php', - 'Symfony\\Polyfill\\Util\\BinaryNoFuncOverload' => __DIR__ . '/..' . '/symfony/polyfill-util/BinaryNoFuncOverload.php', - 'Symfony\\Polyfill\\Util\\BinaryOnFuncOverload' => __DIR__ . '/..' . '/symfony/polyfill-util/BinaryOnFuncOverload.php', - 'Symfony\\Polyfill\\Util\\TestListener' => __DIR__ . '/..' . '/symfony/polyfill-util/TestListener.php', - 'Symfony\\Polyfill\\Util\\TestListenerForV5' => __DIR__ . '/..' . '/symfony/polyfill-util/TestListenerForV5.php', - 'Symfony\\Polyfill\\Util\\TestListenerForV6' => __DIR__ . '/..' . '/symfony/polyfill-util/TestListenerForV6.php', - 'Symfony\\Polyfill\\Util\\TestListenerForV7' => __DIR__ . '/..' . '/symfony/polyfill-util/TestListenerForV7.php', - 'Symfony\\Polyfill\\Util\\TestListenerTrait' => __DIR__ . '/..' . '/symfony/polyfill-util/TestListenerTrait.php', 'UpdateHelper\\ComposerPlugin' => __DIR__ . '/..' . '/kylekatarnls/update-helper/src/UpdateHelper/ComposerPlugin.php', 'UpdateHelper\\NotUpdateInterfaceInstanceException' => __DIR__ . '/..' . '/kylekatarnls/update-helper/src/UpdateHelper/NotUpdateInterfaceInstanceException.php', 'UpdateHelper\\UpdateHelper' => __DIR__ . '/..' . '/kylekatarnls/update-helper/src/UpdateHelper/UpdateHelper.php', diff --git a/application/vendor/composer/installed.json b/application/vendor/composer/installed.json index d243100..3abc49a 100644 --- a/application/vendor/composer/installed.json +++ b/application/vendor/composer/installed.json @@ -687,17 +687,17 @@ }, { "name": "league/mime-type-detection", - "version": "1.4.0", - "version_normalized": "1.4.0.0", + "version": "1.5.1", + "version_normalized": "1.5.1.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "fda190b62b962d96a069fcc414d781db66d65b69" + "reference": "353f66d7555d8a90781f6f5e7091932f9a4250aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/fda190b62b962d96a069fcc414d781db66d65b69", - "reference": "fda190b62b962d96a069fcc414d781db66d65b69", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/353f66d7555d8a90781f6f5e7091932f9a4250aa", + "reference": "353f66d7555d8a90781f6f5e7091932f9a4250aa", "shasum": "" }, "require": { @@ -708,7 +708,7 @@ "phpstan/phpstan": "^0.12.36", "phpunit/phpunit": "^8.5.8" }, - "time": "2020-08-09T10:34:01+00:00", + "time": "2020-10-18T11:50:25+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -1283,29 +1283,24 @@ }, { "name": "symfony/css-selector", - "version": "v3.4.44", - "version_normalized": "3.4.44.0", + "version": "v3.4.46", + "version_normalized": "3.4.46.0", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "9ccf6e78077a3fc1596e6c7b5958008965a11518" + "reference": "da3d9da2ce0026771f5fe64cb332158f1bd2bc33" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/9ccf6e78077a3fc1596e6c7b5958008965a11518", - "reference": "9ccf6e78077a3fc1596e6c7b5958008965a11518", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/da3d9da2ce0026771f5fe64cb332158f1bd2bc33", + "reference": "da3d9da2ce0026771f5fe64cb332158f1bd2bc33", "shasum": "" }, "require": { "php": "^5.5.9|>=7.0.8" }, - "time": "2020-03-16T08:31:04+00:00", + "time": "2020-10-24T10:57:07+00:00", "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, "installation-source": "dist", "autoload": { "psr-4": { @@ -1411,17 +1406,17 @@ }, { "name": "symfony/dom-crawler", - "version": "v3.4.44", - "version_normalized": "3.4.44.0", + "version": "v3.4.46", + "version_normalized": "3.4.46.0", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "702ee651db23dc452bf1fd6dea6ca2f671ed2681" + "reference": "ef97bcfbae5b384b4ca6c8d57b617722f15241a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/702ee651db23dc452bf1fd6dea6ca2f671ed2681", - "reference": "702ee651db23dc452bf1fd6dea6ca2f671ed2681", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/ef97bcfbae5b384b4ca6c8d57b617722f15241a6", + "reference": "ef97bcfbae5b384b4ca6c8d57b617722f15241a6", "shasum": "" }, "require": { @@ -1435,13 +1430,8 @@ "suggest": { "symfony/css-selector": "" }, - "time": "2020-08-09T09:13:53+00:00", + "time": "2020-10-24T10:57:07+00:00", "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, "installation-source": "dist", "autoload": { "psr-4": { @@ -1484,17 +1474,17 @@ }, { "name": "symfony/event-dispatcher", - "version": "v3.4.44", - "version_normalized": "3.4.44.0", + "version": "v3.4.46", + "version_normalized": "3.4.46.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "a0f6858fbf7a524747e87a4c336cab7d0b67c802" + "reference": "31fde73757b6bad247c54597beef974919ec6860" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a0f6858fbf7a524747e87a4c336cab7d0b67c802", - "reference": "a0f6858fbf7a524747e87a4c336cab7d0b67c802", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/31fde73757b6bad247c54597beef974919ec6860", + "reference": "31fde73757b6bad247c54597beef974919ec6860", "shasum": "" }, "require": { @@ -1506,6 +1496,7 @@ "require-dev": { "psr/log": "~1.0", "symfony/config": "~2.8|~3.0|~4.0", + "symfony/debug": "~3.4|~4.4", "symfony/dependency-injection": "~3.3|~4.0", "symfony/expression-language": "~2.8|~3.0|~4.0", "symfony/stopwatch": "~2.8|~3.0|~4.0" @@ -1514,13 +1505,8 @@ "symfony/dependency-injection": "", "symfony/http-kernel": "" }, - "time": "2020-08-12T14:55:37+00:00", + "time": "2020-10-24T10:57:07+00:00", "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, "installation-source": "dist", "autoload": { "psr-4": { @@ -1753,30 +1739,30 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.18.1", - "version_normalized": "1.18.1.0", + "version": "v1.20.0", + "version_normalized": "1.20.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "1c302646f6efc070cd46856e600e5e0684d6b454" + "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454", - "reference": "1c302646f6efc070cd46856e600e5e0684d6b454", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f4ba089a5b6366e453971d3aad5fe8e897b37f41", + "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "suggest": { "ext-ctype": "For best performance" }, - "time": "2020-07-14T12:35:20+00:00", + "time": "2020-10-23T14:02:19+00:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1831,30 +1817,30 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.18.1", - "version_normalized": "1.18.1.0", + "version": "v1.20.0", + "version_normalized": "1.20.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a" + "reference": "39d483bdf39be819deabf04ec872eb0b2410b531" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a", - "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/39d483bdf39be819deabf04ec872eb0b2410b531", + "reference": "39d483bdf39be819deabf04ec872eb0b2410b531", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "suggest": { "ext-mbstring": "For best performance" }, - "time": "2020-07-14T12:35:20+00:00", + "time": "2020-10-23T14:02:19+00:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1910,43 +1896,33 @@ }, { "name": "symfony/polyfill-php56", - "version": "v1.18.1", - "version_normalized": "1.18.1.0", + "version": "v1.20.0", + "version_normalized": "1.20.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "13df84e91cd168f247c2f2ec82cc0fa24901c011" + "reference": "54b8cd7e6c1643d78d011f3be89f3ef1f9f4c675" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/13df84e91cd168f247c2f2ec82cc0fa24901c011", - "reference": "13df84e91cd168f247c2f2ec82cc0fa24901c011", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/54b8cd7e6c1643d78d011f3be89f3ef1f9f4c675", + "reference": "54b8cd7e6c1643d78d011f3be89f3ef1f9f4c675", "shasum": "" }, "require": { - "php": ">=5.3.3", - "symfony/polyfill-util": "~1.0" + "php": ">=7.1" }, - "time": "2020-07-14T12:35:20+00:00", - "type": "library", + "time": "2020-10-23T14:02:19+00:00", + "type": "metapackage", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" } }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php56\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" @@ -1984,78 +1960,6 @@ } ] }, - { - "name": "symfony/polyfill-util", - "version": "v1.18.1", - "version_normalized": "1.18.1.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-util.git", - "reference": "46b910c71e9828f8ec2aa7a0314de1130d9b295a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/46b910c71e9828f8ec2aa7a0314de1130d9b295a", - "reference": "46b910c71e9828f8ec2aa7a0314de1130d9b295a", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "time": "2020-07-14T12:35:20+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.18-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Util\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony utilities for portability of PHP codes", - "homepage": "https://symfony.com", - "keywords": [ - "compat", - "compatibility", - "polyfill", - "shim" - ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ] - }, { "name": "symfony/process", "version": "v3.0.9", diff --git a/application/vendor/league/mime-type-detection/src/GeneratedExtensionToMimeTypeMap.php b/application/vendor/league/mime-type-detection/src/GeneratedExtensionToMimeTypeMap.php index 19f2ed3..a208647 100644 --- a/application/vendor/league/mime-type-detection/src/GeneratedExtensionToMimeTypeMap.php +++ b/application/vendor/league/mime-type-detection/src/GeneratedExtensionToMimeTypeMap.php @@ -70,6 +70,7 @@ class GeneratedExtensionToMimeTypeMap implements ExtensionToMimeTypeMap 'azs' => 'application/vnd.airzip.filesecure.azs', 'azv' => 'image/vnd.airzip.accelerator.azv', 'azw' => 'application/vnd.amazon.ebook', + 'b16' => 'image/vnd.pco.b16', 'bat' => 'application/x-msdownload', 'bcpio' => 'application/x-bcpio', 'bdf' => 'application/x-font-bdf', @@ -181,6 +182,7 @@ class GeneratedExtensionToMimeTypeMap implements ExtensionToMimeTypeMap 'dart' => 'application/vnd.dart', 'dataless' => 'application/vnd.fdsn.seed', 'davmount' => 'application/davmount+xml', + 'dbf' => 'application/vnd.dbf', 'dbk' => 'application/docbook+xml', 'dcr' => 'application/x-director', 'dcurl' => 'text/vnd.curl.dcurl', @@ -468,6 +470,7 @@ class GeneratedExtensionToMimeTypeMap implements ExtensionToMimeTypeMap 'ksp' => 'application/vnd.kde.kspread', 'ktr' => 'application/vnd.kahootz', 'ktx' => 'image/ktx', + 'ktx2' => 'image/ktx2', 'ktz' => 'application/vnd.kahootz', 'kwd' => 'application/vnd.kde.kword', 'kwt' => 'application/vnd.kde.kword', diff --git a/application/vendor/symfony/css-selector/composer.json b/application/vendor/symfony/css-selector/composer.json index 56ab35b..435063f 100644 --- a/application/vendor/symfony/css-selector/composer.json +++ b/application/vendor/symfony/css-selector/composer.json @@ -28,10 +28,5 @@ "/Tests/" ] }, - "minimum-stability": "dev", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - } + "minimum-stability": "dev" } diff --git a/application/vendor/symfony/dom-crawler/AbstractUriElement.php b/application/vendor/symfony/dom-crawler/AbstractUriElement.php index 7aba861..97604bc 100644 --- a/application/vendor/symfony/dom-crawler/AbstractUriElement.php +++ b/application/vendor/symfony/dom-crawler/AbstractUriElement.php @@ -81,7 +81,7 @@ public function getUri() $uri = trim($this->getRawUri()); // absolute URL? - if (null !== parse_url($uri, PHP_URL_SCHEME)) { + if (null !== parse_url($uri, \PHP_URL_SCHEME)) { return $uri; } @@ -114,7 +114,7 @@ public function getUri() } // relative path - $path = parse_url(substr($this->currentUri, \strlen($baseUri)), PHP_URL_PATH); + $path = parse_url(substr($this->currentUri, \strlen($baseUri)), \PHP_URL_PATH); $path = $this->canonicalizePath(substr($path, 0, strrpos($path, '/')).'/'.$uri); return $baseUri.('' === $path || '/' !== $path[0] ? '/' : '').$path; diff --git a/application/vendor/symfony/dom-crawler/Crawler.php b/application/vendor/symfony/dom-crawler/Crawler.php index 9a0a46e..21f7fab 100644 --- a/application/vendor/symfony/dom-crawler/Crawler.php +++ b/application/vendor/symfony/dom-crawler/Crawler.php @@ -182,7 +182,7 @@ public function addContent($content, $type = null) public function addHtmlContent($content, $charset = 'UTF-8') { $internalErrors = libxml_use_internal_errors(true); - if (LIBXML_VERSION < 20900) { + if (\LIBXML_VERSION < 20900) { $disableEntities = libxml_disable_entity_loader(true); } @@ -205,7 +205,7 @@ public function addHtmlContent($content, $charset = 'UTF-8') } libxml_use_internal_errors($internalErrors); - if (LIBXML_VERSION < 20900) { + if (\LIBXML_VERSION < 20900) { libxml_disable_entity_loader($disableEntities); } @@ -242,7 +242,7 @@ public function addHtmlContent($content, $charset = 'UTF-8') * LIBXML_PARSEHUGE is dangerous, see * http://symfony.com/blog/security-release-symfony-2-0-17-released */ - public function addXmlContent($content, $charset = 'UTF-8', $options = LIBXML_NONET) + public function addXmlContent($content, $charset = 'UTF-8', $options = \LIBXML_NONET) { // remove the default namespace if it's the only namespace to make XPath expressions simpler if (!preg_match('/xmlns:/', $content)) { @@ -250,7 +250,7 @@ public function addXmlContent($content, $charset = 'UTF-8', $options = LIBXML_NO } $internalErrors = libxml_use_internal_errors(true); - if (LIBXML_VERSION < 20900) { + if (\LIBXML_VERSION < 20900) { $disableEntities = libxml_disable_entity_loader(true); } @@ -262,7 +262,7 @@ public function addXmlContent($content, $charset = 'UTF-8', $options = LIBXML_NO } libxml_use_internal_errors($internalErrors); - if (LIBXML_VERSION < 20900) { + if (\LIBXML_VERSION < 20900) { libxml_disable_entity_loader($disableEntities); } @@ -497,7 +497,7 @@ public function parents() $nodes = []; while ($node = $node->parentNode) { - if (XML_ELEMENT_NODE === $node->nodeType) { + if (\XML_ELEMENT_NODE === $node->nodeType) { $nodes[] = $node; } } diff --git a/application/vendor/symfony/dom-crawler/Field/FileFormField.php b/application/vendor/symfony/dom-crawler/Field/FileFormField.php index 61bc7c6..3d0b22f 100644 --- a/application/vendor/symfony/dom-crawler/Field/FileFormField.php +++ b/application/vendor/symfony/dom-crawler/Field/FileFormField.php @@ -27,7 +27,7 @@ class FileFormField extends FormField */ public function setErrorCode($error) { - $codes = [UPLOAD_ERR_INI_SIZE, UPLOAD_ERR_FORM_SIZE, UPLOAD_ERR_PARTIAL, UPLOAD_ERR_NO_FILE, UPLOAD_ERR_NO_TMP_DIR, UPLOAD_ERR_CANT_WRITE, UPLOAD_ERR_EXTENSION]; + $codes = [\UPLOAD_ERR_INI_SIZE, \UPLOAD_ERR_FORM_SIZE, \UPLOAD_ERR_PARTIAL, \UPLOAD_ERR_NO_FILE, \UPLOAD_ERR_NO_TMP_DIR, \UPLOAD_ERR_CANT_WRITE, \UPLOAD_ERR_EXTENSION]; if (!\in_array($error, $codes)) { throw new \InvalidArgumentException(sprintf('The error code "%s" is not valid.', $error)); } @@ -53,7 +53,7 @@ public function upload($value) public function setValue($value) { if (null !== $value && is_readable($value)) { - $error = UPLOAD_ERR_OK; + $error = \UPLOAD_ERR_OK; $size = filesize($value); $info = pathinfo($value); $name = $info['basename']; @@ -69,7 +69,7 @@ public function setValue($value) copy($value, $tmp); $value = $tmp; } else { - $error = UPLOAD_ERR_NO_FILE; + $error = \UPLOAD_ERR_NO_FILE; $size = 0; $name = ''; $value = ''; diff --git a/application/vendor/symfony/dom-crawler/Form.php b/application/vendor/symfony/dom-crawler/Form.php index 8a6e28c..7c85ec6 100644 --- a/application/vendor/symfony/dom-crawler/Form.php +++ b/application/vendor/symfony/dom-crawler/Form.php @@ -203,7 +203,7 @@ public function getUri() $uri = parent::getUri(); if (!\in_array($this->getMethod(), ['POST', 'PUT', 'DELETE', 'PATCH'])) { - $query = parse_url($uri, PHP_URL_QUERY); + $query = parse_url($uri, \PHP_URL_QUERY); $currentParameters = []; if ($query) { parse_str($query, $currentParameters); diff --git a/application/vendor/symfony/dom-crawler/Tests/Field/FileFormFieldTest.php b/application/vendor/symfony/dom-crawler/Tests/Field/FileFormFieldTest.php index b14bcc8..ef216aa 100644 --- a/application/vendor/symfony/dom-crawler/Tests/Field/FileFormFieldTest.php +++ b/application/vendor/symfony/dom-crawler/Tests/Field/FileFormFieldTest.php @@ -20,7 +20,7 @@ public function testInitialize() $node = $this->createNode('input', '', ['type' => 'file']); $field = new FileFormField($node); - $this->assertEquals(['name' => '', 'type' => '', 'tmp_name' => '', 'error' => UPLOAD_ERR_NO_FILE, 'size' => 0], $field->getValue(), '->initialize() sets the value of the field to no file uploaded'); + $this->assertEquals(['name' => '', 'type' => '', 'tmp_name' => '', 'error' => \UPLOAD_ERR_NO_FILE, 'size' => 0], $field->getValue(), '->initialize() sets the value of the field to no file uploaded'); $node = $this->createNode('textarea', ''); try { @@ -48,7 +48,7 @@ public function testSetValue($method) $field = new FileFormField($node); $field->$method(null); - $this->assertEquals(['name' => '', 'type' => '', 'tmp_name' => '', 'error' => UPLOAD_ERR_NO_FILE, 'size' => 0], $field->getValue(), "->$method() clears the uploaded file if the value is null"); + $this->assertEquals(['name' => '', 'type' => '', 'tmp_name' => '', 'error' => \UPLOAD_ERR_NO_FILE, 'size' => 0], $field->getValue(), "->$method() clears the uploaded file if the value is null"); $field->$method(__FILE__); $value = $field->getValue(); @@ -91,9 +91,9 @@ public function testSetErrorCode() $node = $this->createNode('input', '', ['type' => 'file']); $field = new FileFormField($node); - $field->setErrorCode(UPLOAD_ERR_FORM_SIZE); + $field->setErrorCode(\UPLOAD_ERR_FORM_SIZE); $value = $field->getValue(); - $this->assertEquals(UPLOAD_ERR_FORM_SIZE, $value['error'], '->setErrorCode() sets the file input field error code'); + $this->assertEquals(\UPLOAD_ERR_FORM_SIZE, $value['error'], '->setErrorCode() sets the file input field error code'); try { $field->setErrorCode('foobar'); diff --git a/application/vendor/symfony/dom-crawler/composer.json b/application/vendor/symfony/dom-crawler/composer.json index ed50e6e..b4b17fc 100644 --- a/application/vendor/symfony/dom-crawler/composer.json +++ b/application/vendor/symfony/dom-crawler/composer.json @@ -32,10 +32,5 @@ "/Tests/" ] }, - "minimum-stability": "dev", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - } + "minimum-stability": "dev" } diff --git a/application/vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php b/application/vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php index 8f53a9d..cbb9b12 100644 --- a/application/vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php +++ b/application/vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php @@ -47,7 +47,7 @@ public function __construct(ContainerInterface $container) $class = get_parent_class($class); } if (__CLASS__ !== $class) { - @trigger_error(sprintf('The %s class is deprecated since Symfony 3.3 and will be removed in 4.0. Use EventDispatcher with closure factories instead.', __CLASS__), E_USER_DEPRECATED); + @trigger_error(sprintf('The %s class is deprecated since Symfony 3.3 and will be removed in 4.0. Use EventDispatcher with closure factories instead.', __CLASS__), \E_USER_DEPRECATED); } } @@ -65,7 +65,7 @@ public function __construct(ContainerInterface $container) */ public function addListenerService($eventName, $callback, $priority = 0) { - @trigger_error(sprintf('The %s class is deprecated since Symfony 3.3 and will be removed in 4.0. Use EventDispatcher with closure factories instead.', __CLASS__), E_USER_DEPRECATED); + @trigger_error(sprintf('The %s class is deprecated since Symfony 3.3 and will be removed in 4.0. Use EventDispatcher with closure factories instead.', __CLASS__), \E_USER_DEPRECATED); if (!\is_array($callback) || 2 !== \count($callback)) { throw new \InvalidArgumentException('Expected an ["service", "method"] argument.'); @@ -147,7 +147,7 @@ public function getListenerPriority($eventName, $listener) */ public function addSubscriberService($serviceId, $class) { - @trigger_error(sprintf('The %s class is deprecated since Symfony 3.3 and will be removed in 4.0. Use EventDispatcher with closure factories instead.', __CLASS__), E_USER_DEPRECATED); + @trigger_error(sprintf('The %s class is deprecated since Symfony 3.3 and will be removed in 4.0. Use EventDispatcher with closure factories instead.', __CLASS__), \E_USER_DEPRECATED); foreach ($class::getSubscribedEvents() as $eventName => $params) { if (\is_string($params)) { @@ -164,7 +164,7 @@ public function addSubscriberService($serviceId, $class) public function getContainer() { - @trigger_error('The '.__METHOD__.'() method is deprecated since Symfony 3.3 as its class will be removed in 4.0. Inject the container or the services you need in your listeners/subscribers instead.', E_USER_DEPRECATED); + @trigger_error('The '.__METHOD__.'() method is deprecated since Symfony 3.3 as its class will be removed in 4.0. Inject the container or the services you need in your listeners/subscribers instead.', \E_USER_DEPRECATED); return $this->container; } diff --git a/application/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php b/application/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php index 4f2f5be..4ba622d 100644 --- a/application/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php +++ b/application/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\EventDispatcher\Tests\Debug; use PHPUnit\Framework\TestCase; +use Symfony\Component\Debug\BufferingLogger; use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcher; use Symfony\Component\EventDispatcher\Event; use Symfony\Component\EventDispatcher\EventDispatcher; @@ -167,41 +168,57 @@ public function testGetCalledListenersNested() public function testLogger() { - $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock(); + $logger = new BufferingLogger(); $dispatcher = new EventDispatcher(); $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch(), $logger); $tdispatcher->addListener('foo', $listener1 = function () {}); $tdispatcher->addListener('foo', $listener2 = function () {}); - $logger->expects($this->exactly(2)) - ->method('debug') - ->withConsecutive( - ['Notified event "{event}" to listener "{listener}".', ['event' => 'foo', 'listener' => 'closure']], - ['Notified event "{event}" to listener "{listener}".', ['event' => 'foo', 'listener' => 'closure']] - ); - $tdispatcher->dispatch('foo'); + + $this->assertSame([ + [ + 'debug', + 'Notified event "{event}" to listener "{listener}".', + ['event' => 'foo', 'listener' => 'closure'], + ], + [ + 'debug', + 'Notified event "{event}" to listener "{listener}".', + ['event' => 'foo', 'listener' => 'closure'], + ], + ], $logger->cleanLogs()); } public function testLoggerWithStoppedEvent() { - $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock(); + $logger = new BufferingLogger(); $dispatcher = new EventDispatcher(); $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch(), $logger); $tdispatcher->addListener('foo', $listener1 = function (Event $event) { $event->stopPropagation(); }); $tdispatcher->addListener('foo', $listener2 = function () {}); - $logger->expects($this->exactly(3)) - ->method('debug') - ->withConsecutive( - ['Notified event "{event}" to listener "{listener}".', ['event' => 'foo', 'listener' => 'closure']], - ['Listener "{listener}" stopped propagation of the event "{event}".', ['event' => 'foo', 'listener' => 'closure']], - ['Listener "{listener}" was not called for event "{event}".', ['event' => 'foo', 'listener' => 'closure']] - ); - $tdispatcher->dispatch('foo'); + + $this->assertSame([ + [ + 'debug', + 'Notified event "{event}" to listener "{listener}".', + ['event' => 'foo', 'listener' => 'closure'], + ], + [ + 'debug', + 'Listener "{listener}" stopped propagation of the event "{event}".', + ['event' => 'foo', 'listener' => 'closure'], + ], + [ + 'debug', + 'Listener "{listener}" was not called for event "{event}".', + ['event' => 'foo', 'listener' => 'closure'], + ], + ], $logger->cleanLogs()); } public function testDispatchCallListeners() diff --git a/application/vendor/symfony/event-dispatcher/composer.json b/application/vendor/symfony/event-dispatcher/composer.json index 75b881b..408022f 100644 --- a/application/vendor/symfony/event-dispatcher/composer.json +++ b/application/vendor/symfony/event-dispatcher/composer.json @@ -22,6 +22,7 @@ "symfony/dependency-injection": "~3.3|~4.0", "symfony/expression-language": "~2.8|~3.0|~4.0", "symfony/config": "~2.8|~3.0|~4.0", + "symfony/debug": "~3.4|~4.4", "symfony/stopwatch": "~2.8|~3.0|~4.0", "psr/log": "~1.0" }, @@ -38,10 +39,5 @@ "/Tests/" ] }, - "minimum-stability": "dev", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - } + "minimum-stability": "dev" } diff --git a/application/vendor/symfony/polyfill-ctype/bootstrap.php b/application/vendor/symfony/polyfill-ctype/bootstrap.php index 8d6fc4b..0bc45cf 100644 --- a/application/vendor/symfony/polyfill-ctype/bootstrap.php +++ b/application/vendor/symfony/polyfill-ctype/bootstrap.php @@ -12,35 +12,35 @@ use Symfony\Polyfill\Ctype as p; if (!function_exists('ctype_alnum')) { - function ctype_alnum($text) { return p\Ctype::ctype_alnum($text); } + function ctype_alnum($input) { return p\Ctype::ctype_alnum($input); } } if (!function_exists('ctype_alpha')) { - function ctype_alpha($text) { return p\Ctype::ctype_alpha($text); } + function ctype_alpha($input) { return p\Ctype::ctype_alpha($input); } } if (!function_exists('ctype_cntrl')) { - function ctype_cntrl($text) { return p\Ctype::ctype_cntrl($text); } + function ctype_cntrl($input) { return p\Ctype::ctype_cntrl($input); } } if (!function_exists('ctype_digit')) { - function ctype_digit($text) { return p\Ctype::ctype_digit($text); } + function ctype_digit($input) { return p\Ctype::ctype_digit($input); } } if (!function_exists('ctype_graph')) { - function ctype_graph($text) { return p\Ctype::ctype_graph($text); } + function ctype_graph($input) { return p\Ctype::ctype_graph($input); } } if (!function_exists('ctype_lower')) { - function ctype_lower($text) { return p\Ctype::ctype_lower($text); } + function ctype_lower($input) { return p\Ctype::ctype_lower($input); } } if (!function_exists('ctype_print')) { - function ctype_print($text) { return p\Ctype::ctype_print($text); } + function ctype_print($input) { return p\Ctype::ctype_print($input); } } if (!function_exists('ctype_punct')) { - function ctype_punct($text) { return p\Ctype::ctype_punct($text); } + function ctype_punct($input) { return p\Ctype::ctype_punct($input); } } if (!function_exists('ctype_space')) { - function ctype_space($text) { return p\Ctype::ctype_space($text); } + function ctype_space($input) { return p\Ctype::ctype_space($input); } } if (!function_exists('ctype_upper')) { - function ctype_upper($text) { return p\Ctype::ctype_upper($text); } + function ctype_upper($input) { return p\Ctype::ctype_upper($input); } } if (!function_exists('ctype_xdigit')) { - function ctype_xdigit($text) { return p\Ctype::ctype_xdigit($text); } + function ctype_xdigit($input) { return p\Ctype::ctype_xdigit($input); } } diff --git a/application/vendor/symfony/polyfill-ctype/composer.json b/application/vendor/symfony/polyfill-ctype/composer.json index 90108c6..2088bb9 100644 --- a/application/vendor/symfony/polyfill-ctype/composer.json +++ b/application/vendor/symfony/polyfill-ctype/composer.json @@ -16,7 +16,7 @@ } ], "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "autoload": { "psr-4": { "Symfony\\Polyfill\\Ctype\\": "" }, @@ -28,7 +28,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", diff --git a/application/vendor/symfony/polyfill-mbstring/Mbstring.php b/application/vendor/symfony/polyfill-mbstring/Mbstring.php index 15503bc..7bb3023 100644 --- a/application/vendor/symfony/polyfill-mbstring/Mbstring.php +++ b/application/vendor/symfony/polyfill-mbstring/Mbstring.php @@ -115,10 +115,8 @@ public static function mb_convert_encoding($s, $toEncoding, $fromEncoding = null return iconv($fromEncoding, $toEncoding.'//IGNORE', $s); } - public static function mb_convert_variables($toEncoding, $fromEncoding, &$a = null, &$b = null, &$c = null, &$d = null, &$e = null, &$f = null) + public static function mb_convert_variables($toEncoding, $fromEncoding, &...$vars) { - $vars = array(&$a, &$b, &$c, &$d, &$e, &$f); - $ok = true; array_walk_recursive($vars, function (&$v) use (&$ok, $toEncoding, $fromEncoding) { if (false === $v = Mbstring::mb_convert_encoding($v, $toEncoding, $fromEncoding)) { @@ -629,10 +627,11 @@ public static function mb_strrchr($haystack, $needle, $part = false, $encoding = { $encoding = self::getEncoding($encoding); if ('CP850' === $encoding || 'ASCII' === $encoding) { - return strrchr($haystack, $needle, $part); + $pos = strrpos($haystack, $needle); + } else { + $needle = self::mb_substr($needle, 0, 1, $encoding); + $pos = iconv_strrpos($haystack, $needle, $encoding); } - $needle = self::mb_substr($needle, 0, 1, $encoding); - $pos = iconv_strrpos($haystack, $needle, $encoding); return self::getSubpart($pos, $part, $haystack, $encoding); } diff --git a/application/vendor/symfony/polyfill-mbstring/bootstrap.php b/application/vendor/symfony/polyfill-mbstring/bootstrap.php index b36a092..d0a93d4 100644 --- a/application/vendor/symfony/polyfill-mbstring/bootstrap.php +++ b/application/vendor/symfony/polyfill-mbstring/bootstrap.php @@ -12,28 +12,28 @@ use Symfony\Polyfill\Mbstring as p; if (!function_exists('mb_convert_encoding')) { - function mb_convert_encoding($s, $to, $from = null) { return p\Mbstring::mb_convert_encoding($s, $to, $from); } + function mb_convert_encoding($string, $to_encoding, $from_encoding = null) { return p\Mbstring::mb_convert_encoding($string, $to_encoding, $from_encoding); } } if (!function_exists('mb_decode_mimeheader')) { - function mb_decode_mimeheader($s) { return p\Mbstring::mb_decode_mimeheader($s); } + function mb_decode_mimeheader($string) { return p\Mbstring::mb_decode_mimeheader($string); } } if (!function_exists('mb_encode_mimeheader')) { - function mb_encode_mimeheader($s, $charset = null, $transferEnc = null, $lf = null, $indent = null) { return p\Mbstring::mb_encode_mimeheader($s, $charset, $transferEnc, $lf, $indent); } + function mb_encode_mimeheader($string, $charset = null, $transfer_encoding = null, $newline = null, $indent = null) { return p\Mbstring::mb_encode_mimeheader($string, $charset, $transfer_encoding, $newline, $indent); } } if (!function_exists('mb_decode_numericentity')) { - function mb_decode_numericentity($s, $convmap, $enc = null) { return p\Mbstring::mb_decode_numericentity($s, $convmap, $enc); } + function mb_decode_numericentity($string, $map, $encoding = null) { return p\Mbstring::mb_decode_numericentity($string, $map, $encoding); } } if (!function_exists('mb_encode_numericentity')) { - function mb_encode_numericentity($s, $convmap, $enc = null, $is_hex = false) { return p\Mbstring::mb_encode_numericentity($s, $convmap, $enc, $is_hex); } + function mb_encode_numericentity($string, $map, $encoding = null, $hex = false) { return p\Mbstring::mb_encode_numericentity($string, $map, $encoding, $hex); } } if (!function_exists('mb_convert_case')) { - function mb_convert_case($s, $mode, $enc = null) { return p\Mbstring::mb_convert_case($s, $mode, $enc); } + function mb_convert_case($string, $mode, $encoding = null) { return p\Mbstring::mb_convert_case($string, $mode, $encoding); } } if (!function_exists('mb_internal_encoding')) { - function mb_internal_encoding($enc = null) { return p\Mbstring::mb_internal_encoding($enc); } + function mb_internal_encoding($encoding = null) { return p\Mbstring::mb_internal_encoding($encoding); } } if (!function_exists('mb_language')) { - function mb_language($lang = null) { return p\Mbstring::mb_language($lang); } + function mb_language($language = null) { return p\Mbstring::mb_language($language); } } if (!function_exists('mb_list_encodings')) { function mb_list_encodings() { return p\Mbstring::mb_list_encodings(); } @@ -42,88 +42,94 @@ function mb_list_encodings() { return p\Mbstring::mb_list_encodings(); } function mb_encoding_aliases($encoding) { return p\Mbstring::mb_encoding_aliases($encoding); } } if (!function_exists('mb_check_encoding')) { - function mb_check_encoding($var = null, $encoding = null) { return p\Mbstring::mb_check_encoding($var, $encoding); } + function mb_check_encoding($value = null, $encoding = null) { return p\Mbstring::mb_check_encoding($value, $encoding); } } if (!function_exists('mb_detect_encoding')) { - function mb_detect_encoding($str, $encodingList = null, $strict = false) { return p\Mbstring::mb_detect_encoding($str, $encodingList, $strict); } + function mb_detect_encoding($string, $encodings = null, $strict = false) { return p\Mbstring::mb_detect_encoding($string, $encodings, $strict); } } if (!function_exists('mb_detect_order')) { - function mb_detect_order($encodingList = null) { return p\Mbstring::mb_detect_order($encodingList); } + function mb_detect_order($encoding = null) { return p\Mbstring::mb_detect_order($encoding); } } if (!function_exists('mb_parse_str')) { - function mb_parse_str($s, &$result = array()) { parse_str($s, $result); } + function mb_parse_str($string, &$result = array()) { parse_str($string, $result); } } if (!function_exists('mb_strlen')) { - function mb_strlen($s, $enc = null) { return p\Mbstring::mb_strlen($s, $enc); } + function mb_strlen($string, $encoding = null) { return p\Mbstring::mb_strlen($string, $encoding); } } if (!function_exists('mb_strpos')) { - function mb_strpos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_strpos($s, $needle, $offset, $enc); } + function mb_strpos($haystack, $needle, $offset = 0, $encoding = null) { return p\Mbstring::mb_strpos($haystack, $needle, $offset, $encoding); } } if (!function_exists('mb_strtolower')) { - function mb_strtolower($s, $enc = null) { return p\Mbstring::mb_strtolower($s, $enc); } + function mb_strtolower($string, $encoding = null) { return p\Mbstring::mb_strtolower($string, $encoding); } } if (!function_exists('mb_strtoupper')) { - function mb_strtoupper($s, $enc = null) { return p\Mbstring::mb_strtoupper($s, $enc); } + function mb_strtoupper($string, $encoding = null) { return p\Mbstring::mb_strtoupper($string, $encoding); } } if (!function_exists('mb_substitute_character')) { - function mb_substitute_character($char = null) { return p\Mbstring::mb_substitute_character($char); } + function mb_substitute_character($substitute_character = null) { return p\Mbstring::mb_substitute_character($substitute_character); } } if (!function_exists('mb_substr')) { - function mb_substr($s, $start, $length = 2147483647, $enc = null) { return p\Mbstring::mb_substr($s, $start, $length, $enc); } + function mb_substr($string, $start, $length = 2147483647, $encoding = null) { return p\Mbstring::mb_substr($string, $start, $length, $encoding); } } if (!function_exists('mb_stripos')) { - function mb_stripos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_stripos($s, $needle, $offset, $enc); } + function mb_stripos($haystack, $needle, $offset = 0, $encoding = null) { return p\Mbstring::mb_stripos($haystack, $needle, $offset, $encoding); } } if (!function_exists('mb_stristr')) { - function mb_stristr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_stristr($s, $needle, $part, $enc); } + function mb_stristr($haystack, $needle, $before_needle = false, $encoding = null) { return p\Mbstring::mb_stristr($haystack, $needle, $before_needle, $encoding); } } if (!function_exists('mb_strrchr')) { - function mb_strrchr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_strrchr($s, $needle, $part, $enc); } + function mb_strrchr($haystack, $needle, $before_needle = false, $encoding = null) { return p\Mbstring::mb_strrchr($haystack, $needle, $before_needle, $encoding); } } if (!function_exists('mb_strrichr')) { - function mb_strrichr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_strrichr($s, $needle, $part, $enc); } + function mb_strrichr($haystack, $needle, $before_needle = false, $encoding = null) { return p\Mbstring::mb_strrichr($haystack, $needle, $before_needle, $encoding); } } if (!function_exists('mb_strripos')) { - function mb_strripos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_strripos($s, $needle, $offset, $enc); } + function mb_strripos($haystack, $needle, $offset = 0, $encoding = null) { return p\Mbstring::mb_strripos($haystack, $needle, $offset, $encoding); } } if (!function_exists('mb_strrpos')) { - function mb_strrpos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_strrpos($s, $needle, $offset, $enc); } + function mb_strrpos($haystack, $needle, $offset = 0, $encoding = null) { return p\Mbstring::mb_strrpos($haystack, $needle, $offset, $encoding); } } if (!function_exists('mb_strstr')) { - function mb_strstr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_strstr($s, $needle, $part, $enc); } + function mb_strstr($haystack, $needle, $before_needle = false, $encoding = null) { return p\Mbstring::mb_strstr($haystack, $needle, $before_needle, $encoding); } } if (!function_exists('mb_get_info')) { function mb_get_info($type = 'all') { return p\Mbstring::mb_get_info($type); } } if (!function_exists('mb_http_output')) { - function mb_http_output($enc = null) { return p\Mbstring::mb_http_output($enc); } + function mb_http_output($encoding = null) { return p\Mbstring::mb_http_output($encoding); } } if (!function_exists('mb_strwidth')) { - function mb_strwidth($s, $enc = null) { return p\Mbstring::mb_strwidth($s, $enc); } + function mb_strwidth($string, $encoding = null) { return p\Mbstring::mb_strwidth($string, $encoding); } } if (!function_exists('mb_substr_count')) { - function mb_substr_count($haystack, $needle, $enc = null) { return p\Mbstring::mb_substr_count($haystack, $needle, $enc); } + function mb_substr_count($haystack, $needle, $encoding = null) { return p\Mbstring::mb_substr_count($haystack, $needle, $encoding); } } if (!function_exists('mb_output_handler')) { - function mb_output_handler($contents, $status) { return p\Mbstring::mb_output_handler($contents, $status); } + function mb_output_handler($string, $status) { return p\Mbstring::mb_output_handler($string, $status); } } if (!function_exists('mb_http_input')) { function mb_http_input($type = '') { return p\Mbstring::mb_http_input($type); } } + if (!function_exists('mb_convert_variables')) { - function mb_convert_variables($toEncoding, $fromEncoding, &$a = null, &$b = null, &$c = null, &$d = null, &$e = null, &$f = null) { return p\Mbstring::mb_convert_variables($toEncoding, $fromEncoding, $a, $b, $c, $d, $e, $f); } + if (PHP_VERSION_ID >= 80000) { + function mb_convert_variables($to_encoding, $from_encoding, &$var, &...$vars) { return p\Mbstring::mb_convert_variables($to_encoding, $from_encoding, $var, ...$vars); } + } else { + function mb_convert_variables($to_encoding, $from_encoding, &...$vars) { return p\Mbstring::mb_convert_variables($to_encoding, $from_encoding, ...$vars); } + } } + if (!function_exists('mb_ord')) { - function mb_ord($s, $enc = null) { return p\Mbstring::mb_ord($s, $enc); } + function mb_ord($string, $encoding = null) { return p\Mbstring::mb_ord($string, $encoding); } } if (!function_exists('mb_chr')) { - function mb_chr($code, $enc = null) { return p\Mbstring::mb_chr($code, $enc); } + function mb_chr($codepoint, $encoding = null) { return p\Mbstring::mb_chr($codepoint, $encoding); } } if (!function_exists('mb_scrub')) { - function mb_scrub($s, $enc = null) { $enc = null === $enc ? mb_internal_encoding() : $enc; return mb_convert_encoding($s, $enc, $enc); } + function mb_scrub($string, $encoding = null) { $encoding = null === $encoding ? mb_internal_encoding() : $encoding; return mb_convert_encoding($string, $encoding, $encoding); } } if (!function_exists('mb_str_split')) { - function mb_str_split($string, $split_length = 1, $encoding = null) { return p\Mbstring::mb_str_split($string, $split_length, $encoding); } + function mb_str_split($string, $length = 1, $encoding = null) { return p\Mbstring::mb_str_split($string, $length, $encoding); } } if (extension_loaded('mbstring')) { diff --git a/application/vendor/symfony/polyfill-mbstring/composer.json b/application/vendor/symfony/polyfill-mbstring/composer.json index 06e6b31..ca4a839 100644 --- a/application/vendor/symfony/polyfill-mbstring/composer.json +++ b/application/vendor/symfony/polyfill-mbstring/composer.json @@ -16,7 +16,7 @@ } ], "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "autoload": { "psr-4": { "Symfony\\Polyfill\\Mbstring\\": "" }, @@ -28,7 +28,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", diff --git a/application/vendor/symfony/polyfill-php56/LICENSE b/application/vendor/symfony/polyfill-php56/LICENSE deleted file mode 100644 index 4cd8bdd..0000000 --- a/application/vendor/symfony/polyfill-php56/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2015-2019 Fabien Potencier - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is furnished -to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/application/vendor/symfony/polyfill-php56/Php56.php b/application/vendor/symfony/polyfill-php56/Php56.php deleted file mode 100644 index dbbc0e1..0000000 --- a/application/vendor/symfony/polyfill-php56/Php56.php +++ /dev/null @@ -1,138 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Polyfill\Php56; - -use Symfony\Polyfill\Util\Binary; - -/** - * @internal - */ -final class Php56 -{ - const LDAP_ESCAPE_FILTER = 1; - const LDAP_ESCAPE_DN = 2; - - public static function hash_equals($knownString, $userInput) - { - if (!\is_string($knownString)) { - trigger_error('Expected known_string to be a string, '.\gettype($knownString).' given', E_USER_WARNING); - - return false; - } - - if (!\is_string($userInput)) { - trigger_error('Expected user_input to be a string, '.\gettype($userInput).' given', E_USER_WARNING); - - return false; - } - - $knownLen = Binary::strlen($knownString); - $userLen = Binary::strlen($userInput); - - if ($knownLen !== $userLen) { - return false; - } - - $result = 0; - - for ($i = 0; $i < $knownLen; ++$i) { - $result |= \ord($knownString[$i]) ^ \ord($userInput[$i]); - } - - return 0 === $result; - } - - /** - * Stub implementation of the {@link ldap_escape()} function of the ldap - * extension. - * - * Escape strings for safe use in LDAP filters and DNs. - * - * @author Chris Wright - * - * @param string $subject - * @param string $ignore - * @param int $flags - * - * @return string - * - * @see http://stackoverflow.com/a/8561604 - */ - public static function ldap_escape($subject, $ignore = '', $flags = 0) - { - static $charMaps = null; - - if (null === $charMaps) { - $charMaps = array( - self::LDAP_ESCAPE_FILTER => array('\\', '*', '(', ')', "\x00"), - self::LDAP_ESCAPE_DN => array('\\', ',', '=', '+', '<', '>', ';', '"', '#', "\r"), - ); - - $charMaps[0] = array(); - - for ($i = 0; $i < 256; ++$i) { - $charMaps[0][\chr($i)] = sprintf('\\%02x', $i); - } - - for ($i = 0, $l = \count($charMaps[self::LDAP_ESCAPE_FILTER]); $i < $l; ++$i) { - $chr = $charMaps[self::LDAP_ESCAPE_FILTER][$i]; - unset($charMaps[self::LDAP_ESCAPE_FILTER][$i]); - $charMaps[self::LDAP_ESCAPE_FILTER][$chr] = $charMaps[0][$chr]; - } - - for ($i = 0, $l = \count($charMaps[self::LDAP_ESCAPE_DN]); $i < $l; ++$i) { - $chr = $charMaps[self::LDAP_ESCAPE_DN][$i]; - unset($charMaps[self::LDAP_ESCAPE_DN][$i]); - $charMaps[self::LDAP_ESCAPE_DN][$chr] = $charMaps[0][$chr]; - } - } - - // Create the base char map to escape - $flags = (int) $flags; - $charMap = array(); - - if ($flags & self::LDAP_ESCAPE_FILTER) { - $charMap += $charMaps[self::LDAP_ESCAPE_FILTER]; - } - - if ($flags & self::LDAP_ESCAPE_DN) { - $charMap += $charMaps[self::LDAP_ESCAPE_DN]; - } - - if (!$charMap) { - $charMap = $charMaps[0]; - } - - // Remove any chars to ignore from the list - $ignore = (string) $ignore; - - for ($i = 0, $l = \strlen($ignore); $i < $l; ++$i) { - unset($charMap[$ignore[$i]]); - } - - // Do the main replacement - $result = strtr($subject, $charMap); - - // Encode leading/trailing spaces if self::LDAP_ESCAPE_DN is passed - if ($flags & self::LDAP_ESCAPE_DN) { - if (' ' === $result[0]) { - $result = '\\20'.substr($result, 1); - } - - if (' ' === $result[\strlen($result) - 1]) { - $result = substr($result, 0, -1).'\\20'; - } - } - - return $result; - } -} diff --git a/application/vendor/symfony/polyfill-php56/README.md b/application/vendor/symfony/polyfill-php56/README.md deleted file mode 100644 index 5ad570b..0000000 --- a/application/vendor/symfony/polyfill-php56/README.md +++ /dev/null @@ -1,15 +0,0 @@ -Symfony Polyfill / Php56 -======================== - -This component provides functions unavailable in releases prior to PHP 5.6: - -- [`hash_equals`](https://php.net/hash_equals) (part of [hash](https://php.net/hash) extension) -- [`ldap_escape`](https://php.net/ldap_escape) (part of [ldap](https://php.net/ldap) extension) - -More information can be found in the -[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md). - -License -======= - -This library is released under the [MIT license](LICENSE). diff --git a/application/vendor/symfony/polyfill-php56/bootstrap.php b/application/vendor/symfony/polyfill-php56/bootstrap.php deleted file mode 100644 index 427dd2e..0000000 --- a/application/vendor/symfony/polyfill-php56/bootstrap.php +++ /dev/null @@ -1,44 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -use Symfony\Polyfill\Php56 as p; - -if (PHP_VERSION_ID >= 50600) { - return; -} - -if (!function_exists('hash_equals')) { - function hash_equals($knownString, $userInput) { return p\Php56::hash_equals($knownString, $userInput); } -} -if (extension_loaded('ldap') && !defined('LDAP_ESCAPE_FILTER')) { - define('LDAP_ESCAPE_FILTER', 1); -} -if (extension_loaded('ldap') && !defined('LDAP_ESCAPE_DN')) { - define('LDAP_ESCAPE_DN', 2); -} - -if (extension_loaded('ldap') && !function_exists('ldap_escape')) { - function ldap_escape($subject, $ignore = '', $flags = 0) { return p\Php56::ldap_escape($subject, $ignore, $flags); } -} - -if (50509 === PHP_VERSION_ID && 4 === PHP_INT_SIZE) { - // Missing functions in PHP 5.5.9 - affects 32 bit builds of Ubuntu 14.04LTS - // See https://bugs.launchpad.net/ubuntu/+source/php5/+bug/1315888 - if (!function_exists('gzopen') && function_exists('gzopen64')) { - function gzopen($filename, $mode, $use_include_path = 0) { return gzopen64($filename, $mode, $use_include_path); } - } - if (!function_exists('gzseek') && function_exists('gzseek64')) { - function gzseek($zp, $offset, $whence = SEEK_SET) { return gzseek64($zp, $offset, $whence); } - } - if (!function_exists('gztell') && function_exists('gztell64')) { - function gztell($zp) { return gztell64($zp); } - } -} diff --git a/application/vendor/symfony/polyfill-php56/composer.json b/application/vendor/symfony/polyfill-php56/composer.json deleted file mode 100644 index a60e567..0000000 --- a/application/vendor/symfony/polyfill-php56/composer.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "name": "symfony/polyfill-php56", - "type": "library", - "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions", - "keywords": ["polyfill", "shim", "compatibility", "portable"], - "homepage": "https://symfony.com", - "license": "MIT", - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "require": { - "php": ">=5.3.3", - "symfony/polyfill-util": "~1.0" - }, - "autoload": { - "psr-4": { "Symfony\\Polyfill\\Php56\\": "" }, - "files": [ "bootstrap.php" ] - }, - "minimum-stability": "dev", - "extra": { - "branch-alias": { - "dev-master": "1.18-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - } -} diff --git a/application/vendor/symfony/polyfill-util/Binary.php b/application/vendor/symfony/polyfill-util/Binary.php deleted file mode 100644 index 23ff974..0000000 --- a/application/vendor/symfony/polyfill-util/Binary.php +++ /dev/null @@ -1,22 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Polyfill\Util; - -if (\extension_loaded('mbstring')) { - class Binary extends BinaryOnFuncOverload - { - } -} else { - class Binary extends BinaryNoFuncOverload - { - } -} diff --git a/application/vendor/symfony/polyfill-util/BinaryNoFuncOverload.php b/application/vendor/symfony/polyfill-util/BinaryNoFuncOverload.php deleted file mode 100644 index 800ad75..0000000 --- a/application/vendor/symfony/polyfill-util/BinaryNoFuncOverload.php +++ /dev/null @@ -1,65 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Polyfill\Util; - -/** - * @author Nicolas Grekas - * - * @internal - */ -class BinaryNoFuncOverload -{ - public static function strlen($s) - { - return \strlen($s); - } - - public static function strpos($haystack, $needle, $offset = 0) - { - return strpos($haystack, $needle, $offset); - } - - public static function strrpos($haystack, $needle, $offset = 0) - { - return strrpos($haystack, $needle, $offset); - } - - public static function substr($string, $start, $length = PHP_INT_MAX) - { - return substr($string, $start, $length); - } - - public static function stripos($s, $needle, $offset = 0) - { - return stripos($s, $needle, $offset); - } - - public static function stristr($s, $needle, $part = false) - { - return stristr($s, $needle, $part); - } - - public static function strrchr($s, $needle, $part = false) - { - return strrchr($s, $needle, $part); - } - - public static function strripos($s, $needle, $offset = 0) - { - return strripos($s, $needle, $offset); - } - - public static function strstr($s, $needle, $part = false) - { - return strstr($s, $needle, $part); - } -} diff --git a/application/vendor/symfony/polyfill-util/BinaryOnFuncOverload.php b/application/vendor/symfony/polyfill-util/BinaryOnFuncOverload.php deleted file mode 100644 index e1b886e..0000000 --- a/application/vendor/symfony/polyfill-util/BinaryOnFuncOverload.php +++ /dev/null @@ -1,67 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Polyfill\Util; - -/** - * Binary safe version of string functions overloaded when MB_OVERLOAD_STRING is enabled. - * - * @author Nicolas Grekas - * - * @internal - */ -class BinaryOnFuncOverload -{ - public static function strlen($s) - { - return mb_strlen($s, '8bit'); - } - - public static function strpos($haystack, $needle, $offset = 0) - { - return mb_strpos($haystack, $needle, $offset, '8bit'); - } - - public static function strrpos($haystack, $needle, $offset = 0) - { - return mb_strrpos($haystack, $needle, $offset, '8bit'); - } - - public static function substr($string, $start, $length = 2147483647) - { - return mb_substr($string, $start, $length, '8bit'); - } - - public static function stripos($s, $needle, $offset = 0) - { - return mb_stripos($s, $needle, $offset, '8bit'); - } - - public static function stristr($s, $needle, $part = false) - { - return mb_stristr($s, $needle, $part, '8bit'); - } - - public static function strrchr($s, $needle, $part = false) - { - return mb_strrchr($s, $needle, $part, '8bit'); - } - - public static function strripos($s, $needle, $offset = 0) - { - return mb_strripos($s, $needle, $offset, '8bit'); - } - - public static function strstr($s, $needle, $part = false) - { - return mb_strstr($s, $needle, $part, '8bit'); - } -} diff --git a/application/vendor/symfony/polyfill-util/LICENSE b/application/vendor/symfony/polyfill-util/LICENSE deleted file mode 100644 index 4cd8bdd..0000000 --- a/application/vendor/symfony/polyfill-util/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2015-2019 Fabien Potencier - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is furnished -to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/application/vendor/symfony/polyfill-util/README.md b/application/vendor/symfony/polyfill-util/README.md deleted file mode 100644 index 1c655fc..0000000 --- a/application/vendor/symfony/polyfill-util/README.md +++ /dev/null @@ -1,13 +0,0 @@ -Symfony Polyfill / Util -======================= - -This component provides binary-safe string functions, using the -[mbstring](https://php.net/mbstring) extension when available. - -More information can be found in the -[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md). - -License -======= - -This library is released under the [MIT license](LICENSE). diff --git a/application/vendor/symfony/polyfill-util/TestListener.php b/application/vendor/symfony/polyfill-util/TestListener.php deleted file mode 100644 index 6b17d45..0000000 --- a/application/vendor/symfony/polyfill-util/TestListener.php +++ /dev/null @@ -1,28 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Polyfill\Util; - -if (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Version::id(), '6.0.0', '<')) { - class_alias('Symfony\Polyfill\Util\TestListenerForV5', 'Symfony\Polyfill\Util\TestListener'); -// Using an early return instead of a else does not work when using the PHPUnit phar due to some weird PHP behavior (the class -// gets defined without executing the code before it and so the definition is not properly conditional) -} elseif (version_compare(\PHPUnit\Runner\Version::id(), '7.0.0', '<')) { - class_alias('Symfony\Polyfill\Util\TestListenerForV6', 'Symfony\Polyfill\Util\TestListener'); -} else { - class_alias('Symfony\Polyfill\Util\TestListenerForV7', 'Symfony\Polyfill\Util\TestListener'); -} - -if (false) { - class TestListener - { - } -} diff --git a/application/vendor/symfony/polyfill-util/TestListenerForV5.php b/application/vendor/symfony/polyfill-util/TestListenerForV5.php deleted file mode 100644 index 501053d..0000000 --- a/application/vendor/symfony/polyfill-util/TestListenerForV5.php +++ /dev/null @@ -1,89 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Polyfill\Util; - -/** - * @author Nicolas Grekas - */ -class TestListenerForV5 extends \PHPUnit_Framework_TestSuite implements \PHPUnit_Framework_TestListener -{ - private $suite; - private $trait; - - public function __construct(\PHPUnit_Framework_TestSuite $suite = null) - { - if ($suite) { - $this->suite = $suite; - $this->setName($suite->getName().' with polyfills enabled'); - $this->addTest($suite); - } - $this->trait = new TestListenerTrait(); - } - - public function startTestSuite(\PHPUnit_Framework_TestSuite $suite) - { - $this->trait->startTestSuite($suite); - } - - public function addError(\PHPUnit_Framework_Test $test, \Exception $e, $time) - { - $this->trait->addError($test, $e, $time); - } - - public function addWarning(\PHPUnit_Framework_Test $test, \PHPUnit_Framework_Warning $e, $time) - { - } - - public function addFailure(\PHPUnit_Framework_Test $test, \PHPUnit_Framework_AssertionFailedError $e, $time) - { - $this->trait->addError($test, $e, $time); - } - - public function addIncompleteTest(\PHPUnit_Framework_Test $test, \Exception $e, $time) - { - } - - public function addRiskyTest(\PHPUnit_Framework_Test $test, \Exception $e, $time) - { - } - - public function addSkippedTest(\PHPUnit_Framework_Test $test, \Exception $e, $time) - { - } - - public function endTestSuite(\PHPUnit_Framework_TestSuite $suite) - { - } - - public function startTest(\PHPUnit_Framework_Test $test) - { - } - - public function endTest(\PHPUnit_Framework_Test $test, $time) - { - } - - public static function warning($message) - { - return parent::warning($message); - } - - protected function setUp() - { - TestListenerTrait::$enabledPolyfills = $this->suite->getName(); - } - - protected function tearDown() - { - TestListenerTrait::$enabledPolyfills = false; - } -} diff --git a/application/vendor/symfony/polyfill-util/TestListenerForV6.php b/application/vendor/symfony/polyfill-util/TestListenerForV6.php deleted file mode 100644 index e9e87cb..0000000 --- a/application/vendor/symfony/polyfill-util/TestListenerForV6.php +++ /dev/null @@ -1,95 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Polyfill\Util; - -use PHPUnit\Framework\AssertionFailedError; -use PHPUnit\Framework\Test; -use PHPUnit\Framework\TestListener as TestListenerInterface; -use PHPUnit\Framework\TestSuite; -use PHPUnit\Framework\Warning; - -/** - * @author Nicolas Grekas - */ -class TestListenerForV6 extends TestSuite implements TestListenerInterface -{ - private $suite; - private $trait; - - public function __construct(TestSuite $suite = null) - { - if ($suite) { - $this->suite = $suite; - $this->setName($suite->getName().' with polyfills enabled'); - $this->addTest($suite); - } - $this->trait = new TestListenerTrait(); - } - - public function startTestSuite(TestSuite $suite) - { - $this->trait->startTestSuite($suite); - } - - public function addError(Test $test, \Exception $e, $time) - { - $this->trait->addError($test, $e, $time); - } - - public function addWarning(Test $test, Warning $e, $time) - { - } - - public function addFailure(Test $test, AssertionFailedError $e, $time) - { - $this->trait->addError($test, $e, $time); - } - - public function addIncompleteTest(Test $test, \Exception $e, $time) - { - } - - public function addRiskyTest(Test $test, \Exception $e, $time) - { - } - - public function addSkippedTest(Test $test, \Exception $e, $time) - { - } - - public function endTestSuite(TestSuite $suite) - { - } - - public function startTest(Test $test) - { - } - - public function endTest(Test $test, $time) - { - } - - public static function warning($message) - { - return parent::warning($message); - } - - protected function setUp() - { - TestListenerTrait::$enabledPolyfills = $this->suite->getName(); - } - - protected function tearDown() - { - TestListenerTrait::$enabledPolyfills = false; - } -} diff --git a/application/vendor/symfony/polyfill-util/TestListenerForV7.php b/application/vendor/symfony/polyfill-util/TestListenerForV7.php deleted file mode 100644 index a5c3759..0000000 --- a/application/vendor/symfony/polyfill-util/TestListenerForV7.php +++ /dev/null @@ -1,96 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Polyfill\Util; - -use PHPUnit\Framework\AssertionFailedError; -use PHPUnit\Framework\Test; -use PHPUnit\Framework\TestListener as TestListenerInterface; -use PHPUnit\Framework\TestSuite; -use PHPUnit\Framework\Warning; -use PHPUnit\Framework\WarningTestCase; - -/** - * @author Ion Bazan - */ -class TestListenerForV7 extends TestSuite implements TestListenerInterface -{ - private $suite; - private $trait; - - public function __construct(TestSuite $suite = null) - { - if ($suite) { - $this->suite = $suite; - $this->setName($suite->getName().' with polyfills enabled'); - $this->addTest($suite); - } - $this->trait = new TestListenerTrait(); - } - - public function startTestSuite(TestSuite $suite): void - { - $this->trait->startTestSuite($suite); - } - - public function addError(Test $test, \Throwable $t, float $time): void - { - $this->trait->addError($test, $t, $time); - } - - public function addWarning(Test $test, Warning $e, float $time): void - { - } - - public function addFailure(Test $test, AssertionFailedError $e, float $time): void - { - $this->trait->addError($test, $e, $time); - } - - public function addIncompleteTest(Test $test, \Throwable $t, float $time): void - { - } - - public function addRiskyTest(Test $test, \Throwable $t, float $time): void - { - } - - public function addSkippedTest(Test $test, \Throwable $t, float $time): void - { - } - - public function endTestSuite(TestSuite $suite): void - { - } - - public function startTest(Test $test): void - { - } - - public function endTest(Test $test, float $time): void - { - } - - public static function warning($message): WarningTestCase - { - return new WarningTestCase($message); - } - - protected function setUp(): void - { - TestListenerTrait::$enabledPolyfills = $this->suite->getName(); - } - - protected function tearDown(): void - { - TestListenerTrait::$enabledPolyfills = false; - } -} diff --git a/application/vendor/symfony/polyfill-util/TestListenerTrait.php b/application/vendor/symfony/polyfill-util/TestListenerTrait.php deleted file mode 100644 index 777fb48..0000000 --- a/application/vendor/symfony/polyfill-util/TestListenerTrait.php +++ /dev/null @@ -1,129 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Polyfill\Util; - -/** - * @author Nicolas Grekas - */ -class TestListenerTrait -{ - public static $enabledPolyfills; - - public function startTestSuite($mainSuite) - { - if (null !== self::$enabledPolyfills) { - return; - } - self::$enabledPolyfills = false; - $SkippedTestError = class_exists('PHPUnit\Framework\SkippedTestError') ? 'PHPUnit\Framework\SkippedTestError' : 'PHPUnit_Framework_SkippedTestError'; - - foreach ($mainSuite->tests() as $suite) { - $testClass = $suite->getName(); - if (!$tests = $suite->tests()) { - continue; - } - $testedClass = new \ReflectionClass($testClass); - if (preg_match('{^ \* @requires PHP (.*)}mi', $testedClass->getDocComment(), $m) && version_compare($m[1], \PHP_VERSION, '>')) { - continue; - } - if (!preg_match('/^(.+)\\\\Tests(\\\\.*)Test$/', $testClass, $m)) { - $mainSuite->addTest(TestListener::warning('Unknown naming convention for '.$testClass)); - continue; - } - if (!class_exists($m[1].$m[2])) { - continue; - } - $testedClass = new \ReflectionClass($m[1].$m[2]); - $bootstrap = new \SplFileObject(\dirname($testedClass->getFileName()).'/bootstrap.php'); - $warnings = array(); - $defLine = null; - - foreach (new \RegexIterator($bootstrap, '/define\(\'/') as $defLine) { - preg_match('/define\(\'(?P.+)\'/', $defLine, $matches); - if (\defined($matches['name'])) { - continue; - } - - try { - eval($defLine); - } catch (\PHPUnit_Framework_Exception $ex){ - $warnings[] = TestListener::warning($ex->getMessage()); - } catch (\PHPUnit\Framework\Exception $ex) { - $warnings[] = TestListener::warning($ex->getMessage()); - } - } - - $bootstrap->rewind(); - - foreach (new \RegexIterator($bootstrap, '/return p\\\\'.$testedClass->getShortName().'::/') as $defLine) { - if (!preg_match('/^\s*function (?P[^\(]++)(?P\(.*\)(?: ?: [^ ]++)?) \{ (?return p\\\\'.$testedClass->getShortName().'::[^\(]++)(?P\([^\)]*+\)); \}$/', $defLine, $f)) { - $warnings[] = TestListener::warning('Invalid line in bootstrap.php: '.trim($defLine)); - continue; - } - $testNamespace = substr($testClass, 0, strrpos($testClass, '\\')); - if (\function_exists($testNamespace.'\\'.$f['name'])) { - continue; - } - - try { - $r = new \ReflectionFunction($f['name']); - if ($r->isUserDefined()) { - throw new \ReflectionException(); - } - if ('idn_to_ascii' === $f['name'] || 'idn_to_utf8' === $f['name']) { - $defLine = sprintf('return INTL_IDNA_VARIANT_2003 === $variant ? \\%s($domain, $options, $variant) : \\%1$s%s', $f['name'], $f['args']); - } elseif (false !== strpos($f['signature'], '&') && 'idn_to_ascii' !== $f['name'] && 'idn_to_utf8' !== $f['name']) { - $defLine = sprintf('return \\%s%s', $f['name'], $f['args']); - } else { - $defLine = sprintf("return \\call_user_func_array('%s', \\func_get_args())", $f['name']); - } - } catch (\ReflectionException $e) { - $defLine = sprintf("throw new \\{$SkippedTestError}('Internal function not found: %s')", $f['name']); - } - - eval(<<getNamespaceName()} as p; - -function {$f['name']}{$f['signature']} -{ - if ('{$testClass}' === TestListenerTrait::\$enabledPolyfills) { - {$f['return']}{$f['args']}; - } - - {$defLine}; -} -EOPHP - ); - } - if (!$warnings && null === $defLine) { - $warnings[] = new $SkippedTestError('No Polyfills found in bootstrap.php for '.$testClass); - } else { - $mainSuite->addTest(new TestListener($suite)); - } - } - foreach ($warnings as $w) { - $mainSuite->addTest($w); - } - } - - public function addError($test, \Exception $e, $time) - { - if (false !== self::$enabledPolyfills) { - $r = new \ReflectionProperty('Exception', 'message'); - $r->setAccessible(true); - $r->setValue($e, 'Polyfills enabled, '.$r->getValue($e)); - } - } -} diff --git a/application/vendor/symfony/polyfill-util/composer.json b/application/vendor/symfony/polyfill-util/composer.json deleted file mode 100644 index 3343c66..0000000 --- a/application/vendor/symfony/polyfill-util/composer.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "name": "symfony/polyfill-util", - "type": "library", - "description": "Symfony utilities for portability of PHP codes", - "keywords": ["polyfill", "shim", "compat", "compatibility"], - "homepage": "https://symfony.com", - "license": "MIT", - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "require": { - "php": ">=5.3.3" - }, - "autoload": { - "psr-4": { "Symfony\\Polyfill\\Util\\": "" } - }, - "minimum-stability": "dev", - "extra": { - "branch-alias": { - "dev-master": "1.18-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - } -} diff --git a/application/version b/application/version index e7f45a8..1ce69a7 100644 --- a/application/version +++ b/application/version @@ -1 +1 @@ -v1.3 +v1.5 diff --git a/docker/php.dockerfile b/docker/php.dockerfile index 40f7542..88a6990 100644 --- a/docker/php.dockerfile +++ b/docker/php.dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4-fpm-alpine +FROM php:7.3-fpm-alpine ADD ./docker/php/www.conf /usr/local/etc/php-fpm.d/www.conf diff --git a/updates.json b/updates.json index 01009b2..1260687 100644 --- a/updates.json +++ b/updates.json @@ -1,4 +1,4 @@ { "title": "BoNeMEAL v1.5", - "body": "Support for PHP 7.3+ Updated base software version to allow support for PHP versions 7.3+" + "body": "Support for PHP 7.3 Updated base software version to allow support for PHP versions up to 7.3" }