Skip to content

Commit 27280b1

Browse files
rquadlingrquadling
committed
CS
1 parent 28bf1c4 commit 27280b1

10 files changed

+67
-19
lines changed

Diff for: ‎.php_cs

+13
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@
33
$finder = PhpCsFixer\Finder::create()
44
->in(__DIR__);
55

6+
$header = <<<TXT
7+
This file is part of ansi-to-html.
8+
9+
(c) 2013 Fabien Potencier
10+
11+
For the full copyright and license information, please view the LICENSE
12+
file that was distributed with this source code.
13+
TXT;
14+
615
$rules = [
716
'@PSR2' => true,
817
'@Symfony' => true,
@@ -22,6 +31,10 @@ $rules = [
2231
'array_syntax' => [
2332
'syntax' => 'short',
2433
],
34+
'header_comment' => [
35+
'header' => $header,
36+
'commentType' => PhpCsFixer\Fixer\Comment\HeaderCommentFixer::HEADER_PHPDOC,
37+
],
2538
'yoda_style' => false,
2639
];
2740

Diff for: ‎.php_cs.cache

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +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}}
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"},"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}}

Diff for: ‎.travis.yml

+5
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ matrix:
2525
- php: nightly
2626
- php: hhvm
2727

28+
cache:
29+
directories:
30+
- $HOME/.composer/cache
31+
- $HOME/.php-cs-fixer
32+
2833
before_script:
2934
- travis_retry composer self-update
3035
- travis_retry composer update --no-interaction --prefer-source --prefer-stable ${COMPOSER_FLAGS}

Diff for: ‎SensioLabs/AnsiConverter/AnsiToHtmlConverter.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
/*
3+
/**
44
* This file is part of ansi-to-html.
55
*
66
* (c) 2013 Fabien Potencier

Diff for: ‎SensioLabs/AnsiConverter/Bridge/Twig/AnsiExtension.php

+15-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
11
<?php
22

3+
/**
4+
* This file is part of ansi-to-html.
5+
*
6+
* (c) 2013 Fabien Potencier
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace SensioLabs\AnsiConverter\Bridge\Twig;
413

514
use SensioLabs\AnsiConverter\AnsiToHtmlConverter;
15+
use Twig\Extension\AbstractExtension;
16+
use Twig\TwigFilter;
17+
use Twig\TwigFunction;
618

7-
class AnsiExtension extends \Twig_Extension
19+
class AnsiExtension extends AbstractExtension
820
{
921
private $converter;
1022

@@ -16,14 +28,14 @@ public function __construct(AnsiToHtmlConverter $converter = null)
1628
public function getFilters()
1729
{
1830
return [
19-
new \Twig_SimpleFilter('ansi_to_html', [$this, 'ansiToHtml'], ['is_safe' => ['html']]),
31+
new TwigFilter('ansi_to_html', [$this, 'ansiToHtml'], ['is_safe' => ['html']]),
2032
];
2133
}
2234

2335
public function getFunctions()
2436
{
2537
return [
26-
new \Twig_SimpleFunction('ansi_css', [$this, 'css'], ['is_safe' => ['css']]),
38+
new TwigFunction('ansi_css', [$this, 'css'], ['is_safe' => ['css']]),
2739
];
2840
}
2941

Diff for: ‎SensioLabs/AnsiConverter/Tests/AnsiToHtmlConverterTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
/*
3+
/**
44
* This file is part of ansi-to-html.
55
*
66
* (c) 2013 Fabien Potencier

Diff for: ‎SensioLabs/AnsiConverter/Theme/SolarizedTheme.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
/*
3+
/**
44
* This file is part of ansi-to-html.
55
*
66
* (c) 2013 Fabien Potencier

Diff for: ‎SensioLabs/AnsiConverter/Theme/SolarizedXTermTheme.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
/*
3+
/**
44
* This file is part of ansi-to-html.
55
*
66
* (c) 2013 Fabien Potencier

Diff for: ‎SensioLabs/AnsiConverter/Theme/Theme.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
/*
3+
/**
44
* This file is part of ansi-to-html.
55
*
66
* (c) 2013 Fabien Potencier

Diff for: ‎phpunit.xml.dist

+28-10
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,37 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<phpunit backupGlobals="false"
4-
backupStaticAttributes="false"
5-
colors="true"
6-
convertErrorsToExceptions="true"
7-
convertNoticesToExceptions="true"
8-
convertWarningsToExceptions="true"
9-
processIsolation="false"
10-
stopOnFailure="false"
11-
syntaxCheck="false"
12-
bootstrap="vendor/autoload.php"
3+
<phpunit
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.5/phpunit.xsd"
6+
backupGlobals="false"
7+
backupStaticAttributes="false"
8+
beStrictAboutChangesToGlobalState="true"
9+
beStrictAboutOutputDuringTests="true"
10+
beStrictAboutTestsThatDoNotTestAnything="true"
11+
bootstrap="vendor/autoload.php"
12+
colors="true"
13+
columns="max"
14+
convertErrorsToExceptions="true"
15+
convertNoticesToExceptions="true"
16+
convertWarningsToExceptions="true"
17+
processIsolation="false"
18+
stopOnError="false"
19+
stopOnFailure="false"
20+
stopOnIncomplete="false"
21+
stopOnSkipped="false"
22+
syntaxCheck="false"
23+
verbose="true"
1324
>
1425
<testsuites>
1526
<testsuite name="Test Suite">
1627
<directory>./SensioLabs/AnsiConverter/Tests</directory>
1728
</testsuite>
1829
</testsuites>
30+
31+
<filter>
32+
<whitelist addUncoveredFilesFromWhitelist="true">
33+
<directory suffix=".php">./SensioLabs/</directory>
34+
</whitelist>
35+
</filter>
36+
1937
</phpunit>

0 commit comments

Comments
 (0)