Moved collections to separate namespace

Closes #3

src/Entity/Articles.php → src/Collection/Articles.php

@@ -1,6 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace PeeHaa\FeedMe\Entity;
+namespace PeeHaa\FeedMe\Collection;
+
+use PeeHaa\FeedMe\Entity\Article;
 
 final class Articles implements \Iterator, \Countable
 {

src/Entity/Categories.php → src/Collection/Categories.php

@@ -1,6 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace PeeHaa\FeedMe\Entity;
+namespace PeeHaa\FeedMe\Collection;
+
+use PeeHaa\FeedMe\Entity\Category;
 
 class Categories
 {

src/Entity/Feeds.php → src/Collection/Feeds.php

@@ -1,6 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace PeeHaa\FeedMe\Entity;
+namespace PeeHaa\FeedMe\Collection;
+
+use PeeHaa\FeedMe\Entity\Feed;
 
 final class Feeds implements \Iterator, \Countable
 {

src/Entity/Subscriptions.php → src/Collection/Subscriptions.php

@@ -1,6 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace PeeHaa\FeedMe\Entity;
+namespace PeeHaa\FeedMe\Collection;
+
+use PeeHaa\FeedMe\Entity\Subscription;
 
 final class Subscriptions implements \Iterator
 {

src/Entity/UserArticles.php → src/Collection/UserArticles.php

@@ -1,6 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace PeeHaa\FeedMe\Entity;
+namespace PeeHaa\FeedMe\Collection;
+
+use PeeHaa\FeedMe\Entity\UserArticle;
 
 final class UserArticles implements \Iterator, \Countable
 {

src/Controller/GetArticles.php

@@ -3,7 +3,7 @@
 namespace PeeHaa\FeedMe\Controller;
 
 use Amp\Promise;
-use PeeHaa\FeedMe\Entity\UserArticles;
+use PeeHaa\FeedMe\Collection\UserArticles;
 use PeeHaa\FeedMe\Request\GetArticles as ArticlesRequest;
 use PeeHaa\FeedMe\Request\Request;
 use PeeHaa\FeedMe\Response\Response;

src/Controller/GetCategories.php

@@ -3,7 +3,7 @@
 namespace PeeHaa\FeedMe\Controller;
 
 use Amp\Promise;
-use PeeHaa\FeedMe\Entity\Categories;
+use PeeHaa\FeedMe\Collection\Categories;
 use PeeHaa\FeedMe\Request\GetCategories as GetCategoriesRequest;
 use PeeHaa\FeedMe\Request\Request;
 use PeeHaa\FeedMe\Response\Response;

src/Controller/SubscribeToAll.php

@@ -3,7 +3,7 @@
 namespace PeeHaa\FeedMe\Controller;
 
 use Amp\Promise;
-use PeeHaa\FeedMe\Entity\Subscriptions;
+use PeeHaa\FeedMe\Collection\Subscriptions;
 use PeeHaa\FeedMe\Http\WebSocket\Subscription;
 use PeeHaa\FeedMe\Http\WebSocket\Subscriptions as PubSubSubscriptions;
 use PeeHaa\FeedMe\Request\GetArticles as ArticlesRequest;

src/Queue/Worker.php

@@ -4,7 +4,7 @@
 
 use Amp\Promise;
 use Auryn\Injector;
-use PeeHaa\FeedMe\Entity\Articles;
+use PeeHaa\FeedMe\Collection\Articles;
 use PeeHaa\FeedMe\Entity\Feed;
 use PeeHaa\FeedMe\Event\NewArticleManager;
 use PeeHaa\FeedMe\Storage\Article\Repository as ArticleRepository;

src/Response/Articles.php

@@ -2,7 +2,7 @@
 
 namespace PeeHaa\FeedMe\Response;
 
-use PeeHaa\FeedMe\Entity\Articles as ArticleCollection;
+use PeeHaa\FeedMe\Collection\Articles as ArticleCollection;
 
 final class Articles implements Response
 {

src/Response/UserArticles.php

@@ -2,7 +2,7 @@
 
 namespace PeeHaa\FeedMe\Response;
 
-use PeeHaa\FeedMe\Entity\UserArticles as ArticleCollection;
+use PeeHaa\FeedMe\Collection\UserArticles as ArticleCollection;
 
 final class UserArticles implements Response
 {

src/Response/UserCategories.php

@@ -2,7 +2,7 @@
 
 namespace PeeHaa\FeedMe\Response;
 
-use PeeHaa\FeedMe\Entity\Categories;
+use PeeHaa\FeedMe\Collection\Categories;
 
 final class UserCategories implements Response
 {

src/Service/Crawler/Crawler.php

@@ -3,7 +3,7 @@
 namespace PeeHaa\FeedMe\Service\Crawler;
 
 use Amp\Promise;
-use PeeHaa\FeedMe\Entity\Articles;
+use PeeHaa\FeedMe\Collection\Articles;
 
 interface Crawler
 {

src/Service/Crawler/Programming/Php/Bugs.php

@@ -5,7 +5,7 @@
 use Amp\Artax\Client;
 use Amp\Artax\Response;
 use Amp\Promise;
-use PeeHaa\FeedMe\Entity\Articles;
+use PeeHaa\FeedMe\Collection\Articles;
 use PeeHaa\FeedMe\Service\Crawler\Crawler;
 use PeeHaa\FeedMe\Service\Parser\Programming\Php\Bugs as Parser;
 use function Amp\call;

src/Service/Crawler/Programming/Php/DocumentationBugs.php

@@ -5,7 +5,7 @@
 use Amp\Artax\Client;
 use Amp\Http\Server\Response;
 use Amp\Promise;
-use PeeHaa\FeedMe\Entity\Articles;
+use PeeHaa\FeedMe\Collection\Articles;
 use PeeHaa\FeedMe\Service\Crawler\Crawler;
 use PeeHaa\FeedMe\Service\Parser\Programming\Php\Bugs as Parser;
 use function Amp\call;

src/Service/Crawler/Programming/Php/Reddit.php

@@ -5,7 +5,7 @@
 use Amp\Artax\Client;
 use Amp\Artax\Response;
 use Amp\Promise;
-use PeeHaa\FeedMe\Entity\Articles;
+use PeeHaa\FeedMe\Collection\Articles;
 use PeeHaa\FeedMe\Service\Crawler\Crawler;
 use PeeHaa\FeedMe\Service\Parser\Programming\Php\Reddit as Parser;
 use function Amp\call;

src/Service/Crawler/Programming/Php/Releases.php

@@ -5,7 +5,7 @@
 use Amp\Artax\Client;
 use Amp\Artax\Response;
 use Amp\Promise;
-use PeeHaa\FeedMe\Entity\Articles;
+use PeeHaa\FeedMe\Collection\Articles;
 use PeeHaa\FeedMe\Service\Crawler\Crawler;
 use PeeHaa\FeedMe\Service\Parser\Programming\Php\Releases as Parser;
 use function Amp\call;

src/Service/Parser/Parser.php

@@ -2,7 +2,7 @@
 
 namespace PeeHaa\FeedMe\Service\Parser;
 
-use PeeHaa\FeedMe\Entity\Articles;
+use PeeHaa\FeedMe\Collection\Articles;
 
 interface Parser
 {

src/Service/Parser/Programming/Php/Bugs.php

@@ -2,8 +2,8 @@
 
 namespace PeeHaa\FeedMe\Service\Parser\Programming\Php;
 
+use PeeHaa\FeedMe\Collection\Articles;
 use PeeHaa\FeedMe\Entity\Article;
-use PeeHaa\FeedMe\Entity\Articles;
 use PeeHaa\FeedMe\Exception\Feed\MissingNode;
 use PeeHaa\FeedMe\Service\Parser\Parser;
 use function PeeHaa\FeedMe\generateUuid;

src/Service/Parser/Programming/Php/Reddit.php

@@ -2,8 +2,8 @@
 
 namespace PeeHaa\FeedMe\Service\Parser\Programming\Php;
 
+use PeeHaa\FeedMe\Collection\Articles;
 use PeeHaa\FeedMe\Entity\Article;
-use PeeHaa\FeedMe\Entity\Articles;
 use PeeHaa\FeedMe\Exception\Feed\MissingNode;
 use PeeHaa\FeedMe\Service\Parser\Parser;
 use function PeeHaa\FeedMe\generateUuid;

src/Service/Parser/Programming/Php/Releases.php

@@ -2,8 +2,8 @@
 
 namespace PeeHaa\FeedMe\Service\Parser\Programming\Php;
 
+use PeeHaa\FeedMe\Collection\Articles;
 use PeeHaa\FeedMe\Entity\Article;
-use PeeHaa\FeedMe\Entity\Articles;
 use PeeHaa\FeedMe\Exception\Feed\MissingNode;
 use PeeHaa\FeedMe\Service\Parser\Parser;
 use function PeeHaa\FeedMe\generateUuid;

src/Storage/Article/PostgresqlRepository.php

@@ -6,11 +6,11 @@
 use Amp\Postgres\ResultSet;
 use Amp\Promise;
 use Amp\Sql\Statement;
+use PeeHaa\FeedMe\Collection\Articles;
+use PeeHaa\FeedMe\Collection\UserArticles;
 use PeeHaa\FeedMe\Entity\Article;
-use PeeHaa\FeedMe\Entity\Articles;
 use PeeHaa\FeedMe\Entity\User;
 use PeeHaa\FeedMe\Entity\UserArticle;
-use PeeHaa\FeedMe\Entity\UserArticles;
 use function Amp\call;
 use function PeeHaa\FeedMe\generateUuid;
 

src/Storage/Article/Repository.php

@@ -3,10 +3,10 @@
 namespace PeeHaa\FeedMe\Storage\Article;
 
 use Amp\Promise;
+use PeeHaa\FeedMe\Collection\Articles;
+use PeeHaa\FeedMe\Collection\UserArticles;
 use PeeHaa\FeedMe\Entity\Article;
-use PeeHaa\FeedMe\Entity\Articles;
 use PeeHaa\FeedMe\Entity\User;
-use PeeHaa\FeedMe\Entity\UserArticles;
 
 interface Repository
 {

src/Storage/Feed/PostgresqlRepository.php

@@ -5,8 +5,8 @@
 use Amp\Postgres\Link;
 use Amp\Postgres\ResultSet;
 use Amp\Promise;
+use PeeHaa\FeedMe\Collection\Feeds;
 use PeeHaa\FeedMe\Entity\Feed;
-use PeeHaa\FeedMe\Entity\Feeds;
 use function Amp\call;
 
 final class PostgresqlRepository implements Repository

src/Storage/Feed/Repository.php

@@ -3,7 +3,7 @@
 namespace PeeHaa\FeedMe\Storage\Feed;
 
 use Amp\Promise;
-use PeeHaa\FeedMe\Entity\Feeds;
+use PeeHaa\FeedMe\Collection\Feeds;
 
 interface Repository
 {

src/Storage/Subscription/PostgresqlRepository.php

@@ -6,8 +6,8 @@
 use Amp\Postgres\ResultSet;
 use Amp\Promise;
 use Amp\Sql\Statement;
+use PeeHaa\FeedMe\Collection\Subscriptions;
 use PeeHaa\FeedMe\Entity\Subscription;
-use PeeHaa\FeedMe\Entity\Subscriptions;
 use PeeHaa\FeedMe\Entity\User;
 use function Amp\call;
 

src/Storage/Subscription/Repository.php

@@ -3,7 +3,7 @@
 namespace PeeHaa\FeedMe\Storage\Subscription;
 
 use Amp\Promise;
-use PeeHaa\FeedMe\Entity\Categories;
+use PeeHaa\FeedMe\Collection\Categories;
 use PeeHaa\FeedMe\Entity\User;
 
 interface Repository

src/Storage/UserCategory/PostgresqlRepository.php

@@ -6,7 +6,7 @@
 use Amp\Postgres\ResultSet;
 use Amp\Promise;
 use Amp\Sql\Statement;
-use PeeHaa\FeedMe\Entity\Categories;
+use PeeHaa\FeedMe\Collection\Categories;
 use PeeHaa\FeedMe\Entity\Category;
 use PeeHaa\FeedMe\Entity\User;
 use function Amp\call;

src/Storage/UserCategory/Repository.php

@@ -3,7 +3,7 @@
 namespace PeeHaa\FeedMe\Storage\UserCategory;
 
 use Amp\Promise;
-use PeeHaa\FeedMe\Entity\Categories;
+use PeeHaa\FeedMe\Collection\Categories;
 use PeeHaa\FeedMe\Entity\User;
 
 interface Repository

tests/Unit/Entity/ArticlesTest.php → tests/Unit/Collection/ArticlesTest.php

@@ -1,9 +1,9 @@
 <?php declare(strict_types=1);
 
-namespace PeeHaa\FeedMeTest\Unit\Entity;
+namespace PeeHaa\FeedMeTest\Unit\Collection;
 
+use PeeHaa\FeedMe\Collection\Articles;
 use PeeHaa\FeedMe\Entity\Article;
-use PeeHaa\FeedMe\Entity\Articles;
 use PHPUnit\Framework\TestCase;
 
 class ArticlesTest extends TestCase

tests/Unit/Entity/CategoriesTest.php → tests/Unit/Collection/CategoriesTest.php

@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace PeeHaa\FeedMeTest\Unit\Entity;
+namespace PeeHaa\FeedMeTest\Unit\Collection;
 
-use PeeHaa\FeedMe\Entity\Categories;
+use PeeHaa\FeedMe\Collection\Categories;
 use PeeHaa\FeedMe\Entity\Category;
 use PHPUnit\Framework\TestCase;
 

tests/Unit/Entity/FeedsTest.php → tests/Unit/Collection/FeedsTest.php

@@ -1,9 +1,9 @@
 <?php declare(strict_types=1);
 
-namespace PeeHaa\FeedMeTest\Unit\Entity;
+namespace PeeHaa\FeedMeTest\Unit\Collection;
 
+use PeeHaa\FeedMe\Collection\Feeds;
 use PeeHaa\FeedMe\Entity\Feed;
-use PeeHaa\FeedMe\Entity\Feeds;
 use PHPUnit\Framework\TestCase;
 
 class FeedsTest extends TestCase

tests/Unit/Entity/SubscriptionsTest.php → tests/Unit/Collection/SubscriptionsTest.php

@@ -1,9 +1,9 @@
 <?php declare(strict_types=1);
 
-namespace PeeHaa\FeedMeTest\Unit\Entity;
+namespace PeeHaa\FeedMeTest\Unit\Collection;
 
+use PeeHaa\FeedMe\Collection\Subscriptions;
 use PeeHaa\FeedMe\Entity\Subscription;
-use PeeHaa\FeedMe\Entity\Subscriptions;
 use PHPUnit\Framework\TestCase;
 
 class SubscriptionsTest extends TestCase

tests/Unit/Entity/UserArticlesTest.php → tests/Unit/Collection/UserArticlesTest.php

@@ -1,10 +1,10 @@
 <?php declare(strict_types=1);
 
-namespace PeeHaa\FeedMeTest\Unit\Entity;
+namespace PeeHaa\FeedMeTest\Unit\Collection;
 
+use PeeHaa\FeedMe\Collection\UserArticles;
 use PeeHaa\FeedMe\Entity\Article;
 use PeeHaa\FeedMe\Entity\UserArticle;
-use PeeHaa\FeedMe\Entity\UserArticles;
 use PHPUnit\Framework\TestCase;
 
 class UserArticlesTest extends TestCase

tests/Unit/Controller/GetArticlesTest.php

@@ -3,9 +3,9 @@
 namespace PeeHaa\FeedMeTest\Unit\Controller;
 
 use Amp\Success;
+use PeeHaa\FeedMe\Collection\UserArticles;
 use PeeHaa\FeedMe\Controller\GetArticles;
 use PeeHaa\FeedMe\Entity\User;
-use PeeHaa\FeedMe\Entity\UserArticles;
 use PeeHaa\FeedMe\Http\WebSocket\Client;
 use PeeHaa\FeedMe\Request\GetArticles as Request;
 use PeeHaa\FeedMe\Response\UserArticles as Response;

tests/Unit/Controller/GetCategoriesTest.php

@@ -3,8 +3,8 @@
 namespace PeeHaa\FeedMeTest\Unit\Controller;
 
 use Amp\Success;
+use PeeHaa\FeedMe\Collection\Categories;
 use PeeHaa\FeedMe\Controller\GetCategories;
-use PeeHaa\FeedMe\Entity\Categories;
 use PeeHaa\FeedMe\Entity\User;
 use PeeHaa\FeedMe\Http\WebSocket\Client;
 use PeeHaa\FeedMe\Request\GetCategories as Request;

tests/Unit/Controller/SubscribeToAllTest.php

@@ -3,9 +3,9 @@
 namespace PeeHaa\FeedMeTest\Unit\Controller;
 
 use Amp\Success;
+use PeeHaa\FeedMe\Collection\Subscriptions;
 use PeeHaa\FeedMe\Controller\SubscribeToAll;
 use PeeHaa\FeedMe\Entity\Subscription;
-use PeeHaa\FeedMe\Entity\Subscriptions;
 use PeeHaa\FeedMe\Entity\User;
 use PeeHaa\FeedMe\Http\WebSocket\Client;
 use PeeHaa\FeedMe\Http\WebSocket\Subscriptions as PubSubSubscriptions;

tests/Unit/Queue/ManagerTest.php

@@ -5,8 +5,8 @@
 use Amp\Loop;
 use Amp\Success;
 use Auryn\Injector;
+use PeeHaa\FeedMe\Collection\Feeds;
 use PeeHaa\FeedMe\Entity\Feed;
-use PeeHaa\FeedMe\Entity\Feeds;
 use PeeHaa\FeedMe\Queue\Manager;
 use PeeHaa\FeedMe\Storage\CrawlerQueue\Repository as CrawlerQueueRepository;
 use PeeHaa\FeedMe\Storage\Feed\Repository as FeedRepository;

tests/Unit/Queue/WorkerTest.php

@@ -4,8 +4,8 @@
 
 use Amp\Success;
 use Auryn\Injector;
+use PeeHaa\FeedMe\Collection\Articles;
 use PeeHaa\FeedMe\Entity\Article;
-use PeeHaa\FeedMe\Entity\Articles;
 use PeeHaa\FeedMe\Entity\Feed;
 use PeeHaa\FeedMe\Event\NewArticleManager;
 use PeeHaa\FeedMe\Queue\Worker;