mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-19 21:19:29 +00:00
Paminger
2dada5200c
Conflicts: .gitignore composer.json include/prestudent.class.php include/securimage/securimage.php include/studienplan.class.php system/dbupdate_3.2.php tests/codesniffer/FHComplete/Sniffs/Commenting/DocBlockAlignmentSniff.php tests/codesniffer/FHComplete/Sniffs/Commenting/FunctionCommentSniff.php tests/codesniffer/FHComplete/Sniffs/Commenting/FunctionCommentTypeSniff.php tests/codesniffer/FHComplete/Sniffs/ControlStructures/ControlSignatureSniff.php tests/codesniffer/FHComplete/Sniffs/ControlStructures/ElseIfDeclarationSniff.php tests/codesniffer/FHComplete/Sniffs/ControlStructures/WhileStructuresSniff.php tests/codesniffer/FHComplete/Sniffs/Formatting/OneClassPerUseSniff.php tests/codesniffer/FHComplete/Sniffs/Formatting/UseInAlphabeticalOrderSniff.php tests/codesniffer/FHComplete/Sniffs/Functions/ClosureDeclarationSniff.php tests/codesniffer/FHComplete/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php tests/codesniffer/FHComplete/Sniffs/NamingConventions/CamelCapsMethodNameSniff.php tests/codesniffer/FHComplete/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidClassBracketsSniff.php tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidFunctionNameSniff.php tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidTraitNameSniff.php tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidVariableNameSniff.php tests/codesniffer/FHComplete/Sniffs/PHP/DisallowShortOpenTagSniff.php tests/codesniffer/FHComplete/Sniffs/PHP/TypeCastingSniff.php tests/codesniffer/FHComplete/Sniffs/Strings/ConcatenationSpacingSniff.php tests/codesniffer/FHComplete/Sniffs/WhiteSpace/CommaSpacingSniff.php tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionCallSpacingSniff.php tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionSpacingSniff.php tests/codesniffer/FHComplete/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php tests/codesniffer/FHComplete/Sniffs/WhiteSpace/OperatorSpacingSniff.php tests/codesniffer/FHComplete/Sniffs/WhiteSpace/ScopeIndentSniff.php tests/codesniffer/FHComplete/Sniffs/WhiteSpace/TabAndSpaceSniff.php tests/codesniffer/FHComplete/ruleset.xml tests/codesniffer/FHComplete/tests/FHCompletePHPStandardTest.php tests/codesniffer/FHComplete/tests/TestHelper.php tests/codesniffer/FHComplete/tests/bootstrap.php tests/codesniffer/FHComplete/tests/files/FHComplete/throws_pass.php tests/codesniffer/FHComplete/tests/files/bad_trait_name.php tests/codesniffer/FHComplete/tests/files/class_brackets_fail1.php tests/codesniffer/FHComplete/tests/files/class_brackets_fail2.php tests/codesniffer/FHComplete/tests/files/class_brackets_fail3.php tests/codesniffer/FHComplete/tests/files/class_underscore_prefix_pass.php tests/codesniffer/FHComplete/tests/files/control_structure_brackets_pass.php tests/codesniffer/FHComplete/tests/files/control_structure_dowhile.php tests/codesniffer/FHComplete/tests/files/control_structure_elseif.php tests/codesniffer/FHComplete/tests/files/control_structure_indentation.php tests/codesniffer/FHComplete/tests/files/control_structure_nobrackets.php tests/codesniffer/FHComplete/tests/files/control_structure_nospace.php tests/codesniffer/FHComplete/tests/files/control_structure_while.php tests/codesniffer/FHComplete/tests/files/control_structures_no_newline.php tests/codesniffer/FHComplete/tests/files/docblock_align_fail.php tests/codesniffer/FHComplete/tests/files/docblock_align_flat_pass.php tests/codesniffer/FHComplete/tests/files/docblock_align_pass.php tests/codesniffer/FHComplete/tests/files/double_space.php tests/codesniffer/FHComplete/tests/files/for_function_comment_pass.php tests/codesniffer/FHComplete/tests/files/function_comment_opening_line_fail.php tests/codesniffer/FHComplete/tests/files/function_comment_opening_line_pass.php tests/codesniffer/FHComplete/tests/files/function_comment_type_fail.php tests/codesniffer/FHComplete/tests/files/function_comment_type_pass.php tests/codesniffer/FHComplete/tests/files/function_spacing.php tests/codesniffer/FHComplete/tests/files/mixing_indent.php tests/codesniffer/FHComplete/tests/files/multiple_use.php tests/codesniffer/FHComplete/tests/files/multiple_use_pass.php tests/codesniffer/FHComplete/tests/files/operator_spacing_pass.php tests/codesniffer/FHComplete/tests/files/short_open_tags_fail.php tests/codesniffer/FHComplete/tests/files/short_open_tags_pass.php tests/codesniffer/FHComplete/tests/files/space_tab.php tests/codesniffer/FHComplete/tests/files/tab_space.php tests/codesniffer/FHComplete/tests/files/traits_no_order.php tests/codesniffer/FHComplete/tests/files/traits_pass.php tests/codesniffer/FHComplete/tests/files/type_casting_fail.php tests/codesniffer/FHComplete/tests/files/type_casting_pass.php tests/codesniffer/FHComplete/tests/files/use_class_and_closure_pass.php tests/codesniffer/FHComplete/tests/files/use_closure_pass.php tests/codesniffer/FHComplete/tests/files/use_no_order.php tests/codesniffer/FHComplete/tests/files/use_ok_pass.php tests/codesniffer/FHComplete/tests/files/use_with_commas.php tests/codesniffer/FHComplete/tests/files/variable_name_pass.php tests/codesniffer/FHComplete/tests/files/whitespace_comma.php tests/codesniffer/FHComplete/tests/files/whitespace_comma_before.php tests/codesniffer/FHComplete/tests/files/whitespace_comma_pass.php tests/codesniffer/FHComplete/tests/ruleset.xml
