Merge pull request #19 from flownative/flow-7-compatibility

robertlemke · web-flow · commit cc35daa79515 · 2020-12-18T13:10:31.000+01:00
Flow 7 compatibility
diff --git a/Classes/OAuthClient.php b/Classes/OAuthClient.php
@@ -460,7 +460,7 @@ public function renderFinishAuthorizationUri(): string
     {
         $currentRequestHandler = $this->bootstrap->getActiveRequestHandler();
         if ($currentRequestHandler instanceof HttpRequestHandlerInterface) {
-            $httpRequest = $currentRequestHandler->getComponentContext()->getHttpRequest();
+            $httpRequest = $currentRequestHandler->getHttpRequest();
         } else {
             putenv('FLOW_REWRITEURLS=1');
             $httpRequest = $this->serverRequestFactory->createServerRequest('GET', new Uri($this->flowBaseUriSetting));
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         "email": "support@flownative.com"
     },
     "require": {
-        "neos/flow": "^4.0 || ^5.0 || ^6.0 || dev-master",
+        "neos/flow": "^6.0 || ^7.0 || dev-master",
         "guzzlehttp/guzzle": "^6.3",
         "league/oauth2-client": "^2.0",
         "ramsey/uuid": "^3.0 || ^4.0",

Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,7 @@ public function renderFinishAuthorizationUri(): string`
`460`	`460`	`{`
`461`	`461`	`$currentRequestHandler = $this->bootstrap->getActiveRequestHandler();`
`462`	`462`	`if ($currentRequestHandler instanceof HttpRequestHandlerInterface) {`
`463`		`- $httpRequest = $currentRequestHandler->getComponentContext()->getHttpRequest();`
	`463`	`+ $httpRequest = $currentRequestHandler->getHttpRequest();`
`464`	`464`	`} else {`
`465`	`465`	`putenv('FLOW_REWRITEURLS=1');`
`466`	`466`	`$httpRequest = $this->serverRequestFactory->createServerRequest('GET', new Uri($this->flowBaseUriSetting));`