Merge pull request chriskacerguis#435 from Tjoosten/master

replace and by &&@

Author: chriskacerguis

application/libraries/Format.php

@@ -9,7 +9,7 @@
  */
 class Format {
 
-	protected $_data = array();   // Array to convert
+	protected $_data = [];        // Array to convert
 	protected $_from_type = NULL; // View filename
 
 	/**
@@ -45,7 +45,7 @@ public function __construct($data = NULL, $from_type = NULL)
 		{
 			if (method_exists($this, '_from_' . $from_type))
 			{
-				$data = call_user_func(array($this, '_from_' . $from_type), $data);
+				$data = call_user_func([$this, '_from_' . $from_type], $data);
 			}
 
 			else
@@ -68,16 +68,16 @@ public function __construct($data = NULL, $from_type = NULL)
 	public function to_array($data = NULL)
 	{
 		// If not just NULL, but nothing is provided
-		if ($data === NULL and ! func_num_args())
+		if ($data === NULL && ! func_num_args())
 		{
 			$data = $this->_data;
 		}
 
-		$array = array();
+		$array = [];
 
 		foreach ((array) $data as $key => $value)
 		{
-			if (is_object($value) or is_array($value))
+			if (is_object($value) || is_array($value))
 			{
 				$array[$key] = $this->to_array($value);
 			}
@@ -101,7 +101,7 @@ public function to_array($data = NULL)
 	 */
 	public function to_xml($data = NULL, $structure = NULL, $basenode = 'xml')
 	{
-		if ($data === NULL and ! func_num_args())
+		if ($data === NULL && ! func_num_args())
 		{
 			$data = $this->_data;
 		}
@@ -118,7 +118,7 @@ public function to_xml($data = NULL, $structure = NULL, $basenode = 'xml')
 		}
 
 		// Force it to be something useful
-		if ( ! is_array($data) AND ! is_object($data))
+		if ( ! is_array($data) && ! is_object($data))
 		{
 			$data = (array) $data;
 		}
@@ -191,7 +191,7 @@ public function to_html()
 		else
 		{
 			$headings = array_keys($data);
-			$data = array($data);
+			$data = [$data];
 		}
 
 		$ci = get_instance();
@@ -226,7 +226,7 @@ public function to_csv()
 		else
 		{
 			$headings = array_keys($data);
-			$data = array($data);
+			$data = [$data];
 		}
 
 		$output = '"'.implode('","', $headings).'"'.PHP_EOL;
@@ -308,7 +308,7 @@ public function to_php()
 	 */
 	protected function _from_xml($string)
 	{
-		return $string ? (array) simplexml_load_string($string, 'SimpleXMLElement', LIBXML_NOCDATA) : array();
+		return $string ? (array) simplexml_load_string($string, 'SimpleXMLElement', LIBXML_NOCDATA) : [];
 	}
 
 	/**
@@ -320,7 +320,7 @@ protected function _from_xml($string)
 	 */
 	protected function _from_csv($string)
 	{
-		$data = array();
+		$data = [];
 
 		// Splits
 		$rows = explode("\n", trim($string));