Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #1522 from realityking/codestyle

Fix additional errors that show up in newer phpcs versions.
  • Loading branch information...
commit 6f1045e0c828c1aabde27aee90a9398c4dceeffa 2 parents 4142521 + 77ccd48
@LouisLandry LouisLandry authored
View
3  build.xml
@@ -80,9 +80,10 @@
<target name="phpcs" description="Generate checkstyle.xml using PHP_CodeSniffer">
<exec executable="phpcs">
<arg value="--report=checkstyle" />
+ <arg value="--extensions=php,css" />
<arg value="--report-file=${basedir}/build/logs/checkstyle.xml" />
<arg value="--standard=${basedir}/build/phpcs/Joomla" />
- <arg value="--ignore=${source}/phpmailer,${source}/phputf8,${source}/simplepie/,${source}/config.example.php" />
+ <arg value="--ignore=config.example.php" />
<arg path="${source}" />
</exec>
</target>
View
145 build/phpcs/Joomla/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
@@ -1,145 +0,0 @@
-<?php
-/**
- * Joomla_Sniffs_Whitespace_ScopeClosingBraceSniff.
- *
- * PHP version 5
- *
- * @category PHP
- * @package PHP_CodeSniffer
- * @author Greg Sherwood <gsherwood@squiz.net>
- * @author Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license http://matrix.squiz.net/developer/tools/php_cs/licence BSD Licence
- * @version CVS: $Id: ScopeClosingBraceSniff.php 287526 2009-08-21 05:42:05Z squiz $
- * @link http://pear.php.net/package/PHP_CodeSniffer
- */
-
-/**
- * Joomla_Sniffs_Whitespace_ScopeClosingBraceSniff.
- *
- * Checks that the closing braces of scopes are aligned correctly.
- *
- * @category PHP
- * @package PHP_CodeSniffer
- * @author Greg Sherwood <gsherwood@squiz.net>
- * @author Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license http://matrix.squiz.net/developer/tools/php_cs/licence BSD Licence
- * @version Release: 1.3.0RC2
- * @link http://pear.php.net/package/PHP_CodeSniffer
- */
-class Joomla_Sniffs_WhiteSpace_ScopeClosingBraceSniff implements PHP_CodeSniffer_Sniff
-{
-
-
- /**
- * Returns an array of tokens this test wants to listen for.
- *
- * @return array
- */
- public function register()
- {
- return PHP_CodeSniffer_Tokens::$scopeOpeners;
-
- }//end register()
-
-
- /**
- * Processes this test, when one of its tokens is encountered.
- *
- * @param PHP_CodeSniffer_File $phpcsFile All the tokens found in the document.
- * @param int $stackPtr The position of the current token
- * in the stack passed in $tokens.
- *
- * @return void
- */
- public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
- {
- $tokens = $phpcsFile->getTokens();
-
- // If this is an inline condition (ie. there is no scope opener), then
- // return, as this is not a new scope.
- if (isset($tokens[$stackPtr]['scope_closer']) === false) {
- return;
- }
-
- $scopeStart = $tokens[$stackPtr]['scope_opener'];
- $scopeEnd = $tokens[$stackPtr]['scope_closer'];
-
- // If the scope closer doesn't think it belongs to this scope opener
- // then the opener is sharing its closer ith other tokens. We only
- // want to process the closer once, so skip this one.
- if ($tokens[$scopeEnd]['scope_condition'] !== $stackPtr) {
- return;
- }
-
- // We need to actually find the first piece of content on this line,
- // because if this is a method with tokens before it (public, static etc)
- // or an if with an else before it, then we need to start the scope
- // checking from there, rather than the current token.
- $lineStart = ($stackPtr - 1);
- for ($lineStart; $lineStart > 0; $lineStart--) {
- if (strpos($tokens[$lineStart]['content'], $phpcsFile->eolChar) !== false) {
- break;
- }
- }
-
- // We found a new line, now go forward and find the first non-whitespace
- // token.
- $lineStart= $phpcsFile->findNext(
- array(T_WHITESPACE),
- ($lineStart + 1),
- null,
- true
- );
-
- $startColumn = $tokens[$lineStart]['column'];
-
- // Check that the closing brace is on it's own line.
- $lastContent = $phpcsFile->findPrevious(
- array(T_WHITESPACE),
- ($scopeEnd - 1),
- $scopeStart,
- true
- );
-
- if ($tokens[$lastContent]['line'] === $tokens[$scopeEnd]['line']) {
- $error = 'Closing brace must be on a line by itself';
- $phpcsFile->addError($error, $scopeEnd, 'Line');
- return;
- }
-
- // Check now that the closing brace is lined up correctly.
- $braceIndent = $tokens[$scopeEnd]['column'];
- $isBreakCloser = ($tokens[$scopeEnd]['code'] === T_BREAK);
- if (in_array($tokens[$stackPtr]['code'], array(T_CASE, T_DEFAULT)) === true
- && $isBreakCloser === true
- ) {
- // BREAK statements should be indented 4 spaces from the
- // CASE or DEFAULT statement.
- if ($braceIndent !== ($startColumn + 4)) {
-// TODO AJE Allow for tab indents instead of spaces
-// $error = 'Break statement indented incorrectly; expected %s spaces, found %s';
-// $data = array(
-// ($startColumn + 3),
-// ($braceIndent - 1),
-// );
-// $phpcsFile->addError($error, $scopeEnd, 'BreakIdent', $data);
- }
- } else {
- if ($braceIndent !== $startColumn) {
- $error = 'Closing brace indented incorrectly; expected %s spaces, found %s';
- $data = array(
- ($startColumn - 1),
- ($braceIndent - 1),
- );
- $phpcsFile->addError($error, $scopeEnd, 'Indent', $data);
- }
- }
-
- }//end process()
-
-
-}//end class
-
-?>
View
15 build/phpcs/Joomla/ruleset.xml
@@ -2,15 +2,12 @@
<ruleset name="Joomla">
<description>The Joomla coding standard.</description>
- <!-- Exclude all javascript files. There are bugs and we don't have any rules anyways. -->
- <exclude-pattern>*.js</exclude-pattern>
-
<!-- Exclude 3rd party libraries. -->
- <exclude-pattern>*/phputf8/*</exclude-pattern>
- <exclude-pattern>*/simplepie/*</exclude-pattern>
- <exclude-pattern>*/phpmailer/phpmailer.php</exclude-pattern>
- <exclude-pattern>*/phpmailer/smtp.php</exclude-pattern>
- <exclude-pattern>*/phpmailer/pop3.php</exclude-pattern>
+ <exclude-pattern>phputf8/*</exclude-pattern>
+ <exclude-pattern>simplepie/*</exclude-pattern>
+ <exclude-pattern>phpmailer/phpmailer.php</exclude-pattern>
+ <exclude-pattern>phpmailer/smtp.php</exclude-pattern>
+ <exclude-pattern>phpmailer/pop3.php</exclude-pattern>
<exclude-pattern>*/mootree*.css</exclude-pattern>
<exclude-pattern>*/mooRainbow.css</exclude-pattern>
<exclude-pattern>*/modal.css</exclude-pattern>
@@ -52,6 +49,8 @@
<rule ref="Squiz.Scope.StaticThisUsage"/>
+ <rule ref="Squiz.WhiteSpace.ScopeClosingBrace"/>
+
<!-- Lines can be 85 chars long, but never show errors -->
<rule ref="Generic.Files.LineLength">
<properties>
Please sign in to comment.
Something went wrong with that request. Please try again.