diff --git a/.php_cs b/.php_cs index 4d783ac..4dfb291 100644 --- a/.php_cs +++ b/.php_cs @@ -3,6 +3,15 @@ $finder = PhpCsFixer\Finder::create() ->in(__DIR__); +$header = << true, '@Symfony' => true, @@ -22,6 +31,10 @@ $rules = [ 'array_syntax' => [ 'syntax' => 'short', ], + 'header_comment' => [ + 'header' => $header, + 'commentType' => PhpCsFixer\Fixer\Comment\HeaderCommentFixer::HEADER_PHPDOC, + ], 'yoda_style' => false, ]; diff --git a/.php_cs.cache b/.php_cs.cache index a6976be..55b391e 100644 --- a/.php_cs.cache +++ b/.php_cs.cache @@ -1 +1 @@ -{"php":"7.0.33","version":"2.15.3:v2.15.3#705490b0f282f21017d73561e9498d2b622ee34c","indent":" ","lineEnding":"\n","rules":{"blank_line_after_namespace":true,"braces":{"allow_single_line_closure":true},"class_definition":{"single_line":true},"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_constants":true,"lowercase_keywords":true,"method_argument_space":true,"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":true,"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true,"binary_operator_spaces":true,"blank_line_after_opening_tag":true,"blank_line_before_statement":{"statements":["return"]},"cast_spaces":{"space":"none"},"class_attributes_separation":{"elements":["method"]},"concat_space":{"spacing":"none"},"declare_equal_normalize":true,"function_typehint_space":true,"include":true,"increment_style":true,"lowercase_cast":true,"lowercase_static_reference":true,"magic_constant_casing":true,"magic_method_casing":true,"native_function_casing":true,"native_function_type_declaration_casing":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_blank_lines_after_phpdoc":true,"no_empty_comment":true,"no_empty_phpdoc":true,"no_empty_statement":true,"no_extra_blank_lines":{"tokens":["curly_brace_block","extra","parenthesis_brace_block","square_brace_block","throw","use"]},"no_leading_import_slash":true,"no_leading_namespace_whitespace":true,"no_mixed_echo_print":true,"no_multiline_whitespace_around_double_arrow":true,"no_short_bool_cast":true,"no_singleline_whitespace_before_semicolons":true,"no_spaces_around_offset":true,"no_trailing_comma_in_list_call":true,"no_trailing_comma_in_singleline_array":true,"no_unneeded_control_parentheses":true,"no_unneeded_curly_braces":true,"no_unneeded_final_method":true,"no_unused_imports":true,"no_whitespace_before_comma_in_array":true,"no_whitespace_in_blank_line":true,"normalize_index_brace":true,"object_operator_without_whitespace":true,"php_unit_fqcn_annotation":true,"phpdoc_align":{"align":"left"},"phpdoc_annotation_without_dot":true,"phpdoc_indent":true,"phpdoc_inline_tag":true,"phpdoc_no_access":true,"phpdoc_no_alias_tag":true,"phpdoc_no_empty_return":true,"phpdoc_no_package":true,"phpdoc_no_useless_inheritdoc":true,"phpdoc_return_self_reference":true,"phpdoc_scalar":true,"phpdoc_separation":true,"phpdoc_single_line_var_spacing":true,"phpdoc_summary":true,"phpdoc_to_comment":true,"phpdoc_trim":true,"phpdoc_types":true,"phpdoc_types_order":{"null_adjustment":"always_last","sort_algorithm":"none"},"phpdoc_var_without_name":true,"protected_to_private":true,"return_type_declaration":true,"semicolon_after_instruction":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_line_comment_style":{"comment_types":["hash"]},"single_quote":true,"single_trait_insert_per_statement":true,"space_after_semicolon":{"remove_in_empty_for_expressions":true},"standardize_increment":true,"standardize_not_equals":true,"ternary_operator_spaces":true,"trailing_comma_in_multiline_array":true,"trim_array_spaces":true,"unary_operator_spaces":true,"whitespace_after_comma_in_array":true,"native_function_invocation":{"scope":"namespaced"},"psr4":true,"array_syntax":{"syntax":"short"}},"hashes":{"SensioLabs\/AnsiConverter\/Bridge\/Twig\/AnsiExtension.php":1074911019,"SensioLabs\/AnsiConverter\/Tests\/AnsiToHtmlConverterTest.php":3391306297,"SensioLabs\/AnsiConverter\/AnsiToHtmlConverter.php":3124383060,"SensioLabs\/AnsiConverter\/Theme\/SolarizedXTermTheme.php":2214076055,"SensioLabs\/AnsiConverter\/Theme\/SolarizedTheme.php":1994090682,"SensioLabs\/AnsiConverter\/Theme\/Theme.php":1433239516}} \ No newline at end of file +{"php":"7.0.33","version":"2.15.3:v2.15.3#705490b0f282f21017d73561e9498d2b622ee34c","indent":" ","lineEnding":"\n","rules":{"blank_line_after_namespace":true,"braces":{"allow_single_line_closure":true},"class_definition":{"single_line":true},"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_constants":true,"lowercase_keywords":true,"method_argument_space":true,"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":true,"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true,"binary_operator_spaces":true,"blank_line_after_opening_tag":true,"blank_line_before_statement":{"statements":["return"]},"cast_spaces":{"space":"none"},"class_attributes_separation":{"elements":["method"]},"concat_space":{"spacing":"none"},"declare_equal_normalize":true,"function_typehint_space":true,"include":true,"increment_style":true,"lowercase_cast":true,"lowercase_static_reference":true,"magic_constant_casing":true,"magic_method_casing":true,"native_function_casing":true,"native_function_type_declaration_casing":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_blank_lines_after_phpdoc":true,"no_empty_comment":true,"no_empty_phpdoc":true,"no_empty_statement":true,"no_extra_blank_lines":{"tokens":["curly_brace_block","extra","parenthesis_brace_block","square_brace_block","throw","use"]},"no_leading_import_slash":true,"no_leading_namespace_whitespace":true,"no_mixed_echo_print":true,"no_multiline_whitespace_around_double_arrow":true,"no_short_bool_cast":true,"no_singleline_whitespace_before_semicolons":true,"no_spaces_around_offset":true,"no_trailing_comma_in_list_call":true,"no_trailing_comma_in_singleline_array":true,"no_unneeded_control_parentheses":true,"no_unneeded_curly_braces":true,"no_unneeded_final_method":true,"no_unused_imports":true,"no_whitespace_before_comma_in_array":true,"no_whitespace_in_blank_line":true,"normalize_index_brace":true,"object_operator_without_whitespace":true,"php_unit_fqcn_annotation":true,"phpdoc_align":{"align":"left"},"phpdoc_annotation_without_dot":true,"phpdoc_indent":true,"phpdoc_inline_tag":true,"phpdoc_no_access":true,"phpdoc_no_alias_tag":true,"phpdoc_no_empty_return":true,"phpdoc_no_package":true,"phpdoc_no_useless_inheritdoc":true,"phpdoc_return_self_reference":true,"phpdoc_scalar":true,"phpdoc_separation":true,"phpdoc_single_line_var_spacing":true,"phpdoc_summary":true,"phpdoc_to_comment":true,"phpdoc_trim":true,"phpdoc_types":true,"phpdoc_types_order":{"null_adjustment":"always_last","sort_algorithm":"none"},"phpdoc_var_without_name":true,"protected_to_private":true,"return_type_declaration":true,"semicolon_after_instruction":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_line_comment_style":{"comment_types":["hash"]},"single_quote":true,"single_trait_insert_per_statement":true,"space_after_semicolon":{"remove_in_empty_for_expressions":true},"standardize_increment":true,"standardize_not_equals":true,"ternary_operator_spaces":true,"trailing_comma_in_multiline_array":true,"trim_array_spaces":true,"unary_operator_spaces":true,"whitespace_after_comma_in_array":true,"native_function_invocation":{"scope":"namespaced"},"psr4":true,"array_syntax":{"syntax":"short"},"header_comment":{"header":"This file is part of ansi-to-html.\n\n(c) 2013 Fabien Potencier\n\nFor the full copyright and license information, please view the LICENSE\nfile that was distributed with this source code.","commentType":"PHPDoc"}},"hashes":{"SensioLabs\/AnsiConverter\/Bridge\/Twig\/AnsiExtension.php":2859265687,"SensioLabs\/AnsiConverter\/Tests\/AnsiToHtmlConverterTest.php":436553342,"SensioLabs\/AnsiConverter\/AnsiToHtmlConverter.php":3476338731,"SensioLabs\/AnsiConverter\/Theme\/SolarizedXTermTheme.php":208261246,"SensioLabs\/AnsiConverter\/Theme\/SolarizedTheme.php":2371482451,"SensioLabs\/AnsiConverter\/Theme\/Theme.php":2288887261}} \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index a6e5035..4a6df4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,11 @@ matrix: - php: nightly - php: hhvm +cache: + directories: + - $HOME/.composer/cache + - $HOME/.php-cs-fixer + before_script: - travis_retry composer self-update - travis_retry composer update --no-interaction --prefer-source --prefer-stable ${COMPOSER_FLAGS} diff --git a/SensioLabs/AnsiConverter/AnsiToHtmlConverter.php b/SensioLabs/AnsiConverter/AnsiToHtmlConverter.php index 53299f9..08a8e60 100644 --- a/SensioLabs/AnsiConverter/AnsiToHtmlConverter.php +++ b/SensioLabs/AnsiConverter/AnsiToHtmlConverter.php @@ -1,6 +1,6 @@ ['html']]), + new TwigFilter('ansi_to_html', [$this, 'ansiToHtml'], ['is_safe' => ['html']]), ]; } public function getFunctions() { return [ - new \Twig_SimpleFunction('ansi_css', [$this, 'css'], ['is_safe' => ['css']]), + new TwigFunction('ansi_css', [$this, 'css'], ['is_safe' => ['css']]), ]; } diff --git a/SensioLabs/AnsiConverter/Tests/AnsiToHtmlConverterTest.php b/SensioLabs/AnsiConverter/Tests/AnsiToHtmlConverterTest.php index e4cede9..78f1fa3 100644 --- a/SensioLabs/AnsiConverter/Tests/AnsiToHtmlConverterTest.php +++ b/SensioLabs/AnsiConverter/Tests/AnsiToHtmlConverterTest.php @@ -1,6 +1,6 @@ - ./SensioLabs/AnsiConverter/Tests + + + + ./SensioLabs/ + + +