svn commit: r771257 - in /incubator/log4php/trunk/src: main/php/Logger.php main/php/LoggerHierarchy.php main/php/LoggerPropertyConfigurator.php test/php/LoggerHierarchyTest.php

[kurdalen]

Author: kurdalen
Date: Mon May  4 09:54:24 2009
New Revision: 771257

URL: http://svn.apache.org/viewvc?rev=771257&view=rev
Log:
sizeof() -> count()

Modified:
    incubator/log4php/trunk/src/main/php/Logger.php
    incubator/log4php/trunk/src/main/php/LoggerHierarchy.php
    incubator/log4php/trunk/src/main/php/LoggerPropertyConfigurator.php
    incubator/log4php/trunk/src/test/php/LoggerHierarchyTest.php

Modified: incubator/log4php/trunk/src/main/php/Logger.php
URL: 
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/Logger.php?rev=771257&r1=771256&r2=771257&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/Logger.php (original)
+++ incubator/log4php/trunk/src/main/php/Logger.php Mon May  4 09:54:24 2009
@@ -106,7 +106,7 @@
         * @param LoggerLoggingEvent $event 
         */
        public function callAppenders($event) {
-               if(sizeof($this->aai) > 0) {
+               if(count($this->aai) > 0) {
                        foreach(array_keys($this->aai) as $appenderName) {
                                $this->aai[$appenderName]->doAppend($event);
                        }
@@ -443,7 +443,7 @@
         */
        public function removeAllAppenders() {
                $appenderNames = array_keys($this->aai);
-               $enumAppenders = sizeof($appenderNames);
+               $enumAppenders = count($appenderNames);
                for($i = 0; $i < $enumAppenders; $i++) {
                        $this->removeAppender($appenderNames[$i]); 
                }

Modified: incubator/log4php/trunk/src/main/php/LoggerHierarchy.php
URL: 
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerHierarchy.php?rev=771257&r1=771256&r2=771257&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerHierarchy.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerHierarchy.php Mon May  4 
09:54:24 2009
@@ -197,7 +197,7 @@
                        } else {
                                $this->ht[$name]->setParent($this->root);
                        } 
-                       if(sizeof($nodes) > 0) {
+                       if(count($nodes) > 0) {
                                // find parent node
                                foreach($nodes as $node) {
                                        $parentNode = "$firstNode.$node";
@@ -273,7 +273,7 @@
                $this->setThreshold(LoggerLevel::getLevelAll());
                $this->shutDown();
                $loggers = $this->getCurrentLoggers();
-               $enumLoggers = sizeof($loggers);
+               $enumLoggers = count($loggers);
                for($i = 0; $i < $enumLoggers; $i++) {
                        $loggers[$i]->setLevel(null);
                        $loggers[$i]->setAdditivity(true);
@@ -328,7 +328,7 @@
        public function shutdown() {
                $this->root->removeAllAppenders();
                $cats = $this->getCurrentLoggers();
-               $enumCats = sizeof($cats);                
+               $enumCats = count($cats);                 
                if($enumCats > 0) {
                        for($i = 0; $i < $enumCats; $i++) {
                                $cats[$i]->removeAllAppenders();

Modified: incubator/log4php/trunk/src/main/php/LoggerPropertyConfigurator.php
URL: 
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerPropertyConfigurator.php?rev=771257&r1=771256&r2=771257&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerPropertyConfigurator.php 
(original)
+++ incubator/log4php/trunk/src/main/php/LoggerPropertyConfigurator.php Mon May 
 4 09:54:24 2009
@@ -479,7 +479,7 @@
 
                if(!(empty($value) || @$value[0] == ',')) {
                        // just to be on the safe side...
-                       if(sizeof($st) == 0) {
+                       if(count($st) == 0) {
                                return;
                        }
                        $levelStr = current($st);

Modified: incubator/log4php/trunk/src/test/php/LoggerHierarchyTest.php
URL: 
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/LoggerHierarchyTest.php?rev=771257&r1=771256&r2=771257&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/LoggerHierarchyTest.php (original)
+++ incubator/log4php/trunk/src/test/php/LoggerHierarchyTest.php Mon May  4 
09:54:24 2009
@@ -52,15 +52,15 @@
                $appender = new LoggerAppenderConsole('A1');
                $root->addAppender($appender);
                $logger = $this->hierarchy->getLogger('test');
-               
self::assertEquals(sizeof($this->hierarchy->getCurrentLoggers()), 1);
+               
self::assertEquals(count($this->hierarchy->getCurrentLoggers()), 1);
                $this->hierarchy->resetConfiguration();
                
self::assertEquals($this->hierarchy->getRootLogger()->getLevel()->levelStr, 
'DEBUG');
                self::assertEquals($this->hierarchy->getThreshold()->levelStr, 
'ALL');
-               
self::assertEquals(sizeof($this->hierarchy->getCurrentLoggers()), 1);
+               
self::assertEquals(count($this->hierarchy->getCurrentLoggers()), 1);
                foreach($this->hierarchy->getCurrentLoggers() as $l) {
                        self::assertEquals($l->getLevel(), null);
                        self::assertTrue($l->getAdditivity());
-                       self::assertEquals(sizeof($l->getAllAppenders()), 0);
+                       self::assertEquals(count($l->getAllAppenders()), 0);
                }
        }