composer json added to beta release

Author: ifsale

PtcDebug.php

@@ -1042,16 +1042,15 @@ protected static function _codeCoverageAnalysis( $backtrace = null)
 		*/
 		protected static function _formatVar($var)
 		{	
-			if(is_array($var) || is_object($var)){ $html_string=static::_doDump($var); }
-			else if(@is_bool($var))
+			if ( is_array( $var ) || is_object( $var ) ){ $html_string = static::_doDump( $var ); }
+			else if ( @is_bool( $var ) )
 			{ 
-				$html_string='<span style="color:#92008d;">'.($var==1 ? 'TRUE' : 'FALSE').'</span>'; 
+				$html_string = '<span style="color:#92008d;">' . ( $var == 1 ? 'TRUE' : 'FALSE' ) . '</span>'; 
 			}
-			else if(@is_null($var)){ $html_strisng='<span style="color:black;">NULL</span>'; }
-			else if(@is_float($var)){ $html_string='<span style="color:#10C500;">'.$var.'</span>'; }
-			else if(is_int($var)){ $html_string='<span style="color:red;">'.$var.'</span>'; }
-			// could be a string
-			else{ $html_string='<span>'.static::_cleanBuffer(@print_r($var,true)).'</span>'; }
+			else if( @is_null( $var ) ){ $html_strisng = '<span style="color:black;">NULL</span>'; }
+			else if( @is_float( $var ) ){ $html_string = '<span style="color:#10C500;">' . $var . '</span>'; }
+			else if( is_int( $var ) ){ $html_string = '<span style="color:red;">' . $var . '</span>'; }
+			else{ $html_string = '<span>' . static::_cleanBuffer( @print_r( $var , true ) ) . '</span>'; }
 			return @$html_string;
 		}
 		/**
@@ -1116,10 +1115,10 @@ protected static function _findReference($reference,$type=1)
 		}
 		/**
 		* Custom dump to properly format a given variable and make it more friendly to read
-		* @param 	mixed 		$var			the string to pass
-		* @param 	mixed 		$varName		some statement preceding the variable
+		* @param 	mixed 	$var			the string to pass
+		* @param 	mixed 	$varName	some statement preceding the variable
 		* @param 	string 	$indent		uses "|" as indents by default
-		* @param 	string 	$reference		a reference to prevent recursion
+		* @param 	string 	$reference	a reference to prevent recursion
 		* @param 	int 		$depth		maximun depth
 		* @return	the html output with the variable
 		*/
