Merge pull request #37 from obj63mc/master

Resolve issue #36 - php 7.3 compatiblity
Quinn-Interactive · Jan 19, 2019 · 5e577c2 · 5e577c2
2 parents 818d2c2 + c481497
commit 5e577c2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     "silverstripe/cms": "^4.1",
     "jonom/silverstripe-text-target-length": "^2",
     "wilr/silverstripe-googlesitemaps": "^2.1",
-    "sunra/php-simple-html-dom-parser": "^1.5",
+    "kub-at/php-simple-html-dom-parser": "^1.7",
     "axllent/silverstripe-trailing-slash": "^2.1"
   },
   "require-dev": {

diff --git a/src/Analysis/Analysis.php b/src/Analysis/Analysis.php
@@ -6,7 +6,7 @@
 use SilverStripe\Core\Config\Configurable;
 use SilverStripe\Core\Injector\Injectable;
 use SilverStripe\View\ArrayData;
-use Sunra\PhpSimple\HtmlDomParser;
+use KubAT\PhpSimple\HtmlDomParser;
 use Vulcan\Seo\Extensions\PageHealthExtension;
 
 /**
@@ -153,7 +153,7 @@ public function getResult()
     }
 
     /**
-     * @return \simplehtmldom_1_5\simple_html_dom
+     * @return \simple_html_dom\simple_html_dom
      */
     public function getRenderedHtmlDomParser()
     {

diff --git a/src/Extensions/PageHealthExtension.php b/src/Extensions/PageHealthExtension.php
@@ -7,7 +7,7 @@
 use SilverStripe\Forms\TextField;
 use SilverStripe\Forms\ToggleCompositeField;
 use SilverStripe\ORM\DataExtension;
-use Sunra\PhpSimple\HtmlDomParser;
+use KubAT\PhpSimple\HtmlDomParser;
 use Vulcan\Seo\Analysis\Analysis;
 use Vulcan\Seo\Forms\GoogleSearchPreview;
 use Vulcan\Seo\Forms\HealthAnalysisField;
@@ -59,18 +59,18 @@ public function getRenderedHtml()
         if (!$this->renderedHtml) {
             $this->renderedHtml = file_get_contents($this->getOwner()->AbsoluteLink().'?stage=Stage');
         }
-        
+
         if ($this->renderedHtml === false) {
             $this->renderedHtml = '<p></p>';
         }
-        
+
         return $this->renderedHtml;
     }
 
     /**
      * Gets the DOM parser for the rendered html
      *
-     * @return \simplehtmldom_1_5\simple_html_dom
+     * @return \simple_html_dom\simple_html_dom
      */
     public function getRenderedHtmlDomParser()
     {

diff --git a/src/Forms/GoogleSearchPreview.php b/src/Forms/GoogleSearchPreview.php
@@ -8,7 +8,7 @@
 use SilverStripe\View\ArrayData;
 use SilverStripe\View\Parsers\URLSegmentFilter;
 use SilverStripe\View\Requirements;
-use simplehtmldom_1_5\simple_html_dom;
+use simple_html_dom\simple_html_dom;
 use Vulcan\Seo\Extensions\PageHealthExtension;
 use Vulcan\Seo\Extensions\PageSeoExtension;