Skip to content

Commit

Permalink
fixed setMessages merge order
Browse files Browse the repository at this point in the history
  • Loading branch information
nmred committed Oct 30, 2014
1 parent b3ba814 commit 0bc8bfd
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 19 deletions.
41 changes: 23 additions & 18 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,30 @@
}
},
"repositories": [
{
"type": "package",
"package": {
"name": "sebastianbergmann/phpcov",
"version": "1.1.0",
"dist": {
"url": "https://github.com/sebastianbergmann/phpcov/archive/1.1.0.zip",
"type": "zip"
},
"source": {
"url": "https://github.com/sebastianbergmann/phpcov.git",
"type": "git",
"reference": "1.1.0"
},
"bin": [
"phpcov.php"
]
{
"type": "package",
"package": {
"name": "sebastianbergmann/phpcov",
"version": "1.1.0",
"dist": {
"url": "https://github.com/sebastianbergmann/phpcov/archive/1.1.0.zip",
"type": "zip"
},
"source": {
"url": "https://github.com/sebastianbergmann/phpcov.git",
"type": "git",
"reference": "1.1.0"
},
"bin": [
"phpcov.php"
]
}
},
{ "packagist": false },
{
"type": "composer",
"url": "http://218.244.132.204/proxy/packagist"
}
}
],
"require-dev": {
"satooshi/php-coveralls": "dev-master",
Expand Down
2 changes: 1 addition & 1 deletion src/Kafka/Produce.php
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public function setMessages($topicName, $partitionId = 0, $messages = array())
{
if (isset($this->payload[$topicName][$partitionId])) {
$this->payload[$topicName][$partitionId] =
array_merge($messages, $this->payload[$topicName][$partitionId]);
array_merge($this->payload[$topicName][$partitionId], $messages);
} else {
$this->payload[$topicName][$partitionId] = $messages;
}
Expand Down

0 comments on commit 0bc8bfd

Please sign in to comment.