harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update composer libs

Browse Source
This commit is contained in:
Mario Vavti
2019-01-02 22:41:03 +01:00
parent a19563e139
commit dbd230da74
18 changed files with 364 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

340
composer.lock generated
View File

@@ -63,16 +63,16 @@
}, },
{ {
"name": "bshaffer/oauth2-server-php", "name": "bshaffer/oauth2-server-php",
"version": "v1.10.0", "version": "v1.11.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/bshaffer/oauth2-server-php.git", "url": "https://github.com/bshaffer/oauth2-server-php.git",
"reference": "d158878425392fe5a0cc34f15dbaf46315ae0ed9" "reference": "5a0c8000d4763b276919e2106f54eddda6bc50fa"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/bshaffer/oauth2-server-php/zipball/d158878425392fe5a0cc34f15dbaf46315ae0ed9", "url": "https://api.github.com/repos/bshaffer/oauth2-server-php/zipball/5a0c8000d4763b276919e2106f54eddda6bc50fa",
"reference": "d158878425392fe5a0cc34f15dbaf46315ae0ed9", "reference": "5a0c8000d4763b276919e2106f54eddda6bc50fa",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -117,7 +117,7 @@
"oauth", "oauth",
"oauth2" "oauth2"
], ],
"time": "2017-11-15T01:41:02+00:00" "time": "2018-12-04T00:29:32+00:00"
}, },
{ {
"name": "commerceguys/intl", "name": "commerceguys/intl",
@@ -251,16 +251,16 @@
}, },
{ {
"name": "league/html-to-markdown", "name": "league/html-to-markdown",
"version": "4.8.0", "version": "4.8.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/html-to-markdown.git", "url": "https://github.com/thephpleague/html-to-markdown.git",
"reference": "f9a879a068c68ff47b722de63f58bec79e448f9d" "reference": "250d1bf45f80d15594fb6b316df777d6d4c97ad1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/f9a879a068c68ff47b722de63f58bec79e448f9d", "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/250d1bf45f80d15594fb6b316df777d6d4c97ad1",
"reference": "f9a879a068c68ff47b722de63f58bec79e448f9d", "reference": "250d1bf45f80d15594fb6b316df777d6d4c97ad1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -311,7 +311,7 @@
"html", "html",
"markdown" "markdown"
], ],
"time": "2018-09-18T12:18:08+00:00" "time": "2018-12-24T17:21:44+00:00"
}, },
{ {
"name": "lukasreschke/id3parser", "name": "lukasreschke/id3parser",
@@ -1925,32 +1925,33 @@
}, },
{ {
"name": "guzzlehttp/psr7", "name": "guzzlehttp/psr7",
"version": "1.4.2", "version": "1.5.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/psr7.git", "url": "https://github.com/guzzle/psr7.git",
"reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c" "reference": "9f83dded91781a01c63574e387eaa769be769115"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c", "url": "https://api.github.com/repos/guzzle/psr7/zipball/9f83dded91781a01c63574e387eaa769be769115",
"reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c", "reference": "9f83dded91781a01c63574e387eaa769be769115",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.4.0", "php": ">=5.4.0",
"psr/http-message": "~1.0" "psr/http-message": "~1.0",
"ralouphie/getallheaders": "^2.0.5"
}, },
"provide": { "provide": {
"psr/http-message-implementation": "1.0" "psr/http-message-implementation": "1.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~4.0" "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.4-dev" "dev-master": "1.5-dev"
} }
}, },
"autoload": { "autoload": {
@@ -1980,13 +1981,14 @@
"keywords": [ "keywords": [
"http", "http",
"message", "message",
"psr-7",
"request", "request",
"response", "response",
"stream", "stream",
"uri", "uri",
"url" "url"
], ],
"time": "2017-03-20T17:10:46+00:00" "time": "2018-12-04T20:46:45+00:00"
}, },
{ {
"name": "myclabs/deep-copy", "name": "myclabs/deep-copy",
@@ -2571,6 +2573,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"abandoned": true,
"time": "2018-02-07T06:47:59+00:00" "time": "2018-02-07T06:47:59+00:00"
}, },
{ {
@@ -2827,16 +2830,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "7.4.4", "version": "7.5.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "b1be2c8530c4c29c3519a052c9fb6cee55053bbd" "reference": "c23d78776ad415d5506e0679723cb461d71f488f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b1be2c8530c4c29c3519a052c9fb6cee55053bbd", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c23d78776ad415d5506e0679723cb461d71f488f",
"reference": "b1be2c8530c4c29c3519a052c9fb6cee55053bbd", "reference": "c23d78776ad415d5506e0679723cb461d71f488f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -2857,7 +2860,7 @@
"phpunit/php-timer": "^2.0", "phpunit/php-timer": "^2.0",
"sebastian/comparator": "^3.0", "sebastian/comparator": "^3.0",
"sebastian/diff": "^3.0", "sebastian/diff": "^3.0",
"sebastian/environment": "^3.1 || ^4.0", "sebastian/environment": "^4.0",
"sebastian/exporter": "^3.1", "sebastian/exporter": "^3.1",
"sebastian/global-state": "^2.0", "sebastian/global-state": "^2.0",
"sebastian/object-enumerator": "^3.0.3", "sebastian/object-enumerator": "^3.0.3",
@@ -2881,7 +2884,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "7.4-dev" "dev-master": "7.5-dev"
} }
}, },
"autoload": { "autoload": {
@@ -2907,7 +2910,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2018-11-14T16:52:02+00:00" "time": "2018-12-12T07:20:32+00:00"
}, },
{ {
"name": "psr/container", "name": "psr/container",
@@ -3008,6 +3011,46 @@
], ],
"time": "2016-08-06T14:39:51+00:00" "time": "2016-08-06T14:39:51+00:00"
}, },
{
"name": "ralouphie/getallheaders",
"version": "2.0.5",
"source": {
"type": "git",
"url": "https://github.com/ralouphie/getallheaders.git",
"reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
"reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
"shasum": ""
},
"require": {
"php": ">=5.3"
},
"require-dev": {
"phpunit/phpunit": "~3.7.0",
"satooshi/php-coveralls": ">=1.0"
},
"type": "library",
"autoload": {
"files": [
"src/getallheaders.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Ralph Khattar",
"email": "ralph.khattar@gmail.com"
}
],
"description": "A polyfill for getallheaders.",
"time": "2016-02-11T07:05:27+00:00"
},
{ {
"name": "sebastian/code-unit-reverse-lookup", "name": "sebastian/code-unit-reverse-lookup",
"version": "1.0.1", "version": "1.0.1",
@@ -3175,28 +3218,28 @@
}, },
{ {
"name": "sebastian/environment", "name": "sebastian/environment",
"version": "3.1.0", "version": "4.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/environment.git", "url": "https://github.com/sebastianbergmann/environment.git",
"reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5" "reference": "febd209a219cea7b56ad799b30ebbea34b71eb8f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5", "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/febd209a219cea7b56ad799b30ebbea34b71eb8f",
"reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5", "reference": "febd209a219cea7b56ad799b30ebbea34b71eb8f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.0" "php": "^7.1"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^6.1" "phpunit/phpunit": "^7.4"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.1.x-dev" "dev-master": "4.0-dev"
} }
}, },
"autoload": { "autoload": {
@@ -3221,7 +3264,7 @@
"environment", "environment",
"hhvm" "hhvm"
], ],
"time": "2017-07-01T08:51:00+00:00" "time": "2018-11-25T09:31:21+00:00"
}, },
{ {
"name": "sebastian/exporter", "name": "sebastian/exporter",
@@ -3573,16 +3616,16 @@
}, },
{ {
"name": "symfony/browser-kit", "name": "symfony/browser-kit",
"version": "v4.1.7", "version": "v4.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/browser-kit.git", "url": "https://github.com/symfony/browser-kit.git",
"reference": "c55fe9257003b2d95c0211b3f6941e8dfd26dffd" "reference": "db7e59fec9c82d45e745eb500e6ede2d96f4a6e9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/browser-kit/zipball/c55fe9257003b2d95c0211b3f6941e8dfd26dffd", "url": "https://api.github.com/repos/symfony/browser-kit/zipball/db7e59fec9c82d45e745eb500e6ede2d96f4a6e9",
"reference": "c55fe9257003b2d95c0211b3f6941e8dfd26dffd", "reference": "db7e59fec9c82d45e745eb500e6ede2d96f4a6e9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -3599,7 +3642,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.1-dev" "dev-master": "4.2-dev"
} }
}, },
"autoload": { "autoload": {
@@ -3626,20 +3669,20 @@
], ],
"description": "Symfony BrowserKit Component", "description": "Symfony BrowserKit Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-07-26T09:10:45+00:00" "time": "2018-11-26T11:49:31+00:00"
}, },
{ {
"name": "symfony/class-loader", "name": "symfony/class-loader",
"version": "v3.4.18", "version": "v3.4.20",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/class-loader.git", "url": "https://github.com/symfony/class-loader.git",
"reference": "5605edec7b8f034ead2497ff4aab17bb70d558c1" "reference": "420458095cf60025eb0841276717e0da7f75e50e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/class-loader/zipball/5605edec7b8f034ead2497ff4aab17bb70d558c1", "url": "https://api.github.com/repos/symfony/class-loader/zipball/420458095cf60025eb0841276717e0da7f75e50e",
"reference": "5605edec7b8f034ead2497ff4aab17bb70d558c1", "reference": "420458095cf60025eb0841276717e0da7f75e50e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -3682,20 +3725,20 @@
], ],
"description": "Symfony ClassLoader Component", "description": "Symfony ClassLoader Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-10-31T09:06:03+00:00" "time": "2018-11-11T19:48:54+00:00"
}, },
{ {
"name": "symfony/config", "name": "symfony/config",
"version": "v4.1.7", "version": "v4.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/config.git", "url": "https://github.com/symfony/config.git",
"reference": "991fec8bbe77367fc8b48ecbaa8a4bd6e905a238" "reference": "005d9a083d03f588677d15391a716b1ac9b887c0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/config/zipball/991fec8bbe77367fc8b48ecbaa8a4bd6e905a238", "url": "https://api.github.com/repos/symfony/config/zipball/005d9a083d03f588677d15391a716b1ac9b887c0",
"reference": "991fec8bbe77367fc8b48ecbaa8a4bd6e905a238", "reference": "005d9a083d03f588677d15391a716b1ac9b887c0",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -3718,7 +3761,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.1-dev" "dev-master": "4.2-dev"
} }
}, },
"autoload": { "autoload": {
@@ -3745,24 +3788,25 @@
], ],
"description": "Symfony Config Component", "description": "Symfony Config Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-10-31T09:09:42+00:00" "time": "2018-11-30T22:21:14+00:00"
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v4.1.7", "version": "v4.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "432122af37d8cd52fba1b294b11976e0d20df595" "reference": "4dff24e5d01e713818805c1862d2e3f901ee7dd0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/432122af37d8cd52fba1b294b11976e0d20df595", "url": "https://api.github.com/repos/symfony/console/zipball/4dff24e5d01e713818805c1862d2e3f901ee7dd0",
"reference": "432122af37d8cd52fba1b294b11976e0d20df595", "reference": "4dff24e5d01e713818805c1862d2e3f901ee7dd0",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.1.3", "php": "^7.1.3",
"symfony/contracts": "^1.0",
"symfony/polyfill-mbstring": "~1.0" "symfony/polyfill-mbstring": "~1.0"
}, },
"conflict": { "conflict": {
@@ -3786,7 +3830,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.1-dev" "dev-master": "4.2-dev"
} }
}, },
"autoload": { "autoload": {
@@ -3813,20 +3857,88 @@
], ],
"description": "Symfony Console Component", "description": "Symfony Console Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-10-31T09:30:44+00:00" "time": "2018-11-27T07:40:44+00:00"
}, },
{ {
"name": "symfony/css-selector", "name": "symfony/contracts",
"version": "v3.4.18", "version": "v1.0.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/css-selector.git", "url": "https://github.com/symfony/contracts.git",
"reference": "3503415d4aafabc31cd08c3a4ebac7f43fde8feb" "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/3503415d4aafabc31cd08c3a4ebac7f43fde8feb", "url": "https://api.github.com/repos/symfony/contracts/zipball/1aa7ab2429c3d594dd70689604b5cf7421254cdf",
"reference": "3503415d4aafabc31cd08c3a4ebac7f43fde8feb", "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf",
"shasum": ""
},
"require": {
"php": "^7.1.3"
},
"require-dev": {
"psr/cache": "^1.0",
"psr/container": "^1.0"
},
"suggest": {
"psr/cache": "When using the Cache contracts",
"psr/container": "When using the Service contracts",
"symfony/cache-contracts-implementation": "",
"symfony/service-contracts-implementation": "",
"symfony/translation-contracts-implementation": ""
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Contracts\\": ""
},
"exclude-from-classmap": [
"**/Tests/"
]
},
"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": "A set of abstractions extracted out of the Symfony components",
"homepage": "https://symfony.com",
"keywords": [
"abstractions",
"contracts",
"decoupling",
"interfaces",
"interoperability",
"standards"
],
"time": "2018-12-05T08:06:11+00:00"
},
{
"name": "symfony/css-selector",
"version": "v3.4.20",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
"reference": "345b9a48595d1ab9630db791dbc3e721bf0233e8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/345b9a48595d1ab9630db791dbc3e721bf0233e8",
"reference": "345b9a48595d1ab9630db791dbc3e721bf0233e8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -3866,37 +3978,39 @@
], ],
"description": "Symfony CssSelector Component", "description": "Symfony CssSelector Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-10-02T16:33:53+00:00" "time": "2018-11-11T19:48:54+00:00"
}, },
{ {
"name": "symfony/dependency-injection", "name": "symfony/dependency-injection",
"version": "v4.1.7", "version": "v4.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/dependency-injection.git", "url": "https://github.com/symfony/dependency-injection.git",
"reference": "e72ee2c23d952e4c368ee98610fa22b79b89b483" "reference": "e4adc57a48d3fa7f394edfffa9e954086d7740e5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/e72ee2c23d952e4c368ee98610fa22b79b89b483", "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/e4adc57a48d3fa7f394edfffa9e954086d7740e5",
"reference": "e72ee2c23d952e4c368ee98610fa22b79b89b483", "reference": "e4adc57a48d3fa7f394edfffa9e954086d7740e5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.1.3", "php": "^7.1.3",
"psr/container": "^1.0" "psr/container": "^1.0",
"symfony/contracts": "^1.0"
}, },
"conflict": { "conflict": {
"symfony/config": "<4.1.1", "symfony/config": "<4.2",
"symfony/finder": "<3.4", "symfony/finder": "<3.4",
"symfony/proxy-manager-bridge": "<3.4", "symfony/proxy-manager-bridge": "<3.4",
"symfony/yaml": "<3.4" "symfony/yaml": "<3.4"
}, },
"provide": { "provide": {
"psr/container-implementation": "1.0" "psr/container-implementation": "1.0",
"symfony/service-contracts-implementation": "1.0"
}, },
"require-dev": { "require-dev": {
"symfony/config": "~4.1", "symfony/config": "~4.2",
"symfony/expression-language": "~3.4|~4.0", "symfony/expression-language": "~3.4|~4.0",
"symfony/yaml": "~3.4|~4.0" "symfony/yaml": "~3.4|~4.0"
}, },
@@ -3910,7 +4024,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.1-dev" "dev-master": "4.2-dev"
} }
}, },
"autoload": { "autoload": {
@@ -3937,20 +4051,20 @@
], ],
"description": "Symfony DependencyInjection Component", "description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-10-31T10:54:16+00:00" "time": "2018-12-02T15:59:36+00:00"
}, },
{ {
"name": "symfony/dom-crawler", "name": "symfony/dom-crawler",
"version": "v4.1.7", "version": "v4.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/dom-crawler.git", "url": "https://github.com/symfony/dom-crawler.git",
"reference": "80e60271bb288de2a2259662cff125cff4f93f95" "reference": "7438a32108fdd555295f443605d6de2cce473159"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/80e60271bb288de2a2259662cff125cff4f93f95", "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/7438a32108fdd555295f443605d6de2cce473159",
"reference": "80e60271bb288de2a2259662cff125cff4f93f95", "reference": "7438a32108fdd555295f443605d6de2cce473159",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -3967,7 +4081,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.1-dev" "dev-master": "4.2-dev"
} }
}, },
"autoload": { "autoload": {
@@ -3994,24 +4108,25 @@
], ],
"description": "Symfony DomCrawler Component", "description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-10-02T12:40:59+00:00" "time": "2018-11-26T10:55:26+00:00"
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
"version": "v4.1.7", "version": "v4.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/event-dispatcher.git", "url": "https://github.com/symfony/event-dispatcher.git",
"reference": "552541dad078c85d9414b09c041ede488b456cd5" "reference": "921f49c3158a276d27c0d770a5a347a3b718b328"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/552541dad078c85d9414b09c041ede488b456cd5", "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/921f49c3158a276d27c0d770a5a347a3b718b328",
"reference": "552541dad078c85d9414b09c041ede488b456cd5", "reference": "921f49c3158a276d27c0d770a5a347a3b718b328",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.1.3" "php": "^7.1.3",
"symfony/contracts": "^1.0"
}, },
"conflict": { "conflict": {
"symfony/dependency-injection": "<3.4" "symfony/dependency-injection": "<3.4"
@@ -4030,7 +4145,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.1-dev" "dev-master": "4.2-dev"
} }
}, },
"autoload": { "autoload": {
@@ -4057,20 +4172,20 @@
], ],
"description": "Symfony EventDispatcher Component", "description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-10-10T13:52:42+00:00" "time": "2018-12-01T08:52:38+00:00"
}, },
{ {
"name": "symfony/filesystem", "name": "symfony/filesystem",
"version": "v4.1.7", "version": "v4.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/filesystem.git", "url": "https://github.com/symfony/filesystem.git",
"reference": "fd7bd6535beb1f0a0a9e3ee960666d0598546981" "reference": "2f4c8b999b3b7cadb2a69390b01af70886753710"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/fd7bd6535beb1f0a0a9e3ee960666d0598546981", "url": "https://api.github.com/repos/symfony/filesystem/zipball/2f4c8b999b3b7cadb2a69390b01af70886753710",
"reference": "fd7bd6535beb1f0a0a9e3ee960666d0598546981", "reference": "2f4c8b999b3b7cadb2a69390b01af70886753710",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -4080,7 +4195,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.1-dev" "dev-master": "4.2-dev"
} }
}, },
"autoload": { "autoload": {
@@ -4107,7 +4222,7 @@
], ],
"description": "Symfony Filesystem Component", "description": "Symfony Filesystem Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-10-30T13:18:25+00:00" "time": "2018-11-11T19:52:12+00:00"
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
@@ -4170,20 +4285,21 @@
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
"version": "v4.1.7", "version": "v4.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/translation.git", "url": "https://github.com/symfony/translation.git",
"reference": "aa04dc1c75b7d3da7bd7003104cd0cfc5dff635c" "reference": "c0e2191e9bed845946ab3d99767513b56ca7dcd6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/aa04dc1c75b7d3da7bd7003104cd0cfc5dff635c", "url": "https://api.github.com/repos/symfony/translation/zipball/c0e2191e9bed845946ab3d99767513b56ca7dcd6",
"reference": "aa04dc1c75b7d3da7bd7003104cd0cfc5dff635c", "reference": "c0e2191e9bed845946ab3d99767513b56ca7dcd6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.1.3", "php": "^7.1.3",
"symfony/contracts": "^1.0.2",
"symfony/polyfill-mbstring": "~1.0" "symfony/polyfill-mbstring": "~1.0"
}, },
"conflict": { "conflict": {
@@ -4191,6 +4307,9 @@
"symfony/dependency-injection": "<3.4", "symfony/dependency-injection": "<3.4",
"symfony/yaml": "<3.4" "symfony/yaml": "<3.4"
}, },
"provide": {
"symfony/translation-contracts-implementation": "1.0"
},
"require-dev": { "require-dev": {
"psr/log": "~1.0", "psr/log": "~1.0",
"symfony/config": "~3.4|~4.0", "symfony/config": "~3.4|~4.0",
@@ -4208,7 +4327,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.1-dev" "dev-master": "4.2-dev"
} }
}, },
"autoload": { "autoload": {
@@ -4235,20 +4354,20 @@
], ],
"description": "Symfony Translation Component", "description": "Symfony Translation Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-10-28T18:38:52+00:00" "time": "2018-12-06T10:45:32+00:00"
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
"version": "v4.1.7", "version": "v4.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/yaml.git", "url": "https://github.com/symfony/yaml.git",
"reference": "367e689b2fdc19965be435337b50bc8adf2746c9" "reference": "c41175c801e3edfda90f32e292619d10c27103d7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/367e689b2fdc19965be435337b50bc8adf2746c9", "url": "https://api.github.com/repos/symfony/yaml/zipball/c41175c801e3edfda90f32e292619d10c27103d7",
"reference": "367e689b2fdc19965be435337b50bc8adf2746c9", "reference": "c41175c801e3edfda90f32e292619d10c27103d7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -4267,7 +4386,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.1-dev" "dev-master": "4.2-dev"
} }
}, },
"autoload": { "autoload": {
@@ -4294,7 +4413,7 @@
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-10-02T16:36:10+00:00" "time": "2018-11-11T19:52:12+00:00"
}, },
{ {
"name": "theseer/tokenizer", "name": "theseer/tokenizer",
@@ -4338,20 +4457,21 @@
}, },
{ {
"name": "webmozart/assert", "name": "webmozart/assert",
"version": "1.3.0", "version": "1.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/webmozart/assert.git", "url": "https://github.com/webmozart/assert.git",
"reference": "0df1908962e7a3071564e857d86874dad1ef204a" "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a", "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
"reference": "0df1908962e7a3071564e857d86874dad1ef204a", "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^5.3.3 || ^7.0" "php": "^5.3.3 || ^7.0",
"symfony/polyfill-ctype": "^1.8"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^4.6", "phpunit/phpunit": "^4.6",
@@ -4384,7 +4504,7 @@
"check", "check",
"validate" "validate"
], ],
"time": "2018-01-29T19:49:41+00:00" "time": "2018-12-25T11:19:39+00:00"
} }
], ],
"aliases": [], "aliases": [],

