From dbb0d681a92c610d573ef33a3597ef1e5eb218a9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 14 Sep 2019 11:16:16 +0000
Subject: [PATCH] Bump fideloper/proxy from 3.3.4 to 4.2.1

Bumps [fideloper/proxy](https://github.com/fideloper/TrustedProxy) from 3.3.4 to 4.2.1.
- [Release notes](https://github.com/fideloper/TrustedProxy/releases)
- [Commits](https://github.com/fideloper/TrustedProxy/compare/3.3.4...4.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 composer.json |  2 +-
 composer.lock | 25 +++++++++++--------------
 2 files changed, 12 insertions(+), 15 deletions(-)
 mode change 100755 => 100644 composer.json
 mode change 100755 => 100644 composer.lock

diff --git a/composer.json b/composer.json
old mode 100755
new mode 100644
index 0aa7120..5b0b905
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
     "type": "project",
     "require": {
         "php": ">=7.0.0",
-        "fideloper/proxy": "~3.3",
+        "fideloper/proxy": "~4.2",
         "laravel/framework": "5.5.*",
         "laravel/tinker": "~1.0"
     },
diff --git a/composer.lock b/composer.lock
old mode 100755
new mode 100644
index c56bbb9..aa01ec7
--- 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": "b7904d07d1e1765a0a199aa11d6301a3",
+    "content-hash": "1ce3073242840c35a775f532eb425115",
     "packages": [
         {
             "name": "dnoegel/php-xdg-base-dir",
@@ -265,32 +265,29 @@
         },
         {
             "name": "fideloper/proxy",
-            "version": "3.3.4",
+            "version": "4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/fideloper/TrustedProxy.git",
-                "reference": "9cdf6f118af58d89764249bbcc7bb260c132924f"
+                "reference": "03085e58ec7bee24773fa5a8850751a6e61a7e8a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/9cdf6f118af58d89764249bbcc7bb260c132924f",
-                "reference": "9cdf6f118af58d89764249bbcc7bb260c132924f",
+                "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/03085e58ec7bee24773fa5a8850751a6e61a7e8a",
+                "reference": "03085e58ec7bee24773fa5a8850751a6e61a7e8a",
                 "shasum": ""
             },
             "require": {
-                "illuminate/contracts": "~5.0",
+                "illuminate/contracts": "^5.0|^6.0|^7.0",
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "illuminate/http": "~5.0",
-                "mockery/mockery": "~0.9.3",
-                "phpunit/phpunit": "^5.7"
+                "illuminate/http": "^5.0|^6.0|^7.0",
+                "mockery/mockery": "^1.0",
+                "phpunit/phpunit": "^6.0"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "3.3-dev"
-                },
                 "laravel": {
                     "providers": [
                         "Fideloper\\Proxy\\TrustedProxyServiceProvider"
@@ -318,7 +315,7 @@
                 "proxy",
                 "trusted proxy"
             ],
-            "time": "2017-06-15T17:19:42+00:00"
+            "time": "2019-09-03T16:45:42+00:00"
         },
         {
             "name": "jakub-onderka/php-console-color",
@@ -1877,7 +1874,7 @@
                 },
                 {
                     "name": "Gert de Pagter",
-                    "email": "backendtea@gmail.com"
+                    "email": "BackEndTea@gmail.com"
                 }
             ],
             "description": "Symfony polyfill for ctype functions",