From 48a804ae379c71f4c5b464abc60bbd9badf9f666 Mon Sep 17 00:00:00 2001
From: Philipp Rieber
Date: Thu, 24 Oct 2013 06:39:59 +0200
Subject: [PATCH] [Coding Standards] Fix sample code logic
---
contributing/code/standards.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contributing/code/standards.rst b/contributing/code/standards.rst
index 16808472f53..96d9421e9ec 100644
--- a/contributing/code/standards.rst
+++ b/contributing/code/standards.rst
@@ -58,11 +58,11 @@ example containing most features described below:
private function transformText($dummy, array $options = array())
{
$mergedOptions = array_merge(
- $options,
array(
'some_default' => 'values',
'another_default' => 'more values',
- )
+ ),
+ $options
);
if (true === $dummy) {