Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve issue #36 - php 7.3 compatiblity #37

Merged
merged 2 commits into from
Jan 19, 2019
Merged

Resolve issue #36 - php 7.3 compatiblity #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba88c56
Update for PHPSimple HTMLDomParser
obj63mc Jan 8, 2019
c481497
Further PHP 7.3 updates
obj63mc Jan 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions src/Analysis/Analysis.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -153,7 +153,7 @@ public function getResult()
}

/**
* @return \simplehtmldom_1_5\simple_html_dom
* @return \simple_html_dom\simple_html_dom
*/
public function getRenderedHtmlDomParser()
{
Expand Down
8 changes: 4 additions & 4 deletions src/Extensions/PageHealthExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Forms/GoogleSearchPreview.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down