From f76ef4e8e64a21ac52b5422a706ec451d8c2814f Mon Sep 17 00:00:00 2001
From: Jason Klein <jason.klein@logicforte.com>
Date: Tue, 26 Nov 2019 09:03:14 -0600
Subject: [PATCH] Require Laravel 6.0+ and PHP 7.2+, drop support for Laravel
 5.x and PHP 7.0/7.1

Per my comments in this PR (https://github.com/OveD-php/typed-collections/pull/3):

My suggestion would be to bump the versioning of your Laravel packages to
align with Laravel versioning so that the existing versions (0.0.7, 2.0.2)
remain available for Laravel 5.x users and a new version (e.g. 6.0.0) is
available for Laravel 6.x users.
---
 .travis.yml   |  4 ++--
 README.md     |  1 +
 composer.json | 16 ++++++++--------
 composer.lock | 39 +++++++++++++++++++--------------------
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8760269..8099366 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: php
 cache: vendor
 php:
-  - 7.0
-  - 7.1
+  - 7.2
+  - 7.3
 
 sudo: required
 
diff --git a/README.md b/README.md
index 87d27ec..45306f8 100644
--- a/README.md
+++ b/README.md
@@ -92,6 +92,7 @@ If you discover any security related issues, please email :author_email instead
 
 - [Visti Kløft](https://github.com/vistik)
 - [Peter Suhm](https://github.com/petersuhm)
+- [Jason Klein](https://github.com/jason-klein)
 
 ## License
 
diff --git a/composer.json b/composer.json
index b98025f..05dba55 100644
--- a/composer.json
+++ b/composer.json
@@ -18,11 +18,11 @@
         "type": "package",
         "package": {
             "name": "vistik/typed-collections",
-            "version": "2.0.2",
+            "version": "6.0.0",
             "source": {
                 "url": "https://github.com/jason-klein/typed-collections",
                 "type": "git",
-                "reference": "dev-laravel6"
+                "reference": "pr-laravel6x"
             },
             "type": "library",
             "autoload": {
@@ -37,14 +37,14 @@
     }
   ],
   "require": {
-    "php": ">=7.0.0",
-    "illuminate/support": "~6.0|~5.4|~5.3",
-    "vistik/typed-collections": "^2.0"
+    "php": "^7.2",
+    "illuminate/support": "^6.0",
+    "vistik/typed-collections": "^6.0"
   },
   "require-dev": {
-    "squizlabs/php_codesniffer": "*",
-    "phpunit/phpunit": "~8.0|~7.0|~6.0",
-    "orchestra/testbench": "~4.0|~3.0",
+    "squizlabs/php_codesniffer": "^3.0",
+    "phpunit/phpunit": "^8.0|^7.0",
+    "orchestra/testbench": "^4.0|^3.0",
     "mockery/mockery": "^1.2|^0.9.9",
     "phpmd/phpmd": "^2.6"
   },
diff --git a/composer.lock b/composer.lock
index 0319e42..e29f8f2 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": "4035c1e73eeef2e869405030d6225ffb",
+    "content-hash": "2dbf2e8219f90efb83c9ea05fdd56b2b",
     "packages": [
         {
             "name": "doctrine/inflector",
@@ -2537,11 +2537,11 @@
         },
         {
             "name": "vistik/typed-collections",
-            "version": "2.0.2",
+            "version": "6.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jason-klein/typed-collections",
-                "reference": "dev-laravel6"
+                "reference": "pr-laravel6x"
             },
             "type": "library",
             "autoload": {
@@ -2766,22 +2766,23 @@
         },
         {
             "name": "mockery/mockery",
-            "version": "1.2.4",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "b3453f75fd23d9fd41685f2148f4abeacabc6405"
+                "reference": "5571962a4f733fbb57bede39778f71647fae8e66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/b3453f75fd23d9fd41685f2148f4abeacabc6405",
-                "reference": "b3453f75fd23d9fd41685f2148f4abeacabc6405",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/5571962a4f733fbb57bede39778f71647fae8e66",
+                "reference": "5571962a4f733fbb57bede39778f71647fae8e66",
                 "shasum": ""
             },
             "require": {
                 "hamcrest/hamcrest-php": "~2.0",
                 "lib-pcre": ">=7.0",
-                "php": ">=5.6.0"
+                "php": ">=5.6.0",
+                "sebastian/comparator": "^1.2.4|^3.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0"
@@ -2827,7 +2828,7 @@
                 "test double",
                 "testing"
             ],
-            "time": "2019-09-30T08:30:27+00:00"
+            "time": "2019-11-24T07:54:50+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -4645,31 +4646,29 @@
         },
         {
             "name": "webmozart/assert",
-            "version": "1.5.0",
+            "version": "1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozart/assert.git",
-                "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4"
+                "reference": "573381c0a64f155a0d9a23f4b0c797194805b925"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/88e6d84706d09a236046d686bbea96f07b3a34f4",
-                "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/573381c0a64f155a0d9a23f4b0c797194805b925",
+                "reference": "573381c0a64f155a0d9a23f4b0c797194805b925",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.3 || ^7.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
+            "conflict": {
+                "vimeo/psalm": "<3.6.0"
+            },
             "require-dev": {
                 "phpunit/phpunit": "^4.8.36 || ^7.5.13"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Webmozart\\Assert\\": "src/"
@@ -4691,7 +4690,7 @@
                 "check",
                 "validate"
             ],
-            "time": "2019-08-24T08:43:50+00:00"
+            "time": "2019-11-24T13:36:37+00:00"
         }
     ],
     "aliases": [],
@@ -4700,7 +4699,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.0.0"
+        "php": "^7.2"
     },
     "platform-dev": []
 }