Skip to content

Commit 7ab109d

Browse files
committed
Merge branch 'development'
2 parents 4fd0041 + 545b9cd commit 7ab109d

67 files changed

Lines changed: 1238 additions & 875 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.cfconfig.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"adminPassword" : "coldbox",
3+
"debuggingEnabled":true,
4+
"debuggingReportExecutionTimes":false,
5+
"disableInternalCFJavaComponents":false,
6+
"inspectTemplate":"always",
7+
"requestTimeout":"0,0,5,0",
8+
"robustExceptionEnabled":true,
9+
"datasources": {
10+
"coolblog": {
11+
"class":"${DB_CLASS}",
12+
"dbdriver": "MySQL",
13+
"dsn":"jdbc:mysql://{host}:{port}/{database}",
14+
"custom":"useUnicode=true&characterEncoding=UTF8&serverTimezone=UTC&useLegacyDatetimeCode=true&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true",
15+
"host":"${DB_HOST:127.0.0.1}",
16+
"username": "${DB_USER:root}",
17+
"password": "${DB_PASSWORD}",
18+
"database": "coolblog",
19+
"port": "${DB_PORT:3306}",
20+
"storage":"false",
21+
"bundleName": "${DB_BUNDLENAME}",
22+
"bundleVersion": "${DB_BUNDLEVERSION}",
23+
"validate":"false"
24+
}
25+
}
26+
}

.cflintrc

Lines changed: 75 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,81 @@
11
{
2+
"output": [],
23
"rule": [],
34
"includes": [
4-
{ "code": "AVOID_USING_CFINCLUDE_TAG" },
5-
{ "code": "AVOID_USING_CFABORT_TAG" },
6-
{ "code": "AVOID_USING_CFEXECUTE_TAG" },
7-
{ "code": "AVOID_USING_DEBUG_ATTR" },
8-
{ "code": "AVOID_USING_ABORT" },
9-
{ "code": "AVOID_USING_ISDATE" },
10-
{ "code": "AVOID_USING_ISDEBUGMODE" },
11-
{ "code": "AVOID_USING_CFINSERT_TAG" },
12-
{ "code": "AVOID_USING_CFUPDATE_TAG" },
13-
{ "code": "ARG_VAR_CONFLICT" },
14-
{ "code": "ARG_VAR_MIXED" },
15-
{ "code": "ARG_HINT_MISSING" },
16-
{ "code": "ARG_HINT_MISSING_SCRIPT" },
17-
{ "code" : "ARGUMENT_INVALID_NAME" },
18-
{ "code" : "ARGUMENT_ALLCAPS_NAME" },
19-
{ "code" : "ARGUMENT_TOO_WORDY" },
20-
{ "code" : "ARGUMENT_IS_TEMPORARY" },
21-
{ "code": "CFQUERYPARAM_REQ" },
22-
{ "code": "COMPARE_INSTEAD_OF_ASSIGN" },
23-
{ "code": "COMPONENT_HINT_MISSING" },
24-
{ "code" : "COMPONENT_INVALID_NAME" },
25-
{ "code" : "COMPONENT_ALLCAPS_NAME" },
26-
{ "code" : "COMPONENT_TOO_SHORT" },
27-
{ "code" : "COMPONENT_TOO_LONG" },
28-
{ "code" : "COMPONENT_TOO_WORDY" },
29-
{ "code" : "COMPONENT_IS_TEMPORARY" },
30-
{ "code" : "COMPONENT_HAS_PREFIX_OR_POSTFIX" },
31-
{ "code": "COMPLEX_BOOLEAN_CHECK" },
32-
{ "code": "EXCESSIVE_FUNCTION_LENGTH" },
33-
{ "code": "EXCESSIVE_COMPONENT_LENGTH" },
34-
{ "code": "EXCESSIVE_ARGUMENTS" },
35-
{ "code": "EXCESSIVE_FUNCTIONS" },
36-
{ "code": "EXPLICIT_BOOLEAN_CHECK" },
37-
{ "code": "FUNCTION_TOO_COMPLEX" },
38-
{ "code": "FUNCTION_HINT_MISSING" },
39-
{ "code": "FILE_SHOULD_START_WITH_LOWERCASE" },
40-
{ "code": "LOCAL_LITERAL_VALUE_USED_TOO_OFTEN" },
41-
{ "code": "GLOBAL_LITERAL_VALUE_USED_TOO_OFTEN" },
42-
{ "code": "MISSING_VAR" },
43-
{ "code" : "METHOD_INVALID_NAME" },
44-
{ "code" : "METHOD_ALLCAPS_NAME" },
45-
{ "code" : "METHOD_IS_TEMPORARY" },
46-
{ "code": "NESTED_CFOUTPUT" },
47-
{ "code": "NEVER_USE_QUERY_IN_CFM" },
48-
{ "code": "OUTPUT_ATTR" },
49-
{ "code" : "QUERYPARAM_REQ" },
50-
{ "code": "UNUSED_LOCAL_VARIABLE" },
51-
{ "code": "UNUSED_METHOD_ARGUMENT" },
52-
{ "code": "SQL_SELECT_STAR" },
53-
{ "code": "SCOPE_ALLCAPS_NAME" },
54-
{ "code": "VAR_ALLCAPS_NAME" },
55-
{ "code": "VAR_INVALID_NAME" },
56-
{ "code": "VAR_TOO_WORDY" }
5+
{
6+
"code": "AVOID_USING_STRUCTNEW"
7+
},
8+
{
9+
"code": "AVOID_USING_ARRAYNEW"
10+
},
11+
{
12+
"code": "AVOID_USING_CFINCLUDE_TAG"
13+
},
14+
{
15+
"code": "AVOID_USING_CFABORT_TAG"
16+
},
17+
{
18+
"code": "AVOID_USING_ABORT"
19+
},
20+
{
21+
"code": "ARG_VAR_CONFLICT"
22+
},
23+
{
24+
"code": "ARG_VAR_MIXED"
25+
},
26+
{
27+
"code": "CFQUERYPARAM_REQ"
28+
},
29+
{
30+
"code": "COMPARE_INSTEAD_OF_ASSIGN"
31+
},
32+
{
33+
"code": "COMPONENT_HINT_MISSING"
34+
},
35+
{
36+
"code": "EXCESSIVE_FUNCTION_LENGTH"
37+
},
38+
{
39+
"code": "EXCESSIVE_COMPONENT_LENGTH"
40+
},
41+
{
42+
"code": "EXCESSIVE_ARGUMENTS"
43+
},
44+
{
45+
"code": "EXCESSIVE_FUNCTIONS"
46+
},
47+
{
48+
"code": "FUNCTION_TOO_COMPLEX"
49+
},
50+
{
51+
"code": "FUNCTION_HINT_MISSING"
52+
},
53+
{
54+
"code": "LOCAL_LITERAL_VALUE_USED_TOO_OFTEN"
55+
},
56+
{
57+
"code": "GLOBAL_LITERAL_VALUE_USED_TOO_OFTEN"
58+
},
59+
{
60+
"code": "MISSING_VAR"
61+
},
62+
{
63+
"code": "OUTPUT_ATTR"
64+
},
65+
{
66+
"code": "UNUSED_LOCAL_VARIABLE"
67+
},
68+
{
69+
"code": "UNUSED_METHOD_ARGUMENT"
70+
},
71+
{
72+
"code": "SQL_SELECT_STAR"
73+
},
74+
{
75+
"code": "VAR_ALLCAPS_NAME"
76+
}
5777
],
5878
"inheritParent": false,
59-
"parameters": {
60-
"TooManyFunctionsChecker.maximum" : 20
61-
}
79+
"inheritPlugins": true,
80+
"parameters": {}
6281
}

