Use stdClass instead of arrays

This commit is contained in:
AnthorNet committed 2015-04-24 16:00:45 +02:00
1 parent 0a5f7b3d1e
commit 8600488c6c
1 file changed
+20 -21
+20 -21
View File
@@ -95,13 +95,13 @@ class EDDN
{
$schema = self::$_schemas['commodity-v1'][((self::$_debug === true) ? 'test' : 'production')];
$message = array();
$message['systemName'] = $systemName;
$message['stationName'] = $stationName;
$message['timestamp'] = date('c', $timestamp);
$message = new stdClass();
$message->systemName = $systemName;
$message->stationName = $stationName;
$message->timestamp = date('c', $timestamp);
foreach($commodity AS $key => $value)
$message[$key] = $value;
$message->{$key} = $value;
return $this->_postToEDDN($schema, $message);
}
@@ -110,12 +110,12 @@ class EDDN
{
$schema = self::$_schemas['commodity-v2'][((self::$_debug === true) ? 'test' : 'production')];
$message = array();
$message['systemName'] = $systemName;
$message['stationName'] = $stationName;
$message['timestamp'] = date('c', $timestamp);
$message = new stdClass();
$message->systemName = $systemName;
$message->stationName = $stationName;
$message->timestamp = date('c', $timestamp);
$message['commodities'] = $commodities;
$message->commodities = $commodities;
return $this->_postToEDDN($schema, $message);
}
@@ -123,23 +123,22 @@ class EDDN
private function _generateHeader()
{
$header = array();
$header['uploaderID'] = $this->getUploaderID();
$header['softwareName'] = $this->getSoftwareName();
$header['softwareVersion'] = $this->getSoftwareVersion();
$header = new stdClass();
$header->uploaderID = $this->getUploaderID();
$header->softwareName = $this->getSoftwareName();
$header->softwareVersion = $this->getSoftwareVersion();
return $header;
}
private function _postToEDDN($schema, array $message)
private function _postToEDDN($schema, stdClass $message)
{
$array = array();
$array['$schemaRef'] = $schema;
$array['header'] = $this->_generateHeader();
$array['message'] = $message;
$object = new stdClass();
$object->{'$schemaRef'} = $schema;
$object->header = $this->_generateHeader();
$object->message = $message;
$json = json_encode($array);
$json = json_encode($object);
if(function_exists('curl_version'))
{