diff --git a/composer.json b/composer.json index c2fa596..2873c08 100644 --- a/composer.json +++ b/composer.json @@ -5,14 +5,14 @@ "php": "^7.2.5", "ext-ctype": "*", "ext-iconv": "*", - "illuminate/support": "^7.9", "symfony/cache": "5.0.*", "symfony/console": "5.0.*", "symfony/dotenv": "5.0.*", "symfony/flex": "^1.3.1", "symfony/framework-bundle": "5.0.*", "symfony/http-client": "5.0.*", - "symfony/yaml": "5.0.*" + "symfony/yaml": "5.0.*", + "tightenco/collect": "^7.9" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2", diff --git a/composer.lock b/composer.lock index 8e38e08..72ec3cd 100644 --- a/composer.lock +++ b/composer.lock @@ -4,263 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "49a1e46ab9ff4cb058c8468e450f35b7", + "content-hash": "a79c570b605cfe719112d6fefc5f8f1b", "packages": [ - { - "name": "doctrine/inflector", - "version": "1.3.1", - "source": { - "type": "git", - "url": "https://github.com/doctrine/inflector.git", - "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/ec3a55242203ffa6a4b27c58176da97ff0a7aec1", - "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1", - "shasum": "" - }, - "require": { - "php": "^7.1" - }, - "require-dev": { - "phpunit/phpunit": "^6.2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "Common String Manipulations with regard to casing and singular/plural rules.", - "homepage": "http://www.doctrine-project.org", - "keywords": [ - "inflection", - "pluralize", - "singularize", - "string" - ], - "time": "2019-10-30T19:59:35+00:00" - }, - { - "name": "illuminate/contracts", - "version": "v7.9.2", - "source": { - "type": "git", - "url": "https://github.com/illuminate/contracts.git", - "reference": "4f9cad4bd982e9f100b1f0a42677fdd3bbfa48fd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/illuminate/contracts/zipball/4f9cad4bd982e9f100b1f0a42677fdd3bbfa48fd", - "reference": "4f9cad4bd982e9f100b1f0a42677fdd3bbfa48fd", - "shasum": "" - }, - "require": { - "php": "^7.2.5", - "psr/container": "^1.0", - "psr/simple-cache": "^1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "7.x-dev" - } - }, - "autoload": { - "psr-4": { - "Illuminate\\Contracts\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylor@laravel.com" - } - ], - "description": "The Illuminate Contracts package.", - "homepage": "https://laravel.com", - "time": "2020-04-28T07:21:27+00:00" - }, - { - "name": "illuminate/support", - "version": "v7.9.2", - "source": { - "type": "git", - "url": "https://github.com/illuminate/support.git", - "reference": "677a3ad776db92b339a2926927929d0b070642ea" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/677a3ad776db92b339a2926927929d0b070642ea", - "reference": "677a3ad776db92b339a2926927929d0b070642ea", - "shasum": "" - }, - "require": { - "doctrine/inflector": "^1.1", - "ext-json": "*", - "ext-mbstring": "*", - "illuminate/contracts": "^7.0", - "nesbot/carbon": "^2.17", - "php": "^7.2.5", - "voku/portable-ascii": "^1.4.8" - }, - "conflict": { - "tightenco/collect": "<5.5.33" - }, - "suggest": { - "illuminate/filesystem": "Required to use the composer class (^7.0).", - "moontoast/math": "Required to use ordered UUIDs (^1.1).", - "ramsey/uuid": "Required to use Str::uuid() (^3.7|^4.0).", - "symfony/process": "Required to use the composer class (^5.0).", - "symfony/var-dumper": "Required to use the dd function (^5.0).", - "vlucas/phpdotenv": "Required to use the Env class and env helper (^4.0)." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "7.x-dev" - } - }, - "autoload": { - "psr-4": { - "Illuminate\\Support\\": "" - }, - "files": [ - "helpers.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylor@laravel.com" - } - ], - "description": "The Illuminate Support package.", - "homepage": "https://laravel.com", - "time": "2020-04-28T07:20:41+00:00" - }, - { - "name": "nesbot/carbon", - "version": "2.33.0", - "source": { - "type": "git", - "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "4d93cb95a80d9ffbff4018fe58ae3b7dd7f4b99b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4d93cb95a80d9ffbff4018fe58ae3b7dd7f4b99b", - "reference": "4d93cb95a80d9ffbff4018fe58ae3b7dd7f4b99b", - "shasum": "" - }, - "require": { - "ext-json": "*", - "php": "^7.1.8 || ^8.0", - "symfony/polyfill-mbstring": "^1.0", - "symfony/translation": "^3.4 || ^4.0 || ^5.0" - }, - "require-dev": { - "doctrine/orm": "^2.7", - "friendsofphp/php-cs-fixer": "^2.14 || ^3.0", - "kylekatarnls/multi-tester": "^1.1", - "phpmd/phpmd": "^2.8", - "phpstan/phpstan": "^0.11", - "phpunit/phpunit": "^7.5 || ^8.0", - "squizlabs/php_codesniffer": "^3.4" - }, - "bin": [ - "bin/carbon" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - }, - "laravel": { - "providers": [ - "Carbon\\Laravel\\ServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "Carbon\\": "src/Carbon/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Brian Nesbitt", - "email": "brian@nesbot.com", - "homepage": "http://nesbot.com" - }, - { - "name": "kylekatarnls", - "homepage": "http://github.com/kylekatarnls" - } - ], - "description": "An API extension for DateTime that supports 281 different languages.", - "homepage": "http://carbon.nesbot.com", - "keywords": [ - "date", - "datetime", - "time" - ], - "funding": [ - { - "url": "https://opencollective.com/Carbon", - "type": "open_collective" - }, - { - "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon", - "type": "tidelift" - } - ], - "time": "2020-04-20T15:05:43+00:00" - }, { "name": "psr/cache", "version": "1.0.1", @@ -449,54 +194,6 @@ ], "time": "2020-03-23T09:12:05+00:00" }, - { - "name": "psr/simple-cache", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/simple-cache.git", - "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", - "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\SimpleCache\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interfaces for simple caching", - "keywords": [ - "cache", - "caching", - "psr", - "psr-16", - "simple-cache" - ], - "time": "2017-10-23T01:57:42+00:00" - }, { "name": "symfony/cache", "version": "v5.0.8", @@ -2269,154 +1966,6 @@ ], "time": "2019-11-18T17:27:11+00:00" }, - { - "name": "symfony/translation", - "version": "v5.0.8", - "source": { - "type": "git", - "url": "https://github.com/symfony/translation.git", - "reference": "c3879db7a68fe3e12b41263b05879412c87b27fd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/c3879db7a68fe3e12b41263b05879412c87b27fd", - "reference": "c3879db7a68fe3e12b41263b05879412c87b27fd", - "shasum": "" - }, - "require": { - "php": "^7.2.5", - "symfony/polyfill-mbstring": "~1.0", - "symfony/translation-contracts": "^2" - }, - "conflict": { - "symfony/config": "<4.4", - "symfony/dependency-injection": "<5.0", - "symfony/http-kernel": "<5.0", - "symfony/twig-bundle": "<5.0", - "symfony/yaml": "<4.4" - }, - "provide": { - "symfony/translation-implementation": "2.0" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/config": "^4.4|^5.0", - "symfony/console": "^4.4|^5.0", - "symfony/dependency-injection": "^5.0", - "symfony/finder": "^4.4|^5.0", - "symfony/http-kernel": "^5.0", - "symfony/intl": "^4.4|^5.0", - "symfony/service-contracts": "^1.1.2|^2", - "symfony/yaml": "^4.4|^5.0" - }, - "suggest": { - "psr/log-implementation": "To use logging capability in translator", - "symfony/config": "", - "symfony/yaml": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Translation\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Translation Component", - "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-04-12T16:45:47+00:00" - }, - { - "name": "symfony/translation-contracts", - "version": "v2.0.1", - "source": { - "type": "git", - "url": "https://github.com/symfony/translation-contracts.git", - "reference": "8cc682ac458d75557203b2f2f14b0b92e1c744ed" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/8cc682ac458d75557203b2f2f14b0b92e1c744ed", - "reference": "8cc682ac458d75557203b2f2f14b0b92e1c744ed", - "shasum": "" - }, - "require": { - "php": "^7.2.5" - }, - "suggest": { - "symfony/translation-implementation": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Contracts\\Translation\\": "" - } - }, - "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": "Generic abstractions related to translation", - "homepage": "https://symfony.com", - "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" - ], - "time": "2019-11-18T17:27:11+00:00" - }, { "name": "symfony/var-dumper", "version": "v5.0.8", @@ -2654,33 +2203,36 @@ "time": "2020-04-28T17:58:55+00:00" }, { - "name": "voku/portable-ascii", - "version": "1.4.10", + "name": "tightenco/collect", + "version": "v7.9.2", "source": { "type": "git", - "url": "https://github.com/voku/portable-ascii.git", - "reference": "240e93829a5f985fab0984a6e55ae5e26b78a334" + "url": "https://github.com/tightenco/collect.git", + "reference": "372230e88129364638d2d9809143fafbb993d7d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/voku/portable-ascii/zipball/240e93829a5f985fab0984a6e55ae5e26b78a334", - "reference": "240e93829a5f985fab0984a6e55ae5e26b78a334", + "url": "https://api.github.com/repos/tightenco/collect/zipball/372230e88129364638d2d9809143fafbb993d7d4", + "reference": "372230e88129364638d2d9809143fafbb993d7d4", "shasum": "" }, "require": { - "php": ">=7.0.0" + "php": "^7.1.3", + "symfony/var-dumper": "^3.4 || ^4.0 || ^5.0" }, "require-dev": { - "phpunit/phpunit": "~6.0 || ~7.0" - }, - "suggest": { - "ext-intl": "Use Intl for transliterator_transliterate() support" + "mockery/mockery": "^1.0", + "nesbot/carbon": "^2.23.0", + "phpunit/phpunit": "^7.0" }, "type": "library", "autoload": { + "files": [ + "src/Collect/Support/helpers.php", + "src/Collect/Support/alias.php" + ], "psr-4": { - "voku\\": "src/voku/", - "voku\\tests\\": "tests/" + "Tightenco\\Collect\\": "src/Collect" } }, "notification-url": "https://packagist.org/downloads/", @@ -2689,36 +2241,16 @@ ], "authors": [ { - "name": "Lars Moelleken", - "homepage": "http://www.moelleken.org/" + "name": "Taylor Otwell", + "email": "taylorotwell@gmail.com" } ], - "description": "Portable ASCII library - performance optimized (ascii) string functions for php.", - "homepage": "https://github.com/voku/portable-ascii", + "description": "Collect - Illuminate Collections as a separate package.", "keywords": [ - "ascii", - "clean", - "php" + "collection", + "laravel" ], - "funding": [ - { - "url": "https://www.paypal.me/moelleken", - "type": "custom" - }, - { - "url": "https://github.com/voku", - "type": "github" - }, - { - "url": "https://www.patreon.com/voku", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/voku/portable-ascii", - "type": "tidelift" - } - ], - "time": "2020-03-13T01:23:26+00:00" + "time": "2020-04-29T16:33:30+00:00" } ], "packages-dev": [ @@ -2788,6 +2320,73 @@ ], "time": "2020-01-29T20:22:20+00:00" }, + { + "name": "doctrine/inflector", + "version": "1.3.1", + "source": { + "type": "git", + "url": "https://github.com/doctrine/inflector.git", + "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/ec3a55242203ffa6a4b27c58176da97ff0a7aec1", + "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1", + "shasum": "" + }, + "require": { + "php": "^7.1" + }, + "require-dev": { + "phpunit/phpunit": "^6.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Common String Manipulations with regard to casing and singular/plural rules.", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "inflection", + "pluralize", + "singularize", + "string" + ], + "time": "2019-10-30T19:59:35+00:00" + }, { "name": "nikic/php-parser", "version": "v4.4.0", diff --git a/config/packages/translation.yaml b/config/packages/translation.yaml deleted file mode 100644 index 05a2b3d..0000000 --- a/config/packages/translation.yaml +++ /dev/null @@ -1,6 +0,0 @@ -framework: - default_locale: en - translator: - default_path: '%kernel.project_dir%/translations' - fallbacks: - - en diff --git a/src/Collection/EventCollection.php b/src/Collection/EventCollection.php index 1d27780..460d3bb 100644 --- a/src/Collection/EventCollection.php +++ b/src/Collection/EventCollection.php @@ -12,7 +12,7 @@ final class EventCollection extends Collection public function excludeEventHosts(): self { return (new self($this->items))->filter(function (array $rsvp): bool { - return !Arr::get($rsvp, 'member.event_context.host'); + return $rsvp['member']['event_context']['host']; }); } } diff --git a/src/Command/GetRaffleWinnerCommand.php b/src/Command/GetRaffleWinnerCommand.php index 3d56017..f6d3b2d 100644 --- a/src/Command/GetRaffleWinnerCommand.php +++ b/src/Command/GetRaffleWinnerCommand.php @@ -6,7 +6,6 @@ namespace App\Command; use App\Collection\EventCollection; use DateInterval; -use Illuminate\Support\Arr; use Illuminate\Support\Collection; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; @@ -77,7 +76,7 @@ final class GetRaffleWinnerCommand extends Command $io->section(sprintf('%s \'yes\' RSVPs (excluding hosts)', $this->yesRsvps->count())); $io->listing($this->yesRsvps->pluck('member.name')->sort()->toArray()); $io->success( - sprintf('Winner: %s', Arr::get($this->winner, 'member.name')) + sprintf('Winner: %s', $this->winner['member']['name']) ); $this->openWinnerPhoto(); @@ -144,7 +143,7 @@ final class GetRaffleWinnerCommand extends Command private function openWinnerPhoto(): void { - if ($photo = Arr::get($this->winner, 'member.photo.photo_link')) { + if ($photo = $this->winner['member']['photo']['photo_link']) { exec(sprintf('xdg-open %s', $photo)); } } diff --git a/symfony.lock b/symfony.lock index eac2155..5809a73 100644 --- a/symfony.lock +++ b/symfony.lock @@ -5,15 +5,6 @@ "doctrine/inflector": { "version": "1.3.1" }, - "illuminate/contracts": { - "version": "v7.9.2" - }, - "illuminate/support": { - "version": "v7.9.2" - }, - "nesbot/carbon": { - "version": "2.33.0" - }, "nikic/php-parser": { "version": "v4.4.0" }, @@ -32,9 +23,6 @@ "psr/log": { "version": "1.1.3" }, - "psr/simple-cache": { - "version": "1.0.1" - }, "squizlabs/php_codesniffer": { "version": "3.0", "recipe": { @@ -172,22 +160,6 @@ "symfony/service-contracts": { "version": "v2.0.1" }, - "symfony/translation": { - "version": "3.3", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "master", - "version": "3.3", - "ref": "2ad9d2545bce8ca1a863e50e92141f0b9d87ffcd" - }, - "files": [ - "config/packages/translation.yaml", - "translations/.gitignore" - ] - }, - "symfony/translation-contracts": { - "version": "v2.0.1" - }, "symfony/var-dumper": { "version": "v5.0.8" }, @@ -197,7 +169,7 @@ "symfony/yaml": { "version": "v5.0.8" }, - "voku/portable-ascii": { - "version": "1.4.10" + "tightenco/collect": { + "version": "v7.9.2" } } diff --git a/translations/.gitignore b/translations/.gitignore deleted file mode 100644 index e69de29..0000000