Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'develop' of github.com:AKSW/OntoWiki into develop

  • Loading branch information...
commit 1a83aad04ea8c2c0ef45b36beca111cf785e2cf7 2 parents cf4c055 + 157056c
@jbrekle jbrekle authored
View
2  Makefile
@@ -140,7 +140,7 @@ IGNOREPATTERN = */libraries/*,pclzip.lib
# Parameter check
ifndef FPATH
- FPATH = "*"
+ FPATH = "./"
endif
ifdef SNIFFS
SNIFFSTR = "--sniffs="$(SNIFFS)
View
3  application/tests/CodeSniffer/Standards/Ontowiki/Sniffs/Classes/ClassFilePathSniff.php
@@ -80,12 +80,13 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
break;
}
}
+ array_shift($filepathArray);
if (FALSE === $notFound) {
$error = '%s name doesn\'t match filepath; expected "%s %s"';
$data = array(
ucfirst($tokens[$stackPtr]['content']),
$tokens[$stackPtr]['content'],
- $tokens[$decName]['content'],
+ implode('_', $filepathArray),
);
$phpcsFile->addError($error, $stackPtr, 'NoMatch', $data);
}
View
2  application/tests/CodeSniffer/cs-scripts.sh
@@ -17,7 +17,7 @@ function cs-install() {
user=`whoami`;
if [[ $user == "root" ]]
then
- pear install PHP_CodeSniffer-1.3.2;
+ pear install PHP_CodeSniffer;
echo " CodeSniffer PEAR Package installed.";
return_value=0
else
Please sign in to comment.
Something went wrong with that request. Please try again.