self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

composer update

Browse Source
This commit is contained in:
Laurent Cozic 2017-05-06 15:35:38 +01:00
parent 1d6a6c5134
commit 3de9e01c18
4 changed files with 157 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

216
composer.lock generated
View File

@ -7,6 +7,65 @@
"hash": "eee8ce5d0dacb47864d01d2e948df689",
"content-hash": "b802a93b011d1b9776a3c2f36989e307",
"packages": [
{
"name": "composer/ca-bundle",
"version": "1.0.7",
"source": {
"type": "git",
"url": "https://github.com/composer/ca-bundle.git",
"reference": "b17e6153cb7f33c7e44eb59578dc12eee5dc8e12"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/b17e6153cb7f33c7e44eb59578dc12eee5dc8e12",
"reference": "b17e6153cb7f33c7e44eb59578dc12eee5dc8e12",
"shasum": ""
},
"require": {
"ext-openssl": "*",
"ext-pcre": "*",
"php": "^5.3.2 || ^7.0"
},
"require-dev": {
"phpunit/phpunit": "^4.5",
"psr/log": "^1.0",
"symfony/process": "^2.5 || ^3.0"
},
"suggest": {
"symfony/process": "This is necessary to reliably check whether openssl_x509_parse is vulnerable on older php versions, but can be ignored on PHP 5.5.6+"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"autoload": {
"psr-4": {
"Composer\\CaBundle\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Jordi Boggiano",
"email": "j.boggiano@seld.be",
"homepage": "http://seld.be"
}
],
"description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.",
"keywords": [
"cabundle",
"cacert",
"certificate",
"ssl",
"tls"
],
"time": "2017-03-06 11:59:08"
},
{
"name": "doctrine/annotations",
"version": "v1.4.0",
@ -778,16 +837,16 @@
},
{
"name": "illuminate/container",
"version": "v5.4.13",
"version": "v5.4.19",
"source": {
"type": "git",
"url": "https://github.com/illuminate/container.git",
"reference": "ccbfa2c69369a11b419d071ad11147b59eb9f052"
"reference": "50aa19491d478edd907d1f67e0928944e8b2dcb5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/container/zipball/ccbfa2c69369a11b419d071ad11147b59eb9f052",
"reference": "ccbfa2c69369a11b419d071ad11147b59eb9f052",
"url": "https://api.github.com/repos/illuminate/container/zipball/50aa19491d478edd907d1f67e0928944e8b2dcb5",
"reference": "50aa19491d478edd907d1f67e0928944e8b2dcb5",
"shasum": ""
},
"require": {
@ -817,20 +876,20 @@
],
"description": "The Illuminate Container package.",
"homepage": "https://laravel.com",
"time": "2017-01-28 17:55:54"
"time": "2017-04-16 13:32:45"
},
{
"name": "illuminate/contracts",
"version": "v5.4.13",
"version": "v5.4.19",
"source": {
"type": "git",
"url": "https://github.com/illuminate/contracts.git",
"reference": "dd256891c80fd94a58ab83d7989d6da2f50e30ea"
"reference": "ab2825726bee46a67c8cc66789852189dbef74a9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/contracts/zipball/dd256891c80fd94a58ab83d7989d6da2f50e30ea",
"reference": "dd256891c80fd94a58ab83d7989d6da2f50e30ea",
"url": "https://api.github.com/repos/illuminate/contracts/zipball/ab2825726bee46a67c8cc66789852189dbef74a9",
"reference": "ab2825726bee46a67c8cc66789852189dbef74a9",
"shasum": ""
},
"require": {
@ -859,20 +918,20 @@
],
"description": "The Illuminate Contracts package.",
"homepage": "https://laravel.com",
"time": "2017-02-21 14:21:59"
"time": "2017-03-29 13:17:47"
},
{
"name": "illuminate/database",
"version": "v5.4.13",
"version": "v5.4.19",
"source": {
"type": "git",
"url": "https://github.com/illuminate/database.git",
"reference": "607d5e1c8e2ecc61d312a455a5e93d6793f694df"
"reference": "890564c6b84bcb2b45d41d3da072fabf422c07f5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/database/zipball/607d5e1c8e2ecc61d312a455a5e93d6793f694df",
"reference": "607d5e1c8e2ecc61d312a455a5e93d6793f694df",
"url": "https://api.github.com/repos/illuminate/database/zipball/890564c6b84bcb2b45d41d3da072fabf422c07f5",
"reference": "890564c6b84bcb2b45d41d3da072fabf422c07f5",
"shasum": ""
},
"require": {
@ -919,20 +978,20 @@
"orm",
"sql"
],
"time": "2017-02-22 14:16:49"
"time": "2017-04-11 22:53:18"
},
{
"name": "illuminate/support",
"version": "v5.4.13",
"version": "v5.4.19",
"source": {
"type": "git",
"url": "https://github.com/illuminate/support.git",
"reference": "904f63003fd67ede2ec3be018b322d1c29415465"
"reference": "b8cb37e15331c59da51c8ee5838038baa22d7955"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/support/zipball/904f63003fd67ede2ec3be018b322d1c29415465",
"reference": "904f63003fd67ede2ec3be018b322d1c29415465",
"url": "https://api.github.com/repos/illuminate/support/zipball/b8cb37e15331c59da51c8ee5838038baa22d7955",
"reference": "b8cb37e15331c59da51c8ee5838038baa22d7955",
"shasum": ""
},
"require": {
@ -976,7 +1035,7 @@
],
"description": "The Illuminate Support package.",
"homepage": "https://laravel.com",
"time": "2017-02-15 19:29:24"
"time": "2017-04-09 14:34:57"
},
{
"name": "incenteev/composer-parameter-handler",
@ -1081,16 +1140,16 @@
},
{
"name": "monolog/monolog",
"version": "1.22.0",
"version": "1.22.1",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
"reference": "bad29cb8d18ab0315e6c477751418a82c850d558"
"reference": "1e044bc4b34e91743943479f1be7a1d5eb93add0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558",
"reference": "bad29cb8d18ab0315e6c477751418a82c850d558",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/1e044bc4b34e91743943479f1be7a1d5eb93add0",
"reference": "1e044bc4b34e91743943479f1be7a1d5eb93add0",
"shasum": ""
},
"require": {
@ -1155,7 +1214,7 @@
"logging",
"psr-3"
],
"time": "2016-11-26 00:15:39"
"time": "2017-03-13 07:08:03"
},
{
"name": "nesbot/carbon",
@ -1212,16 +1271,16 @@
},
{
"name": "paragonie/random_compat",
"version": "v2.0.7",
"version": "v2.0.10",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
"reference": "b5ea1ef3d8ff10c307ba8c5945c2f134e503278f"
"reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/b5ea1ef3d8ff10c307ba8c5945c2f134e503278f",
"reference": "b5ea1ef3d8ff10c307ba8c5945c2f134e503278f",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/634bae8e911eefa89c1abfbf1b66da679ac8f54d",
"reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d",
"shasum": ""
},
"require": {
@ -1256,7 +1315,7 @@
"pseudorandom",
"random"
],
"time": "2017-02-27 17:11:23"
"time": "2017-03-13 16:27:32"
},
{
"name": "psr/cache",
@ -1353,16 +1412,16 @@
},
{
"name": "sensio/distribution-bundle",
"version": "v5.0.18",
"version": "v5.0.19",
"source": {
"type": "git",
"url": "https://github.com/sensiolabs/SensioDistributionBundle.git",
"reference": "17846680901003d26d823c2e3ac9228702837916"
"reference": "654c4fa3d11448c8005400a244987896243a990a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/17846680901003d26d823c2e3ac9228702837916",
"reference": "17846680901003d26d823c2e3ac9228702837916",
"url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/654c4fa3d11448c8005400a244987896243a990a",
"reference": "654c4fa3d11448c8005400a244987896243a990a",
"shasum": ""
},
"require": {
@ -1401,20 +1460,20 @@
"configuration",
"distribution"
],
"time": "2017-01-10 14:58:45"
"time": "2017-04-23 22:28:23"
},
{
"name": "sensio/framework-extra-bundle",
"version": "v3.0.22",
"version": "v3.0.25",
"source": {
"type": "git",
"url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git",
"reference": "1c66c2e3b8f17f06178142386aff5a9f8057a104"
"reference": "472b339cf0c82f3a033b29f85d9d9cada3cd1a9c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/1c66c2e3b8f17f06178142386aff5a9f8057a104",
"reference": "1c66c2e3b8f17f06178142386aff5a9f8057a104",
"url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/472b339cf0c82f3a033b29f85d9d9cada3cd1a9c",
"reference": "472b339cf0c82f3a033b29f85d9d9cada3cd1a9c",
"shasum": ""
},
"require": {
@ -1471,23 +1530,24 @@
"annotations",
"controllers"
],
"time": "2017-02-15 06:52:30"
"time": "2017-03-21 23:34:44"
},
{
"name": "sensiolabs/security-checker",
"version": "v4.0.1",
"version": "v4.0.4",
"source": {
"type": "git",
"url": "https://github.com/sensiolabs/security-checker.git",
"reference": "f2ce0035fc512287978510ca1740cd111d60f89f"
"reference": "9e69eddf3bc49d1ee5c7908564da3141796d4bbc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/f2ce0035fc512287978510ca1740cd111d60f89f",
"reference": "f2ce0035fc512287978510ca1740cd111d60f89f",
"url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/9e69eddf3bc49d1ee5c7908564da3141796d4bbc",
"reference": "9e69eddf3bc49d1ee5c7908564da3141796d4bbc",
"shasum": ""
},
"require": {
"composer/ca-bundle": "^1.0",
"symfony/console": "~2.7|~3.0"
},
"bin": [
@ -1515,20 +1575,20 @@
}
],
"description": "A security checker for your composer.lock",
"time": "2017-02-18 17:53:25"
"time": "2017-03-31 14:50:32"
},
{
"name": "swiftmailer/swiftmailer",
"version": "v5.4.6",
"version": "v5.4.7",
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
"reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e"
"reference": "56db4ed32a6d5c9824c3ecc1d2e538f663f47eb4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e",
"reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e",
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/56db4ed32a6d5c9824c3ecc1d2e538f663f47eb4",
"reference": "56db4ed32a6d5c9824c3ecc1d2e538f663f47eb4",
"shasum": ""
},
"require": {
@ -1569,7 +1629,7 @@
"mail",
"mailer"
],
"time": "2017-02-13 07:52:53"
"time": "2017-04-20 17:32:18"
},
{
"name": "symfony/monolog-bundle",
@ -1970,16 +2030,16 @@
},
{
"name": "symfony/swiftmailer-bundle",
"version": "v2.4.2",
"version": "v2.5.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/swiftmailer-bundle.git",
"reference": "ad751095576ce0c12a284e30e3fff80c91f27225"
"reference": "8ab32ce31a7156621fb92e0466586186beb89759"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/ad751095576ce0c12a284e30e3fff80c91f27225",
"reference": "ad751095576ce0c12a284e30e3fff80c91f27225",
"url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/8ab32ce31a7156621fb92e0466586186beb89759",
"reference": "8ab32ce31a7156621fb92e0466586186beb89759",
"shasum": ""
},
"require": {
@ -2001,7 +2061,7 @@
"type": "symfony-bundle",
"extra": {
"branch-alias": {
"dev-master": "2.4-dev"
"dev-master": "2.5-dev"
}
},
"autoload": {
@ -2025,7 +2085,7 @@
],
"description": "Symfony SwiftmailerBundle",
"homepage": "http://symfony.com",
"time": "2016-12-20 04:44:33"
"time": "2017-03-21 21:47:36"
},
{
"name": "symfony/symfony",
@ -2171,30 +2231,31 @@
},
{
"name": "twig/twig",
"version": "v1.32.0",
"version": "v2.3.2",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "9935b662e24d6e634da88901ab534cc12e8c728f"
"reference": "85e8372c451510165c04bf781295f9d922fa524b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/9935b662e24d6e634da88901ab534cc12e8c728f",
"reference": "9935b662e24d6e634da88901ab534cc12e8c728f",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/85e8372c451510165c04bf781295f9d922fa524b",
"reference": "85e8372c451510165c04bf781295f9d922fa524b",
"shasum": ""
},
"require": {
"php": ">=5.2.7"
"php": "^7.0",
"symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
"psr/container": "^1.0",
"symfony/debug": "~2.7",
"symfony/phpunit-bridge": "~3.2"
"symfony/phpunit-bridge": "~3.3@dev"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.32-dev"
"dev-master": "2.3-dev"
}
},
"autoload": {
@ -2229,7 +2290,7 @@
"keywords": [
"templating"
],
"time": "2017-02-27 00:07:03"
"time": "2017-04-21 00:13:02"
},
{
"name": "yetanotherape/diff-match-patch",
@ -2288,16 +2349,16 @@
"packages-dev": [
{
"name": "sensio/generator-bundle",
"version": "v3.1.2",
"version": "v3.1.4",
"source": {
"type": "git",
"url": "https://github.com/sensiolabs/SensioGeneratorBundle.git",
"reference": "ec278c0bd530edf155c4a00900577b5cb80f559e"
"reference": "37f9f4e165b033fb76cc2320838321cc57140e65"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/ec278c0bd530edf155c4a00900577b5cb80f559e",
"reference": "ec278c0bd530edf155c4a00900577b5cb80f559e",
"url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/37f9f4e165b033fb76cc2320838321cc57140e65",
"reference": "37f9f4e165b033fb76cc2320838321cc57140e65",
"shasum": ""
},
"require": {
@ -2309,7 +2370,9 @@
},
"require-dev": {
"doctrine/orm": "~2.4",
"symfony/doctrine-bridge": "~2.7|~3.0"
"symfony/doctrine-bridge": "~2.7|~3.0",
"symfony/filesystem": "~2.7|~3.0",
"symfony/phpunit-bridge": "^3.3"
},
"type": "symfony-bundle",
"extra": {
@ -2336,25 +2399,28 @@
}
],
"description": "This bundle generates code for you",
"time": "2016-12-05 16:01:19"
"time": "2017-03-15 01:02:10"
},
{
"name": "symfony/phpunit-bridge",
"version": "v3.2.4",
"version": "v3.2.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/phpunit-bridge.git",
"reference": "996374975357b569ea319ec1c98c5ca0f7dda610"
"reference": "00916603c524b8048906de460b7ea0dfa1651281"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/996374975357b569ea319ec1c98c5ca0f7dda610",
"reference": "996374975357b569ea319ec1c98c5ca0f7dda610",
"url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/00916603c524b8048906de460b7ea0dfa1651281",
"reference": "00916603c524b8048906de460b7ea0dfa1651281",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"conflict": {
"phpunit/phpunit": ">=6.0"
},
"suggest": {
"ext-zip": "Zip support is required when using bin/simple-phpunit",
"symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
@ -2395,7 +2461,7 @@
],
"description": "Symfony PHPUnit Bridge",
"homepage": "https://symfony.com",
"time": "2017-01-21 17:06:35"
"time": "2017-04-12 14:13:17"
}
],
"aliases": [],

