Merge pull request #66 from Soullivaneuh/exceptions-namespaces

Move all exceptions on Exception namespace
alexdebril · Jun 5, 2015 · c074319 · c074319
2 parents 030ec8c + baf0547
commit c074319
Show file tree

Hide file tree

Showing 25 changed files with 102 additions and 58 deletions.
diff --git a/Controller/StreamController.php b/Controller/StreamController.php
@@ -6,7 +6,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Debril\RssAtomBundle\Provider\FeedContentProviderInterface;
-use Debril\RssAtomBundle\Exception\FeedNotFoundException;
+use Debril\RssAtomBundle\Exception\FeedException\FeedNotFoundException;
 
 class StreamController extends Controller
 {

diff --git a/Driver/FileDriver.php b/Driver/FileDriver.php
@@ -9,6 +9,8 @@
  */
 namespace Debril\RssAtomBundle\Driver;
 
+use Debril\RssAtomBundle\Exception\DriverUnreachableResourceException;
+
 /**
  * Class FileDriver.
  */

diff --git a/Driver/HttpCurlDriver.php b/Driver/HttpCurlDriver.php
@@ -9,6 +9,8 @@
  */
 namespace Debril\RssAtomBundle\Driver;
 
+use Debril\RssAtomBundle\Exception\DriverUnreachableResourceException;
+
 /**
  * Class HttpCurlDriver.
  */

diff --git a/...er/DriverUnreachableResourceException.php → ...on/DriverUnreachableResourceException.php b/...er/DriverUnreachableResourceException.php → ...on/DriverUnreachableResourceException.php
@@ -8,9 +8,7 @@
  * @copyright (c) 2013, Alexandre Debril
  */
 
-namespace Debril\RssAtomBundle\Driver;
-
-use Debril\RssAtomBundle\Exception\RssAtomException;
+namespace Debril\RssAtomBundle\Exception;
 
 /**
  * Class DriverUnreachableResourceException.

diff --git a/Exception/FeedCannotBeReadException.php → ...edException/FeedCannotBeReadException.php b/Exception/FeedCannotBeReadException.php → ...edException/FeedCannotBeReadException.php
@@ -8,7 +8,9 @@
  * @copyright (c) 2013, Alexandre Debril
  */
 
-namespace Debril\RssAtomBundle\Exception;
+namespace Debril\RssAtomBundle\Exception\FeedException;
+
+use Debril\RssAtomBundle\Exception\FeedException;
 
 /**
  * Class FeedCannotBeReadException.

diff --git a/Exception/FeedForbiddenException.php → .../FeedException/FeedForbiddenException.php b/Exception/FeedForbiddenException.php → .../FeedException/FeedForbiddenException.php
@@ -8,7 +8,9 @@
  * @copyright (c) 2013, Alexandre Debril
  */
 
-namespace Debril\RssAtomBundle\Exception;
+namespace Debril\RssAtomBundle\Exception\FeedException;
+
+use Debril\RssAtomBundle\Exception\FeedException;
 
 /**
  * Class FeedForbiddenException.

diff --git a/Exception/FeedException/FeedNotFoundException.php b/Exception/FeedException/FeedNotFoundException.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Rss/Atom Bundle for Symfony 2.
+ *
+ *
+ * @license http://opensource.org/licenses/lgpl-3.0.html LGPL
+ * @copyright (c) 2013, Alexandre Debril
+ */
+
+namespace Debril\RssAtomBundle\Exception\FeedException;
+
+use Debril\RssAtomBundle\Exception\FeedException;
+
+/**
+ * Class FeedNotFoundException.
+ */
+class FeedNotFoundException extends FeedException
+{
+}
diff --git a/Exception/FeedNotModifiedException.php → ...eedException/FeedNotModifiedException.php b/Exception/FeedNotModifiedException.php → ...eedException/FeedNotModifiedException.php
@@ -8,7 +8,9 @@
  * @copyright (c) 2013, Alexandre Debril
  */
 
-namespace Debril\RssAtomBundle\Exception;
+namespace Debril\RssAtomBundle\Exception\FeedException;
+
+use Debril\RssAtomBundle\Exception\FeedException;
 
 /**
  * Class FeedNotModifiedException.

diff --git a/Exception/FeedServerErrorException.php → ...eedException/FeedServerErrorException.php b/Exception/FeedServerErrorException.php → ...eedException/FeedServerErrorException.php
@@ -8,7 +8,9 @@
  * @copyright (c) 2013, Alexandre Debril
  */
 
-namespace Debril\RssAtomBundle\Exception;
+namespace Debril\RssAtomBundle\Exception\FeedException;
+
+use Debril\RssAtomBundle\Exception\FeedException;
 
 /**
  * Class FeedServerErrorException.

diff --git a/Exception/FeedNotFoundException.php → Exception/ParserException.php b/Exception/FeedNotFoundException.php → Exception/ParserException.php
@@ -11,8 +11,8 @@
 namespace Debril\RssAtomBundle\Exception;
 
 /**
- * Class FeedNotFoundException.
+ * Class ParserException.
  */
-class FeedNotFoundException extends FeedException
+class ParserException extends RssAtomException
 {
 }
diff --git a/Protocol/FeedReader.php b/Protocol/FeedReader.php
@@ -14,12 +14,12 @@
 use Debril\RssAtomBundle\Driver\HttpDriverInterface;
 use Debril\RssAtomBundle\Driver\HttpDriverResponse;
 use Debril\RssAtomBundle\Protocol\Parser\Factory;
-use Debril\RssAtomBundle\Protocol\Parser\ParserException;
-use Debril\RssAtomBundle\Exception\FeedCannotBeReadException;
-use Debril\RssAtomBundle\Exception\FeedNotFoundException;
-use Debril\RssAtomBundle\Exception\FeedNotModifiedException;
-use Debril\RssAtomBundle\Exception\FeedServerErrorException;
-use Debril\RssAtomBundle\Exception\FeedForbiddenException;
+use Debril\RssAtomBundle\Exception\ParserException;
+use Debril\RssAtomBundle\Exception\FeedException\FeedCannotBeReadException;
+use Debril\RssAtomBundle\Exception\FeedException\FeedNotFoundException;
+use Debril\RssAtomBundle\Exception\FeedException\FeedNotModifiedException;
+use Debril\RssAtomBundle\Exception\FeedException\FeedServerErrorException;
+use Debril\RssAtomBundle\Exception\FeedException\FeedForbiddenException;
 
 /**
  * Class to read any kind of supported feeds (RSS, ATOM, and more if you need).

diff --git a/Protocol/Parser.php b/Protocol/Parser.php
@@ -11,7 +11,7 @@
 
 use SimpleXMLElement;
 use DateTime;
-use Debril\RssAtomBundle\Protocol\Parser\ParserException;
+use Debril\RssAtomBundle\Exception\ParserException;
 use Debril\RssAtomBundle\Protocol\Parser\Factory;
 use Debril\RssAtomBundle\Protocol\Parser\Media;
 

diff --git a/Protocol/Parser/ParserException.php b/Protocol/Parser/ParserException.php
diff --git a/Provider/DoctrineFeedContentProvider.php b/Provider/DoctrineFeedContentProvider.php
@@ -10,7 +10,7 @@
 namespace Debril\RssAtomBundle\Provider;
 
 use Doctrine\Bundle\DoctrineBundle\Registry;
-use Debril\RssAtomBundle\Exception\FeedNotFoundException;
+use Debril\RssAtomBundle\Exception\FeedException\FeedNotFoundException;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**

diff --git a/Provider/FeedContentProviderInterface.php b/Provider/FeedContentProviderInterface.php
@@ -16,7 +16,7 @@ interface FeedContentProviderInterface
     /**
      * @param array $options
      *
-     * @throws \Debril\RssAtomBundle\Exception\FeedNotFoundException
+     * @throws \Debril\RssAtomBundle\Exception\FeedException\FeedNotFoundException
      *
      * @return \Debril\RssAtomBundle\Protocol\FeedOutInterface
      */

diff --git a/Provider/MockProvider.php b/Provider/MockProvider.php
@@ -13,7 +13,7 @@
 
 use Debril\RssAtomBundle\Protocol\Parser\FeedContent;
 use Debril\RssAtomBundle\Protocol\Parser\Item;
-use Debril\RssAtomBundle\Exception\FeedNotFoundException;
+use Debril\RssAtomBundle\Exception\FeedException\FeedNotFoundException;
 
 class MockProvider implements FeedContentProviderInterface
 {

diff --git a/Tests/Driver/FileDriverTest.php b/Tests/Driver/FileDriverTest.php
@@ -33,7 +33,7 @@ protected function tearDown()
      * @covers Debril\RssAtomBundle\Driver\FileDriver::getResponse
      *
      * @todo   Implement testGetResponse().
-     * @expectedException Debril\RssAtomBundle\Driver\DriverUnreachableResourceException
+     * @expectedException Debril\RssAtomBundle\Exception\DriverUnreachableResourceException
      */
     public function testGetResponseException()
     {

diff --git a/Tests/Driver/HttpCurlDriverTest.php b/Tests/Driver/HttpCurlDriverTest.php
@@ -2,6 +2,8 @@
 
 namespace Debril\RssAtomBundle\Driver;
 
+use Debril\RssAtomBundle\Exception\DriverUnreachableResourceException;
+
 /**
  * Generated by PHPUnit_SkeletonGenerator 1.2.0 on 2013-02-06 at 23:48:53.
  */
@@ -54,7 +56,7 @@ public function testGetResponse()
 
     /**
      * @covers Debril\RssAtomBundle\Driver\HttpCurlDriver::getResponse
-     * @expectedException Debril\RssAtomBundle\Driver\DriverUnreachableResourceException
+     * @expectedException \Debril\RssAtomBundle\Exception\DriverUnreachableResourceException
      */
     public function testGetResponseException()
     {

diff --git a/Tests/Protocol/FeedReaderTest.php b/Tests/Protocol/FeedReaderTest.php
@@ -64,7 +64,7 @@ public function testGetDriver()
 
     /**
      * @covers Debril\RssAtomBundle\Protocol\FeedReader::getFeedContent
-     * @expectedException Debril\RssAtomBundle\Protocol\Parser\ParserException
+     * @expectedException Debril\RssAtomBundle\Exception\ParserException
      */
     public function testGetFeedContentException()
     {
@@ -219,7 +219,7 @@ public function testGetAccurateParser()
 
     /**
      * @covers Debril\RssAtomBundle\Protocol\FeedReader::getAccurateParser
-     * @expectedException Debril\RssAtomBundle\Protocol\Parser\ParserException
+     * @expectedException Debril\RssAtomBundle\Exception\ParserException
      */
     public function testGetAccurateParserException()
     {
@@ -230,7 +230,7 @@ public function testGetAccurateParserException()
 
     /**
      * @covers Debril\RssAtomBundle\Protocol\FeedReader::parseBody
-     * @expectedException Debril\RssAtomBundle\Exception\FeedNotModifiedException
+     * @expectedException Debril\RssAtomBundle\Exception\FeedException\FeedNotModifiedException
      */
     public function testParseBody304()
     {
@@ -241,7 +241,7 @@ public function testParseBody304()
 
     /**
      * @covers Debril\RssAtomBundle\Protocol\FeedReader::parseBody
-     * @expectedException Debril\RssAtomBundle\Exception\FeedNotFoundException
+     * @expectedException Debril\RssAtomBundle\Exception\FeedException\FeedNotFoundException
      */
     public function testParseBody404()
     {
@@ -252,7 +252,7 @@ public function testParseBody404()
 
     /**
      * @covers Debril\RssAtomBundle\Protocol\FeedReader::parseBody
-     * @expectedException Debril\RssAtomBundle\Exception\FeedServerErrorException
+     * @expectedException Debril\RssAtomBundle\Exception\FeedException\FeedServerErrorException
      */
     public function testParseBody500()
     {
@@ -263,7 +263,7 @@ public function testParseBody500()
 
     /**
      * @covers Debril\RssAtomBundle\Protocol\FeedReader::parseBody
-     * @expectedException Debril\RssAtomBundle\Exception\FeedForbiddenException
+     * @expectedException Debril\RssAtomBundle\Exception\FeedException\FeedForbiddenException
      */
     public function testParseBody403()
     {
@@ -274,7 +274,7 @@ public function testParseBody403()
 
     /**
      * @covers Debril\RssAtomBundle\Protocol\FeedReader::parseBody
-     * @expectedException Debril\RssAtomBundle\Exception\FeedCannotBeReadException
+     * @expectedException Debril\RssAtomBundle\Exception\FeedException\FeedCannotBeReadException
      */
     public function testParseBodyUnknownError()
     {

diff --git a/Tests/Protocol/Parser/AtomParserTest.php b/Tests/Protocol/Parser/AtomParserTest.php
@@ -34,7 +34,7 @@ protected function tearDown()
     /**
      * @covers Debril\RssAtomBundle\Protocol\Parser::parse
      * @covers Debril\RssAtomBundle\Protocol\Parser\AtomParser::canHandle
-     * @expectedException \Debril\RssAtomBundle\Protocol\Parser\ParserException
+     * @expectedException \Debril\RssAtomBundle\Exception\ParserException
      */
     public function testCannotHandle()
     {
@@ -57,7 +57,7 @@ public function testCanHandle()
 
     /**
      * @covers Debril\RssAtomBundle\Protocol\Parser\AtomParser::checkBodyStructure
-     * @expectedException \Debril\RssAtomBundle\Protocol\Parser\ParserException
+     * @expectedException \Debril\RssAtomBundle\Exception\ParserException
      */
     public function testParseError()
     {
@@ -122,7 +122,7 @@ public function testSetDateFormats($default)
     /**
      * @covers Debril\RssAtomBundle\Protocol\Parser::guessDateFormat
      * @dataProvider getDefaultFormats
-     * @expectedException \Debril\RssAtomBundle\Protocol\Parser\ParserException
+     * @expectedException \Debril\RssAtomBundle\Exception\ParserException
      */
     public function testGuessDateFormatException($default)
     {

diff --git a/Tests/Protocol/Parser/RdfParserTest.php b/Tests/Protocol/Parser/RdfParserTest.php
@@ -53,7 +53,7 @@ public function testCanHandle()
 
     /**
      * @covers Debril\RssAtomBundle\Protocol\Parser\RdfParser::checkBodyStructure
-     * @expectedException \Debril\RssAtomBundle\Protocol\Parser\ParserException
+     * @expectedException \Debril\RssAtomBundle\Exception\ParserException
      */
     public function testParseError()
     {
@@ -102,7 +102,7 @@ public function testSetDateFormats($default)
     /**
      * @covers Debril\RssAtomBundle\Protocol\Parser::guessDateFormat
      * @dataProvider getDefaultFormats
-     * @expectedException \Debril\RssAtomBundle\Protocol\Parser\ParserException
+     * @expectedException \Debril\RssAtomBundle\Exception\ParserException
      */
     public function testGuessDateFormatException($default)
     {

diff --git a/Tests/Protocol/Parser/RssParserTest.php b/Tests/Protocol/Parser/RssParserTest.php
@@ -53,7 +53,7 @@ public function testCanHandle()
 
     /**
      * @covers Debril\RssAtomBundle\Protocol\Parser\RssParser::checkBodyStructure
-     * @expectedException \Debril\RssAtomBundle\Protocol\Parser\ParserException
+     * @expectedException \Debril\RssAtomBundle\Exception\ParserException
      */
     public function testParseError()
     {
@@ -158,7 +158,7 @@ public function testSetDateFormats($default)
     /**
      * @covers Debril\RssAtomBundle\Protocol\Parser::guessDateFormat
      * @dataProvider getDefaultFormats
-     * @expectedException \Debril\RssAtomBundle\Protocol\Parser\ParserException
+     * @expectedException \Debril\RssAtomBundle\Exception\ParserException
      */
     public function testGuessDateFormatException(array $default)
     {

diff --git a/Tests/Protocol/ParserTest.php b/Tests/Protocol/ParserTest.php
@@ -48,7 +48,7 @@ public function testGetSystemTimezone()
 
     /**
      * @covers Debril\RssAtomBundle\Protocol\Parser::convertToDateTime
-     * @expectedException \Debril\RssAtomBundle\Protocol\Parser\ParserException
+     * @expectedException \Debril\RssAtomBundle\Exception\ParserException
      */
     public function testConvertToDateTimeException()
     {

diff --git a/Tests/Provider/MockProviderTest.php b/Tests/Provider/MockProviderTest.php
@@ -42,7 +42,7 @@ public function testGetContent()
 
     /**
      * @covers Debril\RssAtomBundle\Provider\MockProvider::getFeedContent
-     * @expectedException \Debril\RssAtomBundle\Exception\FeedNotFoundException
+     * @expectedException \Debril\RssAtomBundle\Exception\FeedException\FeedNotFoundException
      */
     public function testGet404()
     {

diff --git a/UPGRADE-2.0.md b/UPGRADE-2.0.md
@@ -0,0 +1,32 @@
+UPGRADE FROM 1.x to 2.0
+=======================
+
+### Exceptions namespaces
+
+All exceptions of this bundle was moved to `Debril\RssAtomBundle\Exception` namespace.
+
+Feed exceptions are now on `Debril\RssAtomBundle\Exception\FeedException` namespace.
+
+Before:
+
+```php
+use Debril\RssAtomBundle\Driver\DriverUnreachableResourceException;
+use Debril\RssAtomBundle\Protocol\Parser\ParserException;
+use Debril\RssAtomBundle\Exception\FeedCannotBeReadException;
+use Debril\RssAtomBundle\Exception\FeedNotFoundException;
+use Debril\RssAtomBundle\Exception\FeedNotModifiedException;
+use Debril\RssAtomBundle\Exception\FeedServerErrorException;
+use Debril\RssAtomBundle\Exception\FeedForbiddenException;
+```
+
+After:
+
+```php
+use Debril\RssAtomBundle\Exception\DriverUnreachableResourceException;
+use Debril\RssAtomBundle\Exception\ParserException;
+use Debril\RssAtomBundle\Exception\FeedException\FeedCannotBeReadException;
+use Debril\RssAtomBundle\Exception\FeedException\FeedNotFoundException;
+use Debril\RssAtomBundle\Exception\FeedException\FeedNotModifiedException;
+use Debril\RssAtomBundle\Exception\FeedException\FeedServerErrorException;
+use Debril\RssAtomBundle\Exception\FeedException\FeedForbiddenException;
+```