diff --git a/composer.json b/composer.json index 7ba1876..aa26ad0 100644 --- a/composer.json +++ b/composer.json @@ -20,6 +20,7 @@ "kanellov/slim-twig-flash": "^0.2.0", "phpmailer/phpmailer": "~6.0", "tuupola/slim-basic-auth": "^3.2" + }, "require-dev": { "phpunit/phpunit": ">=4.8 < 6.0" diff --git a/composer.lock b/composer.lock index f558af3..5a07240 100644 --- a/composer.lock +++ b/composer.lock @@ -1,7 +1,7 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], "content-hash": "39b38af13b004d514b8fa19e295ad0d9", @@ -39,25 +39,25 @@ }, { "name": "google/recaptcha", - "version": "1.2.1", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/google/recaptcha.git", - "reference": "e7add3be59211482ecdb942288f52da64a35f61a" + "reference": "98c4a6573b27e8b0990ea8789c74ea378795134c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/google/recaptcha/zipball/e7add3be59211482ecdb942288f52da64a35f61a", - "reference": "e7add3be59211482ecdb942288f52da64a35f61a", + "url": "https://api.github.com/repos/google/recaptcha/zipball/98c4a6573b27e8b0990ea8789c74ea378795134c", + "reference": "98c4a6573b27e8b0990ea8789c74ea378795134c", "shasum": "" }, "require": { "php": ">=5.5" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.2.20|^2.12", + "friendsofphp/php-cs-fixer": "^2.2.20|^2.15", "php-coveralls/php-coveralls": "^2.1", - "phpunit/phpunit": "^4.8.36|^5.7.27|^6.59|^7" + "phpunit/phpunit": "^4.8.36|^5.7.27|^6.59|^7.5.11" }, "type": "library", "extra": { @@ -82,7 +82,7 @@ "recaptcha", "spam" ], - "time": "2018-08-05T09:31:53+00:00" + "time": "2019-08-16T15:48:25+00:00" }, { "name": "kanellov/slim-twig-flash", @@ -141,16 +141,16 @@ }, { "name": "monolog/monolog", - "version": "1.24.0", + "version": "1.25.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266" + "reference": "70e65a5470a42cfec1a7da00d30edb6e617e8dcf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", - "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/70e65a5470a42cfec1a7da00d30edb6e617e8dcf", + "reference": "70e65a5470a42cfec1a7da00d30edb6e617e8dcf", "shasum": "" }, "require": { @@ -215,7 +215,7 @@ "logging", "psr-3" ], - "time": "2018-11-05T09:00:11+00:00" + "time": "2019-09-06T13:49:17+00:00" }, { "name": "nikic/fast-route", @@ -265,16 +265,16 @@ }, { "name": "phpmailer/phpmailer", - "version": "v6.0.6", + "version": "v6.1.1", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "8190d73eb5def11a43cfb020b7f36db65330698c" + "reference": "26bd96350b0b2fcbf0ef4e6f0f9cf3528302a9d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/8190d73eb5def11a43cfb020b7f36db65330698c", - "reference": "8190d73eb5def11a43cfb020b7f36db65330698c", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/26bd96350b0b2fcbf0ef4e6f0f9cf3528302a9d8", + "reference": "26bd96350b0b2fcbf0ef4e6f0f9cf3528302a9d8", "shasum": "" }, "require": { @@ -307,17 +307,17 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL-2.1" + "LGPL-2.1-only" ], "authors": [ - { - "name": "Jim Jagielski", - "email": "jimjag@gmail.com" - }, { "name": "Marcus Bointon", "email": "phpmailer@synchromedia.co.uk" }, + { + "name": "Jim Jagielski", + "email": "jimjag@gmail.com" + }, { "name": "Andy Prevost", "email": "codeworxtech@users.sourceforge.net" @@ -327,7 +327,7 @@ } ], "description": "PHPMailer is a full-featured email creation and transfer class for PHP", - "time": "2018-11-16T00:41:32+00:00" + "time": "2019-09-27T21:33:43+00:00" }, { "name": "pimple/pimple", @@ -430,16 +430,16 @@ }, { "name": "psr/http-factory", - "version": "1.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-factory.git", - "reference": "378bfe27931ecc54ff824a20d6f6bfc303bbd04c" + "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/378bfe27931ecc54ff824a20d6f6bfc303bbd04c", - "reference": "378bfe27931ecc54ff824a20d6f6bfc303bbd04c", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", "shasum": "" }, "require": { @@ -478,7 +478,7 @@ "request", "response" ], - "time": "2018-07-30T21:54:04+00:00" + "time": "2019-04-30T12:38:16+00:00" }, { "name": "psr/http-message", @@ -585,16 +585,16 @@ }, { "name": "psr/http-server-middleware", - "version": "1.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-server-middleware.git", - "reference": "ea17eb1fb2c8df6db919cc578451a8013c6a0ae5" + "reference": "2296f45510945530b9dceb8bcedb5cb84d40c5f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/ea17eb1fb2c8df6db919cc578451a8013c6a0ae5", - "reference": "ea17eb1fb2c8df6db919cc578451a8013c6a0ae5", + "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/2296f45510945530b9dceb8bcedb5cb84d40c5f5", + "reference": "2296f45510945530b9dceb8bcedb5cb84d40c5f5", "shasum": "" }, "require": { @@ -634,7 +634,7 @@ "request", "response" ], - "time": "2018-01-22T17:08:31+00:00" + "time": "2018-10-30T17:12:04+00:00" }, { "name": "psr/log", @@ -733,20 +733,23 @@ }, { "name": "slim/slim", - "version": "3.11.0", + "version": "3.12.2", "source": { "type": "git", "url": "https://github.com/slimphp/Slim.git", - "reference": "d378e70431e78ee92ee32ddde61ecc72edf5dc0a" + "reference": "200c6143f15baa477601879b64ab2326847aac0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slimphp/Slim/zipball/d378e70431e78ee92ee32ddde61ecc72edf5dc0a", - "reference": "d378e70431e78ee92ee32ddde61ecc72edf5dc0a", + "url": "https://api.github.com/repos/slimphp/Slim/zipball/200c6143f15baa477601879b64ab2326847aac0b", + "reference": "200c6143f15baa477601879b64ab2326847aac0b", "shasum": "" }, "require": { "container-interop/container-interop": "^1.2", + "ext-json": "*", + "ext-libxml": "*", + "ext-simplexml": "*", "nikic/fast-route": "^1.0", "php": ">=5.5.0", "pimple/pimple": "^3.0", @@ -771,25 +774,25 @@ "MIT" ], "authors": [ - { - "name": "Rob Allen", - "email": "rob@akrabat.com", - "homepage": "http://akrabat.com" - }, { "name": "Josh Lockhart", "email": "hello@joshlockhart.com", "homepage": "https://joshlockhart.com" }, - { - "name": "Gabriel Manricks", - "email": "gmanricks@me.com", - "homepage": "http://gabrielmanricks.com" - }, { "name": "Andrew Smith", "email": "a.smith@silentworks.co.uk", "homepage": "http://silentworks.co.uk" + }, + { + "name": "Rob Allen", + "email": "rob@akrabat.com", + "homepage": "http://akrabat.com" + }, + { + "name": "Gabriel Manricks", + "email": "gmanricks@me.com", + "homepage": "http://gabrielmanricks.com" } ], "description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs", @@ -800,26 +803,26 @@ "micro", "router" ], - "time": "2018-09-16T10:54:21+00:00" + "time": "2019-08-20T18:46:05+00:00" }, { "name": "slim/twig-view", - "version": "2.4.0", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/slimphp/Twig-View.git", - "reference": "78386c01a97f7870462b38fff759dad649da9efc" + "reference": "06ef39b58d60b11a9546893fd0b7fff2bd901798" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slimphp/Twig-View/zipball/78386c01a97f7870462b38fff759dad649da9efc", - "reference": "78386c01a97f7870462b38fff759dad649da9efc", + "url": "https://api.github.com/repos/slimphp/Twig-View/zipball/06ef39b58d60b11a9546893fd0b7fff2bd901798", + "reference": "06ef39b58d60b11a9546893fd0b7fff2bd901798", "shasum": "" }, "require": { "php": ">=5.5.0", "psr/http-message": "^1.0", - "twig/twig": "^1.18|^2.0" + "twig/twig": "^1.38|^2.7" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.7", @@ -851,20 +854,20 @@ "twig", "view" ], - "time": "2018-05-07T10:54:29+00:00" + "time": "2019-04-06T16:34:38+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.10.0", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "e3d826245268269cd66f8326bd8bc066687b4a19" + "reference": "550ebaac289296ce228a706d0867afc34687e3f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19", - "reference": "e3d826245268269cd66f8326bd8bc066687b4a19", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4", + "reference": "550ebaac289296ce228a706d0867afc34687e3f4", "shasum": "" }, "require": { @@ -876,7 +879,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-master": "1.12-dev" } }, "autoload": { @@ -892,13 +895,13 @@ "MIT" ], "authors": [ - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - }, { "name": "Gert de Pagter", "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony polyfill for ctype functions", @@ -909,20 +912,20 @@ "polyfill", "portable" ], - "time": "2018-08-06T14:22:27+00:00" + "time": "2019-08-06T08:03:45+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.10.0", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "c79c051f5b3a46be09205c73b80b346e4153e494" + "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494", - "reference": "c79c051f5b3a46be09205c73b80b346e4153e494", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17", + "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17", "shasum": "" }, "require": { @@ -934,7 +937,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-master": "1.12-dev" } }, "autoload": { @@ -968,7 +971,7 @@ "portable", "shim" ], - "time": "2018-09-21T13:07:52+00:00" + "time": "2019-08-06T08:03:45+00:00" }, { "name": "tuupola/callable-handler", @@ -1025,16 +1028,16 @@ }, { "name": "tuupola/http-factory", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/tuupola/http-factory.git", - "reference": "dd38c41facebdec20b5b4a120cd6380e30720ce8" + "reference": "5fbde4c65a10d09a85652684a6e569542265a749" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tuupola/http-factory/zipball/dd38c41facebdec20b5b4a120cd6380e30720ce8", - "reference": "dd38c41facebdec20b5b4a120cd6380e30720ce8", + "url": "https://api.github.com/repos/tuupola/http-factory/zipball/5fbde4c65a10d09a85652684a6e569542265a749", + "reference": "5fbde4c65a10d09a85652684a6e569542265a749", "shasum": "" }, "require": { @@ -1044,10 +1047,13 @@ "conflict": { "nyholm/psr7": "<1.0" }, + "provide": { + "psr/http-factory-implementation": "^1.0" + }, "require-dev": { "http-interop/http-factory-tests": "^0.5.0", "overtrue/phplint": "^1.0", - "phpunit/phpunit": "^6.5", + "phpunit/phpunit": "^6.0|^7.0", "squizlabs/php_codesniffer": "^3.0" }, "type": "library", @@ -1075,7 +1081,7 @@ "psr-17", "psr-7" ], - "time": "2018-10-12T09:32:20+00:00" + "time": "2019-08-07T07:10:58+00:00" }, { "name": "tuupola/slim-basic-auth", @@ -1136,32 +1142,32 @@ }, { "name": "twig/twig", - "version": "v2.5.0", + "version": "v2.12.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "6a5f676b77a90823c2d4eaf76137b771adf31323" + "reference": "ddd4134af9bfc6dba4eff7c8447444ecc45b9ee5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/6a5f676b77a90823c2d4eaf76137b771adf31323", - "reference": "6a5f676b77a90823c2d4eaf76137b771adf31323", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/ddd4134af9bfc6dba4eff7c8447444ecc45b9ee5", + "reference": "ddd4134af9bfc6dba4eff7c8447444ecc45b9ee5", "shasum": "" }, "require": { "php": "^7.0", "symfony/polyfill-ctype": "^1.8", - "symfony/polyfill-mbstring": "~1.0" + "symfony/polyfill-mbstring": "^1.3" }, "require-dev": { "psr/container": "^1.0", - "symfony/debug": "^2.7", - "symfony/phpunit-bridge": "^3.3" + "symfony/debug": "^3.4|^4.2", + "symfony/phpunit-bridge": "^4.4@dev|^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "2.12-dev" } }, "autoload": { @@ -1183,15 +1189,15 @@ "homepage": "http://fabien.potencier.org", "role": "Lead Developer" }, - { - "name": "Armin Ronacher", - "email": "armin.ronacher@active-4.com", - "role": "Project Founder" - }, { "name": "Twig Team", "homepage": "https://twig.symfony.com/contributors", "role": "Contributors" + }, + { + "name": "Armin Ronacher", + "email": "armin.ronacher@active-4.com", + "role": "Project Founder" } ], "description": "Twig, the flexible, fast, and secure template language for PHP", @@ -1199,33 +1205,35 @@ "keywords": [ "templating" ], - "time": "2018-07-13T07:18:09+00:00" + "time": "2019-10-17T07:34:53+00:00" } ], "packages-dev": [ { "name": "doctrine/instantiator", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda" + "reference": "a2c590166b2133a4633738648b6b064edae0814a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", - "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a", + "reference": "a2c590166b2133a4633738648b6b064edae0814a", "shasum": "" }, "require": { "php": "^7.1" }, "require-dev": { - "athletic/athletic": "~0.1.8", + "doctrine/coding-standard": "^6.0", "ext-pdo": "*", "ext-phar": "*", - "phpunit/phpunit": "^6.2.3", - "squizlabs/php_codesniffer": "^3.0.2" + "phpbench/phpbench": "^0.13", + "phpstan/phpstan-phpunit": "^0.11", + "phpstan/phpstan-shim": "^0.11", + "phpunit/phpunit": "^7.0" }, "type": "library", "extra": { @@ -1250,25 +1258,25 @@ } ], "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://github.com/doctrine/instantiator", + "homepage": "https://www.doctrine-project.org/projects/instantiator.html", "keywords": [ "constructor", "instantiate" ], - "time": "2017-07-22T11:58:36+00:00" + "time": "2019-03-17T17:37:11+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.8.1", + "version": "1.9.3", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8" + "reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8", - "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/007c053ae6f31bba39dfa19a7726f56e9763bbea", + "reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea", "shasum": "" }, "require": { @@ -1303,39 +1311,37 @@ "object", "object graph" ], - "time": "2018-06-11T23:09:50+00:00" + "time": "2019-08-09T12:45:53+00:00" }, { "name": "phpdocumentor/reflection-common", - "version": "1.0.1", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6" + "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", - "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a", + "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a", "shasum": "" }, "require": { - "php": ">=5.5" + "php": ">=7.1" }, "require-dev": { - "phpunit/phpunit": "^4.6" + "phpunit/phpunit": "~6" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src" - ] + "phpDocumentor\\Reflection\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1357,30 +1363,30 @@ "reflection", "static analysis" ], - "time": "2017-09-11T18:02:19+00:00" + "time": "2018-08-07T13:53:10+00:00" }, { "name": "phpdocumentor/reflection-docblock", - "version": "4.3.0", + "version": "4.3.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "94fd0001232e47129dd3504189fa1c7225010d08" + "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08", - "reference": "94fd0001232e47129dd3504189fa1c7225010d08", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/b83ff7cfcfee7827e1e78b637a5904fe6a96698e", + "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e", "shasum": "" }, "require": { "php": "^7.0", - "phpdocumentor/reflection-common": "^1.0.0", - "phpdocumentor/type-resolver": "^0.4.0", + "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0", + "phpdocumentor/type-resolver": "~0.4 || ^1.0.0", "webmozart/assert": "^1.0" }, "require-dev": { - "doctrine/instantiator": "~1.0.5", + "doctrine/instantiator": "^1.0.5", "mockery/mockery": "^1.0", "phpunit/phpunit": "^6.4" }, @@ -1408,41 +1414,40 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-11-30T07:14:17+00:00" + "time": "2019-09-12T14:27:41+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "0.4.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7" + "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7", - "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9", + "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0", - "phpdocumentor/reflection-common": "^1.0" + "php": "^7.1", + "phpdocumentor/reflection-common": "^2.0" }, "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^5.2||^4.8.24" + "ext-tokenizer": "^7.1", + "mockery/mockery": "~1", + "phpunit/phpunit": "^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.x-dev" } }, "autoload": { "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] + "phpDocumentor\\Reflection\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -1455,26 +1460,27 @@ "email": "me@mikevanriel.com" } ], - "time": "2017-07-14T14:27:02+00:00" + "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", + "time": "2019-08-22T18:11:29+00:00" }, { "name": "phpspec/prophecy", - "version": "1.8.0", + "version": "1.9.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06" + "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06", - "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/f6811d96d97bdf400077a0cc100ae56aa32b9203", + "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0", "sebastian/comparator": "^1.1|^2.0|^3.0", "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, @@ -1489,8 +1495,8 @@ } }, "autoload": { - "psr-0": { - "Prophecy\\": "src/" + "psr-4": { + "Prophecy\\": "src/Prophecy" } }, "notification-url": "https://packagist.org/downloads/", @@ -1518,7 +1524,7 @@ "spy", "stub" ], - "time": "2018-08-05T17:53:17+00:00" + "time": "2019-10-03T11:07:50+00:00" }, { "name": "phpunit/php-code-coverage", @@ -2425,16 +2431,16 @@ }, { "name": "symfony/yaml", - "version": "v4.1.8", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "fe87e3b24d15ec8948f0280ee867a65ca44fdbaa" + "reference": "41e16350a2a1c7383c4735aa2f9fce74cf3d1178" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/fe87e3b24d15ec8948f0280ee867a65ca44fdbaa", - "reference": "fe87e3b24d15ec8948f0280ee867a65ca44fdbaa", + "url": "https://api.github.com/repos/symfony/yaml/zipball/41e16350a2a1c7383c4735aa2f9fce74cf3d1178", + "reference": "41e16350a2a1c7383c4735aa2f9fce74cf3d1178", "shasum": "" }, "require": { @@ -2453,7 +2459,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.3-dev" } }, "autoload": { @@ -2480,28 +2486,28 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-11-11T19:51:29+00:00" + "time": "2019-09-11T15:41:19+00:00" }, { "name": "webmozart/assert", - "version": "1.3.0", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "0df1908962e7a3071564e857d86874dad1ef204a" + "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a", - "reference": "0df1908962e7a3071564e857d86874dad1ef204a", + "url": "https://api.github.com/repos/webmozart/assert/zipball/88e6d84706d09a236046d686bbea96f07b3a34f4", + "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "php": "^5.3.3 || ^7.0", + "symfony/polyfill-ctype": "^1.8" }, "require-dev": { - "phpunit/phpunit": "^4.6", - "sebastian/version": "^1.0.1" + "phpunit/phpunit": "^4.8.36 || ^7.5.13" }, "type": "library", "extra": { @@ -2530,7 +2536,7 @@ "check", "validate" ], - "time": "2018-01-29T19:49:41+00:00" + "time": "2019-08-24T08:43:50+00:00" } ], "aliases": [], diff --git a/data/charlas.json b/data/charlas.json new file mode 100644 index 0000000..402fa1b --- /dev/null +++ b/data/charlas.json @@ -0,0 +1,118 @@ +[ + { "categoria":"Plenarias", + "charlas": + [ + { "titulo":"", + "abstract":"", + "pdf":"", + "speaker":{"nombre":"Jairo Bochi","afiliacion":"Universidad Católica de Chile","web":"http://www.mat.uc.cl/~jairo.bochi/"} + }, + { "titulo":"", + "abstract":"", + "pdf":"", + "speaker":{"nombre":"Alicia Dickenstein", "afiliacion":"Universidad de Buenos Aires", "web":"http://mate.dm.uba.ar/~alidick/"} + }, + { "titulo":"", + "abstract":"", + "pdf":"", + "speaker":{"nombre":"Milton Jara", "afiliacion":"Instituto de Matemática Pura e Aplicada", "web":"https://impa.br/page-pessoas/milton-jara/" } + }, + { "titulo":"", + "abstract":"", + "pdf":"", + "speaker":{"nombre":"Antonio Montalbán", "afiliacion":"University of California, Berkeley","web":"https://math.berkeley.edu/~antonio/"} + }, + { "titulo":"", + "abstract":"", + "pdf":"", + "speaker":{"nombre":"Tatiana Toro","afiliacion":"University of Washington","web":"https://sites.math.washington.edu/~toro/"} + } + ] + }, + { "categoria":"Semiplenarias", + "charlas": + [ + { "titulo":"", + "abstract":"", + "pdf":"", + "speaker":{"nombre":"Eduardo Friedman","web":""} + }, + { "titulo":"", + "abstract":"", + "pdf":"", + "speaker":{"nombre":"Mauricio Velasco", "web":""} + }, + { "titulo":"", + "abstract":"", + "pdf":"", + "speaker":{"nombre":"Nicolás Andruskiewitsch", "web":""} + }, + { "titulo":"", + "abstract":"", + "pdf":"", + "speaker":{"nombre":"Andrea Rotnizky", "web":""} + }, + { "titulo":"", + "abstract":"", + "pdf":"", + "speaker":{"nombre":"Helena Nussensveig", "web":""} + }, + { "titulo":"", + "abstract":"", + "pdf":"", + "speaker":{"nombre":"Mónica Clapp", "web":""} + }, + { "titulo":"", + "abstract":"", + "pdf":"", + "speaker":{"nombre":"Gustavo Ponce", "web":""} + }, + { "titulo":"", + "abstract":"", + "pdf":"", + "speaker":{"nombre":"Daniel Smania", "web":""} + } + ] + }, + { "categoria":"Cursos", + "charlas": + [ + { "titulo":"", + "abstract":"", + "pdf":"", + "speaker":{"nombre":"Flavio Bonomo","web":""} + }, + { "titulo":"", + "abstract":"", + "pdf":"", + "speaker":{"nombre":"Sebastian Hurtado","web":"" } + }, + { "titulo":"", + "abstract":"", + "pdf":"", + "speaker":{"nombre":"Isabel Hubard","web":""} + }, + { "titulo":"", + "abstract":"", + "pdf":"", + "speaker":{"nombre":"Yaiza Canzani","web":""} + } + ] + }, + { "categoria":"Públicas", + "charlas": + [ + { "titulo":"", + "abstract":"", + "pdf":"", + "speaker":{"nombre":"Eduardo Saez de Cabezón","web":""} + }, + { "titulo":"", + "abstract":"", + "pdf":"", + "speaker":{"nombre":"Ingrid Daubechis","web":"" } + } + ] + } + +] \ No newline at end of file diff --git a/data/sesiones.json b/data/sesiones.json new file mode 100644 index 0000000..b770cab --- /dev/null +++ b/data/sesiones.json @@ -0,0 +1,164 @@ +[ + { + "titulo":"Set Theory and its Interactions", + "speakers":["Carlos Di Prisco", "Christina Brech"] + }, + { + "titulo":"Combinatoria algebraica de funciones simétricas, cuasisimétricas y sus generalizaciones", + "speakers":["Rafael S. González D'León", "Yannic Vargas Lozada"] + }, + { + "titulo":"Lógica y Computación", + "speakers":["Alexandre Miquel", "Martin Hyland"] + }, + { + "titulo":"Algebraic and categorical structures in geometry and topology", + "speakers":["Manuel Rivera", "Camilo Arias Abad"] + }, + { + "titulo":"Problemas inversos: desde la teoría a las aplicaciones", + "speakers":["Adriano Dr Cezaro", "Alberto Mercado", "Juan Pablo Agnelli"] + }, + { + "titulo":"Estadística Matemática", + "speakers":["Florencia Leonardi", "Pamela Llop", "Daniela Rodriguez"] + }, + { + "titulo":"Teorı́a de bordismo y acciones de grupos finitos", + "speakers":["Andrés Ángel", "Ana González de los Santos", "Rita Jiménez Rolland", "Carlos Segovia"] + }, + { + "titulo":"Ecuaciones de evolución no-lineales y su Dinámica", + "speakers":["Jaime Angulo Pava", "Diego Chamorro", "Claudio Muñoz"] + }, + { + "titulo":"Combinatoria", + "speakers":["Celina Miraglia Herrera de Figueiredo", "Flavia Bonomo", "Lucia Moura"] + }, + { + "titulo":"Análisis Numérico", + "speakers":["Gabriel Acosta", "Pedro Morin", "Rodolfo Rodríguez"] + }, + { + "titulo":"Análisis Funcional y Geometría", + "speakers":["Esteban Andruchow", "Pedro Massey", "Lázaro Recht"] + }, + { + "titulo":"Geometría, Mecánica, Control y sus interconexiones", + "speakers":["Viviana Alejandra Díaz","Edith Padrón Fernandez"] + }, + { + "titulo":"Cuerpos finitos y aplicaciones", + "speakers":["Daniel Panario","Luciane Quoos"] + }, + { + "titulo":"Teoría de códigos y temas afines", + "speakers":["Ricardo Podestá", "Claudio Qureshi"] + }, + { + "titulo":"Análisis no lineal en espacios de Banach", + "speakers":["Gerardo Botelho","Daniel Carando","Maite Fenández Unzueta"] + }, + { + "titulo":"Ecuaciones diferenciales y estructuras geométricas", + "speakers":["John Alexander Arredondo García","Ronaldo Alves García","Mikhail Malakhaltsev","Jesús Muciño Raymundo"] + }, + { + "titulo":"Análisis Armónico y Teoría geométrica de la medida", + "speakers":["Carlos Cabrelli","Jean Carlos Moraes"] + }, + { + "titulo":"Quantum symmetries", + "speakers":["César Galindo", "Julia Plavnik", "Leandro Vendramin"] + }, + { + "titulo":"Sistemas Dinámicos y Teoría Ergódica", + "speakers":["Jairo Bochi", "Katrin Gelfert", "Rafael Potrie"] + }, + { + "titulo":"Funciones especiales, polinomios ortogonales y teoría de aproximación", + "speakers":["Manuel Domínguez de la Iglesia", "Pablo Manuel Román"] + }, + { + "titulo":"Teoría algebraica de formas cuadráticas sobre anillos", + "speakers":["Hugo L. Mariano", "Alejandro Petrovich"] + }, + { + "titulo":"Lógica matemática", + "speakers":["Manuela Busaniche", "Marcelo Esteban Coniglio"] + }, + { + "titulo":"Operator Algebras", + "speakers":["Fernando Abadie", "Alcides Buss", "Damián Ferraro"] + }, + { + "titulo":"Teoría de Números", + "speakers":["María de los Ángeles Chara", "Guillermo Mantilla", "Amalia Pizarro"] + }, + { + "titulo":"Dinámica de grupos", + "speakers":["Juan Alonso", "Nancy Guelman", "Sebastián Hurtado","Cristóbal Rivas"] + + }, + { + "titulo":"Estructuras Geométricas", + "speakers":["Martin Bridgeman", "Richard Canary", "Matilde Martínez","Andrés Sambarino"] + }, + { + "titulo":"Educación matemática en la enseñanza superior", + "speakers":["Omar Gil", "Mario Ponce"] + }, + { + "titulo":"Functional Differential Equations and its Applications", + "speakers":["Pablo Amster", "Gonzalo Robledo"] + }, + { + "titulo":"Educación matemática", + "speakers":["Elizabeth Montoya Delgadillo", "Miguel Ribeiro"] + }, + { + "titulo":"Problemas Variacionales y Ecuaciones Diferenciales Parciales", + "speakers":["Judith Campos Cordero", "Duvan Henao Manrique", "Dora Cecilia Salazar Lozano"] + }, + { + "titulo":"Stochastic processes and applications", + "speakers":["Joaquín Fontbona", "Juan Carlos Pardo", "Daniel Remenik", "Víctor Rivero"] + }, + { + "titulo":"Large Stochastic systems", + "speakers":["Claudio Landim", "Pablo Ferrari"] + }, + { + "titulo":"Geometría Algebraica computacional", + "speakers":["Gregorio Malajovich", "Diego Armentano"] + }, + { + "titulo":"Análisis Wavelete y aplicaciones", + "speakers":["Victoria Vampa","Liliam Alvarez Díaz","María Teresa Martín"] + }, + { + "titulo":"Geometría Algebraica", + "speakers":["Álvaro Rittatore","Pedro Luis del Ángel R."] + }, + { + "titulo":"K-teoría", + "speakers":["Noé Bárcenas","Eugenia Ellis", "Emanuel Rodríguez Cirone"] + }, + { + "titulo":"Stochastic analysis and stochastic processes", + "speakers":["Paavo Salminen","Antoine Lejay", "Ernesto Mordecki"] + }, + { + "titulo":"Control and Stabilization for Partial Differential Equations", + "speakers":["Fágner D. Araruna","Eduardo Cerpa", "Luz de Teresa"] + }, + { + "titulo":"Geometría Diferencial", + "speakers":["Romina Arroyo","Vivial del Barco", "Silvio Reggiani"] + }, + { + "titulo":"Comunicación de las matemáticas en América Latina", + "speakers":["Javier Elizondo","Eduardo Sáenz de Cabezón"] + } + +] \ No newline at end of file diff --git a/public/archivos/convocatoria-premio-UMALCA-2020.pdf b/public/archivos/convocatoria-premio-UMALCA-2020.pdf new file mode 100644 index 0000000..0f55a8c Binary files /dev/null and b/public/archivos/convocatoria-premio-UMALCA-2020.pdf differ diff --git a/public/archivos/posters-UMALCA-2020.pdf b/public/archivos/posters-UMALCA-2020.pdf new file mode 100644 index 0000000..a2c7730 Binary files /dev/null and b/public/archivos/posters-UMALCA-2020.pdf differ diff --git a/public/img/convocatoria-ico.jpg b/public/img/convocatoria-ico.jpg new file mode 100644 index 0000000..d4d3145 Binary files /dev/null and b/public/img/convocatoria-ico.jpg differ diff --git a/public/img/llamado-posters-ico.png b/public/img/llamado-posters-ico.png new file mode 100644 index 0000000..e3b20ef Binary files /dev/null and b/public/img/llamado-posters-ico.png differ diff --git a/public/js/app.js b/public/js/app.js index 851b40f..3218c9c 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -11,8 +11,11 @@ function routeMenu(){ /*case "/committees": $("li#committees").addClass("active"); break;*/ - case "/plenaryspeakers": - $("li#speakers").addClass("active"); + case "/charlas": + $("li#charlas").addClass("active"); + break; + case "/sesiones": + $("li#sesiones").addClass("active"); break; case "/registrarse": $("li#registration").addClass("active"); diff --git a/public/style/style.css b/public/style/style.css index 9659ae7..4e7792b 100644 --- a/public/style/style.css +++ b/public/style/style.css @@ -20,11 +20,11 @@ p color:black; } -h1, h2, h3, h4, h5, h6 +/*h1, h2, h3, h4, h5, h6 { font: normal 179% 'century gothic', arial, sans-serif; color: #43423F; margin: 0 0 15px 0; - padding: 15px 0 5px 0;} + padding: 15px 0 5px 0;}*/ h1#welcome{ font-size:300%; @@ -36,11 +36,11 @@ h2 h3 { font: normal 125% 'century gothic', arial, sans-serif;} -h4, h5, h6 +/*h4, h5, h6 { margin: 0; padding: 0 0 5px 0; font: normal 120% arial, sans-serif; - color: #0AB6F6;} + color: #0AB6F6;}*/ h5, h6 { font: italic 95% arial, sans-serif; @@ -293,11 +293,11 @@ div.interest-links h4 a{ border:none; } -@media screen and (min-width: 1200px){ +/*@media screen and (min-width: 1200px){ .container{ width:970px; } -} +}*/ #site_content { /*width: 858px; @@ -544,3 +544,29 @@ ul.float-shortcuts a{ padding-top:15px; } } +.news .media a { + display: inline-block; + color:inherit; + text-decoration:none; + padding:5px; +} + +.news .media a:hover { + background-color: #808080; +} + +/*.media a:active { + background-color: black; +}*/ + +/*.meida a:visited { + background-color: #ccc; +}*/ + +.media img.media-object{ + max-width:40px; +} +.media .media-body{ + text-align: left; + color:black; +} \ No newline at end of file diff --git a/src/routes.php b/src/routes.php index 0e3d402..61d8ff9 100644 --- a/src/routes.php +++ b/src/routes.php @@ -50,17 +50,20 @@ $app->get('/informacion-practica', function (Request $request, Response $respons return $this->renderer->render($response, 'practicalinfo.html', $args); }); -$app->get('/plenaryspeakers', function (Request $request, Response $response, array $args) { - $this->logger->info("GDDWorkshop '/plenaryspeakers' route"); - try { - $speakers = $this->db->getSpeakers(); - } catch (Exception $e) { - $this->logger->debug("Submit register DB error: ".$e->getMessage()); - $this->flash->addMessageNow("Get Speakers", "DB error: ".$e->getMessage()); +$app->get('/charlas', function (Request $request, Response $response, array $args) { + $this->logger->info("GDDWorkshop '/charlas' route"); + $strcharlas = file_get_contents(__DIR__."/../data/charlas.json"); + $charlas = json_decode($strcharlas,true); + return $this->renderer->render($response, 'charlas.html', + ['charlas' => $charlas]); +}); - } - return $this->renderer->render($response, 'plenaryspeakers.html', - ['speakers' => $speakers]); +$app->get('/sesiones', function (Request $request, Response $response, array $args) { + $this->logger->info("GDDWorkshop '/sesiones' route"); + $strsesiones = file_get_contents(__DIR__."/../data/sesiones.json"); + $sesiones = json_decode($strsesiones,true); + //echo "
".var_export(array_chunk($sesiones,10,true),true)."
"; + return $this->renderer->render($response, 'sesiones.html', ["sesiones"=>array_chunk($sesiones,8,true)]); }); $app->get('/programa', function (Request $request, Response $response, array $args) { diff --git a/templates/charlas.html b/templates/charlas.html new file mode 100644 index 0000000..1900055 --- /dev/null +++ b/templates/charlas.html @@ -0,0 +1,40 @@ +{% extends "layout.html" %} + +{% block content %} +
+

Charlas

+
+
+
    + {% for categoria in charlas %} + {% set categoria = categoria.categoria %} +
  • {{categoria}}
    • + {% endfor %} +
+
+ {% for lista in charlas %} + {% set categoria = lista.categoria %} +
+ {% for charla in lista.charlas %} +
+
+ +
+
+

{{charla.titulo|default('Título: Próximamente')}}

+ {% if charla.speaker.web %}{% endif %} + {{" "~charla.speaker.nombre}}{{" - "~charla.speaker.afiliacion|default('')}} + {{ charla.speaker.web ? '':"" }} +

{{charla.abstract|default('Abstract')}}

+ +
+
+ {% endfor %} +
+ {% endfor %} +
+
+
+ +
+{% endblock %} diff --git a/templates/header.html b/templates/header.html index deec584..dca6692 100644 --- a/templates/header.html +++ b/templates/header.html @@ -36,7 +36,8 @@
  • Programa
    • -
  • Charlas plenarias
    • +
  • Charlas
    • +
  • Sesiones
  • Registro
  • Participantes
  • Información Práctica
    • diff --git a/templates/plenaryspeakers.html b/templates/plenaryspeakers.html deleted file mode 100644 index 8e30590..0000000 --- a/templates/plenaryspeakers.html +++ /dev/null @@ -1,23 +0,0 @@ -{% extends "layout.html" %} - -{% block content %} -
    -

    Plenary Speakers

    - - - -
    -{% endblock %} diff --git a/templates/sesiones.html b/templates/sesiones.html new file mode 100644 index 0000000..62812f9 --- /dev/null +++ b/templates/sesiones.html @@ -0,0 +1,37 @@ +{% extends "layout.html" %} + +{% block content %} +
    +

    Sesiones

    + +
    +
    + {% set count=0 %} + {% for pagina in sesiones %} +
    + {% for s in pagina %} + {% set count = count+1 %} +
    +
    +
    {{count}}
    +
    +
    +

    {{s.titulo}}

    + Speakers: {{s.speakers|join(', ')}} +
    +
    + {% endfor %} +
    + {% endfor %} +
    + + +
    +
    +{% endblock %} diff --git a/templates/sidebar.html b/templates/sidebar.html index c5f1f49..fc668d7 100644 --- a/templates/sidebar.html +++ b/templates/sidebar.html @@ -21,9 +21,32 @@
    -
    +

    Noticias

    +
    + +
    + convocatoria icono +
    +
    +

    Convocatoria a premio UMALCA 2020

    + Se invita a presentar candidaturas para el premio UMALCA 2020. +
    +     +
    +
    + +
    + convocatoria icono +
    +
    +

    Llamado a Posters

    + En el marco del CLAM2020 se realizarán dos sesiones de presentación de posters. A los interesados en participar se les invita a enviar sus propuestas. +
    +     +
    +