4
vendor/bshaffer/oauth2-server-php/CHANGELOG.md vendored
View File

@@ -8,7 +8,7 @@ To see the files changed for a given bug, go to https://github.com/bshaffer/oaut
To get the diff between two versions, go to https://github.com/bshaffer/oauth2-server-php/compare/v1.0...v1.1 To get the diff between two versions, go to https://github.com/bshaffer/oauth2-server-php/compare/v1.0...v1.1
To get the diff for a specific change, go to https://github.com/bshaffer/oauth2-server-php/commit/XXX where XXX is the change hash To get the diff for a specific change, go to https://github.com/bshaffer/oauth2-server-php/commit/XXX where XXX is the change hash
* 1.10.0 (2017-12-14) * 1.10.0 (2017-11-15)
PR: https://github.com/bshaffer/oauth2-server-php/pull/889 PR: https://github.com/bshaffer/oauth2-server-php/pull/889
@@ -26,7 +26,7 @@ To get the diff for a specific change, go to https://github.com/bshaffer/oauth2-
* #794 - [docs] Fix typo in composer.json * #794 - [docs] Fix typo in composer.json
* #885 - [testing] Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase * #885 - [testing] Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase
* 1.9.0 (2016-01-06) * 1.9.0 (2017-01-06)
PR: https://github.com/bshaffer/oauth2-server-php/pull/788 PR: https://github.com/bshaffer/oauth2-server-php/pull/788

