diff --git a/composer.lock b/composer.lock index 3d9528530..59bb0aa16 100644 --- a/composer.lock +++ b/composer.lock @@ -949,16 +949,16 @@ }, { "name": "erusev/parsedown", - "version": "1.6.1", + "version": "1.6.2", "source": { "type": "git", "url": "https://github.com/erusev/parsedown.git", - "reference": "20ff8bbb57205368b4b42d094642a3e52dac85fb" + "reference": "1bf24f7334fe16c88bf9d467863309ceaf285b01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown/zipball/20ff8bbb57205368b4b42d094642a3e52dac85fb", - "reference": "20ff8bbb57205368b4b42d094642a3e52dac85fb", + "url": "https://api.github.com/repos/erusev/parsedown/zipball/1bf24f7334fe16c88bf9d467863309ceaf285b01", + "reference": "1bf24f7334fe16c88bf9d467863309ceaf285b01", "shasum": "" }, "require": { @@ -987,20 +987,20 @@ "markdown", "parser" ], - "time": "2016-11-02T15:56:58+00:00" + "time": "2017-03-29T16:04:15+00:00" }, { "name": "ezyang/htmlpurifier", - "version": "v4.9.1", + "version": "v4.9.2", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "de82f9845f2a0f9f27abec67d6a4958427e6f5d6" + "reference": "6d50e5282afdfdfc3e0ff6d192aff56c5629b3d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/de82f9845f2a0f9f27abec67d6a4958427e6f5d6", - "reference": "de82f9845f2a0f9f27abec67d6a4958427e6f5d6", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/6d50e5282afdfdfc3e0ff6d192aff56c5629b3d4", + "reference": "6d50e5282afdfdfc3e0ff6d192aff56c5629b3d4", "shasum": "" }, "require": { @@ -1034,7 +1034,7 @@ "keywords": [ "html" ], - "time": "2017-03-08T08:22:36+00:00" + "time": "2017-03-13T06:30:53+00:00" }, { "name": "incenteev/composer-parameter-handler", @@ -1139,16 +1139,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": { @@ -1213,20 +1213,20 @@ "logging", "psr-3" ], - "time": "2016-11-26T00:15:39+00:00" + "time": "2017-03-13T07:08:03+00:00" }, { "name": "pagerfanta/pagerfanta", - "version": "v1.0.4", + "version": "v1.0.5", "source": { "type": "git", "url": "https://github.com/whiteoctober/Pagerfanta.git", - "reference": "f846c5e06bb66df659a688ea4734aab49de589d6" + "reference": "29aade64addfdfb12c05aabf160f09d1aea6b143" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/whiteoctober/Pagerfanta/zipball/f846c5e06bb66df659a688ea4734aab49de589d6", - "reference": "f846c5e06bb66df659a688ea4734aab49de589d6", + "url": "https://api.github.com/repos/whiteoctober/Pagerfanta/zipball/29aade64addfdfb12c05aabf160f09d1aea6b143", + "reference": "29aade64addfdfb12c05aabf160f09d1aea6b143", "shasum": "" }, "require": { @@ -1240,6 +1240,7 @@ "mandango/mandango": "~1.0@dev", "mandango/mondator": "~1.0@dev", "phpunit/phpunit": "~4 | ~5", + "propel/propel": "~2.0@dev", "propel/propel1": "~1.6", "ruflin/elastica": "~1.3", "solarium/solarium": "~3.1" @@ -1249,6 +1250,7 @@ "doctrine/orm": "To use the DoctrineORMAdapter.", "doctrine/phpcr-odm": "To use the DoctrineODMPhpcrAdapter. >= 1.1.0", "mandango/mandango": "To use the MandangoAdapter.", + "propel/propel": "To use the Propel2Adapter", "propel/propel1": "To use the PropelAdapter", "solarium/solarium": "To use the SolariumAdapter." }, @@ -1280,20 +1282,20 @@ "paginator", "paging" ], - "time": "2016-11-28T09:17:04+00:00" + "time": "2017-03-20T13:46:15+00:00" }, { "name": "paragonie/random_compat", - "version": "v2.0.9", + "version": "v2.0.10", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "6968531206671f94377b01dc7888d5d1b858a01b" + "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/6968531206671f94377b01dc7888d5d1b858a01b", - "reference": "6968531206671f94377b01dc7888d5d1b858a01b", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/634bae8e911eefa89c1abfbf1b66da679ac8f54d", + "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d", "shasum": "" }, "require": { @@ -1328,7 +1330,7 @@ "pseudorandom", "random" ], - "time": "2017-03-03T20:43:42+00:00" + "time": "2017-03-13T16:27:32+00:00" }, { "name": "psr/cache", @@ -1425,16 +1427,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": { @@ -1473,20 +1475,20 @@ "configuration", "distribution" ], - "time": "2017-01-10T14:58:45+00:00" + "time": "2017-04-23T22:28:23+00:00" }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.23", + "version": "v3.0.25", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "d3601fd5709168ace7a1ca6eefa2619a1632b7f7" + "reference": "472b339cf0c82f3a033b29f85d9d9cada3cd1a9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/d3601fd5709168ace7a1ca6eefa2619a1632b7f7", - "reference": "d3601fd5709168ace7a1ca6eefa2619a1632b7f7", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/472b339cf0c82f3a033b29f85d9d9cada3cd1a9c", + "reference": "472b339cf0c82f3a033b29f85d9d9cada3cd1a9c", "shasum": "" }, "require": { @@ -1543,7 +1545,7 @@ "annotations", "controllers" ], - "time": "2017-03-02T20:17:28+00:00" + "time": "2017-03-21T23:34:44+00:00" }, { "name": "sensiolabs/security-checker", @@ -1592,16 +1594,16 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v5.4.6", + "version": "v5.4.8", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e" + "reference": "9a06dc570a0367850280eefd3f1dc2da45aef517" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e", - "reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/9a06dc570a0367850280eefd3f1dc2da45aef517", + "reference": "9a06dc570a0367850280eefd3f1dc2da45aef517", "shasum": "" }, "require": { @@ -1642,20 +1644,20 @@ "mail", "mailer" ], - "time": "2017-02-13T07:52:53+00:00" + "time": "2017-05-01T15:54:03+00:00" }, { "name": "symfony/monolog-bundle", - "version": "v3.0.3", + "version": "v3.1.0", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bundle.git", - "reference": "ebce76a39a65495a66c34eb1574cc4b9e35a4e64" + "reference": "6f96c7dbb6b2ef70b307a1a6f897153cbca3da47" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/ebce76a39a65495a66c34eb1574cc4b9e35a4e64", - "reference": "ebce76a39a65495a66c34eb1574cc4b9e35a4e64", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/6f96c7dbb6b2ef70b307a1a6f897153cbca3da47", + "reference": "6f96c7dbb6b2ef70b307a1a6f897153cbca3da47", "shasum": "" }, "require": { @@ -1702,7 +1704,7 @@ "log", "logging" ], - "time": "2017-01-10T20:01:51+00:00" + "time": "2017-03-26T11:55:59+00:00" }, { "name": "symfony/polyfill-apcu", @@ -2043,16 +2045,16 @@ }, { "name": "symfony/swiftmailer-bundle", - "version": "v2.5.3", + "version": "v2.5.4", "source": { "type": "git", "url": "https://github.com/symfony/swiftmailer-bundle.git", - "reference": "b59a70d03b948e29d070b6c4416b4a03af4748ec" + "reference": "8ab32ce31a7156621fb92e0466586186beb89759" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/b59a70d03b948e29d070b6c4416b4a03af4748ec", - "reference": "b59a70d03b948e29d070b6c4416b4a03af4748ec", + "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/8ab32ce31a7156621fb92e0466586186beb89759", + "reference": "8ab32ce31a7156621fb92e0466586186beb89759", "shasum": "" }, "require": { @@ -2098,20 +2100,20 @@ ], "description": "Symfony SwiftmailerBundle", "homepage": "http://symfony.com", - "time": "2017-03-02T16:47:57+00:00" + "time": "2017-03-21T21:47:36+00:00" }, { "name": "symfony/symfony", - "version": "v3.2.5", + "version": "v3.2.8", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "463b6558cef064b8472779e79fc49a48af7b94d1" + "reference": "85959c2abbe4d2f050f950f39c9c3cf83819f3df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/463b6558cef064b8472779e79fc49a48af7b94d1", - "reference": "463b6558cef064b8472779e79fc49a48af7b94d1", + "url": "https://api.github.com/repos/symfony/symfony/zipball/85959c2abbe4d2f050f950f39c9c3cf83819f3df", + "reference": "85959c2abbe4d2f050f950f39c9c3cf83819f3df", "shasum": "" }, "require": { @@ -2242,7 +2244,7 @@ "keywords": [ "framework" ], - "time": "2017-03-09T02:03:55+00:00" + "time": "2017-05-01T17:47:03+00:00" }, { "name": "twig/extensions", @@ -2298,16 +2300,16 @@ }, { "name": "twig/twig", - "version": "v1.32.0", + "version": "v1.33.2", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "9935b662e24d6e634da88901ab534cc12e8c728f" + "reference": "dd6ca96227917e1e85b41c7c3cc6507b411e0927" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/9935b662e24d6e634da88901ab534cc12e8c728f", - "reference": "9935b662e24d6e634da88901ab534cc12e8c728f", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/dd6ca96227917e1e85b41c7c3cc6507b411e0927", + "reference": "dd6ca96227917e1e85b41c7c3cc6507b411e0927", "shasum": "" }, "require": { @@ -2316,12 +2318,12 @@ "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": "1.33-dev" } }, "autoload": { @@ -2356,7 +2358,7 @@ "keywords": [ "templating" ], - "time": "2017-02-27T00:07:03+00:00" + "time": "2017-04-20T17:39:48+00:00" }, { "name": "white-october/pagerfanta-bundle", @@ -2414,16 +2416,16 @@ "packages-dev": [ { "name": "dama/doctrine-test-bundle", - "version": "v1.0.12", + "version": "v1.0.13", "source": { "type": "git", "url": "https://github.com/dmaicher/doctrine-test-bundle.git", - "reference": "638865b9bfd1c3d726761421814fe140500f5a58" + "reference": "3faa4f23b27b031f5416b3ecc2d6330a752fe32f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dmaicher/doctrine-test-bundle/zipball/638865b9bfd1c3d726761421814fe140500f5a58", - "reference": "638865b9bfd1c3d726761421814fe140500f5a58", + "url": "https://api.github.com/repos/dmaicher/doctrine-test-bundle/zipball/3faa4f23b27b031f5416b3ecc2d6330a752fe32f", + "reference": "3faa4f23b27b031f5416b3ecc2d6330a752fe32f", "shasum": "" }, "require": { @@ -2464,53 +2466,63 @@ "symfony 2", "tests" ], - "time": "2017-05-03T07:24:19+00:00" + "time": "2017-05-09T12:12:32+00:00" }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.1.1", + "version": "v2.2.3", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "e0e33ce4eaf59ba77ead9ce45256692aa29ecb38" + "reference": "8f33cf3da0da94b67b9cd696b2b9dda81c928f72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/e0e33ce4eaf59ba77ead9ce45256692aa29ecb38", - "reference": "e0e33ce4eaf59ba77ead9ce45256692aa29ecb38", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/8f33cf3da0da94b67b9cd696b2b9dda81c928f72", + "reference": "8f33cf3da0da94b67b9cd696b2b9dda81c928f72", "shasum": "" }, "require": { + "doctrine/annotations": "^1.2", "ext-tokenizer": "*", "php": "^5.3.6 || >=7.0 <7.2", - "sebastian/diff": "^1.1", - "symfony/console": "^2.3 || ^3.0", + "sebastian/diff": "^1.4", + "symfony/console": "^2.4 || ^3.0", "symfony/event-dispatcher": "^2.1 || ^3.0", "symfony/filesystem": "^2.4 || ^3.0", "symfony/finder": "^2.2 || ^3.0", + "symfony/options-resolver": "^2.6 || ^3.0", "symfony/polyfill-php54": "^1.0", "symfony/polyfill-php55": "^1.3", + "symfony/polyfill-php70": "^1.0", "symfony/polyfill-xml": "^1.3", "symfony/process": "^2.3 || ^3.0", "symfony/stopwatch": "^2.5 || ^3.0" }, "conflict": { - "hhvm": "<3.9" + "hhvm": "<3.18" }, "require-dev": { "gecko-packages/gecko-php-unit": "^2.0", "justinrainbow/json-schema": "^5.0", - "phpunit/phpunit": "^4.5|^5", + "phpunit/phpunit": "^4.5 || ^5.0", "satooshi/php-coveralls": "^1.0", - "symfony/phpunit-bridge": "^3.2" + "symfony/phpunit-bridge": "^3.2.2" }, "suggest": { - "ext-xml": "For better performance." + "ext-mbstring": "For handling non-UTF8 characters in cache signature.", + "ext-xml": "For better performance.", + "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." }, "bin": [ "php-cs-fixer" ], "type": "application", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, "autoload": { "psr-4": { "PhpCsFixer\\": "src/" @@ -2531,7 +2543,7 @@ } ], "description": "A tool to automatically fix PHP code style", - "time": "2017-03-03T08:03:57+00:00" + "time": "2017-04-25T20:39:28+00:00" }, { "name": "ircmaxell/password-compat", @@ -3534,16 +3546,16 @@ }, { "name": "sensio/generator-bundle", - "version": "v3.1.3", + "version": "v3.1.4", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", - "reference": "c76c7833ed5ffe0f5aeef15e13939ddb59a684eb" + "reference": "37f9f4e165b033fb76cc2320838321cc57140e65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/c76c7833ed5ffe0f5aeef15e13939ddb59a684eb", - "reference": "c76c7833ed5ffe0f5aeef15e13939ddb59a684eb", + "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/37f9f4e165b033fb76cc2320838321cc57140e65", + "reference": "37f9f4e165b033fb76cc2320838321cc57140e65", "shasum": "" }, "require": { @@ -3555,7 +3567,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": { @@ -3582,20 +3596,20 @@ } ], "description": "This bundle generates code for you", - "time": "2017-03-03T15:22:50+00:00" + "time": "2017-03-15T01:02:10+00:00" }, { "name": "symfony/phpunit-bridge", - "version": "v3.2.5", + "version": "v3.2.8", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "6de70e232e8b60e4247ea49d6d51b04a943c4972" + "reference": "00916603c524b8048906de460b7ea0dfa1651281" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/6de70e232e8b60e4247ea49d6d51b04a943c4972", - "reference": "6de70e232e8b60e4247ea49d6d51b04a943c4972", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/00916603c524b8048906de460b7ea0dfa1651281", + "reference": "00916603c524b8048906de460b7ea0dfa1651281", "shasum": "" }, "require": { @@ -3644,7 +3658,7 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2017-03-06T16:08:22+00:00" + "time": "2017-04-12T14:13:17+00:00" }, { "name": "symfony/polyfill-php54", diff --git a/web/app_dev.php b/web/app_dev.php index 73798fc46..bae57f734 100644 --- a/web/app_dev.php +++ b/web/app_dev.php @@ -27,7 +27,7 @@ // something more sophisticated. if (isset($_SERVER['HTTP_CLIENT_IP']) || isset($_SERVER['HTTP_X_FORWARDED_FOR']) - || !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1']) || php_sapi_name() === 'cli-server') + || !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1']) || PHP_SAPI === 'cli-server') ) { header('HTTP/1.0 403 Forbidden'); exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');