' . basename($filename) . '
';
if (!empty($results)) {
$output .= theme('item_list', $results);
}
@@ -1266,13 +1266,13 @@ function theme_coder_warning($warning, $
$link = $warning['#link'];
$warning = $warning['#warning'];
if (isset($link)) {
- $warning .= ' ('. l('Drupal Docs', $link) .')';
+ $warning .= ' (' . l('Drupal Docs', $link) . ')';
}
}
if ($lineno) {
$warning = t('Line @number: !warning', array('@number' => $lineno, '!warning' => $warning));
if ($line) {
- $warning .= '
'. check_plain($line) .'
';
+ $warning .= '
' . check_plain($line) . '
';
}
}
$class = 'coder-warning';
@@ -1281,12 +1281,12 @@ function theme_coder_warning($warning, $
}
$path = drupal_get_path('module', 'coder');
$title = t('severity: @severity', array('@severity' => $severity_name));
- $img = theme('image', $path ."/images/$severity_name.png", $title, $title, array('align' => 'right', 'class' => 'coder'), false);
+ $img = theme('image', $path . "/images/$severity_name.png", $title, $title, array('align' => 'right', 'class' => 'coder'), false);
if (!empty($description)) {
- $img .= theme('image', $path .'/images/more.png', t('click to read more'), '', array('align' => 'right', 'class' => 'coder-more'), false);
- $warning .= '
Explanation: '. $description .'
';
+ $img .= theme('image', $path . '/images/more.png', t('click to read more'), '', array('align' => 'right', 'class' => 'coder-more'), false);
+ $warning .= '
Explanation: ' . $description . '
';
}
- return '
'. $img . $warning .'
';
+ return '
' . $img . $warning . '
';
}
function theme_drupalapi($function, $version = 'HEAD') {
Index: includes/coder_50.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/coder/includes/coder_50.inc,v
retrieving revision 1.21
diff -u -p -r1.21 coder_50.inc
--- includes/coder_50.inc 1 Jun 2007 00:47:57 -0000 1.21
+++ includes/coder_50.inc 15 Apr 2008 11:25:05 -0000
@@ -84,7 +84,7 @@ function _coder_50_callback(&$coder_args
$filename = $coder_args['#filename'];
if (substr($filename, -7) == '.module') {
// make sure that a .info file exists
- $filename = drupal_substr(realpath($filename), 0, -7) .'.info';
+ $filename = drupal_substr(realpath($filename), 0, -7) . '.info';
if (!file_exists($filename)) {
$severity_name = _coder_severity_name($coder_args, $review, $rule);
$warning = t('All modules now need to have a
modulename.info file', array('@info' => 'http://drupal.org/node/101009'));
Index: includes/coder_style.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/coder/includes/coder_style.inc,v
retrieving revision 1.16
diff -u -p -r1.16 coder_style.inc
--- includes/coder_style.inc 22 Jul 2007 18:12:01 -0000 1.16
+++ includes/coder_style.inc 15 Apr 2008 11:25:06 -0000
@@ -44,13 +44,8 @@ function coder_style_reviews() {
),
array(
'#type' => 'regex',
- '#value' => '(\.\s\'\'|\'\'\s\.|\.\s""|\.\s"")',
- '#warning' => 'string concatenation should be formatted without a space separating the operators (dot .) and a quote',
- ),
- array(
- '#type' => 'regex',
- '#value' => '([^\'\"\s0-9]\.|\.[^\'\"\=\s0-9])',
- '#warning' => 'string concatenation should be formatted with a space separating the operators (dot .) and non-quote terms',
+ '#value' => '([^\s]\.|\.[^\=\s])',
+ '#warning' => 'String concatenation should be formatted with a space separating the operators (dot .) and the terms',
),
array(
'#type' => 'regex',
@@ -61,7 +56,7 @@ function coder_style_reviews() {
array(
'#type' => 'regex',
'#value' => 'global\s+\$(\w+)(,\s\$(\w+))*',
- '#not' => '^_|^('. _coder_style_core_global_regex() .')$',
+ '#not' => '^_|^(' . _coder_style_core_global_regex() . ')$',
'#warning' => 'global variables should start with a single underscore followed by the module and another underscore',
),
array(
@@ -99,7 +94,7 @@ function coder_style_reviews() {
array(
'#type' => 'regex',
'#source' => 'html',
- '#value' => '<'. $br .'>', // NOTE: use $br only to avoid a warning
+ '#value' => '<' . $br . '>', // NOTE: use $br only to avoid a warning
'#warning' => 'use <br /> instead of <br>',
'#severity' => 'minor',
),
Index: scripts/coder_format/coder_format.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/coder/scripts/coder_format/coder_format.php,v
retrieving revision 1.3
diff -u -p -r1.3 coder_format.php
--- scripts/coder_format/coder_format.php 24 Feb 2008 19:40:50 -0000 1.3
+++ scripts/coder_format/coder_format.php 15 Apr 2008 11:25:06 -0000
@@ -38,7 +38,7 @@
// We are on the command line, so output only real errors.
error_reporting(E_ERROR | E_WARNING | E_PARSE);
-require_once realpath(dirname($_SERVER['PHP_SELF'])) .'/coder_format.inc';
+require_once realpath(dirname($_SERVER['PHP_SELF'])) . '/coder_format.inc';
if (!empty($_SERVER['argv'])) {
// Remove self-reference.
@@ -186,7 +186,7 @@ function file_copy(&$source, $dest = 0,
// If the destination file is not specified then use the filename of the source file.
$basename = $basename ? $basename : basename($source);
- $dest = $directory .'/'. $basename;
+ $dest = $directory . '/' . $basename;
// Make sure source and destination filenames are not the same, makes no sense
// to copy it if they are. In fact copying the file will most likely result in
@@ -286,7 +286,7 @@ function file_move(&$source, $dest = 0,
* @return
*/
function file_create_filename($basename, $directory) {
- $dest = $directory .'/'. $basename;
+ $dest = $directory . '/' . $basename;
if (file_exists($dest)) {
// Destination file already exists, generate an alternative.
@@ -295,7 +295,7 @@ function file_create_filename($basename,
$counter = 0;
do {
- $dest = $directory .'/'. $name . str_repeat('.coder.orig', $counter++);
+ $dest = $directory . '/' . $name . str_repeat('.coder.orig', $counter++);
} while (file_exists($dest));
}
Index: scripts/coder_format/tests/CoderTestCase.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/coder/scripts/coder_format/tests/CoderTestCase.php,v
retrieving revision 1.2
diff -u -p -r1.2 CoderTestCase.php
--- scripts/coder_format/tests/CoderTestCase.php 24 Feb 2008 19:40:50 -0000 1.2
+++ scripts/coder_format/tests/CoderTestCase.php 15 Apr 2008 11:25:06 -0000
@@ -1,7 +1,7 @@
input[$unit] .= $line ."\n";
+ $this->input[$unit] .= $line . "\n";
break;
case 'EXPECT':
- $this->expect[$unit] .= $line ."\n";
+ $this->expect[$unit] .= $line . "\n";
break;
case 'ONLY':
@@ -95,9 +95,9 @@ class CoderTestFile extends SimpleExpect
}
// If FULL was *not* defined, add a PHP header to contents.
if (!$this->full) {
- $prepend = "input[$unit] = $prepend . rtrim($this->input[$unit], "\n") ."\n\n";
- $this->expect[$unit] = $prepend . rtrim($this->expect[$unit], "\n") ."\n\n";
+ $prepend = "input[$unit] = $prepend . rtrim($this->input[$unit], "\n") . "\n\n";
+ $this->expect[$unit] = $prepend . rtrim($this->expect[$unit], "\n") . "\n\n";
}
}
if (!empty($this->only[$unit])) {
@@ -136,7 +136,7 @@ class CoderTestFile extends SimpleExpect
* Implements SimpleExpectation::testMessage().
*/
function testMessage() {
- $message = $this->test .' test in '. htmlspecialchars(basename($this->filename));
+ $message = $this->test . ' test in ' . htmlspecialchars(basename($this->filename));
return $message;
}
@@ -144,7 +144,7 @@ class CoderTestFile extends SimpleExpect
* Renders the test with an HTML diff table.
*/
function render() {
- drupal_add_css(drupal_get_path('module', 'coder') .'/scripts/coder_format/tests/coder-diff.css', 'module', 'all', false);
+ drupal_add_css(drupal_get_path('module', 'coder') . '/scripts/coder_format/tests/coder-diff.css', 'module', 'all', false);
foreach ($this->input as $unit => $content) {
// Do not output passed units.
@@ -153,7 +153,7 @@ class CoderTestFile extends SimpleExpect
}
$diff = new Text_Diff('auto', array(explode("\n", $this->expect[$unit]), explode("\n", $this->actual[$unit])));
- $renderer = new Text_Diff_Renderer_parallel($this->test .' test in '. htmlspecialchars(basename($this->filename)));
+ $renderer = new Text_Diff_Renderer_parallel($this->test . ' test in ' . htmlspecialchars(basename($this->filename)));
$message .= $renderer->render($diff);
}
@@ -185,7 +185,7 @@ class Text_Diff_Renderer_parallel extend
function _blockHeader() {}
function _startDiff() {
- return '
| '. $this->title .' |
|---|
| '. $this->original .' | '. $this->final .' |
|---|
';
+ return '| ' . $this->title . ' |
|---|
| ' . $this->original . ' | ' . $this->final . ' |
|---|
';
}
function _endDiff() {
@@ -193,25 +193,25 @@ class Text_Diff_Renderer_parallel extend
}
function _context($lines) {
- return ''. $this->_renderLines($lines) .' |
- '. $this->_renderLines($lines) .' |
';
+ return '' . $this->_renderLines($lines) . ' |
+ ' . $this->_renderLines($lines) . ' |
';
}
function _added($lines) {
- return '| | '. $this->_renderLines($lines) .' |
';
+ return '| | ' . $this->_renderLines($lines) . ' |
';
}
function _deleted($lines) {
- return ''. $this->_renderLines($lines) .' | |
';
+ return '' . $this->_renderLines($lines) . ' | |
';
}
function _changed($orig, $final) {
- return ''. $this->_renderLines($orig) .' |
+ return '
' . $this->_renderLines($orig) . ' |
'. $this->_renderLines($final) .' |
';
}
function _renderLines($lines) {
- return str_replace("\n", "¶\n", htmlspecialchars(implode("\n", $lines)."\n"));
+ return str_replace("\n", "¶\n", htmlspecialchars(implode("\n", $lines) . "\n"));
}
}
Index: tests/coder_style.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/coder/tests/coder_style.inc,v
retrieving revision 1.6
diff -u -p -r1.6 coder_style.inc
--- tests/coder_style.inc 1 Jun 2007 00:47:57 -0000 1.6
+++ tests/coder_style.inc 15 Apr 2008 11:25:06 -0000
@@ -62,11 +62,11 @@ __EOD__;
}
function coder_dot() {
- if ($file = file_check_upload($fieldname . '_upload')) { // not ok
+ if ($file = file_check_upload($fieldname .'_upload')) { // not ok
}
$v .= 'bugger'; // ok
- $a = $v .'bugger'; // ok
- $a = $v ."bugger"; // ok, but will throw performance warning
+ $a = $v . 'bugger'; // ok
+ $a = $v . "bugger"; // ok, but will throw performance warning
$a = $v.'bugger'; // not ok
$a = $some_func().'bugger'; // not ok
}