Skip to content

Commit 695c274

Browse files
committed
Merge branch 'development'
2 parents 3300def + edc6949 commit 695c274

3 files changed

Lines changed: 126 additions & 64 deletions

File tree

.bxformat.json

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
{
2+
"indentSize" : 4,
3+
"tabIndent" : true,
4+
"maxLineLength" : 115,
5+
"newLine" : "\n",
6+
"singleQuote" : false,
7+
"preserveStringQuotes" : false,
8+
"alignConsecutiveAssignments" : true,
9+
"alignConsecutiveProperties" : true,
10+
"bracketPadding" : true,
11+
"parensPadding" : true,
12+
"binaryOperatorsPadding" : true,
13+
"semicolons" : true,
14+
"cfFormatCompatibility" : true,
15+
"sourceType" : null,
16+
"struct" : {
17+
"padding" : true,
18+
"empty_padding" : false,
19+
"quote_keys" : false,
20+
"separator" : " : ",
21+
"multiline" : {
22+
"element_count" : 2,
23+
"comma_dangle" : false,
24+
"leading_comma" : {
25+
"enabled" : false,
26+
"padding" : true
27+
},
28+
"min_length" : 60
29+
}
30+
},
31+
"property" : {
32+
"multiline" : {
33+
"element_count" : 3,
34+
"comma_dangle" : false,
35+
"leading_comma" : {
36+
"enabled" : false,
37+
"padding" : true
38+
},
39+
"min_length" : 30
40+
},
41+
"key_value" : {
42+
"padding" : false
43+
}
44+
},
45+
"array" : {
46+
"padding" : true,
47+
"empty_padding" : false,
48+
"multiline" : {
49+
"element_count" : 2,
50+
"comma_dangle" : false,
51+
"leading_comma" : {
52+
"enabled" : false,
53+
"padding" : true
54+
},
55+
"min_length" : 50
56+
}
57+
},
58+
"for_loop_semicolons" : {
59+
"padding" : true
60+
},
61+
"function" : {
62+
"style" : "preserve",
63+
"parameters" : {
64+
"padding" : true,
65+
"empty_padding" : false,
66+
"comma_dangle" : false,
67+
"multiline_count" : 3,
68+
"multiline_length" : 50
69+
},
70+
"arrow" : {
71+
"parens" : "always"
72+
}
73+
},
74+
"arguments" : {
75+
"padding" : true,
76+
"empty_padding" : false,
77+
"comma_dangle" : false,
78+
"multiline_count" : 3,
79+
"multiline_length" : 50
80+
},
81+
"braces" : {
82+
"style" : "same-line",
83+
"require_for_single_statement" : true,
84+
"else" : {
85+
"style" : "same-line"
86+
}
87+
},
88+
"operators" : {
89+
"position" : "end",
90+
"comparison_style" : "preserve",
91+
"ternary" : {
92+
"style" : "flat",
93+
"question_position" : "start"
94+
}
95+
},
96+
"chain" : {
97+
"break_count" : 3,
98+
"break_length" : 2147483647
99+
},
100+
"template" : {
101+
"component_prefix" : "bx",
102+
"indent_content" : true,
103+
"single_attribute_per_line" : false,
104+
"self_closing" : false
105+
},
106+
"import" : {
107+
"sort" : false,
108+
"group" : false
109+
},
110+
"comments" : {
111+
"preserve_blank_lines" : true,
112+
"wrap" : false
113+
},
114+
"class" : {
115+
"member_order" : "preserve",
116+
"member_spacing" : 1,
117+
"property_order" : "preserve",
118+
"method_order" : "preserve",
119+
"method_grouping" : false
120+
},
121+
"sql" : {
122+
"uppercase_keywords" : true,
123+
"indent_clauses" : true
124+
}
125+
}

.cfformat.json

Lines changed: 0 additions & 63 deletions
This file was deleted.

box.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name":"Flat ColdBox App Template",
3-
"version":"8.1.0",
3+
"version":"8.2.0",
44
"author":"You",
55
"location":"forgeboxStorage",
66
"slug":"cbtemplate-flat",

0 commit comments

Comments
 (0)