Skip to content

Added: PSR2, protected for options and conditional for Logger #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dariuszwrzesien wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added: PSR2, protected for options and conditional for Logger #1

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
287b168
added PSR-2 format, protected for options and conditional for logger
dariuszwrzesien Apr 10, 2015
6aaf1ff
comment
dariuszwrzesien Apr 10, 2015
e865399
format
dariuszwrzesien Apr 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
201 changes: 102 additions & 99 deletions src/NTLMSoap/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,99 +1,102 @@
<?php

namespace NTLMSoap;

use \Psr\Log\LoggerAwareInterface;
use \Psr\Log\LoggerAwareTrait;
use \Psr\Log\LoggerInterface;

class Client extends \SoapClient{
use LoggerAwareTrait;

private $options = Array();

/**
*
* @param String $url The WSDL url
* @param Array $data Soap options
* @param \Psr\Log\LoggerAwareInterface $logger
* @see \SoapClient::__construct()
*/
public function __construct($url, $data, LoggerInterface $logger = null){
if($logger){
$this->setLogger($logger);
}

$this->options = $data;

if(empty($data['ntlm_username']) && empty($data['ntlm_password'])){
parent::__construct($url, $data);
}else{
$this->use_ntlm = true;
HttpStream\NTLM::$user = $data['ntlm_username'];
HttpStream\NTLM::$password = $data['ntlm_password'];

stream_wrapper_unregister('http');
if(!stream_wrapper_register('http', '\\NTLMSoap\\HttpStream\\NTLM')){
throw new Exception("Unable to register HTTP Handler");
}

$time_start = microtime(true);
parent::__construct($url, $data);

if(!empty($this->logger) && (($end_time = microtime(true) - $time_start) > 0.1)){
$this->logger->debug("WSDL Timer", Array("time" => $end_time, "url" => $url));
}

stream_wrapper_restore('http');
}

}

/**
* (non-PHPdoc)
* @see SoapClient::__doRequest()
*/
public function __doRequest($request, $location, $action, $version, $one_way=0) {
$this->__last_request = $request;
$start_time = microtime(true);

$ch = curl_init($location);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);

curl_setopt($ch, CURLOPT_HTTPHEADER, array(
'Method: POST',
'User-Agent: PHP-SOAP-CURL',
'Content-Type: text/xml; charset=utf-8',
'SOAPAction: "' . $action . '"',
));

curl_setopt($ch, CURLOPT_POST, true);
curl_setopt($ch, CURLOPT_POSTFIELDS, $request);
curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);

if(!empty($this->options['ntlm_username']) && !empty($this->options['ntlm_password'])){
curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_NTLM);
curl_setopt($ch, CURLOPT_USERPWD, $this->options['ntlm_username'].':'. $this->options['ntlm_password']);
}

$response = curl_exec($ch);

// Log as an error if the curl call isn't a success
$http_status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
$log_func = $http_status == 200 ? 'debug' : 'error';

// Log the call
$this->logger->$log_func("SoapCall: " . $action, [
"Location" => $location,
"HttpStatus" => $http_status,
"Request" => $request,
"Response" => strlen($response) > 2000 ? substr($response, 0, 2000) . "..." : $response,
"RequestTime" => curl_getinfo($ch, CURLINFO_TOTAL_TIME),
"RequestConnectTime" => curl_getinfo($ch, CURLINFO_CONNECT_TIME),
"Time" => microtime(true) - $start_time
]);

return $response;
}

}
<?php

namespace NTLMSoap;

use \Psr\Log\LoggerAwareInterface;
use \Psr\Log\LoggerAwareTrait;
use \Psr\Log\LoggerInterface;

class Client extends \SoapClient
{
use LoggerAwareTrait;

protected $options = array();

/**
* @see \SoapClient::__construct()
*
* @param string $url The WSDL url
* @param array $data Soap options
* @param LoggerAwareInterface $logger
*/
public function __construct($url, $data, LoggerInterface $logger = null)
{
if ($logger) {
$this->setLogger($logger);
}

$this->options = $data;

if (empty($data['ntlm_username']) && empty($data['ntlm_password'])) {
parent::__construct($url, $data);
} else {
$this->use_ntlm = true;
HttpStream\NTLM::$user = $data['ntlm_username'];
HttpStream\NTLM::$password = $data['ntlm_password'];

stream_wrapper_unregister('http');
if (! stream_wrapper_register('http', '\\NTLMSoap\\HttpStream\\NTLM')) {
throw new Exception("Unable to register HTTP Handler");
}

$time_start = microtime(true);
parent::__construct($url, $data);

if (! empty($this->logger) && (($end_time = microtime(true) - $time_start) > 0.1)) {
$this->logger->debug("WSDL Timer", array("time" => $end_time, "url" => $url));
}

stream_wrapper_restore('http');
}

}

/**
* @see SoapClient::__doRequest()
*/
public function __doRequest($request, $location, $action, $version, $one_way = 0)
{
$this->__last_request = $request;
$start_time = microtime(true);

$ch = curl_init($location);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);

curl_setopt($ch, CURLOPT_HTTPHEADER, array(
'Method: POST',
'User-Agent: PHP-SOAP-CURL',
'Content-Type: text/xml; charset=utf-8',
'SOAPAction: "' . $action . '"',
));

curl_setopt($ch, CURLOPT_POST, true);
curl_setopt($ch, CURLOPT_POSTFIELDS, $request);
curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);

if (! empty($this->options['ntlm_username']) && !empty($this->options['ntlm_password'])) {
curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_NTLM);
curl_setopt($ch, CURLOPT_USERPWD, $this->options['ntlm_username'].':'. $this->options['ntlm_password']);
}

$response = curl_exec($ch);

// Log as an error if the curl call isn't a success
$http_status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
$log_func = $http_status == 200 ? 'debug' : 'error';

if (null !== $this->logger) {
// Log the call
$this->logger->$log_func("SoapCall: " . $action, [
"Location" => $location,
"HttpStatus" => $http_status,
"Request" => $request,
"RequestTime" => curl_getinfo($ch, CURLINFO_TOTAL_TIME),
"Response" => strlen($response) > 2000 ? substr($response, 0, 2000) . "..." : $response,
"RequestConnectTime" => curl_getinfo($ch, CURLINFO_CONNECT_TIME),
"Time" => microtime(true) - $start_time
]);
}

return $response;
}
}