diff --git a/.gitignore b/.gitignore index 4ce34862c..61964d6de 100644 --- a/.gitignore +++ b/.gitignore @@ -120,4 +120,5 @@ elections/css jobs/css software/css speaker_bureau/css -registration/css \ No newline at end of file +registration/css +/summit-trackchair-app/css/ diff --git a/composer.json b/composer.json index 4a62aef8b..bf64a9240 100644 --- a/composer.json +++ b/composer.json @@ -69,7 +69,7 @@ "sendgrid/sendgrid": "~5.5", "guzzlehttp/guzzle": "^6.3", "parse/php-sdk" : "1.1.*", - "fzaninotto/Faker": "^1.5", + "fzaninotto/faker": "^1.5", "phpoffice/phpexcel": "1.8.1", "google/apiclient": "^2.2", "symfony/process": "^3.1", @@ -90,7 +90,8 @@ "smarcet/silverstripe-cloudassets-swift": "dev-master", "markguinn/silverstripe-cloudassets": "dev-master", "php-opencloud/openstack": "dev-master", - "jumbojett/openid-connect-php": "dev-master" + "jumbojett/openid-connect-php": "dev-master", + "spatie/dropbox-api": "dev-master" }, "require-dev": { "phpunit/phpunit": "^7.0", diff --git a/composer.lock b/composer.lock index c337917f0..fee00b7db 100644 --- a/composer.lock +++ b/composer.lock @@ -4,32 +4,35 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "0ea3ecd2406159e8d34305c59238058d", + "content-hash": "01cab8b61c5421eb94278310aab8ddb0", "packages": [ { "name": "composer/installers", - "version": "v1.8.0", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/composer/installers.git", - "reference": "7d610d50aae61ae7ed6675e58efeabdf279bb5e3" + "reference": "8669edf5fa12f0bf279c08e3392017a47e44cfba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/installers/zipball/7d610d50aae61ae7ed6675e58efeabdf279bb5e3", - "reference": "7d610d50aae61ae7ed6675e58efeabdf279bb5e3", + "url": "https://api.github.com/repos/composer/installers/zipball/8669edf5fa12f0bf279c08e3392017a47e44cfba", + "reference": "8669edf5fa12f0bf279c08e3392017a47e44cfba", "shasum": "" }, "require": { - "composer-plugin-api": "^1.0" + "composer-plugin-api": "^1.0 || ^2.0" }, "replace": { "roundcube/plugin-installer": "*", "shama/baton": "*" }, "require-dev": { - "composer/composer": "1.0.*@dev", - "phpunit/phpunit": "^4.8.36" + "composer/composer": "1.6.* || 2.0.*@dev", + "composer/semver": "1.0.* || 2.0.*@dev", + "phpunit/phpunit": "^4.8.36", + "sebastian/comparator": "^1.2.4", + "symfony/process": "^2.3" }, "type": "composer-plugin", "extra": { @@ -128,7 +131,7 @@ "zend", "zikula" ], - "time": "2020-02-07T10:39:20+00:00" + "time": "2020-04-15T07:14:27+00:00" }, { "name": "doctrine/annotations", @@ -420,33 +423,38 @@ }, { "name": "doctrine/inflector", - "version": "1.3.x-dev", + "version": "1.4.x-dev", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1" + "reference": "26bfe72fe7f806404ecd6e9d1abdb4a4ac4b1d49" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/ec3a55242203ffa6a4b27c58176da97ff0a7aec1", - "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/26bfe72fe7f806404ecd6e9d1abdb4a4ac4b1d49", + "reference": "26bfe72fe7f806404ecd6e9d1abdb4a4ac4b1d49", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.2" }, "require-dev": { - "phpunit/phpunit": "^6.2" + "doctrine/coding-standard": "^7.0", + "phpstan/phpstan": "^0.11", + "phpstan/phpstan-phpunit": "^0.11", + "phpstan/phpstan-strict-rules": "^0.11", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { "psr-4": { - "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector" + "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector", + "Doctrine\\Inflector\\": "lib/Doctrine/Inflector" } }, "notification-url": "https://packagist.org/downloads/", @@ -475,15 +483,21 @@ "email": "schmittjoh@gmail.com" } ], - "description": "Common String Manipulations with regard to casing and singular/plural rules.", - "homepage": "http://www.doctrine-project.org", + "description": "PHP Doctrine Inflector is a small library that can perform string manipulations with regard to upper/lowercase and singular/plural forms of words.", + "homepage": "https://www.doctrine-project.org/projects/inflector.html", "keywords": [ "inflection", - "pluralize", - "singularize", - "string" + "inflector", + "lowercase", + "manipulation", + "php", + "plural", + "singular", + "strings", + "uppercase", + "words" ], - "time": "2019-10-30T19:59:35+00:00" + "time": "2020-05-14T21:04:48+00:00" }, { "name": "doctrine/lexer", @@ -647,23 +661,23 @@ }, { "name": "firebase/php-jwt", - "version": "v5.0.0", + "version": "v5.2.0", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "9984a4d3a32ae7673d6971ea00bae9d0a1abba0e" + "reference": "feb0e820b8436873675fd3aca04f3728eb2185cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/9984a4d3a32ae7673d6971ea00bae9d0a1abba0e", - "reference": "9984a4d3a32ae7673d6971ea00bae9d0a1abba0e", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/feb0e820b8436873675fd3aca04f3728eb2185cb", + "reference": "feb0e820b8436873675fd3aca04f3728eb2185cb", "shasum": "" }, "require": { "php": ">=5.3.0" }, "require-dev": { - "phpunit/phpunit": " 4.8.35" + "phpunit/phpunit": ">=4.8 <=9" }, "type": "library", "autoload": { @@ -689,7 +703,11 @@ ], "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.", "homepage": "https://github.com/firebase/php-jwt", - "time": "2017-06-27T22:17:23+00:00" + "keywords": [ + "jwt", + "php" + ], + "time": "2020-03-25T18:49:23+00:00" }, { "name": "fzaninotto/faker", @@ -697,12 +715,12 @@ "source": { "type": "git", "url": "https://github.com/fzaninotto/Faker.git", - "reference": "04c47e38dbc68d7261c88446598bbf509d37c77a" + "reference": "5337ce5261b393937bd7aaebb21020159756a152" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/04c47e38dbc68d7261c88446598bbf509d37c77a", - "reference": "04c47e38dbc68d7261c88446598bbf509d37c77a", + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/5337ce5261b393937bd7aaebb21020159756a152", + "reference": "5337ce5261b393937bd7aaebb21020159756a152", "shasum": "" }, "require": { @@ -739,7 +757,7 @@ "faker", "fixtures" ], - "time": "2019-12-31T10:44:52+00:00" + "time": "2020-05-11T08:39:57+00:00" }, { "name": "gettext/gettext", @@ -870,12 +888,12 @@ "source": { "type": "git", "url": "https://github.com/googleapis/google-api-php-client.git", - "reference": "afd3b55207efd691564c6e8e8b9e9bb39f6ce4f4" + "reference": "019012e9f69d59922cb8e6358160ff8c604e7a89" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/afd3b55207efd691564c6e8e8b9e9bb39f6ce4f4", - "reference": "afd3b55207efd691564c6e8e8b9e9bb39f6ce4f4", + "url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/019012e9f69d59922cb8e6358160ff8c604e7a89", + "reference": "019012e9f69d59922cb8e6358160ff8c604e7a89", "shasum": "" }, "require": { @@ -923,20 +941,20 @@ "keywords": [ "google" ], - "time": "2020-01-27T15:26:57+00:00" + "time": "2020-05-14T19:01:25+00:00" }, { "name": "google/apiclient-services", - "version": "v0.127", + "version": "v0.136", "source": { "type": "git", "url": "https://github.com/googleapis/google-api-php-client-services.git", - "reference": "19eacad739807e522891bf3f911ffab4a4c29869" + "reference": "e6fcc181136d28f6efa4b41f3434c97819b520e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/19eacad739807e522891bf3f911ffab4a4c29869", - "reference": "19eacad739807e522891bf3f911ffab4a4c29869", + "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/e6fcc181136d28f6efa4b41f3434c97819b520e6", + "reference": "e6fcc181136d28f6efa4b41f3434c97819b520e6", "shasum": "" }, "require": { @@ -960,20 +978,20 @@ "keywords": [ "google" ], - "time": "2020-02-17T00:24:19+00:00" + "time": "2020-05-16T00:25:19+00:00" }, { "name": "google/auth", - "version": "v1.7.1", + "version": "v1.9.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-auth-library-php.git", - "reference": "39e243a7d8320b1889ab8bb4cd6f98f7af83c582" + "reference": "af4abf63988b8c74f589bee1e69ba310d3e43c6c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/39e243a7d8320b1889ab8bb4cd6f98f7af83c582", - "reference": "39e243a7d8320b1889ab8bb4cd6f98f7af83c582", + "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/af4abf63988b8c74f589bee1e69ba310d3e43c6c", + "reference": "af4abf63988b8c74f589bee1e69ba310d3e43c6c", "shasum": "" }, "require": { @@ -985,12 +1003,12 @@ "psr/http-message": "^1.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^1.11", "guzzlehttp/promises": "0.1.1|^1.3", "kelvinmo/simplejwt": "^0.2.5", "phpseclib/phpseclib": "^2", "phpunit/phpunit": "^4.8.36|^5.7", - "sebastian/comparator": ">=1.2.3" + "sebastian/comparator": ">=1.2.3", + "squizlabs/php_codesniffer": "^3.5" }, "suggest": { "phpseclib/phpseclib": "May be used in place of OpenSSL for signing strings or for token management. Please require version ^2." @@ -1012,7 +1030,7 @@ "google", "oauth2" ], - "time": "2020-02-12T20:54:50+00:00" + "time": "2020-05-18T17:02:59+00:00" }, { "name": "google/recaptcha", @@ -1020,12 +1038,12 @@ "source": { "type": "git", "url": "https://github.com/google/recaptcha.git", - "reference": "2ccff6a4fde9a975b70975567c2793bdf72d3085" + "reference": "c209aad8e865fb2f4ad9869344a8af49a743aaec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/google/recaptcha/zipball/2ccff6a4fde9a975b70975567c2793bdf72d3085", - "reference": "2ccff6a4fde9a975b70975567c2793bdf72d3085", + "url": "https://api.github.com/repos/google/recaptcha/zipball/c209aad8e865fb2f4ad9869344a8af49a743aaec", + "reference": "c209aad8e865fb2f4ad9869344a8af49a743aaec", "shasum": "" }, "require": { @@ -1059,7 +1077,56 @@ "recaptcha", "spam" ], - "time": "2019-09-10T21:42:39+00:00" + "time": "2020-05-16T20:01:55+00:00" + }, + { + "name": "graham-campbell/guzzle-factory", + "version": "3.0.x-dev", + "source": { + "type": "git", + "url": "https://github.com/GrahamCampbell/Guzzle-Factory.git", + "reference": "817c45a2ba491d63d66b578f243e9d8d6f9b39a9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/GrahamCampbell/Guzzle-Factory/zipball/817c45a2ba491d63d66b578f243e9d8d6f9b39a9", + "reference": "817c45a2ba491d63d66b578f243e9d8d6f9b39a9", + "shasum": "" + }, + "require": { + "guzzlehttp/guzzle": "^6.2", + "php": "^7.0|^8.0" + }, + "require-dev": { + "graham-campbell/analyzer": "^2.4 || ^3.0", + "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.7" + }, + "type": "library", + "autoload": { + "psr-4": { + "GrahamCampbell\\GuzzleFactory\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "graham@alt-three.com" + } + ], + "description": "Provides A Simple Guzzle Factory With Good Defaults", + "keywords": [ + "Graham Campbell", + "GrahamCampbell", + "Guzzle", + "Guzzle Factory", + "Guzzle-Factory", + "http" + ], + "time": "2020-08-14T09:47:19+00:00" }, { "name": "guzzle/guzzle", @@ -1163,19 +1230,20 @@ "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "400cefd25a23a3098486bfb52685b5367a464171" + "reference": "c8162bee934111d42b1db4869c09fb58926074c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/400cefd25a23a3098486bfb52685b5367a464171", - "reference": "400cefd25a23a3098486bfb52685b5367a464171", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/c8162bee934111d42b1db4869c09fb58926074c7", + "reference": "c8162bee934111d42b1db4869c09fb58926074c7", "shasum": "" }, "require": { "ext-json": "*", "guzzlehttp/promises": "^1.0", "guzzlehttp/psr7": "^1.6.1", - "php": ">=5.5" + "php": ">=5.5", + "symfony/polyfill-intl-idn": "^1.11" }, "require-dev": { "ext-curl": "*", @@ -1183,7 +1251,6 @@ "psr/log": "^1.1" }, "suggest": { - "ext-intl": "Required for Internationalized Domain Name (IDN) support", "psr/log": "Required for using the Log middleware" }, "type": "library", @@ -1222,7 +1289,7 @@ "rest", "web service" ], - "time": "2019-12-30T04:52:42+00:00" + "time": "2020-05-19T12:55:02+00:00" }, { "name": "guzzlehttp/promises", @@ -1281,12 +1348,12 @@ "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "c73b502efd02beb2602500aa36793fb405e383ac" + "reference": "188cc82398f157483976ccf61bd04ee80afcf29c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/c73b502efd02beb2602500aa36793fb405e383ac", - "reference": "c73b502efd02beb2602500aa36793fb405e383ac", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/188cc82398f157483976ccf61bd04ee80afcf29c", + "reference": "188cc82398f157483976ccf61bd04ee80afcf29c", "shasum": "" }, "require": { @@ -1344,7 +1411,7 @@ "uri", "url" ], - "time": "2020-02-12T23:13:46+00:00" + "time": "2020-05-17T20:05:25+00:00" }, { "name": "icanboogie/inflector", @@ -1440,23 +1507,23 @@ }, { "name": "justinrainbow/json-schema", - "version": "5.x-dev", + "version": "5.2.9", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4" + "reference": "44c6787311242a979fa15c704327c20e7221a0e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/dcb6e1006bb5fd1e392b4daa68932880f37550d4", - "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/44c6787311242a979fa15c704327c20e7221a0e4", + "reference": "44c6787311242a979fa15c704327c20e7221a0e4", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "friendsofphp/php-cs-fixer": "~2.2.20", + "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1", "json-schema/json-schema-test-suite": "1.2.0", "phpunit/phpunit": "^4.8.35" }, @@ -1502,7 +1569,7 @@ "json", "schema" ], - "time": "2019-01-14T23:55:14+00:00" + "time": "2019-09-25T14:49:45+00:00" }, { "name": "knplabs/github-api", @@ -1743,12 +1810,12 @@ "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "fdef10febe89f73d8bb52f04e804248285f2da21" + "reference": "438b8983b7e58f6342377b8cf5b9ab1ee91d518f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fdef10febe89f73d8bb52f04e804248285f2da21", - "reference": "fdef10febe89f73d8bb52f04e804248285f2da21", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/438b8983b7e58f6342377b8cf5b9ab1ee91d518f", + "reference": "438b8983b7e58f6342377b8cf5b9ab1ee91d518f", "shasum": "" }, "require": { @@ -1763,11 +1830,11 @@ "doctrine/couchdb": "~1.0@dev", "elasticsearch/elasticsearch": "^6.0", "graylog2/gelf-php": "^1.4.2", - "jakub-onderka/php-parallel-lint": "^0.9", "php-amqplib/php-amqplib": "~2.4", "php-console/php-console": "^3.1.3", + "php-parallel-lint/php-parallel-lint": "^1.0", "phpspec/prophecy": "^1.6.1", - "phpunit/phpunit": "^8.3", + "phpunit/phpunit": "^8.5", "predis/predis": "^1.1", "rollbar/rollbar": "^1.3", "ruflin/elastica": ">=0.90 <3.0", @@ -1816,7 +1883,7 @@ "logging", "psr-3" ], - "time": "2020-02-14T17:18:16+00:00" + "time": "2020-05-15T12:00:09+00:00" }, { "name": "mtdowling/cron-expression", @@ -1919,12 +1986,12 @@ "source": { "type": "git", "url": "https://github.com/chartjs/Chart.js.git", - "reference": "7397a41fac0e9a57c969148eddc2805c8b249ee7" + "reference": "00f726b0eaeeaad177ded228a00cb4c4e0c9e529" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/chartjs/Chart.js/zipball/7397a41fac0e9a57c969148eddc2805c8b249ee7", - "reference": "7397a41fac0e9a57c969148eddc2805c8b249ee7", + "url": "https://api.github.com/repos/chartjs/Chart.js/zipball/00f726b0eaeeaad177ded228a00cb4c4e0c9e529", + "reference": "00f726b0eaeeaad177ded228a00cb4c4e0c9e529", "shasum": "" }, "require": { @@ -1952,7 +2019,7 @@ "JS", "chart" ], - "time": "2020-02-14T19:12:23+00:00" + "time": "2020-05-08T15:09:37+00:00" }, { "name": "openid/php-openid", @@ -1960,12 +2027,12 @@ "source": { "type": "git", "url": "https://github.com/openid/php-openid.git", - "reference": "5c7d903c765e302b031a8faf9ff6499f8bc4d19f" + "reference": "f68aae1136b15c8084ce2f5c06bc7f0cf2228682" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/openid/php-openid/zipball/5c7d903c765e302b031a8faf9ff6499f8bc4d19f", - "reference": "5c7d903c765e302b031a8faf9ff6499f8bc4d19f", + "url": "https://api.github.com/repos/openid/php-openid/zipball/f68aae1136b15c8084ce2f5c06bc7f0cf2228682", + "reference": "f68aae1136b15c8084ce2f5c06bc7f0cf2228682", "shasum": "" }, "require": { @@ -2001,7 +2068,7 @@ "auth", "yadis" ], - "time": "2020-01-17T15:59:41+00:00" + "time": "2020-04-23T00:48:41+00:00" }, { "name": "paragonie/random_compat", @@ -2295,12 +2362,12 @@ "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "40998159a0907cc523e1f2d1904d45765613a617" + "reference": "ceaffa8fa9fcd34d5c91c8053f113a4ad07cdd12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/40998159a0907cc523e1f2d1904d45765613a617", - "reference": "40998159a0907cc523e1f2d1904d45765613a617", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/ceaffa8fa9fcd34d5c91c8053f113a4ad07cdd12", + "reference": "ceaffa8fa9fcd34d5c91c8053f113a4ad07cdd12", "shasum": "" }, "require": { @@ -2379,7 +2446,7 @@ "x.509", "x509" ], - "time": "2020-02-04T12:15:04+00:00" + "time": "2020-05-11T04:52:20+00:00" }, { "name": "psr/cache", @@ -2483,12 +2550,12 @@ "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "5628725d0e4d687e29575eb41f9d5ee7de33a84c" + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/5628725d0e4d687e29575eb41f9d5ee7de33a84c", - "reference": "5628725d0e4d687e29575eb41f9d5ee7de33a84c", + "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", "shasum": "" }, "require": { @@ -2522,7 +2589,7 @@ "psr", "psr-3" ], - "time": "2019-11-12T16:45:05+00:00" + "time": "2020-03-23T09:12:05+00:00" }, { "name": "ralouphie/getallheaders", @@ -2680,16 +2747,16 @@ }, { "name": "sendgrid/php-http-client", - "version": "3.10.2", + "version": "3.10.6", "source": { "type": "git", "url": "https://github.com/sendgrid/php-http-client.git", - "reference": "a3891dfe1130014e46b59e3c76be0c1c9d4fd540" + "reference": "1c97ab5475b0aa98032ea3f89d7f12453469fc08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sendgrid/php-http-client/zipball/a3891dfe1130014e46b59e3c76be0c1c9d4fd540", - "reference": "a3891dfe1130014e46b59e3c76be0c1c9d4fd540", + "url": "https://api.github.com/repos/sendgrid/php-http-client/zipball/1c97ab5475b0aa98032ea3f89d7f12453469fc08", + "reference": "1c97ab5475b0aa98032ea3f89d7f12453469fc08", "shasum": "" }, "require": { @@ -2712,7 +2779,7 @@ "authors": [ { "name": "Matt Bernier", - "email": "dx@sendgrid.com" + "email": "mbernier@twilio.com" }, { "name": "Elmer Thomas", @@ -2728,7 +2795,7 @@ "rest", "sendgrid" ], - "time": "2020-01-22T20:51:56+00:00" + "time": "2020-04-29T19:42:26+00:00" }, { "name": "sendgrid/sendgrid", @@ -3284,6 +3351,63 @@ }, "time": "2020-02-08T21:11:03+00:00" }, + { + "name": "spatie/dropbox-api", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/spatie/dropbox-api.git", + "reference": "c294ce5ec69e16fb19879451e3a0944b7291f826" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/dropbox-api/zipball/c294ce5ec69e16fb19879451e3a0944b7291f826", + "reference": "c294ce5ec69e16fb19879451e3a0944b7291f826", + "shasum": "" + }, + "require": { + "graham-campbell/guzzle-factory": "^3.0||^4.0", + "guzzlehttp/guzzle": "^6.2||^7.0", + "php": "^7.1" + }, + "require-dev": { + "phpunit/phpunit": "^7.5.15|^8.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Spatie\\Dropbox\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Alex Vanderbist", + "email": "alex.vanderbist@gmail.com", + "homepage": "https://spatie.be", + "role": "Developer" + }, + { + "name": "Freek Van der Herten", + "email": "freek@spatie.be", + "homepage": "https://spatie.be", + "role": "Developer" + } + ], + "description": "A minimal implementation of Dropbox API v2", + "homepage": "https://github.com/spatie/dropbox-api", + "keywords": [ + "Dropbox-API", + "api", + "dropbox", + "spatie", + "v2" + ], + "time": "2020-09-25T08:07:36+00:00" + }, { "name": "symbiote/silverstripe-gridfieldextensions", "version": "2.1.0", @@ -3401,12 +3525,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38" + "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/fbdeaec0df06cf3d51c93de80c7eb76e271f5a38", - "reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9", + "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9", "shasum": "" }, "require": { @@ -3418,7 +3542,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.14-dev" + "dev-master": "1.17-dev" } }, "autoload": { @@ -3451,7 +3575,183 @@ "polyfill", "portable" ], - "time": "2020-01-13T11:15:53+00:00" + "time": "2020-05-12T16:14:59+00:00" + }, + { + "name": "symfony/polyfill-intl-idn", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-idn.git", + "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3bff59ea7047e925be6b7f2059d60af31bb46d6a", + "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/polyfill-mbstring": "^1.3", + "symfony/polyfill-php72": "^1.10" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.17-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Intl\\Idn\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Laurent Bassin", + "email": "laurent@bassin.info" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "idn", + "intl", + "polyfill", + "portable", + "shim" + ], + "time": "2020-05-12T16:47:27+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "fa79b11539418b02fc5e1897267673ba2c19419c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c", + "reference": "fa79b11539418b02fc5e1897267673ba2c19419c", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.17-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "time": "2020-05-12T16:47:27+00:00" + }, + { + "name": "symfony/polyfill-php72", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php72.git", + "reference": "f048e612a3905f34931127360bdd2def19a5e582" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/f048e612a3905f34931127360bdd2def19a5e582", + "reference": "f048e612a3905f34931127360bdd2def19a5e582", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.17-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php72\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2020-05-12T16:47:27+00:00" }, { "name": "symfony/process", @@ -3459,12 +3759,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "b03b02dcea26ba4c65c16a73bab4f00c186b13da" + "reference": "f5104c9dcbc2cfad45d01d5150c1da9836967271" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/b03b02dcea26ba4c65c16a73bab4f00c186b13da", - "reference": "b03b02dcea26ba4c65c16a73bab4f00c186b13da", + "url": "https://api.github.com/repos/symfony/process/zipball/f5104c9dcbc2cfad45d01d5150c1da9836967271", + "reference": "f5104c9dcbc2cfad45d01d5150c1da9836967271", "shasum": "" }, "require": { @@ -3500,7 +3800,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2020-02-04T08:04:52+00:00" + "time": "2020-04-12T14:33:46+00:00" }, { "name": "symfony/yaml", @@ -3508,12 +3808,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "bc63e15160866e8730a1f738541b194c401f72bf" + "reference": "7233ac2bfdde24d672f5305f2b3f6b5d741ef8eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/bc63e15160866e8730a1f738541b194c401f72bf", - "reference": "bc63e15160866e8730a1f738541b194c401f72bf", + "url": "https://api.github.com/repos/symfony/yaml/zipball/7233ac2bfdde24d672f5305f2b3f6b5d741ef8eb", + "reference": "7233ac2bfdde24d672f5305f2b3f6b5d741ef8eb", "shasum": "" }, "require": { @@ -3559,7 +3859,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2020-01-16T19:04:26+00:00" + "time": "2020-05-11T07:51:54+00:00" }, { "name": "tractorcow/silverstripe-autocomplete", @@ -4151,16 +4451,16 @@ }, { "name": "mockery/mockery", - "version": "dev-master", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "46fadaa0f5b8e4a290521a5340ada69701a70a20" + "reference": "f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/46fadaa0f5b8e4a290521a5340ada69701a70a20", - "reference": "46fadaa0f5b8e4a290521a5340ada69701a70a20", + "url": "https://api.github.com/repos/mockery/mockery/zipball/f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be", + "reference": "f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be", "shasum": "" }, "require": { @@ -4212,7 +4512,7 @@ "test double", "testing" ], - "time": "2020-01-16T09:16:38+00:00" + "time": "2019-12-26T09:49:15+00:00" }, { "name": "myclabs/deep-copy", @@ -4220,12 +4520,12 @@ "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef" + "reference": "a491d65139e2411c75704e871dd02bdddf5a4bdc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/b2c28789e80a97badd14145fda39b545d83ca3ef", - "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/a491d65139e2411c75704e871dd02bdddf5a4bdc", + "reference": "a491d65139e2411c75704e871dd02bdddf5a4bdc", "shasum": "" }, "require": { @@ -4260,31 +4560,27 @@ "object", "object graph" ], - "time": "2020-01-17T21:11:47+00:00" + "time": "2020-03-12T21:49:07+00:00" }, { "name": "phar-io/manifest", - "version": "dev-master", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/phar-io/manifest.git", - "reference": "3d94e3b6eb309e921a100a4992f72314299bb03f" + "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/3d94e3b6eb309e921a100a4992f72314299bb03f", - "reference": "3d94e3b6eb309e921a100a4992f72314299bb03f", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", + "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", "shasum": "" }, "require": { "ext-dom": "*", "ext-phar": "*", - "ext-xmlwriter": "*", "phar-io/version": "^2.0", - "php": "^7.2" - }, - "require-dev": { - "phpunit/phpunit": "^8.2" + "php": "^5.6 || ^7.0" }, "type": "library", "extra": { @@ -4319,7 +4615,7 @@ } ], "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "time": "2019-12-29T10:29:09+00:00" + "time": "2018-07-08T19:23:20+00:00" }, { "name": "phar-io/version", @@ -4374,20 +4670,17 @@ "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "b0843c8cbcc2dc5eda5158e583c7199a5e44c86d" + "reference": "985f414b55eca4296ffc99db960a97b3cc8fbcea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/b0843c8cbcc2dc5eda5158e583c7199a5e44c86d", - "reference": "b0843c8cbcc2dc5eda5158e583c7199a5e44c86d", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/985f414b55eca4296ffc99db960a97b3cc8fbcea", + "reference": "985f414b55eca4296ffc99db960a97b3cc8fbcea", "shasum": "" }, "require": { "php": ">=7.1" }, - "require-dev": { - "phpunit/phpunit": "~6" - }, "type": "library", "extra": { "branch-alias": { @@ -4418,7 +4711,7 @@ "reflection", "static analysis" ], - "time": "2019-12-20T12:45:35+00:00" + "time": "2020-04-27T09:34:19+00:00" }, { "name": "phpdocumentor/reflection-docblock", @@ -4426,12 +4719,12 @@ "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "011b369030b0976f51d94eba8e255a1f66461df5" + "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/011b369030b0976f51d94eba8e255a1f66461df5", - "reference": "011b369030b0976f51d94eba8e255a1f66461df5", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e", + "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e", "shasum": "" }, "require": { @@ -4471,7 +4764,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2020-02-17T17:48:35+00:00" + "time": "2020-02-22T12:28:44+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -4479,12 +4772,12 @@ "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "70d7abb1fdad964379676d629923de0dd1918f4f" + "reference": "95d8782070ccd738295bbe4483f8760f998ad64d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/70d7abb1fdad964379676d629923de0dd1918f4f", - "reference": "70d7abb1fdad964379676d629923de0dd1918f4f", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/95d8782070ccd738295bbe4483f8760f998ad64d", + "reference": "95d8782070ccd738295bbe4483f8760f998ad64d", "shasum": "" }, "require": { @@ -4517,7 +4810,7 @@ } ], "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", - "time": "2020-02-14T12:50:24+00:00" + "time": "2020-05-13T13:46:15+00:00" }, { "name": "phpspec/prophecy", @@ -4525,12 +4818,12 @@ "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "b4400efc9d206e83138e2bb97ed7f5b14b831cd9" + "reference": "451c3cd1418cf640de218914901e51b064abb093" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/b4400efc9d206e83138e2bb97ed7f5b14b831cd9", - "reference": "b4400efc9d206e83138e2bb97ed7f5b14b831cd9", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093", + "reference": "451c3cd1418cf640de218914901e51b064abb093", "shasum": "" }, "require": { @@ -4580,7 +4873,7 @@ "spy", "stub" ], - "time": "2020-01-20T15:57:02+00:00" + "time": "2020-03-05T15:02:03+00:00" }, { "name": "phpunit/php-code-coverage", @@ -4836,16 +5129,16 @@ }, { "name": "phpunit/phpunit", - "version": "7.5.x-dev", + "version": "7.5.20", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "fc43f121f3c4ad93630bac6f9c86c23fb917b095" + "reference": "9467db479d1b0487c99733bb1e7944d32deded2c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc43f121f3c4ad93630bac6f9c86c23fb917b095", - "reference": "fc43f121f3c4ad93630bac6f9c86c23fb917b095", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9467db479d1b0487c99733bb1e7944d32deded2c", + "reference": "9467db479d1b0487c99733bb1e7944d32deded2c", "shasum": "" }, "require": { @@ -4916,7 +5209,7 @@ "testing", "xunit" ], - "time": "2020-01-23T15:43:47+00:00" + "time": "2020-01-08T08:45:45+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -5526,16 +5819,16 @@ }, { "name": "webmozart/assert", - "version": "1.7.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "aed98a490f9a8f78468232db345ab9cf606cf598" + "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/aed98a490f9a8f78468232db345ab9cf606cf598", - "reference": "aed98a490f9a8f78468232db345ab9cf606cf598", + "url": "https://api.github.com/repos/webmozart/assert/zipball/ab2cb0b3b559010b75981b1bdce728da3ee90ad6", + "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6", "shasum": "" }, "require": { @@ -5543,7 +5836,7 @@ "symfony/polyfill-ctype": "^1.8" }, "conflict": { - "vimeo/psalm": "<3.6.0" + "vimeo/psalm": "<3.9.1" }, "require-dev": { "phpunit/phpunit": "^4.8.36 || ^7.5.13" @@ -5570,7 +5863,7 @@ "check", "validate" ], - "time": "2020-02-14T12:15:55+00:00" + "time": "2020-04-18T12:12:48+00:00" } ], "aliases": [], @@ -5587,7 +5880,8 @@ "smarcet/silverstripe-cloudassets-swift": 20, "markguinn/silverstripe-cloudassets": 20, "php-opencloud/openstack": 20, - "jumbojett/openid-connect-php": 20 + "jumbojett/openid-connect-php": 20, + "spatie/dropbox-api": 20 }, "prefer-stable": false, "prefer-lowest": false, diff --git a/database/code/CustomDatabaseAdmin.php b/database/code/CustomDatabaseAdmin.php index fd541cce6..70d8d56aa 100644 --- a/database/code/CustomDatabaseAdmin.php +++ b/database/code/CustomDatabaseAdmin.php @@ -20,12 +20,16 @@ class CustomDatabaseAdmin extends DatabaseAdmin { public function build() { + // drop index if exists + $res = DB::query("SHOW KEYS FROM `Member` WHERE Key_name='ExternalUserId'")->first(); + if($res) + DB::query("ALTER TABLE `Member` DROP INDEX `ExternalUserId`;"); + parent::build(); $this->dropObsoleteTables(); $this->buildMandatoryTables(); } - private function dropObsoleteTables(){ global $database; diff --git a/elections/code/infrastructure/active_records/FoundationMember.php b/elections/code/infrastructure/active_records/FoundationMember.php index 4b69381b7..5c3ad5bd4 100644 --- a/elections/code/infrastructure/active_records/FoundationMember.php +++ b/elections/code/infrastructure/active_records/FoundationMember.php @@ -180,15 +180,15 @@ public function getCurrentCandidate() $current_election = Election::getCurrent(); if ($current_election) { - $candidate = Candidate::get()->filter(array( - 'MemberID' => $this->getIdentifier(), - 'ElectionID' => $current_election->ID))->first(); - - $res = $candidate; - if (!is_null($candidate)) { - UnitOfWork::getInstance()->setToCache($candidate); - UnitOfWork::getInstance()->scheduleForUpdate($candidate); - } + $candidate = Candidate::get()->filter(array( + 'MemberID' => $this->getIdentifier(), + 'ElectionID' => $current_election->ID))->first(); + + $res = $candidate; + if (!is_null($candidate)) { + UnitOfWork::getInstance()->setToCache($candidate); + UnitOfWork::getInstance()->scheduleForUpdate($candidate); + } } return $res; diff --git a/errors_pages/ui/404/index.html b/errors_pages/ui/404/index.html index e261415f4..869a8d3d3 100644 --- a/errors_pages/ui/404/index.html +++ b/errors_pages/ui/404/index.html @@ -7,26 +7,7 @@ -