diff --git a/.gitignore b/.gitignore index 7a1ac425..b667888f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ Homestead.json Homestead.yaml npm-debug.log yarn-error.log +/.idea # Custom paths in /public /public/coverage /public/files diff --git a/.travis.yml b/.travis.yml index 15a9c137..68f0d9fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,4 +67,4 @@ script: - php vendor/bin/phpunit - php phpcs.phar #- php artisan dusk - - php vendor/bin/security-checker security:check --end-point=http://security.sensiolabs.org/check_lock + - php vendor/bin/security-checker security:check diff --git a/app/Http/Controllers/TokenEndpointController.php b/app/Http/Controllers/TokenEndpointController.php index f065c3f2..9a2aab06 100644 --- a/app/Http/Controllers/TokenEndpointController.php +++ b/app/Http/Controllers/TokenEndpointController.php @@ -48,7 +48,8 @@ class TokenEndpointController extends Controller request()->input('code'), request()->input('me'), request()->input('redirect_uri'), - request()->input('client_id') + request()->input('client_id'), + null // code_verifier ); if (array_key_exists('me', $auth)) { $scope = $auth['scope'] ?? ''; diff --git a/app/Models/Note.php b/app/Models/Note.php index 9150d051..d0993171 100644 --- a/app/Models/Note.php +++ b/app/Models/Note.php @@ -355,7 +355,7 @@ class Note extends Model } catch (\Exception $e) { return null; } - Cache::put($tweetId, $oEmbed, ($oEmbed->cache_age / 60)); + Cache::put($tweetId, $oEmbed, ($oEmbed->cache_age)); return $oEmbed; } diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index f3e3c3fc..686d6023 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -12,7 +12,7 @@ class AuthServiceProvider extends ServiceProvider * @var array */ protected $policies = [ - 'App\Model' => 'App\Policies\ModelPolicy', + // 'App\Model' => 'App\Policies\ModelPolicy', ]; /** diff --git a/composer.json b/composer.json index 65dcbfe0..2b6cb748 100644 --- a/composer.json +++ b/composer.json @@ -19,16 +19,16 @@ "jonnybarnes/emoji-a11y": "^0.3", "jonnybarnes/indieweb": "dev-master", "jonnybarnes/webmentions-parser": "0.4.*", - "laravel/framework": "5.7.*", + "laravel/framework": "5.8.*", "laravel/horizon": "^1.0", - "laravel/scout": "^5.0", + "laravel/scout": "^7.0", "laravel/tinker": "^1.0", "lcobucci/jwt": "^3.1", "league/commonmark": "^0.18.0", "league/flysystem-aws-s3-v3": "^1.0", "mf2/mf2": "~0.3", "phaza/laravel-postgis": "~3.1", - "pmatseykanets/laravel-scout-postgres": "~3.0", + "pmatseykanets/laravel-scout-postgres": "~5.0", "predis/predis": "~1.0", "ramsey/uuid": "^3.5", "sensiolabs/security-checker": "^5.0", @@ -40,13 +40,13 @@ "require-dev": { "beyondcode/laravel-dump-server": "^1.0", "barryvdh/laravel-debugbar": "~3.0", - "codedungeon/phpunit-result-printer": "^0.24.0", + "codedungeon/phpunit-result-printer": "^0.26.0", "filp/whoops": "~2.0", "fzaninotto/faker": "~1.4", - "laravel/dusk": "^4.0", + "laravel/dusk": "^5.0", "mockery/mockery": "~1.0", - "nunomaduro/collision": "^2.0", - "phpunit/phpunit": "~7.0", + "nunomaduro/collision": "^3.0", + "phpunit/phpunit": "~8.0", "symfony/thanks": "~1.0" }, "config": { diff --git a/composer.lock b/composer.lock index 0ee64740..66e2f0d1 100644 --- a/composer.lock +++ b/composer.lock @@ -4,27 +4,26 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ea5648b9a59275e4094e5231477396d0", + "content-hash": "2337f94b0e6c7d9f3589283c1204c053", "packages": [ { "name": "aws/aws-sdk-php", - "version": "3.87.2", + "version": "3.90.3", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "7c00779a343c9b813628bf6a27b94945272ced93" + "reference": "12ba8071bcc3d79cbfbf8cca77f59f146816b17a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7c00779a343c9b813628bf6a27b94945272ced93", - "reference": "7c00779a343c9b813628bf6a27b94945272ced93", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/12ba8071bcc3d79cbfbf8cca77f59f146816b17a", + "reference": "12ba8071bcc3d79cbfbf8cca77f59f146816b17a", "shasum": "" }, "require": { "ext-json": "*", "ext-pcre": "*", "ext-simplexml": "*", - "ext-spl": "*", "guzzlehttp/guzzle": "^5.3.3|^6.2.1", "guzzlehttp/promises": "~1.0", "guzzlehttp/psr7": "^1.4.1", @@ -87,7 +86,7 @@ "s3", "sdk" ], - "time": "2019-01-25T22:29:49+00:00" + "time": "2019-03-14T18:32:41+00:00" }, { "name": "bosnadev/database", @@ -146,16 +145,16 @@ }, { "name": "cakephp/chronos", - "version": "1.2.3", + "version": "1.2.4", "source": { "type": "git", "url": "https://github.com/cakephp/chronos.git", - "reference": "395110125ff577f080fa064dca5c5608a4e77ee1" + "reference": "ebda7326d4a65e53bc5bb915ebbbeee98f1926b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/chronos/zipball/395110125ff577f080fa064dca5c5608a4e77ee1", - "reference": "395110125ff577f080fa064dca5c5608a4e77ee1", + "url": "https://api.github.com/repos/cakephp/chronos/zipball/ebda7326d4a65e53bc5bb915ebbbeee98f1926b0", + "reference": "ebda7326d4a65e53bc5bb915ebbbeee98f1926b0", "shasum": "" }, "require": { @@ -199,7 +198,7 @@ "datetime", "time" ], - "time": "2018-10-18T22:02:21+00:00" + "time": "2019-02-11T02:08:31+00:00" }, { "name": "cocur/slugify", @@ -324,30 +323,30 @@ }, { "name": "cviebrock/eloquent-sluggable", - "version": "4.6.0", + "version": "4.8.0", "source": { "type": "git", "url": "https://github.com/cviebrock/eloquent-sluggable.git", - "reference": "d8a6982d32a7fe92f42b1c33a34e89d33516c2fd" + "reference": "4a5bf905b55e7eb0a30ef5933f647387dc8f365a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cviebrock/eloquent-sluggable/zipball/d8a6982d32a7fe92f42b1c33a34e89d33516c2fd", - "reference": "d8a6982d32a7fe92f42b1c33a34e89d33516c2fd", + "url": "https://api.github.com/repos/cviebrock/eloquent-sluggable/zipball/4a5bf905b55e7eb0a30ef5933f647387dc8f365a", + "reference": "4a5bf905b55e7eb0a30ef5933f647387dc8f365a", "shasum": "" }, "require": { "cocur/slugify": "^3.1", - "illuminate/config": "~5.7.0", - "illuminate/database": "~5.7.0", - "illuminate/support": "~5.7.0", - "php": "^7.0" + "illuminate/config": "~5.8.0", + "illuminate/database": "~5.8.0", + "illuminate/support": "~5.8.0", + "php": "^7.1" }, "require-dev": { "limedeck/phpunit-detailed-printer": "^4.1", - "mockery/mockery": "^0.9.4", - "orchestra/database": "3.7.x-dev", - "orchestra/testbench": "v3.7.0", + "mockery/mockery": "^1.2", + "orchestra/database": "3.8.x-dev", + "orchestra/testbench": "v3.8.0", "phpunit/phpunit": "~7.0" }, "type": "library", @@ -383,7 +382,7 @@ "slug", "sluggable" ], - "time": "2018-09-05T02:03:48+00:00" + "time": "2019-03-01T05:04:21+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -1254,16 +1253,16 @@ }, { "name": "indieauth/client", - "version": "0.4.1", + "version": "0.5.1", "source": { "type": "git", "url": "https://github.com/indieweb/indieauth-client-php.git", - "reference": "3e47004ccfccddc5760639f4faf9ed5ceadb460e" + "reference": "5dab0728234a3b3e741cbeba2400dd257a3f950c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/indieweb/indieauth-client-php/zipball/3e47004ccfccddc5760639f4faf9ed5ceadb460e", - "reference": "3e47004ccfccddc5760639f4faf9ed5ceadb460e", + "url": "https://api.github.com/repos/indieweb/indieauth-client-php/zipball/5dab0728234a3b3e741cbeba2400dd257a3f950c", + "reference": "5dab0728234a3b3e741cbeba2400dd257a3f950c", "shasum": "" }, "require": { @@ -1292,7 +1291,7 @@ } ], "description": "IndieAuth Client Library", - "time": "2018-03-13T23:39:55+00:00" + "time": "2019-03-12T02:33:59+00:00" }, { "name": "indieweb/link-rel-parser", @@ -1598,16 +1597,16 @@ }, { "name": "jonnybarnes/commonmark-linkify", - "version": "v0.5", + "version": "v0.5.1", "source": { "type": "git", "url": "https://github.com/jonnybarnes/commonmark-linkify.git", - "reference": "4d9a3cfe4f0ced80f974a705c6fa985b285a5940" + "reference": "e27103f5e0e9e84eb17344a361845241e27512e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jonnybarnes/commonmark-linkify/zipball/4d9a3cfe4f0ced80f974a705c6fa985b285a5940", - "reference": "4d9a3cfe4f0ced80f974a705c6fa985b285a5940", + "url": "https://api.github.com/repos/jonnybarnes/commonmark-linkify/zipball/e27103f5e0e9e84eb17344a361845241e27512e0", + "reference": "e27103f5e0e9e84eb17344a361845241e27512e0", "shasum": "" }, "require": { @@ -1640,7 +1639,7 @@ "extension", "markdown" ], - "time": "2018-10-05T15:28:41+00:00" + "time": "2019-02-17T10:48:03+00:00" }, { "name": "jonnybarnes/emoji-a11y", @@ -1779,45 +1778,45 @@ }, { "name": "laravel/framework", - "version": "v5.7.24", + "version": "v5.8.4", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "2ede55db4b8201ed0450fa7e7a4d7220aa29bc34" + "reference": "d651f8bd25c6baf7ae4913bc51f02849fad4e925" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/2ede55db4b8201ed0450fa7e7a4d7220aa29bc34", - "reference": "2ede55db4b8201ed0450fa7e7a4d7220aa29bc34", + "url": "https://api.github.com/repos/laravel/framework/zipball/d651f8bd25c6baf7ae4913bc51f02849fad4e925", + "reference": "d651f8bd25c6baf7ae4913bc51f02849fad4e925", "shasum": "" }, "require": { "doctrine/inflector": "^1.1", "dragonmantank/cron-expression": "^2.0", + "egulias/email-validator": "^2.0", "erusev/parsedown": "^1.7", + "ext-json": "*", "ext-mbstring": "*", "ext-openssl": "*", - "laravel/nexmo-notification-channel": "^1.0", - "laravel/slack-notification-channel": "^1.0", "league/flysystem": "^1.0.8", "monolog/monolog": "^1.12", - "nesbot/carbon": "^1.26.3", + "nesbot/carbon": "^1.26.3 || ^2.0", "opis/closure": "^3.1", "php": "^7.1.3", "psr/container": "^1.0", "psr/simple-cache": "^1.0", "ramsey/uuid": "^3.7", "swiftmailer/swiftmailer": "^6.0", - "symfony/console": "^4.1", - "symfony/debug": "^4.1", - "symfony/finder": "^4.1", - "symfony/http-foundation": "^4.1", - "symfony/http-kernel": "^4.1", - "symfony/process": "^4.1", - "symfony/routing": "^4.1", - "symfony/var-dumper": "^4.1", + "symfony/console": "^4.2", + "symfony/debug": "^4.2", + "symfony/finder": "^4.2", + "symfony/http-foundation": "^4.2", + "symfony/http-kernel": "^4.2", + "symfony/process": "^4.2", + "symfony/routing": "^4.2", + "symfony/var-dumper": "^4.2", "tijsverkoyen/css-to-inline-styles": "^2.2.1", - "vlucas/phpdotenv": "^2.2" + "vlucas/phpdotenv": "^3.3" }, "conflict": { "tightenco/collect": "<5.5.33" @@ -1860,12 +1859,12 @@ "league/flysystem-cached-adapter": "^1.0", "mockery/mockery": "^1.0", "moontoast/math": "^1.1", - "orchestra/testbench-core": "3.7.*", - "pda/pheanstalk": "^3.0", - "phpunit/phpunit": "^7.5", + "orchestra/testbench-core": "3.8.*", + "pda/pheanstalk": "^4.0", + "phpunit/phpunit": "^7.5|^8.0", "predis/predis": "^1.1.1", - "symfony/css-selector": "^4.1", - "symfony/dom-crawler": "^4.1", + "symfony/css-selector": "^4.2", + "symfony/dom-crawler": "^4.2", "true/punycode": "^2.1" }, "suggest": { @@ -1883,17 +1882,18 @@ "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).", "moontoast/math": "Required to use ordered UUIDs (^1.1).", "nexmo/client": "Required to use the Nexmo transport (^1.0).", - "pda/pheanstalk": "Required to use the beanstalk queue driver (^3.0).", + "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).", "predis/predis": "Required to use the redis cache and queue drivers (^1.0).", "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^3.0).", - "symfony/css-selector": "Required to use some of the crawler integration testing tools (^4.1).", - "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (^4.1).", - "symfony/psr-http-message-bridge": "Required to psr7 bridging features (^1.0)." + "symfony/css-selector": "Required to use some of the crawler integration testing tools (^4.2).", + "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (^4.2).", + "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.1).", + "wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.7-dev" + "dev-master": "5.8-dev" } }, "autoload": { @@ -1921,7 +1921,7 @@ "framework", "laravel" ], - "time": "2019-01-29T22:13:46+00:00" + "time": "2019-03-12T13:33:14+00:00" }, { "name": "laravel/horizon", @@ -1991,98 +1991,41 @@ ], "time": "2018-11-01T14:03:51+00:00" }, - { - "name": "laravel/nexmo-notification-channel", - "version": "v1.0.1", - "source": { - "type": "git", - "url": "https://github.com/laravel/nexmo-notification-channel.git", - "reference": "03edd42a55b306ff980c9950899d5a2b03260d48" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laravel/nexmo-notification-channel/zipball/03edd42a55b306ff980c9950899d5a2b03260d48", - "reference": "03edd42a55b306ff980c9950899d5a2b03260d48", - "shasum": "" - }, - "require": { - "nexmo/client": "^1.0", - "php": "^7.1.3" - }, - "require-dev": { - "illuminate/notifications": "~5.7", - "mockery/mockery": "^1.0", - "phpunit/phpunit": "^7.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - }, - "laravel": { - "providers": [ - "Illuminate\\Notifications\\NexmoChannelServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "Illuminate\\Notifications\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylor@laravel.com" - } - ], - "description": "Nexmo Notification Channel for laravel.", - "keywords": [ - "laravel", - "nexmo", - "notifications" - ], - "time": "2018-12-04T12:57:08+00:00" - }, { "name": "laravel/scout", - "version": "v5.0.3", + "version": "v7.1.0", "source": { "type": "git", "url": "https://github.com/laravel/scout.git", - "reference": "ac7e8d2de8fba37473e3a802347d8f24141993cd" + "reference": "59d301b79d53fb6ad47e143e06372434af0fda38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/scout/zipball/ac7e8d2de8fba37473e3a802347d8f24141993cd", - "reference": "ac7e8d2de8fba37473e3a802347d8f24141993cd", + "url": "https://api.github.com/repos/laravel/scout/zipball/59d301b79d53fb6ad47e143e06372434af0fda38", + "reference": "59d301b79d53fb6ad47e143e06372434af0fda38", "shasum": "" }, "require": { - "illuminate/bus": "~5.4", - "illuminate/contracts": "~5.4", - "illuminate/database": "~5.4", - "illuminate/pagination": "~5.4", - "illuminate/queue": "~5.4", - "illuminate/support": "~5.4", + "illuminate/bus": "~5.4.0|~5.5.0|~5.6.0|~5.7.0|~5.8.0", + "illuminate/contracts": "~5.4.0|~5.5.0|~5.6.0|~5.7.0|~5.8.0", + "illuminate/database": "~5.4.0|~5.5.0|~5.6.0|~5.7.0|~5.8.0", + "illuminate/pagination": "~5.4.0|~5.5.0|~5.6.0|~5.7.0|~5.8.0", + "illuminate/queue": "~5.4.0|~5.5.0|~5.6.0|~5.7.0|~5.8.0", + "illuminate/support": "~5.4.0|~5.5.0|~5.6.0|~5.7.0|~5.8.0", "php": ">=7.0" }, "require-dev": { - "algolia/algoliasearch-client-php": "^1.10", + "algolia/algoliasearch-client-php": "^2.2", "mockery/mockery": "~1.0", "phpunit/phpunit": "~6.0" }, "suggest": { - "algolia/algoliasearch-client-php": "Required to use the Algolia engine (^1.10)." + "algolia/algoliasearch-client-php": "Required to use the Algolia engine (^2.2)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-master": "7.0-dev" }, "laravel": { "providers": [ @@ -2111,64 +2054,7 @@ "laravel", "search" ], - "time": "2018-08-05T18:16:13+00:00" - }, - { - "name": "laravel/slack-notification-channel", - "version": "v1.0.3", - "source": { - "type": "git", - "url": "https://github.com/laravel/slack-notification-channel.git", - "reference": "6e164293b754a95f246faf50ab2bbea3e4923cc9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laravel/slack-notification-channel/zipball/6e164293b754a95f246faf50ab2bbea3e4923cc9", - "reference": "6e164293b754a95f246faf50ab2bbea3e4923cc9", - "shasum": "" - }, - "require": { - "guzzlehttp/guzzle": "^6.0", - "php": "^7.1.3" - }, - "require-dev": { - "illuminate/notifications": "~5.7", - "mockery/mockery": "^1.0", - "phpunit/phpunit": "^7.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - }, - "laravel": { - "providers": [ - "Illuminate\\Notifications\\SlackChannelServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "Illuminate\\Notifications\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylor@laravel.com" - } - ], - "description": "Slack Notification Channel for laravel.", - "keywords": [ - "laravel", - "notifications", - "slack" - ], - "time": "2018-12-12T13:12:06+00:00" + "time": "2019-02-14T16:50:18+00:00" }, { "name": "laravel/tinker", @@ -2293,16 +2179,16 @@ }, { "name": "league/commonmark", - "version": "0.18.1", + "version": "0.18.2", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "e5029f74ba39e043ce4b3ca6c05dc719d8aafd94" + "reference": "ad51c7cafb90e0bbd9f34b71d18d05994547e352" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/e5029f74ba39e043ce4b3ca6c05dc719d8aafd94", - "reference": "e5029f74ba39e043ce4b3ca6c05dc719d8aafd94", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/ad51c7cafb90e0bbd9f34b71d18d05994547e352", + "reference": "ad51c7cafb90e0bbd9f34b71d18d05994547e352", "shasum": "" }, "require": { @@ -2358,7 +2244,7 @@ "markdown", "parser" ], - "time": "2018-12-30T01:55:29+00:00" + "time": "2019-03-17T01:41:59+00:00" }, { "name": "league/flysystem", @@ -2619,16 +2505,16 @@ }, { "name": "masterminds/html5", - "version": "2.5.0", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/Masterminds/html5-php.git", - "reference": "b5d892a4bd058d61f736935d32a9c248f11ccc93" + "reference": "c961ca6a0a81dc6b55b6859b3f9ea7f402edf9ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/b5d892a4bd058d61f736935d32a9c248f11ccc93", - "reference": "b5d892a4bd058d61f736935d32a9c248f11ccc93", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/c961ca6a0a81dc6b55b6859b3f9ea7f402edf9ad", + "reference": "c961ca6a0a81dc6b55b6859b3f9ea7f402edf9ad", "shasum": "" }, "require": { @@ -2645,7 +2531,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4-dev" + "dev-master": "2.6-dev" } }, "autoload": { @@ -2682,7 +2568,7 @@ "serializer", "xml" ], - "time": "2018-12-27T22:03:43+00:00" + "time": "2019-03-10T11:41:28+00:00" }, { "name": "mf2/mf2", @@ -2875,28 +2761,30 @@ }, { "name": "nesbot/carbon", - "version": "1.36.2", + "version": "2.16.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "cd324b98bc30290f233dd0e75e6ce49f7ab2a6c9" + "reference": "dd16fedc022180ea4292a03aabe95e9895677911" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/cd324b98bc30290f233dd0e75e6ce49f7ab2a6c9", - "reference": "cd324b98bc30290f233dd0e75e6ce49f7ab2a6c9", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/dd16fedc022180ea4292a03aabe95e9895677911", + "reference": "dd16fedc022180ea4292a03aabe95e9895677911", "shasum": "" }, "require": { - "php": ">=5.3.9", - "symfony/translation": "~2.6 || ~3.0 || ~4.0" + "ext-json": "*", + "php": "^7.1.8 || ^8.0", + "symfony/translation": "^3.4 || ^4.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7" - }, - "suggest": { - "friendsofphp/php-cs-fixer": "Needed for the `composer phpcs` command. Allow to automatically fix code style.", - "phpstan/phpstan": "Needed for the `composer phpstan` command. Allow to detect potential errors." + "friendsofphp/php-cs-fixer": "^2.14 || ^3.0", + "kylekatarnls/multi-tester": "^0.1", + "phpmd/phpmd": "^2.6", + "phpstan/phpstan": "^0.10.8", + "phpunit/phpunit": "^7.5 || ^8.0", + "squizlabs/php_codesniffer": "^3.4" }, "type": "library", "extra": { @@ -2908,7 +2796,7 @@ }, "autoload": { "psr-4": { - "": "src/" + "Carbon\\": "src/Carbon/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2929,68 +2817,20 @@ "datetime", "time" ], - "time": "2018-12-28T10:07:33+00:00" - }, - { - "name": "nexmo/client", - "version": "1.6.1", - "source": { - "type": "git", - "url": "https://github.com/Nexmo/nexmo-php.git", - "reference": "3dc03ca1dab726a23b757110897740e54304fc65" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Nexmo/nexmo-php/zipball/3dc03ca1dab726a23b757110897740e54304fc65", - "reference": "3dc03ca1dab726a23b757110897740e54304fc65", - "shasum": "" - }, - "require": { - "lcobucci/jwt": "^3.2", - "php": ">=5.6", - "php-http/client-implementation": "^1.0", - "php-http/guzzle6-adapter": "^1.0", - "zendframework/zend-diactoros": "^1.3" - }, - "require-dev": { - "estahn/phpunit-json-assertions": "^1.0.0", - "php-http/mock-client": "^0.3.0", - "phpunit/phpunit": "^5.7", - "squizlabs/php_codesniffer": "^3.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "Nexmo\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Tim Lytle", - "email": "tim@nexmo.com", - "homepage": "http://twitter.com/tjlytle", - "role": "Developer" - } - ], - "description": "PHP Client for using Nexmo's API.", - "time": "2019-01-02T09:06:47+00:00" + "time": "2019-03-12T09:31:40+00:00" }, { "name": "nikic/php-parser", - "version": "v4.2.0", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "594bcae1fc0bccd3993d2f0d61a018e26ac2865a" + "reference": "5221f49a608808c1e4d436df32884cbc1b821ac0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/594bcae1fc0bccd3993d2f0d61a018e26ac2865a", - "reference": "594bcae1fc0bccd3993d2f0d61a018e26ac2865a", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/5221f49a608808c1e4d436df32884cbc1b821ac0", + "reference": "5221f49a608808c1e4d436df32884cbc1b821ac0", "shasum": "" }, "require": { @@ -3028,20 +2868,20 @@ "parser", "php" ], - "time": "2019-01-12T16:31:37+00:00" + "time": "2019-02-16T20:54:15+00:00" }, { "name": "opis/closure", - "version": "3.1.5", + "version": "3.1.6", "source": { "type": "git", "url": "https://github.com/opis/closure.git", - "reference": "41f5da65d75cf473e5ee582df8fc7f2c733ce9d6" + "reference": "ccb8e3928c5c8181c76cdd0ed9366c5bcaafd91b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opis/closure/zipball/41f5da65d75cf473e5ee582df8fc7f2c733ce9d6", - "reference": "41f5da65d75cf473e5ee582df8fc7f2c733ce9d6", + "url": "https://api.github.com/repos/opis/closure/zipball/ccb8e3928c5c8181c76cdd0ed9366c5bcaafd91b", + "reference": "ccb8e3928c5c8181c76cdd0ed9366c5bcaafd91b", "shasum": "" }, "require": { @@ -3089,7 +2929,7 @@ "serialization", "serialize" ], - "time": "2019-01-14T14:45:33+00:00" + "time": "2019-02-22T10:30:00+00:00" }, { "name": "p3k/http", @@ -3232,190 +3072,74 @@ "time": "2018-08-22T09:20:12+00:00" }, { - "name": "php-http/guzzle6-adapter", - "version": "v1.1.1", + "name": "phpoption/phpoption", + "version": "1.5.0", "source": { "type": "git", - "url": "https://github.com/php-http/guzzle6-adapter.git", - "reference": "a56941f9dc6110409cfcddc91546ee97039277ab" + "url": "https://github.com/schmittjoh/php-option.git", + "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/guzzle6-adapter/zipball/a56941f9dc6110409cfcddc91546ee97039277ab", - "reference": "a56941f9dc6110409cfcddc91546ee97039277ab", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/94e644f7d2051a5f0fcf77d81605f152eecff0ed", + "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed", "shasum": "" }, "require": { - "guzzlehttp/guzzle": "^6.0", - "php": ">=5.5.0", - "php-http/httplug": "^1.0" - }, - "provide": { - "php-http/async-client-implementation": "1.0", - "php-http/client-implementation": "1.0" + "php": ">=5.3.0" }, "require-dev": { - "ext-curl": "*", - "php-http/adapter-integration-tests": "^0.4" + "phpunit/phpunit": "4.7.*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { - "psr-4": { - "Http\\Adapter\\Guzzle6\\": "src/" + "psr-0": { + "PhpOption\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "Apache2" ], "authors": [ { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" - }, - { - "name": "David de Boer", - "email": "david@ddeboer.nl" + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com" } ], - "description": "Guzzle 6 HTTP Adapter", - "homepage": "http://httplug.io", + "description": "Option Type for PHP", "keywords": [ - "Guzzle", - "http" + "language", + "option", + "php", + "type" ], - "time": "2016-05-10T06:13:32+00:00" - }, - { - "name": "php-http/httplug", - "version": "v1.1.0", - "source": { - "type": "git", - "url": "https://github.com/php-http/httplug.git", - "reference": "1c6381726c18579c4ca2ef1ec1498fdae8bdf018" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-http/httplug/zipball/1c6381726c18579c4ca2ef1ec1498fdae8bdf018", - "reference": "1c6381726c18579c4ca2ef1ec1498fdae8bdf018", - "shasum": "" - }, - "require": { - "php": ">=5.4", - "php-http/promise": "^1.0", - "psr/http-message": "^1.0" - }, - "require-dev": { - "henrikbjorn/phpspec-code-coverage": "^1.0", - "phpspec/phpspec": "^2.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-4": { - "Http\\Client\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Eric GELOEN", - "email": "geloen.eric@gmail.com" - }, - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" - } - ], - "description": "HTTPlug, the HTTP client abstraction for PHP", - "homepage": "http://httplug.io", - "keywords": [ - "client", - "http" - ], - "time": "2016-08-31T08:30:17+00:00" - }, - { - "name": "php-http/promise", - "version": "v1.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-http/promise.git", - "reference": "dc494cdc9d7160b9a09bd5573272195242ce7980" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-http/promise/zipball/dc494cdc9d7160b9a09bd5573272195242ce7980", - "reference": "dc494cdc9d7160b9a09bd5573272195242ce7980", - "shasum": "" - }, - "require-dev": { - "henrikbjorn/phpspec-code-coverage": "^1.0", - "phpspec/phpspec": "^2.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-4": { - "Http\\Promise\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" - }, - { - "name": "Joel Wurtz", - "email": "joel.wurtz@gmail.com" - } - ], - "description": "Promise used for asynchronous HTTP requests", - "homepage": "http://httplug.io", - "keywords": [ - "promise" - ], - "time": "2016-01-26T13:27:02+00:00" + "time": "2015-07-25T16:39:46+00:00" }, { "name": "pmatseykanets/laravel-scout-postgres", - "version": "v3.1.0", + "version": "v5.0.0", "source": { "type": "git", "url": "https://github.com/pmatseykanets/laravel-scout-postgres.git", - "reference": "c2e3f8485a7cc76e156b6ef4a3c6d37de2a18f36" + "reference": "104fa78744ed7f3277550c87c2fe93be07de2031" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmatseykanets/laravel-scout-postgres/zipball/c2e3f8485a7cc76e156b6ef4a3c6d37de2a18f36", - "reference": "c2e3f8485a7cc76e156b6ef4a3c6d37de2a18f36", + "url": "https://api.github.com/repos/pmatseykanets/laravel-scout-postgres/zipball/104fa78744ed7f3277550c87c2fe93be07de2031", + "reference": "104fa78744ed7f3277550c87c2fe93be07de2031", "shasum": "" }, "require": { "illuminate/contracts": "~5.4", "illuminate/database": "~5.4", "illuminate/support": "~5.4", - "laravel/scout": "~5.0", + "laravel/scout": "~7.0", "php": ">=7.0" }, "require-dev": { @@ -3456,7 +3180,7 @@ "postgresql", "search" ], - "time": "2018-10-20T23:51:55+00:00" + "time": "2019-03-13T05:27:00+00:00" }, { "name": "predis/predis", @@ -3900,16 +3624,16 @@ }, { "name": "scrivo/highlight.php", - "version": "v9.13.1.1", + "version": "v9.15.6.0", "source": { "type": "git", "url": "https://github.com/scrivo/highlight.php.git", - "reference": "93834559fa181b6f34a3f639eaab5f9a9856ec99" + "reference": "5b5fc5eddb43845036f65e47f8d157ce5754511f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/93834559fa181b6f34a3f639eaab5f9a9856ec99", - "reference": "93834559fa181b6f34a3f639eaab5f9a9856ec99", + "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/5b5fc5eddb43845036f65e47f8d157ce5754511f", + "reference": "5b5fc5eddb43845036f65e47f8d157ce5754511f", "shasum": "" }, "require": { @@ -3955,7 +3679,7 @@ "highlight.php", "syntax" ], - "time": "2019-01-15T05:54:20+00:00" + "time": "2019-03-06T07:43:42+00:00" }, { "name": "sensiolabs/security-checker", @@ -4005,16 +3729,16 @@ }, { "name": "spatie/browsershot", - "version": "3.26.2", + "version": "3.27.0", "source": { "type": "git", "url": "https://github.com/spatie/browsershot.git", - "reference": "c572e805cc66e93b879507f4634ec1aaac0ec149" + "reference": "94c184461dd72f09c7a03ee0fdf00ec190e8bd7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/browsershot/zipball/c572e805cc66e93b879507f4634ec1aaac0ec149", - "reference": "c572e805cc66e93b879507f4634ec1aaac0ec149", + "url": "https://api.github.com/repos/spatie/browsershot/zipball/94c184461dd72f09c7a03ee0fdf00ec190e8bd7a", + "reference": "94c184461dd72f09c7a03ee0fdf00ec190e8bd7a", "shasum": "" }, "require": { @@ -4057,31 +3781,31 @@ "screenshot", "webpage" ], - "time": "2019-02-01T10:17:45+00:00" + "time": "2019-03-11T10:56:24+00:00" }, { "name": "spatie/commonmark-highlighter", - "version": "1.0.1", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/spatie/commonmark-highlighter.git", - "reference": "cab33e2d2a87011a4f44db71ceed2a89f692f930" + "reference": "f35555c76658a6893f215bf5f14f7bd54f42da2c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/commonmark-highlighter/zipball/cab33e2d2a87011a4f44db71ceed2a89f692f930", - "reference": "cab33e2d2a87011a4f44db71ceed2a89f692f930", + "url": "https://api.github.com/repos/spatie/commonmark-highlighter/zipball/f35555c76658a6893f215bf5f14f7bd54f42da2c", + "reference": "f35555c76658a6893f215bf5f14f7bd54f42da2c", "shasum": "" }, "require": { "league/commonmark": "^0.18.0", - "php": "^7.1", - "scrivo/highlight.php": "v9.13.1.1" + "php": "^7.2", + "scrivo/highlight.php": "^9.14" }, "require-dev": { "larapack/dd": "^1.0", - "phpunit/phpunit": "^7.0", - "spatie/phpunit-snapshot-assertions": "^1.3" + "phpunit/phpunit": "^8.0", + "spatie/phpunit-snapshot-assertions": "^2.0" }, "type": "library", "autoload": { @@ -4107,7 +3831,7 @@ "commonmark-highlighter", "spatie" ], - "time": "2019-01-16T15:37:34+00:00" + "time": "2019-02-08T08:50:45+00:00" }, { "name": "spatie/image", @@ -4164,26 +3888,26 @@ }, { "name": "spatie/image-optimizer", - "version": "1.1.4", + "version": "1.1.5", "source": { "type": "git", "url": "https://github.com/spatie/image-optimizer.git", - "reference": "11f0b270669a55f90093d63ddb5214e0f7c279da" + "reference": "e62f8b459bee0a880c8976c316e82638a74510b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/image-optimizer/zipball/11f0b270669a55f90093d63ddb5214e0f7c279da", - "reference": "11f0b270669a55f90093d63ddb5214e0f7c279da", + "url": "https://api.github.com/repos/spatie/image-optimizer/zipball/e62f8b459bee0a880c8976c316e82638a74510b5", + "reference": "e62f8b459bee0a880c8976c316e82638a74510b5", "shasum": "" }, "require": { "ext-fileinfo": "*", - "php": "^7.0", + "php": "^7.2", "psr/log": "^1.0", "symfony/process": "^4.2" }, "require-dev": { - "phpunit/phpunit": "^7.5", + "phpunit/phpunit": "^8.0", "symfony/var-dumper": "^4.2" }, "type": "library", @@ -4210,7 +3934,7 @@ "image-optimizer", "spatie" ], - "time": "2019-01-14T09:15:47+00:00" + "time": "2019-02-15T12:11:38+00:00" }, { "name": "spatie/temporary-directory", @@ -4260,25 +3984,28 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v6.1.3", + "version": "v6.2.0", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "8ddcb66ac10c392d3beb54829eef8ac1438595f4" + "reference": "6fa3232ff9d3f8237c0fae4b7ff05e1baa4cd707" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8ddcb66ac10c392d3beb54829eef8ac1438595f4", - "reference": "8ddcb66ac10c392d3beb54829eef8ac1438595f4", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/6fa3232ff9d3f8237c0fae4b7ff05e1baa4cd707", + "reference": "6fa3232ff9d3f8237c0fae4b7ff05e1baa4cd707", "shasum": "" }, "require": { "egulias/email-validator": "~2.0", - "php": ">=7.0.0" + "php": ">=7.0.0", + "symfony/polyfill-iconv": "^1.0", + "symfony/polyfill-intl-idn": "^1.10", + "symfony/polyfill-mbstring": "^1.0" }, "require-dev": { "mockery/mockery": "~0.9.1", - "symfony/phpunit-bridge": "~3.3@dev" + "symfony/phpunit-bridge": "^3.4.19|^4.1.8" }, "suggest": { "ext-intl": "Needed to support internationalized email addresses", @@ -4287,7 +4014,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "6.1-dev" + "dev-master": "6.2-dev" } }, "autoload": { @@ -4315,20 +4042,20 @@ "mail", "mailer" ], - "time": "2018-09-11T07:12:52+00:00" + "time": "2019-03-10T07:52:41+00:00" }, { "name": "symfony/console", - "version": "v4.2.2", + "version": "v4.2.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "b0a03c1bb0fcbe288629956cf2f1dd3f1dc97522" + "reference": "9dc2299a016497f9ee620be94524e6c0af0280a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/b0a03c1bb0fcbe288629956cf2f1dd3f1dc97522", - "reference": "b0a03c1bb0fcbe288629956cf2f1dd3f1dc97522", + "url": "https://api.github.com/repos/symfony/console/zipball/9dc2299a016497f9ee620be94524e6c0af0280a9", + "reference": "9dc2299a016497f9ee620be94524e6c0af0280a9", "shasum": "" }, "require": { @@ -4340,6 +4067,9 @@ "symfony/dependency-injection": "<3.4", "symfony/process": "<3.3" }, + "provide": { + "psr/log-implementation": "1.0" + }, "require-dev": { "psr/log": "~1.0", "symfony/config": "~3.4|~4.0", @@ -4349,7 +4079,7 @@ "symfony/process": "~3.4|~4.0" }, "suggest": { - "psr/log-implementation": "For using the console logger", + "psr/log": "For using the console logger", "symfony/event-dispatcher": "", "symfony/lock": "", "symfony/process": "" @@ -4384,7 +4114,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-01-04T15:13:53+00:00" + "time": "2019-02-23T15:17:42+00:00" }, { "name": "symfony/contracts", @@ -4456,16 +4186,16 @@ }, { "name": "symfony/css-selector", - "version": "v4.2.2", + "version": "v4.2.4", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "76dac1dbe2830213e95892c7c2ec1edd74113ea4" + "reference": "48eddf66950fa57996e1be4a55916d65c10c604a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/76dac1dbe2830213e95892c7c2ec1edd74113ea4", - "reference": "76dac1dbe2830213e95892c7c2ec1edd74113ea4", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/48eddf66950fa57996e1be4a55916d65c10c604a", + "reference": "48eddf66950fa57996e1be4a55916d65c10c604a", "shasum": "" }, "require": { @@ -4505,20 +4235,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2019-01-03T09:07:35+00:00" + "time": "2019-01-16T20:31:39+00:00" }, { "name": "symfony/debug", - "version": "v4.2.2", + "version": "v4.2.4", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "64cb33c81e37d19b7715d4a6a4d49c1c382066dd" + "reference": "de73f48977b8eaf7ce22814d66e43a1662cc864f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/64cb33c81e37d19b7715d4a6a4d49c1c382066dd", - "reference": "64cb33c81e37d19b7715d4a6a4d49c1c382066dd", + "url": "https://api.github.com/repos/symfony/debug/zipball/de73f48977b8eaf7ce22814d66e43a1662cc864f", + "reference": "de73f48977b8eaf7ce22814d66e43a1662cc864f", "shasum": "" }, "require": { @@ -4561,20 +4291,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-01-03T09:07:35+00:00" + "time": "2019-03-03T18:11:24+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.2.2", + "version": "v4.2.4", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "887de6d34c86cf0cb6cbf910afb170cdb743cb5e" + "reference": "3354d2e6af986dd71f68b4e5cf4a933ab58697fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/887de6d34c86cf0cb6cbf910afb170cdb743cb5e", - "reference": "887de6d34c86cf0cb6cbf910afb170cdb743cb5e", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3354d2e6af986dd71f68b4e5cf4a933ab58697fb", + "reference": "3354d2e6af986dd71f68b4e5cf4a933ab58697fb", "shasum": "" }, "require": { @@ -4625,20 +4355,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2019-01-05T16:37:49+00:00" + "time": "2019-02-23T15:17:42+00:00" }, { "name": "symfony/finder", - "version": "v4.2.2", + "version": "v4.2.4", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "9094d69e8c6ee3fe186a0ec5a4f1401e506071ce" + "reference": "267b7002c1b70ea80db0833c3afe05f0fbde580a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/9094d69e8c6ee3fe186a0ec5a4f1401e506071ce", - "reference": "9094d69e8c6ee3fe186a0ec5a4f1401e506071ce", + "url": "https://api.github.com/repos/symfony/finder/zipball/267b7002c1b70ea80db0833c3afe05f0fbde580a", + "reference": "267b7002c1b70ea80db0833c3afe05f0fbde580a", "shasum": "" }, "require": { @@ -4674,20 +4404,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-01-03T09:07:35+00:00" + "time": "2019-02-23T15:42:05+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.2.2", + "version": "v4.2.4", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "a633d422a09242064ba24e44a6e1494c5126de86" + "reference": "850a667d6254ccf6c61d853407b16f21c4579c77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a633d422a09242064ba24e44a6e1494c5126de86", - "reference": "a633d422a09242064ba24e44a6e1494c5126de86", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/850a667d6254ccf6c61d853407b16f21c4579c77", + "reference": "850a667d6254ccf6c61d853407b16f21c4579c77", "shasum": "" }, "require": { @@ -4728,20 +4458,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2019-01-05T16:37:49+00:00" + "time": "2019-02-26T08:03:39+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.2.2", + "version": "v4.2.4", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "83de6543328917c18d5498eeb6bb6d36f7aab31b" + "reference": "895ceccaa8149f9343e6134e607c21da42d73b7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/83de6543328917c18d5498eeb6bb6d36f7aab31b", - "reference": "83de6543328917c18d5498eeb6bb6d36f7aab31b", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/895ceccaa8149f9343e6134e607c21da42d73b7a", + "reference": "895ceccaa8149f9343e6134e607c21da42d73b7a", "shasum": "" }, "require": { @@ -4817,7 +4547,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2019-01-06T16:19:23+00:00" + "time": "2019-03-03T19:38:09+00:00" }, { "name": "symfony/polyfill-ctype", @@ -4877,6 +4607,127 @@ ], "time": "2018-08-06T14:22:27+00:00" }, + { + "name": "symfony/polyfill-iconv", + "version": "v1.10.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-iconv.git", + "reference": "97001cfc283484c9691769f51cdf25259037eba2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/97001cfc283484c9691769f51cdf25259037eba2", + "reference": "97001cfc283484c9691769f51cdf25259037eba2", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-iconv": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.9-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Iconv\\": "" + }, + "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 Iconv extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "iconv", + "polyfill", + "portable", + "shim" + ], + "time": "2018-09-21T06:26:08+00:00" + }, + { + "name": "symfony/polyfill-intl-idn", + "version": "v1.10.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-idn.git", + "reference": "89de1d44f2c059b266f22c9cc9124ddc4cd0987a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/89de1d44f2c059b266f22c9cc9124ddc4cd0987a", + "reference": "89de1d44f2c059b266f22c9cc9124ddc4cd0987a", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/polyfill-mbstring": "^1.3", + "symfony/polyfill-php72": "^1.9" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.9-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Intl\\Idn\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + }, + { + "name": "Laurent Bassin", + "email": "laurent@bassin.info" + } + ], + "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": "2018-09-30T16:36:12+00:00" + }, { "name": "symfony/polyfill-mbstring", "version": "v1.10.0", @@ -4993,16 +4844,16 @@ }, { "name": "symfony/process", - "version": "v4.2.2", + "version": "v4.2.4", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "ea043ab5d8ed13b467a9087d81cb876aee7f689a" + "reference": "6c05edb11fbeff9e2b324b4270ecb17911a8b7ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/ea043ab5d8ed13b467a9087d81cb876aee7f689a", - "reference": "ea043ab5d8ed13b467a9087d81cb876aee7f689a", + "url": "https://api.github.com/repos/symfony/process/zipball/6c05edb11fbeff9e2b324b4270ecb17911a8b7ad", + "reference": "6c05edb11fbeff9e2b324b4270ecb17911a8b7ad", "shasum": "" }, "require": { @@ -5038,20 +4889,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2019-01-03T14:48:52+00:00" + "time": "2019-01-24T22:05:03+00:00" }, { "name": "symfony/routing", - "version": "v4.2.2", + "version": "v4.2.4", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "e69b7a13a0b58af378a49b49dd7084462de16cee" + "reference": "ff03eae644e6b1e26d4a04b2385fe3a1a7f04e42" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/e69b7a13a0b58af378a49b49dd7084462de16cee", - "reference": "e69b7a13a0b58af378a49b49dd7084462de16cee", + "url": "https://api.github.com/repos/symfony/routing/zipball/ff03eae644e6b1e26d4a04b2385fe3a1a7f04e42", + "reference": "ff03eae644e6b1e26d4a04b2385fe3a1a7f04e42", "shasum": "" }, "require": { @@ -5115,20 +4966,20 @@ "uri", "url" ], - "time": "2019-01-03T09:07:35+00:00" + "time": "2019-02-23T15:17:42+00:00" }, { "name": "symfony/translation", - "version": "v4.2.2", + "version": "v4.2.4", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "939fb792d73f2ce80e6ae9019d205fc480f1c9a0" + "reference": "748464177a77011f8f4cdd076773862ce4915f8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/939fb792d73f2ce80e6ae9019d205fc480f1c9a0", - "reference": "939fb792d73f2ce80e6ae9019d205fc480f1c9a0", + "url": "https://api.github.com/repos/symfony/translation/zipball/748464177a77011f8f4cdd076773862ce4915f8f", + "reference": "748464177a77011f8f4cdd076773862ce4915f8f", "shasum": "" }, "require": { @@ -5188,20 +5039,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2019-01-03T09:07:35+00:00" + "time": "2019-02-27T03:31:50+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.2.2", + "version": "v4.2.4", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "85bde661b178173d85c6f11ea9d03b61d1212bb2" + "reference": "9f87189ac10b42edf7fb8edc846f1937c6d157cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/85bde661b178173d85c6f11ea9d03b61d1212bb2", - "reference": "85bde661b178173d85c6f11ea9d03b61d1212bb2", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/9f87189ac10b42edf7fb8edc846f1937c6d157cf", + "reference": "9f87189ac10b42edf7fb8edc846f1937c6d157cf", "shasum": "" }, "require": { @@ -5264,7 +5115,7 @@ "debug", "dump" ], - "time": "2019-01-03T09:07:35+00:00" + "time": "2019-02-23T15:17:42+00:00" }, { "name": "tgalopin/html-sanitizer", @@ -5445,29 +5296,30 @@ }, { "name": "vlucas/phpdotenv", - "version": "v2.6.1", + "version": "v3.3.3", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5" + "reference": "dbcc609971dd9b55f48b8008b553d79fd372ddde" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2a7dcf7e3e02dc5e701004e51a6f304b713107d5", - "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/dbcc609971dd9b55f48b8008b553d79fd372ddde", + "reference": "dbcc609971dd9b55f48b8008b553d79fd372ddde", "shasum": "" }, "require": { - "php": ">=5.3.9", + "php": "^5.4 || ^7.0", + "phpoption/phpoption": "^1.5", "symfony/polyfill-ctype": "^1.9" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.0" + "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -5492,71 +5344,7 @@ "env", "environment" ], - "time": "2019-01-29T11:11:52+00:00" - }, - { - "name": "zendframework/zend-diactoros", - "version": "1.8.6", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "20da13beba0dde8fb648be3cc19765732790f46e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/20da13beba0dde8fb648be3cc19765732790f46e", - "reference": "20da13beba0dde8fb648be3cc19765732790f46e", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0", - "psr/http-message": "^1.0" - }, - "provide": { - "psr/http-message-implementation": "1.0" - }, - "require-dev": { - "ext-dom": "*", - "ext-libxml": "*", - "php-http/psr7-integration-tests": "dev-master", - "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7", - "zendframework/zend-coding-standard": "~1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.8.x-dev", - "dev-develop": "1.9.x-dev", - "dev-release-2.0": "2.0.x-dev" - } - }, - "autoload": { - "files": [ - "src/functions/create_uploaded_file.php", - "src/functions/marshal_headers_from_sapi.php", - "src/functions/marshal_method_from_sapi.php", - "src/functions/marshal_protocol_version_from_sapi.php", - "src/functions/marshal_uri_from_sapi.php", - "src/functions/normalize_server.php", - "src/functions/normalize_uploaded_files.php", - "src/functions/parse_cookie_header.php" - ], - "psr-4": { - "Zend\\Diactoros\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-2-Clause" - ], - "description": "PSR HTTP Message implementations", - "homepage": "https://github.com/zendframework/zend-diactoros", - "keywords": [ - "http", - "psr", - "psr-7" - ], - "time": "2018-09-05T19:29:37+00:00" + "time": "2019-03-06T09:39:45+00:00" } ], "packages-dev": [ @@ -5607,22 +5395,22 @@ }, { "name": "barryvdh/laravel-debugbar", - "version": "v3.2.1", + "version": "v3.2.3", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "9d5caf43c5f3a3aea2178942f281054805872e7c" + "reference": "5fcba4cc8e92a230b13b99c1083fc22ba8a5c479" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/9d5caf43c5f3a3aea2178942f281054805872e7c", - "reference": "9d5caf43c5f3a3aea2178942f281054805872e7c", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/5fcba4cc8e92a230b13b99c1083fc22ba8a5c479", + "reference": "5fcba4cc8e92a230b13b99c1083fc22ba8a5c479", "shasum": "" }, "require": { - "illuminate/routing": "5.5.x|5.6.x|5.7.x", - "illuminate/session": "5.5.x|5.6.x|5.7.x", - "illuminate/support": "5.5.x|5.6.x|5.7.x", + "illuminate/routing": "5.5.x|5.6.x|5.7.x|5.8.x", + "illuminate/session": "5.5.x|5.6.x|5.7.x|5.8.x", + "illuminate/support": "5.5.x|5.6.x|5.7.x|5.8.x", "maximebf/debugbar": "~1.15.0", "php": ">=7.0", "symfony/debug": "^3|^4", @@ -5671,7 +5459,7 @@ "profiler", "webprofiler" ], - "time": "2018-11-09T08:37:55+00:00" + "time": "2019-02-26T18:01:54+00:00" }, { "name": "beyondcode/laravel-dump-server", @@ -5780,16 +5568,16 @@ }, { "name": "codedungeon/phpunit-result-printer", - "version": "0.24.1", + "version": "0.26.1", "source": { "type": "git", "url": "https://github.com/mikeerickson/phpunit-pretty-result-printer.git", - "reference": "efac6389486641fd3390180c5e0eb4bec5f4cd9e" + "reference": "70efe139f174954392582103355a1b4a3d9022e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mikeerickson/phpunit-pretty-result-printer/zipball/efac6389486641fd3390180c5e0eb4bec5f4cd9e", - "reference": "efac6389486641fd3390180c5e0eb4bec5f4cd9e", + "url": "https://api.github.com/repos/mikeerickson/phpunit-pretty-result-printer/zipball/70efe139f174954392582103355a1b4a3d9022e5", + "reference": "70efe139f174954392582103355a1b4a3d9022e5", "shasum": "" }, "require": { @@ -5800,7 +5588,7 @@ "symfony/yaml": "^2.7|^3.0|^4.0" }, "require-dev": { - "phpunit/phpunit": "7.4.*", + "phpunit/phpunit": "8.0.*", "spatie/phpunit-watcher": "^1.6" }, "type": "library", @@ -5829,7 +5617,7 @@ "result-printer", "testing" ], - "time": "2019-01-05T19:01:49+00:00" + "time": "2019-02-28T18:52:43+00:00" }, { "name": "doctrine/instantiator", @@ -6163,35 +5951,37 @@ }, { "name": "laravel/dusk", - "version": "v4.0.5", + "version": "v5.0.2", "source": { "type": "git", "url": "https://github.com/laravel/dusk.git", - "reference": "c30c8a01d35661e253a7d3ea7ae6a79faf3f8d92" + "reference": "5ffd0603ec6ad68eb9f4bd0ea98c6d4005b2f7cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/dusk/zipball/c30c8a01d35661e253a7d3ea7ae6a79faf3f8d92", - "reference": "c30c8a01d35661e253a7d3ea7ae6a79faf3f8d92", + "url": "https://api.github.com/repos/laravel/dusk/zipball/5ffd0603ec6ad68eb9f4bd0ea98c6d4005b2f7cf", + "reference": "5ffd0603ec6ad68eb9f4bd0ea98c6d4005b2f7cf", "shasum": "" }, "require": { - "facebook/webdriver": "~1.3", - "illuminate/console": "~5.6", - "illuminate/support": "~5.6", - "nesbot/carbon": "~1.20", + "facebook/webdriver": "^1.3", + "illuminate/console": "~5.7.0|~5.8.0", + "illuminate/support": "~5.7.0|~5.8.0", + "nesbot/carbon": "^1.20|^2.0", "php": ">=7.1.0", - "symfony/console": "~4.0", - "symfony/process": "~4.0" + "symfony/console": "^4.0", + "symfony/finder": "^4.0", + "symfony/process": "^4.0", + "vlucas/phpdotenv": "^2.2|^3.3" }, "require-dev": { - "mockery/mockery": "~1.0", - "phpunit/phpunit": "~7.0" + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^7.0|^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "5.0-dev" }, "laravel": { "providers": [ @@ -6220,7 +6010,7 @@ "testing", "webdriver" ], - "time": "2019-01-10T14:22:35+00:00" + "time": "2019-03-12T15:52:39+00:00" }, { "name": "maximebf/debugbar", @@ -6285,16 +6075,16 @@ }, { "name": "mockery/mockery", - "version": "1.2.0", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "100633629bf76d57430b86b7098cd6beb996a35a" + "reference": "0eb0b48c3f07b3b89f5169ce005b7d05b18cf1d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/100633629bf76d57430b86b7098cd6beb996a35a", - "reference": "100633629bf76d57430b86b7098cd6beb996a35a", + "url": "https://api.github.com/repos/mockery/mockery/zipball/0eb0b48c3f07b3b89f5169ce005b7d05b18cf1d2", + "reference": "0eb0b48c3f07b3b89f5169ce005b7d05b18cf1d2", "shasum": "" }, "require": { @@ -6303,7 +6093,7 @@ "php": ">=5.6.0" }, "require-dev": { - "phpunit/phpunit": "~5.7.10|~6.5|~7.0" + "phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0" }, "type": "library", "extra": { @@ -6346,7 +6136,7 @@ "test double", "testing" ], - "time": "2018-10-02T21:52:37+00:00" + "time": "2019-02-13T09:37:52+00:00" }, { "name": "myclabs/deep-copy", @@ -6398,16 +6188,16 @@ }, { "name": "nunomaduro/collision", - "version": "v2.1.1", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/nunomaduro/collision.git", - "reference": "b5feb0c0d92978ec7169232ce5d70d6da6b29f63" + "reference": "af42d339fe2742295a54f6fdd42aaa6f8c4aca68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/b5feb0c0d92978ec7169232ce5d70d6da6b29f63", - "reference": "b5feb0c0d92978ec7169232ce5d70d6da6b29f63", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/af42d339fe2742295a54f6fdd42aaa6f8c4aca68", + "reference": "af42d339fe2742295a54f6fdd42aaa6f8c4aca68", "shasum": "" }, "require": { @@ -6417,10 +6207,10 @@ "symfony/console": "~2.8|~3.3|~4.0" }, "require-dev": { - "laravel/framework": "5.7.*", + "laravel/framework": "5.8.*", "nunomaduro/larastan": "^0.3.0", - "phpstan/phpstan": "^0.10", - "phpunit/phpunit": "~7.3" + "phpstan/phpstan": "^0.11", + "phpunit/phpunit": "~8.0" }, "type": "library", "extra": { @@ -6458,7 +6248,7 @@ "php", "symfony" ], - "time": "2018-11-21T21:40:54+00:00" + "time": "2019-03-07T21:35:13+00:00" }, { "name": "phar-io/manifest", @@ -6779,40 +6569,40 @@ }, { "name": "phpunit/php-code-coverage", - "version": "6.1.4", + "version": "7.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d" + "reference": "0317a769a81845c390e19684d9ba25d7f6aa4707" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", - "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/0317a769a81845c390e19684d9ba25d7f6aa4707", + "reference": "0317a769a81845c390e19684d9ba25d7f6aa4707", "shasum": "" }, "require": { "ext-dom": "*", "ext-xmlwriter": "*", - "php": "^7.1", - "phpunit/php-file-iterator": "^2.0", + "php": "^7.2", + "phpunit/php-file-iterator": "^2.0.2", "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^3.0", + "phpunit/php-token-stream": "^3.0.1", "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^3.1 || ^4.0", + "sebastian/environment": "^4.1", "sebastian/version": "^2.0.1", "theseer/tokenizer": "^1.1" }, "require-dev": { - "phpunit/phpunit": "^7.0" + "phpunit/phpunit": "^8.0" }, "suggest": { - "ext-xdebug": "^2.6.0" + "ext-xdebug": "^2.6.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "6.1-dev" + "dev-master": "7.0-dev" } }, "autoload": { @@ -6838,7 +6628,7 @@ "testing", "xunit" ], - "time": "2018-10-31T16:06:48+00:00" + "time": "2019-02-26T07:38:26+00:00" }, { "name": "phpunit/php-file-iterator", @@ -6933,16 +6723,16 @@ }, { "name": "phpunit/php-timer", - "version": "2.0.0", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f" + "reference": "8b389aebe1b8b0578430bda0c7c95a829608e059" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b8454ea6958c3dee38453d3bd571e023108c91f", - "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b389aebe1b8b0578430bda0c7c95a829608e059", + "reference": "8b389aebe1b8b0578430bda0c7c95a829608e059", "shasum": "" }, "require": { @@ -6954,7 +6744,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "2.1-dev" } }, "autoload": { @@ -6978,7 +6768,7 @@ "keywords": [ "timer" ], - "time": "2018-02-01T13:07:23+00:00" + "time": "2019-02-20T10:12:59+00:00" }, { "name": "phpunit/php-token-stream", @@ -7031,16 +6821,16 @@ }, { "name": "phpunit/phpunit", - "version": "7.5.3", + "version": "8.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "2cb759721e53bc05f56487f628c6b9fbb6c18746" + "reference": "19cbed2120839772c4a00e8b28456b0c77d1a7b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2cb759721e53bc05f56487f628c6b9fbb6c18746", - "reference": "2cb759721e53bc05f56487f628c6b9fbb6c18746", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/19cbed2120839772c4a00e8b28456b0c77d1a7b4", + "reference": "19cbed2120839772c4a00e8b28456b0c77d1a7b4", "shasum": "" }, "require": { @@ -7050,27 +6840,25 @@ "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", + "ext-xmlwriter": "*", "myclabs/deep-copy": "^1.7", "phar-io/manifest": "^1.0.2", "phar-io/version": "^2.0", - "php": "^7.1", + "php": "^7.2", "phpspec/prophecy": "^1.7", - "phpunit/php-code-coverage": "^6.0.7", + "phpunit/php-code-coverage": "^7.0", "phpunit/php-file-iterator": "^2.0.1", "phpunit/php-text-template": "^1.2.1", - "phpunit/php-timer": "^2.0", + "phpunit/php-timer": "^2.1", "sebastian/comparator": "^3.0", "sebastian/diff": "^3.0", - "sebastian/environment": "^4.0", + "sebastian/environment": "^4.1", "sebastian/exporter": "^3.1", - "sebastian/global-state": "^2.0", + "sebastian/global-state": "^3.0", "sebastian/object-enumerator": "^3.0.3", "sebastian/resource-operations": "^2.0", "sebastian/version": "^2.0.1" }, - "conflict": { - "phpunit/phpunit-mock-objects": "*" - }, "require-dev": { "ext-pdo": "*" }, @@ -7085,7 +6873,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "7.5-dev" + "dev-master": "8.0-dev" } }, "autoload": { @@ -7111,7 +6899,7 @@ "testing", "xunit" ], - "time": "2019-02-01T05:24:07+00:00" + "time": "2019-03-16T07:33:46+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -7224,23 +7012,23 @@ }, { "name": "sebastian/diff", - "version": "3.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "366541b989927187c4ca70490a35615d3fef2dce" + "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/366541b989927187c4ca70490a35615d3fef2dce", - "reference": "366541b989927187c4ca70490a35615d3fef2dce", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/720fcc7e9b5cf384ea68d9d930d480907a0c1a29", + "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29", "shasum": "" }, "require": { "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^7.0", + "phpunit/phpunit": "^7.5 || ^8.0", "symfony/process": "^2 || ^3.3 || ^4" }, "type": "library", @@ -7276,7 +7064,7 @@ "unidiff", "unified diff" ], - "time": "2018-06-10T07:54:39+00:00" + "time": "2019-02-04T06:01:07+00:00" }, { "name": "sebastian/environment", @@ -7400,23 +7188,26 @@ }, { "name": "sebastian/global-state", - "version": "2.0.0", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4" + "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", - "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4", + "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4", "shasum": "" }, "require": { - "php": "^7.0" + "php": "^7.2", + "sebastian/object-reflector": "^1.1.1", + "sebastian/recursion-context": "^3.0" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "ext-dom": "*", + "phpunit/phpunit": "^8.0" }, "suggest": { "ext-uopz": "*" @@ -7424,7 +7215,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -7447,7 +7238,7 @@ "keywords": [ "global state" ], - "time": "2017-04-27T15:39:26+00:00" + "time": "2019-02-01T05:30:01+00:00" }, { "name": "sebastian/object-enumerator", @@ -7724,16 +7515,16 @@ }, { "name": "symfony/yaml", - "version": "v4.2.2", + "version": "v4.2.4", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "d0aa6c0ea484087927b49fd513383a7d36190ca6" + "reference": "761fa560a937fd7686e5274ff89dcfa87a5047df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/d0aa6c0ea484087927b49fd513383a7d36190ca6", - "reference": "d0aa6c0ea484087927b49fd513383a7d36190ca6", + "url": "https://api.github.com/repos/symfony/yaml/zipball/761fa560a937fd7686e5274ff89dcfa87a5047df", + "reference": "761fa560a937fd7686e5274ff89dcfa87a5047df", "shasum": "" }, "require": { @@ -7779,7 +7570,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2019-01-03T09:07:35+00:00" + "time": "2019-02-23T15:17:42+00:00" }, { "name": "theseer/tokenizer", diff --git a/config/app.php b/config/app.php index 3b54d437..c3f1b0fe 100644 --- a/config/app.php +++ b/config/app.php @@ -226,6 +226,7 @@ return [ 'aliases' => [ 'App' => Illuminate\Support\Facades\App::class, + 'Arr' => Illuminate\Support\Arr::class, 'Artisan' => Illuminate\Support\Facades\Artisan::class, 'Auth' => Illuminate\Support\Facades\Auth::class, 'Blade' => Illuminate\Support\Facades\Blade::class, @@ -254,6 +255,7 @@ return [ 'Schema' => Illuminate\Support\Facades\Schema::class, 'Session' => Illuminate\Support\Facades\Session::class, 'Storage' => Illuminate\Support\Facades\Storage::class, + 'Str' => Illuminate\Support\Str::class, 'URL' => Illuminate\Support\Facades\URL::class, 'Validator' => Illuminate\Support\Facades\Validator::class, 'View' => Illuminate\Support\Facades\View::class, diff --git a/config/database.php b/config/database.php index a5af47f3..7b2492d8 100644 --- a/config/database.php +++ b/config/database.php @@ -54,6 +54,9 @@ return [ 'prefix_indexes' => true, 'strict' => true, 'engine' => null, + 'options' => extension_loaded('pdo_mysql') ? array_filter([ + PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), + ]) : [], ], 'pgsql' => [ diff --git a/database/seeds/ContactsTableSeeder.php b/database/seeds/ContactsTableSeeder.php index 2708d912..c5f6a1f8 100644 --- a/database/seeds/ContactsTableSeeder.php +++ b/database/seeds/ContactsTableSeeder.php @@ -2,6 +2,7 @@ use App\Models\Contact; use Illuminate\Database\Seeder; +use Illuminate\FileSystem\FileSystem; class ContactsTableSeeder extends Seeder { @@ -24,5 +25,13 @@ class ContactsTableSeeder extends Seeder 'homepage' => 'https://aaronparecki.com', 'facebook' => '123456', ]); + $fs = new FileSystem(); + if (!$fs->exists(public_path('assets/profile-images/aaronparecki.com'))) { + $fs->makeDirectory(public_path('assets/profile-images/aaronparecki.com')); + } + $fs->copy( + base_path('tests/aaron.png'), + public_path('assets/profile-images/aaronparecki.com/image') + ); } } diff --git a/public/assets/css/app.css b/public/assets/css/app.css index 211226c7..2a0f4c41 100644 --- a/public/assets/css/app.css +++ b/public/assets/css/app.css @@ -1,2 +1,2 @@ -html{box-sizing:border-box}*,*::before,*::after{box-sizing:inherit}html{font-size:10px;font-family:"filson-soft", serif}a.u-syndication{text-decoration:none}#topheader{display:flex;flex-flow:row;align-items:center;width:100%;min-height:5rem}#topheader h1{font-size:2rem;padding:0 2rem}#topheader nav{font-size:2rem}main{display:flex;flex-direction:column;align-items:stretch;max-width:512px;margin:0 auto;padding:0 0.5rem;font-size:2rem}.top-space{padding-top:2rem}.h-entry pre code{padding:1.5rem 2rem;border-radius:4px}.mini-h-card{position:relative}.mini-h-card .p-name{position:relative}.mini-h-card:hover .p-name{z-index:100}.hovercard{position:absolute;flex-direction:row;justify-content:space-between;align-items:flex-end;background:white;width:30rem;left:-10px;top:-10px;z-index:50;padding:2rem 1rem 1rem;border-radius:2px;box-shadow:3px 3px 2px 1px #101314;display:none}.mini-h-card:hover .hovercard{display:flex}.mini-h-card .social-icon{width:auto;height:2rem}.mini-h-card .u-photo{height:10rem}.note{display:flex;flex-direction:column;font-size:2rem}.note img{max-width:100%;max-height:80vh}.note-metadata{display:flex;flex-direction:row;justify-content:space-between}.icon{width:auto;height:1em}.note pre code{padding:1.5rem 2rem;border-radius:4px}.pagination{display:flex;flex-direction:row;justify-content:space-evenly;font-size:2rem;list-style-type:none}main .contact{font-size:2rem;display:flex;flex-direction:row-reverse;justify-content:space-between;margin-top:2rem}.contact .u-photo{width:auto;height:8rem}#projects{font-size:2rem}body>div.h-card{max-width:512px;margin:0 auto;font-size:1.5rem}footer{max-width:512px;margin:0 auto;display:flex;flex-direction:column;align-items:center}.admin-form{margin-top:2rem;margin-bottom:2rem}.form{display:flex;flex-direction:column}.form>div{display:flex;flex-direction:column}div.form-row{flex-direction:row}.u-like-of{margin-top:1rem}.p-bridgy-twitter-content,.p-bridgy-facebook-content{display:none}span[role=img][aria-label]{position:relative}span[role=img][aria-label]:focus::after,span[role=img][aria-label]:hover::after{position:absolute;display:block;z-index:1;bottom:1.5em;left:0;padding:0.5em 0.75em;border:0.05em solid #fff;border-radius:0.2em;box-shadow:0.15em 0.15em 0.5em #000;content:attr(aria-label);background-color:rgba(0,0,0,0.85);color:#fff;font-size:80%;-webkit-animation:TOOLTIP 0.1s ease-out 1;animation:TOOLTIP 0.1s ease-out 1}@-webkit-keyframes TOOLTIP{from{bottom:0.5em;background-color:rgba(0,0,0,0);border:0.05em solid rgba(255,255,255,0);color:rgba(255,255,255,0);box-shadow:0 0 0 #000}to{bottom:1.5em;background-color:rgba(0,0,0,0.85);border:0.05em solid #fff;color:#fff;box-shadow:0.15em 0.15em 0.5em #000}}@keyframes TOOLTIP{from{bottom:0.5em;background-color:rgba(0,0,0,0);border:0.05em solid rgba(255,255,255,0);color:rgba(255,255,255,0);box-shadow:0 0 0 #000}to{bottom:1.5em;background-color:rgba(0,0,0,0.85);border:0.05em solid #fff;color:#fff;box-shadow:0.15em 0.15em 0.5em #000}}@media print{span[role=img][aria-label]::after{content:" (" attr(aria-label) ") "}}.map{height:200px}.mapboxgl-ctrl-logo{border-bottom:none}.marker{background-image:url(data:image/png;base64,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);background-size:contain;width:20px;height:20px}.map-menu{position:absolute;top:0;left:0;background:white;padding:0.4rem}.map-menu label{margin-left:3px;margin-right:3px}body{background-color:var(--brwhite);color:var(--black)}#topheader{background-color:var(--black);color:var(--white)}a,a:visited{color:var(--blue)}html{text-rendering:optimizeLegibility;overflow-wrap:break-word;-webkit-font-kerning:normal;font-kerning:normal}h1 a{text-decoration:none}#topheader a{text-decoration:none}.tags{margin:0;overflow:hidden;padding:0}.tags li{float:left;list-style-type:none}.tag,.tag:visited{background:var(--white);border-radius:3px 0 0 3px;color:var(--black);display:inline-block;height:2.6rem;line-height:2.6rem;padding:0 2rem 0 1rem;position:relative;margin:0 1rem 1rem 0;text-decoration:none;transition:color 0.2s}.tag::after{background:var(--brwhite);border-bottom:1.3rem solid transparent;border-left:1rem solid var(--white);border-top:1.3rem solid transparent;content:'';position:absolute;right:0;top:0}.tag:hover{background-color:var(--red);color:var(--black)}.tag:hover::after{border-left-color:var(--red)} +html{font-family:montserrat, sans-serif;font-weight:300;font-style:normal;font-size:20px}h1{font-family:bebas-neue, sans-serif;font-weight:400;font-style:normal}code{font-family:"Operator Mono", monospace}#topheader{display:flex;width:100vw;flex-direction:column;align-items:center;background-color:var(--black)}#topheader a{color:var(--white);text-decoration:none}#topheader h1{margin-top:0;padding-top:1rem;font-size:3rem}#topheader nav{padding-bottom:1rem;font-size:1.5rem}main{display:flex;flex-direction:column;align-items:center;background-color:var(--white);color:var(--black)}main a{color:var(--blue);text-decoration:none}main .h-entry{margin:3rem 0}.pagination{display:flex;flex-direction:row;align-items:center;justify-content:space-around;list-style-type:none;width:40rem}.personal-bio{width:40rem}article.h-entry{width:40rem}.h-entry .note{width:40rem}@media screen and (max-width: 40rem){.h-entry .note{width:95vw}.h-entry .note .e-content img{width:100%}}footer{display:flex;flex-direction:column;align-items:center;background-color:var(--white);color:var(--black)}footer a{color:var(--blue);text-decoration:none}footer form:first-child{margin-bottom:1rem}footer p{margin-bottom:0}.map{height:200px}.note-metadata{display:flex;flex-direction:row;justify-content:space-between}.note-metadata .social-links{flex-direction:row}.note-metadata .social-links svg{height:1em;width:auto}span[role=img][aria-label]{position:relative}span[role=img][aria-label]:focus::after,span[role=img][aria-label]:hover::after{position:absolute;display:block;z-index:1;bottom:1.5em;left:0;padding:0.5em 0.75em;border:0.05em solid #fff;border-radius:0.2em;box-shadow:0.15em 0.15em 0.5em #000;content:attr(aria-label);background-color:rgba(0,0,0,0.85);color:#fff;font-size:80%;-webkit-animation:TOOLTIP 0.1s ease-out 1;animation:TOOLTIP 0.1s ease-out 1}@-webkit-keyframes TOOLTIP{from{bottom:0.5em;background-color:rgba(0,0,0,0);border:0.05em solid rgba(255,255,255,0);color:rgba(255,255,255,0);box-shadow:0 0 0 #000}to{bottom:1.5em;background-color:rgba(0,0,0,0.85);border:0.05em solid #fff;color:#fff;box-shadow:0.15em 0.15em 0.5em #000}}@keyframes TOOLTIP{from{bottom:0.5em;background-color:rgba(0,0,0,0);border:0.05em solid rgba(255,255,255,0);color:rgba(255,255,255,0);box-shadow:0 0 0 #000}to{bottom:1.5em;background-color:rgba(0,0,0,0.85);border:0.05em solid #fff;color:#fff;box-shadow:0.15em 0.15em 0.5em #000}}@media print{span[role=img][aria-label]::after{content:" (" attr(aria-label) ") "}} /*# sourceMappingURL=app.css.map */ \ No newline at end of file diff --git a/public/assets/css/app.css.map b/public/assets/css/app.css.map index 515dd533..97f202f1 100644 --- a/public/assets/css/app.css.map +++ b/public/assets/css/app.css.map @@ -1 +1 @@ -{"version":3,"sources":["../../../resources/sass/_border-box.scss","../../../resources/sass/_base-font.scss","../../../resources/sass/_header.scss","../../../resources/sass/_variables.scss","../../../resources/sass/_main.scss","../../../resources/sass/_articles.scss","../../../resources/sass/_hovercard.scss","../../../resources/sass/_notes.scss","../../../resources/sass/_pagination.scss","../../../resources/sass/_contacts-page.scss","../../../resources/sass/_projects.scss","../../../resources/sass/_footer.scss","../../../resources/sass/_admin-form.scss","../../../resources/sass/_form.scss","../../../resources/sass/_likes.scss","../../../resources/sass/_bridgy-links.scss","../../../resources/sass/_emoji.scss","../../../resources/sass/_mapbox.scss","../../../resources/sass/_colors.scss","../../../resources/sass/_styles.scss","../../../resources/sass/_tags.scss"],"names":[],"mappings":"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","file":"app.css"} \ No newline at end of file +{"version":3,"sources":["../../../resources/sass/_base.scss","../../../resources/sass/_site-header.scss","../../../resources/sass/_main.scss","../../../resources/sass/_pagination.scss","../../../resources/sass/_bio.scss","../../../resources/sass/_articles.scss","../../../resources/sass/_notes.scss","../../../resources/sass/_footer.scss","../../../resources/sass/_mapbox.scss","../../../resources/sass/_syndication.scss","../../../resources/sass/_emoji.scss"],"names":[],"mappings":"AAGA,KACI,kCAAmC,CACnC,eAAgB,CAChB,iBAAkB,CAClB,cAAe,CAClB,GAGG,kCAAmC,CACnC,eAAgB,CAChB,iBAAkB,CACrB,KAGG,sCAAuC,CAC1C,WCfG,YAAa,CACb,WAAY,CACZ,qBAAsB,CACtB,kBAAmB,CACnB,6BAA8B,CALlC,aAQQ,kBAAmB,CACnB,oBAAqB,CAT7B,cAaQ,YAAa,CACb,gBAAiB,CACjB,cAAe,CAfvB,eAmBQ,mBAAoB,CACpB,gBAAiB,CACpB,KCpBD,YAAa,CACb,qBAAsB,CACtB,kBAAmB,CACnB,6BAA8B,CAC9B,kBAAmB,CALvB,OAQQ,iBAAkB,CAClB,oBAAqB,CAT7B,cAaQ,aAAc,CACjB,YCbD,YAAa,CACb,kBAAmB,CACnB,kBAAmB,CACnB,4BAA6B,CAC7B,oBAAqB,CACrB,WHaa,CGZhB,cCNG,WJkBa,CIjBhB,gBCDG,WLkBa,CKjBhB,eCDG,WNkBa,CMjBhB,qCAGG,eACI,UAAW,CADf,8BAKY,UAAW,CACd,CCXb,OACI,YAAa,CACb,qBAAsB,CACtB,kBAAmB,CACnB,6BAA8B,CAC9B,kBAAmB,CALvB,SAQQ,iBAAkB,CAClB,oBAAqB,CAT7B,wBAaQ,kBAAmB,CAb3B,SAiBQ,eAAgB,CACnB,KCjBD,YAAa,CAChB,eCDG,YAAa,CACb,kBAAmB,CACnB,6BAA8B,CAHlC,6BAMQ,kBAAmB,CAN3B,iCASY,UAAW,CACX,UAAW,CACd,2BCRL,iBAAkB,CACrB,gFAIG,iBAAkB,CAClB,aAAc,CACd,SAAU,CACV,YAAa,CACb,MAAO,CACP,oBAAqB,CACrB,wBAA2C,CAC3C,mBAAoB,CACpB,mCAAgD,CAChD,wBAAyB,CACzB,iCAAqC,CACrC,UAA6B,CAC7B,aAAc,CACd,yCAAW,CAAX,iCAAkC,CACrC,2BAGG,KACI,YAAa,CACb,8BAAkC,CAClC,uCAA2C,CAC3C,yBAA6B,CAC7B,qBAAkC,CAGtC,GACI,YAAa,CACb,iCAAqC,CACrC,wBAA2C,CAC3C,UAA6B,CAC7B,mCAAgD,CAAA,CAhBvD,mBAGG,KACI,YAAa,CACb,8BAAkC,CAClC,uCAA2C,CAC3C,yBAA6B,CAC7B,qBAAkC,CAGtC,GACI,YAAa,CACb,iCAAqC,CACrC,wBAA2C,CAC3C,UAA6B,CAC7B,mCAAgD,CAAA,CAIxD,aACI,kCACI,kCAAmC,CACtC","file":"app.css"} \ No newline at end of file diff --git a/public/assets/img/iwc.svg b/public/assets/img/iwc.svg new file mode 100644 index 00000000..8ad3f06d --- /dev/null +++ b/public/assets/img/iwc.svg @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/sass/_admin-form.scss b/resources/sass/_admin-form.scss deleted file mode 100644 index beb5d813..00000000 --- a/resources/sass/_admin-form.scss +++ /dev/null @@ -1,6 +0,0 @@ -//admin-form.scss - -.admin-form { - margin-top: 2rem; - margin-bottom: 2rem; -} diff --git a/resources/sass/_articles.scss b/resources/sass/_articles.scss index cfa07bb6..72095a8e 100644 --- a/resources/sass/_articles.scss +++ b/resources/sass/_articles.scss @@ -1,6 +1,5 @@ //articles.scss -.h-entry pre code { - padding: 1.5rem 2rem; - border-radius: 4px; +article.h-entry { + width: $mainWidth; } diff --git a/resources/sass/_base-font.scss b/resources/sass/_base-font.scss deleted file mode 100644 index 3cd3072c..00000000 --- a/resources/sass/_base-font.scss +++ /dev/null @@ -1,10 +0,0 @@ -//base-font.scss - -html { - font-size: 10px; - font-family: "filson-soft", serif; -} - -a.u-syndication { - text-decoration: none; -} diff --git a/resources/sass/_base.scss b/resources/sass/_base.scss new file mode 100644 index 00000000..4996c3f5 --- /dev/null +++ b/resources/sass/_base.scss @@ -0,0 +1,22 @@ +// _base.scss + +// Fonts +html { + font-family: montserrat, sans-serif; + font-weight: 300; + font-style: normal; + font-size: 20px; +} + +h1 { + font-family: bebas-neue, sans-serif; + font-weight: 400; + font-style: normal; +} + +code { + font-family: "Operator Mono", monospace; +} + +// Variables +$mainWidth: 40rem; diff --git a/resources/sass/_bio.scss b/resources/sass/_bio.scss new file mode 100644 index 00000000..be6ee095 --- /dev/null +++ b/resources/sass/_bio.scss @@ -0,0 +1,5 @@ +// bio.scss + +.personal-bio { + width: $mainWidth; +} diff --git a/resources/sass/_border-box.scss b/resources/sass/_border-box.scss deleted file mode 100644 index 65cd66b6..00000000 --- a/resources/sass/_border-box.scss +++ /dev/null @@ -1,14 +0,0 @@ -//border-box.scss - -//use universal box sizing with inheritance -//from https://css-tricks.com/box-sizing/ - -html { - box-sizing: border-box; -} - -*, -*::before, -*::after { - box-sizing: inherit; -} diff --git a/resources/sass/_bridgy-links.scss b/resources/sass/_bridgy-links.scss deleted file mode 100644 index edb925d2..00000000 --- a/resources/sass/_bridgy-links.scss +++ /dev/null @@ -1,6 +0,0 @@ -// bridgy-links.scss - -.p-bridgy-twitter-content, -.p-bridgy-facebook-content { - display: none; -} diff --git a/resources/sass/_colors.scss b/resources/sass/_colors.scss deleted file mode 100644 index 9ba406df..00000000 --- a/resources/sass/_colors.scss +++ /dev/null @@ -1,16 +0,0 @@ -//colors.scss - -body { - background-color: var(--brwhite); - color: var(--black); -} - -#topheader { - background-color: var(--black); - color: var(--white); -} - -a, -a:visited { - color: var(--blue); -} diff --git a/resources/sass/_contacts-page.scss b/resources/sass/_contacts-page.scss deleted file mode 100644 index 4e409adc..00000000 --- a/resources/sass/_contacts-page.scss +++ /dev/null @@ -1,14 +0,0 @@ -//contacts-page.scss - -main .contact { - font-size: 2rem; - display: flex; - flex-direction: row-reverse; - justify-content: space-between; - margin-top: 2rem; -} - -.contact .u-photo { - width: auto; - height: 8rem; -} diff --git a/resources/sass/_footer.scss b/resources/sass/_footer.scss index e527e6aa..e3a78419 100644 --- a/resources/sass/_footer.scss +++ b/resources/sass/_footer.scss @@ -1,15 +1,22 @@ -//footer.scss - -body > div.h-card { - max-width: $body-width; - margin: 0 auto; - font-size: 1.5rem; -} +// footer.scss footer { - max-width: $body-width; - margin: 0 auto; display: flex; flex-direction: column; align-items: center; + background-color: var(--white); + color: var(--black); + + a { + color: var(--blue); + text-decoration: none; + } + + form:first-child { + margin-bottom: 1rem; + } + + p { + margin-bottom: 0; + } } diff --git a/resources/sass/_form.scss b/resources/sass/_form.scss deleted file mode 100644 index 09a06592..00000000 --- a/resources/sass/_form.scss +++ /dev/null @@ -1,15 +0,0 @@ -//form.scss - -.form { - display: flex; - flex-direction: column; -} - -.form > div { - display: flex; - flex-direction: column; -} - -div.form-row { - flex-direction: row; -} diff --git a/resources/sass/_header.scss b/resources/sass/_header.scss deleted file mode 100644 index 5c6563c4..00000000 --- a/resources/sass/_header.scss +++ /dev/null @@ -1,18 +0,0 @@ -//header.scss - -#topheader { - display: flex; - flex-flow: row; - align-items: center; - width: 100%; - min-height: $header-height; -} - -#topheader h1 { - font-size: 2rem; - padding: 0 2rem; -} - -#topheader nav { - font-size: 2rem; -} diff --git a/resources/sass/_hovercard.scss b/resources/sass/_hovercard.scss deleted file mode 100644 index 72a72ae9..00000000 --- a/resources/sass/_hovercard.scss +++ /dev/null @@ -1,42 +0,0 @@ -//hovercard.scss - -.mini-h-card { - position: relative; -} - -.mini-h-card .p-name { - position: relative; -} - -.mini-h-card:hover .p-name { - z-index: 100; -} - -.hovercard { - position: absolute; - flex-direction: row; - justify-content: space-between; - align-items: flex-end; - background: white; - width: 30rem; - left: -10px; - top: -10px; - z-index: 50; - padding: 2rem 1rem 1rem; - border-radius: 2px; - box-shadow: 3px 3px 2px 1px hsla(190, 11%, 7%, 1); - display: none; -} - -.mini-h-card:hover .hovercard { - display: flex; -} - -.mini-h-card .social-icon { - width: auto; - height: 2rem; -} - -.mini-h-card .u-photo { - height: 10rem; -} diff --git a/resources/sass/_likes.scss b/resources/sass/_likes.scss deleted file mode 100644 index 0954872a..00000000 --- a/resources/sass/_likes.scss +++ /dev/null @@ -1,5 +0,0 @@ -//likes.scss - -.u-like-of { - margin-top: 1rem; -} diff --git a/resources/sass/_main.scss b/resources/sass/_main.scss index 5beededf..a7ced3a8 100644 --- a/resources/sass/_main.scss +++ b/resources/sass/_main.scss @@ -1,16 +1,21 @@ -//main.scss +// main.scss main { display: flex; flex-direction: column; - align-items: stretch; - max-width: $body-width; - margin: 0 auto; - padding: 0 0.5rem; - font-size: 2rem; + align-items: center; + background-color: var(--white); + color: var(--black); + + a { + color: var(--blue); + text-decoration: none; + } + + .h-entry { + margin: 3rem 0; + } } -// add some padding to the top for pages that need it -.top-space { - padding-top: 2rem; -} +@import "pagination"; +@import "bio"; diff --git a/resources/sass/_mapbox.scss b/resources/sass/_mapbox.scss index f50b2921..a21d9c7c 100644 --- a/resources/sass/_mapbox.scss +++ b/resources/sass/_mapbox.scss @@ -1,29 +1,5 @@ -// mapbox.scss +//mapbox.scss .map { height: 200px; } - -.mapboxgl-ctrl-logo { - border-bottom: none; -} - -.marker { - background-image: url(data:image/png;base64,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); - background-size: contain; - width: 20px; - height: 20px; -} - -.map-menu { - position: absolute; - top: 0; - left: 0; - background: white; - padding: 0.4rem; -} - -.map-menu label { - margin-left: 3px; - margin-right: 3px; -} diff --git a/resources/sass/_notes.scss b/resources/sass/_notes.scss index dde2c313..1760f7f7 100644 --- a/resources/sass/_notes.scss +++ b/resources/sass/_notes.scss @@ -1,34 +1,17 @@ -//notes.scss +// notes.scss -//the hovercard that is displayed in notes -@import "hovercard"; - -.note { - display: flex; - flex-direction: column; - font-size: 2rem; +.h-entry .note { + width: $mainWidth; } -.note img { - max-width: 100%; - max-height: 80vh; -} +@media screen and (max-width: $mainWidth) { + .h-entry .note { + width: 95vw; -.note-metadata { - display: flex; - flex-direction: row; - justify-content: space-between; + .e-content { + img { + width: 100%; + } + } + } } - -.icon { - width: auto; - height: 1em; -} - -.note pre code { - padding: 1.5rem 2rem; - border-radius: 4px; -} - -//style the pagination links -@import "pagination"; diff --git a/resources/sass/_pagination.scss b/resources/sass/_pagination.scss index e33b3230..f4edc216 100644 --- a/resources/sass/_pagination.scss +++ b/resources/sass/_pagination.scss @@ -1,9 +1,10 @@ -//pagination.scss +// pagination.scss .pagination { display: flex; flex-direction: row; - justify-content: space-evenly; - font-size: 2rem; + align-items: center; + justify-content: space-around; list-style-type: none; + width: $mainWidth; } diff --git a/resources/sass/_projects.scss b/resources/sass/_projects.scss deleted file mode 100644 index e7505a98..00000000 --- a/resources/sass/_projects.scss +++ /dev/null @@ -1,5 +0,0 @@ -//projects.scss - -#projects { - font-size: 2rem; -} diff --git a/resources/sass/_site-header.scss b/resources/sass/_site-header.scss new file mode 100644 index 00000000..6ead7f56 --- /dev/null +++ b/resources/sass/_site-header.scss @@ -0,0 +1,25 @@ +// site-header.scss + +#topheader { + display: flex; + width: 100vw; + flex-direction: column; + align-items: center; + background-color: var(--black); + + a { + color: var(--white); + text-decoration: none; + } + + h1 { + margin-top: 0; + padding-top: 1rem; + font-size: 3rem; + } + + nav { + padding-bottom: 1rem; + font-size: 1.5rem; + } +} diff --git a/resources/sass/_styles.scss b/resources/sass/_styles.scss deleted file mode 100644 index 6a34274d..00000000 --- a/resources/sass/_styles.scss +++ /dev/null @@ -1,19 +0,0 @@ -//styles.scss - -html { - text-rendering: optimizeLegibility; - //text-decoration-skip-ink: auto; - overflow-wrap: break-word; - font-kerning: normal; -} - -h1 a { - text-decoration: none; -} - -#topheader a { - text-decoration: none; -} - -// tags -@import "tags"; diff --git a/resources/sass/_syndication.scss b/resources/sass/_syndication.scss new file mode 100644 index 00000000..5649a76a --- /dev/null +++ b/resources/sass/_syndication.scss @@ -0,0 +1,16 @@ +//syndication.scss + +.note-metadata { + display: flex; + flex-direction: row; + justify-content: space-between; + + .social-links { + flex-direction: row; + + svg { + height: 1em; + width: auto; + } + } +} diff --git a/resources/sass/_tags.scss b/resources/sass/_tags.scss deleted file mode 100644 index c568687b..00000000 --- a/resources/sass/_tags.scss +++ /dev/null @@ -1,49 +0,0 @@ -//tags.scss - -//sourced from https://codepen.io/wbeeftink/pen/dIaDH - -.tags { - margin: 0; - overflow: hidden; - padding: 0; -} - -.tags li { - float: left; - list-style-type: none; -} - -.tag, -.tag:visited { - background: var(--white); - border-radius: 3px 0 0 3px; - color: var(--black); - display: inline-block; - height: 2.6rem; - line-height: 2.6rem; - padding: 0 2rem 0 1rem; - position: relative; - margin: 0 1rem 1rem 0; - text-decoration: none; - transition: color 0.2s; -} - -.tag::after { - background: var(--brwhite); - border-bottom: 1.3rem solid transparent; - border-left: 1rem solid var(--white); - border-top: 1.3rem solid transparent; - content: ''; - position: absolute; - right: 0; - top: 0; -} - -.tag:hover { - background-color: var(--red); - color: var(--black); -} - -.tag:hover::after { - border-left-color: var(--red); -} diff --git a/resources/sass/_variables.scss b/resources/sass/_variables.scss deleted file mode 100644 index f22c7928..00000000 --- a/resources/sass/_variables.scss +++ /dev/null @@ -1,4 +0,0 @@ -//variables.scss - -$body-width: 512px; -$header-height: 5rem; diff --git a/resources/sass/app.scss b/resources/sass/app.scss index 283e3d7d..430baa62 100644 --- a/resources/sass/app.scss +++ b/resources/sass/app.scss @@ -1,37 +1,18 @@ // app.scss -//variables used elsewhere -@import "variables"; - -//border-box -@import "border-box"; - -//base font styles -@import "base-font"; - -//layouts -@import "header"; +// General styles +@import "base"; +@import "site-header"; @import "main"; @import "articles"; @import "notes"; -@import "contacts-page"; -@import "projects"; @import "footer"; -@import "admin-form"; -@import "form"; -@import "likes"; -//hide the custom bridgy posse content -@import "bridgy-links"; - -//style the emoji alt-text (a11y) -@import "emoji"; - -//style the mapbox maps +// Mapbox styles @import "mapbox"; -//apply colors -@import "colors"; +// The syndication links at the end of notes +@import "syndication"; -//apply styles -@import "styles"; +// Accessible emoji +@import "emoji"; diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php index aa669acf..eb6f86b7 100644 --- a/resources/views/master.blade.php +++ b/resources/views/master.blade.php @@ -7,7 +7,7 @@ - + @@ -41,9 +41,9 @@
@yield('content') -
@section('bio') @show + @@ -59,7 +59,7 @@