5
joplin.sublime-project
View File

@ -8,7 +8,10 @@
"vendor",
"QtClient/build-JoplinQtClient-Visual_C_32_bits-Debug",
"QtClient/data/resources",
"app/data/uploads"
"app/data/uploads",
"ReactNativeClient/node_modules",
"ReactNativeClient/android",
"ReactNativeClient/ios",
],
"file_exclude_patterns": [
"*.pro.user",

2
src/AppBundle/Exception/AuthException.php
View File

@ -4,6 +4,6 @@ namespace AppBundle\Exception;
class AuthException extends BaseException {
protected $message = 'invalid authentication';
protected $message = 'authentication error';
}

15
web/app.php
View File

@ -14,7 +14,14 @@ $kernel->loadClassCache();
// When using the HttpCache, you need to call the method in your front controller instead of relying on the configuration parameter
//Request::enableHttpMethodParameterOverride();
$request = Request::createFromGlobals();
$response = $kernel->handle($request);
$response->send();
$kernel->terminate($request, $response);
try {
$request = Request::createFromGlobals();
$response = $kernel->handle($request);
$response->send();
$kernel->terminate($request, $response);
} catch(\Exception $e) {
header('HTTP/1.1 500 Internal Server Error');
echo $e->getMessage() . "\n";
echo $e->getTraceAsString();
}