joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-24 22:39:31 +00:00
Code Packages Releases Activity

Update Composer libraries to current versions (#13321)

Browse Source
This commit is contained in:
Michael Babker 2016-12-26 11:35:03 -06:00 committed by George Wilson
parent d0842d521f
commit ea3526f1df
39 changed files with 1551 additions and 1270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -60,6 +60,7 @@ Desktop.ini
/libraries/vendor/ircmaxell/password-compat/phpunit.xml.dist
/libraries/vendor/ircmaxell/password-compat/README.md
/libraries/vendor/ircmaxell/password-compat/version-test.php
/libraries/vendor/joomla/*/.github
/libraries/vendor/joomla/*/.gitignore
/libraries/vendor/joomla/*/.gitmodules
/libraries/vendor/joomla/*/docs
@ -70,6 +71,7 @@ Desktop.ini
/libraries/vendor/joomla/*/composer.json
/libraries/vendor/joomla/*/phpunit.xml.dist
/libraries/vendor/joomla/*/README.md
/libraries/vendor/joomla/session/Joomla/Session/.github
/libraries/vendor/joomla/session/Joomla/Session/_Tests
/libraries/vendor/joomla/session/Joomla/Session/build
/libraries/vendor/joomla/session/Joomla/Session/Tests

6
composer.json
View File

@ -23,15 +23,15 @@
"joomla/data": "~1.2",
"joomla/di": "~1.2",
"joomla/event": "~1.1",
"joomla/registry": "~1.4 >=1.4.5",
"joomla/registry": "^1.4.5",
"joomla/session": "~1.3",
"joomla/string": "~1.3",
"joomla/uri": "~1.1",
"joomla/utilities": "~1.3 >=1.3.3",
"joomla/utilities": "^1.3.3",
"ircmaxell/password-compat": "1.*",
"leafo/lessphp": "0.5.0",
"paragonie/random_compat": "~1.0",
"phpmailer/phpmailer": "5.2.16",
"phpmailer/phpmailer": "^5.2.18",
"symfony/polyfill-php55": "~1.2",
"symfony/polyfill-php56": "~1.0",
"symfony/yaml": "2.*",

367
composer.lock generated
View File

@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "15ae8f9ee2aa080639758e0925fa9b45",
"content-hash": "ea772882d62aa0ce41eaaa27dcb93653",
"hash": "ca7cb035c1ac04233d3c822f1160546c",
"content-hash": "161f91c41caf9a179d905264523b29ae",
"packages": [
{
"name": "ircmaxell/password-compat",
@ -51,29 +51,29 @@
},
{
"name": "joomla/application",
"version": "1.6.0",
"version": "1.7.0",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/application.git",
"reference": "2c2fb32553819f22ee15d4022dec805e750f43ce"
"reference": "e1a2416d3aaeae3c927920b3e1b1c33095b16e03"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/application/zipball/2c2fb32553819f22ee15d4022dec805e750f43ce",
"reference": "2c2fb32553819f22ee15d4022dec805e750f43ce",
"url": "https://api.github.com/repos/joomla-framework/application/zipball/e1a2416d3aaeae3c927920b3e1b1c33095b16e03",
"reference": "e1a2416d3aaeae3c927920b3e1b1c33095b16e03",
"shasum": ""
},
"require": {
"joomla/input": "~1.2",
"joomla/registry": "~1.1",
"php": ">=5.3.10|>=7.0",
"php": "^5.3.10|~7.0",
"psr/log": "~1.0"
},
"require-dev": {
"joomla/session": "^1.2.1",
"joomla/test": "~1.1",
"joomla/uri": "~1.1",
"phpunit/phpunit": "~4.8|~5.0",
"phpunit/phpunit": "~4.8|>=5.0 <5.4",
"squizlabs/php_codesniffer": "1.*"
},
"suggest": {
@ -102,7 +102,7 @@
"framework",
"joomla"
],
"time": "2016-04-09 03:08:55"
"time": "2016-12-10 17:26:50"
},
{
"name": "joomla/compat",
@ -287,25 +287,25 @@
},
{
"name": "joomla/filter",
"version": "1.2.0",
"version": "1.3.0",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/filter.git",
"reference": "45a504f0cd6fa2312a0260955e957435ca2cedc9"
"reference": "250d8f0d3e2d2fb6e31a540ddc6c8d992c92091d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/filter/zipball/45a504f0cd6fa2312a0260955e957435ca2cedc9",
"reference": "45a504f0cd6fa2312a0260955e957435ca2cedc9",
"url": "https://api.github.com/repos/joomla-framework/filter/zipball/250d8f0d3e2d2fb6e31a540ddc6c8d992c92091d",
"reference": "250d8f0d3e2d2fb6e31a540ddc6c8d992c92091d",
"shasum": ""
},
"require": {
"joomla/string": "~1.3",
"php": ">=5.3.10"
"php": "^5.3.10|~7.0"
},
"require-dev": {
"joomla/language": "~1.0",
"phpunit/phpunit": "4.*",
"joomla/language": "~1.3",
"phpunit/phpunit": "~4.8|~5.0",
"squizlabs/php_codesniffer": "1.*"
},
"suggest": {
@ -319,8 +319,7 @@
},
"autoload": {
"psr-4": {
"Joomla\\Filter\\": "src/",
"Joomla\\Filter\\Tests\\": "Tests/"
"Joomla\\Filter\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -334,7 +333,7 @@
"framework",
"joomla"
],
"time": "2016-01-08 17:27:47"
"time": "2016-10-16 18:10:33"
},
{
"name": "joomla/input",
@ -439,29 +438,30 @@
},
{
"name": "joomla/session",
"version": "1.3.1",
"version": "1.3.3",
"target-dir": "Joomla/Session",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/session.git",
"reference": "a91ea38b797f505c8ab20773604b901b567ed0ab"
"reference": "1fb5df818998305fa5d4eaf18e530a388e69edc0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/session/zipball/a91ea38b797f505c8ab20773604b901b567ed0ab",
"reference": "a91ea38b797f505c8ab20773604b901b567ed0ab",
"url": "https://api.github.com/repos/joomla-framework/session/zipball/1fb5df818998305fa5d4eaf18e530a388e69edc0",
"reference": "1fb5df818998305fa5d4eaf18e530a388e69edc0",
"shasum": ""
},
"require": {
"joomla/event": "~1.1",
"joomla/filter": "~1.0",
"php": ">=5.3.10"
"paragonie/random_compat": "~1.0|~2.0",
"php": "^5.3.10|~7.0"
},
"require-dev": {
"joomla/database": "~1.0",
"joomla/test": "~1.0",
"phpunit/dbunit": "~1.2",
"phpunit/phpunit": "4.*",
"phpunit/dbunit": "~1.3",
"phpunit/phpunit": "~4.8|~5.0",
"squizlabs/php_codesniffer": "1.*"
},
"suggest": {
@ -484,30 +484,33 @@
"joomla",
"session"
],
"time": "2015-12-14 18:23:13"
"time": "2016-12-21 21:08:20"
},
{
"name": "joomla/string",
"version": "1.4.0",
"version": "1.4.1",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/string.git",
"reference": "05197132a075ee22a3f0f7da31a19a6d5b4717db"
"reference": "66363d317e6c020f30a70265c129281c77c43ca0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/string/zipball/05197132a075ee22a3f0f7da31a19a6d5b4717db",
"reference": "05197132a075ee22a3f0f7da31a19a6d5b4717db",
"url": "https://api.github.com/repos/joomla-framework/string/zipball/66363d317e6c020f30a70265c129281c77c43ca0",
"reference": "66363d317e6c020f30a70265c129281c77c43ca0",
"shasum": ""
},
"require": {
"php": ">=5.3.10|>=7.0"
"php": "^5.3.10|~7.0"
},
"require-dev": {
"joomla/test": "~1.0",
"phpunit/phpunit": "~4.8|~5.0",
"squizlabs/php_codesniffer": "1.*"
},
"suggest": {
"ext-mbstring": "For improved processing"
},
"type": "joomla-package",
"extra": {
"branch-alias": {
@ -516,8 +519,7 @@
},
"autoload": {
"psr-4": {
"Joomla\\String\\": "src/",
"Joomla\\String\\Tests\\": "Tests/"
"Joomla\\String\\": "src/"
},
"files": [
"src/phputf8/utf8.php",
@ -548,7 +550,7 @@
"joomla",
"string"
],
"time": "2016-01-30 20:04:23"
"time": "2016-12-10 18:13:42"
},
{
"name": "joomla/uri",
@ -589,24 +591,24 @@
},
{
"name": "joomla/utilities",
"version": "1.4.0",
"version": "1.4.1",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/utilities.git",
"reference": "ecf18231ff86ab06cf555a7c3ed4dd447ae39e9b"
"reference": "8913ca02aad7b929e0d52d78fd5a6961070bdbc6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/utilities/zipball/ecf18231ff86ab06cf555a7c3ed4dd447ae39e9b",
"reference": "ecf18231ff86ab06cf555a7c3ed4dd447ae39e9b",
"url": "https://api.github.com/repos/joomla-framework/utilities/zipball/8913ca02aad7b929e0d52d78fd5a6961070bdbc6",
"reference": "8913ca02aad7b929e0d52d78fd5a6961070bdbc6",
"shasum": ""
},
"require": {
"joomla/string": "~1.3",
"php": ">=5.3.10"
"php": "^5.3.10|~7.0"
},
"require-dev": {
"phpunit/phpunit": "4.*",
"phpunit/phpunit": "~4.8|~5.0",
"squizlabs/php_codesniffer": "1.*"
},
"type": "joomla-package",
@ -617,8 +619,7 @@
},
"autoload": {
"psr-4": {
"Joomla\\Utilities\\": "src/",
"Joomla\\Utilities\\Tests\\": "Tests/"
"Joomla\\Utilities\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -632,7 +633,7 @@
"joomla",
"utilities"
],
"time": "2015-09-05 16:41:24"
"time": "2016-12-10 17:09:33"
},
{
"name": "leafo/lessphp",
@ -725,16 +726,16 @@
},
{
"name": "phpmailer/phpmailer",
"version": "v5.2.16",
"version": "v5.2.19",
"source": {
"type": "git",
"url": "https://github.com/PHPMailer/PHPMailer.git",
"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a"
"reference": "9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a",
"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a",
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9",
"reference": "9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9",
"shasum": ""
},
"require": {
@ -781,26 +782,34 @@
}
],
"description": "PHPMailer is a full-featured email creation and transfer class for PHP",
"time": "2016-06-06 09:09:37"
"time": "2016-12-26 10:09:10"
},
{
"name": "psr/log",
"version": "1.0.0",
"version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
"url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-0": {
"Psr\\Log\\": ""
"psr-4": {
"Psr\\Log\\": "Psr/Log/"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -814,12 +823,13 @@
}
],
"description": "Common interface for logging libraries",
"homepage": "https://github.com/php-fig/log",
"keywords": [
"log",
"psr",
"psr-3"
],
"time": "2012-12-21 11:40:51"
"time": "2016-10-10 12:19:37"
},
{
"name": "simplepie/simplepie",
@ -877,16 +887,16 @@
},
{
"name": "symfony/polyfill-php55",
"version": "v1.2.0",
"version": "v1.3.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php55.git",
"reference": "bf2ff9ad6be1a4772cb873e4eea94d70daa95c6d"
"reference": "03e3f0350bca2220e3623a0e340eef194405fc67"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/bf2ff9ad6be1a4772cb873e4eea94d70daa95c6d",
"reference": "bf2ff9ad6be1a4772cb873e4eea94d70daa95c6d",
"url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/03e3f0350bca2220e3623a0e340eef194405fc67",
"reference": "03e3f0350bca2220e3623a0e340eef194405fc67",
"shasum": ""
},
"require": {
@ -896,7 +906,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.2-dev"
"dev-master": "1.3-dev"
}
},
"autoload": {
@ -929,20 +939,20 @@
"portable",
"shim"
],
"time": "2016-05-18 14:26:46"
"time": "2016-11-14 01:06:16"
},
{
"name": "symfony/polyfill-php56",
"version": "v1.2.0",
"version": "v1.3.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php56.git",
"reference": "3edf57a8fbf9a927533344cef65ad7e1cf31030a"
"reference": "1dd42b9b89556f18092f3d1ada22cb05ac85383c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/3edf57a8fbf9a927533344cef65ad7e1cf31030a",
"reference": "3edf57a8fbf9a927533344cef65ad7e1cf31030a",
"url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/1dd42b9b89556f18092f3d1ada22cb05ac85383c",
"reference": "1dd42b9b89556f18092f3d1ada22cb05ac85383c",
"shasum": ""
},
"require": {
@ -952,7 +962,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.2-dev"
"dev-master": "1.3-dev"
}
},
"autoload": {
@ -985,20 +995,20 @@
"portable",
"shim"
],
"time": "2016-05-18 14:26:46"
"time": "2016-11-14 01:06:16"
},
{
"name": "symfony/polyfill-util",
"version": "v1.2.0",
"version": "v1.3.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-util.git",
"reference": "ef830ce3d218e622b221d6bfad42c751d974bf99"
"reference": "746bce0fca664ac0a575e465f65c6643faddf7fb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ef830ce3d218e622b221d6bfad42c751d974bf99",
"reference": "ef830ce3d218e622b221d6bfad42c751d974bf99",
"url": "https://api.github.com/repos/symfony/polyfill-util/zipball/746bce0fca664ac0a575e465f65c6643faddf7fb",
"reference": "746bce0fca664ac0a575e465f65c6643faddf7fb",
"shasum": ""
},
"require": {
@ -1007,7 +1017,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.2-dev"
"dev-master": "1.3-dev"
}
},
"autoload": {
@ -1037,20 +1047,20 @@
"polyfill",
"shim"
],
"time": "2016-05-18 14:26:46"
"time": "2016-11-14 01:06:16"
},
{
"name": "symfony/yaml",
"version": "v2.8.8",
"version": "v2.8.15",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "dba4bb5846798cd12f32e2d8f3f35d77045773c8"
"reference": "befb26a3713c97af90d25dd12e75621ef14d91ff"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/dba4bb5846798cd12f32e2d8f3f35d77045773c8",
"reference": "dba4bb5846798cd12f32e2d8f3f35d77045773c8",
"url": "https://api.github.com/repos/symfony/yaml/zipball/befb26a3713c97af90d25dd12e75621ef14d91ff",
"reference": "befb26a3713c97af90d25dd12e75621ef14d91ff",
"shasum": ""
},
"require": {
@ -1086,7 +1096,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"time": "2016-06-29 05:29:29"
"time": "2016-11-14 16:15:57"
}
],
"packages-dev": [
@ -1303,16 +1313,16 @@
},
{
"name": "phpspec/prophecy",
"version": "v1.6.1",
"version": "v1.6.2",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
"reference": "58a8137754bc24b25740d4281399a4a3596058e0"
"reference": "6c52c2722f8460122f96f86346600e1077ce22cb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/58a8137754bc24b25740d4281399a4a3596058e0",
"reference": "58a8137754bc24b25740d4281399a4a3596058e0",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/6c52c2722f8460122f96f86346600e1077ce22cb",
"reference": "6c52c2722f8460122f96f86346600e1077ce22cb",
"shasum": ""
},
"require": {
@ -1320,10 +1330,11 @@
"php": "^5.3|^7.0",
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
"sebastian/comparator": "^1.1",
"sebastian/recursion-context": "^1.0"
"sebastian/recursion-context": "^1.0|^2.0"
},
"require-dev": {
"phpspec/phpspec": "^2.0"
"phpspec/phpspec": "^2.0",
"phpunit/phpunit": "^4.8 || ^5.6.5"
},
"type": "library",
"extra": {
@ -1361,7 +1372,7 @@
"spy",
"stub"
],
"time": "2016-06-07 08:13:47"
"time": "2016-11-21 14:58:47"
},
{
"name": "phpunit/dbunit",
@ -1486,16 +1497,16 @@
},
{
"name": "phpunit/php-file-iterator",
"version": "1.4.1",
"version": "1.4.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-file-iterator.git",
"reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0"
"reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
"reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
"url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
"reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
"shasum": ""
},
"require": {
@ -1529,7 +1540,7 @@
"filesystem",
"iterator"
],
"time": "2015-06-21 13:08:43"
"time": "2016-10-03 07:40:28"
},
{
"name": "phpunit/php-text-template",
@ -1618,16 +1629,16 @@
},
{
"name": "phpunit/php-token-stream",
"version": "1.4.8",
"version": "1.4.9",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
"reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
"reference": "3b402f65a4cc90abf6e1104e388b896ce209631b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
"reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3b402f65a4cc90abf6e1104e388b896ce209631b",
"reference": "3b402f65a4cc90abf6e1104e388b896ce209631b",
"shasum": ""
},
"require": {
@ -1663,20 +1674,20 @@
"keywords": [
"tokenizer"
],
"time": "2015-09-15 10:49:45"
"time": "2016-11-15 14:06:22"
},
{
"name": "phpunit/phpunit",
"version": "4.8.27",
"version": "4.8.31",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90"
"reference": "98b2b39a520766bec663ff5b7ff1b729db9dbfe3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c062dddcb68e44b563f66ee319ddae2b5a322a90",
"reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/98b2b39a520766bec663ff5b7ff1b729db9dbfe3",
"reference": "98b2b39a520766bec663ff5b7ff1b729db9dbfe3",
"shasum": ""
},
"require": {
@ -1692,7 +1703,7 @@
"phpunit/php-text-template": "~1.2",
"phpunit/php-timer": "^1.0.6",
"phpunit/phpunit-mock-objects": "~2.3",
"sebastian/comparator": "~1.1",
"sebastian/comparator": "~1.2.2",
"sebastian/diff": "~1.2",
"sebastian/environment": "~1.3",
"sebastian/exporter": "~1.2",
@ -1735,7 +1746,7 @@
"testing",
"xunit"
],
"time": "2016-07-21 06:48:14"
"time": "2016-12-09 02:45:31"
},
{
"name": "phpunit/phpunit-mock-objects",
@ -1795,22 +1806,22 @@
},
{
"name": "sebastian/comparator",
"version": "1.2.0",
"version": "1.2.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
"reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
"reference": "6a1ed12e8b2409076ab22e3897126211ff8b1f7f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
"reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
"url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/6a1ed12e8b2409076ab22e3897126211ff8b1f7f",
"reference": "6a1ed12e8b2409076ab22e3897126211ff8b1f7f",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"sebastian/diff": "~1.2",
"sebastian/exporter": "~1.2"
"sebastian/exporter": "~1.2 || ~2.0"
},
"require-dev": {
"phpunit/phpunit": "~4.4"
@ -1855,7 +1866,7 @@
"compare",
"equality"
],
"time": "2015-07-26 15:48:44"
"time": "2016-11-19 09:18:40"
},
{
"name": "sebastian/diff",
@ -1911,23 +1922,23 @@
},
{
"name": "sebastian/environment",
"version": "1.3.7",
"version": "1.3.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
"reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716"
"reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716",
"reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea",
"reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
"php": "^5.3.3 || ^7.0"
},
"require-dev": {
"phpunit/phpunit": "~4.4"
"phpunit/phpunit": "^4.8 || ^5.0"
},
"type": "library",
"extra": {
@ -1957,7 +1968,7 @@
"environment",
"hhvm"
],
"time": "2016-05-17 03:18:57"
"time": "2016-08-18 05:49:44"
},
{
"name": "sebastian/exporter",
@ -2242,20 +2253,21 @@
},
{
"name": "symfony/console",
"version": "v2.8.9",
"version": "v2.8.15",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "36e62335caca8a6e909c5c5bac4a8128149911c9"
"reference": "d5643cd095e5e37d31e004bb2606b5dd7e96602f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/36e62335caca8a6e909c5c5bac4a8128149911c9",
"reference": "36e62335caca8a6e909c5c5bac4a8128149911c9",
"url": "https://api.github.com/repos/symfony/console/zipball/d5643cd095e5e37d31e004bb2606b5dd7e96602f",
"reference": "d5643cd095e5e37d31e004bb2606b5dd7e96602f",
"shasum": ""
},
"require": {
"php": ">=5.3.9",
"symfony/debug": "~2.7,>=2.7.2|~3.0.0",
"symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
@ -2298,20 +2310,77 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"time": "2016-07-30 07:20:35"
"time": "2016-12-06 11:59:35"
},
{
"name": "symfony/event-dispatcher",
"version": "v2.8.9",
"name": "symfony/debug",
"version": "v2.8.15",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "889983a79a043dfda68f38c38b6dba092dd49cd8"
"url": "https://github.com/symfony/debug.git",
"reference": "62a68f640456f6761d752c62d81631428ef0d8a1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/889983a79a043dfda68f38c38b6dba092dd49cd8",
"reference": "889983a79a043dfda68f38c38b6dba092dd49cd8",
"url": "https://api.github.com/repos/symfony/debug/zipball/62a68f640456f6761d752c62d81631428ef0d8a1",
"reference": "62a68f640456f6761d752c62d81631428ef0d8a1",
"shasum": ""
},
"require": {
"php": ">=5.3.9",
"psr/log": "~1.0"
},
"conflict": {
"symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
},
"require-dev": {
"symfony/class-loader": "~2.2|~3.0.0",
"symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2|~3.0.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.8-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\Debug\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
"time": "2016-11-15 12:53:17"
},
{
"name": "symfony/event-dispatcher",
"version": "v2.8.15",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "25c576abd4e0f212e678fe8b2bd9a9a98c7ea934"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/25c576abd4e0f212e678fe8b2bd9a9a98c7ea934",
"reference": "25c576abd4e0f212e678fe8b2bd9a9a98c7ea934",
"shasum": ""
},
"require": {
@ -2358,20 +2427,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
"time": "2016-07-28 16:56:28"
"time": "2016-10-13 01:43:15"
},
{
"name": "symfony/filesystem",
"version": "v2.8.9",
"version": "v2.8.15",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "ab4c3f085c8f5a56536845bf985c4cef30bf75fd"
"reference": "a3784111af9f95f102b6411548376e1ae7c93898"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/ab4c3f085c8f5a56536845bf985c4cef30bf75fd",
"reference": "ab4c3f085c8f5a56536845bf985c4cef30bf75fd",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/a3784111af9f95f102b6411548376e1ae7c93898",
"reference": "a3784111af9f95f102b6411548376e1ae7c93898",
"shasum": ""
},
"require": {
@ -2407,20 +2476,20 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
"time": "2016-07-20 05:41:28"
"time": "2016-10-18 04:28:30"
},
{
"name": "symfony/finder",
"version": "v2.8.9",
"version": "v2.8.15",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "60804d88691e4a73bbbb3035eb1d9f075c5c2c10"
"reference": "c0f10576335743b881ac1ed39d18c0fa66048775"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/60804d88691e4a73bbbb3035eb1d9f075c5c2c10",
"reference": "60804d88691e4a73bbbb3035eb1d9f075c5c2c10",
"url": "https://api.github.com/repos/symfony/finder/zipball/c0f10576335743b881ac1ed39d18c0fa66048775",
"reference": "c0f10576335743b881ac1ed39d18c0fa66048775",
"shasum": ""
},
"require": {
@ -2456,20 +2525,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
"time": "2016-07-26 08:02:44"
"time": "2016-12-13 09:38:12"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.2.0",
"version": "v1.3.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "dff51f72b0706335131b00a7f49606168c582594"
"reference": "e79d363049d1c2128f133a2667e4f4190904f7f4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594",
"reference": "dff51f72b0706335131b00a7f49606168c582594",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4",
"reference": "e79d363049d1c2128f133a2667e4f4190904f7f4",
"shasum": ""
},
"require": {
@ -2481,7 +2550,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.2-dev"
"dev-master": "1.3-dev"
}
},
"autoload": {
@ -2515,20 +2584,20 @@
"portable",
"shim"
],
"time": "2016-05-18 14:26:46"
"time": "2016-11-14 01:06:16"
},
{
"name": "symfony/process",
"version": "v2.8.9",
"version": "v2.8.15",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "d20332e43e8774ff8870b394f3dd6020cc7f8e0c"
"reference": "1a1bd056395540d0bc549d39818316513565d278"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/d20332e43e8774ff8870b394f3dd6020cc7f8e0c",
"reference": "d20332e43e8774ff8870b394f3dd6020cc7f8e0c",
"url": "https://api.github.com/repos/symfony/process/zipball/1a1bd056395540d0bc549d39818316513565d278",
"reference": "1a1bd056395540d0bc549d39818316513565d278",
"shasum": ""
},
"require": {
@ -2564,11 +2633,11 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
"time": "2016-07-28 11:13:19"
"time": "2016-11-24 00:43:03"
},
{
"name": "symfony/stopwatch",
"version": "v2.8.9",
"version": "v2.8.15",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",

2
libraries/vendor/autoload.php vendored
View File

@ -2,6 +2,6 @@
// autoload.php @generated by Composer
require_once __DIR__ . '/composer' . '/autoload_real.php';
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit205c915b9c7d3e718e7c95793ee67ffe::getLoader();

1
libraries/vendor/composer/autoload_namespaces.php vendored
View File

@ -7,6 +7,5 @@ $baseDir = dirname(dirname($vendorDir));
return array(
'SimplePie' => array($vendorDir . '/simplepie/simplepie/library'),
'Psr\\Log\\' => array($vendorDir . '/psr/log'),
'Joomla\\Session' => array($vendorDir . '/joomla/session'),
);

4
libraries/vendor/composer/autoload_psr4.php vendored
View File

@ -10,16 +10,14 @@ return array(
'Symfony\\Polyfill\\Php56\\' => array($vendorDir . '/symfony/polyfill-php56'),
'Symfony\\Polyfill\\Php55\\' => array($vendorDir . '/symfony/polyfill-php55'),
'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
'Joomla\\Utilities\\Tests\\' => array($vendorDir . '/joomla/utilities/Tests'),
'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
'Joomla\\Utilities\\' => array($vendorDir . '/joomla/utilities/src'),
'Joomla\\Uri\\Tests\\' => array($vendorDir . '/joomla/uri/Tests'),
'Joomla\\Uri\\' => array($vendorDir . '/joomla/uri/src'),
'Joomla\\String\\Tests\\' => array($vendorDir . '/joomla/string/Tests'),
'Joomla\\String\\' => array($vendorDir . '/joomla/string/src'),
'Joomla\\Registry\\' => array($vendorDir . '/joomla/registry/src'),
'Joomla\\Input\\Tests\\' => array($vendorDir . '/joomla/input/Tests'),
'Joomla\\Input\\' => array($vendorDir . '/joomla/input/src'),
'Joomla\\Filter\\Tests\\' => array($vendorDir . '/joomla/filter/Tests'),
'Joomla\\Filter\\' => array($vendorDir . '/joomla/filter/src'),
'Joomla\\Event\\Tests\\' => array($vendorDir . '/joomla/event/Tests'),
'Joomla\\Event\\' => array($vendorDir . '/joomla/event/src'),

2
libraries/vendor/composer/autoload_real.php vendored
View File

@ -23,7 +23,7 @@ class ComposerAutoloaderInit205c915b9c7d3e718e7c95793ee67ffe
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit205c915b9c7d3e718e7c95793ee67ffe', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION');
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';

26
libraries/vendor/composer/autoload_static.php vendored
View File

@ -36,18 +36,19 @@ class ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe
'Symfony\\Polyfill\\Php55\\' => 23,
'Symfony\\Component\\Yaml\\' => 23,
),
'P' =>
array (
'Psr\\Log\\' => 8,
),
'J' =>
array (
'Joomla\\Utilities\\Tests\\' => 23,
'Joomla\\Utilities\\' => 17,
'Joomla\\Uri\\Tests\\' => 17,
'Joomla\\Uri\\' => 11,
'Joomla\\String\\Tests\\' => 20,
'Joomla\\String\\' => 14,
'Joomla\\Registry\\' => 16,
'Joomla\\Input\\Tests\\' => 19,
'Joomla\\Input\\' => 13,
'Joomla\\Filter\\Tests\\' => 20,
'Joomla\\Filter\\' => 14,
'Joomla\\Event\\Tests\\' => 19,
'Joomla\\Event\\' => 13,
@ -76,9 +77,9 @@ class ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe
array (
0 => __DIR__ . '/..' . '/symfony/yaml',
),
'Joomla\\Utilities\\Tests\\' =>
'Psr\\Log\\' =>
array (
0 => __DIR__ . '/..' . '/joomla/utilities/Tests',
0 => __DIR__ . '/..' . '/psr/log/Psr/Log',
),
'Joomla\\Utilities\\' =>
array (
@ -92,10 +93,6 @@ class ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe
array (
0 => __DIR__ . '/..' . '/joomla/uri/src',
),
'Joomla\\String\\Tests\\' =>
array (
0 => __DIR__ . '/..' . '/joomla/string/Tests',
),
'Joomla\\String\\' =>
array (
0 => __DIR__ . '/..' . '/joomla/string/src',
@ -112,10 +109,6 @@ class ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe
array (
0 => __DIR__ . '/..' . '/joomla/input/src',
),
'Joomla\\Filter\\Tests\\' =>
array (
0 => __DIR__ . '/..' . '/joomla/filter/Tests',
),
'Joomla\\Filter\\' =>
array (
0 => __DIR__ . '/..' . '/joomla/filter/src',
@ -158,13 +151,6 @@ class ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe
0 => __DIR__ . '/..' . '/simplepie/simplepie/library',
),
),
'P' =>
array (
'Psr\\Log\\' =>
array (
0 => __DIR__ . '/..' . '/psr/log',
),
),
'J' =>
array (
'Joomla\\Session' =>

888
libraries/vendor/composer/installed.json vendored
View File

@ -1,44 +1,4 @@
[
{
"name": "psr/log",
"version": "1.0.0",
"version_normalized": "1.0.0.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
"shasum": ""
},
"time": "2012-12-21 11:40:51",
"type": "library",
"installation-source": "dist",
"autoload": {
"psr-0": {
"Psr\\Log\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "PHP-FIG",
"homepage": "http://www.php-fig.org/"
}
],
"description": "Common interface for logging libraries",
"keywords": [
"log",
"psr",
"psr-3"
]
},
{
"name": "joomla/uri",
"version": "1.1.1",
@ -305,225 +265,6 @@
"description": "lessphp is a compiler for LESS written in PHP.",
"homepage": "http://leafo.net/lessphp/"
},
{
"name": "joomla/filter",
"version": "1.2.0",
"version_normalized": "1.2.0.0",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/filter.git",
"reference": "45a504f0cd6fa2312a0260955e957435ca2cedc9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/filter/zipball/45a504f0cd6fa2312a0260955e957435ca2cedc9",
"reference": "45a504f0cd6fa2312a0260955e957435ca2cedc9",
"shasum": ""
},
"require": {
"joomla/string": "~1.3",
"php": ">=5.3.10"
},
"require-dev": {
"joomla/language": "~1.0",
"phpunit/phpunit": "4.*",
"squizlabs/php_codesniffer": "1.*"
},
"suggest": {
"joomla/language": "Required only if you want to use `OutputFilter::stringURLSafe`."
},
"time": "2016-01-08 17:27:47",
"type": "joomla-package",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
"Joomla\\Filter\\": "src/",
"Joomla\\Filter\\Tests\\": "Tests/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"description": "Joomla Filter Package",
"homepage": "https://github.com/joomla-framework/filter",
"keywords": [
"filter",
"framework",
"joomla"
]
},
{
"name": "joomla/session",
"version": "1.3.1",
"version_normalized": "1.3.1.0",
"target-dir": "Joomla/Session",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/session.git",
"reference": "a91ea38b797f505c8ab20773604b901b567ed0ab"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/session/zipball/a91ea38b797f505c8ab20773604b901b567ed0ab",
"reference": "a91ea38b797f505c8ab20773604b901b567ed0ab",
"shasum": ""
},
"require": {
"joomla/event": "~1.1",
"joomla/filter": "~1.0",
"php": ">=5.3.10"
},
"require-dev": {
"joomla/database": "~1.0",
"joomla/test": "~1.0",
"phpunit/dbunit": "~1.2",
"phpunit/phpunit": "4.*",
"squizlabs/php_codesniffer": "1.*"
},
"suggest": {
"joomla/database": "Install joomla/database if you want to use Database session storage."
},
"time": "2015-12-14 18:23:13",
"type": "joomla-package",
"installation-source": "dist",
"autoload": {
"psr-0": {
"Joomla\\Session": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"description": "Joomla Session Package",
"homepage": "https://github.com/joomla-framework/session",
"keywords": [
"framework",
"joomla",
"session"
]
},
{
"name": "joomla/utilities",
"version": "1.4.0",
"version_normalized": "1.4.0.0",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/utilities.git",
"reference": "ecf18231ff86ab06cf555a7c3ed4dd447ae39e9b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/utilities/zipball/ecf18231ff86ab06cf555a7c3ed4dd447ae39e9b",
"reference": "ecf18231ff86ab06cf555a7c3ed4dd447ae39e9b",
"shasum": ""
},
"require": {
"joomla/string": "~1.3",
"php": ">=5.3.10"
},
"require-dev": {
"phpunit/phpunit": "4.*",
"squizlabs/php_codesniffer": "1.*"
},
"time": "2015-09-05 16:41:24",
"type": "joomla-package",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
"Joomla\\Utilities\\": "src/",
"Joomla\\Utilities\\Tests\\": "Tests/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"description": "Joomla Utilities Package",
"homepage": "https://github.com/joomla-framework/utilities",
"keywords": [
"framework",
"joomla",
"utilities"
]
},
{
"name": "joomla/string",
"version": "1.4.0",
"version_normalized": "1.4.0.0",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/string.git",
"reference": "05197132a075ee22a3f0f7da31a19a6d5b4717db"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/string/zipball/05197132a075ee22a3f0f7da31a19a6d5b4717db",
"reference": "05197132a075ee22a3f0f7da31a19a6d5b4717db",
"shasum": ""
},
"require": {
"php": ">=5.3.10|>=7.0"
},
"require-dev": {
"joomla/test": "~1.0",
"phpunit/phpunit": "~4.8|~5.0",
"squizlabs/php_codesniffer": "1.*"
},
"time": "2016-01-30 20:04:23",
"type": "joomla-package",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
"Joomla\\String\\": "src/",
"Joomla\\String\\Tests\\": "Tests/"
},
"files": [
"src/phputf8/utf8.php",
"src/phputf8/ord.php",
"src/phputf8/str_ireplace.php",
"src/phputf8/str_pad.php",
"src/phputf8/str_split.php",
"src/phputf8/strcasecmp.php",
"src/phputf8/strcspn.php",
"src/phputf8/stristr.php",
"src/phputf8/strrev.php",
"src/phputf8/strspn.php",
"src/phputf8/trim.php",
"src/phputf8/ucfirst.php",
"src/phputf8/ucwords.php",
"src/phputf8/utils/ascii.php",
"src/phputf8/utils/validation.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"description": "Joomla String Package",
"homepage": "https://github.com/joomla-framework/string",
"keywords": [
"framework",
"joomla",
"string"
]
},
{
"name": "joomla/event",
"version": "1.2.0",
@ -622,63 +363,6 @@
"random"
]
},
{
"name": "joomla/application",
"version": "1.6.0",
"version_normalized": "1.6.0.0",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/application.git",
"reference": "2c2fb32553819f22ee15d4022dec805e750f43ce"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/application/zipball/2c2fb32553819f22ee15d4022dec805e750f43ce",
"reference": "2c2fb32553819f22ee15d4022dec805e750f43ce",
"shasum": ""
},
"require": {
"joomla/input": "~1.2",
"joomla/registry": "~1.1",
"php": ">=5.3.10|>=7.0",
"psr/log": "~1.0"
},
"require-dev": {
"joomla/session": "^1.2.1",
"joomla/test": "~1.1",
"joomla/uri": "~1.1",
"phpunit/phpunit": "~4.8|~5.0",
"squizlabs/php_codesniffer": "1.*"
},
"suggest": {
"joomla/session": "To use AbstractWebApplication with session support, install joomla/session",
"joomla/uri": "To use AbstractWebApplication, install joomla/uri"
},
"time": "2016-04-09 03:08:55",
"type": "joomla-package",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
"Joomla\\Application\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"description": "Joomla Application Package",
"homepage": "https://github.com/joomla-framework/application",
"keywords": [
"application",
"framework",
"joomla"
]
},
{
"name": "simplepie/simplepie",
"version": "1.3.1",
@ -735,64 +419,6 @@
"rss"
]
},
{
"name": "symfony/polyfill-php55",
"version": "v1.2.0",
"version_normalized": "1.2.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php55.git",
"reference": "bf2ff9ad6be1a4772cb873e4eea94d70daa95c6d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/bf2ff9ad6be1a4772cb873e4eea94d70daa95c6d",
"reference": "bf2ff9ad6be1a4772cb873e4eea94d70daa95c6d",
"shasum": ""
},
"require": {
"ircmaxell/password-compat": "~1.0",
"php": ">=5.3.3"
},
"time": "2016-05-18 14:26:46",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.2-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
"Symfony\\Polyfill\\Php55\\": ""
},
"files": [
"bootstrap.php"
]
},
"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 polyfill backporting some PHP 5.5+ features to lower PHP versions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"polyfill",
"portable",
"shim"
]
},
{
"name": "joomla/data",
"version": "1.2.0",
@ -900,90 +526,360 @@
]
},
{
"name": "phpmailer/phpmailer",
"version": "v5.2.16",
"version_normalized": "5.2.16.0",
"name": "psr/log",
"version": "1.0.2",
"version_normalized": "1.0.2.0",
"source": {
"type": "git",
"url": "https://github.com/PHPMailer/PHPMailer.git",
"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a"
"url": "https://github.com/php-fig/log.git",
"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a",
"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a",
"url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
"shasum": ""
},
"require": {
"php": ">=5.0.0"
"php": ">=5.3.0"
},
"require-dev": {
"phpdocumentor/phpdocumentor": "*",
"phpunit/phpunit": "4.7.*"
},
"suggest": {
"league/oauth2-google": "Needed for Google XOAUTH2 authentication"
},
"time": "2016-06-06 09:09:37",
"time": "2016-10-10 12:19:37",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"classmap": [
"class.phpmailer.php",
"class.phpmaileroauth.php",
"class.phpmaileroauthgoogle.php",
"class.smtp.php",
"class.pop3.php",
"extras/EasyPeasyICS.php",
"extras/ntlm_sasl_client.php"
"psr-4": {
"Psr\\Log\\": "Psr/Log/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "PHP-FIG",
"homepage": "http://www.php-fig.org/"
}
],
"description": "Common interface for logging libraries",
"homepage": "https://github.com/php-fig/log",
"keywords": [
"log",
"psr",
"psr-3"
]
},
{
"name": "joomla/string",
"version": "1.4.1",
"version_normalized": "1.4.1.0",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/string.git",
"reference": "66363d317e6c020f30a70265c129281c77c43ca0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/string/zipball/66363d317e6c020f30a70265c129281c77c43ca0",
"reference": "66363d317e6c020f30a70265c129281c77c43ca0",
"shasum": ""
},
"require": {
"php": "^5.3.10|~7.0"
},
"require-dev": {
"joomla/test": "~1.0",
"phpunit/phpunit": "~4.8|~5.0",
"squizlabs/php_codesniffer": "1.*"
},
"suggest": {
"ext-mbstring": "For improved processing"
},
"time": "2016-12-10 18:13:42",
"type": "joomla-package",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
"Joomla\\String\\": "src/"
},
"files": [
"src/phputf8/utf8.php",
"src/phputf8/ord.php",
"src/phputf8/str_ireplace.php",
"src/phputf8/str_pad.php",
"src/phputf8/str_split.php",
"src/phputf8/strcasecmp.php",
"src/phputf8/strcspn.php",
"src/phputf8/stristr.php",
"src/phputf8/strrev.php",
"src/phputf8/strspn.php",
"src/phputf8/trim.php",
"src/phputf8/ucfirst.php",
"src/phputf8/ucwords.php",
"src/phputf8/utils/ascii.php",
"src/phputf8/utils/validation.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"LGPL-2.1"
"GPL-2.0+"
],
"authors": [
{
"name": "Jim Jagielski",
"email": "jimjag@gmail.com"
},
{
"name": "Marcus Bointon",
"email": "phpmailer@synchromedia.co.uk"
},
{
"name": "Andy Prevost",
"email": "codeworxtech@users.sourceforge.net"
},
{
"name": "Brent R. Matzelle"
}
],
"description": "PHPMailer is a full-featured email creation and transfer class for PHP"
"description": "Joomla String Package",
"homepage": "https://github.com/joomla-framework/string",
"keywords": [
"framework",
"joomla",
"string"
]
},
{
"name": "symfony/polyfill-util",
"version": "v1.2.0",
"version_normalized": "1.2.0.0",
"name": "joomla/utilities",
"version": "1.4.1",
"version_normalized": "1.4.1.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-util.git",
"reference": "ef830ce3d218e622b221d6bfad42c751d974bf99"
"url": "https://github.com/joomla-framework/utilities.git",
"reference": "8913ca02aad7b929e0d52d78fd5a6961070bdbc6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ef830ce3d218e622b221d6bfad42c751d974bf99",
"reference": "ef830ce3d218e622b221d6bfad42c751d974bf99",
"url": "https://api.github.com/repos/joomla-framework/utilities/zipball/8913ca02aad7b929e0d52d78fd5a6961070bdbc6",
"reference": "8913ca02aad7b929e0d52d78fd5a6961070bdbc6",
"shasum": ""
},
"require": {
"joomla/string": "~1.3",
"php": "^5.3.10|~7.0"
},
"require-dev": {
"phpunit/phpunit": "~4.8|~5.0",
"squizlabs/php_codesniffer": "1.*"
},
"time": "2016-12-10 17:09:33",
"type": "joomla-package",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
"Joomla\\Utilities\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"description": "Joomla Utilities Package",
"homepage": "https://github.com/joomla-framework/utilities",
"keywords": [
"framework",
"joomla",
"utilities"
]
},
{
"name": "joomla/filter",
"version": "1.3.0",
"version_normalized": "1.3.0.0",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/filter.git",
"reference": "250d8f0d3e2d2fb6e31a540ddc6c8d992c92091d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/filter/zipball/250d8f0d3e2d2fb6e31a540ddc6c8d992c92091d",
"reference": "250d8f0d3e2d2fb6e31a540ddc6c8d992c92091d",
"shasum": ""
},
"require": {
"joomla/string": "~1.3",
"php": "^5.3.10|~7.0"
},
"require-dev": {
"joomla/language": "~1.3",
"phpunit/phpunit": "~4.8|~5.0",
"squizlabs/php_codesniffer": "1.*"
},
"suggest": {
"joomla/language": "Required only if you want to use `OutputFilter::stringURLSafe`."
},
"time": "2016-10-16 18:10:33",
"type": "joomla-package",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
"Joomla\\Filter\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"description": "Joomla Filter Package",
"homepage": "https://github.com/joomla-framework/filter",
"keywords": [
"filter",
"framework",
"joomla"
]
},
{
"name": "joomla/application",
"version": "1.7.0",
"version_normalized": "1.7.0.0",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/application.git",
"reference": "e1a2416d3aaeae3c927920b3e1b1c33095b16e03"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/application/zipball/e1a2416d3aaeae3c927920b3e1b1c33095b16e03",
"reference": "e1a2416d3aaeae3c927920b3e1b1c33095b16e03",
"shasum": ""
},
"require": {
"joomla/input": "~1.2",
"joomla/registry": "~1.1",
"php": "^5.3.10|~7.0",
"psr/log": "~1.0"
},
"require-dev": {
"joomla/session": "^1.2.1",
"joomla/test": "~1.1",
"joomla/uri": "~1.1",
"phpunit/phpunit": "~4.8|>=5.0 <5.4",
"squizlabs/php_codesniffer": "1.*"
},
"suggest": {
"joomla/session": "To use AbstractWebApplication with session support, install joomla/session",
"joomla/uri": "To use AbstractWebApplication, install joomla/uri"
},
"time": "2016-12-10 17:26:50",
"type": "joomla-package",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
"Joomla\\Application\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"description": "Joomla Application Package",
"homepage": "https://github.com/joomla-framework/application",
"keywords": [
"application",
"framework",
"joomla"
]
},
{
"name": "symfony/polyfill-php55",
"version": "v1.3.0",
"version_normalized": "1.3.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php55.git",
"reference": "03e3f0350bca2220e3623a0e340eef194405fc67"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/03e3f0350bca2220e3623a0e340eef194405fc67",
"reference": "03e3f0350bca2220e3623a0e340eef194405fc67",
"shasum": ""
},
"require": {
"ircmaxell/password-compat": "~1.0",
"php": ">=5.3.3"
},
"time": "2016-11-14 01:06:16",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.3-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
"Symfony\\Polyfill\\Php55\\": ""
},
"files": [
"bootstrap.php"
]
},
"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 polyfill backporting some PHP 5.5+ features to lower PHP versions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"polyfill",
"portable",
"shim"
]
},
{
"name": "symfony/polyfill-util",
"version": "v1.3.0",
"version_normalized": "1.3.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-util.git",
"reference": "746bce0fca664ac0a575e465f65c6643faddf7fb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-util/zipball/746bce0fca664ac0a575e465f65c6643faddf7fb",
"reference": "746bce0fca664ac0a575e465f65c6643faddf7fb",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"time": "2016-05-18 14:26:46",
"time": "2016-11-14 01:06:16",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.2-dev"
"dev-master": "1.3-dev"
}
},
"installation-source": "dist",
@ -1017,28 +913,28 @@
},
{
"name": "symfony/polyfill-php56",
"version": "v1.2.0",
"version_normalized": "1.2.0.0",
"version": "v1.3.0",
"version_normalized": "1.3.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php56.git",
"reference": "3edf57a8fbf9a927533344cef65ad7e1cf31030a"
"reference": "1dd42b9b89556f18092f3d1ada22cb05ac85383c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/3edf57a8fbf9a927533344cef65ad7e1cf31030a",
"reference": "3edf57a8fbf9a927533344cef65ad7e1cf31030a",
"url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/1dd42b9b89556f18092f3d1ada22cb05ac85383c",
"reference": "1dd42b9b89556f18092f3d1ada22cb05ac85383c",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"symfony/polyfill-util": "~1.0"
},
"time": "2016-05-18 14:26:46",
"time": "2016-11-14 01:06:16",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.2-dev"
"dev-master": "1.3-dev"
}
},
"installation-source": "dist",
@ -1075,23 +971,23 @@
},
{
"name": "symfony/yaml",
"version": "v2.8.8",
"version_normalized": "2.8.8.0",
"version": "v2.8.15",
"version_normalized": "2.8.15.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "dba4bb5846798cd12f32e2d8f3f35d77045773c8"
"reference": "befb26a3713c97af90d25dd12e75621ef14d91ff"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/dba4bb5846798cd12f32e2d8f3f35d77045773c8",
"reference": "dba4bb5846798cd12f32e2d8f3f35d77045773c8",
"url": "https://api.github.com/repos/symfony/yaml/zipball/befb26a3713c97af90d25dd12e75621ef14d91ff",
"reference": "befb26a3713c97af90d25dd12e75621ef14d91ff",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
"time": "2016-06-29 05:29:29",
"time": "2016-11-14 16:15:57",
"type": "library",
"extra": {
"branch-alias": {
@ -1123,5 +1019,119 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com"
},
{
"name": "joomla/session",
"version": "1.3.3",
"version_normalized": "1.3.3.0",
"target-dir": "Joomla/Session",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/session.git",
"reference": "1fb5df818998305fa5d4eaf18e530a388e69edc0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/session/zipball/1fb5df818998305fa5d4eaf18e530a388e69edc0",
"reference": "1fb5df818998305fa5d4eaf18e530a388e69edc0",
"shasum": ""
},
"require": {
"joomla/event": "~1.1",
"joomla/filter": "~1.0",
"paragonie/random_compat": "~1.0|~2.0",
"php": "^5.3.10|~7.0"
},
"require-dev": {
"joomla/database": "~1.0",
"joomla/test": "~1.0",
"phpunit/dbunit": "~1.3",
"phpunit/phpunit": "~4.8|~5.0",
"squizlabs/php_codesniffer": "1.*"
},
"suggest": {
"joomla/database": "Install joomla/database if you want to use Database session storage."
},
"time": "2016-12-21 21:08:20",
"type": "joomla-package",
"installation-source": "dist",
"autoload": {
"psr-0": {
"Joomla\\Session": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"description": "Joomla Session Package",
"homepage": "https://github.com/joomla-framework/session",
"keywords": [
"framework",
"joomla",
"session"
]
},
{
"name": "phpmailer/phpmailer",
"version": "v5.2.19",
"version_normalized": "5.2.19.0",
"source": {
"type": "git",
"url": "https://github.com/PHPMailer/PHPMailer.git",
"reference": "9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9",
"reference": "9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9",
"shasum": ""
},
"require": {
"php": ">=5.0.0"
},
"require-dev": {
"phpdocumentor/phpdocumentor": "*",
"phpunit/phpunit": "4.7.*"
},
"suggest": {
"league/oauth2-google": "Needed for Google XOAUTH2 authentication"
},
"time": "2016-12-26 10:09:10",
"type": "library",
"installation-source": "dist",
"autoload": {
"classmap": [
"class.phpmailer.php",
"class.phpmaileroauth.php",
"class.phpmaileroauthgoogle.php",
"class.smtp.php",
"class.pop3.php",
"extras/EasyPeasyICS.php",
"extras/ntlm_sasl_client.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"LGPL-2.1"
],
"authors": [
{
"name": "Jim Jagielski",
"email": "jimjag@gmail.com"
},
{
"name": "Marcus Bointon",
"email": "phpmailer@synchromedia.co.uk"
},
{
"name": "Andy Prevost",
"email": "codeworxtech@users.sourceforge.net"
},
{
"name": "Brent R. Matzelle"
}
],
"description": "PHPMailer is a full-featured email creation and transfer class for PHP"
}
]

11
libraries/vendor/joomla/application/src/AbstractApplication.php vendored
View File

@ -48,12 +48,11 @@ abstract class AbstractApplication implements LoggerAwareInterface
/**
* Class constructor.
*
* @param Input $input An optional argument to provide dependency injection for the application's
* input object. If the argument is an InputCli object that object will become
* the application's input object, otherwise a default input object is created.
* @param Registry $config An optional argument to provide dependency injection for the application's
* config object. If the argument is a Registry object that object will become
* the application's config object, otherwise a default config object is created.
* @param Input $input An optional argument to provide dependency injection for the application's input object. If the argument is an
* Input object that object will become the application's input object, otherwise a default input object is created.
* @param Registry $config An optional argument to provide dependency injection for the application's config object. If the argument
* is a Registry object that object will become the application's config object, otherwise a default config
* object is created.
*
* @since 1.0
*/

20
libraries/vendor/joomla/application/src/AbstractCliApplication.php vendored
View File

@ -37,14 +37,18 @@ abstract class AbstractCliApplication extends AbstractApplication
/**
* Class constructor.
*
* @param Input\Cli $input An optional argument to provide dependency injection for the application's
* input object. If the argument is an InputCli object that object will become
* the application's input object, otherwise a default input object is created.
* @param Registry $config An optional argument to provide dependency injection for the application's
* config object. If the argument is a Registry object that object will become
* the application's config object, otherwise a default config object is created.
* @param Cli\CliOutput $output The output handler.
* @param Cli\CliInput $cliInput The CLI input handler.
* @param Input\Cli $input An optional argument to provide dependency injection for the application's input object. If the
* argument is an Input\Cli object that object will become the application's input object, otherwise
* a default input object is created.
* @param Registry $config An optional argument to provide dependency injection for the application's config object. If the
* argument is a Registry object that object will become the application's config object, otherwise
* a default config object is created.
* @param Cli\CliOutput $output An optional argument to provide dependency injection for the application's output object. If the
* argument is a Cli\CliOutput object that object will become the application's input object, otherwise
* a default output object is created.
* @param Cli\CliInput $cliInput An optional argument to provide dependency injection for the application's CLI input object. If the
* argument is a Cli\CliInput object that object will become the application's input object, otherwise
* a default input object is created.
*
* @since 1.0
*/

25
libraries/vendor/joomla/application/src/AbstractDaemonApplication.php vendored
View File

@ -8,8 +8,8 @@
namespace Joomla\Application;
use Joomla\Input;
use Joomla\Registry\Registry;
use Joomla\Input\Cli;
use Psr\Log\LoggerAwareInterface;
/**
@ -92,17 +92,22 @@ abstract class AbstractDaemonApplication extends AbstractCliApplication implemen
/**
* Class constructor.
*
* @param Cli $input An optional argument to provide dependency injection for the application's
* input object. If the argument is an InputCli object that object will become
* the application's input object, otherwise a default input object is created.
* @param Registry $config An optional argument to provide dependency injection for the application's
* config object. If the argument is a Registry object that object will become
* the application's config object, otherwise a default config object is created.
* @param Input\Cli $input An optional argument to provide dependency injection for the application's input object. If the
* argument is an Input\Cli object that object will become the application's input object, otherwise
* a default input object is created.
* @param Registry $config An optional argument to provide dependency injection for the application's config object. If the
* argument is a Registry object that object will become the application's config object, otherwise
* a default config object is created.
* @param Cli\CliOutput $output An optional argument to provide dependency injection for the application's output object. If the
* argument is a Cli\CliOutput object that object will become the application's input object, otherwise
* a default output object is created.
* @param Cli\CliInput $cliInput An optional argument to provide dependency injection for the application's CLI input object. If the
* argument is a Cli\CliInput object that object will become the application's input object, otherwise
* a default input object is created.
*
* @since 1.0
* @throws \RuntimeException
*/
public function __construct(Cli $input = null, Registry $config = null)
public function __construct(Cli $input = null, Registry $config = null, Cli\CliOutput $output = null, Cli\CliInput $cliInput = null)
{
// Verify that the process control extension for PHP is available.
// @codeCoverageIgnoreStart
@ -124,7 +129,7 @@ abstract class AbstractDaemonApplication extends AbstractCliApplication implemen
// @codeCoverageIgnoreEnd
// Call the parent constructor.
parent::__construct($input, $config);
parent::__construct($input, $config, $output, $cliInput);
// Set some system limits.
@set_time_limit($this->get('max_execution_time', 0));

22
libraries/vendor/joomla/application/src/AbstractWebApplication.php vendored
View File

@ -90,15 +90,15 @@ abstract class AbstractWebApplication extends AbstractApplication
/**
* Class constructor.
*
* @param Input $input An optional argument to provide dependency injection for the application's
* input object. If the argument is an Input object that object will become
* the application's input object, otherwise a default input object is created.
* @param Registry $config An optional argument to provide dependency injection for the application's
* config object. If the argument is a Registry object that object will become
* the application's config object, otherwise a default config object is created.
* @param Web\WebClient $client An optional argument to provide dependency injection for the application's
* client object. If the argument is a Web\WebClient object that object will become
* the application's client object, otherwise a default client object is created.
* @param Input $input An optional argument to provide dependency injection for the application's input object. If the argument
* is an Input object that object will become the application's input object, otherwise a default input
* object is created.
* @param Registry $config An optional argument to provide dependency injection for the application's config object. If the argument
* is a Registry object that object will become the application's config object, otherwise a default config
* object is created.
* @param Web\WebClient $client An optional argument to provide dependency injection for the application's client object. If the argument
* is a Web\WebClient object that object will become the application's client object, otherwise a default client
* object is created.
*
* @since 1.0
*/
@ -238,7 +238,7 @@ abstract class AbstractWebApplication extends AbstractApplication
if (!$this->allowCache())
{
// Expires in the past.
$this->setHeader('Expires', 'Mon, 1 Jan 2001 00:00:00 GMT', true);
$this->setHeader('Expires', 'Wed, 17 Aug 2005 00:00:00 GMT', true);
// Always modified.
$this->setHeader('Last-Modified', gmdate('D, d M Y H:i:s') . ' GMT', true);
@ -658,7 +658,7 @@ abstract class AbstractWebApplication extends AbstractApplication
*/
protected function header($string, $replace = true, $code = null)
{
header($string, $replace, $code);
header(str_replace(chr(0), '', $string), $replace, $code);
}
/**

47
libraries/vendor/joomla/application/src/Web/WebClient.php vendored
View File

@ -52,6 +52,8 @@ class WebClient
const SAFARI = 20;
const OPERA = 21;
const ANDROIDTABLET = 22;
const EDGE = 23;
const BLINK = 24;
/**
* @var integer The detected platform on which the web client runs.
@ -266,6 +268,11 @@ class WebClient
$this->browser = self::IE;
$patternBrowser = ' rv';
}
elseif (stripos($userAgent, 'Edge') !== false)
{
$this->browser = self::EDGE;
$patternBrowser = 'Edge';
}
elseif ((stripos($userAgent, 'Firefox') !== false) && (stripos($userAgent, 'like Firefox') === false))
{
$this->browser = self::FIREFOX;
@ -371,8 +378,38 @@ class WebClient
// Attempt to detect the client engine -- starting with the most popular ... for now.
$this->engine = self::TRIDENT;
}
elseif (stripos($userAgent, 'Edge') !== false || stripos($userAgent, 'EdgeHTML') !== false)
{
$this->engine = self::EDGE;
}
elseif (stripos($userAgent, 'Chrome') !== false)
{
$result = explode('/', stristr($userAgent, 'Chrome'));
$version = explode(' ', $result[1]);
if ($version[0] >= 28)
{
$this->engine = self::BLINK;
}
else
{
$this->engine = self::WEBKIT;
}
}
elseif (stripos($userAgent, 'AppleWebKit') !== false || stripos($userAgent, 'blackberry') !== false)
{
if (stripos($userAgent, 'AppleWebKit') !== false)
{
$result = explode('/', stristr($userAgent, 'AppleWebKit'));
$version = explode(' ', $result[1]);
if ($version[0] === 537.36)
{
// AppleWebKit/537.36 is Blink engine specific, exception is Blink emulated IEMobile, Trident or Edge
$this->engine = self::BLINK;
}
}
// Evidently blackberry uses WebKit and doesn't necessarily report it. Bad RIM.
$this->engine = self::WEBKIT;
}
@ -383,6 +420,14 @@ class WebClient
}
elseif (stripos($userAgent, 'Opera') !== false || stripos($userAgent, 'Presto') !== false)
{
$result = explode('/', stristr($userAgent, 'Opera'));
$version = explode(' ', $result[1]);
if ($version[0] >= 15)
{
$this->engine = self::BLINK;
}
// Sometimes Opera browsers don't say Presto.
$this->engine = self::PRESTO;
}
@ -523,7 +568,7 @@ class WebClient
*/
protected function detectRobot($userAgent)
{
if (preg_match('/http|bot|robot|spider|crawler|curl|^$/i', $userAgent))
if (preg_match('/http|bot|bingbot|googlebot|robot|spider|slurp|crawler|curl|^$/i', $userAgent))
{
$this->robot = true;
}

144
libraries/vendor/joomla/filter/src/InputFilter.php vendored
View File

@ -20,17 +20,49 @@ use Joomla\String\StringHelper;
*/
class InputFilter
{
/**
* Defines the InputFilter instance should use a whitelist method for sanitising tags.
*
* @var integer
* @since 1.3.0
*/
const TAGS_WHITELIST = 0;
/**
* Defines the InputFilter instance should use a blacklist method for sanitising tags.
*
* @var integer
* @since 1.3.0
*/
const TAGS_BLACKLIST = 1;
/**
* Defines the InputFilter instance should use a whitelist method for sanitising attributes.
*
* @var integer
* @since 1.3.0
*/
const ATTR_WHITELIST = 0;
/**
* Defines the InputFilter instance should use a blacklist method for sanitising attributes.
*
* @var integer
* @since 1.3.0
*/
const ATTR_BLACKLIST = 1;
/**
* A container for InputFilter instances.
*
* @var InputFilter[]
* @since 1.0
* @deprecated 2.0
* @deprecated 1.2.0
*/
protected static $instances = array();
/**
* The array of permitted tags (white list).
* The array of permitted tags (whitelist).
*
* @var array
* @since 1.0
@ -38,7 +70,7 @@ class InputFilter
public $tagsArray;
/**
* The array of permitted tag attributes (white list).
* The array of permitted tag attributes (whitelist).
*
* @var array
* @since 1.0
@ -46,7 +78,7 @@ class InputFilter
public $attrArray;
/**
* The method for sanitising tags: WhiteList method = 0 (default), BlackList method = 1
* The method for sanitising tags
*
* @var integer
* @since 1.0
@ -54,7 +86,7 @@ class InputFilter
public $tagsMethod;
/**
* The method for sanitising attributes: WhiteList method = 0 (default), BlackList method = 1
* The method for sanitising attributes
*
* @var integer
* @since 1.0
@ -125,18 +157,19 @@ class InputFilter
*
* @since 1.0
*/
public function __construct($tagsArray = array(), $attrArray = array(), $tagsMethod = 0, $attrMethod = 0, $xssAuto = 1)
public function __construct($tagsArray = array(), $attrArray = array(), $tagsMethod = self::TAGS_WHITELIST, $attrMethod = self::ATTR_WHITELIST,
$xssAuto = 1)
{
// Make sure user defined arrays are in lowercase
$tagsArray = array_map('strtolower', (array) $tagsArray);
$attrArray = array_map('strtolower', (array) $attrArray);
// Assign member variables
$this->tagsArray = $tagsArray;
$this->attrArray = $attrArray;
$this->tagsArray = $tagsArray;
$this->attrArray = $attrArray;
$this->tagsMethod = $tagsMethod;
$this->attrMethod = $attrMethod;
$this->xssAuto = $xssAuto;
$this->xssAuto = $xssAuto;
}
/**
@ -242,7 +275,22 @@ class InputFilter
case 'BOOL':
case 'BOOLEAN':
$result = (bool) $source;
if (is_array($source))
{
$result = array();
// Iterate through the array
foreach ($source as $eachString)
{
$result[] = (bool) $eachString;
}
}
else
{
$result = (bool) $source;
}
break;
case 'WORD':
@ -501,14 +549,13 @@ class InputFilter
*/
protected function remove($source)
{
$loopCounter = 0;
// Iteration provides nested tag protection
while ($source != $this->cleanTags($source))
do
{
$temp = $source;
$source = $this->cleanTags($source);
$loopCounter++;
}
while ($temp != $source);
return $source;
}
@ -785,34 +832,32 @@ class InputFilter
}
// XSS attribute value filtering
if (isset($attrSubSet[1]))
{
// Trim leading and trailing spaces
$attrSubSet[1] = trim($attrSubSet[1]);
// Strips unicode, hex, etc
$attrSubSet[1] = str_replace('&#', '', $attrSubSet[1]);
// Strip normal newline within attr value
$attrSubSet[1] = preg_replace('/[\n\r]/', '', $attrSubSet[1]);
// Strip double quotes
$attrSubSet[1] = str_replace('"', '', $attrSubSet[1]);
// Convert single quotes from either side to doubles (Single quotes shouldn't be used to pad attr values)
if ((substr($attrSubSet[1], 0, 1) == "'") && (substr($attrSubSet[1], (strlen($attrSubSet[1]) - 1), 1) == "'"))
{
$attrSubSet[1] = substr($attrSubSet[1], 1, (strlen($attrSubSet[1]) - 2));
}
// Strip slashes
$attrSubSet[1] = stripslashes($attrSubSet[1]);
}
else
if (!isset($attrSubSet[1]))
{
continue;
}
// Trim leading and trailing spaces
$attrSubSet[1] = trim($attrSubSet[1]);
// Strips unicode, hex, etc
$attrSubSet[1] = str_replace('&#', '', $attrSubSet[1]);
// Strip normal newline within attr value
$attrSubSet[1] = preg_replace('/[\n\r]/', '', $attrSubSet[1]);
// Strip double quotes
$attrSubSet[1] = str_replace('"', '', $attrSubSet[1]);
// Convert single quotes from either side to doubles (Single quotes shouldn't be used to pad attr values)
if ((substr($attrSubSet[1], 0, 1) == "'") && (substr($attrSubSet[1], (strlen($attrSubSet[1]) - 1), 1) == "'"))
{
$attrSubSet[1] = substr($attrSubSet[1], 1, (strlen($attrSubSet[1]) - 2));
}
// Strip slashes
$attrSubSet[1] = stripslashes($attrSubSet[1]);
// Autostrip script tags
if (self::checkAttribute($attrSubSet))
{
@ -935,20 +980,17 @@ class InputFilter
if (!stripos($test, ':expression'))
{
// Not found, so we are done
$return = $source;
}
else
{
// At this point, we have stripped out the comments and have found :expression
// Test stripped string for :expression followed by a '('
if (preg_match_all('#:expression\s*\(#', $test, $matches))
{
// If found, remove :expression
$test = str_ireplace(':expression', '', $test);
$return = $test;
}
return $source;
}
return $return;
// At this point, we have stripped out the comments and have found :expression
// Test stripped string for :expression followed by a '('
if (preg_match_all('#:expression\s*\(#', $test, $matches))
{
// If found, remove :expression
return str_ireplace(':expression', '', $test);
}
return $source;
}
}

9
libraries/vendor/joomla/filter/src/OutputFilter.php vendored
View File

@ -84,18 +84,21 @@ class OutputFilter
* This method processes a string and replaces all accented UTF-8 characters by unaccented
* ASCII-7 "equivalents", whitespaces are replaced by hyphens and the string is lowercase.
*
* @param string $string String to process
* @param string $string String to process
* @param string $language Language to transliterate to
*
* @return string Processed string
*
* @since 1.0
*/
public static function stringUrlSafe($string)
public static function stringUrlSafe($string, $language = '')
{
// Remove any '-' from the string since they will be used as concatenaters
$str = str_replace('-', ' ', $string);
$str = Language::getInstance()->transliterate($str);
// Transliterate on the language requested (fallback to current language if not specified)
$lang = empty($language) ? Language::getInstance() : Language::getInstance($language);
$str = $lang->transliterate($str);
// Trim white spaces at beginning and end of alias and make lowercase
$str = trim(StringHelper::strtolower($str));

20
libraries/vendor/joomla/session/Joomla/Session/Session.php vendored
View File

@ -2,7 +2,7 @@
/**
* Part of the Joomla Framework Session Package
*
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/
@ -243,7 +243,7 @@ class Session implements \IteratorAggregate
// Create a token
if ($token === null || $forceNew)
{
$token = $this->_createToken(12);
$token = $this->_createToken();
$this->set('session.token', $token);
}
@ -601,7 +601,7 @@ class Session implements \IteratorAggregate
if ($session_clean)
{
session_id($session_clean);
$cookie->set($session_name, '', time() - 3600);
$cookie->set($session_name, '', 1);
}
}
}
@ -649,7 +649,7 @@ class Session implements \IteratorAggregate
*/
if (isset($_COOKIE[session_name()]))
{
setcookie(session_name(), '', time() - 42000, $this->cookie_path, $this->cookie_domain);
$this->input->cookie->set(session_name(), '', 1);
}
session_unset();
@ -837,17 +837,7 @@ class Session implements \IteratorAggregate
*/
protected function createToken($length = 32)
{
static $chars = '0123456789abcdef';
$max = strlen($chars) - 1;
$token = '';
$name = session_name();
for ($i = 0; $i < $length; ++$i)
{
$token .= $chars[(rand(0, $max))];
}
return md5($token . $name);
return bin2hex(random_bytes($length));
}
/**

2
libraries/vendor/joomla/string/src/Normalise.php vendored
View File

@ -130,7 +130,7 @@ abstract class Normalise
$input = self::toCamelCase($input);
// Remove leading digits.
$input = preg_replace('#^[0-9]+.*$#', '', $input);
$input = preg_replace('#^[0-9]+#', '', $input);
// Lowercase the first character.
$first = substr($input, 0, 1);

2
libraries/vendor/joomla/string/src/phputf8/utils/unicode.php vendored
View File

@ -16,7 +16,7 @@
//--------------------------------------------------------------------
/**
* Takes a UTF-8 string and returns an array of ints representing the
* Takes an UTF-8 string and returns an array of ints representing the
* Unicode characters. Astral planes are supported ie. the ints in the
* output can be > 0xFFFF. Occurrances of the BOM are ignored. Surrogates
* are not allowed.

100
libraries/vendor/joomla/utilities/src/ArrayHelper.php vendored
View File

@ -2,7 +2,7 @@
/**
* Part of the Joomla Framework Utilities Package
*
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
*/
@ -19,6 +19,8 @@ final class ArrayHelper
{
/**
* Private constructor to prevent instantiation of this class
*
* @since 1.0
*/
private function __construct()
{
@ -30,7 +32,7 @@ final class ArrayHelper
* @param array $array The source array to convert
* @param mixed $default A default value (int|array) to assign if $array is not an array
*
* @return array The converted array
* @return array
*
* @since 1.0
*/
@ -38,25 +40,20 @@ final class ArrayHelper
{
if (is_array($array))
{
$array = array_map('intval', $array);
}
else
{
if ($default === null)
{
$array = array();
}
elseif (is_array($default))
{
$array = self::toInteger($default, null);
}
else
{
$array = array((int) $default);
}
return array_map('intval', $array);
}
return $array;
if ($default === null)
{
return array();
}
if (is_array($default))
{
return static::toInteger($default, null);
}
return array((int) $default);
}
/**
@ -66,7 +63,7 @@ final class ArrayHelper
* @param string $class Name of the class to create
* @param boolean $recursive Convert also any array inside the main array
*
* @return object The object mapped from the given array
* @return object
*
* @since 1.0
*/
@ -78,7 +75,7 @@ final class ArrayHelper
{
if ($recursive && is_array($v))
{
$obj->$k = self::toObject($v, $class);
$obj->$k = static::toObject($v, $class);
}
else
{
@ -97,7 +94,7 @@ final class ArrayHelper
* @param string $outer_glue The glue (optional, defaults to ' ') between array elements.
* @param boolean $keepOuterKey True if final key should be kept.
*
* @return string The string mapped from the given array
* @return string
*
* @since 1.0
*/
@ -115,7 +112,7 @@ final class ArrayHelper
}
// This is value is an array, go and do it again!
$output[] = self::toString($item, $inner_glue, $outer_glue, $keepOuterKey);
$output[] = static::toString($item, $inner_glue, $outer_glue, $keepOuterKey);
}
else
{
@ -133,7 +130,7 @@ final class ArrayHelper
* @param boolean $recurse True to recurse through multi-level objects
* @param string $regex An optional regular expression to match on field names
*
* @return array The array mapped from the given object
* @return array
*
* @since 1.0
*/
@ -143,10 +140,8 @@ final class ArrayHelper
{
return self::arrayFromObject($p_obj, $recurse, $regex);
}
else
{
return null;
}
return array();
}
/**
@ -156,7 +151,7 @@ final class ArrayHelper
* @param boolean $recurse True to recurse through multi-level objects
* @param string $regex An optional regular expression to match on field names
*
* @return array The array mapped from the given object
* @return array
*
* @since 1.0
*/
@ -180,8 +175,11 @@ final class ArrayHelper
}
}
}
return $result;
}
elseif (is_array($item))
if (is_array($item))
{
$result = array();
@ -189,13 +187,11 @@ final class ArrayHelper
{
$result[$k] = self::arrayFromObject($v, $recurse, $regex);
}
}
else
{
$result = $item;
return $result;
}
return $result;
return $item;
}
/**
@ -203,12 +199,15 @@ final class ArrayHelper
*
* @param array $array The source array
* @param string $valueCol The index of the column or name of object property to be used as value
* It may also be NULL to return complete arrays or objects (this is
* useful together with <var>$keyCol</var> to reindex the array).
* @param string $keyCol The index of the column or name of object property to be used as key
*
* @return array Column of values from the source array
*
* @since 1.0
* @see http://php.net/manual/en/language.types.array.php
* @see http://php.net/manual/en/function.array-column.php
*/
public static function getColumn(array $array, $valueCol, $keyCol = null)
{
@ -219,19 +218,24 @@ final class ArrayHelper
// Convert object to array
$subject = is_object($item) ? static::fromObject($item) : $item;
// We process array (and object already converted to array) only.
// Only if the value column exists in this item
if (is_array($subject) && isset($subject[$valueCol]))
/*
* We process arrays (and objects already converted to array)
* Only if the value column (if required) exists in this item
*/
if (is_array($subject) && (!isset($valueCol) || isset($subject[$valueCol])))
{
// Use whole $item if valueCol is null, else use the value column.
$value = isset($valueCol) ? $subject[$valueCol] : $item;
// Array keys can only be integer or string. Casting will occur as per the PHP Manual.
if (isset($keyCol) && isset($subject[$keyCol]) && is_scalar($subject[$keyCol]))
{
$key = $subject[$keyCol];
$result[$key] = $subject[$valueCol];
$result[$key] = $value;
}
else
{
$result[] = $subject[$valueCol];
$result[] = $value;
}
}
}
@ -247,11 +251,10 @@ final class ArrayHelper
* @param mixed $default The default value to give if no key found
* @param string $type Return type for the variable (INT, FLOAT, STRING, WORD, BOOLEAN, ARRAY)
*
* @return mixed The value from the source array
*
* @throws \InvalidArgumentException
* @return mixed
*
* @since 1.0
* @throws \InvalidArgumentException
*/
public static function getValue($array, $name, $default = null, $type = '')
{
@ -342,7 +345,7 @@ final class ArrayHelper
*
* @param array $array The source array.
*
* @return array The inverted array.
* @return array
*
* @since 1.0
*/
@ -375,7 +378,7 @@ final class ArrayHelper
*
* @param array $array An array to test.
*
* @return boolean True if the array is an associative array.
* @return boolean
*
* @since 1.0
*/
@ -479,7 +482,7 @@ final class ArrayHelper
* @param mixed $caseSensitive Boolean or array of booleans to let sort occur case sensitive or insensitive
* @param mixed $locale Boolean or array of booleans to let sort occur using the locale language or not
*
* @return array The sorted array of objects
* @return array
*
* @since 1.0
*/
@ -496,7 +499,7 @@ final class ArrayHelper
$sortLocale = $locale;
usort(
$a, function($a, $b) use($sortCase, $sortDirection, $key, $sortLocale)
$a, function ($a, $b) use ($sortCase, $sortDirection, $key, $sortLocale)
{
for ($i = 0, $count = count($key); $i < $count; $i++)
{
@ -569,8 +572,7 @@ final class ArrayHelper
}
/**
* An improved array_search that allows for partial matching
* of strings values in associative arrays.
* An improved array_search that allows for partial matching of strings values in associative arrays.
*
* @param string $needle The text to search for within the array.
* @param array $haystack Associative array to search in to find $needle.

2
libraries/vendor/phpmailer/phpmailer/VERSION vendored
View File

@ -1 +1 @@
5.2.16
5.2.19

113
libraries/vendor/phpmailer/phpmailer/class.phpmailer.php vendored
View File

@ -31,7 +31,7 @@ class PHPMailer
* The PHPMailer Version number.
* @var string
*/
public $Version = '5.2.16';
public $Version = '5.2.19';
/**
* Email priority.
@ -201,6 +201,9 @@ class PHPMailer
/**
* An ID to be used in the Message-ID header.
* If empty, a unique id will be generated.
* You can set your own, but it must be in the format "<id@domain>",
* as defined in RFC5322 section 3.6.4 or it will be ignored.
* @see https://tools.ietf.org/html/rfc5322#section-3.6.4
* @var string
*/
public $MessageID = '';
@ -420,6 +423,13 @@ class PHPMailer
*/
public $DKIM_private = '';
/**
* DKIM private key string.
* If set, takes precedence over `$DKIM_private`.
* @var string
*/
public $DKIM_private_string = '';
/**
* Callback Action function name.
*
@ -681,16 +691,16 @@ class PHPMailer
} else {
$subject = $this->encodeHeader($this->secureHeader($subject));
}
//Can't use additional_parameters in safe_mode
//Can't use additional_parameters in safe_mode, calling mail() with null params breaks
//@link http://php.net/manual/en/function.mail.php
if (ini_get('safe_mode') or !$this->UseSendmailOptions) {
if (ini_get('safe_mode') or !$this->UseSendmailOptions or is_null($params)) {
$result = @mail($to, $subject, $body, $header);
} else {
$result = @mail($to, $subject, $body, $header, $params);
}
return $result;
}
/**
* Output debugging info via user-defined method.
* Only generates output if SMTP debug output is enabled (@see SMTP::$do_debug).
@ -1284,9 +1294,11 @@ class PHPMailer
// Sign with DKIM if enabled
if (!empty($this->DKIM_domain)
&& !empty($this->DKIM_private)
&& !empty($this->DKIM_selector)
&& file_exists($this->DKIM_private)) {
&& (!empty($this->DKIM_private_string)
|| (!empty($this->DKIM_private) && file_exists($this->DKIM_private))
)
) {
$header_dkim = $this->DKIM_Add(
$this->MIMEHeader . $this->mailHeader,
$this->encodeHeader($this->secureHeader($this->Subject)),
@ -1352,7 +1364,7 @@ class PHPMailer
*/
protected function sendmailSend($header, $body)
{
if ($this->Sender != '') {
if (!empty($this->Sender)) {
if ($this->Mailer == 'qmail') {
$sendmail = sprintf('%s -f%s', escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
} else {
@ -1429,10 +1441,10 @@ class PHPMailer
$params = null;
//This sets the SMTP envelope sender which gets turned into a return-path header by the receiver
if (!empty($this->Sender)) {
$params = sprintf('-f%s', $this->Sender);
if (!empty($this->Sender) and $this->validateAddress($this->Sender)) {
$params = sprintf('-f%s', escapeshellarg($this->Sender));
}
if ($this->Sender != '' and !ini_get('safe_mode')) {
if (!empty($this->Sender) and !ini_get('safe_mode') and $this->validateAddress($this->Sender)) {
$old_from = ini_get('sendmail_from');
ini_set('sendmail_from', $this->Sender);
}
@ -1486,10 +1498,10 @@ class PHPMailer
if (!$this->smtpConnect($this->SMTPOptions)) {
throw new phpmailerException($this->lang('smtp_connect_failed'), self::STOP_CRITICAL);
}
if ('' == $this->Sender) {
$smtp_from = $this->From;
} else {
if (!empty($this->Sender) and $this->validateAddress($this->Sender)) {
$smtp_from = $this->Sender;
} else {
$smtp_from = $this->From;
}
if (!$this->smtp->mail($smtp_from)) {
$this->setError($this->lang('from_failed') . $smtp_from . ' : ' . implode(',', $this->smtp->getError()));
@ -1681,6 +1693,19 @@ class PHPMailer
*/
public function setLanguage($langcode = 'en', $lang_path = '')
{
// Backwards compatibility for renamed language codes
$renamed_langcodes = array(
'br' => 'pt_br',
'cz' => 'cs',
'dk' => 'da',
'no' => 'nb',
'se' => 'sv',
);
if (isset($renamed_langcodes[$langcode])) {
$langcode = $renamed_langcodes[$langcode];
}
// Define full set of translatable strings in English
$PHPMAILER_LANG = array(
'authenticate' => 'SMTP Error: Could not authenticate.',
@ -1707,6 +1732,10 @@ class PHPMailer
// Calculate an absolute path so it can work if CWD is not here
$lang_path = dirname(__FILE__). DIRECTORY_SEPARATOR . 'language'. DIRECTORY_SEPARATOR;
}
//Validate $langcode
if (!preg_match('/^[a-z]{2}(?:_[a-zA-Z]{2})?$/', $langcode)) {
$langcode = 'en';
}
$foundlang = true;
$lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php';
// There is no English translation file
@ -2000,6 +2029,8 @@ class PHPMailer
$result .= $this->headerLine('Subject', $this->encodeHeader($this->secureHeader($this->Subject)));
}
// Only allow a custom message ID if it conforms to RFC 5322 section 3.6.4
// https://tools.ietf.org/html/rfc5322#section-3.6.4
if ('' != $this->MessageID and preg_match('/^<.*@.*>$/', $this->MessageID)) {
$this->lastMessageID = $this->MessageID;
} else {
@ -2105,6 +2136,14 @@ class PHPMailer
return rtrim($this->MIMEHeader . $this->mailHeader, "\n\r") . self::CRLF . self::CRLF . $this->MIMEBody;
}
/**
* Create unique ID
* @return string
*/
protected function generateId() {
return md5(uniqid(time()));
}
/**
* Assemble the message body.
* Returns an empty string on failure.
@ -2116,7 +2155,7 @@ class PHPMailer
{
$body = '';
//Create unique IDs and preset boundaries
$this->uniqueid = md5(uniqid(time()));
$this->uniqueid = $this->generateId();
$this->boundary[1] = 'b1_' . $this->uniqueid;
$this->boundary[2] = 'b2_' . $this->uniqueid;
$this->boundary[3] = 'b3_' . $this->uniqueid;
@ -3296,16 +3335,18 @@ class PHPMailer
}
/**
* Create a message from an HTML string.
* Automatically makes modifications for inline images and backgrounds
* and creates a plain-text version by converting the HTML.
* Overwrites any existing values in $this->Body and $this->AltBody
* Create a message body from an HTML string.
* Automatically inlines images and creates a plain-text version by converting the HTML,
* overwriting any existing values in Body and AltBody.
* $basedir is used when handling relative image paths, e.g. <img src="images/a.png">
* will look for an image file in $basedir/images/a.png and convert it to inline.
* If you don't want to apply these transformations to your HTML, just set Body and AltBody yourself.
* @access public
* @param string $message HTML message string
* @param string $basedir baseline directory for path
* @param string $basedir base directory for relative paths to images
* @param boolean|callable $advanced Whether to use the internal HTML to text converter
* or your own custom converter @see PHPMailer::html2text()
* @return string $message
* @return string $message The transformed message Body
*/
public function msgHTML($message, $basedir = '', $advanced = false)
{
@ -3375,7 +3416,7 @@ class PHPMailer
* Convert an HTML string into plain text.
* This is used by msgHTML().
* Note - older versions of this function used a bundled advanced converter
* which was been removed for license reasons in #232
* which was been removed for license reasons in #232.
* Example usage:
* <code>
* // Use default conversion
@ -3675,7 +3716,7 @@ class PHPMailer
* @access public
* @param string $signHeader
* @throws phpmailerException
* @return string
* @return string The DKIM signature value
*/
public function DKIM_Sign($signHeader)
{
@ -3685,15 +3726,33 @@ class PHPMailer
}
return '';
}
$privKeyStr = file_get_contents($this->DKIM_private);
if ($this->DKIM_passphrase != '') {
$privKeyStr = !empty($this->DKIM_private_string) ? $this->DKIM_private_string : file_get_contents($this->DKIM_private);
if ('' != $this->DKIM_passphrase) {
$privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase);
} else {
$privKey = openssl_pkey_get_private($privKeyStr);
}
if (openssl_sign($signHeader, $signature, $privKey, 'sha256WithRSAEncryption')) { //sha1WithRSAEncryption
openssl_pkey_free($privKey);
return base64_encode($signature);
//Workaround for missing digest algorithms in old PHP & OpenSSL versions
//@link http://stackoverflow.com/a/11117338/333340
if (version_compare(PHP_VERSION, '5.3.0') >= 0 and
in_array('sha256WithRSAEncryption', openssl_get_md_methods(true))) {
if (openssl_sign($signHeader, $signature, $privKey, 'sha256WithRSAEncryption')) {
openssl_pkey_free($privKey);
return base64_encode($signature);
}
} else {
$pinfo = openssl_pkey_get_details($privKey);
$hash = hash('sha256', $signHeader);
//'Magic' constant for SHA256 from RFC3447
//@link https://tools.ietf.org/html/rfc3447#page-43
$t = '3031300d060960864801650304020105000420' . $hash;
$pslen = $pinfo['bits'] / 8 - (strlen($t) / 2 + 3);
$eb = pack('H*', '0001' . str_repeat('FF', $pslen) . '00' . $t);
if (openssl_private_encrypt($eb, $signature, $privKey, OPENSSL_NO_PADDING)) {
openssl_pkey_free($privKey);
return base64_encode($signature);
}
}
openssl_pkey_free($privKey);
return '';

1
libraries/vendor/phpmailer/phpmailer/class.phpmaileroauth.php vendored
View File

@ -80,6 +80,7 @@ class PHPMailerOAuth extends PHPMailer
* @uses SMTP
* @access public
* @return bool
* @throws phpmailerException
*/
public function smtpConnect($options = array())
{

2
libraries/vendor/phpmailer/phpmailer/class.pop3.php vendored
View File

@ -34,7 +34,7 @@ class POP3
* @var string
* @access public
*/
public $Version = '5.2.16';
public $Version = '5.2.19';
/**
* Default POP3 port number.

73
libraries/vendor/phpmailer/phpmailer/class.smtp.php vendored
View File

@ -30,7 +30,7 @@ class SMTP
* The PHPMailer SMTP version number.
* @var string
*/
const VERSION = '5.2.16';
const VERSION = '5.2.19';
/**
* SMTP line break constant.
@ -81,7 +81,7 @@ class SMTP
* @deprecated Use the `VERSION` constant instead
* @see SMTP::VERSION
*/
public $Version = '5.2.16';
public $Version = '5.2.19';
/**
* SMTP server port number.
@ -150,6 +150,17 @@ class SMTP
*/
public $Timelimit = 300;
/**
* @var array patterns to extract smtp transaction id from smtp reply
* Only first capture group will be use, use non-capturing group to deal with it
* Extend this class to override this property to fulfil your needs.
*/
protected $smtp_transaction_id_patterns = array(
'exim' => '/[0-9]{3} OK id=(.*)/',
'sendmail' => '/[0-9]{3} 2.0.0 (.*) Message/',
'postfix' => '/[0-9]{3} 2.0.0 Ok: queued as (.*)/'
);
/**
* The socket for the server connection.
* @var resource
@ -206,7 +217,7 @@ class SMTP
}
//Avoid clash with built-in function names
if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
call_user_func($this->Debugoutput, $str, $this->do_debug);
call_user_func($this->Debugoutput, $str, $level);
return;
}
switch ($this->Debugoutput) {
@ -272,8 +283,8 @@ class SMTP
$errstr = '';
if ($streamok) {
$socket_context = stream_context_create($options);
//Suppress errors; connection failures are handled at a higher level
$this->smtp_conn = @stream_socket_client(
set_error_handler(array($this, 'errorHandler'));
$this->smtp_conn = stream_socket_client(
$host . ":" . $port,
$errno,
$errstr,
@ -281,12 +292,14 @@ class SMTP
STREAM_CLIENT_CONNECT,
$socket_context
);
restore_error_handler();
} else {
//Fall back to fsockopen which should work in more places, but is missing some features
$this->edebug(
"Connection: stream_socket_client not available, falling back to fsockopen",
self::DEBUG_CONNECTION
);
set_error_handler(array($this, 'errorHandler'));
$this->smtp_conn = fsockopen(
$host,
$port,
@ -294,6 +307,7 @@ class SMTP
$errstr,
$timeout
);
restore_error_handler();
}
// Verify we connected properly
if (!is_resource($this->smtp_conn)) {
@ -474,7 +488,7 @@ class SMTP
$temp = new stdClass;
$ntlm_client = new ntlm_sasl_client_class;
//Check that functions are available
if (!$ntlm_client->Initialize($temp)) {
if (!$ntlm_client->initialize($temp)) {
$this->setError($temp->error);
$this->edebug(
'You need to enable some modules in your php.ini file: '
@ -484,7 +498,7 @@ class SMTP
return false;
}
//msg1
$msg1 = $ntlm_client->TypeMsg1($realm, $workstation); //msg1
$msg1 = $ntlm_client->typeMsg1($realm, $workstation); //msg1
if (!$this->sendCommand(
'AUTH NTLM',
@ -503,7 +517,7 @@ class SMTP
$password
);
//msg3
$msg3 = $ntlm_client->TypeMsg3(
$msg3 = $ntlm_client->typeMsg3(
$ntlm_res,
$username,
$realm,
@ -1189,4 +1203,47 @@ class SMTP
{
return $this->Timeout;
}
/**
* Reports an error number and string.
* @param integer $errno The error number returned by PHP.
* @param string $errmsg The error message returned by PHP.
*/
protected function errorHandler($errno, $errmsg)
{
$notice = 'Connection: Failed to connect to server.';
$this->setError(
$notice,
$errno,
$errmsg
);
$this->edebug(
$notice . ' Error number ' . $errno . '. "Error notice: ' . $errmsg,
self::DEBUG_CONNECTION
);
}
/**
* Will return the ID of the last smtp transaction based on a list of patterns provided
* in SMTP::$smtp_transaction_id_patterns.
* If no reply has been received yet, it will return null.
* If no pattern has been matched, it will return false.
* @return bool|null|string
*/
public function getLastTransactionID()
{
$reply = $this->getLastReply();
if (empty($reply)) {
return null;
}
foreach($this->smtp_transaction_id_patterns as $smtp_transaction_id_pattern) {
if(preg_match($smtp_transaction_id_pattern, $reply, $matches)) {
return $matches[1];
}
}
return false;
}
}

669
libraries/vendor/phpmailer/phpmailer/composer.lock generated vendored
View File

File diff suppressed because it is too large Load Diff

11
libraries/vendor/phpmailer/phpmailer/extras/htmlfilter.php vendored
View File

@ -461,7 +461,6 @@ function tln_deent(&$attvalue, $regex, $hex = false)
* checks on them.
*
* @param string $attvalue A string to run entity check against.
* @return Void, modifies a reference value.
*/
function tln_defang(&$attvalue)
{
@ -488,7 +487,6 @@ function tln_defang(&$attvalue)
* be funny to make "java[tab]script" be just as good as "javascript".
*
* @param string $attvalue The attribute value before extraneous spaces removed.
* @return Void, modifies a reference value.
*/
function tln_unspace(&$attvalue)
{
@ -511,7 +509,7 @@ function tln_unspace(&$attvalue)
* @param array $add_attr_to_tag See description for tln_sanitize
* @param string $trans_image_path
* @param boolean $block_external_images
* @return Array with modified attributes.
* @return array with modified attributes.
*/
function tln_fixatts(
$tagname,
@ -667,9 +665,7 @@ function tln_fixurl($attname, &$attvalue, $trans_image_path, $block_external_ima
function tln_fixstyle($body, $pos, $trans_image_path, $block_external_images)
{
$me = 'tln_fixstyle';
// workaround for </style> in between comments
$iCurrentPos = $pos;
$content = '';
$sToken = '';
$bSucces = false;
@ -740,8 +736,6 @@ function tln_fixstyle($body, $pos, $trans_image_path, $block_external_images)
*/
$content = preg_replace("|body(\s*\{.*?\})|si", ".bodyclass\\1", $content);
$trans_image_path = $trans_image_path;
/**
* Fix url('blah') declarations.
*/
@ -796,7 +790,6 @@ function tln_fixstyle($body, $pos, $trans_image_path, $block_external_images)
function tln_body2div($attary, $trans_image_path)
{
$me = 'tln_body2div';
$divattary = array('class' => "'bodyclass'");
$text = '#000000';
$has_bgc_stl = $has_txt_stl = false;
@ -901,7 +894,7 @@ function tln_sanitize(
}
$trusted .= tln_tagprint($tagname, $attary, $tagtype);
$trusted .= $free_content;
$trusted .= tln_tagprint($tagname, false, 2);
$trusted .= tln_tagprint($tagname, null, 2);
}
continue;
}

4
libraries/vendor/phpmailer/phpmailer/extras/ntlm_sasl_client.php vendored
View File

@ -160,12 +160,12 @@ class ntlm_sasl_client_class
{
switch ($this->state) {
case SASL_NTLM_STATE_IDENTIFY_DOMAIN:
$message = $this->TypeMsg1($this->credentials["realm"], $this->credentials["workstation"]);
$message = $this->typeMsg1($this->credentials["realm"], $this->credentials["workstation"]);
$this->state = SASL_NTLM_STATE_RESPOND_CHALLENGE;
break;
case SASL_NTLM_STATE_RESPOND_CHALLENGE:
$ntlm_response = $this->NTLMResponse(substr($response, 24, 8), $this->credentials["password"]);
$message = $this->TypeMsg3(
$message = $this->typeMsg3(
$ntlm_response,
$this->credentials["user"],
$this->credentials["realm"],

40
libraries/vendor/psr/log/Psr/Log/AbstractLogger.php vendored
View File

@ -15,8 +15,9 @@ abstract class AbstractLogger implements LoggerInterface
* System is unusable.
*
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function emergency($message, array $context = array())
{
@ -30,8 +31,9 @@ abstract class AbstractLogger implements LoggerInterface
* trigger the SMS alerts and wake you up.
*
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function alert($message, array $context = array())
{
@ -44,8 +46,9 @@ abstract class AbstractLogger implements LoggerInterface
* Example: Application component unavailable, unexpected exception.
*
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function critical($message, array $context = array())
{
@ -57,8 +60,9 @@ abstract class AbstractLogger implements LoggerInterface
* be logged and monitored.
*
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function error($message, array $context = array())
{
@ -72,8 +76,9 @@ abstract class AbstractLogger implements LoggerInterface
* that are not necessarily wrong.
*
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function warning($message, array $context = array())
{
@ -84,8 +89,9 @@ abstract class AbstractLogger implements LoggerInterface
* Normal but significant events.
*
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function notice($message, array $context = array())
{
@ -98,8 +104,9 @@ abstract class AbstractLogger implements LoggerInterface
* Example: User logs in, SQL logs.
*
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function info($message, array $context = array())
{
@ -110,8 +117,9 @@ abstract class AbstractLogger implements LoggerInterface
* Detailed debug information.
*
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function debug($message, array $context = array())
{

16
libraries/vendor/psr/log/Psr/Log/LogLevel.php vendored
View File

@ -3,16 +3,16 @@
namespace Psr\Log;
/**
* Describes log levels
* Describes log levels.
*/
class LogLevel
{
const EMERGENCY = 'emergency';
const ALERT = 'alert';
const CRITICAL = 'critical';
const ERROR = 'error';
const WARNING = 'warning';
const NOTICE = 'notice';
const INFO = 'info';
const DEBUG = 'debug';
const ALERT = 'alert';
const CRITICAL = 'critical';
const ERROR = 'error';
const WARNING = 'warning';
const NOTICE = 'notice';
const INFO = 'info';
const DEBUG = 'debug';
}

7
libraries/vendor/psr/log/Psr/Log/LoggerAwareInterface.php vendored
View File

@ -3,15 +3,16 @@
namespace Psr\Log;
/**
* Describes a logger-aware instance
* Describes a logger-aware instance.
*/
interface LoggerAwareInterface
{
/**
* Sets a logger instance on the object
* Sets a logger instance on the object.
*
* @param LoggerInterface $logger
* @return null
*
* @return void
*/
public function setLogger(LoggerInterface $logger);
}

8
libraries/vendor/psr/log/Psr/Log/LoggerAwareTrait.php vendored
View File

@ -7,12 +7,16 @@ namespace Psr\Log;
*/
trait LoggerAwareTrait
{
/** @var LoggerInterface */
/**
* The logger instance.
*
* @var LoggerInterface
*/
protected $logger;
/**
* Sets a logger.
*
*
* @param LoggerInterface $logger
*/
public function setLogger(LoggerInterface $logger)

51
libraries/vendor/psr/log/Psr/Log/LoggerInterface.php vendored
View File

@ -3,14 +3,14 @@
namespace Psr\Log;
/**
* Describes a logger instance
* Describes a logger instance.
*
* The message MUST be a string or object implementing __toString().
*
* The message MAY contain placeholders in the form: {foo} where foo
* will be replaced by the context data in key "foo".
*
* The context array can contain arbitrary data, the only assumption that
* The context array can contain arbitrary data. The only assumption that
* can be made by implementors is that if an Exception instance is given
* to produce a stack trace, it MUST be in a key named "exception".
*
@ -23,8 +23,9 @@ interface LoggerInterface
* System is unusable.
*
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function emergency($message, array $context = array());
@ -35,8 +36,9 @@ interface LoggerInterface
* trigger the SMS alerts and wake you up.
*
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function alert($message, array $context = array());
@ -46,8 +48,9 @@ interface LoggerInterface
* Example: Application component unavailable, unexpected exception.
*
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function critical($message, array $context = array());
@ -56,8 +59,9 @@ interface LoggerInterface
* be logged and monitored.
*
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function error($message, array $context = array());
@ -68,8 +72,9 @@ interface LoggerInterface
* that are not necessarily wrong.
*
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function warning($message, array $context = array());
@ -77,8 +82,9 @@ interface LoggerInterface
* Normal but significant events.
*
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function notice($message, array $context = array());
@ -88,8 +94,9 @@ interface LoggerInterface
* Example: User logs in, SQL logs.
*
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function info($message, array $context = array());
@ -97,18 +104,20 @@ interface LoggerInterface
* Detailed debug information.
*
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function debug($message, array $context = array());
/**
* Logs with an arbitrary level.
*
* @param mixed $level
* @param mixed $level
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function log($level, $message, array $context = array());
}

51
libraries/vendor/psr/log/Psr/Log/LoggerTrait.php vendored
View File

@ -6,8 +6,8 @@ namespace Psr\Log;
* This is a simple Logger trait that classes unable to extend AbstractLogger
* (because they extend another class, etc) can include.
*
* It simply delegates all log-level-specific methods to the `log` method to
* reduce boilerplate code that a simple Logger that does the same thing with
* It simply delegates all log-level-specific methods to the `log` method to
* reduce boilerplate code that a simple Logger that does the same thing with
* messages regardless of the error level has to implement.
*/
trait LoggerTrait
@ -16,8 +16,9 @@ trait LoggerTrait
* System is unusable.
*
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function emergency($message, array $context = array())
{
@ -31,8 +32,9 @@ trait LoggerTrait
* trigger the SMS alerts and wake you up.
*
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function alert($message, array $context = array())
{
@ -45,8 +47,9 @@ trait LoggerTrait
* Example: Application component unavailable, unexpected exception.
*
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function critical($message, array $context = array())
{
@ -58,8 +61,9 @@ trait LoggerTrait
* be logged and monitored.
*
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function error($message, array $context = array())
{
@ -73,8 +77,9 @@ trait LoggerTrait
* that are not necessarily wrong.
*
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function warning($message, array $context = array())
{
@ -85,8 +90,9 @@ trait LoggerTrait
* Normal but significant events.
*
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function notice($message, array $context = array())
{
@ -99,8 +105,9 @@ trait LoggerTrait
* Example: User logs in, SQL logs.
*
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function info($message, array $context = array())
{
@ -111,8 +118,9 @@ trait LoggerTrait
* Detailed debug information.
*
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function debug($message, array $context = array())
{
@ -122,10 +130,11 @@ trait LoggerTrait
/**
* Logs with an arbitrary level.
*
* @param mixed $level
* @param mixed $level
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
abstract public function log($level, $message, array $context = array());
}

9
libraries/vendor/psr/log/Psr/Log/NullLogger.php vendored
View File

@ -3,7 +3,7 @@
namespace Psr\Log;
/**
* This Logger can be used to avoid conditional log calls
* This Logger can be used to avoid conditional log calls.
*
* Logging should always be optional, and if no logger is provided to your
* library creating a NullLogger instance to have something to throw logs at
@ -15,10 +15,11 @@ class NullLogger extends AbstractLogger
/**
* Logs with an arbitrary level.
*
* @param mixed $level
* @param mixed $level
* @param string $message
* @param array $context
* @return null
* @param array $context
*
* @return void
*/
public function log($level, $message, array $context = array())
{

13
libraries/vendor/symfony/polyfill-php56/Php56.php vendored
View File

@ -74,7 +74,7 @@ final class Php56
if (null === $charMaps) {
$charMaps = array(
self::LDAP_ESCAPE_FILTER => array('\\', '*', '(', ')', "\x00"),
self::LDAP_ESCAPE_DN => array('\\', ',', '=', '+', '<', '>', ';', '"', '#'),
self::LDAP_ESCAPE_DN => array('\\', ',', '=', '+', '<', '>', ';', '"', '#', "\r"),
);
$charMaps[0] = array();
@ -122,6 +122,17 @@ final class Php56
// 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;
}
}

30
libraries/vendor/symfony/yaml/Inline.php vendored
View File

@ -28,7 +28,7 @@ class Inline
private static $objectForMap = false;
/**
* Converts a YAML string to a PHP array.
* Converts a YAML string to a PHP value.
*
* @param string $value A YAML string
* @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
@ -36,7 +36,7 @@ class Inline
* @param bool $objectForMap true if maps should return a stdClass instead of array()
* @param array $references Mapping of variable names to values
*
* @return array A PHP array representing the YAML string
* @return mixed A PHP value
*
* @throws ParseException
*/
@ -90,7 +90,7 @@ class Inline
* @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
* @param bool $objectSupport true if object support is enabled, false otherwise
*
* @return string The YAML string representing the PHP array
* @return string The YAML string representing the PHP value
*
* @throws DumpException When trying to dump PHP resource
*/
@ -210,7 +210,7 @@ class Inline
}
/**
* Parses a scalar to a YAML string.
* Parses a YAML scalar.
*
* @param string $scalar
* @param string $delimiters
@ -219,7 +219,7 @@ class Inline
* @param bool $evaluate
* @param array $references
*
* @return string A YAML string
* @return string
*
* @throws ParseException When malformed inline YAML string is parsed
*
@ -251,7 +251,7 @@ class Inline
$output = $match[1];
$i += strlen($output);
} else {
throw new ParseException(sprintf('Malformed inline YAML string (%s).', $scalar));
throw new ParseException(sprintf('Malformed inline YAML string: %s.', $scalar));
}
// a non-quoted string cannot start with @ or ` (reserved) nor with a scalar indicator (| or >)
@ -271,19 +271,19 @@ class Inline
}
/**
* Parses a quoted scalar to YAML.
* Parses a YAML quoted scalar.
*
* @param string $scalar
* @param int &$i
*
* @return string A YAML string
* @return string
*
* @throws ParseException When malformed inline YAML string is parsed
*/
private static function parseQuotedScalar($scalar, &$i)
{
if (!preg_match('/'.self::REGEX_QUOTED_STRING.'/Au', substr($scalar, $i), $match)) {
throw new ParseException(sprintf('Malformed inline YAML string (%s).', substr($scalar, $i)));
throw new ParseException(sprintf('Malformed inline YAML string: %s.', substr($scalar, $i)));
}
$output = substr($match[0], 1, strlen($match[0]) - 2);
@ -301,13 +301,13 @@ class Inline
}
/**
* Parses a sequence to a YAML string.
* Parses a YAML sequence.
*
* @param string $sequence
* @param int &$i
* @param array $references
*
* @return string A YAML string
* @return array
*
* @throws ParseException When malformed inline YAML string is parsed
*/
@ -356,17 +356,17 @@ class Inline
++$i;
}
throw new ParseException(sprintf('Malformed inline YAML string %s', $sequence));
throw new ParseException(sprintf('Malformed inline YAML string: %s.', $sequence));
}
/**
* Parses a mapping to a YAML string.
* Parses a YAML mapping.
*
* @param string $mapping
* @param int &$i
* @param array $references
*
* @return string A YAML string
* @return array|\stdClass
*
* @throws ParseException When malformed inline YAML string is parsed
*/
@ -444,7 +444,7 @@ class Inline
}
}
throw new ParseException(sprintf('Malformed inline YAML string %s', $mapping));
throw new ParseException(sprintf('Malformed inline YAML string: %s.', $mapping));
}
/**

11
libraries/vendor/symfony/yaml/Parser.php vendored
View File

@ -255,17 +255,6 @@ class Parser
throw $e;
}
if (is_array($value)) {
$first = reset($value);
if (is_string($first) && 0 === strpos($first, '*')) {
$data = array();
foreach ($value as $alias) {
$data[] = $this->refs[substr($alias, 1)];
}
$value = $data;
}
}
if (isset($mbEncoding)) {
mb_internal_encoding($mbEncoding);
}

10
libraries/vendor/symfony/yaml/Yaml.php vendored
View File

@ -73,20 +73,20 @@ class Yaml
}
/**
* Dumps a PHP array to a YAML string.
* Dumps a PHP value to a YAML string.
*
* The dump method, when supplied with an array, will do its best
* to convert the array into friendly YAML.
*
* @param array $array PHP array
* @param mixed $input The PHP value
* @param int $inline The level where you switch to inline YAML
* @param int $indent The amount of spaces to use for indentation of nested nodes
* @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
* @param bool $objectSupport true if object support is enabled, false otherwise
*
* @return string A YAML string representing the original PHP array
* @return string A YAML string representing the original PHP value
*/
public static function dump($array, $inline = 2, $indent = 4, $exceptionOnInvalidType = false, $objectSupport = false)
public static function dump($input, $inline = 2, $indent = 4, $exceptionOnInvalidType = false, $objectSupport = false)
{
if ($indent < 1) {
throw new \InvalidArgumentException('The indentation must be greater than zero.');
@ -95,6 +95,6 @@ class Yaml
$yaml = new Dumper();
$yaml->setIndentation($indent);
return $yaml->dump($array, $inline, 0, $exceptionOnInvalidType, $objectSupport);
return $yaml->dump($input, $inline, 0, $exceptionOnInvalidType, $objectSupport);
}
}