Skip to content

Commit a798829

Browse files
committed
Update to NC 1.7
1 parent 6520924 commit a798829

File tree

4 files changed

+12
-22
lines changed

4 files changed

+12
-22
lines changed

.codeclimate.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ engines:
4545
enabled: false
4646
Squiz ControlStructures ForEachLoopDeclaration SpaceBeforeClose:
4747
enabled: false
48+
Squiz ControlStructures ForLoopDeclaration SpacingAfterOpen:
49+
enabled: false
50+
Squiz ControlStructures ForLoopDeclaration SpacingBeforeClose:
51+
enabled: false
4852
Squiz Functions MultiLineFunctionDeclaration BraceOnSameLine:
4953
enabled: false
5054
phpmd:

.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"extends": "eslint:recommended",
66
"rules": {
77
"semi": ["error", "never"],
8-
"indent": ["error", "tab"],
8+
"indent": ["error", "tab", { "SwitchCase": 1 } ],
99
"comma-dangle": ["error", "always-multiline"],
1010
"no-cond-assign": ["error", "always"],
1111
"no-console": "off",

.stylelintrc.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@
9696
"selector-combinator-space-after": "always",
9797
"selector-combinator-space-before": "always",
9898
"selector-descendant-combinator-no-non-space": true,
99-
"selector-no-id": true,
100-
"selector-no-universal": true,
10199
"selector-no-vendor-prefix": true,
102100
"selector-pseudo-class-case": "lower",
103101
"selector-pseudo-class-no-unknown": true,
@@ -108,7 +106,9 @@
108106
"selector-type-case": "lower",
109107
"selector-type-no-unknown": true,
110108
"selector-max-empty-lines": 0,
111-
109+
"selector-max-id": 0,
110+
"selector-max-universal": 0,
111+
112112
"selector-list-comma-newline-after": "always",
113113
"selector-list-comma-newline-before": "never-multi-line",
114114
"selector-list-comma-space-after": "always-single-line",

.travis.yml

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
# see http://about.travis-ci.org/docs/user/languages/php/ for more hints
22

3-
language: php
43
dist: trusty
54
sudo: required
65

7-
addons:
8-
apt:
9-
packages:
10-
- mysql-server-5.6
11-
- mysql-client-core-5.6
12-
- mysql-client-5.6
13-
6+
language: php
147
php:
158
- 5.6
169
- 7.0
@@ -23,27 +16,20 @@ matrix:
2316
- php: 7.0
2417
- php: hhvm
2518

26-
# TODO https://docs.travis-ci.com/user/database-setup/#MariaDB
27-
services:
28-
- mysql
29-
3019
before_script:
31-
- sh -c "mysql -u root -e 'CREATE DATABASE IF NOT EXISTS phoenix;'"
32-
- php _onces/phoenix/once.test.initialize.php
3320
- git clone https://github.com/eustasy/normal-checks.git
3421
- cd normal-checks
35-
- git checkout d5f1a5d9e3fbac391b905f2bdfcdcdbfe465eabf
22+
- git checkout 4256f55ef631900df06ca5c6167e21e6ed4cf55b
3623
- cd ../
37-
- ./normal-checks/check-config.sh
3824

3925
script:
26+
- ./normal-checks/check-config.sh
4027
- ./normal-checks/check-permissions.sh
41-
- ./normal-checks/check-css.sh
4228
- ./normal-checks/check-javascript.sh
29+
- ./normal-checks/check-css.sh
4330
- ./normal-checks/check-php.sh
4431
- php normal-checks/check-json.php
4532
- php normal-checks/check-xml.php
46-
- php _tests/phoenix.php
4733

4834
notifications:
4935
email:

0 commit comments

Comments
 (0)