diff --git a/composer.json b/composer.json index b42f8f3..17205f0 100644 --- a/composer.json +++ b/composer.json @@ -12,8 +12,7 @@ "symfony/flex": "^1.3.1", "symfony/framework-bundle": "5.0.*", "symfony/http-client": "5.0.*", - "symfony/yaml": "5.0.*", - "tightenco/collect": "^7.9" + "symfony/yaml": "5.0.*" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2", @@ -27,7 +26,11 @@ "preferred-install": { "*": "dist" }, - "sort-packages": true + "sort-packages": true, + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true, + "symfony/flex": true + } }, "autoload": { "psr-4": { diff --git a/composer.lock b/composer.lock index 6e3ce19..56706e8 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "26de4f5e139e29ab9d3d46f19c4efef9", + "content-hash": "75247b438442805edb4e7da9fc2e78ba", "packages": [ { "name": "illuminate/collections", @@ -2590,56 +2590,6 @@ } ], "time": "2020-05-20T17:38:26+00:00" - }, - { - "name": "tightenco/collect", - "version": "v7.26.1", - "source": { - "type": "git", - "url": "https://github.com/tighten/collect.git", - "reference": "5e460929279ad806e59fc731e649e9b25fc8774a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/tighten/collect/zipball/5e460929279ad806e59fc731e649e9b25fc8774a", - "reference": "5e460929279ad806e59fc731e649e9b25fc8774a", - "shasum": "" - }, - "require": { - "php": "^7.1.3", - "symfony/var-dumper": "^3.4 || ^4.0 || ^5.0" - }, - "require-dev": { - "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": { - "Tightenco\\Collect\\": "src/Collect" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylorotwell@gmail.com" - } - ], - "description": "Collect - Illuminate Collections as a separate package.", - "keywords": [ - "collection", - "laravel" - ], - "time": "2020-09-05T00:05:48+00:00" } ], "packages-dev": [ diff --git a/src/EventRepository.php b/src/EventRepository.php index 67abfa9..23b0e02 100644 --- a/src/EventRepository.php +++ b/src/EventRepository.php @@ -2,7 +2,7 @@ namespace App; -use Tightenco\Collect\Support\Collection; +use Illuminate\Support\Collection; interface EventRepository { diff --git a/src/Meetup/MeetupEventRepository.php b/src/Meetup/MeetupEventRepository.php index c06004d..d2a58f2 100644 --- a/src/Meetup/MeetupEventRepository.php +++ b/src/Meetup/MeetupEventRepository.php @@ -3,8 +3,8 @@ namespace App\Meetup; use App\EventRepository; +use Illuminate\Support\Collection; use Symfony\Contracts\HttpClient\HttpClientInterface; -use Tightenco\Collect\Support\Collection; final class MeetupEventRepository implements EventRepository { diff --git a/symfony.lock b/symfony.lock index 8ec85a6..e13f727 100644 --- a/symfony.lock +++ b/symfony.lock @@ -309,9 +309,6 @@ "theseer/tokenizer": { "version": "1.2.1" }, - "tightenco/collect": { - "version": "v7.9.2" - }, "webmozart/assert": { "version": "1.10.0" } diff --git a/tests/EventRepositoryContractTest.php b/tests/EventRepositoryContractTest.php index 6c5405e..45fb1ae 100644 --- a/tests/EventRepositoryContractTest.php +++ b/tests/EventRepositoryContractTest.php @@ -3,7 +3,7 @@ namespace App\Tests; use App\EventRepository; -use Tightenco\Collect\Support\Collection; +use Illuminate\Support\Collection; trait EventRepositoryContractTest { diff --git a/tests/Fake/FakeEventRepository.php b/tests/Fake/FakeEventRepository.php index 5ab9ce2..dba2cce 100644 --- a/tests/Fake/FakeEventRepository.php +++ b/tests/Fake/FakeEventRepository.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace App\Tests\Fake; use App\EventRepository; -use Tightenco\Collect\Support\Collection; +use Illuminate\Support\Collection; final class FakeEventRepository implements EventRepository {