2
vendor/bshaffer/oauth2-server-php/README.md vendored
View File

@@ -1,7 +1,7 @@
oauth2-server-php oauth2-server-php
================= =================
[![Build Status](https://travis-ci.org/bshaffer/oauth2-server-php.svg?branch=develop)](https://travis-ci.org/bshaffer/oauth2-server-php) [![Build Status](https://travis-ci.org/bshaffer/oauth2-server-php.svg?branch=master)](https://travis-ci.org/bshaffer/oauth2-server-php)
[![Total Downloads](https://poser.pugx.org/bshaffer/oauth2-server-php/downloads.png)](https://packagist.org/packages/bshaffer/oauth2-server-php) [![Total Downloads](https://poser.pugx.org/bshaffer/oauth2-server-php/downloads.png)](https://packagist.org/packages/bshaffer/oauth2-server-php)

7
vendor/bshaffer/oauth2-server-php/src/OAuth2/Request.php vendored
View File

@@ -64,7 +64,12 @@ class Request implements RequestInterface
$this->files = $files; $this->files = $files;
$this->server = $server; $this->server = $server;
$this->content = $content; $this->content = $content;
$this->headers = is_null($headers) ? $this->getHeadersFromServer($this->server) : $headers;
if ($headers === null) {
$headers = array();
}
$this->headers = $headers + $this->getHeadersFromServer($this->server);
} }
/** /**

2
vendor/bshaffer/oauth2-server-php/src/OAuth2/Response.php vendored
View File

@@ -366,7 +366,7 @@ class Response implements ResponseInterface
if (count($this->parameters) > 0) { if (count($this->parameters) > 0) {
// add parameters to URL redirection // add parameters to URL redirection
$parts = parse_url($url); $parts = parse_url($url);
$sep = isset($parts['query']) && count($parts['query']) > 0 ? '&' : '?'; $sep = isset($parts['query']) && !empty($parts['query']) ? '&' : '?';
$url .= $sep . http_build_query($this->parameters); $url .= $sep . http_build_query($this->parameters);
} }

18
vendor/bshaffer/oauth2-server-php/src/OAuth2/ResponseType/JwtAccessToken.php vendored
View File

@@ -128,7 +128,7 @@ class JwtAccessToken extends AccessToken
$expires = time() + $this->config['access_lifetime']; $expires = time() + $this->config['access_lifetime'];
$id = $this->generateAccessToken(); $id = $this->generateAccessToken();
return array( $payload = array(
'id' => $id, // for BC (see #591) 'id' => $id, // for BC (see #591)
'jti' => $id, 'jti' => $id,
'iss' => $this->config['issuer'], 'iss' => $this->config['issuer'],
@@ -139,5 +139,21 @@ class JwtAccessToken extends AccessToken
'token_type' => $this->config['token_type'], 'token_type' => $this->config['token_type'],
'scope' => $scope 'scope' => $scope
); );
if (isset($this->config['jwt_extra_payload_callable'])) {
if (!is_callable($this->config['jwt_extra_payload_callable'])) {
throw new \InvalidArgumentException('jwt_extra_payload_callable is not callable');
}
$extra = call_user_func($this->config['jwt_extra_payload_callable'], $client_id, $user_id, $scope);
if (!is_array($extra)) {
throw new \InvalidArgumentException('jwt_extra_payload_callable must return array');
}
$payload = array_merge($extra, $payload);
}
return $payload;
} }
} }

7
vendor/bshaffer/oauth2-server-php/src/OAuth2/Server.php vendored
View File

@@ -88,12 +88,12 @@ class Server implements ResourceControllerInterface,
/** /**
* @var array * @var array
*/ */
protected $grantTypes = []; protected $grantTypes = array();
/** /**
* @var array * @var array
*/ */
protected $responseTypes = []; protected $responseTypes = array();
/** /**
* @var TokenTypeInterface * @var TokenTypeInterface
@@ -161,6 +161,7 @@ class Server implements ResourceControllerInterface,
// merge all config values. These get passed to our controller objects // merge all config values. These get passed to our controller objects
$this->config = array_merge(array( $this->config = array_merge(array(
'use_jwt_access_tokens' => false, 'use_jwt_access_tokens' => false,
'jwt_extra_payload_callable' => null,
'store_encrypted_token_string' => true, 'store_encrypted_token_string' => true,
'use_openid_connect' => false, 'use_openid_connect' => false,
'id_lifetime' => 3600, 'id_lifetime' => 3600,
@@ -840,7 +841,7 @@ class Server implements ResourceControllerInterface,
$refreshStorage = $this->storages['refresh_token']; $refreshStorage = $this->storages['refresh_token'];
} }
$config = array_intersect_key($this->config, array_flip(explode(' ', 'store_encrypted_token_string issuer access_lifetime refresh_token_lifetime'))); $config = array_intersect_key($this->config, array_flip(explode(' ', 'store_encrypted_token_string issuer access_lifetime refresh_token_lifetime jwt_extra_payload_callable')));
return new JwtAccessToken($this->storages['public_key'], $tokenStorage, $refreshStorage, $config); return new JwtAccessToken($this->storages['public_key'], $tokenStorage, $refreshStorage, $config);
} }

18
vendor/bshaffer/oauth2-server-php/test/OAuth2/RequestTest.php vendored
View File

@@ -86,6 +86,24 @@ class RequestTest extends TestCase
$this->assertEquals('correct', $request->query('client_id', $request->request('client_id'))); $this->assertEquals('correct', $request->query('client_id', $request->request('client_id')));
} }
public function testRequestHasHeadersAndServerHeaders()
{
$request = new Request(
array(),
array(),
array(),
array(),
array(),
array('CONTENT_TYPE' => 'text/xml', 'PHP_AUTH_USER' => 'client_id', 'PHP_AUTH_PW' => 'client_pass'),
null,
array('CONTENT_TYPE' => 'application/json')
);
$this->assertSame('client_id', $request->headers('PHP_AUTH_USER'));
$this->assertSame('client_pass', $request->headers('PHP_AUTH_PW'));
$this->assertSame('application/json', $request->headers('CONTENT_TYPE'));
}
private function getTestServer($config = array()) private function getTestServer($config = array())
{ {
$storage = Bootstrap::getInstance()->getMemoryStorage(); $storage = Bootstrap::getInstance()->getMemoryStorage();

23
vendor/bshaffer/oauth2-server-php/test/OAuth2/ResponseTest.php vendored
View File

@@ -1,6 +1,8 @@
<?php <?php
namespace OAuth2;use PHPUnit\Framework\TestCase; namespace OAuth2;
use PHPUnit\Framework\TestCase;
class ResponseTest extends TestCase class ResponseTest extends TestCase
{ {
@@ -14,4 +16,23 @@ class ResponseTest extends TestCase
$string = $response->getResponseBody('xml'); $string = $response->getResponseBody('xml');
$this->assertContains('<response><foo>bar</foo><halland>oates</halland></response>', $string); $this->assertContains('<response><foo>bar</foo><halland>oates</halland></response>', $string);
} }
public function testSetRedirect()
{
$response = new Response();
$url = 'https://foo/bar';
$state = 'stateparam';
$response->setRedirect(301, $url, $state);
$this->assertEquals(
sprintf('%s?state=%s', $url, $state),
$response->getHttpHeader('Location')
);
$query = 'query=foo';
$response->setRedirect(301, $url . '?' . $query, $state);
$this->assertEquals(
sprintf('%s?%s&state=%s', $url, $query, $state),
$response->getHttpHeader('Location')
);
}
} }

21
vendor/bshaffer/oauth2-server-php/test/OAuth2/ResponseType/JwtAccessTokenTest.php vendored
View File

@@ -41,6 +41,23 @@ class JwtAccessTokenTest extends TestCase
$this->assertEquals($decodedAccessToken['id'], $decodedAccessToken['jti']); $this->assertEquals($decodedAccessToken['id'], $decodedAccessToken['jti']);
} }
public function testExtraPayloadCallback()
{
$jwtconfig = array('jwt_extra_payload_callable' => function() {
return array('custom_param' => 'custom_value');
});
$server = $this->getTestServer($jwtconfig);
$jwtResponseType = $server->getResponseType('token');
$accessToken = $jwtResponseType->createAccessToken('Test Client ID', 123, 'test', false);
$jwt = new Jwt;
$decodedAccessToken = $jwt->decode($accessToken['access_token'], null, false);
$this->assertArrayHasKey('custom_param', $decodedAccessToken);
$this->assertEquals('custom_value', $decodedAccessToken['custom_param']);
}
public function testGrantJwtAccessToken() public function testGrantJwtAccessToken()
{ {
// add the test parameters in memory // add the test parameters in memory
@@ -140,7 +157,7 @@ class JwtAccessTokenTest extends TestCase
$this->assertNotNull($response->getParameter('access_token')); $this->assertNotNull($response->getParameter('access_token'));
} }
private function getTestServer() private function getTestServer($jwtconfig = array())
{ {
$memoryStorage = Bootstrap::getInstance()->getMemoryStorage(); $memoryStorage = Bootstrap::getInstance()->getMemoryStorage();
@@ -153,7 +170,7 @@ class JwtAccessTokenTest extends TestCase
$server->addGrantType(new ClientCredentials($memoryStorage)); $server->addGrantType(new ClientCredentials($memoryStorage));
// make the "token" response type a JwtAccessToken // make the "token" response type a JwtAccessToken
$config = array('issuer' => 'https://api.example.com'); $config = array_merge(array('issuer' => 'https://api.example.com'), $jwtconfig);
$server->addResponseType(new JwtAccessToken($memoryStorage, $memoryStorage, null, $config)); $server->addResponseType(new JwtAccessToken($memoryStorage, $memoryStorage, null, $config));
return $server; return $server;

8
vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/PdoTest.php vendored
View File

@@ -6,7 +6,8 @@ class PdoTest extends BaseTest
{ {
public function testCreatePdoStorageUsingPdoClass() public function testCreatePdoStorageUsingPdoClass()
{ {
$pdo = new \PDO(sprintf('sqlite://%s', Bootstrap::getInstance()->getSqliteDir())); $dsn = sprintf('sqlite:%s', Bootstrap::getInstance()->getSqliteDir());
$pdo = new \PDO($dsn);
$storage = new Pdo($pdo); $storage = new Pdo($pdo);
$this->assertNotNull($storage->getClientDetails('oauth_test_client')); $this->assertNotNull($storage->getClientDetails('oauth_test_client'));
@@ -14,7 +15,7 @@ class PdoTest extends BaseTest
public function testCreatePdoStorageUsingDSN() public function testCreatePdoStorageUsingDSN()
{ {
$dsn = sprintf('sqlite://%s', Bootstrap::getInstance()->getSqliteDir()); $dsn = sprintf('sqlite:%s', Bootstrap::getInstance()->getSqliteDir());
$storage = new Pdo($dsn); $storage = new Pdo($dsn);
$this->assertNotNull($storage->getClientDetails('oauth_test_client')); $this->assertNotNull($storage->getClientDetails('oauth_test_client'));
@@ -22,7 +23,8 @@ class PdoTest extends BaseTest
public function testCreatePdoStorageUsingConfig() public function testCreatePdoStorageUsingConfig()
{ {
$config = array('dsn' => sprintf('sqlite://%s', Bootstrap::getInstance()->getSqliteDir())); $dsn = sprintf('sqlite:%s', Bootstrap::getInstance()->getSqliteDir());
$config = array('dsn' => $dsn);
$storage = new Pdo($config); $storage = new Pdo($config);
$this->assertNotNull($storage->getClientDetails('oauth_test_client')); $this->assertNotNull($storage->getClientDetails('oauth_test_client'));

2
vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/Bootstrap.php vendored
View File

@@ -36,7 +36,7 @@ class Bootstrap
{ {
if (!$this->sqlite) { if (!$this->sqlite) {
$this->removeSqliteDb(); $this->removeSqliteDb();
$pdo = new \PDO(sprintf('sqlite://%s', $this->getSqliteDir())); $pdo = new \PDO(sprintf('sqlite:%s', $this->getSqliteDir()));
$pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION); $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
$this->createSqliteDb($pdo); $this->createSqliteDb($pdo);

5
vendor/composer/autoload_classmap.php vendored
View File

@@ -380,9 +380,6 @@ return array(
'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php', 'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php',
'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php', 'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php',
'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php', 'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php',
'Ramsey\\Uuid\\BinaryUtils' => $vendorDir . '/ramsey/uuid/src/BinaryUtils.php', 'Ramsey\\Uuid\\BinaryUtils' => $vendorDir . '/ramsey/uuid/src/BinaryUtils.php',
'Ramsey\\Uuid\\Builder\\DefaultUuidBuilder' => $vendorDir . '/ramsey/uuid/src/Builder/DefaultUuidBuilder.php', 'Ramsey\\Uuid\\Builder\\DefaultUuidBuilder' => $vendorDir . '/ramsey/uuid/src/Builder/DefaultUuidBuilder.php',
'Ramsey\\Uuid\\Builder\\DegradedUuidBuilder' => $vendorDir . '/ramsey/uuid/src/Builder/DegradedUuidBuilder.php', 'Ramsey\\Uuid\\Builder\\DegradedUuidBuilder' => $vendorDir . '/ramsey/uuid/src/Builder/DegradedUuidBuilder.php',
@@ -1343,6 +1340,8 @@ return array(
'Zotlabs\\Update\\_1226' => $baseDir . '/Zotlabs/Update/_1226.php', 'Zotlabs\\Update\\_1226' => $baseDir . '/Zotlabs/Update/_1226.php',
'Zotlabs\\Update\\_1227' => $baseDir . '/Zotlabs/Update/_1227.php', 'Zotlabs\\Update\\_1227' => $baseDir . '/Zotlabs/Update/_1227.php',
'Zotlabs\\Update\\_1228' => $baseDir . '/Zotlabs/Update/_1228.php', 'Zotlabs\\Update\\_1228' => $baseDir . '/Zotlabs/Update/_1228.php',
'Zotlabs\\Update\\_1229' => $baseDir . '/Zotlabs/Update/_1229.php',
'Zotlabs\\Update\\_1230' => $baseDir . '/Zotlabs/Update/_1230.php',
'Zotlabs\\Web\\Controller' => $baseDir . '/Zotlabs/Web/Controller.php', 'Zotlabs\\Web\\Controller' => $baseDir . '/Zotlabs/Web/Controller.php',
'Zotlabs\\Web\\HTTPHeaders' => $baseDir . '/Zotlabs/Web/HTTPHeaders.php', 'Zotlabs\\Web\\HTTPHeaders' => $baseDir . '/Zotlabs/Web/HTTPHeaders.php',
'Zotlabs\\Web\\HTTPSig' => $baseDir . '/Zotlabs/Web/HTTPSig.php', 'Zotlabs\\Web\\HTTPSig' => $baseDir . '/Zotlabs/Web/HTTPSig.php',

5
vendor/composer/autoload_static.php vendored
View File

@@ -548,9 +548,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php', 'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php',
'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php', 'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php',
'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php', 'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php',
'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
'Psr\\Log\\Test\\TestLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/TestLogger.php',
'Ramsey\\Uuid\\BinaryUtils' => __DIR__ . '/..' . '/ramsey/uuid/src/BinaryUtils.php', 'Ramsey\\Uuid\\BinaryUtils' => __DIR__ . '/..' . '/ramsey/uuid/src/BinaryUtils.php',
'Ramsey\\Uuid\\Builder\\DefaultUuidBuilder' => __DIR__ . '/..' . '/ramsey/uuid/src/Builder/DefaultUuidBuilder.php', 'Ramsey\\Uuid\\Builder\\DefaultUuidBuilder' => __DIR__ . '/..' . '/ramsey/uuid/src/Builder/DefaultUuidBuilder.php',
'Ramsey\\Uuid\\Builder\\DegradedUuidBuilder' => __DIR__ . '/..' . '/ramsey/uuid/src/Builder/DegradedUuidBuilder.php', 'Ramsey\\Uuid\\Builder\\DegradedUuidBuilder' => __DIR__ . '/..' . '/ramsey/uuid/src/Builder/DegradedUuidBuilder.php',
@@ -1511,6 +1508,8 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
'Zotlabs\\Update\\_1226' => __DIR__ . '/../..' . '/Zotlabs/Update/_1226.php', 'Zotlabs\\Update\\_1226' => __DIR__ . '/../..' . '/Zotlabs/Update/_1226.php',
'Zotlabs\\Update\\_1227' => __DIR__ . '/../..' . '/Zotlabs/Update/_1227.php', 'Zotlabs\\Update\\_1227' => __DIR__ . '/../..' . '/Zotlabs/Update/_1227.php',
'Zotlabs\\Update\\_1228' => __DIR__ . '/../..' . '/Zotlabs/Update/_1228.php', 'Zotlabs\\Update\\_1228' => __DIR__ . '/../..' . '/Zotlabs/Update/_1228.php',
'Zotlabs\\Update\\_1229' => __DIR__ . '/../..' . '/Zotlabs/Update/_1229.php',
'Zotlabs\\Update\\_1230' => __DIR__ . '/../..' . '/Zotlabs/Update/_1230.php',
'Zotlabs\\Web\\Controller' => __DIR__ . '/../..' . '/Zotlabs/Web/Controller.php', 'Zotlabs\\Web\\Controller' => __DIR__ . '/../..' . '/Zotlabs/Web/Controller.php',
'Zotlabs\\Web\\HTTPHeaders' => __DIR__ . '/../..' . '/Zotlabs/Web/HTTPHeaders.php', 'Zotlabs\\Web\\HTTPHeaders' => __DIR__ . '/../..' . '/Zotlabs/Web/HTTPHeaders.php',
'Zotlabs\\Web\\HTTPSig' => __DIR__ . '/../..' . '/Zotlabs/Web/HTTPSig.php', 'Zotlabs\\Web\\HTTPSig' => __DIR__ . '/../..' . '/Zotlabs/Web/HTTPSig.php',

24
vendor/composer/installed.json vendored
View File

@@ -58,17 +58,17 @@
}, },
{ {
"name": "bshaffer/oauth2-server-php", "name": "bshaffer/oauth2-server-php",
"version": "v1.10.0", "version": "v1.11.1",
"version_normalized": "1.10.0.0", "version_normalized": "1.11.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/bshaffer/oauth2-server-php.git", "url": "https://github.com/bshaffer/oauth2-server-php.git",
"reference": "d158878425392fe5a0cc34f15dbaf46315ae0ed9" "reference": "5a0c8000d4763b276919e2106f54eddda6bc50fa"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/bshaffer/oauth2-server-php/zipball/d158878425392fe5a0cc34f15dbaf46315ae0ed9", "url": "https://api.github.com/repos/bshaffer/oauth2-server-php/zipball/5a0c8000d4763b276919e2106f54eddda6bc50fa",
"reference": "d158878425392fe5a0cc34f15dbaf46315ae0ed9", "reference": "5a0c8000d4763b276919e2106f54eddda6bc50fa",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -89,7 +89,7 @@
"predis/predis": "Required to use Redis storage", "predis/predis": "Required to use Redis storage",
"thobbs/phpcassa": "Required to use Cassandra storage" "thobbs/phpcassa": "Required to use Cassandra storage"
}, },
"time": "2017-11-15T01:41:02+00:00", "time": "2018-12-04T00:29:32+00:00",
"type": "library", "type": "library",
"installation-source": "dist", "installation-source": "dist",
"autoload": { "autoload": {
@@ -254,17 +254,17 @@
}, },
{ {
"name": "league/html-to-markdown", "name": "league/html-to-markdown",
"version": "4.8.0", "version": "4.8.1",
"version_normalized": "4.8.0.0", "version_normalized": "4.8.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/html-to-markdown.git", "url": "https://github.com/thephpleague/html-to-markdown.git",
"reference": "f9a879a068c68ff47b722de63f58bec79e448f9d" "reference": "250d1bf45f80d15594fb6b316df777d6d4c97ad1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/f9a879a068c68ff47b722de63f58bec79e448f9d", "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/250d1bf45f80d15594fb6b316df777d6d4c97ad1",
"reference": "f9a879a068c68ff47b722de63f58bec79e448f9d", "reference": "250d1bf45f80d15594fb6b316df777d6d4c97ad1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -277,7 +277,7 @@
"phpunit/phpunit": "4.*", "phpunit/phpunit": "4.*",
"scrutinizer/ocular": "~1.1" "scrutinizer/ocular": "~1.1"
}, },
"time": "2018-09-18T12:18:08+00:00", "time": "2018-12-24T17:21:44+00:00",
"bin": [ "bin": [
"bin/html-to-markdown" "bin/html-to-markdown"
], ],

11
vendor/league/html-to-markdown/CHANGELOG.md vendored
View File

@@ -4,6 +4,14 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
## [Unreleased][unreleased] ## [Unreleased][unreleased]
## [4.8.1] - 2018-12-24
### Added
- Added support for PHP 7.3
### Fixed
- Fixed paragraphs following tables (#165, #166)
- Fixed incorrect list item escaping (#168, #169)
## [4.8.0] - 2018-09-18 ## [4.8.0] - 2018-09-18
### Added ### Added
- Added support for email auto-linking - Added support for email auto-linking
@@ -235,7 +243,8 @@ not ideally set, so this releases fixes that. Moving forwards this should reduce
### Added ### Added
- Initial release - Initial release
[unreleased]: https://github.com/thephpleague/html-to-markdown/compare/4.8.0...master [unreleased]: https://github.com/thephpleague/html-to-markdown/compare/4.8.1...master
[4.8.1]: https://github.com/thephpleague/html-to-markdown/compare/4.8.0...4.8.1
[4.8.0]: https://github.com/thephpleague/html-to-markdown/compare/4.7.0...4.8.0 [4.8.0]: https://github.com/thephpleague/html-to-markdown/compare/4.7.0...4.8.0
[4.7.0]: https://github.com/thephpleague/html-to-markdown/compare/4.6.2...4.7.0 [4.7.0]: https://github.com/thephpleague/html-to-markdown/compare/4.6.2...4.7.0
[4.6.2]: https://github.com/thephpleague/html-to-markdown/compare/4.6.1...4.6.2 [4.6.2]: https://github.com/thephpleague/html-to-markdown/compare/4.6.1...4.6.2

8
vendor/league/html-to-markdown/src/Converter/DefaultConverter.php vendored
View File

@@ -37,7 +37,13 @@ class DefaultConverter implements ConverterInterface, ConfigurationAwareInterfac
return $element->getValue(); return $element->getValue();
} }
return html_entity_decode($element->getChildrenAsString()); $markdown = html_entity_decode($element->getChildrenAsString());
if ($element->getTagName() === 'table') {
$markdown .= "\n\n";
}
return $markdown;
} }
/** /**

3
vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php vendored
View File

@@ -35,10 +35,13 @@ class HardBreakConverter implements ConverterInterface, ConfigurationAwareInterf
$next_value = $next->getValue(); $next_value = $next->getValue();
if ($next_value) { if ($next_value) {
if (in_array(substr($next_value, 0, 2), array('- ', '* ', '+ '))) { if (in_array(substr($next_value, 0, 2), array('- ', '* ', '+ '))) {
$parent = $element->getParent();
if ($parent && $parent->getTagName() == 'li') {
$return .= '\\'; $return .= '\\';
} }
} }
} }
}
return $return; return $return;
} }