Skip to content

Commit

Permalink
fix all warnings except TODO warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@ceeram
ceeram committed Nov 14, 2012
1 parent ac087ec commit 56225bc
Show file tree
Hide file tree
Showing 21 changed files with 110 additions and 17 deletions.
10 changes: 10 additions & 0 deletions lib/Cake/Console/Command/ConsoleShell.php
View file
Expand Up @@ -238,7 +238,9 @@ public function main($command = null) {

if ($this->_isValidModel($modelToCheck)) {
$findCommand = "\$data = \$this->$command;";
//@codingStandardsIgnoreStart
@eval($findCommand);
//@codingStandardsIgnoreEnd

if (is_array($data)) {
foreach ($data as $idx => $results) {
Expand Down Expand Up @@ -294,7 +296,9 @@ public function main($command = null) {
list($foo, $data) = explode("->save", $command);
$data = preg_replace('/^\(*(array)?\(*(.+?)\)*$/i', '\\2', $data);
$saveCommand = "\$this->{$modelToSave}->save(array('{$modelToSave}' => array({$data})));";
//@codingStandardsIgnoreStart
@eval($saveCommand);
//@codingStandardsIgnoreEnd
$this->out(__d('cake_console', 'Saved record for %s', $modelToSave));
}
break;
Expand All @@ -304,7 +308,9 @@ public function main($command = null) {
if ($this->_isValidModel($modelToCheck)) {
// Get the column info for this model
$fieldsCommand = "\$data = \$this->{$modelToCheck}->getColumnTypes();";
//@codingStandardsIgnoreStart
@eval($fieldsCommand);
//@codingStandardsIgnoreEnd

if (is_array($data)) {
foreach ($data as $field => $type) {
Expand All @@ -326,7 +332,9 @@ public function main($command = null) {
$this->out(print_r(Hash::combine(Router::$routes, '{n}.template', '{n}.defaults'), true));
break;
case (preg_match("/^route\s+(\(.*\))$/i", $command, $tmp) == true):
//@codingStandardsIgnoreStart
if ($url = eval('return array' . $tmp[1] . ';')) {
//@codingStandardsIgnoreEnd
$this->out(Router::url($url));
}
break;
Expand Down Expand Up @@ -362,7 +370,9 @@ protected function _loadRoutes() {
Router::reload();
extract(Router::getNamedExpressions());

//@codingStandardsIgnoreStart
if (!@include APP . 'Config' . DS . 'routes.php') {
//@codingStandardsIgnoreEnd
return false;
}
CakePlugin::routes();
Expand Down
2 changes: 2 additions & 0 deletions lib/Cake/Console/Shell.php
View file
Expand Up @@ -686,7 +686,9 @@ public function createFile($path, $contents) {
protected function _checkUnitTest() {
if (class_exists('PHPUnit_Framework_TestCase')) {
return true;
//@codingStandardsIgnoreStart
} elseif (@include 'PHPUnit' . DS . 'Autoload.php') {
//@codingStandardsIgnoreEnd
return true;
} elseif (App::import('Vendor', 'phpunit', array('file' => 'PHPUnit' . DS . 'Autoload.php'))) {
return true;
Expand Down
8 changes: 8 additions & 0 deletions lib/Cake/Error/exceptions.php
View file
Expand Up @@ -224,9 +224,11 @@ class MissingControllerException extends CakeException {

protected $_messageTemplate = 'Controller class %s could not be found.';

//@codingStandardsIgnoreStart
public function __construct($message, $code = 404) {
parent::__construct($message, $code);
}
//@codingStandardsIgnoreEnd

}

Expand All @@ -240,9 +242,11 @@ class MissingActionException extends CakeException {

protected $_messageTemplate = 'Action %s::%s() could not be found.';

//@codingStandardsIgnoreStart
public function __construct($message, $code = 404) {
parent::__construct($message, $code);
}
//@codingStandardsIgnoreEnd

}

Expand All @@ -256,9 +260,11 @@ class PrivateActionException extends CakeException {

protected $_messageTemplate = 'Private Action %s::%s() is not directly accessible.';

//@codingStandardsIgnoreStart
public function __construct($message, $code = 404, Exception $previous = null) {
parent::__construct($message, $code, $previous);
}
//@codingStandardsIgnoreEnd

}

Expand Down Expand Up @@ -572,8 +578,10 @@ class NotImplementedException extends CakeException {

protected $_messageTemplate = '%s is not implemented.';

//@codingStandardsIgnoreStart
public function __construct($message, $code = 501) {
parent::__construct($message, $code);
}
//@codingStandardsIgnoreEnd

}
4 changes: 3 additions & 1 deletion lib/Cake/Model/Datasource/Database/Sqlite.php
View file
Expand Up @@ -249,7 +249,9 @@ public function column($real) {

$col = strtolower(str_replace(')', '', $real));
$limit = null;
@list($col, $limit) = explode('(', $col);
if (strpos($col, '(') !== false) {
list($col, $limit) = explode('(', $col);
}

if (in_array($col, array('text', 'integer', 'float', 'boolean', 'timestamp', 'date', 'datetime', 'time'))) {
return $col;
Expand Down
2 changes: 2 additions & 0 deletions lib/Cake/Network/CakeSocket.php
View file
Expand Up @@ -105,11 +105,13 @@ public function connect() {
$scheme = 'ssl://';
}

//@codingStandardsIgnoreStart
if ($this->config['persistent'] == true) {
$this->connection = @pfsockopen($scheme . $this->config['host'], $this->config['port'], $errNum, $errStr, $this->config['timeout']);
} else {
$this->connection = @fsockopen($scheme . $this->config['host'], $this->config['port'], $errNum, $errStr, $this->config['timeout']);
}
//@codingStandardsIgnoreEnd

if (!empty($errNum) || !empty($errStr)) {
$this->setLastError($errNum, $errStr);
Expand Down
2 changes: 2 additions & 0 deletions lib/Cake/Network/Email/MailTransport.php
View file
Expand Up @@ -63,9 +63,11 @@ public function send(CakeEmail $email) {
* @return void
*/
protected function _mail($to, $subject, $message, $headers, $params = null) {
//@codingStandardsIgnoreStart
if (!@mail($to, $subject, $message, $headers, $params)) {
throw new SocketException(__d('cake_dev', 'Could not send email.'));
}
//@codingStandardsIgnoreEnd
}

}
8 changes: 6 additions & 2 deletions lib/Cake/Test/Case/BasicsTest.php
View file
Expand Up @@ -282,7 +282,9 @@ public function testCache() {

$result = cache('basics_test');
$this->assertEquals('simple cache write', $result);
@unlink(CACHE . 'basics_test');
if (file_exists(CACHE . 'basics_test')) {
unlink(CACHE . 'basics_test');
}

cache('basics_test', 'expired', '+1 second');
sleep(2);
Expand Down Expand Up @@ -603,7 +605,9 @@ public function testTranslateDomainCategoryPlural() {
* @return void
*/
public function testLogError() {
@unlink(LOGS . 'error.log');
if (file_exists(LOGS . 'error.log')) {
unlink(LOGS . 'error.log');
}

// disable stderr output for this test
if (CakeLog::stream('stderr')) {
Expand Down
2 changes: 2 additions & 0 deletions lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
View file
Expand Up @@ -111,9 +111,11 @@ public function testMultipleServers() {

foreach ($servers as $server) {
list($host, $port) = explode(':', $server);
//@codingStandardsIgnoreStart
if (!@$Memcache->connect($host, $port)) {
$available = false;
}
//@codingStandardsIgnoreEnd
}

$this->skipIf(!$available, 'Need memcache servers at ' . implode(', ', $servers) . ' to run this test.');
Expand Down
8 changes: 6 additions & 2 deletions lib/Cake/Test/Case/Core/ConfigureTest.php
View file
Expand Up @@ -383,7 +383,9 @@ public function testDump() {
$result = file_get_contents(TMP . 'config_test.php');
$this->assertContains('<?php', $result);
$this->assertContains('$config = ', $result);
@unlink(TMP . 'config_test.php');
if (file_exists(TMP . 'config_test.php')) {
unlink(TMP . 'config_test.php');
}
}

/**
Expand All @@ -402,7 +404,9 @@ public function testDumpPartial() {
$this->assertContains('Error', $result);
$this->assertNotContains('debug', $result);

@unlink(TMP . 'config_test.php');
if (file_exists(TMP . 'config_test.php')) {
unlink(TMP . 'config_test.php');
}
}

}
14 changes: 10 additions & 4 deletions lib/Cake/Test/Case/Error/ErrorHandlerTest.php
View file
Expand Up @@ -124,7 +124,9 @@ public function testErrorSuppressed() {
$this->_restoreError = true;

ob_start();
//@codingStandardsIgnoreStart
@include 'invalid.file';
//@codingStandardsIgnoreEnd
$result = ob_get_clean();
$this->assertTrue(empty($result));
}
Expand All @@ -138,7 +140,7 @@ public function testHandleErrorDebugOff() {
Configure::write('debug', 0);
Configure::write('Error.trace', false);
if (file_exists(LOGS . 'debug.log')) {
@unlink(LOGS . 'debug.log');
unlink(LOGS . 'debug.log');
}

set_error_handler('ErrorHandler::handleError');
Expand All @@ -152,7 +154,9 @@ public function testHandleErrorDebugOff() {
'/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} (Notice|Debug): Notice \(8\): Undefined variable:\s+out in \[.+ line \d+\]$/',
$result[0]
);
@unlink(LOGS . 'debug.log');
if (file_exists(LOGS . 'debug.log')) {
unlink(LOGS . 'debug.log');
}
}

/**
Expand All @@ -164,7 +168,7 @@ public function testHandleErrorLoggingTrace() {
Configure::write('debug', 0);
Configure::write('Error.trace', true);
if (file_exists(LOGS . 'debug.log')) {
@unlink(LOGS . 'debug.log');
unlink(LOGS . 'debug.log');
}

set_error_handler('ErrorHandler::handleError');
Expand All @@ -179,7 +183,9 @@ public function testHandleErrorLoggingTrace() {
);
$this->assertRegExp('/^Trace:/', $result[1]);
$this->assertRegExp('/^ErrorHandlerTest\:\:testHandleErrorLoggingTrace\(\)/', $result[2]);
@unlink(LOGS . 'debug.log');
if (file_exists(LOGS . 'debug.log')) {
unlink(LOGS . 'debug.log');
}
}

/**
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Test/Case/Log/CakeLogTest.php
View file
Expand Up @@ -150,7 +150,7 @@ public function testConfig() {
$this->assertEquals(array('file'), $result);

if (file_exists(LOGS . 'error.log')) {
@unlink(LOGS . 'error.log');
unlink(LOGS . 'error.log');
}
CakeLog::write(LOG_WARNING, 'Test warning');
$this->assertTrue(file_exists(LOGS . 'error.log'));
Expand Down
6 changes: 5 additions & 1 deletion lib/Cake/Test/Case/View/Helper/JsHelperTest.php
View file
Expand Up @@ -29,7 +29,9 @@ class JsEncodingObject {

protected $_title = 'Old thing';

//@codingStandardsIgnoreStart
private $__noshow = 'Never ever';
//@codingStandardsIgnoreEnd

}

Expand Down Expand Up @@ -366,7 +368,9 @@ public function testWriteScriptsInFile() {
$this->assertTrue(file_exists(WWW_ROOT . $filename[1]));
$contents = file_get_contents(WWW_ROOT . $filename[1]);
$this->assertRegExp('/one\s=\s1;\ntwo\s=\s2;/', $contents);
@unlink(WWW_ROOT . $filename[1]);
if (file_exists(WWW_ROOT . $filename[1])) {
unlink(WWW_ROOT . $filename[1]);
}

Configure::write('Cache.disable', true);
$this->Js->buffer('one = 1;');
Expand Down
4 changes: 3 additions & 1 deletion lib/Cake/Test/Case/View/ViewTest.php
View file
Expand Up @@ -1101,7 +1101,9 @@ public function testRenderCache() {

$this->assertRegExp('/^some cacheText/', $result);

@unlink($path);
if (file_exists($path)) {
unlink($path);
}
}

/**
Expand Down
2 changes: 2 additions & 0 deletions lib/Cake/TestSuite/CakeTestSuiteCommand.php
View file
Expand Up @@ -82,7 +82,9 @@ public function run(array $argv, $exit = true) {
$result = $skeleton->generate(true);

if (!$result['incomplete']) {
//@codingStandardsIgnoreStart
eval(str_replace(array('<?php', '?>'), '', $result['code']));
//@codingStandardsIgnoreEnd
$suite = new PHPUnit_Framework_TestSuite(
$this->arguments['test'] . 'Test'
);
Expand Down
8 changes: 4 additions & 4 deletions lib/Cake/TestSuite/ControllerTestCase.php
View file
Expand Up @@ -173,7 +173,7 @@ abstract class ControllerTestCase extends CakeTestCase {
*
* @var boolean
*/
private $__dirtyController = false;
protected $_dirtyController = false;

/**
* Used to enable calling ControllerTestCase::testAction() without the testing
Expand Down Expand Up @@ -252,7 +252,7 @@ protected function _testAction($url = '', $options = array()) {
$this->headers = Router::currentRoute()->response->header();
return;
}
if ($this->__dirtyController) {
if ($this->_dirtyController) {
$this->controller = null;
}

Expand All @@ -275,7 +275,7 @@ protected function _testAction($url = '', $options = array()) {
if (isset($this->controller->View)) {
$this->view = $this->controller->View->fetch('__view_no_layout__');
}
$this->__dirtyController = true;
$this->_dirtyController = true;
$this->headers = $Dispatch->response->header();

$_GET = $restore['get'];
Expand Down Expand Up @@ -371,7 +371,7 @@ public function generate($controller, $mocks = array()) {
}

$_controller->constructClasses();
$this->__dirtyController = false;
$this->_dirtyController = false;

$this->controller = $_controller;
return $this->controller;
Expand Down
5 changes: 4 additions & 1 deletion lib/Cake/Utility/Debugger.php
View file
Expand Up @@ -395,7 +395,10 @@ public static function excerpt($file, $line, $context = 2) {
if (!file_exists($file)) {
return array();
}
$data = @explode("\n", file_get_contents($file));
$data = file_get_contents($file);
if (!empty($data) && strpos($data, "\n") !== false) {
$data = explode("\n", $data);
}

if (empty($data) || !isset($data[$line])) {
return;
Expand Down

0 comments on commit 56225bc

Please sign in to comment.