Skip to content

Commit

Permalink
CONTENTBOX-1136 #resolve
Browse files Browse the repository at this point in the history
Upgrade to CBSecurity 2

CONTENTBOX-1135 #resolve
Upgrade to ColdBox 6
  • Loading branch information
lmajano committed Aug 21, 2020
1 parent 1040fbe commit af07a72
Show file tree
Hide file tree
Showing 185 changed files with 5,748 additions and 5,089 deletions.
32 changes: 19 additions & 13 deletions .cfformat.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"array.empty_padding": false,
"array.padding": true,
"array.multiline.min_length": 40,
"array.multiline.element_count": 4,
"array.multiline.min_length": 50,
"array.multiline.element_count": 2,
"array.multiline.leading_comma.padding": true,
"array.multiline.leading_comma": false,
"alignment.consecutive.assignments": true,
Expand All @@ -16,23 +16,23 @@
"function_call.padding": true,
"function_call.multiline.leading_comma.padding": true,
"function_call.casing.builtin": "cfdocs",
"function_call.casing.userdefined": "",
"function_call.multiline.element_count": 4,
"function_call.casing.userdefined": "camel",
"function_call.multiline.element_count": 3,
"function_call.multiline.leading_comma": false,
"function_call.multiline.min_length": 40,
"function_call.multiline.min_length": 50,
"function_declaration.padding": true,
"function_declaration.empty_padding": false,
"function_declaration.multiline.leading_comma": false,
"function_declaration.multiline.leading_comma.padding": true,
"function_declaration.multiline.element_count": 4,
"function_declaration.multiline.min_length": 40,
"function_declaration.multiline.element_count": 3,
"function_declaration.multiline.min_length": 50,
"function_declaration.group_to_block_spacing": "compact",
"function_anonymous.empty_padding": false,
"function_anonymous.group_to_block_spacing": "compact",
"function_anonymous.multiline.element_count": 4,
"function_anonymous.multiline.element_count": 3,
"function_anonymous.multiline.leading_comma": false,
"function_anonymous.multiline.leading_comma.padding": true,
"function_anonymous.multiline.min_length": 40,
"function_anonymous.multiline.min_length": 50,
"function_anonymous.padding": true,
"indent_size": 4,
"keywords.block_to_keyword_spacing": "spaced",
Expand All @@ -41,7 +41,13 @@
"keywords.spacing_to_block": "spaced",
"keywords.spacing_to_group": true,
"keywords.empty_group_spacing": false,
"max_columns": 120,
"max_columns": 100,
"metadata.multiline.element_count": 3,
"metadata.multiline.min_length": 50,
"method_call.chain.multiline" : 3,
"newline":"\n",
"property.multiline.element_count": 3,
"property.multiline.min_length": 30,
"parentheses.padding": true,
"strings.quote": "double",
"strings.attributes.quote": "double",
Expand All @@ -50,7 +56,7 @@
"struct.empty_padding": false,
"struct.multiline.leading_comma": false,
"struct.multiline.leading_comma.padding": true,
"struct.multiline.element_count": 4,
"struct.multiline.min_length": 40,
"struct.multiline.element_count": 2,
"struct.multiline.min_length": 60,
"tab_indent": true
}
}
201 changes: 147 additions & 54 deletions .cflintrc
Original file line number Diff line number Diff line change
@@ -1,56 +1,149 @@
{
"rule": [],
"includes": [
{ "code": "AVOID_USING_CFINCLUDE_TAG" },
{ "code": "AVOID_USING_CFABORT_TAG" },
{ "code": "AVOID_USING_CFEXECUTE_TAG" },
{ "code": "AVOID_USING_DEBUG_ATTR" },
{ "code": "AVOID_USING_ABORT" },
{ "code": "AVOID_USING_ISDATE" },
{ "code": "AVOID_USING_ISDEBUGMODE" },
{ "code": "AVOID_USING_CFINSERT_TAG" },
{ "code": "AVOID_USING_CFUPDATE_TAG" },
{ "code": "ARG_VAR_CONFLICT" },
{ "code": "ARG_HINT_MISSING" },
{ "code": "ARG_HINT_MISSING_SCRIPT" },
{ "code" : "ARGUMENT_INVALID_NAME" },
{ "code" : "ARGUMENT_ALLCAPS_NAME" },
{ "code" : "ARGUMENT_IS_TEMPORARY" },
{ "code": "CFQUERYPARAM_REQ" },
{ "code": "COMPARE_INSTEAD_OF_ASSIGN" },
{ "code": "COMPONENT_HINT_MISSING" },
{ "code" : "COMPONENT_INVALID_NAME" },
{ "code" : "COMPONENT_ALLCAPS_NAME" },
{ "code" : "COMPONENT_TOO_SHORT" },
{ "code" : "COMPONENT_TOO_LONG" },
{ "code" : "COMPONENT_TOO_WORDY" },
{ "code" : "COMPONENT_IS_TEMPORARY" },
{ "code" : "COMPONENT_HAS_PREFIX_OR_POSTFIX" },
{ "code": "COMPLEX_BOOLEAN_CHECK" },
{ "code": "EXCESSIVE_FUNCTION_LENGTH" },
{ "code": "EXCESSIVE_COMPONENT_LENGTH" },
{ "code": "EXCESSIVE_FUNCTIONS" },
{ "code": "EXPLICIT_BOOLEAN_CHECK" },
{ "code": "FUNCTION_TOO_COMPLEX" },
{ "code": "FUNCTION_HINT_MISSING" },
{ "code": "FILE_SHOULD_START_WITH_LOWERCASE" },
{ "code": "GLOBAL_LITERAL_VALUE_USED_TOO_OFTEN" },
{ "code": "MISSING_VAR" },
{ "code" : "METHOD_INVALID_NAME" },
{ "code" : "METHOD_ALLCAPS_NAME" },
{ "code" : "METHOD_IS_TEMPORARY" },
{ "code": "NESTED_CFOUTPUT" },
{ "code": "NEVER_USE_QUERY_IN_CFM" },
{ "code": "OUTPUT_ATTR" },
{ "code" : "QUERYPARAM_REQ" },
{ "code": "UNUSED_METHOD_ARGUMENT" },
{ "code": "SQL_SELECT_STAR" },
{ "code": "SCOPE_ALLCAPS_NAME" },
{ "code": "VAR_ALLCAPS_NAME" },
{ "code": "VAR_INVALID_NAME" }
],
"inheritParent": false,
"parameters": {
"TooManyFunctionsChecker.maximum" : 20
}
"rule": [],
"includes": [
{
"code": "AVOID_USING_CFINCLUDE_TAG"
},
{
"code": "AVOID_USING_CFABORT_TAG"
},
{
"code": "AVOID_USING_CFEXECUTE_TAG"
},
{
"code": "AVOID_USING_DEBUG_ATTR"
},
{
"code": "AVOID_USING_ABORT"
},
{
"code": "AVOID_USING_ISDATE"
},
{
"code": "AVOID_USING_ISDEBUGMODE"
},
{
"code": "AVOID_USING_CFINSERT_TAG"
},
{
"code": "AVOID_USING_CFUPDATE_TAG"
},
{
"code": "ARG_VAR_CONFLICT"
},
{
"code": "ARG_HINT_MISSING"
},
{
"code": "ARG_HINT_MISSING_SCRIPT"
},
{
"code": "ARGUMENT_INVALID_NAME"
},
{
"code": "ARGUMENT_ALLCAPS_NAME"
},
{
"code": "ARGUMENT_IS_TEMPORARY"
},
{
"code": "CFQUERYPARAM_REQ"
},
{
"code": "COMPARE_INSTEAD_OF_ASSIGN"
},
{
"code": "COMPONENT_HINT_MISSING"
},
{
"code": "COMPONENT_INVALID_NAME"
},
{
"code": "COMPONENT_ALLCAPS_NAME"
},
{
"code": "COMPONENT_TOO_SHORT"
},
{
"code": "COMPONENT_TOO_LONG"
},
{
"code": "COMPONENT_IS_TEMPORARY"
},
{
"code": "COMPONENT_HAS_PREFIX_OR_POSTFIX"
},
{
"code": "COMPLEX_BOOLEAN_CHECK"
},
{
"code": "EXCESSIVE_FUNCTION_LENGTH"
},
{
"code": "EXCESSIVE_ARGUMENTS"
},
{
"code": "EXPLICIT_BOOLEAN_CHECK"
},
{
"code": "FUNCTION_HINT_MISSING"
},
{
"code": "FILE_SHOULD_START_WITH_LOWERCASE"
},
{
"code": "LOCAL_LITERAL_VALUE_USED_TOO_OFTEN"
},
{
"code": "GLOBAL_LITERAL_VALUE_USED_TOO_OFTEN"
},
{
"code": "MISSING_VAR"
},
{
"code": "METHOD_INVALID_NAME"
},
{
"code": "METHOD_ALLCAPS_NAME"
},
{
"code": "NESTED_CFOUTPUT"
},
{
"code": "NEVER_USE_QUERY_IN_CFM"
},
{
"code": "OUTPUT_ATTR"
},
{
"code": "QUERYPARAM_REQ"
},
{
"code": "UNUSED_LOCAL_VARIABLE"
},
{
"code": "UNUSED_METHOD_ARGUMENT"
},
{
"code": "SQL_SELECT_STAR"
},
{
"code": "SCOPE_ALLCAPS_NAME"
},
{
"code": "VAR_ALLCAPS_NAME"
},
{
"code": "VAR_INVALID_NAME"
}
],
"inheritParent": false,
"parameters": {
"TooManyFunctionsChecker.maximum": 20
},
"excludes": [
{
"code": "ARG_VAR_MIXED"
}
]
}
22 changes: 22 additions & 0 deletions .env.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# ColdBox Name and Environment
APPNAME=ContentBox Modular CMS
ENVIRONMENT=development

