Merge remote-tracking branch 'origin/master'

# Conflicts:
#	composer.json
#	src/Block/BlockInterface.php
#	src/Block/DocumentInterface.php
#	src/Block/ListBlockInterface.php
#	src/Content/ContentInterface.php

Author: Martin Brecht-Precht

.codeclimate.yml

@@ -1,6 +1,10 @@
 engines:
   duplication:
     enabled: true
+    exclude_fingerprints:
+    - 677dcaea63986631c0aecab6fc511f1c
+    - f5d52454fcb0dd64edf1c226dbdb2110
+    - d9593838ba526376aff5421735393d8e
     config:
       languages:
       - ruby

composer.json

@@ -1,28 +1,28 @@
 {
-	"name": "markdom/model-interface",
-	"type": "library",
-	"description": "Markdom domain model interfaces written in PHP",
-	"keywords": [
-		"Markdom",
-		"Model",
-		"Interface"
-	],
-	"homepage": "http://markenwerk.net/",
-	"license": "MIT",
-	"authors": [
-		{
-			"name": "Martin Brecht-Precht",
-			"email": "mb@markenwerk.net",
-			"homepage": "http://markenwerk.net"
-		}
-	],
-	"autoload": {
-		"psr-4": {
-			"Markdom\\ModelInterface\\": "src"
-		}
-	},
-	"require": {
-		"php": "^7.1",
-		"markdom/handler-interface": "^1.1"
-	}
+  "name": "markdom/model-interface",
+  "type": "library",
+  "description": "Markdom domain model interfaces written in PHP",
+  "keywords": [
+    "Markdom",
+    "Model",
+    "Interface"
+  ],
+  "homepage": "http://markenwerk.net/",
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Martin Brecht-Precht",
+      "email": "mb@markenwerk.net",
+      "homepage": "http://markenwerk.net"
+    }
+  ],
+  "autoload": {
+    "psr-4": {
+      "Markdom\\ModelInterface\\": "src"
+    }
+  },
+  "require": {
+    "php": ">=5.3",
+    "markdom/handler-interface": "^1.0.10"
+  }
 }

src/Block/BlockInterface.php

@@ -16,25 +16,20 @@
 interface BlockInterface extends NodeInterface
 {
 
-	public const TYPE_CODE = BlockType::TYPE_CODE;
-	public const TYPE_COMMENT = BlockType::TYPE_COMMENT;
-	public const TYPE_DIVISION = BlockType::TYPE_DIVISION;
-	public const TYPE_HEADING = BlockType::TYPE_HEADING;
-	public const TYPE_UNORDERED_LIST = BlockType::TYPE_UNORDERED_LIST;
-	public const TYPE_ORDERED_LIST = BlockType::TYPE_ORDERED_LIST;
-	public const TYPE_LIST_ITEM = BlockType::TYPE_LIST_ITEM;
-	public const TYPE_PARAGRAPH = BlockType::TYPE_PARAGRAPH;
-	public const TYPE_QUOTE = BlockType::TYPE_QUOTE;
+	const BLOCK_TYPE_CODE = BlockType::TYPE_CODE;
+	const BLOCK_TYPE_COMMENT = BlockType::TYPE_COMMENT;
+	const BLOCK_TYPE_DIVISION = BlockType::TYPE_DIVISION;
+	const BLOCK_TYPE_HEADING = BlockType::TYPE_HEADING;
+	const BLOCK_TYPE_UNORDERED_LIST = BlockType::TYPE_UNORDERED_LIST;
+	const BLOCK_TYPE_ORDERED_LIST = BlockType::TYPE_ORDERED_LIST;
+	const BLOCK_TYPE_LIST_ITEM = BlockType::TYPE_LIST_ITEM;
+	const BLOCK_TYPE_PARAGRAPH = BlockType::TYPE_PARAGRAPH;
+	const BLOCK_TYPE_QUOTE = BlockType::TYPE_QUOTE;
 
 	/**
 	 * @return string
 	 */
-	public function getBlockType(): string;
-
-	/**
-	 * @return BlockInterface
-	 */
-	public function getBlock(): BlockInterface;
+	public function getBlockType();
 
 	/**
 	 * @param BlockParentInterface $blockParent
@@ -50,12 +45,12 @@ public function onDetach();
 	/**
 	 * @return BlockParentInterface
 	 */
-	public function getParent(): BlockParentInterface;
+	public function getParent();
 
 	/**
 	 * @param HandlerInterface $markdomHandler
 	 * @return void
 	 */
-	public function onHandle(HandlerInterface $markdomHandler): void;
+	public function onHandle(HandlerInterface $markdomHandler);
 
 }

src/Block/BlockParentInterface.php

