diff --git a/composer.lock b/composer.lock index 8ce7ef1..1d6e39a 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "catfan/medoo", - "version": "v1.5.7", + "version": "v1.7.10", "source": { "type": "git", "url": "https://github.com/catfan/Medoo.git", - "reference": "8d90cba0e8ff176028847527d0ea76fe41a06ecf" + "reference": "2d675f73e23f63bbaeb9a8aa33318659a3d3c32f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/catfan/Medoo/zipball/8d90cba0e8ff176028847527d0ea76fe41a06ecf", - "reference": "8d90cba0e8ff176028847527d0ea76fe41a06ecf", + "url": "https://api.github.com/repos/catfan/Medoo/zipball/2d675f73e23f63bbaeb9a8aa33318659a3d3c32f", + "reference": "2d675f73e23f63bbaeb9a8aa33318659a3d3c32f", "shasum": "" }, "require": { @@ -31,7 +31,7 @@ "ext-pdo_oci8": "For Oracle version 8 database", "ext-pdo_pqsql": "For PostgreSQL database", "ext-pdo_sqlite": "For SQLite database", - "ext-pdo_sqlsrv": "For MSSQL database" + "ext-pdo_sqlsrv": "For MSSQL database on both Window/Liunx platform" }, "type": "framework", "autoload": { @@ -49,10 +49,11 @@ "email": "angel@catfan.me" } ], - "description": "The lightest PHP database framework to accelerate development", + "description": "The lightweight PHP database framework to accelerate development", "homepage": "https://medoo.in", "keywords": [ "database", + "database library", "lightweight", "mariadb", "mssql", @@ -63,31 +64,31 @@ "sql", "sqlite" ], - "time": "2018-06-14T18:59:08+00:00" + "time": "2020-02-11T08:20:42+00:00" }, { "name": "composer/ca-bundle", - "version": "1.1.2", + "version": "1.2.6", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "46afded9720f40b9dc63542af4e3e43a1177acb0" + "reference": "47fe531de31fca4a1b997f87308e7d7804348f7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/46afded9720f40b9dc63542af4e3e43a1177acb0", - "reference": "46afded9720f40b9dc63542af4e3e43a1177acb0", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/47fe531de31fca4a1b997f87308e7d7804348f7e", + "reference": "47fe531de31fca4a1b997f87308e7d7804348f7e", "shasum": "" }, "require": { "ext-openssl": "*", "ext-pcre": "*", - "php": "^5.3.2 || ^7.0" + "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5", + "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8", "psr/log": "^1.0", - "symfony/process": "^2.5 || ^3.0 || ^4.0" + "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0" }, "type": "library", "extra": { @@ -119,30 +120,31 @@ "ssl", "tls" ], - "time": "2018-08-08T08:57:40+00:00" + "time": "2020-01-13T10:02:55+00:00" }, { "name": "geoip2/geoip2", - "version": "v2.9.0", + "version": "v2.10.0", "source": { "type": "git", "url": "https://github.com/maxmind/GeoIP2-php.git", - "reference": "a807fbf65212eef5d8d2db1a1b31082b53633d77" + "reference": "419557cd21d9fe039721a83490701a58c8ce784a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maxmind/GeoIP2-php/zipball/a807fbf65212eef5d8d2db1a1b31082b53633d77", - "reference": "a807fbf65212eef5d8d2db1a1b31082b53633d77", + "url": "https://api.github.com/repos/maxmind/GeoIP2-php/zipball/419557cd21d9fe039721a83490701a58c8ce784a", + "reference": "419557cd21d9fe039721a83490701a58c8ce784a", "shasum": "" }, "require": { - "maxmind-db/reader": "~1.0", - "maxmind/web-service-common": "~0.5", - "php": ">=5.4" + "ext-json": "*", + "maxmind-db/reader": "~1.5", + "maxmind/web-service-common": "~0.6", + "php": ">=5.6" }, "require-dev": { "friendsofphp/php-cs-fixer": "2.*", - "phpunit/phpunit": "4.*", + "phpunit/phpunit": "5.*", "squizlabs/php_codesniffer": "3.*" }, "type": "library", @@ -159,7 +161,7 @@ { "name": "Gregory J. Oschwald", "email": "goschwald@maxmind.com", - "homepage": "http://www.maxmind.com/" + "homepage": "https://www.maxmind.com/" } ], "description": "MaxMind GeoIP2 PHP API", @@ -171,48 +173,50 @@ "geolocation", "maxmind" ], - "time": "2018-04-10T15:32:59+00:00" + "time": "2019-12-12T18:48:39+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "6.3.3", + "version": "6.5.2", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba" + "reference": "43ece0e75098b7ecd8d13918293029e555a50f82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba", - "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/43ece0e75098b7ecd8d13918293029e555a50f82", + "reference": "43ece0e75098b7ecd8d13918293029e555a50f82", "shasum": "" }, "require": { + "ext-json": "*", "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.4", + "guzzlehttp/psr7": "^1.6.1", "php": ">=5.5" }, "require-dev": { "ext-curl": "*", "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", - "psr/log": "^1.0" + "psr/log": "^1.1" }, "suggest": { + "ext-intl": "Required for Internationalized Domain Name (IDN) support", "psr/log": "Required for using the Log middleware" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "6.3-dev" + "dev-master": "6.5-dev" } }, "autoload": { - "files": [ - "src/functions_include.php" - ], "psr-4": { "GuzzleHttp\\": "src/" - } + }, + "files": [ + "src/functions_include.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -236,7 +240,7 @@ "rest", "web service" ], - "time": "2018-04-22T15:46:56+00:00" + "time": "2019-12-23T11:57:10+00:00" }, { "name": "guzzlehttp/promises", @@ -291,32 +295,37 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.4.2", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c" + "reference": "239400de7a173fe9901b9ac7c06497751f00727a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c", - "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a", + "reference": "239400de7a173fe9901b9ac7c06497751f00727a", "shasum": "" }, "require": { "php": ">=5.4.0", - "psr/http-message": "~1.0" + "psr/http-message": "~1.0", + "ralouphie/getallheaders": "^2.0.5 || ^3.0.0" }, "provide": { "psr/http-message-implementation": "1.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "ext-zlib": "*", + "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8" + }, + "suggest": { + "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.6-dev" } }, "autoload": { @@ -346,13 +355,14 @@ "keywords": [ "http", "message", + "psr-7", "request", "response", "stream", "uri", "url" ], - "time": "2017-03-20T17:10:46+00:00" + "time": "2019-07-01T23:21:34+00:00" }, { "name": "hughbertd/oauth2-unsplash", @@ -408,21 +418,21 @@ }, { "name": "league/oauth2-client", - "version": "2.3.0", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/thephpleague/oauth2-client.git", - "reference": "aa2e3df188f0bfd87f7880cc880e906e99923580" + "reference": "cc114abc622a53af969e8664722e84ca36257530" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/aa2e3df188f0bfd87f7880cc880e906e99923580", - "reference": "aa2e3df188f0bfd87f7880cc880e906e99923580", + "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/cc114abc622a53af969e8664722e84ca36257530", + "reference": "cc114abc622a53af969e8664722e84ca36257530", "shasum": "" }, "require": { "guzzlehttp/guzzle": "^6.0", - "paragonie/random_compat": "^1|^2", + "paragonie/random_compat": "^1|^2|^9.99", "php": "^5.6|^7.0" }, "require-dev": { @@ -471,29 +481,33 @@ "oauth2", "single sign on" ], - "time": "2018-01-13T05:27:58+00:00" + "time": "2018-11-22T18:33:57+00:00" }, { "name": "maxmind-db/reader", - "version": "v1.3.0", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/maxmind/MaxMind-DB-Reader-php.git", - "reference": "e042b4f8a2dff41e19019faf16427178b07fbd58" + "reference": "febd4920bf17c1da84cef58e56a8227dfb37fbe4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maxmind/MaxMind-DB-Reader-php/zipball/e042b4f8a2dff41e19019faf16427178b07fbd58", - "reference": "e042b4f8a2dff41e19019faf16427178b07fbd58", + "url": "https://api.github.com/repos/maxmind/MaxMind-DB-Reader-php/zipball/febd4920bf17c1da84cef58e56a8227dfb37fbe4", + "reference": "febd4920bf17c1da84cef58e56a8227dfb37fbe4", "shasum": "" }, "require": { - "php": ">=5.4" + "php": ">=5.6" + }, + "conflict": { + "ext-maxminddb": "<1.6.0,>=2.0.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "2.*", - "phpunit/phpunit": "4.* || 5.*", - "satooshi/php-coveralls": "1.0.*", + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpcov": "^3.0", + "phpunit/phpunit": "5.*", "squizlabs/php_codesniffer": "3.*" }, "suggest": { @@ -515,7 +529,7 @@ { "name": "Gregory J. Oschwald", "email": "goschwald@maxmind.com", - "homepage": "http://www.maxmind.com/" + "homepage": "https://www.maxmind.com/" } ], "description": "MaxMind DB Reader API", @@ -527,31 +541,31 @@ "geolocation", "maxmind" ], - "time": "2018-02-21T21:23:33+00:00" + "time": "2019-12-19T22:59:03+00:00" }, { "name": "maxmind/web-service-common", - "version": "v0.5.0", + "version": "v0.6.0", "source": { "type": "git", "url": "https://github.com/maxmind/web-service-common-php.git", - "reference": "61a9836fa3bb1743ab89752bae5005d71e78c73b" + "reference": "40c928bb0194c45088b369a17f9baef9c3fc7460" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maxmind/web-service-common-php/zipball/61a9836fa3bb1743ab89752bae5005d71e78c73b", - "reference": "61a9836fa3bb1743ab89752bae5005d71e78c73b", + "url": "https://api.github.com/repos/maxmind/web-service-common-php/zipball/40c928bb0194c45088b369a17f9baef9c3fc7460", + "reference": "40c928bb0194c45088b369a17f9baef9c3fc7460", "shasum": "" }, "require": { "composer/ca-bundle": "^1.0.3", "ext-curl": "*", "ext-json": "*", - "php": ">=5.4" + "php": ">=5.6" }, "require-dev": { "friendsofphp/php-cs-fixer": "2.*", - "phpunit/phpunit": "4.*", + "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0", "squizlabs/php_codesniffer": "3.*" }, "type": "library", @@ -573,37 +587,33 @@ ], "description": "Internal MaxMind Web Service API", "homepage": "https://github.com/maxmind/web-service-common-php", - "time": "2018-02-12T22:31:54+00:00" + "time": "2019-12-12T15:56:05+00:00" }, { "name": "paragonie/random_compat", - "version": "v2.0.17", + "version": "v9.99.99", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d" + "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/29af24f25bab834fcbb38ad2a69fa93b867e070d", - "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95", + "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95", "shasum": "" }, "require": { - "php": ">=5.2.0" + "php": "^7" }, "require-dev": { - "phpunit/phpunit": "4.*|5.*" + "phpunit/phpunit": "4.*|5.*", + "vimeo/psalm": "^1" }, "suggest": { "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." }, "type": "library", - "autoload": { - "files": [ - "lib/random.php" - ] - }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" @@ -622,20 +632,20 @@ "pseudorandom", "random" ], - "time": "2018-07-04T16:31:37+00:00" + "time": "2018-07-02T15:55:56+00:00" }, { "name": "phpmailer/phpmailer", - "version": "v6.0.5", + "version": "v6.1.4", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "cb3ea134d4d3729e7857737d5f320cce9caf4d32" + "reference": "c5e61d0729507049cec9673aa1a679f9adefd683" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/cb3ea134d4d3729e7857737d5f320cce9caf4d32", - "reference": "cb3ea134d4d3729e7857737d5f320cce9caf4d32", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/c5e61d0729507049cec9673aa1a679f9adefd683", + "reference": "c5e61d0729507049cec9673aa1a679f9adefd683", "shasum": "" }, "require": { @@ -644,13 +654,9 @@ "php": ">=5.5.0" }, "require-dev": { - "doctrine/annotations": "1.2.*", + "doctrine/annotations": "^1.2", "friendsofphp/php-cs-fixer": "^2.2", - "phpdocumentor/phpdocumentor": "2.*", - "phpunit/phpunit": "^4.8 || ^5.7", - "zendframework/zend-eventmanager": "3.0.*", - "zendframework/zend-i18n": "2.7.3", - "zendframework/zend-serializer": "2.7.*" + "phpunit/phpunit": "^4.8 || ^5.7" }, "suggest": { "ext-mbstring": "Needed to send email in multibyte encoding charset", @@ -668,17 +674,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" @@ -688,7 +694,7 @@ } ], "description": "PHPMailer is a full-featured email creation and transfer class for PHP", - "time": "2018-03-27T13:49:45+00:00" + "time": "2019-12-10T11:17:38+00:00" }, { "name": "psr/http-message", @@ -741,17 +747,57 @@ "time": "2016-08-06T14:39:51+00:00" }, { - "name": "unsplash/unsplash", - "version": "2.4.4", + "name": "ralouphie/getallheaders", + "version": "3.0.3", "source": { "type": "git", - "url": "https://github.com/unsplash/unsplash-php.git", - "reference": "af907f6192bfd4be9e9814a1242942442604c4de" + "url": "https://github.com/ralouphie/getallheaders.git", + "reference": "120b605dfeb996808c31b6477290a714d356e822" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/unsplash/unsplash-php/zipball/af907f6192bfd4be9e9814a1242942442604c4de", - "reference": "af907f6192bfd4be9e9814a1242942442604c4de", + "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", + "reference": "120b605dfeb996808c31b6477290a714d356e822", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^5 || ^6.5" + }, + "type": "library", + "autoload": { + "files": [ + "src/getallheaders.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ralph Khattar", + "email": "ralph.khattar@gmail.com" + } + ], + "description": "A polyfill for getallheaders.", + "time": "2019-03-08T08:55:37+00:00" + }, + { + "name": "unsplash/unsplash", + "version": "2.5.0", + "source": { + "type": "git", + "url": "https://github.com/unsplash/unsplash-php.git", + "reference": "edcef04f1803448e65c7111e89f6ad65c8cecb99" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/unsplash/unsplash-php/zipball/edcef04f1803448e65c7111e89f6ad65c8cecb99", + "reference": "edcef04f1803448e65c7111e89f6ad65c8cecb99", "shasum": "" }, "require": { @@ -779,14 +825,6 @@ "MIT" ], "authors": [ - { - "name": "Charles Lalonde", - "email": "charles@pickcrew.com" - }, - { - "name": "Hugh Downer", - "email": "hugh.downer@gmail.com" - }, { "name": "Aaron Klaassen", "email": "aaron@unsplash.com" @@ -794,10 +832,18 @@ { "name": "Luke Chesser", "email": "luke@unsplash.com" + }, + { + "name": "Charles Lalonde", + "email": "charles@pickcrew.com" + }, + { + "name": "Hugh Downer", + "email": "hugh.downer@gmail.com" } ], "description": "Wrapper to access the Unsplash API and photo library", - "time": "2019-02-05T18:27:04+00:00" + "time": "2019-08-14T20:44:07+00:00" } ], "packages-dev": [], diff --git a/lib/filepicker_unsplash.php b/lib/filepicker_unsplash.php index 6a037a1..034fc21 100644 --- a/lib/filepicker_unsplash.php +++ b/lib/filepicker_unsplash.php @@ -34,7 +34,6 @@ if (isset($_GET['query']) && $_GET['query'] != "") { $images = Crew\Unsplash\Photo::all($page, $per_page, 'popular'); } -$images-> $htmlout = "";