Merge pull request #21 from j0k3r/childnode-goes-null

Avoid childnode becoming null to generate a warning
j0k3r · Jan 11, 2017 · e5d31b9 · e5d31b9
2 parents ade8505 + 6e24a5d
commit e5d31b9
Show file tree

Hide file tree

Showing 5 changed files with 162 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,8 @@ php:
     - 5.5
     - 5.6
     - 7.0
+    - 7.1
+    - nightly
     - hhvm
 
 matrix:
@@ -16,6 +18,7 @@ matrix:
     fast_finish: true
     allow_failures:
         - php: hhvm
+        - php: nightly
 
 # faster builds on new travis setup not using sudo
 sudo: false
@@ -32,6 +35,8 @@ before_install:
     # see: https://blog.travis-ci.com/upcoming_ubuntu_11_10_migration/
     - if [[ $TRAVIS_PHP_VERSION = 5.3.3 ]]; then composer config -g -- disable-tls true; fi;
     - if [[ $TRAVIS_PHP_VERSION = 5.3.3 ]]; then composer config -g -- secure-http false; fi;
+    # no version compatible with PHP > 7.1
+    - if [[ $TRAVIS_PHP_VERSION = 7.2.* ]]; then composer remove friendsofphp/php-cs-fixer; fi;
 
 install:
     - composer self-update

