Merge branch 'develop'

miWebb · Aug 18, 2016 · 427e882 · 427e882
2 parents d5b49ad + 9fb3e1f
commit 427e882
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -80,7 +80,7 @@ $jsend->isError();
 $jsend->getStatus();
 $jsend->setStatus($status);
 $jsend->getData();
-$jsend->setData($data = []);
+$jsend->setData($data = null);
 $jsend->getMessage();
 $jsend->setMessage($message = null);
 $jsend->getCode();
@@ -89,8 +89,8 @@ $jsend->send();
 ```
 
 ```PHP
-JSend::success($data);
+JSend::success($data = null);
 JSend::fail($data);
-JSend::error($message, $code, $data);
+JSend::error($message, $code = null, $data = null);
 JSend::decode($input);
 ```
diff --git a/src/JSend.php b/src/JSend.php
@@ -121,10 +121,10 @@ public static function fail(array $data)
 	 *
 	 * @param string $message
 	 * @param int|null $code = null
-	 * @param array $data = []
+	 * @param array $data = null
 	 * @return JSend a JSend error object with the given message, code and data.
 	 */
-	public static function error($message, $code = null, array $data = [])
+	public static function error($message, $code = null, array $data = null)
 	{
 		return new self(self::ERROR, $data, $message, $code);
 	}