Skip to content

Commit

Permalink
Update to NC 1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
lewisgoddard committed Sep 16, 2017
1 parent 6520924 commit a798829
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 22 deletions.
4 changes: 4 additions & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ engines:
enabled: false
Squiz ControlStructures ForEachLoopDeclaration SpaceBeforeClose:
enabled: false
Squiz ControlStructures ForLoopDeclaration SpacingAfterOpen:
enabled: false
Squiz ControlStructures ForLoopDeclaration SpacingBeforeClose:
enabled: false
Squiz Functions MultiLineFunctionDeclaration BraceOnSameLine:
enabled: false
phpmd:
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"extends": "eslint:recommended",
"rules": {
"semi": ["error", "never"],
"indent": ["error", "tab"],
"indent": ["error", "tab", { "SwitchCase": 1 } ],
"comma-dangle": ["error", "always-multiline"],
"no-cond-assign": ["error", "always"],
"no-console": "off",
Expand Down
6 changes: 3 additions & 3 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@
"selector-combinator-space-after": "always",
"selector-combinator-space-before": "always",
"selector-descendant-combinator-no-non-space": true,
"selector-no-id": true,
"selector-no-universal": true,
"selector-no-vendor-prefix": true,
"selector-pseudo-class-case": "lower",
"selector-pseudo-class-no-unknown": true,
Expand All @@ -108,7 +106,9 @@
"selector-type-case": "lower",
"selector-type-no-unknown": true,
"selector-max-empty-lines": 0,

"selector-max-id": 0,
"selector-max-universal": 0,

"selector-list-comma-newline-after": "always",
"selector-list-comma-newline-before": "never-multi-line",
"selector-list-comma-space-after": "always-single-line",
Expand Down
22 changes: 4 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
# see http://about.travis-ci.org/docs/user/languages/php/ for more hints

language: php
dist: trusty
sudo: required

addons:
apt:
packages:
- mysql-server-5.6
- mysql-client-core-5.6
- mysql-client-5.6

language: php
php:
- 5.6
- 7.0
Expand All @@ -23,27 +16,20 @@ matrix:
- php: 7.0
- php: hhvm

# TODO https://docs.travis-ci.com/user/database-setup/#MariaDB
services:
- mysql

before_script:
- sh -c "mysql -u root -e 'CREATE DATABASE IF NOT EXISTS phoenix;'"
- php _onces/phoenix/once.test.initialize.php
- git clone https://github.com/eustasy/normal-checks.git
- cd normal-checks
- git checkout d5f1a5d9e3fbac391b905f2bdfcdcdbfe465eabf
- git checkout 4256f55ef631900df06ca5c6167e21e6ed4cf55b
- cd ../
- ./normal-checks/check-config.sh

script:
- ./normal-checks/check-config.sh
- ./normal-checks/check-permissions.sh
- ./normal-checks/check-css.sh
- ./normal-checks/check-javascript.sh
- ./normal-checks/check-css.sh
- ./normal-checks/check-php.sh
- php normal-checks/check-json.php
- php normal-checks/check-xml.php
- php _tests/phoenix.php

notifications:
email:
Expand Down

0 comments on commit a798829

Please sign in to comment.