Merge branch '7.x'

Author: GrahamCampbell

CHANGELOG-6.x.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased](https://github.com/laravel/framework/compare/v6.18.16...6.x)
 
+### Fixed
+- Fixed `Illuminate\Database\Eloquent\Collection::getQueueableRelations()` ([00e9ed7](https://github.com/laravel/framework/commit/00e9ed76483ea6ad1264676e7b1095b23e16a433))
+- Fixed bug with update existing pivot and polymorphic many to many ([684208b](https://github.com/laravel/framework/commit/684208b10460b49fa34354cc42f33b9b7135814f))
+
 
 ## [v6.18.15 (2020-05-19)](https://github.com/laravel/framework/compare/v6.18.14...v6.18.15)
 

composer.json

@@ -90,6 +90,9 @@
         "predis/predis": "^1.1.1",
         "symfony/cache": "^5.1"
     },
+    "provide": {
+        "psr/container-implementation": "1.0"
+    },
     "conflict": {
         "tightenco/collect": "<5.5.33"
     },

src/Illuminate/Container/composer.json

@@ -18,6 +18,9 @@
         "illuminate/contracts": "^8.0",
         "psr/container": "^1.0"
     },
+    "provide": {
+        "psr/container-implementation": "1.0"
+    },
     "autoload": {
         "psr-4": {
             "Illuminate\\Container\\": ""