Permalink
Browse files

fix all warnings except TODO warnings

  • Loading branch information...
1 parent ac087ec commit 56225bcca3aca9959d072641aef7639390f119af @ceeram committed Nov 14, 2012
@@ -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) {
@@ -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;
@@ -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) {
@@ -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;
@@ -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();
@@ -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;
@@ -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
}
@@ -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
}
@@ -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
}
@@ -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
}
@@ -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;
@@ -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);
@@ -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
}
}
@@ -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);
@@ -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')) {
@@ -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.');
@@ -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');
+ }
}
/**
@@ -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');
+ }
}
}
@@ -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));
}
@@ -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');
@@ -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');
+ }
}
/**
@@ -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');
@@ -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');
+ }
}
/**
@@ -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'));
@@ -29,7 +29,9 @@ class JsEncodingObject {
protected $_title = 'Old thing';
+ //@codingStandardsIgnoreStart
private $__noshow = 'Never ever';
+ //@codingStandardsIgnoreEnd
}
@@ -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;');
@@ -1101,7 +1101,9 @@ public function testRenderCache() {
$this->assertRegExp('/^some cacheText/', $result);
- @unlink($path);
+ if (file_exists($path)) {
+ unlink($path);
+ }
}
/**
@@ -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'
);
@@ -173,7 +173,7 @@ public function afterRender($viewFile) {
*
* @var boolean
*/
- private $__dirtyController = false;
+ protected $_dirtyController = false;
/**
* Used to enable calling ControllerTestCase::testAction() without the testing
@@ -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;
}
@@ -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'];
@@ -371,7 +371,7 @@ public function generate($controller, $mocks = array()) {
}
$_controller->constructClasses();
- $this->__dirtyController = false;
+ $this->_dirtyController = false;
$this->controller = $_controller;
return $this->controller;
@@ -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;
Oops, something went wrong.

0 comments on commit 56225bc

Please sign in to comment.