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

Jump to bottom

Update composer type to vendormodule and remove extend object class #9

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update composer type to vendormodule and remove extend object class #9

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
271001c
Update composer type to vendormodule and remove extend object class
ishannz Jan 23, 2019
d5aab9c
fixed incorrect path with require_once in HTML_BBCodeParser2Test
pjayme Feb 25, 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
8 changes: 8 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/php.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

192 changes: 192 additions & 0 deletions .idea/workspace.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "silverstripe-archive/silverstripe-bbcodeparser",
"description": "Abandoned moduled providing BBCodeParser and TextParser to SS 4+",
"type": "silverstripe-module",
"type": "silverstripe-vendormodule",
"require": {
"silverstripe/framework": "^4.0"
},
Expand Down
7 changes: 3 additions & 4 deletions src/TextParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace SilverStripe\BBCodeParser;

use SilverStripe\ORM\FieldType\DBField;
use SilverStripe\Core\Object;
use SilverStripe\Core\Injector\Injectable;

/**
* Parses text in a variety of ways.
Expand All @@ -29,8 +29,9 @@
*
* @todo Define a proper syntax for (or refactor) usable_tags that can be extended as needed.
*/
abstract class TextParser extends Object
abstract class TextParser
{
use Injectable;

/**
* @var string
Expand All @@ -44,9 +45,7 @@ abstract class TextParser extends Object
*/
public function __construct($content = "")
{
parent::__construct();
$this->content = $content;
parent::__construct();
}

/**
Expand Down
Loading