SCA: dropped import duplicates, fixed a few cases of php core API misuse (#5639)

kalessil · Naktibalda · commit 557998a9169f · 2019-08-09T19:25:28.000+03:00
* SCA: dropped import duplicates, fixed a few cases of php core API misuse

* SCA: partial revert to probe if semaphore build gets fixed
diff --git a/src/Codeception/Lib/Connector/Guzzle.php b/src/Codeception/Lib/Connector/Guzzle.php
@@ -17,7 +17,6 @@
 use Symfony\Component\BrowserKit\Client;
 use Symfony\Component\BrowserKit\Cookie;
 use Symfony\Component\BrowserKit\Request as BrowserKitRequest;
-use Symfony\Component\BrowserKit\Request;
 use Symfony\Component\BrowserKit\Response as BrowserKitResponse;
 
 class Guzzle extends Client
@@ -253,7 +252,7 @@ protected function extractFormData(BrowserKitRequest $request)
         return $request->getParameters();
     }
 
-    protected function extractMultipartFormData(Request $request)
+    protected function extractMultipartFormData(BrowserKitRequest $request)
     {
         if (!in_array(strtoupper($request->getMethod()), ['POST', 'PUT', 'PATCH'])) {
             return [];
diff --git a/tests/unit/Codeception/Module/PhpBrowserRestTest.php b/tests/unit/Codeception/Module/PhpBrowserRestTest.php
@@ -1,7 +1,7 @@
 <?php
 
 use Codeception\Test\Unit;
-use Codeception\Util\Stub as Stub;
+use Codeception\Util\Stub;
 
 class PhpBrowserRestTest extends Unit
 {

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`use Symfony\Component\BrowserKit\Client;`
`18`	`18`	`use Symfony\Component\BrowserKit\Cookie;`
`19`	`19`	`use Symfony\Component\BrowserKit\Request as BrowserKitRequest;`
`20`		`-use Symfony\Component\BrowserKit\Request;`
`21`	`20`	`use Symfony\Component\BrowserKit\Response as BrowserKitResponse;`
`22`	`21`
`23`	`22`	`class Guzzle extends Client`
`@@ -253,7 +252,7 @@ protected function extractFormData(BrowserKitRequest $request)`
`253`	`252`	`return $request->getParameters();`
`254`	`253`	`}`
`255`	`254`
`256`		`- protected function extractMultipartFormData(Request $request)`
	`255`	`+ protected function extractMultipartFormData(BrowserKitRequest $request)`
`257`	`256`	`{`
`258`	`257`	`if (!in_array(strtoupper($request->getMethod()), ['POST', 'PUT', 'PATCH'])) {`
`259`	`258`	`return [];`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`use Codeception\Test\Unit;`
`4`		`-use Codeception\Util\Stub as Stub;`
	`4`	`+use Codeception\Util\Stub;`
`5`	`5`
`6`	`6`	`class PhpBrowserRestTest extends Unit`
`7`	`7`	`{`