Merge pull request #6 from mortenscheel/allow-oauth2-client-v2

dcblogdev · web-flow · commit bdb756fe27a6 · 2020-02-12T15:42:36.000Z
Allow using league/oauth2-client v2
diff --git a/composer.json b/composer.json
@@ -10,10 +10,16 @@
         }
     ],
     "homepage": "https://github.com/daveismyname/laravel-microsoft-graph",
-    "keywords": ["Laravel", "MsGraph", "Graph", "Microsoft Graph", "Office365"],
+    "keywords": [
+        "Laravel",
+        "MsGraph",
+        "Graph",
+        "Microsoft Graph",
+        "Office365"
+    ],
     "require": {
         "illuminate/support": "5.5.x|5.6.x|5.7.x|5.8.x|6.x",
-        "league/oauth2-client": "^1.4",
+        "league/oauth2-client": "^1.4|^2",
         "guzzlehttp/guzzle": "^6"
     },
     "autoload": {
@@ -32,4 +38,4 @@
             }
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,16 @@`
`10`	`10`	`}`
`11`	`11`	`],`
`12`	`12`	`"homepage": "https://github.com/daveismyname/laravel-microsoft-graph",`
`13`		`- "keywords": ["Laravel", "MsGraph", "Graph", "Microsoft Graph", "Office365"],`
	`13`	`+ "keywords": [`
	`14`	`+ "Laravel",`
	`15`	`+ "MsGraph",`
	`16`	`+ "Graph",`
	`17`	`+ "Microsoft Graph",`
	`18`	`+ "Office365"`
	`19`	`+ ],`
`14`	`20`	`"require": {`
`15`	`21`	`"illuminate/support": "5.5.x\|5.6.x\|5.7.x\|5.8.x\|6.x",`
`16`		`- "league/oauth2-client": "^1.4",`
	`22`	`+ "league/oauth2-client": "^1.4\|^2",`
`17`	`23`	`"guzzlehttp/guzzle": "^6"`
`18`	`24`	`},`
`19`	`25`	`"autoload": {`
`@@ -32,4 +38,4 @@`
`32`	`38`	`}`
`33`	`39`	`}`
`34`	`40`	`}`
`35`		`-}`
	`41`	`+}`