The code for {{ config('app.longurl') }} can be found on GitHub.

:

Built with love: Colophon

-

+

Indie Web Camp logo

@if (config('app.piwik') === true) diff --git a/resources/views/templates/bio.blade.php b/resources/views/templates/bio.blade.php index 722a668b..63a16f37 100644 --- a/resources/views/templates/bio.blade.php +++ b/resources/views/templates/bio.blade.php @@ -1,32 +1,32 @@ @section('bio') -
-

My name is Jonny Barnes, and - - jonnybarnes.uk - is my site. I’m from - - Manchester, - UK - .

-

I am active to varying degrees on several - silos:

- -

My usual online nickname is normally - jonnybarnes for other services. I also syndicate my content - to the IndieWeb friendly site - micro.blog. - Here’s a - profile pic. I also have a - PGP - key, with fingerprint. You can email me - at jonny at my domain, or message me on - XMPP.

-
+
+

My name is Jonny Barnes, and + + jonnybarnes.uk + is my site. I’m from + + Manchester, + UK + .

+

I am active to varying degrees on several + silos:

+ +

My usual online nickname is normally + jonnybarnes for other services. I also syndicate my content + to the IndieWeb friendly site + micro.blog. + Here’s a + profile pic. I also have a + PGP + key, with fingerprint. You can email me + at jonny at my domain, or message me on + XMPP.

