Change exception type

Author: ivanlanin

src/PhpWord/Exceptions/InvalidObjectException.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * PHPWord
+ *
+ * Copyright (c) 2014 PHPWord
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPWord
+ * @package    PHPWord
+ * @copyright  Copyright (c) 2014 PHPWord
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    0.8.0
+ */
+namespace PhpOffice\PhpWord\Exceptions;
+
+/**
+ * Exception used for when an image is not found
+ */
+class InvalidObjectException extends Exception
+{
+}

src/PhpWord/Section.php

@@ -25,7 +25,8 @@
 
 namespace PhpOffice\PhpWord;
 
-use PhpOffice\PhpWord\Exceptions\Exception;
+use PhpOffice\PhpWord\Exceptions\InvalidImageException;
+use PhpOffice\PhpWord\Exceptions\InvalidObjectException;
 use PhpOffice\PhpWord\Section\Footer;
 use PhpOffice\PhpWord\Section\Image;
 use PhpOffice\PhpWord\Section\Header;
@@ -229,7 +230,7 @@ public function addListItem($text, $depth = 0, $styleFont = null, $styleList = n
      * @param string $src
      * @param mixed $style
      * @return \PhpOffice\PhpWord\Section\Object
-     * @throws \PhpOffice\PhpWord\Exceptions\Exception
+     * @throws \PhpOffice\PhpWord\Exceptions\InvalidObjectException
      */
     public function addObject($src, $style = null)
     {
@@ -260,8 +261,9 @@ public function addObject($src, $style = null)
 
             $this->_elementCollection[] = $object;
             return $object;
+        } else {
+            throw new InvalidObjectException;
         }
-        throw new Exception('Source does not exist or unsupported object type.');
     }
 
     /**
@@ -270,7 +272,7 @@ public function addObject($src, $style = null)
      * @param string $src
      * @param mixed $style
      * @return \PhpOffice\PhpWord\Section\Image
-     * @throws \PhpOffice\PhpWord\Exceptions\Exception
+     * @throws \PhpOffice\PhpWord\Exceptions\InvalidImageException
      */
     public function addImage($src, $style = null)
     {
@@ -281,7 +283,7 @@ public function addImage($src, $style = null)
             $this->_elementCollection[] = $image;
             return $image;
         } else {
-            throw new Exception('Source does not exist or unsupported image type.');
+            throw new InvalidImageException;
         }
     }
 

src/PhpWord/Section/Footer.php

@@ -25,7 +25,7 @@
 
 namespace PhpOffice\PhpWord\Section;
 
-use PhpOffice\PhpWord\Exceptions\Exception;
+use PhpOffice\PhpWord\Exceptions\InvalidImageException;
 use PhpOffice\PhpWord\Media;
 use PhpOffice\PhpWord\Section\Footer\PreserveText;
 use PhpOffice\PhpWord\Shared\String;
@@ -140,7 +140,7 @@ public function addImage($src, $style = null)
             $this->_elementCollection[] = $image;
             return $image;
         } else {
-            throw new Exception('Source does not exist or unsupported image type.');
+            throw new InvalidImageException;
         }
     }
 

src/PhpWord/Section/Header.php

@@ -25,7 +25,7 @@
 
 namespace PhpOffice\PhpWord\Section;
 
-use PhpOffice\PhpWord\Exceptions\Exception;
+use PhpOffice\PhpWord\Exceptions\InvalidImageException;
 use PhpOffice\PhpWord\Media;
 use PhpOffice\PhpWord\Section\Footer\PreserveText;
 use PhpOffice\PhpWord\Shared\String;
@@ -169,7 +169,7 @@ public function addImage($src, $style = null)
             $this->_elementCollection[] = $image;
             return $image;
         } else {
-            throw new Exception('Source does not exist or unsupported image type.');
+            throw new InvalidImageException;
         }
     }
 
@@ -219,7 +219,7 @@ public function addWatermark($src, $style = null)
             $this->_elementCollection[] = $image;
             return $image;
         } else {
-            throw new Exception('Src does not exist or invalid image type.');
+            throw new InvalidImageException;
         }
     }
 

src/PhpWord/Section/Table/Cell.php

@@ -26,6 +26,8 @@
 namespace PhpOffice\PhpWord\Section\Table;
 
 use PhpOffice\PhpWord\Exceptions\Exception;
+use PhpOffice\PhpWord\Exceptions\InvalidObjectException;
+use PhpOffice\PhpWord\Exceptions\InvalidImageException;
 use PhpOffice\PhpWord\Media;
 use PhpOffice\PhpWord\Section\Footer\PreserveText;
 use PhpOffice\PhpWord\Section\Image;
@@ -212,7 +214,7 @@ public function addImage($src, $style = null)
             $this->_elementCollection[] = $image;
             return $image;
         } else {
-            throw new Exception('Source does not exist or unsupported image type.');
+            throw new InvalidImageException;
         }
     }
 
@@ -265,7 +267,7 @@ public function addObject($src, $style = null)
             $this->_elementCollection[] = $object;
             return $object;
         } else {
-            throw new Exception('Source does not exist or unsupported object type.');
+            throw new InvalidObjectException;
         }
     }
 

src/PhpWord/Section/TextRun.php

@@ -25,7 +25,7 @@
 
 namespace PhpOffice\PhpWord\Section;
 
-use PhpOffice\PhpWord\Exceptions\Exception;
+use PhpOffice\PhpWord\Exceptions\InvalidImageException;
 use PhpOffice\PhpWord\Media;
 use PhpOffice\PhpWord\Shared\String;
 use PhpOffice\PhpWord\Style\Paragraph;
@@ -131,7 +131,7 @@ public function addImage($imageSrc, $style = null)
             $this->_elementCollection[] = $image;
             return $image;
         } else {
-            throw new Exception('Source does not exist or unsupported image type.');
+            throw new InvalidImageException;
         }
     }