Skip to content

Commit

Permalink
Merge pull request #3 from publicwhip/rb-0.4.1-code-stylings
Browse files Browse the repository at this point in the history
Rb 0.4.1 code stylings
  • Loading branch information
rbairwell authored Mar 16, 2019
2 parents acb4002 + a814288 commit 88f14f2
Show file tree
Hide file tree
Showing 95 changed files with 2,989 additions and 967 deletions.
16 changes: 4 additions & 12 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,12 @@ end_of_line=lf
insert_final_newline=false
indent_style=space
indent_size=4
trim_trailing_whitespace = true

[{.babelrc,.stylelintrc,jest.config,.eslintrc,*.json,*.jsb3,*.jsb2,*.bowerrc}]
indent_style=space
indent_size=2

[{*.cql,*.ddl,*.sql}]
indent_style=space
indent_size=2
[*.md]
trim_trailing_whitespace = false

[{*.yaml,*.yml}]
indent_style=space
[{.babelrc,.stylelintrc,jest.config,.eslintrc,*.json,*.jsb3,*.jsb2,*.bowerrc,*.yaml,*.yml,*.sql,composer.lock}]
indent_size=2

[{composer.lock,composer.json}]
indent_style=space
indent_size=2

34 changes: 27 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,34 @@
.idea
.php_cs.cache
# We allow .idea to enable shared development on Jetbrains IDEs
# but exclude the following user-specific stuff
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf
# ... generated files
.idea/**/contentModel.xml
# .. sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml
.idea/httpRequests

# We don't want the logs folder populated as the contents are local only.
logs/*
!logs/.gitkeep
!logs/README.md
# We don't want the cache folder populated as the contents are local only.
cache/*
!cache/.gitkeep
!cache/README.md
vendor/*
# We don't want the qa folder populated as the results change too often.
qa/*
!qa/.gitkeep
!qa/README.md
# We don't want the following cache files stored as they are local only.
.phpunit.result.cache
!.gitkeep
.php_cs.cache
# We don't want vendor to accidentally make it into the repo.
vendor/*
122 changes: 122 additions & 0 deletions .idea/PublicWhipV2.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/composerJson.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/fileTemplates/code/PHP Constructor.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .idea/fileTemplates/includes/PHP Class Doc Comment.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .idea/fileTemplates/includes/PHP Interface Doc Comment.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .idea/fileTemplates/includes/PHP Trait Doc Comment.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/fileTemplates/internal/PHP Class.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .idea/fileTemplates/internal/PHP File.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/fileTemplates/internal/PHP Interface.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/fileTemplates/internal/PHP Trait.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions .idea/fileTemplates/internal/PHPUnit 6 Test.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions .idea/fileTemplates/internal/PHPUnit Test.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 88f14f2

Please sign in to comment.