Renaming $self to unintuitive var name for consistency

cboden · cboden · commit 6da66473bfd1 · 2013-01-04T20:02:24.000-05:00
diff --git a/LibEventLoop.php b/LibEventLoop.php
@@ -173,8 +173,8 @@ protected function addTimerInternal($interval, $callback, $periodic = false)
         $timer->signature = spl_object_hash($timer);
         $timersGc = $this->timersGc;
 
-        $self = $this;
-        $callback = function () use ($timer, $timersGc, $self) {
+        $that = $this;
+        $callback = function () use ($timer, $timersGc, $that) {
             foreach ($timersGc as $resource) {
                 event_free($resource);
             }
@@ -185,7 +185,7 @@ protected function addTimerInternal($interval, $callback, $periodic = false)
                 if ($timer->periodic === true) {
                     event_add($timer->resource, $timer->interval);
                 } else {
-                    $self->cancelTimer($timer->signature);
+                    $that->cancelTimer($timer->signature);
                 }
             }
         };

Original file line number	Diff line number	Diff line change
`@@ -173,8 +173,8 @@ protected function addTimerInternal($interval, $callback, $periodic = false)`
`173`	`173`	`$timer->signature = spl_object_hash($timer);`
`174`	`174`	`$timersGc = $this->timersGc;`
`175`	`175`
`176`		`- $self = $this;`
`177`		`- $callback = function () use ($timer, $timersGc, $self) {`
	`176`	`+ $that = $this;`
	`177`	`+ $callback = function () use ($timer, $timersGc, $that) {`
`178`	`178`	`foreach ($timersGc as $resource) {`
`179`	`179`	`event_free($resource);`
`180`	`180`	`}`
`@@ -185,7 +185,7 @@ protected function addTimerInternal($interval, $callback, $periodic = false)`
`185`	`185`	`if ($timer->periodic === true) {`
`186`	`186`	`event_add($timer->resource, $timer->interval);`
`187`	`187`	`} else {`
`188`		`- $self->cancelTimer($timer->signature);`
	`188`	`+ $that->cancelTimer($timer->signature);`
`189`	`189`	`}`
`190`	`190`	`}`
`191`	`191`	`};`