Merge pull request #35 from bu-ist/develop

Fix Code Climate Build Errors/Update Travis Config

.codeclimate.yml

@@ -1,21 +1,21 @@
 ---
 exclude_paths:
-- tests/
-- node_modules/
+- images/
+- js/vendor/
 - languages/
+- tests/
 - vendor/
-- bower_components/
-- js/vendor/
-- ".sass-cache/"
-- "*.min.css"
-- "*.min.js"
-- "**.css"
+- "**.min.css"
+- "**.min.js"
+- "js/jquery-ui-classic.css"
+- "js/jquery-ui-fresh.css"
 
 prepare:
   fetch:
-  - "https://raw.githubusercontent.com/bu-ist/coding-standards/master/code-climate-rule-sets/.sass-lint.yml"
   - "https://raw.githubusercontent.com/bu-ist/coding-standards/master/code-climate-rule-sets/.eslintrc"
   - "https://raw.githubusercontent.com/bu-ist/coding-standards/master/code-climate-rule-sets/.eslintignore"
+  - "https://raw.githubusercontent.com/bu-ist/coding-standards/master/code-climate-rule-sets/.mdlrc"
+  - "https://raw.githubusercontent.com/bu-ist/coding-standards/master/code-climate-rule-sets/markdown.rb"
 
 engines:
   csslint:
@@ -46,11 +46,9 @@ engines:
       file_extensions: php
       rulesets: codesize,naming,unusedcode
   scss-lint:
-    enabled: true
+    enabled: false
 ratings:
   paths:
-  - "**.inc"
   - "**.js"
   - "**.php"
   - "**.css"
-  - "**.scss"

.travis.yml

@@ -3,26 +3,17 @@ language: php
 sudo: false
 
 php:
-    - 5.3
     - 5.4
     - 5.5
     - 5.6
     - 7.0
+    - 7.1
 
 env:
-    - WP_VERSION=4.1.13 WP_MULTISITE=0
-    - WP_VERSION=4.1.13 WP_MULTISITE=1
-    - WP_VERSION=latest WP_MULTISITE=0
-    - WP_VERSION=latest WP_MULTISITE=1
-    - WP_VERSION=nightly WP_MULTISITE=0
-    - WP_VERSION=nightly WP_MULTISITE=1
-
-matrix:
-  exclude:
-        - php: 7.0
-          env: WP_VERSION=4.1.13 WP_MULTISITE=1
-        - php: 7.0
-          env: WP_VERSION=4.1.13 WP_MULTISITE=0
+    - WP_VERSION=nightly
+    - WP_VERSION=latest
+    - WP_VERSION=4.7
+    - WP_VERSION=4.6
 
 cache:
   directories:
@@ -35,11 +26,24 @@ install:
   - composer install --prefer-dist
 
 before_script:
+  - export PATH="$HOME/.composer/vendor/bin:$PATH"
+  - |
+    if [[ ${TRAVIS_PHP_VERSION:0:2} == "7." ]]; then
+      composer global require "phpunit/phpunit=5.7.*"
+    else
+      composer global require "phpunit/phpunit=4.8.*"
+    fi
+
   - git config --global user.email "[email protected]"
   - git config --global user.name "Travis CI"
   - bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
 
-script: phpunit
+script:
+  - |
+    if [[ ! -z "$WP_VERSION" ]] ; then
+      phpunit
+      WP_MULTISITE=1 phpunit
+    fi
 
 after_script:
   - ./bin/codeclimate.sh