infong
/
php-readability
mirror of https://github.com/j0k3r/php-readability
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45 from j0k3r/fix/update-fixer-rules

Browse Source 
Update fixer rules
pull/46/head 1.2.0
Jérémy Benoist 7 years ago committed by GitHub
parent 49ce4233fa 2dce2879bf
commit 6a0f3337a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 585 additions and 582 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      .php_cs
  2. 6
      src/JSLikeHTMLElement.php
  3. 1114
      src/Readability.php
  4. 24
      tests/ReadabilityTest.php

23
.php_cs
Unescape View File

@ -4,22 +4,27 @@ return PhpCsFixer\Config::create()
->setUsingCache(true) ->setUsingCache(true)
->setRiskyAllowed(true) ->setRiskyAllowed(true)
->setRules([ ->setRules([
'concat_space' => [ '@Symfony' => true,
'spacing' => 'one', '@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, 'ordered_imports' => true,
'php_unit_strict' => false,
'phpdoc_order' => true, 'phpdoc_order' => true,
// 'psr4' => true,
'strict_comparison' => true, 'strict_comparison' => true,
'strict_param' => true, 'strict_param' => true,
'array_syntax' => [ 'concat_space' => ['spacing' => 'one'],
'syntax' => 'long',
],
]) ])
->setFinder( ->setFinder(
PhpCsFixer\Finder::create() PhpCsFixer\Finder::create()
->exclude([ ->exclude(['vendor'])
'vendor',
])
->in(__DIR__) ->in(__DIR__)
) )
; ;

6
src/JSLikeHTMLElement.php
Unescape View File

@ -45,7 +45,7 @@ class JSLikeHTMLElement extends \DOMElement
*/ */
public function __set($name, $value) public function __set($name, $value)
{ {
if ($name !== 'innerHTML') { if ('innerHTML' !== $name) {
$trace = debug_backtrace(); $trace = debug_backtrace();
trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_NOTICE); 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) public function __get($name)
{ {
if ($name === 'innerHTML') { if ('innerHTML' === $name) {
$inner = ''; $inner = '';
foreach ($this->childNodes as $child) { foreach ($this->childNodes as $child) {
@ -121,8 +121,6 @@ class JSLikeHTMLElement extends \DOMElement
$trace = debug_backtrace(); $trace = debug_backtrace();
trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_NOTICE); trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_NOTICE);
return;
} }
public function __toString() public function __toString()

1114
src/Readability.php
View File

File diff suppressed because it is too large Load Diff

24
tests/ReadabilityTest.php
Unescape View File

@ -11,17 +11,6 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
public $logHandler; public $logHandler;
public $logger; 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 * @requires extension tidy
*/ */
@ -345,7 +334,7 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
{ {
error_reporting(E_ALL | E_STRICT); error_reporting(E_ALL | E_STRICT);
ini_set('display_errors', true); 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"> $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#"> <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('<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); $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;
}
} }

Write Preview
Loading…
Cancel
Save