Fixed phpcs error reporting.

Author: selul

classes/Visualizer/Module/Sources.php

@@ -18,7 +18,6 @@
 // +----------------------------------------------------------------------+
 // | Author: Eugene Manuilov <[email protected]>                        |
 // +----------------------------------------------------------------------+
-
 /**
  * Sources module class.
  *

classes/Visualizer/Source.php

@@ -1,5 +1,4 @@
 <?php
-
 // +----------------------------------------------------------------------+
 // | Copyright 2013  Madpixels  (email : [email protected])        |
 // +----------------------------------------------------------------------+
@@ -30,6 +29,15 @@
  */
 abstract class Visualizer_Source {
 
+	/**
+	 * The array of allowed types.
+	 *
+	 * @since 1.0.0
+	 *
+	 * @access protected
+	 * @var array
+	 */
+	protected static $allowed_types = array( 'string', 'number', 'boolean', 'date', 'datetime', 'timeofday' );
 	/**
 	 * The array of data.
 	 *
@@ -39,7 +47,6 @@ abstract class Visualizer_Source {
 	 * @var array
 	 */
 	protected $_data = array();
-
 	/**
 	 * The array of series.
 	 *
@@ -51,14 +58,39 @@ abstract class Visualizer_Source {
 	protected $_series = array();
 
 	/**
-	 * The array of allowed types.
+	 * Return allowed types
 	 *
-	 * @since 1.0.0
+	 * @since 1.0.1
+	 *
+	 * @static
+	 * @access public
+	 * @return array the allowed types
+	 */
+	public static function getAllowedTypes() {
+		return self::$allowed_types;
+	}
+
+	/**
+	 * Validates series tyeps.
+	 *
+	 * @since 1.0.1
 	 *
+	 * @static
 	 * @access protected
-	 * @var array
+	 *
+	 * @param array $types The icoming series types.
+	 *
+	 * @return boolean TRUE if sereis types are valid, otherwise FALSE.
 	 */
-	protected static $allowed_types = array( 'string', 'number', 'boolean', 'date', 'datetime', 'timeofday' );
+	protected static function _validateTypes( $types ) {
+		foreach ( $types as $type ) {
+			if ( ! in_array( $type, self::$allowed_types ) ) {
+				return false;
+			}
+		}
+
+		return true;
+	}
 
 	/**
 	 * Returns source name.
@@ -117,13 +149,47 @@ public function getRawData() {
 		return $this->_data;
 	}
 
+	/**
+	 * Re populates series if the source is dynamic.
+	 *
+	 * @since 1.1.0
+	 *
+	 * @access public
+	 *
+	 * @param array $series The actual array of series.
+	 * @param int   $chart_id The chart id.
+	 *
+	 * @return array The re populated array of series or old one.
+	 */
+	public function repopulateSeries( $series, $chart_id ) {
+		return $series;
+	}
+
+	/**
+	 * Re populates data if the source is dynamic.
+	 *
+	 * @since 1.1.0
+	 *
+	 * @access public
+	 *
+	 * @param array $data The actual array of data.
+	 * @param int   $chart_id The chart id.
+	 *
+	 * @return array The re populated array of data or old one.
+	 */
+	public function repopulateData( $data, $chart_id ) {
+		return $data;
+	}
+
 	/**
 	 * Normalizes values according to series' type.
 	 *
 	 * @since 1.0.0
 	 *
 	 * @access protected
+	 *
 	 * @param array $data The row of data.
+	 *
 	 * @return array Normalized row of data.
 	 */
 	protected function _normalizeData( $data ) {
@@ -134,14 +200,12 @@ protected function _normalizeData( $data ) {
 			if ( ! isset( $data[ $i ] ) ) {
 				$data[ $i ] = null;
 			}
-
 			if ( is_null( $data[ $i ] ) ) {
 				continue;
 			}
-
 			switch ( $series['type'] ) {
 				case 'number':
-					$data[ $i ] = (  is_numeric( $data[ $i ] ) ) ? floatval( $data[ $i ] ) : (is_numeric( str_replace( ',', '', $data[ $i ] ) ) ?  floatval( str_replace( ',', '', $data[ $i ] ) ) : null);
+					$data[ $i ] = ( is_numeric( $data[ $i ] ) ) ? floatval( $data[ $i ] ) : ( is_numeric( str_replace( ',', '', $data[ $i ] ) ) ? floatval( str_replace( ',', '', $data[ $i ] ) ) : null );
 					break;
 				case 'boolean':
 					$data[ $i ] = ! empty( $data[ $i ] ) ? filter_validate( $data[ $i ], FILTER_VALIDATE_BOOLEAN ) : null;
@@ -159,70 +223,8 @@ protected function _normalizeData( $data ) {
 					break;
 			}
 		}
-		// error_log(print_r($data,true));
-		return $data;
-	}
-
-	/**
-	 * Validates series tyeps.
-	 *
-	 * @since 1.0.1
-	 *
-	 * @static
-	 * @access protected
-	 * @param array $types The icoming series types.
-	 * @return boolean TRUE if sereis types are valid, otherwise FALSE.
-	 */
-	protected static function _validateTypes( $types ) {
-		foreach ( $types as $type ) {
-			if ( ! in_array( $type, self::$allowed_types ) ) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Return allowed types
-	 *
-	 * @since 1.0.1
-	 *
-	 * @static
-	 * @access public
-	 * @return array the allowed types
-	 */
-	public static function getAllowedTypes() {
-		return self::$allowed_types;
-	}
-
-
-
-	/**
-	 * Re populates series if the source is dynamic.
-	 *
-	 * @since 1.1.0
-	 *
-	 * @access public
-	 * @param array $series The actual array of series.
-	 * @param int   $chart_id The chart id.
-	 * @return array The re populated array of series or old one.
-	 */
-	public function repopulateSeries( $series, $chart_id ) {
-		return $series;
-	}
 
-	/**
-	 * Re populates data if the source is dynamic.
-	 *
-	 * @since 1.1.0
-	 *
-	 * @access public
-	 * @param array $data The actual array of data.
-	 * @param int   $chart_id The chart id.
-	 * @return array The re populated array of data or old one.
-	 */
-	public function repopulateData( $data, $chart_id ) {
+		// error_log(print_r($data,true));
 		return $data;
 	}