@@ -1207,12 +1206,13 @@ protected static function _doDump( &$var , $varName = NULL , $indent = NULL , $r
 				else if ( is_object( $avar ) )
 				{
 					$continue = true;
-					if ( false === strpos( @get_class( $avar ) , 'Reflection' ) )	// something is wrong with the reflection
+					if ( false === strpos( @get_class( $avar ) , 'Reflection' ) && 
+							false === strpos( @get_class( $avar ) , 'SimpleXML' ) )
 					{
 						$rf = @new \ReflectionFunction( $avar );
-						if ( ( @$rf->getName( ) == '{closure}' ) ) // work with lambda functions first
+						if ( false !== @strpos( $rf->getName( ) , '{closure}' ) ) // work with lambda functions first
 						{
-							$result .= $indent . ( $varName ? $varName . ' => ' : '');
+							@$result .= $indent . ( $varName ? $varName . ' => ' : '');
 							$result .= '<span>**RUNTIME CREATED FUNCTION** ';
 							if ( @$rf->getFileName( ) ) { $result .= @$rf->getFileName( ); } 
 							if ( @$rf->getStartLine( ) ) { $result .= ':' . @$rf->getStartLine( ); } 

PtcEvent.php

@@ -5,23 +5,24 @@
 	* PHP version 5.3
 	* @category 	Libraries
 	* @package  	PhpToolCase
-	* @version	0.9.1b
+	* @version	0.9.3b
 	* @author   	Irony <carlo@salapc.com>
 	* @license  	http://www.gnu.org/copyleft/gpl.html GNU General Public License
 	* @link     	http://phptoolcase.com
 	*/
-
+	
 	class PtcEvent
 	{
+		/**
+		* Alias of @ref getEvents()
+		*/
+		public static function getEvent( $name = null ){ return static::getEvents( $name ); }
 		/**
 		* Registers the component with a constant for ptc helpers functions
 		*/
 		public static function register( )
 		{
-			if ( !defined( '_PTCEVENT_' ) ) // declare the class namespace
-			{
-				@define( '_PTCEVENT_' , get_called_class( ) ); 
-			}
+			if ( !defined( '_PTCEVENT_' ) ) { @define( '_PTCEVENT_' , get_called_class( ) ); }
 		}
 		/**
 		* Adds a listener to an event
@@ -38,14 +39,15 @@ public static function listen( $event , $callback , $priority = 0 )
 				trigger_error( 'All event names must use "."!' , E_USER_ERROR );
 				return false;
 			}
-			if ( $callback instanceof Closure || is_callable( $callback ) ){ $call = $callback; }
+			if ( $callback instanceof \Closure || is_callable( $callback ) ){ $call = $callback; }
 			else
 			{
 				$try = explode( '@' , $callback );
-				if ( @class_exists( $try[ 0 ] ) )
+				$clean_name = explode( '::' , $try[ 0 ] );
+				if ( @class_exists( $clean_name[ 0 ] ) )
 				{
 					$method = ( sizeof( $try ) > 1 ) ? $try[ 1 ] : 'handle';
-					$call = array( new $try[ 0 ] , $method );
+					$call = ( false !== strpos( $try[ 0 ] , '::' ) ) ? $try[ 0 ] : array( new $try[ 0 ] , $method );
 				}
 				else	// no valid callback found
 				{
@@ -92,8 +94,8 @@ public static function remove( $event  , $key = null )
 				{ 
 					if ( !array_key_exists( $key , static::$_events[ $event[ 0 ] ][ $event[ 1 ] ] ) )
 					{
-						trigger_error( $key . ' not found in  <b>' . $event[ 0 ] . '.' . $event[ 1 ] . 
-															'</b>!' , E_USER_WARNING );
+						trigger_error( $key . ' not found in  <b>' . 
+							$event[ 0 ] . '.' . $event[ 1 ] . '</b>!' , E_USER_WARNING );
 						return false;
 					}
 					static::_debug( static::$_events[ $event[ 0 ] ][ $event[ 1 ] ][ $key ] , 
@@ -121,7 +123,7 @@ public static function remove( $event  , $key = null )
 		* @param	string	$event	the event name to fire
 		* @param	array	$data	an array with the data you wish to pass to the listeners
 		*/
-		public static function fire( $event , $data = array( ) )
+		public static function fire( $event , $data )
 		{
 			static::register( );
 			$main = $event;
@@ -143,7 +145,7 @@ public static function fire( $event , $data = array( ) )
 				{
 					$data = ( is_array( $data ) ) ? $data : array( $data );
 					static::_debug( array( 'callback' => $wildcard , 'data' => array( $data , $main ) ) , 
-						'firing wildcard <b>' . $event[ 0 ] . '.' . $event[ 1 ] . '[ ' . $a . ' ]</b>' , 'Event Manager' );
+					'firing wildcard <b>' . $event[ 0 ] . '.' . $event[ 1 ] . '[ ' . $a . ' ]</b>' , 'Event Manager' );
 					$a++;
 					if ( false === static::_run( $wildcard , array( $data , $main ) ) ){ return; }
 				}

PtcQueryBuilder.php

@@ -29,25 +29,7 @@ public function __construct( \PDO $pdo = null )
 		public function table( $table ) 
 		{ 
 			$this->reset( );
-			$table = ( is_array( $table ) ) ? $table : array( $table );
-			foreach ( $table as $v )
-			{
-				if ( $val = $this->_checkRawValue( $v ) )
-				{ 
-					$this->_table .= ' ' . $val. ','; 
-					continue;
-				}
-				$divider = ( strpos( $v , ' as ' ) ) ? ' as ' : ' AS ';
-				$table = explode( $divider , $v );
-				$t = $this->addBackTicks( $table[ 0 ] ); 
-				if ( array_key_exists( 1 , $table ) )
-				{ 
-					$t .= ' as ' . $this->addBackTicks( $table[ 1 ] ); 
-				}
-				$this->_table .= $this->sanitize( $t ) . ',';
-				//$this->_table .= $this->addBackTicks( $this->sanitize( $v ) ) . ','; 
-			}
-			$this->_table = substr( $this->_table , 0 , strlen( $this->_table ) - 1 );
+			$this->_table = $this->_formatTable( $table );
 			$this->_currentQueryType = 'select'; // set query type as select by default
 			return $this; 
 		}
@@ -115,22 +97,23 @@ public function raw( $value ){ return $this->_randomId . 'RAW{' .$value . '}'; }
 		public function addBackTicks( $string )
 		{
 			if ( $val = $this->_checkRawValue( $string ) ){ return $val; }
-			$raw = explode( '.' , $string );
+			$raw = array_map( 'trim' , explode( '.' , $string ) );
 			$string = ( $raw[ 0 ] === '*' ) ? $raw[ 0 ] : '`' . $raw[ 0 ] . '`';
-			return $string .= ( @$raw[ 1 ] ) ? '.`' . $raw[ 1 ] . '`': ''; 
+			if ( @$raw[ 1 ] ){ $string .= ( $raw[ 1 ] === '*' ) ? '.' . $raw[ 1 ] : '.`' . $raw[ 1 ] . '`'; }
+			return $string;
 		}
 		/**
 		* Creates a join based on the parameters. See @ref qb_joins
-		* @param	string		$table			the name of the table to join
-		* @param	string		$first			the first column
+		* @param	string		$table		the name of the table to join
+		* @param	string		$first		the first column
 		* @param	string		$operator		the operator to use for the join
 		* @param	string		$second		the second column
-		* @param	string		$type			the type of join
+		* @param	string		$type		the type of join
 		*/
 		public function join( $table , $first , $operator = null , $second = null , $type = 'inner' )
 		{
 			if ( !$this->_isTableSet( ) ) { return false; }
-			$this->_join .= ' ' . strtoupper( $type ) . ' JOIN ' . $this->addBackTicks( $table );
+			$this->_join .= ' ' . strtoupper( $type ) . ' JOIN ' . $this->_formatTable( $table );
 			$this->_isClosure = true;
 			if ( $first instanceof \Closure ){ $this->_runClosure( $first  , 'join' ); }
 			else{ $this->on( $first, $operator, $second ); }
@@ -208,8 +191,7 @@ public function run( $query = null , $bind = null , $type = null )
 			if ( !$type )
 			{
 				$type = 3;
-				// check statement that needs data in return
-				foreach ( $this->_returnStatements as $statement )
+				foreach ( $this->_returnStatements as $statement ) // statements that need return data
 				{
 					if ( strpos( trim( strtoupper( $this->_currentQuery ) ) , $statement ) === 0 ) 
 					{
@@ -256,7 +238,7 @@ public function prepare( )
 			{
 				if ( is_string( $v ) ) 
 				{
-					if ( false === strpos( $v, ':' ) ) { continue; }
+					if ( false === strpos( $v , ':' ) ) { continue; }
 					$query = preg_replace( '/\?/' , $v , $query , 1 );
 				}
 			}
@@ -266,7 +248,7 @@ public function prepare( )
 		/**
 		* Adds order to the query. See @ref qb_order_group_limit
 		* @param	string		$column		the column names
-		* @param	string		$direction		asc or desc
+		* @param	string		$direction	asc or desc
 		*/
 		public function order( $column , $direction = 'asc' )
 		{
@@ -408,7 +390,7 @@ public function setFetchMode( $mode , $class = null )
 				return false;
 			}
 			$this->_fetchMode = ( $class ) ? array( $mode , $class ) : array( $mode );
-			
+			return $this;
 		}
 		/**
 		* Adds where operators and joins to the query
@@ -783,6 +765,33 @@ protected function _checkPdo( )
 			return true;
 		}
 		/**
+		* Adds backticks properly to table names
+		* @param	string|array	$table	the table name
+		*/
+		protected function _formatTable( $table )
+		{
+			$string = null;
+			$table = ( is_array( $table ) ) ? $table : array( $table );
+			foreach ( $table as $v )
+			{
+				if ( $val = $this->_checkRawValue( $v ) )
+				{ 
+					$string .= ' ' . $val. ','; 
+					continue;
+				}
+				$divider = ( strpos( $v , ' as ' ) ) ? ' as ' : ' AS ';
+				$table = explode( $divider , $v );
+				$t = $this->addBackTicks( $table[ 0 ] ); 
+				if ( array_key_exists( 1 , $table ) )
+				{ 
+					$t .= ' as ' . $this->addBackTicks( $table[ 1 ] ); 
+				}
+				$string .= $this->sanitize( $t ) . ',';
+				//$string .= $this->addBackTicks( $this->sanitize( $v ) ) . ','; 
+			}
+			return $string = substr( $string , 0 , strlen( $string ) - 1 );
+		}
+		/**
 		* Checks if a table was set
 		*/
 		protected function _isTableSet( )
@@ -851,10 +860,10 @@ protected function _debugQuery( $string , $data )
 		}
 		/**
 		* Adds execution time and query results to the PtcDebug class
-		* @param	string		$reference		a reference to look for ("$statement")
-		* @param	string		$type			the type of debug  (timer, attach)
+		* @param	string		$reference	a reference to look for ("$statement")
+		* @param	string		$type		the type of debug  (timer, attach)
 		* @param 	mixed 		$string		the string to pass
-		* @param 	mixed 		$statement		some new statement if required
+		* @param 	mixed 		$statement	some new statement if required
 		*/
 		protected static function _debugBuffer( $reference , $type = null , $string = null , $statement = null )
 		{