nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make HTTPInputData dynamic

Browse source 
- Removing DI:: dependency inside App class
- Making testability easier & adapting tests
This commit is contained in:
Philipp Holzer 2021-11-28 14:01:13 +01:00 • committed by Hypolite Petovan
commit 9cec38f916
5 changed files with 54 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

34
tests/Util/HTTPInputDataDouble.php
View file

@ -30,20 +30,18 @@ use Friendica\Util\HTTPInputData;
class HTTPInputDataDouble extends HTTPInputData
{
/** @var false|resource */
protected static $injectedStream = false;
protected $injectedStream = false;
/** @var false|string */
protected static $injectedContent = false;
/** @var false|string */
protected static $injectedContentType = false;
protected $injectedContent = false;
/**
* injects the PHP input stream for a test
*
* @param false|resource $stream
*/
public static function setPhpInputStream($stream)
public function setPhpInputStream($stream)
{
self::$injectedStream = $stream;
$this->injectedStream = $stream;
}
/**
@ -51,9 +49,9 @@ class HTTPInputDataDouble extends HTTPInputData
*
* @param false|string $content
*/
public static function setPhpInputContent($content)
public function setPhpInputContent($content)
{
self::$injectedContent = $content;
$this->injectedContent = $content;
}
/**
@ -61,30 +59,24 @@ class HTTPInputDataDouble extends HTTPInputData
*
* @param false|string $contentType
*/
public static function setPhpInputContentType($contentType)
public function setPhpInputContentType($contentType)
{
self::$injectedContentType = $contentType;
$this->injectedContentType = $contentType;
}
/** {@inheritDoc} */
protected static function getPhpInputStream()
protected function getPhpInputStream()
{
return static::$injectedStream;
return $this->injectedStream;
}
/** {@inheritDoc} */
protected static function getPhpInputContent()
protected function getPhpInputContent()
{
return static::$injectedContent;
return $this->injectedContent;
}
/** {@inheritDoc} */
protected static function getContentType()
{
return static::$injectedContentType;
}
protected static function fetchFileData($stream, string $boundary, array $headers, string $filename)
protected function fetchFileData($stream, string $boundary, array $headers, string $filename)
{
$data = parent::fetchFileData($stream, $boundary, $headers, $filename);
if (!empty($data['tmp_name'])) {

9
tests/src/Util/HTTPInputDataTest.php
View file

@ -139,14 +139,15 @@ class HTTPInputDataTest extends MockedTest
*/
public function testHttpInput(string $contentType, string $input, array $expected)
{
HTTPInputDataDouble::setPhpInputContentType($contentType);
HTTPInputDataDouble::setPhpInputContent($input);
$httpInput = new HTTPInputDataDouble(['CONTENT_TYPE' => $contentType]);
$httpInput->setPhpInputContent($input);
$stream = fopen('php://memory', 'r+');
fwrite($stream, $input);
rewind($stream);
HTTPInputDataDouble::setPhpInputStream($stream);
$output = HTTPInputDataDouble::process();
$httpInput->setPhpInputStream($stream);
$output = $httpInput->process();
$this->assertEqualsCanonicalizing($expected, $output);
}
}