Changeset 2963 for trunk/vendor/spikephpcoverage

Timestamp:

10/21/07 07:23:59 (15 months ago)

Author:

jwage

Message:

Mass search and replace for coding standards changes, doc block formatting, and code spacing.

Location:

trunk/vendor/spikephpcoverage

Files:

• cli/driver.php (modified) (5 diffs)
• cli/instrument.php (modified) (10 diffs)
• CoverageRecorder.php (modified) (4 diffs)
• parser/BasicXmlParser.php (modified) (1 diff)
• parser/CoverageXmlParser.php (modified) (2 diffs)
• parser/Parser.php (modified) (3 diffs)
• parser/PHPParser.php (modified) (2 diffs)
• PEAR.php (modified) (4 diffs)
• phpcoverage.inc.php (modified) (1 diff)
• phpcoverage.remote.bottom.inc.php (modified) (2 diffs)
• phpcoverage.remote.top.inc.php (modified) (3 diffs)
• remote/RemoteCoverageRecorder.php (modified) (7 diffs)
• remote/XdebugTraceReader.php (modified) (3 diffs)
• reporter/CoverageReporter.php (modified) (3 diffs)
• reporter/HtmlCoverageReporter.php (modified) (6 diffs)
• util/CoverageLogger.php (modified) (1 diff)
• util/Utility.php (modified) (3 diffs)
• XML/Parser.php (modified) (7 diffs)
• XML/Parser/Simple.php (modified) (2 diffs)

trunk/vendor/spikephpcoverage/cli/driver.php

@@ -19 +19 @@
     */
 
