Changeset 1131

Show
Ignore:
Timestamp:
12/07/07 18:44:00 (1 year ago)
Author:
richi
Message:

coding standards: adapted coding standards & sniffs with regard to remarks on ticket #48

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main/php/org/stubbles/codeSniffer/stubbles/StubblesCodingStandard.php

    r1125 r1131  
    2929          return array( 
    3030                // Generic 
    31                 'Generic/Sniffs/Formatting/NoSpaceAfterCastSniff.php', 
    3231                'Generic/Sniffs/Functions/OpeningFunctionBraceBsdAllmanSniff.php', 
    3332                'Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php', 
    3433                'Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php', 
    3534                'Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php', 
    36                 'Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php', 
    3735 
    3836                // PEAR 
    39                 'PEAR/Sniffs/Files/IncludingFileSniff.php', 
    4037                'PEAR/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php', 
    4138                'PEAR/Sniffs/Functions/ValidDefaultValueSniff.php', 
    …… 
    4946                'Squiz/Sniffs/Classes/LowercaseClassKeywordsSniff.php', 
    5047                'Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php', 
     48              # 'Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php', 
    5149                'Squiz/Sniffs/Commenting/BlockCommentSniff.php', 
    5250                'Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php', 

  • trunk/src/main/php/org/stubbles/codeSniffer/stubbles/sniffs/Classes/stubValidClassNameSniff.php

    r1125 r1131  
    1717 * @package   Functions 
    1818 */ 
    19 class stubbles_Sniffs_Classes_stubValidClassNameSniff implements PHP_CodeSniffer_Sniff 
     19class Stubbles_Sniffs_Classes_stubValidClassNameSniff implements PHP_CodeSniffer_Sniff 
    2020{ 
    2121    /** 
    …… 
    5353        $className = trim($phpcsFile->getTokensAsString($nameStart, ($nameEnd - $nameStart))); 
    5454 
     55        /* 
     56         * Stubbles 
     57         */ 
     58        if ($className === 'Binford') { 
     59            // class name Binford is neither in camel caps nor 
     60            // prefixed with 'stub' but should be allowed. 
     61            return; 
     62        } 
     63         
     64        /* 
     65         * Stubbles 
     66         */ 
     67        // Check for 'stub' prefix in class name. 
     68        $stubPrefix = (substr($className,0,4) === 'stub')? true : false; 
     69        if ($stubPrefix === false) { 
     70            $type  = ucfirst($tokens[$stackPtr]['content']); 
     71            $error = "$type \"$className\" is not prefixed with \"stub\""; 
     72            $phpcsFile->addError($error, $stackPtr); 
     73        } 
     74         
    5575        // Check for camel caps format. 
    5676        $camelCase = PHP_CodeSniffer::isCamelCaps($className, false, true, false); 
    …… 
    6080            $phpcsFile->addError($error, $stackPtr); 
    6181        } 
    62  
    63         /* 
    64          * Stubbles 
    65          */ 
    66         // Check for 'stub' prefix in className. 
    67         $stubPrefix = (substr($className,0,4) === 'stub')? true : false; 
    68         if ($stubPrefix === false) { 
    69             $type  = ucfirst($tokens[$stackPtr]['content']); 
    70             $error = "$type \"$className\" is not prefixed with \"stub\""; 
    71             $phpcsFile->addError($error, $stackPtr); 
    72         } 
    7382    } 
    7483 

  • trunk/src/main/php/org/stubbles/codeSniffer/stubbles/sniffs/Functions/stubFunctionCallSignatureSniff.php

    r1125 r1131  
    3939 * @package   Functions 
    4040 */ 
    41 class stubbles_Sniffs_Functions_stubFunctionCallSignatureSniff implements PHP_CodeSniffer_Sniff 
     41class Stubbles_Sniffs_Functions_stubFunctionCallSignatureSniff implements PHP_CodeSniffer_Sniff 
    4242{ 
    4343    /**