Author: Derick Rethans
Date: 2006-09-25 10:21:27 +0200 (Mon, 25 Sep 2006)
New Revision: 3570
Log:
- CS issues.
Modified:
trunk/SignalSlot/src/internal/callback_comparer.php
trunk/SignalSlot/src/signal_collection.php
trunk/SignalSlot/src/static_connections.php
Modified: trunk/SignalSlot/src/internal/callback_comparer.php
===================================================================
--- trunk/SignalSlot/src/internal/callback_comparer.php 2006-09-25 08:17:20 UTC
(rev 3569)
+++ trunk/SignalSlot/src/internal/callback_comparer.php 2006-09-25 08:21:27 UTC
(rev 3570)
@@ -27,7 +27,7 @@
*/
public static function compareCallbacks( $a, $b )
{
- if( is_string( $a ) || is_string( $b ) )
+ if ( is_string( $a ) || is_string( $b ) )
{
return $a === $b;
}
@@ -45,10 +45,11 @@
*/
public static function comp_func( $a, $b )
{
- if( $a === $b ) return 0;
+ if ( $a === $b )
+ {
+ return 0;
+ }
return 1;
-
}
}
-
?>
Modified: trunk/SignalSlot/src/signal_collection.php
===================================================================
--- trunk/SignalSlot/src/signal_collection.php 2006-09-25 08:17:20 UTC (rev
3569)
+++ trunk/SignalSlot/src/signal_collection.php 2006-09-25 08:21:27 UTC (rev
3570)
@@ -116,7 +116,7 @@
*/
public function emit( $signal )
{
- if( $this->signalsBlocked )
+ if ( $this->signalsBlocked )
{
return;
}
@@ -127,26 +127,26 @@
// check if there are any static connections
$priStaticConnections =
ezcSignalStaticConnections::getInstance()->getConnections( $this->identifier,
$signal );
$hasPriStaticConnections = false;
- if( count( $priStaticConnections ) > (isset(
$priStaticConnections[1000] ) ? 1 : 0) )
+ if ( count( $priStaticConnections ) > ( isset(
$priStaticConnections[1000] ) ? 1 : 0) )
{
$hasPriStaticConnections = true;
}
// fast algorithm if there are no prioritized slots
- if( isset( $this->priorityConnections[$signal] ) == 0 &&
!$hasPriStaticConnections )
+ if ( isset( $this->priorityConnections[$signal] ) == 0 &&
!$hasPriStaticConnections )
{
- if( isset( $this->defaultConnections[$signal] ) )
+ if ( isset( $this->defaultConnections[$signal] ) )
{
- foreach( $this->defaultConnections[$signal] as $callback )
+ foreach ( $this->defaultConnections[$signal] as $callback )
{
call_user_func_array( $callback, $parameters );
}
}
- if( isset( $priStaticConnections[1000] ) )
+ if ( isset( $priStaticConnections[1000] ) )
{
- foreach( $priStaticConnections[1000] as $callback )
+ foreach ( $priStaticConnections[1000] as $callback )
{
- call_user_func_array( $callback, $parameters);
+ call_user_func_array( $callback, $parameters );
}
}
}
@@ -154,7 +154,7 @@
{
// order slots
$defaultKeys = array();
- if( isset( $this->priorityConnections[$signal] ) )
+ if ( isset( $this->priorityConnections[$signal] ) )
{
$defaultKeys = array_keys( $this->priorityConnections[$signal]
);
}
@@ -163,25 +163,25 @@
$allKeys = array_unique( array_merge( $defaultKeys, $staticKeys,
array( 1000 ) /*default*/ ) );
sort( $allKeys, SORT_NUMERIC );
- foreach( $allKeys as $key ) // call all slots in the correct order
+ foreach ( $allKeys as $key ) // call all slots in the correct order
{
- if( $key == 1000 && isset( $this->defaultConnections[$signal]
) )
+ if ( $key == 1000 && isset( $this->defaultConnections[$signal]
) )
{
- foreach( $this->defaultConnections[$signal] as $callback )
+ foreach ( $this->defaultConnections[$signal] as $callback )
{
call_user_func_array( $callback, $parameters );
}
}
- if( isset( $this->priorityConnections[$signal][$key] ) )
+ if ( isset( $this->priorityConnections[$signal][$key] ) )
{
- foreach( $this->priorityConnections[$signal][$key] as
$callback )
+ foreach ( $this->priorityConnections[$signal][$key] as
$callback )
{
call_user_func_array( $callback, $parameters );
}
}
- if( isset( $priStaticConnections[$key] ) )
+ if ( isset( $priStaticConnections[$key] ) )
{
- foreach( $priStaticConnections[$key] as $callback )
+ foreach ( $priStaticConnections[$key] as $callback )
{
call_user_func_array( $callback, $parameters );
}
@@ -215,7 +215,7 @@
*/
public function connect( $signal, $slot, $priority = 1000 )
{
- if( $priority === 1000 ) // default
+ if ( $priority === 1000 ) // default
{
$this->defaultConnections[$signal][] = $slot;
}
@@ -241,25 +241,25 @@
*/
public function disconnect( $signal, $slot, $priority = null )
{
- if( $priority === null ) // delete first found, searched from back
+ if ( $priority === null ) // delete first found, searched from back
{
$priorityKeys = array();
- if( isset( $this->priorityConnections[$signal] ) )
+ if ( isset( $this->priorityConnections[$signal] ) )
{
$priorityKeys = array_keys(
$this->priorityConnections[$signal] );
}
$allPriorities = array_unique( array_merge( $priorityKeys, array(
1000 ) /*default*/ ) );
rsort( $allPriorities, SORT_NUMERIC );
- foreach( $allPriorities as $priority )
+ foreach ( $allPriorities as $priority )
{
- if( $priority === 1000 )
+ if ( $priority === 1000 )
{
- if( isset( $this->defaultConnections[$signal] ) )
+ if ( isset( $this->defaultConnections[$signal] ) )
{
- foreach( $this->defaultConnections[$signal] as $key =>
$callback )
+ foreach ( $this->defaultConnections[$signal] as $key
=> $callback )
{
- if( ezcSignalCallbackComparer::compareCallbacks(
$slot, $callback ) )
+ if ( ezcSignalCallbackComparer::compareCallbacks(
$slot, $callback ) )
{
unset(
$this->defaultConnections[$signal][$key] );
return;
@@ -269,12 +269,12 @@
}
else
{
- if( isset( $this->priorityConnections[$signal] ) &&
+ if ( isset( $this->priorityConnections[$signal] ) &&
isset( $this->priorityConnections[$signal][$priority]
) )
{
- foreach(
$this->priorityConnections[$signal][$priority] as $key => $callback)
+ foreach (
$this->priorityConnections[$signal][$priority] as $key => $callback)
{
- if( ezcSignalCallbackComparer::compareCallbacks(
$slot, $callback ) )
+ if ( ezcSignalCallbackComparer::compareCallbacks(
$slot, $callback ) )
{
unset(
$this->priorityConnections[$signal][$priority][$key] );
return;
@@ -285,13 +285,13 @@
}
}
- else if( $priority === 1000 ) // only delete from default
+ else if ( $priority === 1000 ) // only delete from default
{
- if( isset( $this->defaultConnections[$signal] ) )
+ if ( isset( $this->defaultConnections[$signal] ) )
{
- foreach( $this->defaultConnections[$signal] as $key =>
$callback )
+ foreach ( $this->defaultConnections[$signal] as $key =>
$callback )
{
- if( ezcSignalCallbackComparer::compareCallbacks( $slot,
$callback ) )
+ if ( ezcSignalCallbackComparer::compareCallbacks( $slot,
$callback ) )
{
unset( $this->defaultConnections[$signal][$key] );
return;
@@ -301,12 +301,12 @@
}
else // delete from priority connectinos
{
- if( isset( $this->priorityConnections[$signal] ) &&
+ if ( isset( $this->priorityConnections[$signal] ) &&
isset( $this->priorityConnections[$signal][$priority] ) )
{
- foreach( $this->priorityConnections[$signal][$priority] as
$key => $callback )
+ foreach ( $this->priorityConnections[$signal][$priority] as
$key => $callback )
{
- if( ezcSignalCallbackComparer::compareCallbacks( $slot,
$callback ) )
+ if ( ezcSignalCallbackComparer::compareCallbacks( $slot,
$callback ) )
{
unset(
$this->priorityConnections[$signal][$priority][$key] );
return;
Modified: trunk/SignalSlot/src/static_connections.php
===================================================================
--- trunk/SignalSlot/src/static_connections.php 2006-09-25 08:17:20 UTC (rev
3569)
+++ trunk/SignalSlot/src/static_connections.php 2006-09-25 08:21:27 UTC (rev
3570)
@@ -52,7 +52,7 @@
*/
public static function getInstance()
{
- if( self::$instance === null )
+ if ( self::$instance === null )
{
self::$instance = new ezcSignalStaticConnections();
}
@@ -120,7 +120,7 @@
*/
public function getConnections( $identifier, $signal )
{
- if( isset( $this->connections[$identifier] ) &&
+ if ( isset( $this->connections[$identifier] ) &&
isset( $this->connections[$identifier][$signal] ) )
{
return $this->connections[$identifier][$signal];
@@ -174,21 +174,21 @@
*/
public function disconnect( $identifier, $signal, $slot, $priority = null )
{
- if( !isset( $this->connections[$identifier] ) ||
+ if ( !isset( $this->connections[$identifier] ) ||
!isset( $this->connections[$identifier][$signal] ) )
{
return;
}
- if( $priority === null ) // delete first found, searched from back
+ if ( $priority === null ) // delete first found, searched from back
{
$allKeys = array_keys( $this->connections[$identifier][$signal] );
rsort( $allKeys, SORT_NUMERIC );
- foreach( $allKeys as $priority )
+ foreach ( $allKeys as $priority )
{
- foreach( $this->connections[$identifier][$signal][$priority]
as $key => $callback)
+ foreach ( $this->connections[$identifier][$signal][$priority]
as $key => $callback )
{
- if( ezcSignalCallbackComparer::compareCallbacks( $slot,
$callback ) )
+ if ( ezcSignalCallbackComparer::compareCallbacks( $slot,
$callback ) )
{
unset(
$this->properties['connections'][$identifier][$signal][$priority][$key] );
return;
@@ -199,11 +199,11 @@
}
else // only delete from priority connections
{
- if( isset( $this->connections[$identifier][$signal][$priority] ) )
+ if ( isset( $this->connections[$identifier][$signal][$priority] ) )
{
- foreach( $this->connections[$identifier][$signal][$priority]
as $key => $callback )
+ foreach ( $this->connections[$identifier][$signal][$priority]
as $key => $callback )
{
- if( ezcSignalCallbackComparer::compareCallbacks( $slot,
$callback ) )
+ if ( ezcSignalCallbackComparer::compareCallbacks( $slot,
$callback ) )
{
unset(
$this->properties['connections'][$identifier][$signal][$priority][$key] );
return;
--
svn-components mailing list
[email protected]
http://lists.ez.no/mailman/listinfo/svn-components