-    if(!defined("__PHPCOVERAGE_HOME")) {
+    if( ! defined("__PHPCOVERAGE_HOME")) {
         define("__PHPCOVERAGE_HOME", dirname(dirname(__FILE__)));
     }
@@ -149 +149 @@
     $excludePaths = array();
 
-    if (!$OPTION['cov-url']){
-        if(!$OPTION['report'] && !$OPTION['cov-data-files']) {
+    if ( ! $OPTION['cov-url']){
+        if( ! $OPTION['report'] && !$OPTION['cov-data-files']) {
             echo "ERROR: No --cov-url option specified.\n";
             exit(1);
@@ -157 +157 @@
 
     if($OPTION['init']) {
-        if(!$OPTION['tmp-dir']) {
+        if( ! $OPTION['tmp-dir']) {
             $OPTION['tmp-dir'] = $util->getTmpDir();
         }
-        if(!$OPTION['cov-file-name']) {
+        if( ! $OPTION['cov-file-name']) {
             $OPTION['cov-file-name'] = "phpcoverage.data.xml";
         }
@@ -166 +166 @@
 
     if($OPTION['report']) {
-        if (!$OPTION['report-name']){
+        if ( ! $OPTION['report-name']){
             echo "ERROR: No --report-name option specified.\n";
             exit(1);
         }
 
-        if(!$OPTION['report-dir']) {
-            if(!empty($PHPCOVERAGE_REPORT_DIR)) {
+        if( ! $OPTION['report-dir']) {
+            if( ! empty($PHPCOVERAGE_REPORT_DIR)) {
                 $OPTION["report-dir"] = $PHPCOVERAGE_REPORT_DIR;
             }
@@ -226 +226 @@
             $OPTION['cov-data-fileset'] = explode(",", $OPTION['cov-data-files']);
             foreach($OPTION['cov-data-fileset'] as $covDataFile) {
-                if(!is_readable($covDataFile)) {
+                if( ! is_readable($covDataFile)) {
                     echo "Error: Cannot read cov-data-file: " . $covDataFile . "\n";
                     exit(1);

trunk/vendor/spikephpcoverage/cli/instrument.php

@@ -11 +11 @@
     #!/bin/php
 
-    if(!defined("__PHPCOVERAGE_HOME")) {
+    if( ! defined("__PHPCOVERAGE_HOME")) {
         define("__PHPCOVERAGE_HOME", dirname(dirname(__FILE__)));
     }
@@ -82 +82 @@
 
         $fp = fopen($tmpfile, "w");
-        if(!$fp) {
+        if( ! $fp) {
             error("Cannot write to file: $tmpfile");
         }
@@ -94 +94 @@
         }
         $ret = rename($tmpfile, $file);
-        if(!$ret) {
+        if( ! $ret) {
             error("Cannot save file: $file");
         }
@@ -119 +119 @@
         $fr = fopen($file, "r");
         $fw = fopen($tmpfile, "w");
-        if(!$fr) {
+        if( ! $fr) {
             error("Cannot read file: $file");
         }
-        if(!$fr) {
+        if( ! $fr) {
             error("Cannot write to file: $tmpfile");
         }
-        while(!feof($fr)) {
+        while( ! feof($fr)) {
             $line = fgets($fr);
             if(strpos($line, $top) === false && strpos($line, $bottom) === false) {
@@ -139 +139 @@
         }
         $ret = rename($tmpfile, $file);
-        if(!$ret) {
+        if( ! $ret) {
             error("Cannot save file: $file");
         }
@@ -159 +159 @@
         while(count($dirs) > 0) {
             $currDir = realpath(array_pop($dirs));
-            if(!is_readable($currDir)) {
+            if( ! is_readable($currDir)) {
                 continue;
             }
@@ -237 +237 @@
 
 
-    if(!is_dir($LOCAL_PHPCOVERAGE_LOCATION)) {
+    if( ! is_dir($LOCAL_PHPCOVERAGE_LOCATION)) {
         error("LOCAL_PHPCOVERAGE_LOCATION [$LOCAL_PHPCOVERAGE_LOCATION] not found.");
     }
@@ -252 +252 @@
     }
     $ret = copy($PHPCOVERAGE_HOME . $top_file, $LOCAL_PHPCOVERAGE_LOCATION . $top_file);
-    if(!$ret) {
+    if( ! $ret) {
         error("Cannot copy to $LOCAL_PHPCOVERAGE_LOCATION");
     }
@@ -259 +259 @@
     }
     $ret = copy($PHPCOVERAGE_HOME . $bottom_file, $LOCAL_PHPCOVERAGE_LOCATION . $bottom_file);
-    if(!$ret) {
+    if( ! $ret) {
         error("Cannot copy to $LOCAL_PHPCOVERAGE_LOCATION");
     }
@@ -268 +268 @@
         $paths[] = getcwd();
     }
-    if(!isset($EXCLUDE_FILES) || empty($EXCLUDE_FILES)) {
+    if( ! isset($EXCLUDE_FILES) || empty($EXCLUDE_FILES)) {
         $EXCLUDE_FILES = array();
     }
     for($i = 0; $i < count($EXCLUDE_FILES); $i++) {
         // Remove a file from the array if it does not exist
-        if(!file_exists($EXCLUDE_FILES[$i])) {
+        if( ! file_exists($EXCLUDE_FILES[$i])) {
             array_splice($EXCLUDE_FILES, $i, 1);
             $i --;

trunk/vendor/spikephpcoverage/CoverageRecorder.php

@@ -10 +10 @@
 <?php
 
-    if(!defined("__PHPCOVERAGE_HOME")) {
+    if( ! defined("__PHPCOVERAGE_HOME")) {
         define("__PHPCOVERAGE_HOME", dirname(__FILE__));
     }
@@ -169 +169 @@
         protected function removeAbsentPaths(&$dirs) {
             for($i = 0; $i < count($dirs); $i++) {
-                if(! file_exists($dirs[$i])) {
+                if( !  file_exists($dirs[$i])) {
                     // echo "Not found: " . $dirs[$i] . "\n";
                     $this->errors[] = "Not found: " . $dirs[$i] 
@@ -212 +212 @@
             while(count($dirs) > 0) {
                 $currDir = realpath(array_pop($dirs));
-                if(!is_readable($currDir)) {
+                if( ! is_readable($currDir)) {
                     continue;
                 }
@@ -272 +272 @@
                     }
                 }
-                if(!array_key_exists($files[$i], $this->coverageData)) {
+                if( ! array_key_exists($files[$i], $this->coverageData)) {
                     $this->coverageData[$files[$i]] =  array();
                 }

trunk/vendor/spikephpcoverage/parser/BasicXmlParser.php

@@ -12 +12 @@
     require_once("XML/Parser.php");
 
-    if(!defined("ATTRIBUTES")) {
+    if( ! defined("ATTRIBUTES")) {
         define("ATTRIBUTES", "__ATTRIBUTES__");
     }

trunk/vendor/spikephpcoverage/parser/CoverageXmlParser.php

@@ -43 +43 @@
                 $fileAttributes = $this->handleAttrTag($name, $attrs);
                 $this->_lastFilePath = $fileAttributes["PATH"];
-                if(!isset($this->_data[$this->_lastFilePath])) {
+                if( ! isset($this->_data[$this->_lastFilePath])) {
                     $this->_data[$this->_lastFilePath] = array();
                 }
@@ -51 +51 @@
                 $lineAttributes = $this->handleAttrTag($name, $attrs);
                 $lineNumber = (int)$lineAttributes["LINE-NUMBER"];
-                if(!isset($this->_data[$this->_lastFilePath][$lineNumber])) {
+                if( ! isset($this->_data[$this->_lastFilePath][$lineNumber])) {
                     $this->_data[$this->_lastFilePath][$lineNumber] = (int)$lineAttributes["FREQUENCY"];
                 }

trunk/vendor/spikephpcoverage/parser/Parser.php

@@ -10 +10 @@
 <?php
 
-    if(!defined("__PHPCOVERAGE_HOME")) {
+    if( ! defined("__PHPCOVERAGE_HOME")) {
         define("__PHPCOVERAGE_HOME", dirname(dirname(__FILE__)));
     }
@@ -74 +74 @@
             $this->filename = $filename;
             $ret = $this->openFileReadOnly();
-            if(!$ret) {
+            if( ! $ret) {
                 die("Error: Cannot open file: $this->filename \n");
             }
@@ -102 +102 @@
         */
         public function getLine() {
-            if(!feof($this->fileRef)) {
+            if( ! feof($this->fileRef)) {
                 $this->line = fgets($this->fileRef);
                 $this->processLine($this->line);

trunk/vendor/spikephpcoverage/parser/PHPParser.php

@@ -10 +10 @@
 <?php
 
-    if(!defined("__PHPCOVERAGE_HOME")) {
+    if( ! defined("__PHPCOVERAGE_HOME")) {
         define("__PHPCOVERAGE_HOME", dirname(dirname(__FILE__)));
     }
@@ -84 +84 @@
 
             // If we are not inside PHP opening tag
-            if(!$this->inPHP) {
+            if( ! $this->inPHP) {
                 $pos = -1;
 

trunk/vendor/spikephpcoverage/PEAR.php

@@ -46 +46 @@
 
 // instant backwards compatibility
-if (!defined('PATH_SEPARATOR')) {
+if ( ! defined('PATH_SEPARATOR')) {
     if (OS_WINDOWS) {
         define('PATH_SEPARATOR', ';');
@@ -165 +165 @@
                 global $_PEAR_destructor_object_list;
                 $_PEAR_destructor_object_list[] = &$this;
-                if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
+                if ( ! isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
                     register_shutdown_function("_PEAR_call_destructors");
                     $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
@@ -440 +440 @@
             }
             return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
-        } elseif (!empty($error_code)) {
+        } elseif ( ! empty($error_code)) {
             // $error_code comes alone, trying to unset it
             if ($this->_checkDelExpect($error_code)) {
@@ -708 +708 @@
     function loadExtension($ext)
     {
-        if (!extension_loaded($ext)) {
+        if ( ! extension_loaded($ext)) {
             // if either returns true dl() will produce a FATAL error, stop that
             if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {

trunk/vendor/spikephpcoverage/phpcoverage.inc.php

@@ -44 +44 @@
 
     // Fallback
-    if(!defined("PHPCOVERAGE_HOME")) {
+    if( ! defined("PHPCOVERAGE_HOME")) {
         $include_path = get_include_path();
         set_include_path($PHPCOVERAGE_HOME. PATH_SEPARATOR . $include_path);

trunk/vendor/spikephpcoverage/phpcoverage.remote.bottom.inc.php

@@ -20 +20 @@
             __FILE__, __LINE__);
 
-        if(!isset($cov)) {
+        if( ! isset($cov)) {
             if(file_exists($tmpFile)) {
                 $object = file_get_contents($tmpFile);
@@ -30 +30 @@
         if(isset($cov)) {
             // PHPCoverage bottom half
-            if(!isset($called_script)) {
+            if( ! isset($called_script)) {
                 $called_script = "";
             }

trunk/vendor/spikephpcoverage/phpcoverage.remote.top.inc.php

@@ -29 +29 @@
         $called_script = basename($_SERVER["SCRIPT_FILENAME"]);
 
-        if(!empty($_REQUEST["PHPCOVERAGE_HOME"])) {
+        if( ! empty($_REQUEST["PHPCOVERAGE_HOME"])) {
             $PHPCOVERAGE_HOME = $_REQUEST["PHPCOVERAGE_HOME"];
         }
@@ -52 +52 @@
 
         // Fallback
-        if(!defined("PHPCOVERAGE_HOME")) {
+        if( ! defined("PHPCOVERAGE_HOME")) {
             $include_path = get_include_path();
             set_include_path($PHPCOVERAGE_HOME. ":" . $include_path);
@@ -95 +95 @@
         }
 
-        if(!empty($_REQUEST["phpcoverage-action"])) {
+        if( ! empty($_REQUEST["phpcoverage-action"])) {
             $logger->info("[phpcoverage.remote.top.inc.php] phpcoverage-action=" . strtolower($_REQUEST["phpcoverage-action"]),
                 __FILE__, __LINE__);
             switch(strtolower($_REQUEST["phpcoverage-action"])) {
             case "init":
-                if(!empty($_REQUEST["tmp-dir"])) {
+                if( ! empty($_REQUEST["tmp-dir"])) {
                     $cov->setTmpDir($_REQUEST["tmp-dir"]);
                 }
                 $cov->setCoverageFileName($_REQUEST["cov-file-name"]);
-                if(!$cov->cleanCoverageFile()) {
+                if( ! $cov->cleanCoverageFile()) {
                     die("Cannot delete existing coverage data.");
                 }

trunk/vendor/spikephpcoverage/remote/RemoteCoverageRecorder.php

@@ -10 +10 @@
 <?php
 
-    if(!defined("__PHPCOVERAGE_HOME")) {
+    if( ! defined("__PHPCOVERAGE_HOME")) {
         define("__PHPCOVERAGE_HOME", dirname(dirname(__FILE__)));
     }
@@ -125 +125 @@
             $xmlString = "";
             $xmlBody = "";
-            if(!empty($this->coverageData)) {
+            if( ! empty($this->coverageData)) {
                 foreach($this->coverageData as $file => &$lines) {
                     $xmlBody .= "<file path=\"". $util->replaceBackslashes($file) . "\">";
@@ -158 +158 @@
         protected function parseCoverageXml(&$xml, $stream=false) {
             // Need to handle multiple xml files.
-            if(!is_array($xml)) {
+            if( ! is_array($xml)) {
                 $xml = array($xml);
             }
@@ -195 +195 @@
                 $fp = fopen($filepath, "r");
                 if($fp) {
-                    while(!feof($fp)) {
+                    while( ! feof($fp)) {
                         $xml = fread($fp, 4096);
                         echo $xml;
@@ -226 +226 @@
         protected function appendDataToFile($newXml) {
             $filepath = $this->tmpDir . "/" . $this->coverageFileName;
-            if(!file_exists($filepath)) {
+            if( ! file_exists($filepath)) {
                 // If new file, write the xml start and end tags
                 $bytes = file_put_contents($filepath, $this->xmlStart . "\n" . $this->xmlEnd);
-                if(!$bytes) {
+                if( ! $bytes) {
                     $this->logger->critical("[RemoteCoverageRecorder::appendDataToFile()] Could not create file: " . $filepath, __FILE__, __LINE__);
                     return false;
@@ -239 +239 @@
                     fseek($res, -1 * strlen($this->xmlEnd), SEEK_END);
                     $ret = fwrite($res, $newXml);
-                    if(!$ret) {
+                    if( ! $ret) {
                         $this->logger->error("[RemoteCoverageRecorder::appendDataToFile()] Could not append data to file.",
                             __FILE__, __LINE__);
@@ -271 +271 @@
                 $xml = $this->prepareCoverageXml();
                 $ret = $this->appendDataToFile($xml);
-                if(!$ret) {
+                if( ! $ret) {
                     $this->logger->warn("[RemoteCoverageRecorder::saveCoverageXml()] "
                     . "ERROR: Nothing was written to " . $filepath,

trunk/vendor/spikephpcoverage/remote/XdebugTraceReader.php

@@ -61 +61 @@
         */
         public function parseTraceFile() {
-            if(!$this->openTraceFile()) {
+            if( ! $this->openTraceFile()) {
                 error_log("[XdebugTraceReader::parseTraceFile()] Unable to read trace file.");
                 return false;
             }
-            while(!feof($this->handle)) {
+            while( ! feof($this->handle)) {
                 $line = fgets($this->handle);
                 // echo "Line: " . $line . "\n";
@@ -91 +91 @@
                 return false;
             }
-            if(!file_exists($dataparts[$cnt-2])) {
+            if( ! file_exists($dataparts[$cnt-2])) {
                 // echo "No file: " . $dataparts[$cnt-2] . "\n";
                 return false;
@@ -99 +99 @@
             $dataparts[$cnt-1] = trim($dataparts[$cnt-1]);
 
-            if(!isset($this->coverage[$dataparts[$cnt-2]][$dataparts[$cnt-1]])) {
+            if( ! isset($this->coverage[$dataparts[$cnt-2]][$dataparts[$cnt-1]])) {
                 $this->coverage[$dataparts[$cnt-2]][$dataparts[$cnt-1]] = 1;
             }

trunk/vendor/spikephpcoverage/reporter/CoverageReporter.php

@@ -10 +10 @@
 <?php
 
-    if(!defined("__PHPCOVERAGE_HOME")) {
+    if( ! defined("__PHPCOVERAGE_HOME")) {
         define("__PHPCOVERAGE_HOME", dirname(dirname(__FILE__)));
     }
@@ -101 +101 @@
         protected function createReportDir() {
             global $util;
-            if(!file_exists($this->outputDir)) {
+            if( ! file_exists($this->outputDir)) {
                 $util->makeDirRecursive($this->outputDir, 0755);
             }
@@ -201 +201 @@
             else {
                 $filename = $util->replaceBackslashes($filename);
-                if(!file_exists(dirname($filename))) {
+                if( ! file_exists(dirname($filename))) {
                     $ret = $util->makeDirRecursive(dirname($filename), 0755);
-                    if(!$ret) {
+                    if( ! $ret) {
                         die ("Cannot create directory " . dirname($filename) . "\n");
                     }

trunk/vendor/spikephpcoverage/reporter/HtmlCoverageReporter.php

@@ -10 +10 @@
 <?php
 
-    if(!defined("__PHPCOVERAGE_HOME")) {
+    if( ! defined("__PHPCOVERAGE_HOME")) {
         define("__PHPCOVERAGE_HOME", dirname(dirname(__FILE__)));
     }
@@ -67 +67 @@
         */
         public function generateReport(&$data) {
-            if(!file_exists($this->outputDir)) {
+            if( ! file_exists($this->outputDir)) {
                 mkdir($this->outputDir);
             }
@@ -155 +155 @@
             }
             $imagesSpikeDir = $imagesDir . "/spikesource";
-            if(!file_exists($imagesSpikeDir)) {
+            if( ! file_exists($imagesSpikeDir)) {
                 mkdir($imagesSpikeDir);
             }
@@ -342 +342 @@
             $str .= $this->writeIndexFileTableHead();
             $str .= '<tbody>';
-            if(!empty($this->coverageData)) {
+            if( ! empty($this->coverageData)) {
                 foreach($this->coverageData as $filename => &$lines) {
                     $realFile = realpath($filename);
@@ -440 +440 @@
             $fileLink = $util->replaceBackslashes($fileLink);
             $parentDir = $util->replaceBackslashes(dirname($fileLink));
-            if(!file_exists($parentDir)) {
+            if( ! file_exists($parentDir)) {
                 //echo "\nCreating dir: $parentDir\n";
       &nb