Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ACF Compats #1

Open
wants to merge 78 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
67498a2
removed readme for template, not necessary
lmajano May 15, 2020
ef6bcd9
change char sets
lmajano May 15, 2020
09783cc
updating formatting rules to latest
lmajano May 15, 2020
15445a0
renamed for generic presso
lmajano May 15, 2020
23b5390
added lucee + adobe support
lmajano May 15, 2020
36546aa
added migrations
lmajano May 15, 2020
826e7b8
coldbox 6 updates
lmajano May 15, 2020
7ac0a8b
env updates and ignores
lmajano May 16, 2020
cf86b05
added admin passwords
lmajano May 16, 2020
1782433
cleanup
lmajano May 16, 2020
0009d47
losts of ACF incompatibilities and coldbox 6 updates
lmajano May 16, 2020
b1e873d
finalized v1
lmajano May 16, 2020
d3989aa
reverted engines due to compilation bugs on latest hotfixes of 2018
lmajano May 16, 2020
fa50ae7
v2 finalized
lmajano May 16, 2020
acd441e
v3 finalized for acf compat
lmajano May 16, 2020
e8c297c
v3 finalized
lmajano May 18, 2020
6970c46
finalized v4
lmajano May 18, 2020
dbb1735
v5 complete
lmajano May 18, 2020
b674f04
finalized v6
lmajano May 18, 2020
93f2232
updated readme
lmajano May 19, 2020
6572bd2
Merge branch 'development' of github.com:lmajano/modern-functional-fl…
lmajano May 19, 2020
93cee91
adding server names and mysql 5.8 compats
lmajano May 19, 2020
272c188
more fine-tunning
lmajano May 19, 2020
301094d
Duplicate expectation removed
jfarraraains May 27, 2020
400507d
Duplicate expect check.
jfarraraains May 27, 2020
3541c52
Duplicate Expect Check.
jfarraraains May 27, 2020
66ffbd2
updated all formatting and linting rules
lmajano Jul 12, 2022
7afe943
updated all engine information to latest adobe
lmajano Jul 12, 2022
d2c51a8
updated all env vars
lmajano Jul 12, 2022
aa9c509
updated editor files
lmajano Jul 12, 2022
bfaf8ac
updated all dependencies
lmajano Jul 12, 2022
26144ff
updated ports
lmajano Jul 12, 2022
69c2b53
prepping for acf 2021 and cbdebugger
lmajano Jul 12, 2022
11d0966
making sure cbdebugger is working
lmajano Jul 12, 2022
c9ccac2
remove models, not needed, making it simpler
lmajano Jul 12, 2022
fc0d320
seeding cors
lmajano Jul 13, 2022
86d1be9
updated migrations to use the schema builder and mocked data.
lmajano Jul 13, 2022
2120249
new db based on uuid
lmajano Jul 13, 2022
efb640a
wip
lmajano Jul 14, 2022
12847ae
v1 now working
lmajano Jul 14, 2022
442caf4
v2 module done.
lmajano Jul 14, 2022
1e9d354
v2 finalized
lmajano Jul 14, 2022
140202c
v3 tests finalized
lmajano Jul 15, 2022
cc6bace
v4 finalized
lmajano Jul 15, 2022
af989de
small tweaks for consistency
lmajano Jul 15, 2022
3eca956
v5 almost done
lmajano Jul 15, 2022
44d07fd
v5 done
lmajano Jul 15, 2022
f41017e
formatting fixes
lmajano Jul 15, 2022
4760b5f
v6 models done
lmajano Jul 16, 2022
1de3b14
formatting
lmajano Jul 16, 2022
2d7ca84
more wip for v6
lmajano Jul 16, 2022
271d79d
v6 wip
lmajano Jul 18, 2022
0850ce4
v6 done
lmajano Jul 18, 2022
a6eb9d0
github actions
lmajano Jul 18, 2022
4d12653
fixing db updates
lmajano Jul 18, 2022
b1d0a25
remove cbdebugger for ci tests
lmajano Jul 18, 2022
578f370
embedded users
lmajano Jul 18, 2022
11b3379
updated readme
lmajano Jul 18, 2022
5925d6b
added db_databse env
lmajano Jul 18, 2022
4ad6078
cbdebugger env
lmajano Jul 18, 2022
f45838b
Merge pull request #2 from jfarraraains/patch-2
lmajano Dec 23, 2022
0e62cd6
Merge pull request #1 from jfarraraains/patch-1
lmajano Dec 23, 2022
9f74367
update to all new dependencies and migrations
lmajano Sep 19, 2024
5193653
modules config
lmajano Sep 19, 2024
0b63c69
more updates to new standards
lmajano Sep 19, 2024
d22c7b3
v1 finalized
lmajano Sep 19, 2024
8b48d15
leveraging new matchers in ColdBox
lmajano Sep 19, 2024
15f607c
use withKey
lmajano Sep 19, 2024
6c32632
v2 certified
lmajano Sep 19, 2024
de6039a
v3 done
lmajano Sep 19, 2024
2b96c12
v4 certified
lmajano Sep 19, 2024
0ec3160
update slug for boxlang
lmajano Sep 19, 2024
375b02c
boxlang support
lmajano Sep 19, 2024
74d3290
use snapshots
lmajano Sep 19, 2024
1dff91b
adding be to the demo so we can use boxlang
lmajano Sep 19, 2024
9365ab0
be for testing
lmajano Sep 20, 2024
cc5494c
swagger UI
lmajano Sep 30, 2024
920c612
change ports
lmajano Sep 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 30 additions & 31 deletions .cfconfig.json
Original file line number Diff line number Diff line change
@@ -1,33 +1,32 @@
{
"requestTimeoutEnabled":true,
"whitespaceManagement":"white-space-pref",
"requestTimeout":"0,0,5,0",
"cacheDefaultObject":"coldbox",
"caches":{
"coldbox":{
"storage":"true",
"type":"RAM",
"custom":{
"timeToIdleSeconds":"1800",
"timeToLiveSeconds":"3600"
},
"class":"lucee.runtime.cache.ram.RamCache",
"readOnly":"false"
}
},
"datasources" : {
"${DB_DATABASE}":{
"host":"${DB_HOST}",
"dbdriver":"${DB_DRIVER}",
"database":"${DB_DATABASE}",
"dsn":"jdbc:mysql://{host}:{port}/{database}",
"custom":"useUnicode=true&characterEncoding=UTF-8&useLegacyDatetimeCode=true&autoReconnect=true",
"port":"${DB_PORT}",
"class":"${DB_CLASS}",
"username":"${DB_USER}",
"password":"${DB_PASSWORD}",
"connectionLimit":"100",
"connectionTimeout":"1"
}
"systemErr":"System",
"systemOut":"System",
"componentCacheEnabled":false,
"thistimezone":"UTC",
"adminPassword": "${CFCONFIG_ADMINPASSWORD}",
"debuggingEnabled":true,
"debuggingShowDatabase":true,
"debuggingReportExecutionTimes": false,
"disableInternalCFJavaComponents":false,
"requestTimeoutEnabled": true,
"robustExceptionEnabled": true,
"whitespaceManagement": "white-space-pref",
"requestTimeout": "0,0,5,0",
"datasources": {
"${DB_DATABASE}": {
"bundleName": "${DB_BUNDLENAME}",
"bundleVersion": "${DB_BUNDLEVERSION}",
"class": "${DB_CLASS}",
"custom": "useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&useLegacyDatetimeCode=true&allowPublicKeyRetrieval=true",
"database": "${DB_DATABASE}",
"dbdriver": "MySQL",
"dsn": "jdbc:mysql://{host}:{port}/{database}",
"host":"${DB_HOST:127.0.0.1}",
"password": "${DB_PASSWORD}",
"port": "${DB_PORT:3306}",
"username": "${DB_USER:root}",
"storage":"false",
"validate":"false"
}
}
}
}
117 changes: 61 additions & 56 deletions .cfformat.json
Original file line number Diff line number Diff line change
@@ -1,58 +1,63 @@
{
"alignment.consecutive.assignments":false,
"alignment.consecutive.params":false,
"alignment.consecutive.properties":false,
"array.empty_padding":false,
"array.multiline.element_count":4,
"array.multiline.leading_comma":false,
"array.multiline.leading_comma.padding":true,
"array.multiline.min_length":40,
"array.padding":true,
"binary_operators.padding":true,
"brackets.padding":true,
"comment.asterisks":"align",
"for_loop_semicolons.padding":true,
"function_anonymous.empty_padding":false,
"function_anonymous.group_to_block_spacing":"spaced",
"function_anonymous.multiline.element_count":4,
"function_anonymous.multiline.leading_comma":false,
"function_anonymous.multiline.leading_comma.padding":true,
"function_anonymous.multiline.min_length":40,
"function_anonymous.padding":true,
"function_call.casing.builtin":"cfdocs",
"function_call.casing.userdefined":"camel",
"function_call.empty_padding":false,
"function_call.multiline.element_count":4,
"function_call.multiline.leading_comma":false,
"function_call.multiline.leading_comma.padding":true,
"function_call.multiline.min_length":40,
"function_call.padding":true,
"function_declaration.empty_padding":false,
"function_declaration.group_to_block_spacing":"spaced",
"function_declaration.multiline.element_count":4,
"function_declaration.multiline.leading_comma":false,
"function_declaration.multiline.leading_comma.padding":true,
"function_declaration.multiline.min_length":40,
"function_declaration.padding":true,
"indent_size":4,
"keywords.block_to_keyword_spacing":"spaced",
"keywords.empty_group_spacing":false,
"keywords.group_to_block_spacing":"spaced",
"keywords.padding_inside_group":true,
"keywords.spacing_to_block":"spaced",
"keywords.spacing_to_group":true,
"max_columns":120,
"method_call.chain.multiline":3,
"newline":"\n",
"parentheses.padding":true,
"strings.attributes.quote":"double",
"strings.quote":"double",
"struct.empty_padding":false,
"struct.multiline.element_count":4,
"struct.multiline.leading_comma":false,
"struct.multiline.leading_comma.padding":true,
"struct.multiline.min_length":40,
"struct.padding":true,
"struct.separator":": ",
"tab_indent":true
"array.empty_padding": false,
"array.padding": true,
"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,
"alignment.consecutive.properties": true,
"alignment.consecutive.params": true,
"alignment.doc_comments" : true,
"brackets.padding": true,
"comment.asterisks": "align",
"binary_operators.padding": true,
"for_loop_semicolons.padding": true,
"function_call.empty_padding": false,
"function_call.padding": true,
"function_call.multiline.leading_comma.padding": true,
"function_call.casing.builtin": "cfdocs",
"function_call.casing.userdefined": "camel",
"function_call.multiline.element_count": 3,
"function_call.multiline.leading_comma": false,
"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": 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": 3,
"function_anonymous.multiline.leading_comma": false,
"function_anonymous.multiline.leading_comma.padding": true,
"function_anonymous.multiline.min_length": 50,
"function_anonymous.padding": true,
"indent_size": 4,
"keywords.block_to_keyword_spacing": "spaced",
"keywords.group_to_block_spacing": "spaced",
"keywords.padding_inside_group": true,
"keywords.spacing_to_block": "spaced",
"keywords.spacing_to_group": true,
"keywords.empty_group_spacing": false,
"max_columns": 115,
"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",
"struct.separator": " : ",
"struct.padding": true,
"struct.empty_padding": false,
"struct.multiline.leading_comma": false,
"struct.multiline.leading_comma.padding": true,
"struct.multiline.element_count": 2,
"struct.multiline.min_length": 60,
"tab_indent": true
}
133 changes: 57 additions & 76 deletions .cflintrc
Original file line number Diff line number Diff line change
@@ -1,81 +1,62 @@
{
"output": [],
"rule": [],
"includes": [
{
"code": "AVOID_USING_STRUCTNEW"
},
{
"code": "AVOID_USING_ARRAYNEW"
},
{
"code": "AVOID_USING_CFINCLUDE_TAG"
},
{
"code": "AVOID_USING_CFABORT_TAG"
},
{
"code": "AVOID_USING_ABORT"
},
{
"code": "ARG_VAR_CONFLICT"
},
{
"code": "ARG_VAR_MIXED"
},
{
"code": "CFQUERYPARAM_REQ"
},
{
"code": "COMPARE_INSTEAD_OF_ASSIGN"
},
{
"code": "COMPONENT_HINT_MISSING"
},
{
"code": "EXCESSIVE_FUNCTION_LENGTH"
},
{
"code": "EXCESSIVE_COMPONENT_LENGTH"
},
{
"code": "EXCESSIVE_ARGUMENTS"
},
{
"code": "EXCESSIVE_FUNCTIONS"
},
{
"code": "FUNCTION_TOO_COMPLEX"
},
{
"code": "FUNCTION_HINT_MISSING"
},
{
"code": "LOCAL_LITERAL_VALUE_USED_TOO_OFTEN"
},
{
"code": "GLOBAL_LITERAL_VALUE_USED_TOO_OFTEN"
},
{
"code": "MISSING_VAR"
},
{
"code": "OUTPUT_ATTR"
},
{
"code": "UNUSED_LOCAL_VARIABLE"
},
{
"code": "UNUSED_METHOD_ARGUMENT"
},
{
"code": "SQL_SELECT_STAR"
},
{
"code": "VAR_ALLCAPS_NAME"
}
{ "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_VAR_MIXED" },
{ "code": "ARG_HINT_MISSING" },
{ "code": "ARG_HINT_MISSING_SCRIPT" },
{ "code" : "ARGUMENT_INVALID_NAME" },
{ "code" : "ARGUMENT_ALLCAPS_NAME" },
{ "code" : "ARGUMENT_TOO_WORDY" },
{ "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_ARGUMENTS" },
{ "code": "EXCESSIVE_FUNCTIONS" },
{ "code": "EXPLICIT_BOOLEAN_CHECK" },
{ "code": "FUNCTION_TOO_COMPLEX" },
{ "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" : "METHOD_IS_TEMPORARY" },
{ "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" },
{ "code": "VAR_TOO_WORDY" }
],
"inheritParent": false,
"inheritPlugins": true,
"parameters": {}
}
"parameters": {
"TooManyFunctionsChecker.maximum" : 20
}
}
20 changes: 20 additions & 0 deletions .cfmigrations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"default": {
"manager": "cfmigrations.models.QBMigrationManager",
"migrationsDirectory": "resources/database/migrations/",
"seedsDirectory": "resources/database/seeds/",
"properties": {
"defaultGrammar": "AutoDiscover@qb",
"schema": "${DB_DATABASE}",
"migrationsTable": "cfmigrations",
"connectionInfo": {
"connectionString": "${DB_CONNECTIONSTRING}",
"class": "${DB_CLASS}",
"username": "${DB_USER}",
"password": "${DB_PASSWORD}",
"bundleName": "${DB_BUNDLENAME}",
"bundleVersion": "${DB_BUNDLEVERSION}"
}
}
}
}
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ indent_size = 2

[*.{md,markdown}]
trim_trailing_whitespace = false
insert_final_newline = false
insert_final_newline = false
Loading