Merge pull request #1267 from jrfnl/feature/cs-update
Bring code style up to the latest standards - This PR addresses code-style issues identified when testing the code against the WordPress Coding Standards.
This commit is contained in:
commit
72e34ef6bc
21 changed files with 301 additions and 194 deletions
13
.travis.yml
13
.travis.yml
|
@ -50,16 +50,17 @@ before_script:
|
|||
- phpenv config-rm xdebug.ini || echo 'No xdebug config.'
|
||||
# Set up temporary paths.
|
||||
- export PHPCS_DIR=/tmp/phpcs
|
||||
- export SNIFFS_DIR=/tmp/sniffs
|
||||
- export WPCS_DIR=/tmp/wpcs
|
||||
- export PHPCOMPAT_DIR=/tmp/phpcompatibility
|
||||
# Install CodeSniffer for WordPress Coding Standards checks.
|
||||
- if [[ "$SNIFF" == "1" ]]; then git clone -b 2.9.1 --depth 1 https://github.com/squizlabs/PHP_CodeSniffer.git $PHPCS_DIR; fi
|
||||
- if [[ "$SNIFF" == "1" ]]; then git clone -b master --depth 1 https://github.com/squizlabs/PHP_CodeSniffer.git $PHPCS_DIR; fi
|
||||
# Install WordPress Coding Standards.
|
||||
- if [[ "$SNIFF" == "1" ]]; then git clone -b 0.11.0 --depth 1 https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git $SNIFFS_DIR; fi
|
||||
- if [[ "$SNIFF" == "1" ]]; then git clone -b 0.14.1 --depth 1 https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git $WPCS_DIR; fi
|
||||
# Install PHP Compatibility sniffs.
|
||||
- if [[ "$SNIFF" == "1" ]]; then git clone -b 7.1.5 --depth 1 https://github.com/wimg/PHPCompatibility.git $SNIFFS_DIR/PHPCompatibility; fi
|
||||
- if [[ "$SNIFF" == "1" ]]; then git clone -b master --depth 1 https://github.com/wimg/PHPCompatibility.git $PHPCOMPAT_DIR; fi
|
||||
# Set install path for PHPCS sniffs.
|
||||
# @link https://github.com/squizlabs/PHP_CodeSniffer/blob/4237c2fc98cc838730b76ee9cee316f99286a2a7/CodeSniffer.php#L1941
|
||||
- if [[ "$SNIFF" == "1" ]]; then $PHPCS_DIR/scripts/phpcs --config-set installed_paths $SNIFFS_DIR; fi
|
||||
- if [[ "$SNIFF" == "1" ]]; then $PHPCS_DIR/bin/phpcs --config-set installed_paths $WPCS_DIR,$PHPCOMPAT_DIR; fi
|
||||
# After CodeSniffer install you should refresh your path.
|
||||
- if [[ "$SNIFF" == "1" ]]; then phpenv rehash; fi
|
||||
# Install JSCS: JavaScript Code Style checker.
|
||||
|
@ -86,7 +87,7 @@ script:
|
|||
# @link https://pear.php.net/package/PHP_CodeSniffer/
|
||||
# Uses a custom ruleset based on WordPress. This ruleset is automatically
|
||||
# picked up by PHPCS as it's named `phpcs.xml(.dist)`.
|
||||
- if [[ "$SNIFF" == "1" ]]; then $PHPCS_DIR/scripts/phpcs; fi
|
||||
- if [[ "$SNIFF" == "1" ]]; then $PHPCS_DIR/bin/phpcs --runtime-set ignore_warnings_on_exit 1; fi
|
||||
|
||||
# Receive notifications for build results.
|
||||
# @link https://docs.travis-ci.com/user/notifications/#Email-notifications
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue