root

Changeset 432

Show
Ignore:
Timestamp:
12/11/08 00:32:37 (2 years ago)
Author:
wbond
Message:

Removed a whole bunch of unnecessary error suppression operators (@)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • fDatabase.php

    r429 r432 Hide Line Numbers
    10421042    { 
    10431043        if ($this->extension == 'mssql') { 
    1044             $result->setResult(@mssql_query($result->getSQL(), $this->connection)); 
     1044            $result->setResult(mssql_query($result->getSQL(), $this->connection)); 
    10451045        } elseif ($this->extension == 'mysql') { 
    1046             $result->setResult(@mysql_query($result->getSQL(), $this->connection)); 
     1046            $result->setResult(mysql_query($result->getSQL(), $this->connection)); 
    10471047        } elseif ($this->extension == 'mysqli') { 
    1048             $result->setResult(@mysqli_query($this->connection, $result->getSQL())); 
     1048            $result->setResult(mysqli_query($this->connection, $result->getSQL())); 
    10491049        } elseif ($this->extension == 'odbc') { 
    10501050            $rows = array(); 
    1051             $resource = @odbc_exec($this->connection, $result->getSQL()); 
     1051            $resource = odbc_exec($this->connection, $result->getSQL()); 
    10521052            if (is_resource($resource)) { 
    10531053                // Allow up to 1MB of binary data 
    …… 
    10621062            } 
    10631063        } elseif ($this->extension == 'pgsql') { 
    1064             $result->setResult(@pg_query($this->connection, $result->getSQL())); 
     1064            $result->setResult(pg_query($this->connection, $result->getSQL())); 
    10651065        } elseif ($this->extension == 'sqlite') { 
    1066             $result->setResult(@sqlite_query($this->connection, $result->getSQL(), SQLITE_ASSOC, $sqlite_error_message)); 
     1066            $result->setResult(sqlite_query($this->connection, $result->getSQL(), SQLITE_ASSOC, $sqlite_error_message)); 
    10671067        } elseif ($this->extension == 'sqlsrv') { 
    10681068            $rows = array(); 
    1069             $resource = @sqlsrv_query($this->connection, $result->getSQL()); 
     1069            $resource = sqlsrv_query($this->connection, $result->getSQL()); 
    10701070            if (is_resource($resource)) { 
    10711071                while ($row = sqlsrv_fetch_array($resource, SQLSRV_FETCH_ASSOC)) { 
    …… 
    11161116    { 
    11171117        if ($this->extension == 'mssql') { 
    1118             $result->setResult(@mssql_query($result->getSQL(), $this->connection, 20)); 
     1118            $result->setResult(mssql_query($result->getSQL(), $this->connection, 20)); 
    11191119        } elseif ($this->extension == 'mysql') { 
    1120             $result->setResult(@mysql_unbuffered_query($result->getSQL(), $this->connection)); 
     1120            $result->setResult(mysql_unbuffered_query($result->getSQL(), $this->connection)); 
    11211121        } elseif ($this->extension == 'mysqli') { 
    1122             $result->setResult(@mysqli_query($this->connection, $result->getSQL(), MYSQLI_USE_RESULT)); 
     1122            $result->setResult(mysqli_query($this->connection, $result->getSQL(), MYSQLI_USE_RESULT)); 
    11231123        } elseif ($this->extension == 'odbc') { 
    1124             $result->setResult(@odbc_exec($this->connection, $result->getSQL())); 
     1124            $result->setResult(odbc_exec($this->connection, $result->getSQL())); 
    11251125        } elseif ($this->extension == 'pgsql') { 
    1126             $result->setResult(@pg_query($this->connection, $result->getSQL())); 
     1126            $result->setResult(pg_query($this->connection, $result->getSQL())); 
    11271127        } elseif ($this->extension == 'sqlite') { 
    1128             $result->setResult(@sqlite_unbuffered_query($this->connection, $result->getSQL(), SQLITE_ASSOC, $sqlite_error_message)); 
     1128            $result->setResult(sqlite_unbuffered_query($this->connection, $result->getSQL(), SQLITE_ASSOC, $sqlite_error_message)); 
    11291129        } elseif ($this->extension == 'sqlsrv') { 
    1130             $result->setResult(@sqlsrv_query($this->connection, $result->getSQL())); 
     1130            $result->setResult(sqlsrv_query($this->connection, $result->getSQL())); 
    11311131        } elseif ($this->extension == 'pdo') { 
    11321132            $result->setResult($this->connection->query($result->getSQL())); 

  • fDirectory.php

    r388 r432 Hide Line Numbers
    338338        } 
    339339         
    340          
    341         @rename($this->directory, $new_dirname); 
     340        rename($this->directory, $new_dirname); 
    342341         
    343342        // Allow filesystem transactions 

  • fFile.php

    r430 r432 Hide Line Numbers
    542542        } 
    543543         
    544         @unlink($this->file); 
     544        unlink($this->file); 
    545545         
    546546        $exception = new fProgrammerException( 
    …… 
    607607        } 
    608608         
    609         @copy($this->getPath(), $new_filename); 
     609        copy($this->getPath(), $new_filename); 
    610610        $class = get_class($this); 
    611611        $file  = new $class($new_filename); 
    …… 
    868868        } 
    869869         
    870         @rename($this->file, $new_filename); 
     870        rename($this->file, $new_filename); 
    871871         
    872872        // Allow filesystem transactions 

  • fFilesystem.php

    r431 r432 Hide Line Numbers
    145145            // Commit operations only include deletes, however it could be a filename or object 
    146146            if (isset($operation['filename'])) { 
    147                 @unlink($operation['filename']); 
     147                unlink($operation['filename']); 
    148148            } else { 
    149149                $operation['object']->delete(); 
    …… 
    553553                        new fProgrammerException('The action requested can not be performed because the file has been deleted') 
    554554                    ); 
    555                     @unlink($operation['filename']); 
     555                    unlink($operation['filename']); 
    556556                    break; 
    557557                     
    …… 
    562562                case 'rename': 
    563563                    fFilesystem::updateFilenameMap($operation['new_name'], $operation['old_name']); 
    564                     @rename($operation['new_name'], $operation['old_name']); 
     564                    rename($operation['new_name'], $operation['old_name']); 
    565565                    break; 
    566566