Correctly handle emtpy string in proxyuserpwd config

[sshambar]

As documented, the default value for config value proxyuserpwd is ''.
However, that value results in the error:
"cURL error 5: Unsupported proxy syntax in '@'".
This patch handles the values of '' and null (the default in the code)
the same for config values proxyuserpwd and proxy.

Signed-off-by: Scott Shambarger [email protected]

[rullzer]

This is cleaner IMO. since it sets the correct default

[rullzer]

Awesome :)

[kesselb]

server/tests/lib/Http/Client/ClientTest.php

Lines 56 to 65 in effca30

	$this->config
	->expects($this->at(0))
	->method('getSystemValue')
	->with('proxy', null)
	->willReturn('foo');
	$this->config
	->expects($this->at(1))
	->method('getSystemValue')
	->with('proxyuserpwd', null)
	->willReturn(null);

@rullzer do you know why these tests are not failing? getSystemValue is invoked with a different default value 🤔

[rullzer]

server/tests/lib/Http/Client/ClientTest.php

Lines 56 to 65 in effca30

	$this->config
	->expects($this->at(0))
	->method('getSystemValue')
	->with('proxy', null)
	->willReturn('foo');
	$this->config
	->expects($this->at(1))
	->method('getSystemValue')
	->with('proxyuserpwd', null)
	->willReturn(null);

@rullzer do you know why these tests are not failing? getSystemValue is invoked with a different default value thinking

I think because null is not matched exactly in the with statement...

[ChristophWurst]

empty might also have done the trick but this is fine :)

Thanks a lot!

[ChristophWurst]

I think because null is not matched exactly in the with statement...

one could then try

$this->config 
 			->expects($this->at(1)) 
 			->method('getSystemValue') 
 			->with($this->equalTo('proxyuserpwd'), $this->equalTo(null)) 
 			->willReturn(null); 

That might help in case phpunit filters out empty args.

[rullzer]

Ah my bad. pushed wrong. let me create a proper branch.