Update fixer rules

Following graby, wallabag, etc.
7 years ago · 2dce2879bf
parent 49ce4233fa
commit 2dce2879bf
4 changed files with 585 additions and 582 deletions
--- a/.php_cs
+++ b/.php_cs
@ -4,22 +4,27 @@ return PhpCsFixer\Config::create()
    ->setUsingCache(true)
    ->setRiskyAllowed(true)
    ->setRules([
-        'concat_space' => [
-            'spacing' => 'one',
-        ],
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'combine_consecutive_unsets' => true,
+        'heredoc_to_nowdoc' => true,
+        'no_extra_consecutive_blank_lines' => ['break', 'continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block'],
+        'no_unreachable_default_argument_value' => true,
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'ordered_class_elements' => true,
        'ordered_imports' => true,
+        'php_unit_strict' => false,
        'phpdoc_order' => true,
+        // 'psr4' => true,
        'strict_comparison' => true,
        'strict_param' => true,
-        'array_syntax' => [
-            'syntax' => 'long',
-        ],
+        'concat_space' => ['spacing' => 'one'],
    ])
    ->setFinder(
        PhpCsFixer\Finder::create()
-            ->exclude([
-                'vendor',
-            ])
+            ->exclude(['vendor'])
            ->in(__DIR__)
    )
 ;
--- a/src/JSLikeHTMLElement.php
+++ b/src/JSLikeHTMLElement.php
@ -45,7 +45,7 @@ class JSLikeHTMLElement extends \DOMElement
     */
    public function __set($name, $value)
    {
-        if ($name !== 'innerHTML') {
+        if ('innerHTML' !== $name) {
            $trace = debug_backtrace();
            trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_NOTICE);

@ -109,7 +109,7 @@ class JSLikeHTMLElement extends \DOMElement
     */
    public function __get($name)
    {
-        if ($name === 'innerHTML') {
+        if ('innerHTML' === $name) {
            $inner = '';

            foreach ($this->childNodes as $child) {
@ -121,8 +121,6 @@ class JSLikeHTMLElement extends \DOMElement

        $trace = debug_backtrace();
        trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_NOTICE);
-
-        return;
    }

    public function __toString()
--- a/src/Readability.php
+++ b/src/Readability.php
--- a/tests/ReadabilityTest.php
+++ b/tests/ReadabilityTest.php
@ -11,17 +11,6 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
    public $logHandler;
    public $logger;

-    private function getReadability($html, $url = null, $parser = 'libxml', $useTidy = true)
-    {
-        $readability = new Readability($html, $url, $parser, $useTidy);
-
-        $this->logHandler = new TestHandler();
-        $this->logger = new Logger('test', array($this->logHandler));
-        $readability->setLogger($this->logger);
-
-        return $readability;
-    }
-
    /**
     * @requires extension tidy
     */
@ -345,7 +334,7 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
    {
        error_reporting(E_ALL | E_STRICT);
        ini_set('display_errors', true);
-        set_error_handler(array($this, 'error2Exception'), E_ALL | E_STRICT);
+        set_error_handler([$this, 'error2Exception'], E_ALL | E_STRICT);

        $data = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
            <html xmlns="http://www.w3.org/1999/xhtml" lang="ru-RU" prefix="og: http://ogp.me/ns#">
@ -493,4 +482,15 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
        $this->assertContains('<sup id="fnref1:fnfeed_2"><a href="#fn:fnfeed_2" class="footnote-ref">2</a></sup>', $readability->getContent()->innerHTML);
        $this->assertContains('<a href="#fnref1:fnfeed_2" rev="footnote"', $readability->getContent()->innerHTML);
    }
+
+    private function getReadability($html, $url = null, $parser = 'libxml', $useTidy = true)
+    {
+        $readability = new Readability($html, $url, $parser, $useTidy);
+
+        $this->logHandler = new TestHandler();
+        $this->logger = new Logger('test', [$this->logHandler]);
+        $readability->setLogger($this->logger);
+
+        return $readability;
+    }
 }