diff --git a/.gitattributes b/.gitattributes index a4b80131b..266d7181c 100755 --- a/.gitattributes +++ b/.gitattributes @@ -27,10 +27,12 @@ *.txt -binary text eol=lf conflict-marker-size=100 *.vcproj -binary text eol=crlf *.xml -binary text eol=lf +*.yml -binary text eol=lf libs/* -whitespace Changelog -binary text eol=lf .gitignore -binary text .gitattributes -binary text +.gitmodules -binary text composer.lock -binary text diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..2e396e638 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "libraries/lithium"] + path = libraries/lithium + url = git://github.com/UnionOfRAD/lithium.git diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 72d04e656..5f7adce7c 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -1,45 +1,49 @@ build: + dependencies: + # Overwrites inferred commands + override: + - 'composer install --no-interaction --no-dev --prefer-source --no-scripts' environment: php: version: 5.5.14 -checks: - php: - avoid_closing_tag: false - avoid_multiple_statements_on_same_line: true - avoid_perl_style_comments: true - avoid_superglobals: false - avoid_usage_of_logical_operators: true - blank_line_after_namespace_declaration: true - classes_in_camel_caps: true - code_rating: true - duplication: true - encourage_postdec_operator: true - encourage_single_quotes: true - fix_php_opening_tag: false - function_in_camel_caps: true - newline_at_end_of_file: true - no_exit: false - no_global_keyword: false - no_mixed_inline_html: false - no_short_method_names: - minimum: '3' - no_short_variable_names: - minimum: '3' - no_underscore_prefix_in_methods: true - no_underscore_prefix_in_properties: true - one_class_per_file: true - optional_parameters_at_the_end: true - param_doc_comment_if_not_inferrable: true - php5_style_constructor: true - properties_in_camelcaps: true - psr2_class_declaration: false - psr2_control_structure_declaration: false - psr2_switch_declaration: false - remove_php_closing_tag: false - require_braces_around_control_structures: false - security_vulnerabilities: false - side_effects_or_types: false - single_namespace_per_use: false + checks: + php: + avoid_closing_tag: false + avoid_multiple_statements_on_same_line: true + avoid_perl_style_comments: true + avoid_superglobals: false + avoid_usage_of_logical_operators: true + blank_line_after_namespace_declaration: true + classes_in_camel_caps: true + code_rating: true + duplication: true + encourage_postdec_operator: true + encourage_single_quotes: true + fix_php_opening_tag: false + function_in_camel_caps: true + newline_at_end_of_file: true + no_exit: false + no_global_keyword: false + no_mixed_inline_html: false + no_short_method_names: + minimum: '3' + no_short_variable_names: + minimum: '3' + no_underscore_prefix_in_methods: true + no_underscore_prefix_in_properties: true + one_class_per_file: true + optional_parameters_at_the_end: true + param_doc_comment_if_not_inferrable: true + php5_style_constructor: true + properties_in_camelcaps: true + psr2_class_declaration: false + psr2_control_structure_declaration: false + psr2_switch_declaration: false + remove_php_closing_tag: false + require_braces_around_control_structures: false + security_vulnerabilities: false + side_effects_or_types: false + single_namespace_per_use: false coding_style: php: diff --git a/Changelog b/Changelog index b18f2b182..20f3f6e42 100755 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +2016-04-28 DariusIII + * Upd: Update scrutinizer.yml, .gitignore and add .gitmodules 2016-04-27 DariusIII * Upd: Scrutinizer.yml * Upd: Update composer, add more scripts to be managed by composer and remove scripts not used.