# Database Information
DB_CONNECTIONSTRING=jdbc:mysql://127.0.0.1:3306/coldbox?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&useLegacyDatetimeCode=true
DB_CLASS=com.mysql.jdbc.Driver
DB_DRIVER=MySQL
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=coldbox
DB_USER=root
DB_PASSWORD=

# JWT Information
JWT_SECRET=

# S3 Information
S3_ACCESS_KEY=
S3_SECRET_KEY=
S3_REGION=us-east-1
S3_DOMAIN=amazonaws.com
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ testbox/*
**/bower_components/**
**/app_modules/**
workbench/app_modules
.env

# Runtime Properties
config/runtime.properties.cfm
Expand Down
14 changes: 14 additions & 0 deletions .markdownlint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"line-length": false,
"single-h1": false,
"no-hard-tabs" : false,
"fenced-code-language" : false,
"no-bare-urls" : false,
"first-line-h1": false,
"no-multiple-blanks": {
"maximum": 2
},
"no-duplicate-header" : {
"siblings_only" : true
}
}
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ before_script:
# import database
- mysql -u root < tests/resources/sql/mysql/contentbox.sql
# Startup testing engine
- box server start serverConfigFile="server-cbcms-${ENGINE}.json"
- box server start serverConfigFile="server-${ENGINE}.json"

script:
# Run tests
Expand Down
Loading

0 comments on commit af07a72

Please sign in to comment.