Changed all exception to specific objects

Author: paquettg

src/PHPHtmlParser/Curl.php

@@ -1,14 +1,16 @@
 <?php
 namespace PHPHtmlParser;
 
+use PHPHtmlParser\Exceptions\CurlException;
+
 class Curl implements CurlInterface {
 
 	/**
 	 * A simple curl implementation to get the content of the url.
 	 *
 	 * @param string $url
 	 * @return string
-	 * @throws Exception
+	 * @throws CurlException
 	 */
 	public function get($url)
 	{
@@ -22,7 +24,7 @@ public function get($url)
 		{
 			// there was a problem
 			$error = curl_error($ch);
-			throw new Exception('Error retrieving "'.$url.'" ('.$error.')');
+			throw new CurlException('Error retrieving "'.$url.'" ('.$error.')');
 		}
 
 		return $content;

src/PHPHtmlParser/Dom.php

@@ -3,6 +3,7 @@
 
 use PHPHtmlParser\Dom\HtmlNode;
 use PHPHtmlParser\Dom\TextNode;
+use PHPHtmlParser\Exceptions\NotLoadedException;
 use stringEncode\Encode;
 
 class Dom {
@@ -306,11 +307,6 @@ protected function loadStr($str, $option)
 		$this->rawSize = strlen($str);
 		$this->raw     = $str;
 
-		// clean out none-html text
-		if ( ! $this instanceof Dom)
-		{
-			throw new \Exception(get_class($this));
-		}
 		$html = $this->clean($str);
 
 		$this->size    = strlen($str);
@@ -325,13 +321,13 @@ protected function loadStr($str, $option)
 	/**
 	 * Checks if the load methods have been called.
 	 *
-	 * @throws Exception
+	 * @throws NotLoadedException
 	 */
 	protected function isLoaded()
 	{
 		if (is_null($this->content))
 		{
-			throw new Exception('Content is not loaded!');
+			throw new NotLoadedException('Content is not loaded!');
 		}
 	}
 

src/PHPHtmlParser/Dom/AbstractNode.php

@@ -2,6 +2,9 @@
 namespace PHPHtmlParser\Dom;
 
 use PHPHtmlParser\Selector;
+use PHPHtmlParser\Exceptions\ChildNotFoundException;
+use PHPHtmlParser\Exceptions\CircularException;
+use PHPHtmlParser\Exceptions\ParentNotFoundException;
 use stringEncode\Encode;
 
 /**
@@ -130,14 +133,14 @@ public function getParent()
 	 *
 	 * @param AbstractNode $parent
 	 * @chainable
-	 * @throws Exception
+	 * @throws CircularException
 	 */
 	public function setParent(AbstractNode $parent)
 	{
 		// check integrity 
 		if ($this->isDescendant($parent->id()))
 		{
-			throw new Exception('Can not add descendant "'.$parent->id().'" as my parent.');
+			throw new CircularException('Can not add descendant "'.$parent->id().'" as my parent.');
 		}
 
 		// remove from old parent
@@ -195,13 +198,13 @@ public function hasChildren()
 	 *
 	 * @param int $id
 	 * @return AbstractNode
-	 * @throw Exception
+	 * @throws ChildNotFoundException
 	 */
 	public function getChild($id)
 	{
 		if ( ! isset($this->children[$id]))
 		{
-			throw new Exception('Child "'.$id.'" not found in this node.');
+			throw new ChildNotFoundException("Child '$id' not found in this node.");
 		}
 
 		return $this->children[$id]['node'];
@@ -213,6 +216,7 @@ public function getChild($id)
 	 * 
 	 * @param AbstractNode $child
 	 * @return bool
+	 * @throws CircularExceptionException
 	 */
 	public function addChild(AbstractNode $child)
 	{
@@ -222,13 +226,13 @@ public function addChild(AbstractNode $child)
 		// check integrity
 		if ($this->isAncestor($child->id()))
 		{
-			throw new Exception('Can not add child. It is my ancestor.');
+			throw new CircularException('Can not add child. It is my ancestor.');
 		}
 
 		// check if child is itself
 		if ($child->id() == $this->id)
 		{
-			throw new Exception('Can not set itself as a child.');
+			throw new CircularException('Can not set itself as a child.');
 		}
 
 		if ($this->hasChildren())
@@ -416,13 +420,13 @@ public function lastChild()
 	 * Attempts to get the next sibling.
 	 *
 	 * @return AbstractNode
-	 * @throws Exception
+	 * @throws ParentNotFoundException
 	 */
 	public function nextSibling()
 	{
 		if (is_null($this->parent))
 		{
-			throw new Exception('Parent is not set for this node.');
+			throw new ParentNotFoundException('Parent is not set for this node.');
 		}
 
 		return $this->parent->nextChild($this->id);
@@ -432,13 +436,13 @@ public function nextSibling()
 	 * Attempts to get the previous sibling
 	 *
 	 * @return AbstractNode
-	 * @throw Exception
+	 * @throws ParentNotFoundException
 	 */
 	public function previousSibling()
 	{
 		if (is_null($this->parent))
 		{
-			throw new Exception('Parent is not set for this node.');
+			throw new ParentNotFoundException('Parent is not set for this node.');
 		}
 
 		return $this->parent->previousChild($this->id);
@@ -493,7 +497,7 @@ public function getAttribute($key)
 	 *
 	 * @param  string $tag
 	 * @return AbstractNode
-	 * @throws Exception
+	 * @throws ParentNotFoundException
 	 */
 	public function ancestorByTag($tag)
 	{
@@ -510,7 +514,7 @@ public function ancestorByTag($tag)
 			$node = $node->getParent();
 		}
 
-		throw new Exception('Could not find an ancestor with "'.$tag.'" tag');
+		throw new ParentNotFoundException('Could not find an ancestor with "'.$tag.'" tag');
 	}
 
 	/**

src/PHPHtmlParser/Dom/Exception.php

@@ -1,6 +1,9 @@
 <?php
 namespace PHPHtmlParser\Dom;
 
+use PHPHtmlParser\Exceptions\UnkownChildTypeException;
+use PHPHtmlParser\Exceptions\ChildNotFoundException;
+
 class HtmlNode extends AbstractNode {
 
 	/**
@@ -39,6 +42,7 @@ public function __construct($tag)
 	 * Gets the inner html of this node.
 	 *
 	 * @return string
+	 * @throws UnkownChildTypeException
 	 */
 	public function innerHtml()
 	{
@@ -70,14 +74,14 @@ public function innerHtml()
 			}
 			else
 			{
-				throw new Exception('Error: Unkowne child type "'.get_class($child).'" found in node');
+				throw new UnknownChildTypeException('Unknown child type "'.get_class($child).'" found in node');
 			}
 
 			try
 			{
 				$child = $this->nextChild($child->id());
 			}
-			catch (Exception $e)
+			catch (ChildNotFoundException $e)
 			{
 				// no more children
 				$child = null;

src/PHPHtmlParser/Dom/HtmlNode.php

@@ -0,0 +1,5 @@
+<?php
+namespace PHPHtmlParser\Exceptions;
+
+final class ChildNotFoundException extends \Exception {}
+

src/PHPHtmlParser/Exception.php

@@ -0,0 +1,4 @@
+<?php
+namespace PHPHtmlParser\Exceptions;
+
+final class CircularException extends \Exception {};

src/PHPHtmlParser/Exceptions/ChildNotFoundException.php

@@ -0,0 +1,4 @@
+<?php
+namespace PHPHtmlParser\Exceptions;
+
+class CurlException extends \Exception {}

src/PHPHtmlParser/Exceptions/CircularException.php

@@ -0,0 +1,4 @@
+<?php
+namespace PHPHtmlParser\Exceptions;
+
+final class NotLoadedException extends \Exception {}