+
@stop diff --git a/tests/Browser/ExampleTest.php b/tests/Browser/ExampleTest.php new file mode 100644 index 00000000..3827756b --- /dev/null +++ b/tests/Browser/ExampleTest.php @@ -0,0 +1,23 @@ +browse(function (Browser $browser) { + $browser->visit('/') + ->assertSee('Laravel'); + }); + } +} diff --git a/tests/Feature/Admin/ContactsTest.php b/tests/Feature/Admin/ContactsTest.php index 2921bc26..7c13ab12 100644 --- a/tests/Feature/Admin/ContactsTest.php +++ b/tests/Feature/Admin/ContactsTest.php @@ -15,7 +15,7 @@ class ContactsTest extends TestCase { use DatabaseTransactions; - public function tearDown() + protected function tearDown(): void { if (file_exists(public_path() . '/assets/profile-images/tantek.com/image')) { unlink(public_path() . '/assets/profile-images/tantek.com/image'); diff --git a/tests/Feature/ParseCachedWebMentionsTest.php b/tests/Feature/ParseCachedWebMentionsTest.php index 5cedfb43..f07bf247 100644 --- a/tests/Feature/ParseCachedWebMentionsTest.php +++ b/tests/Feature/ParseCachedWebMentionsTest.php @@ -12,7 +12,7 @@ class ParseCachedWebMentionsTest extends TestCase { use DatabaseTransactions; - public function setUp() + protected function setUp(): void { parent::setUp(); @@ -43,7 +43,7 @@ class ParseCachedWebMentionsTest extends TestCase $this->assertTrue($webmentionTantek->updated_at->gt($webmentionTantek->created_at)); } - public function tearDown() + protected function tearDown(): void { $fs = new FileSystem(); if ($fs->exists(storage_path() . '/HTML/https')) { diff --git a/tests/Feature/TokenServiceTest.php b/tests/Feature/TokenServiceTest.php index 58b4cc3d..dfd2e3ae 100644 --- a/tests/Feature/TokenServiceTest.php +++ b/tests/Feature/TokenServiceTest.php @@ -6,6 +6,7 @@ use Tests\TestCase; use Lcobucci\JWT\Builder; use App\Services\TokenService; use Lcobucci\JWT\Signer\Hmac\Sha256; +use App\Exceptions\InvalidTokenException; class TokenServiceTest extends TestCase { @@ -33,12 +34,11 @@ class TokenServiceTest extends TestCase $this->assertSame($data, $validData); } - /** - * @expectedException App\Exceptions\InvalidTokenException - * @expectedExceptionMessage Token failed validation - */ - public function test_token_with_different_singing_key_throws_exception() + public function test_token_with_different_signing_key_throws_exception() { + $this->expectException(InvalidTokenException::class); + $this->expectExceptionMessage('Token failed validation'); + $data = [ 'me' => 'https://example.org', 'client_id' => 'https://quill.p3k.io', diff --git a/tests/Unit/BookmarksTest.php b/tests/Unit/BookmarksTest.php index 78617273..c5691795 100644 --- a/tests/Unit/BookmarksTest.php +++ b/tests/Unit/BookmarksTest.php @@ -8,6 +8,7 @@ use GuzzleHttp\HandlerStack; use GuzzleHttp\Psr7\Response; use App\Services\BookmarkService; use GuzzleHttp\Handler\MockHandler; +use App\Exceptions\InternetArchiveException; class BookmarksTest extends TestCase { @@ -32,11 +33,10 @@ class BookmarksTest extends TestCase $this->assertEquals('/web/1234/example.org', $url); } - /** - * @expectedException App\Exceptions\InternetArchiveException - */ public function test_archive_link_method_archive_site_error_exception() { + $this->expectException(InternetArchiveException::class); + $mock = new MockHandler([ new Response(403), ]); @@ -46,11 +46,10 @@ class BookmarksTest extends TestCase $url = (new BookmarkService())->getArchiveLink('https://example.org'); } - /** - * @expectedException App\Exceptions\InternetArchiveException - */ public function test_archive_link_method_archive_site_no_location_exception() { + $this->expectException(InternetArchiveException::class); + $mock = new MockHandler([ new Response(200), ]); diff --git a/tests/Unit/Jobs/DownloadWebMentionJobTest.php b/tests/Unit/Jobs/DownloadWebMentionJobTest.php index 39dade3c..bc8731d4 100644 --- a/tests/Unit/Jobs/DownloadWebMentionJobTest.php +++ b/tests/Unit/Jobs/DownloadWebMentionJobTest.php @@ -13,7 +13,7 @@ use Illuminate\Foundation\Testing\RefreshDatabase; class DownloadWebMentionJobTest extends TestCase { - public function tearDown() + protected function tearDown(): void { $fs = new FileSystem(); if ($fs->exists(storage_path() . '/HTML/https')) { diff --git a/tests/Unit/Jobs/ProcessWebMentionJobTest.php b/tests/Unit/Jobs/ProcessWebMentionJobTest.php index 6a845caf..bede514c 100644 --- a/tests/Unit/Jobs/ProcessWebMentionJobTest.php +++ b/tests/Unit/Jobs/ProcessWebMentionJobTest.php @@ -14,13 +14,14 @@ use GuzzleHttp\Handler\MockHandler; use Illuminate\FileSystem\FileSystem; use Illuminate\Support\Facades\Queue; use Jonnybarnes\WebmentionsParser\Parser; +use App\Exceptions\RemoteContentNotFoundException; use Illuminate\Foundation\Testing\DatabaseTransactions; class ProcessWebMentionJobTest extends TestCase { use DatabaseTransactions; - public function tearDown() + protected function tearDown(): void { $fs = new FileSystem(); if ($fs->exists(storage_path() . '/HTML/https')) { @@ -29,11 +30,10 @@ class ProcessWebMentionJobTest extends TestCase parent::tearDown(); } - /** - * @expectedException \App\Exceptions\RemoteContentNotFoundException - */ public function test_for_exception_from_failure_to_get_webmention() { + $this->expectException(RemoteContentNotFoundException::class); + $parser = new Parser(); $mock = new MockHandler([ new Response(404), diff --git a/tests/Unit/Jobs/SaveProfileImageJobTest.php b/tests/Unit/Jobs/SaveProfileImageJobTest.php index da4ddf74..e278798b 100644 --- a/tests/Unit/Jobs/SaveProfileImageJobTest.php +++ b/tests/Unit/Jobs/SaveProfileImageJobTest.php @@ -14,7 +14,7 @@ use Jonnybarnes\WebmentionsParser\Exceptions\AuthorshipParserException; class SaveProfileImageJobTest extends TestCase { - public function tearDown() + protected function tearDown(): void { if (file_exists(public_path() . '/assets/profile-images/example.org/image')) { unlink(public_path() . '/assets/profile-images/example.org/image'); diff --git a/tests/Unit/PlacesTest.php b/tests/Unit/PlacesTest.php index 45c33b2a..b989f9af 100644 --- a/tests/Unit/PlacesTest.php +++ b/tests/Unit/PlacesTest.php @@ -66,22 +66,20 @@ class PlacesTest extends TestCase $this->assertEquals(2, count(Place::all())); // still 2 places } - /** - * @expectedException InvalidArgumentException - * @expectedExceptionMessage Missing required name - */ public function test_service_requires_name() { + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Missing required name'); + $service = new PlaceService(); $service->createPlaceFromCheckin(['foo' => 'bar']); } - /** - * @expectedException InvalidArgumentException - * @expectedExceptionMessage Missing required longitude/latitude - */ public function test_service_requires_latitude() { + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Missing required longitude/latitude'); + $service = new PlaceService(); $service->createPlaceFromCheckin(['properties' => ['name' => 'bar']]); }