mirror of
https://github.com/php-curl-class/php-curl-class.git
synced 2026-08-28 03:00:55 +00:00
Use a helper function to access values of private class properties
This commit is contained in:
@@ -138,6 +138,14 @@ function remove_file_from_server($uploaded_file_path) {
|
||||
assert(file_exists($uploaded_file_path) === false);
|
||||
}
|
||||
|
||||
function get_curl_property_value($instance, $property_name)
|
||||
{
|
||||
$reflector = new \ReflectionClass('\Curl\Curl');
|
||||
$property = $reflector->getProperty($property_name);
|
||||
$property->setAccessible(true);
|
||||
return $property->getValue($instance);
|
||||
}
|
||||
|
||||
function get_multi_curl_property_value($instance, $property_name)
|
||||
{
|
||||
$reflector = new \ReflectionClass('\Curl\MultiCurl');
|
||||
|
||||
@@ -1198,11 +1198,7 @@ class CurlTest extends \PHPUnit\Framework\TestCase
|
||||
$curl = new Curl();
|
||||
$curl->setHeader('Content-Type', $content_type);
|
||||
|
||||
$reflector = new \ReflectionClass('\Curl\Curl');
|
||||
$property = $reflector->getProperty('headers');
|
||||
$property->setAccessible(true);
|
||||
$headers = $property->getValue($curl);
|
||||
|
||||
$headers = \Helper\get_curl_property_value($curl, 'headers');
|
||||
$this->assertEquals($content_type, $headers['Content-Type']);
|
||||
$this->assertEquals($content_type, $headers['content-type']);
|
||||
$this->assertEquals($content_type, $headers['CONTENT-TYPE']);
|
||||
@@ -1568,10 +1564,8 @@ class CurlTest extends \PHPUnit\Framework\TestCase
|
||||
'text/x-json',
|
||||
);
|
||||
|
||||
$class = new \ReflectionClass('\Curl\Curl');
|
||||
$property = $class->getProperty('jsonPattern');
|
||||
$property->setAccessible(true);
|
||||
$json_pattern = $property->getValue(new Curl);
|
||||
$curl = new Curl();
|
||||
$json_pattern = \Helper\get_curl_property_value($curl, 'jsonPattern');
|
||||
|
||||
foreach ($json_content_types as $json_content_type) {
|
||||
$message = '"' . $json_content_type . '" does not match pattern ' . $json_pattern;
|
||||
@@ -2713,10 +2707,8 @@ class CurlTest extends \PHPUnit\Framework\TestCase
|
||||
'text/xml',
|
||||
);
|
||||
|
||||
$class = new \ReflectionClass('\Curl\Curl');
|
||||
$property = $class->getProperty('xmlPattern');
|
||||
$property->setAccessible(true);
|
||||
$xml_pattern = $property->getValue(new Curl);
|
||||
$curl = new Curl();
|
||||
$xml_pattern = \Helper\get_curl_property_value($curl, 'xmlPattern');
|
||||
|
||||
foreach ($xml_content_types as $xml_content_type) {
|
||||
$message = '"' . $xml_content_type . '" does not match pattern ' . $xml_pattern;
|
||||
@@ -3952,11 +3944,7 @@ class CurlTest extends \PHPUnit\Framework\TestCase
|
||||
'Key16: Value16',
|
||||
), $curl->getOpt(CURLOPT_HTTPHEADER));
|
||||
|
||||
$reflector = new \ReflectionClass('\Curl\Curl');
|
||||
$property = $reflector->getProperty('headers');
|
||||
$property->setAccessible(true);
|
||||
$headers = $property->getValue($curl);
|
||||
|
||||
$headers = \Helper\get_curl_property_value($curl, 'headers');
|
||||
$this->assertEquals('Value1', $headers['Key1']);
|
||||
$this->assertEquals('Value2', $headers['Key2']);
|
||||
$this->assertEquals('Value3', $headers['Key3']);
|
||||
@@ -4016,11 +4004,7 @@ class CurlTest extends \PHPUnit\Framework\TestCase
|
||||
'Key16: Value16',
|
||||
), $curl->getOpt(CURLOPT_HTTPHEADER));
|
||||
|
||||
$reflector = new \ReflectionClass('\Curl\Curl');
|
||||
$property = $reflector->getProperty('headers');
|
||||
$property->setAccessible(true);
|
||||
$headers = $property->getValue($curl);
|
||||
|
||||
$headers = \Helper\get_curl_property_value($curl, 'headers');
|
||||
$this->assertEquals('Value1', $headers['Key1']);
|
||||
$this->assertEquals('Value2', $headers['Key2']);
|
||||
$this->assertEquals('Value3', $headers['Key3']);
|
||||
|
||||
@@ -4609,11 +4609,7 @@ class MultiCurlTest extends \PHPUnit\Framework\TestCase
|
||||
));
|
||||
$multi_curl->addGet(Test::TEST_URL);
|
||||
|
||||
$reflector = new \ReflectionClass('\Curl\MultiCurl');
|
||||
$property = $reflector->getProperty('curls');
|
||||
$property->setAccessible(true);
|
||||
$curls = $property->getValue($multi_curl);
|
||||
|
||||
$curls = \Helper\get_multi_curl_property_value($multi_curl, 'curls');
|
||||
foreach ($curls as $curl) {
|
||||
$this->assertEquals(array(
|
||||
'Key1: Value1',
|
||||
@@ -4634,11 +4630,7 @@ class MultiCurlTest extends \PHPUnit\Framework\TestCase
|
||||
'Key16: Value16',
|
||||
), $curl->getOpt(CURLOPT_HTTPHEADER));
|
||||
|
||||
$reflector = new \ReflectionClass('\Curl\Curl');
|
||||
$property = $reflector->getProperty('headers');
|
||||
$property->setAccessible(true);
|
||||
$headers = $property->getValue($curl);
|
||||
|
||||
$headers = \Helper\get_curl_property_value($curl, 'headers');
|
||||
$this->assertEquals('Value1', $headers['Key1']);
|
||||
$this->assertEquals('Value2', $headers['Key2']);
|
||||
$this->assertEquals('Value3', $headers['Key3']);
|
||||
@@ -4681,11 +4673,7 @@ class MultiCurlTest extends \PHPUnit\Framework\TestCase
|
||||
));
|
||||
$multi_curl->addGet(Test::TEST_URL);
|
||||
|
||||
$reflector = new \ReflectionClass('\Curl\MultiCurl');
|
||||
$property = $reflector->getProperty('curls');
|
||||
$property->setAccessible(true);
|
||||
$curls = $property->getValue($multi_curl);
|
||||
|
||||
$curls = \Helper\get_multi_curl_property_value($multi_curl, 'curls');
|
||||
foreach ($curls as $curl) {
|
||||
$this->assertEquals(array(
|
||||
'Key1: Value1',
|
||||
@@ -4706,11 +4694,7 @@ class MultiCurlTest extends \PHPUnit\Framework\TestCase
|
||||
'Key16: Value16',
|
||||
), $curl->getOpt(CURLOPT_HTTPHEADER));
|
||||
|
||||
$reflector = new \ReflectionClass('\Curl\Curl');
|
||||
$property = $reflector->getProperty('headers');
|
||||
$property->setAccessible(true);
|
||||
$headers = $property->getValue($curl);
|
||||
|
||||
$headers = \Helper\get_curl_property_value($curl, 'headers');
|
||||
$this->assertEquals('Value1', $headers['Key1']);
|
||||
$this->assertEquals('Value2', $headers['Key2']);
|
||||
$this->assertEquals('Value3', $headers['Key3']);
|
||||
|
||||
Reference in New Issue
Block a user