From e9b0a124a9d298d61caac92f7cb4a739623e44a8 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 9 May 2020 22:35:53 +0100 Subject: [PATCH] Remove duplicate Collection library --- .idea/oliverdavies-uk.iml | 1 - .idea/php.xml | 1 - composer.json | 3 +- composer.lock | 64 +++++---------------------------------- 4 files changed, 8 insertions(+), 61 deletions(-) diff --git a/.idea/oliverdavies-uk.iml b/.idea/oliverdavies-uk.iml index 5a99f34..090d567 100644 --- a/.idea/oliverdavies-uk.iml +++ b/.idea/oliverdavies-uk.iml @@ -125,7 +125,6 @@ - diff --git a/.idea/php.xml b/.idea/php.xml index 831e977..b1004b4 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -74,7 +74,6 @@ - diff --git a/composer.json b/composer.json index bd906a7..617e37f 100644 --- a/composer.json +++ b/composer.json @@ -33,8 +33,7 @@ "drupal/xmlsitemap": "^1.0", "drush/drush": "^9", "illuminate/support": "^7.10", - "nesbot/carbon": "^2.33", - "tightenco/collect": "^6.15" + "nesbot/carbon": "^2.33" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2", diff --git a/composer.lock b/composer.lock index cdfc035..9fa5d08 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": "9bfa466922e45768b4123877e46728c6", + "content-hash": "ca89fa35a8db80a0bc7008cc2a1ebc57", "packages": [ { "name": "asm89/stack-cors", @@ -5668,16 +5668,16 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.15.0", + "version": "v1.16.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "37b0976c78b94856543260ce09b460a7bc852747" + "reference": "42fda6d7380e5c940d7f68341ccae89d5ab9963b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/37b0976c78b94856543260ce09b460a7bc852747", - "reference": "37b0976c78b94856543260ce09b460a7bc852747", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/42fda6d7380e5c940d7f68341ccae89d5ab9963b", + "reference": "42fda6d7380e5c940d7f68341ccae89d5ab9963b", "shasum": "" }, "require": { @@ -5686,7 +5686,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.15-dev" + "dev-master": "1.16-dev" } }, "autoload": { @@ -5733,7 +5733,7 @@ "type": "tidelift" } ], - "time": "2020-02-27T09:26:54+00:00" + "time": "2020-05-08T17:28:34+00:00" }, { "name": "symfony/polyfill-util", @@ -6359,56 +6359,6 @@ "homepage": "https://symfony.com", "time": "2019-10-24T15:33:53+00:00" }, - { - "name": "tightenco/collect", - "version": "v6.18.6", - "source": { - "type": "git", - "url": "https://github.com/tightenco/collect.git", - "reference": "1a1378fda47c964b53523d3e1f30a08d8f97adc8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/tightenco/collect/zipball/1a1378fda47c964b53523d3e1f30a08d8f97adc8", - "reference": "1a1378fda47c964b53523d3e1f30a08d8f97adc8", - "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-03-12T16:23:01+00:00" - }, { "name": "twig/twig", "version": "v1.42.3",