Skip to content

Commit c990fb0

Browse files
authored
Merge pull request #255 from W0rma/fix-cs
Fix CS
2 parents 973bc37 + 6962785 commit c990fb0

13 files changed

+13
-15
lines changed

.github/workflows/benchmark.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- name: Checkout code
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2525

2626
- name: Setup PHP
2727
uses: shivammathur/setup-php@v2

.github/workflows/ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: Checkout code
28-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
2929

3030
- name: Setup PHP
3131
uses: shivammathur/setup-php@v2

.github/workflows/cs.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Checkout code
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323

2424
- name: Setup PHP
2525
uses: shivammathur/setup-php@v2
@@ -28,5 +28,5 @@ jobs:
2828

2929
- name: cs fix
3030
run: |
31-
wget -q https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.13.1/php-cs-fixer.phar
31+
wget -q https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.19.3/php-cs-fixer.phar
3232
php php-cs-fixer.phar fix --dry-run --diff

.php_cs.dist

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ $finder = PhpCsFixer\Finder::create()
77
return PhpCsFixer\Config::create()
88
->setRules(array(
99
'@Symfony' => true,
10+
'array_syntax' => false,
1011
'concat_space' => array('spacing' => 'one'),
1112
'phpdoc_annotation_without_dot' => false,
1213
))

src/HTML5.php

-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ public function hasErrors()
146146
* Parse an input string.
147147
*
148148
* @param string $input
149-
* @param array $options
150149
*
151150
* @return \DOMDocument
152151
*/

src/HTML5/Parser/DOMTreeBuilder.php

-2
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,6 @@ public function fragment()
231231
*
232232
* This is used for handling Processor Instructions as they are
233233
* inserted. If omitted, PI's are inserted directly into the DOM tree.
234-
*
235-
* @param InstructionProcessor $proc
236234
*/
237235
public function setInstructionProcessor(InstructionProcessor $proc)
238236
{

src/HTML5/Parser/Tokenizer.php

+1
Original file line numberDiff line numberDiff line change
@@ -729,6 +729,7 @@ protected function isCommentEnd()
729729
// Test for '!>'
730730
if ('!' == $this->scanner->current() && '>' == $this->scanner->peek()) {
731731
$this->scanner->consume(); // Consume the last '>'
732+
732733
return true;
733734
}
734735
// Unread '-' and one of '!' or '>';

src/HTML5/Parser/TreeBuildingRules.php

-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ public function evaluate($new, $current)
8080
case 'thead':
8181
case 'tfoot':
8282
case 'table': // Spec isn't explicit about this, but it's necessary.
83-
8483
return $this->closeIfCurrentMatches($new, $current, array(
8584
'thead',
8685
'tfoot',

test/HTML5/Parser/DOMTreeBuilderTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
namespace Masterminds\HTML5\Tests\Parser;
88

9+
use Masterminds\HTML5\Parser\DOMTreeBuilder;
910
use Masterminds\HTML5\Parser\Scanner;
1011
use Masterminds\HTML5\Parser\Tokenizer;
11-
use Masterminds\HTML5\Parser\DOMTreeBuilder;
1212

1313
/**
1414
* These tests are functional, not necessarily unit tests.

test/HTML5/Parser/ScannerTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
namespace Masterminds\HTML5\Tests\Parser;
88

9-
use Masterminds\HTML5\Parser\StringInputStream;
109
use Masterminds\HTML5\Parser\Scanner;
10+
use Masterminds\HTML5\Parser\StringInputStream;
1111

1212
class ScannerTest extends \Masterminds\HTML5\Tests\TestCase
1313
{

test/HTML5/Parser/TokenizerTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
namespace Masterminds\HTML5\Tests\Parser;
44

5-
use Masterminds\HTML5\Parser\UTF8Utils;
65
use Masterminds\HTML5\Parser\Scanner;
76
use Masterminds\HTML5\Parser\Tokenizer;
7+
use Masterminds\HTML5\Parser\UTF8Utils;
88

99
class TokenizerTest extends \Masterminds\HTML5\Tests\TestCase
1010
{

test/HTML5/Parser/TreeBuildingRulesTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
namespace Masterminds\HTML5\Tests\Parser;
88

9-
use Masterminds\HTML5\Parser\TreeBuildingRules;
10-
use Masterminds\HTML5\Parser\Tokenizer;
11-
use Masterminds\HTML5\Parser\Scanner;
129
use Masterminds\HTML5\Parser\DOMTreeBuilder;
10+
use Masterminds\HTML5\Parser\Scanner;
11+
use Masterminds\HTML5\Parser\Tokenizer;
12+
use Masterminds\HTML5\Parser\TreeBuildingRules;
1313

1414
/**
1515
* These tests are functional, not necessarily unit tests.

test/HTML5/Serializer/OutputRulesTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
namespace Masterminds\HTML5\Tests\Serializer;
44

5+
use Masterminds\HTML5;
56
use Masterminds\HTML5\Serializer\OutputRules;
67
use Masterminds\HTML5\Serializer\Traverser;
7-
use Masterminds\HTML5;
88

99
class OutputRulesTest extends \Masterminds\HTML5\Tests\TestCase
1010
{

0 commit comments

Comments
 (0)