diff --git a/composer.json b/composer.json
@@ -25,11 +25,11 @@
     }],
     "require": {
         "php": ">=5.3.3",
-        "monolog/monolog": "^1.13.1"
+        "monolog/monolog": "^1.13"
     },
     "require-dev": {
         "satooshi/php-coveralls": "~0.6",
-        "friendsofphp/php-cs-fixer": "*"
+        "friendsofphp/php-cs-fixer": "<2"
     },
     "autoload": {
         "psr-4": { "Readability\\": "src/" }

diff --git a/src/Readability.php b/src/Readability.php
@@ -758,6 +758,11 @@ protected function grabArticle($page = null)
                     for ($i = 0, $il = $node->childNodes->length; $i < $il; ++$i) {
                         $childNode = $node->childNodes->item($i);
 
+                        // it looks like sometimes the loop is going too far and we are retrieving a non-existant child
+                        if (null === $childNode) {
+                            continue;
+                        }
+
                         // executable tags (<?php or <?xml) warning
                         if (is_object($childNode) && get_class($childNode) === 'DOMProcessingInstruction') {
                             $childNode->parentNode->removeChild($childNode);

diff --git a/tests/ReadabilityTest.php b/tests/ReadabilityTest.php
@@ -464,4 +464,17 @@ public function testPreFilters()
         $this->assertTrue($res);
         $this->assertContains('This the awesome and WONDERFUL content :)', $readability->getContent()->innerHTML);
     }
+
+    public function testChildNodeGoneNull()
+    {
+        // from http://www.ayyaantuu.net/ethiopia-targets-opposition-lawmakers/
+        $html = file_get_contents('tests/fixtures/childNodeGoesNull.html');
+
+        $readability = $this->getReadability($html, 'http://0.0.0.0');
+        $readability->debug = true;
+        $readability->convertLinksToFootnotes = true;
+        $res = $readability->init();
+
+        $this->assertTrue($res);
+    }
 }
diff --git a/tests/fixtures/childNodeGoesNull.html b/tests/fixtures/childNodeGoesNull.html
@@ -0,0 +1,137 @@
+<div id="main-sidebar-container">
+
+            <!-- #main Starts -->
+                        <section id="main">
+<?php if (function_exists ('adinserter')) echo adinserter (1); ?><article class="post-23842 post type-post status-publish format-standard hentry category-ethiopia">
+    <header>
+    <h1 class="title entry-title">Ethiopia targets opposition who met with European lawmakers</h1>  </header>
+<div class="post-meta"><span class="Small"><abbr class="date time published updated" title="2017-01-09T15:25:17-0500">January 9, 2017</abbr>  <span class="Small">in</span> <span class="categories"><a href="http://www.ayyaantuu.net/category/horn-of-africa/ethiopia/" title="View all items in Ethiopia">Ethiopia</a></span>  </div>
+    <section class="entry">
+<div id="fb-root"></div>
+<p><strong>Ethiopia targets opposition who met with European lawmakers</strong></p>
+<p><span class="dateline"><img class="alignleft wp-image-22789 size-full" src="http://www.ayyaantuu.net/wp-content/uploads/2016/12/Ana-Gomes-Merera-Gudina.jpg" alt="Ethiopia targets opposition who met with European lawmakers" width="300" height="160" srcset="http://www.ayyaantuu.net/wp-content/uploads/2016/12/Ana-Gomes-Merera-Gudina.jpg 300w, http://www.ayyaantuu.net/wp-content/uploads/2016/12/Ana-Gomes-Merera-Gudina-200x107.jpg 200w" sizes="(max-width: 300px) 100vw, 300px" />ADDIS ABABA (<a href="http://www.foxnews.com/world/2017/01/09/ethiopia-targets-opposition-who-met-with-european-lawmakers.html">Fox News</a>)  –  </span>Ethiopia says it will not release a leading opposition figure detained under the country’s state of emergency after meeting with European lawmakers in Belgium.</p>
+<!-- WP QUADS Content Ad Plugin v. 1.3.9 -->
+<div class="quads-location quads-ad2" id="quads-ad2" style="float:left;margin:2px 2px 2px 0;">
+<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+<!-- Ad2016_12_14_3 -->
+<ins class="adsbygoogle"
+     style="display:inline-block;width:336px;height:280px"
+     data-ad-client="ca-pub-6953193962442323"
+     data-ad-slot="4950645476"></ins>
+<script>
+(adsbygoogle = window.adsbygoogle || []).push({});
+</script>
+</div>
+
+<p>Prime Minister Hailemariam Desalegn told reporters on Monday that Merara Gudina of the Oromo Federalist Congress party instead will face justice.</p>
+<p>The prime minister says “individuals in the European Parliament who are harboring anti-peace elements cannot save those who trespass the law of the country.”</p>
+<p>Merara is one of 22,000 people the prime minister says were detained under the state of emergency declared in October after widespread anti-government protests.</p>
+<p>Merara was arrested immediately after he returned from Belgium. He was accused of meeting with members of an armed Ethiopian opposition group in Brussels, an act banned under the emergency law.</p>
+
+<div style="font-size:0px;height:0px;line-height:0px;margin:0;padding:0;clear:both"></div><aside class="mashsb-container mashsb-main "><div class="mashsb-box"><div class="mashsb-count mash-small" style="float:left;"><div class="counts mashsbcount">0</div><span class="mashsb-sharetext">SHARES</span></div><div class="mashsb-buttons"><a  class="mashicon-facebook mash-small" href="http://www.facebook.com/sharer.php?u=http%3A%2F%2Fwww.ayyaantuu.net%2Fethiopia-targets-opposition-lawmakers%2F" target="_blank" rel="nofollow"><span class="icon"></span><span class="text">Share</span></a><a  class="mashicon-twitter mash-small" href="https://twitter.com/intent/tweet?text=Ethiopia%20targets%20opposition%20who%20met%20with%20European%20lawmakers&url=http://www.ayyaantuu.net/?p=23842&via= ayyaantuu" target="_blank" rel="nofollow"><span class="icon"></span><span class="text">Tweet</span></a><div class="onoffswitch mash-small"></div><div class="secondary-shares" style="display:none;"><a  class="mashicon-subscribe mash-small" href="#" target="_blank" rel="nofollow"><span class="icon"></span><span class="text">Subscribe</span></a><div class="onoffswitch2 mash-small" style="display:none;"></div></div></div>
+            </div>
+                <div style="clear:both;"></div><div class="mashsb-toggle-container"></div></aside>
+            <!-- Share buttons by mashshare.net - Version: 3.3.6--> </section><!-- /.entry -->
+    <div class="fix"></div>
+        <aside id="connect">
+        <h3>Subscribe</h3>
+
+        <div class="col-left">
+            <p>Subscribe to our e-mail newsletter to receive updates.</p>
+
+
+
+                        <div class="social">
+                                <a href="http://www.ayyaantuu.net/feed/" class="subscribe" title="RSS"></a>
+
+                                <a target="_blank" href="https://twitter.com/ayyaantuu" class="twitter" title="Twitter"></a>
+
+                                <a target="_blank" href="https://www.facebook.com/ayyaantuu.oromiyaa" class="facebook" title="Facebook"></a>
+
+                            </div>
+
+        </div><!-- col-left -->
+
+                <div class="related-posts col-right">
+            <h4>Related Posts:</h4>
+            <div class="woo-sc-related-posts">
+<ul>
+<li class="post-id-23812">
+
+<a href="http://www.ayyaantuu.net/country-new-african-millionaire/" title="Africa Business: The life of TPLF millionaire in Oromia/Ethiopia?" class="related-title"><span>Africa Business: The life of TPLF millionaire in Oromia/Ethiopia?</span></a>
+</li>
+<li class="post-id-23794">
+
+<a href="http://www.ayyaantuu.net/ethiopian-girl-band-funding-axed-uk/" title="Ethiopian girl band Yegna&#8217;s funding axed by UK &#8211; BBC News" class="related-title"><span>Ethiopian girl band Yegna&#8217;s funding axed by UK &#8211; BBC News</span></a>
+</li>
+<li class="post-id-23783">
+
+<a href="http://www.ayyaantuu.net/infrastructure-led-chinese-approach/" title="Ethiopia’s political ripple a big test for infrastructure-led Chinese approach" class="related-title"><span>Ethiopia’s political ripple a big test for infrastructure-led Chinese approach</span></a>
+</li>
+<li class="post-id-23766">
+
+<a href="http://www.ayyaantuu.net/defense-witness-testimonials/" title="Defense Witness Testimonials on Yonatan Tesfaye’s Terrorism Charges" class="related-title"><span>Defense Witness Testimonials on Yonatan Tesfaye’s Terrorism Charges</span></a>
+</li>
+<li class="post-id-23745">
+
+<a href="http://www.ayyaantuu.net/foreign-government-internet-shutdowns-soared-2016/" title="Foreign government internet shutdowns soared in 2016" class="related-title"><span>Foreign government internet shutdowns soared in 2016</span></a>
+</li>
+</ul>
+<div class="fix"></div><!--/.fix-->
+</div><!--/.woo-sc-related-posts-->     </div><!-- col-right -->
+
+        <div class="fix"></div>
+    </aside>
+    <div class="post-utility"></div>
+</article><!-- /.post -->
+            <div class="post-entries">
+                <div class="nav-prev fl"><a href="http://www.ayyaantuu.net/many-bombs-united-states-dropped-2016/" rel="prev"><i class="fa fa-angle-left"></i> How Many Bombs the United States Dropped in 2016?</a></div>
+                <div class="nav-next fr"><a href="http://www.ayyaantuu.net/rockefeller-conspiracy-one-world-order/" rel="next">David Rockefeller Says Conspiracy About ‘One World Order’ Is True <i class="fa fa-angle-right"></i></a></div>
+                <div class="fix"></div>
+            </div>
+
+        <?php if (function_exists ('adinserter')) echo adinserter (1); ?><div id="comments">            <h3 id="comments-title">One Response to <em>Ethiopia targets opposition who met with European lawmakers</em></h3>
+            <ol class="commentlist">
+
+        <li id="comment-30772" class="comment even thread-even depth-1">
+
+            <div id="li-comment-30772" class="comment-container">
+
+                                    <div class="avatar"></div>
+
+                <div class="comment-head">
+
+                    <span class="name">Addis Zemen</span>
+                    <span class="date">January 9, 2017 at 5:57 pm</span>
+                    <span class="perma"><a href="http://www.ayyaantuu.net/ethiopia-targets-opposition-lawmakers/#comment-30772" title="Direct link to this comment">#</a></span>
+                    <span class="edit"></span>
+
+                </div><!-- /.comment-head -->
+
+                <div class="comment-entry">
+
+                <p>10,000 people that were areested in Oromia got released. When the people were arrested it was under the assumption “Violence broke out during an Oromo religious festival, and in some instances foreigners seem to have been targeted. ”</p>
+<p>But now many prosecutors agree Violence was not the case. The people at the Erecha celebration thought aliens invaded their country. They thought the foreigners were aliens from another planet.<br />
+Close to a thousand threw themselves of a cliff just because they saw a helicopter flying near them. Many are paralized hundreds died. Now the injured are trying to blame the helicopter pilot for their injuries by saying the pilot caused their injuries by scaring them, flying like an alien abductor UFO would . After the prosecutor agreed it was an accident or suicide that caused the deaths of hundreds of people at the Erecha celebration, the suspected 10,000 prisoners got released. The prosecutors are blaming those that spoke with the European parliament for spreading false information about what really happened at the Erecha celebration.</p>
+
+
+                    <div class="reply">
+                        <a rel='nofollow' class='comment-reply-link' href='http://www.ayyaantuu.net/ethiopia-targets-opposition-lawmakers/?replytocom=30772#respond' onclick='return addComment.moveForm( "comment-30772", "30772", "respond", "23842" )' aria-label='Reply to Addis Zemen'>Reply</a>                   </div><!-- /.reply -->
+
+                </div><!-- /comment-entry -->
+
+            </div><!-- /.comment-container -->
+
+    </li><!-- #comment-## -->
+            </ol>
+            </div>  <div id="respond" class="comment-respond">
+        <h3 id="reply-title" class="comment-reply-title">Leave a Reply <small><a rel="nofollow" id="cancel-comment-reply-link" href="/ethiopia-targets-opposition-lawmakers/#respond" style="display:none;">Click here to cancel reply.</a></small></h3>            <form action="http://www.ayyaantuu.net/wp-comments-post.php" method="post" id="commentform" class="comment-form">
+                <p class="comment-form-comment"><label class="hide" for="comment">Comment</label> <textarea tabindex="4" id="comment" name="comment" cols="50" rows="10" maxlength="65525" aria-required="true" required="required"></textarea></p><p class="comment-form-author"><input id="author" name="author" type="text" class="txt" tabindex="1" value="" size="30" aria-required='true' /><label for="author">Name <span class="required">(required)</span></label> </p>
+<p class="comment-form-email"><input id="email" name="email" type="text" class="txt" tabindex="2" value="" size="30" aria-required='true' /><label for="email">Email (will not be published) <span class="required">(required)</span></label> </p>
+<p class="comment-form-url"><input id="url" name="url" type="text" class="txt" tabindex="3" value="" size="30" /><label for="url">Website</label></p>
+<p class="form-submit"><input name="submit" type="submit" id="submit" class="submit" value="Submit Comment" /> <input type='hidden' name='comment_post_ID' value='23842' id='comment_post_ID' />
+<input type='hidden' name='comment_parent' id='comment_parent' value='0' />
+</p><p style="display: none;"><input type="hidden" id="akismet_comment_nonce" name="akismet_comment_nonce" value="39bacbf69e" /></p><p style="display: none;"><input type="hidden" id="ak_js" name="ak_js" value="66"/></p>         </form>
+            </div><!-- #respond -->
+
+            </section><!-- /#main -->