.env.template

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
DB_HOST=127.0.0.1
2+
DB_PORT=3306
3+
DB_USER=root
4+
DB_PASSWORD=mysql
5+
DB_CLASS=com.mysql.cj.jdbc.Driver
6+
DB_BUNDLEVERSION=8.0.19
7+
DB_BUNDLENAME=com.mysql.cj

.github/CODE_OF_CONDUCT.MD

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Code of Conduct
2+
3+
Please see it in our [Contributing Guidelines](../CONTRIBUTING.md#code-of-conduct).

.github/FUNDING.YML

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
patreon: ortussolutions
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
---
5+
6+
<!-- Thanks for reporting an issue! Please fill out the blanks below. -->
7+
8+
## What are the steps to reproduce this issue?
9+
10+
1.
11+
2.
12+
3.
13+
14+
## What happens?
15+
16+
17+
18+
## What were you expecting to happen?
19+
20+
21+
22+
## Any logs, error output, etc?
23+
24+
25+
26+
## Any other comments?
27+
28+
29+
30+
## What versions are you using?
31+
32+
**Operating System:**
33+
**Package Version:**
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
name: Feature Request
3+
about: Request a new feature or enhancement
4+
---
5+
6+
<!-- Thanks for taking the time to recommend a feature! Please fill out the form below -->
7+
8+
## Summary
9+
10+
<!-- High level description of what this feature is -->
11+
12+
## Detailed Description
13+
14+
<!-- Lets get into the weeds here -->
15+
16+
## Possible Implementation Ideas
17+
18+
<!-- If you already have some idea of how to implement this, this would be the place to put it -->

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Description
2+
3+
Please include a summary of the changes and which issue(s) is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
4+
5+
**Please note that all PRs must have tests attached to them**
6+
7+
IMPORTANT: Please review the [CONTRIBUTING.md](../CONTRIBUTING.md) file for detailed contributing guidelines.
8+
9+
## Issues
10+
11+
All PRs must have an accompanied issue. Please make sure you created it and linked it here.
12+
13+
## Type of change
14+
15+
Please delete options that are not relevant.
16+
17+
- [ ] Bug Fix
18+
- [ ] Improvement
19+
- [ ] New Feature
20+
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
21+
- [ ] This change requires a documentation update
22+
23+
## Checklist
24+
25+
- [ ] My code follows the style guidelines of this project [cfformat](../.cfformat.json)
26+
- [ ] I have commented my code, particularly in hard-to-understand areas
27+
- [ ] I have made corresponding changes to the documentation
28+
- [ ] I have added tests that prove my fix is effective or that my feature works
29+
- [ ] New and existing unit tests pass locally with my changes

.github/SECURITY.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Security Policy
2+
3+
Please see it in our [Contributing Guidelines](../CONTRIBUTING.md#security-vulnerabilities).

.github/SUPPORT.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Support & Help
2+
3+
Please see it in our [Contributing Guidelines](../CONTRIBUTING.md#support-questions).

0 commit comments

Comments
 (0)