Skip to content

Optimized namespaces #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 30, 2025
Merged

Optimized namespaces #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ namespace App\Feeds;

use App\Feeds\Items\UserFeedItem;
use App\Models\User;
use DragonCode\LaravelFeed\Feed;
use DragonCode\LaravelFeed\FeedItem;
use DragonCode\LaravelFeed\Feeds\Feed;
use DragonCode\LaravelFeed\Feeds\Items\FeedItem;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;

Expand All @@ -124,7 +124,7 @@ For example, we use this content for the Feed Item class:
```php
namespace App\Feeds\Items;

use DragonCode\LaravelFeed\FeedItem;
use DragonCode\LaravelFeed\Feeds\Items\FeedItem;

/** @property-read \App\Models\User $model */
class UserFeedItem extends FeedItem
Expand Down
6 changes: 3 additions & 3 deletions src/Feed.php → src/Feeds/Feed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

declare(strict_types=1);

namespace DragonCode\LaravelFeed;
namespace DragonCode\LaravelFeed\Feeds;

use DragonCode\LaravelFeed\Items\ModelFeedItem;
use DragonCode\LaravelFeed\Feeds\Items\FeedItem;
use Illuminate\Contracts\Filesystem\Filesystem;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
Expand All @@ -23,7 +23,7 @@ abstract public function builder(): Builder;

public function item(Model $model): FeedItem
{
return new ModelFeedItem($model);
return new FeedItem($model);
}

public function chunkSize(): int
Expand Down
4 changes: 2 additions & 2 deletions src/FeedItem.php → src/Feeds/Items/FeedItem.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

declare(strict_types=1);

namespace DragonCode\LaravelFeed;
namespace DragonCode\LaravelFeed\Feeds\Items;

use Illuminate\Contracts\Support\Arrayable;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Str;

use function class_basename;

abstract class FeedItem implements Arrayable
class FeedItem implements Arrayable
{
protected ?string $name = null;

Expand Down
9 changes: 0 additions & 9 deletions src/Items/ModelFeedItem.php
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/Services/ConvertToXml.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

use DOMDocument;
use DOMElement;
use DragonCode\LaravelFeed\FeedItem;
use DragonCode\LaravelFeed\Feeds\Items\FeedItem;
use Illuminate\Container\Attributes\Config;

use function htmlspecialchars;
Expand Down
2 changes: 1 addition & 1 deletion src/Services/Generator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace DragonCode\LaravelFeed\Services;

use DragonCode\LaravelFeed\Feed;
use DragonCode\LaravelFeed\Feeds\Feed;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Filesystem\Filesystem;

Expand Down
4 changes: 2 additions & 2 deletions stubs/feed.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ declare(strict_types=1);

namespace DummyNamespace;

use DragonCode\LaravelFeed\Feed;
use DragonCode\LaravelFeed\FeedItem;
use DragonCode\LaravelFeed\Feeds\Feed;
use DragonCode\LaravelFeed\Feeds\Items\FeedItem;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use NamespacedDummyUserModel;
Expand Down
2 changes: 1 addition & 1 deletion stubs/feed_item.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ declare(strict_types=1);

namespace DummyNamespace;

use DragonCode\LaravelFeed\FeedItem;
use DragonCode\LaravelFeed\Feeds\Items\FeedItem;

/** @property-read NamespacedDummyUserModel $model */
class DummyClass extends FeedItem
Expand Down
2 changes: 1 addition & 1 deletion tests/.pest/snapshots/Unit/Console/MakeItemTest/make_feed_item.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ declare(strict_types=1);

namespace App\Feeds\Items;

use DragonCode\LaravelFeed\FeedItem;
use DragonCode\LaravelFeed\Feeds\Items\FeedItem;

/** @property-read Illuminate\Foundation\Auth\User $model */
class FooBarFeedItem extends FeedItem
Expand Down
4 changes: 2 additions & 2 deletions tests/.pest/snapshots/Unit/Console/MakeTest/make_feed.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ declare(strict_types=1);

namespace App\Feeds;

use DragonCode\LaravelFeed\Feed;
use DragonCode\LaravelFeed\FeedItem;
use DragonCode\LaravelFeed\Feeds\Feed;
use DragonCode\LaravelFeed\Feeds\Items\FeedItem;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Foundation\Auth\User;
Expand Down
4 changes: 2 additions & 2 deletions tests/.pest/snapshots/Unit/Console/MakeTest/make_with_item.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ declare(strict_types=1);

namespace App\Feeds;

use DragonCode\LaravelFeed\Feed;
use DragonCode\LaravelFeed\FeedItem;
use DragonCode\LaravelFeed\Feeds\Feed;
use DragonCode\LaravelFeed\Feeds\Items\FeedItem;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Foundation\Auth\User;
Expand Down
2 changes: 1 addition & 1 deletion tests/.pest/snapshots/Unit/Console/MakeTest/make_with_item__2.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ declare(strict_types=1);

namespace App\Feeds\Items;

use DragonCode\LaravelFeed\FeedItem;
use DragonCode\LaravelFeed\Feeds\Items\FeedItem;

/** @property-read Illuminate\Foundation\Auth\User $model */
class QweRtyFeedItem extends FeedItem
Expand Down
2 changes: 1 addition & 1 deletion workbench/app/Feeds/EmptyFeed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Workbench\App\Feeds;

use DragonCode\LaravelFeed\Feed;
use DragonCode\LaravelFeed\Feeds\Feed;
use Illuminate\Database\Eloquent\Builder;
use Workbench\App\Models\News;

Expand Down
4 changes: 2 additions & 2 deletions workbench/app/Feeds/FilledFeed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

namespace Workbench\App\Feeds;

use DragonCode\LaravelFeed\Feed;
use DragonCode\LaravelFeed\FeedItem;
use DragonCode\LaravelFeed\Feeds\Feed;
use DragonCode\LaravelFeed\Feeds\Items\FeedItem;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Workbench\App\Feeds\Items\NewsFeedItem;
Expand Down
2 changes: 1 addition & 1 deletion workbench/app/Feeds/Items/NewsFeedItem.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Workbench\App\Feeds\Items;

use DragonCode\LaravelFeed\FeedItem;
use DragonCode\LaravelFeed\Feeds\Items\FeedItem;

/** @property-read \Workbench\App\Models\News $model */
class NewsFeedItem extends FeedItem
Expand Down