Merge b9d2b2aa2d into 6427dd7371

.php_cs

@@ -1,20 +1,28 @@
 <?php
 
-return Symfony\CS\Config\Config::create()
-    ->setUsingCache(true)
-    ->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
-    // use default SYMFONY_LEVEL and extra fixers:
-    ->fixers(array(
-        'concat_with_spaces',
-        'ordered_use',
-        'phpdoc_order',
-        'strict',
-        'strict_param',
-        'long_array_syntax',
-    ))
-    ->finder(
-        Symfony\CS\Finder\DefaultFinder::create()
-            ->in(__DIR__)
+return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        'combine_consecutive_unsets' => true,
+        'heredoc_to_nowdoc' => true,
+        'no_extra_consecutive_blank_lines' => array('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,
+        'concat_space' => array('spacing' => 'one'),
+    ])
+    ->setFinder(
+        PhpCsFixer\Finder::create()
             ->exclude(array('vendor'))
+            ->in(__DIR__)
     )
 ;

.travis.yml

@@ -1,24 +1,32 @@
 language: php
 
 php:
-    - 5.3.3
-    - 5.3
-    - 5.4
     - 5.5
     - 5.6
     - 7.0
     - 7.1
+    - 7.2
     - nightly
     - hhvm
 
 matrix:
     include:
+        - php: 5.3.3
+          dist: precise
+          sudo: required
+        - php: 5.3
+          dist: precise
+          sudo: required
+        - php: 5.4
+          dist: precise
+          sudo: required
         - php: 7.0
           env: CS_FIXER=run
     fast_finish: true
     allow_failures:
-        - php: hhvm
+        - php: 7.2
         - php: nightly
+        - php: hhvm
 
 # faster builds on new travis setup not using sudo
 sudo: false

composer.json

@@ -31,7 +31,7 @@
     },
     "require-dev": {
         "satooshi/php-coveralls": "~0.6",
-        "friendsofphp/php-cs-fixer": "<2",
+        "friendsofphp/php-cs-fixer": "~2.0",
         "monolog/monolog": "^1.13",
         "symfony/phpunit-bridge": "^3.2"
     },

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()

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
      */
@@ -479,4 +468,15 @@ class ReadabilityTest extends \PHPUnit_Framework_TestCase
 
         $this->assertTrue($res);
     }
+
+    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;
+    }
 }