Revert "Use stdClass instead of arrays"

This reverts commit 8600488c6ce77feae168d0972b70f3c2d691d0a5.
This commit is contained in:
AnthorNet 2015-04-24 16:03:33 +02:00
parent 8600488c6c
commit 0d805340f7

View File

@ -95,13 +95,13 @@ class EDDN
{ {
$schema = self::$_schemas['commodity-v1'][((self::$_debug === true) ? 'test' : 'production')]; $schema = self::$_schemas['commodity-v1'][((self::$_debug === true) ? 'test' : 'production')];
$message = new stdClass(); $message = array();
$message->systemName = $systemName; $message['systemName'] = $systemName;
$message->stationName = $stationName; $message['stationName'] = $stationName;
$message->timestamp = date('c', $timestamp); $message['timestamp'] = date('c', $timestamp);
foreach($commodity AS $key => $value) foreach($commodity AS $key => $value)
$message->{$key} = $value; $message[$key] = $value;
return $this->_postToEDDN($schema, $message); return $this->_postToEDDN($schema, $message);
} }
@ -110,12 +110,12 @@ class EDDN
{ {
$schema = self::$_schemas['commodity-v2'][((self::$_debug === true) ? 'test' : 'production')]; $schema = self::$_schemas['commodity-v2'][((self::$_debug === true) ? 'test' : 'production')];
$message = new stdClass(); $message = array();
$message->systemName = $systemName; $message['systemName'] = $systemName;
$message->stationName = $stationName; $message['stationName'] = $stationName;
$message->timestamp = date('c', $timestamp); $message['timestamp'] = date('c', $timestamp);
$message->commodities = $commodities; $message['commodities'] = $commodities;
return $this->_postToEDDN($schema, $message); return $this->_postToEDDN($schema, $message);
} }
@ -123,22 +123,23 @@ class EDDN
private function _generateHeader() private function _generateHeader()
{ {
$header = new stdClass(); $header = array();
$header->uploaderID = $this->getUploaderID();
$header->softwareName = $this->getSoftwareName(); $header['uploaderID'] = $this->getUploaderID();
$header->softwareVersion = $this->getSoftwareVersion(); $header['softwareName'] = $this->getSoftwareName();
$header['softwareVersion'] = $this->getSoftwareVersion();
return $header; return $header;
} }
private function _postToEDDN($schema, stdClass $message) private function _postToEDDN($schema, array $message)
{ {
$object = new stdClass(); $array = array();
$object->{'$schemaRef'} = $schema; $array['$schemaRef'] = $schema;
$object->header = $this->_generateHeader(); $array['header'] = $this->_generateHeader();
$object->message = $message; $array['message'] = $message;
$json = json_encode($object); $json = json_encode($array);
if(function_exists('curl_version')) if(function_exists('curl_version'))
{ {