@@ -14,6 +14,15 @@
 interface BlockParentInterface extends NodeInterface
 {
 
+	const BLOCK_PARENT_TYPE_DOCUMENT = 'DOCUMENT';
+	const BLOCK_PARENT_TYPE_LIST_ITEM = 'LIST_ITEM';
+	const BLOCK_PARENT_TYPE_QUOTE = 'QUOTE';
+
+	/**
+	 * @return string
+	 */
+	public function getBlockParentType();
+
 	/**
 	 * @return BlockSequenceInterface
 	 */

src/Block/DocumentInterface.php

@@ -2,20 +2,14 @@
 
 namespace Markdom\ModelInterface\Block;
 
-use Markdom\HandlerInterface\HandlerInterface;
+use Markdom\DispatcherInterface\DispatcherInterface;
 
 /**
  * Interface DocumentInterface
  *
  * @package Markdom\ModelInterface\Block
  */
-interface DocumentInterface extends BlockParentInterface
+interface DocumentInterface extends BlockParentInterface, DispatcherInterface
 {
 
-	/**
-	 * @param HandlerInterface $markdomHandler
-	 * @return void
-	 */
-	public function handle(HandlerInterface $markdomHandler): void;
-
 }

src/Block/ListBlockInterface.php

@@ -10,9 +10,29 @@
 interface ListBlockInterface extends BlockInterface
 {
 
+	const LIST_BLOCK_TYPE_ORDERED_LIST = 'ORDERED_LIST';
+	const LIST_BLOCK_TYPE_UNORDERED_LIST = 'UNORDERED_LIST';
+
+	/**
+	 * @return string
+	 */
+	public function getListBlockType();
+
 	/**
 	 * @return ListItemSequenceInterface
 	 */
-	public function getListItems(): ListItemSequenceInterface;
+	public function getItems();
+
+	/**
+	 * @param ListItemInterface $listItem
+	 * @return $this
+	 */
+	public function addItem(ListItemInterface $listItem);
+
+	/**
+	 * @param ListItemInterface[] $listItems
+	 * @return $this
+	 */
+	public function addItems(array $listItems);
 
 }

src/Content/ContentInterface.php

@@ -4,7 +4,7 @@
 
 use Markdom\Common\ContentType;
 use Markdom\HandlerInterface\HandlerInterface;
-use Markdom\ModelInterface\Block\ContentParentBlockInterface;
+use Markdom\ModelInterface\Block\BlockInterface;
 use Markdom\ModelInterface\Common\NodeInterface;
 
 /**
@@ -17,27 +17,27 @@
 interface ContentInterface extends NodeInterface
 {
 
-	public const TYPE_CODE = ContentType::TYPE_CODE;
-	public const TYPE_EMPHASIS = ContentType::TYPE_EMPHASIS;
-	public const TYPE_IMAGE = ContentType::TYPE_IMAGE;
-	public const TYPE_LINE_BREAK = ContentType::TYPE_LINE_BREAK;
-	public const TYPE_LINK = ContentType::TYPE_LINK;
-	public const TYPE_TEXT = ContentType::TYPE_TEXT;
+	const CONTENT_TYPE_CODE = ContentType::TYPE_CODE;
+	const CONTENT_TYPE_EMPHASIS = ContentType::TYPE_EMPHASIS;
+	const CONTENT_TYPE_IMAGE = ContentType::TYPE_IMAGE;
+	const CONTENT_TYPE_LINE_BREAK = ContentType::TYPE_LINE_BREAK;
+	const CONTENT_TYPE_LINK = ContentType::TYPE_LINK;
+	const CONTENT_TYPE_TEXT = ContentType::TYPE_TEXT;
 
 	/**
 	 * @return string
 	 */
-	public function getContentType(): string;
+	public function getContentType();
 
 	/**
 	 * @return ContentParentInterface
 	 */
-	public function getParent(): ContentParentInterface;
+	public function getParent();
 
 	/**
-	 * @return ContentParentBlockInterface
+	 * @return BlockInterface
 	 */
-	public function getBlock(): ContentParentBlockInterface;
+	public function getBlock();
 
 	/**
 	 * @param ContentParentInterface $contentParent
@@ -52,8 +52,7 @@ public function onDetach();
 
 	/**
 	 * @param HandlerInterface $markdomHandler
-	 * @return void
 	 */
-	public function onHandle(HandlerInterface $markdomHandler): void;
+	public function onHandle(HandlerInterface $markdomHandler);
 
 }

src/Content/ContentParentInterface.php

@@ -2,7 +2,7 @@
 
 namespace Markdom\ModelInterface\Content;
 
-use Markdom\ModelInterface\Block\ContentParentBlockInterface;
+use Markdom\ModelInterface\Block\BlockInterface;
 use Markdom\ModelInterface\Common\NodeInterface;
 
 /**
@@ -15,8 +15,18 @@
 interface ContentParentInterface extends NodeInterface
 {
 
+	const CONTENT_PARENT_TYPE_EMPHASIS = 'EMPHASIS';
+	const CONTENT_PARENT_TYPE_HEADING = 'HEADING';
+	const CONTENT_PARENT_TYPE_LINK = 'LINK';
+	const CONTENT_PARENT_TYPE_PARAGRAPH = 'PARAGRAPH';
+
+	/**
+	 * @return string
+	 */
+	public function getContentParentType();
+
 	/**
-	 * @return ContentParentBlockInterface
+	 * @return BlockInterface
 	 */
 	public function getBlock(): ContentParentBlockInterface;