Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reinstate PHPCS and update VIP sniffs #541

Merged
merged 8 commits into from
Oct 16, 2018
+7 −5
Merged

Reinstate PHPCS and update VIP sniffs #541

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c81bba7
PHPCS: Restore PHPCS sniffs in Travis
philipjohn Oct 16, 2018
b48d73d
Tests: Update to the WordPress-VIP-Go ruleset
philipjohn Oct 16, 2018
7261df3
Tests: Fix VIP standards dir
philipjohn Oct 16, 2018
25fe53e
Tests: Ensure we're using the correct path to the PHPCS binary
philipjohn Oct 16, 2018
08c1c5c
Tests: Let's not limit ourselves, especially as we have a lot more JS…
philipjohn Oct 16, 2018
87b8934
Tests: Fix syntax error
philipjohn Oct 16, 2018
06bd775
Tests: Explicitly include the VIP standards dir in PHPCS
philipjohn Oct 16, 2018
8de33ec
Tests: Exclude some paths from PHPCS checks
philipjohn Oct 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ matrix:
# aliased to a recent 5.6.x version
- php: '5.6'
env:
#- SNIFF=1
- WP_VERSION=latest
- WP_MULTISITE=0
- php: '5.6'
env:
#- SNIFF=1
- WP_VERSION=latest
- WP_MULTISITE=1
# aliased to a recent 7.x version
- php: '7.0'
env: WP_VERSION=latest
env:
- SNIFF=1
- WP_VERSION=latest
# aliased to a recent hhvm version
- php: 'hhvm'
env: WP_VERSION=latest
Expand All @@ -39,11 +39,13 @@ before_script:
- 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 master --depth 1 https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git $SNIFFS_DIR; fi
# Install VIP Coding Standards.
- if [[ "$SNIFF" == "1" ]]; then git clone -b master --depth 1 https://github.com/automattic/VIP-Coding-Standards.git $SNIFFS_DIR/VIP-Coding-Standards; fi
# Install PHP Compatibility sniffs.
- if [[ "$SNIFF" == "1" ]]; then git clone -b master --depth 1 https://github.com/wimg/PHPCompatibility.git $SNIFFS_DIR/PHPCompatibility; 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 $SNIFFS_DIR,$SNIFFS_DIR/VIP-Coding-Standards; fi
# After CodeSniffer install you should refresh your path.
- if [[ "$SNIFF" == "1" ]]; then phpenv rehash; fi
# Set up unit tests
Expand All @@ -63,7 +65,7 @@ script:
# -n flag: Do not print warnings. (shortcut for --warning-severity=0)
# --standard: Use WordPress as the standard.
# --extensions: Only sniff PHP files.
- if [[ "$SNIFF" == "1" ]]; then $PHPCS_DIR/scripts/phpcs -p -s -v -n . --standard="WordPress-VIP" --extensions=php; fi
- if [[ "$SNIFF" == "1" ]]; then $PHPCS_DIR/bin/phpcs -p -s -v -n . --standard="WordPress-VIP-Go" --ignore=assets/*,vendor/*,bin/*,node_modules/*; fi
# Run unit tests
- phpunit
# Run linting
Expand Down