From 2ee6935b5e5c9afc97565cb4781190122d6235f2 Mon Sep 17 00:00:00 2001
From: antoine <antoine.guingand@wanadoo.fr>
Date: Wed, 17 Jan 2024 15:04:10 +0100
Subject: [PATCH] Change namespace to ContentRenderer + remove
spatie/laravel-package-tools
---
composer.json | 12 ++++------
config/content-renderer.php | 2 +-
src/ContentRendererServiceProvider.php | 24 +++++++------------
src/Facades/LaravelContentRenderer.php | 16 -------------
.../ComponentAttributeBagCollection.php | 2 +-
src/Support/ComponentFragment.php | 2 +-
src/Support/Fragment.php | 2 +-
src/Support/FragmentsFactory.php | 2 +-
src/Support/HTMLFragment.php | 2 +-
src/View/Components/Attributes.php | 2 +-
src/View/Components/Content.php | 4 ++--
src/View/Components/RenderComponent.php | 4 ++--
src/View/Components/RenderContent.php | 6 ++---
tests/Pest.php | 2 +-
tests/TestCase.php | 4 ++--
15 files changed, 30 insertions(+), 56 deletions(-)
delete mode 100644 src/Facades/LaravelContentRenderer.php
diff --git a/composer.json b/composer.json
index 30390dc..747d0db 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,6 @@
],
"require": {
"php": "^8.1",
- "spatie/laravel-package-tools": "^1.14.0",
"illuminate/contracts": "^10.0"
},
"require-dev": {
@@ -31,12 +30,12 @@
},
"autoload": {
"psr-4": {
- "Code16\\LaravelContentRenderer\\": "src/"
+ "Code16\\ContentRenderer\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
- "Code16\\LaravelContentRenderer\\Tests\\": "tests/",
+ "Code16\\ContentRenderer\\Tests\\": "tests/",
"Workbench\\App\\": "workbench/app/"
}
},
@@ -68,11 +67,8 @@
"extra": {
"laravel": {
"providers": [
- "Code16\\LaravelContentRenderer\\ContentRendererServiceProvider"
- ],
- "aliases": {
- "LaravelContentRenderer": "Code16\\LaravelContentRenderer\\Facades\\LaravelContentRenderer"
- }
+ "Code16\\ContentRenderer\\ContentRendererServiceProvider"
+ ]
}
},
"minimum-stability": "dev",
diff --git a/config/content-renderer.php b/config/content-renderer.php
index e72d1a3..51ce861 100644
--- a/config/content-renderer.php
+++ b/config/content-renderer.php
@@ -1,6 +1,6 @@
<?php
-// config for Code16/LaravelContentRenderer
+// config for Code16/ContentRenderer
return [
];
diff --git a/src/ContentRendererServiceProvider.php b/src/ContentRendererServiceProvider.php
index c4874ef..02ad337 100644
--- a/src/ContentRendererServiceProvider.php
+++ b/src/ContentRendererServiceProvider.php
@@ -1,25 +1,19 @@
<?php
-namespace Code16\LaravelContentRenderer;
+namespace Code16\ContentRenderer;
use Illuminate\Support\Facades\Blade;
-use Spatie\LaravelPackageTools\Package;
-use Spatie\LaravelPackageTools\PackageServiceProvider;
+use Illuminate\Support\ServiceProvider;
-class ContentRendererServiceProvider extends PackageServiceProvider
+class ContentRendererServiceProvider extends ServiceProvider
{
- public function configurePackage(Package $package): void
+ public function register()
{
- /*
- * This class is a Package Service Provider
- *
- * More info: https://github.com/spatie/laravel-package-tools
- */
- $package
- ->name('laravel-content-renderer')
- ->hasConfigFile()
- ->hasViews('content');
+ }
- Blade::componentNamespace('Code16\\LaravelContentRenderer\\View\\Components', 'content');
+ public function boot()
+ {
+ $this->loadViewsFrom(__DIR__.'/../resources/views', 'content');
+ Blade::componentNamespace('Code16\\ContentRenderer\\View\\Components', 'content');
}
}
diff --git a/src/Facades/LaravelContentRenderer.php b/src/Facades/LaravelContentRenderer.php
deleted file mode 100644
index 8ad780e..0000000
--- a/src/Facades/LaravelContentRenderer.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace Code16\LaravelContentRenderer\Facades;
-
-use Illuminate\Support\Facades\Facade;
-
-/**
- * @see \Code16\LaravelContentRenderer\LaravelContentRenderer
- */
-class LaravelContentRenderer extends Facade
-{
- protected static function getFacadeAccessor()
- {
- return \Code16\LaravelContentRenderer\LaravelContentRenderer::class;
- }
-}
diff --git a/src/Support/ComponentAttributeBagCollection.php b/src/Support/ComponentAttributeBagCollection.php
index d845d6d..d91a641 100644
--- a/src/Support/ComponentAttributeBagCollection.php
+++ b/src/Support/ComponentAttributeBagCollection.php
@@ -1,6 +1,6 @@
<?php
-namespace Code16\LaravelContentRenderer\Support;
+namespace Code16\ContentRenderer\Support;
use Illuminate\Support\Collection;
use Illuminate\View\ComponentAttributeBag;
diff --git a/src/Support/ComponentFragment.php b/src/Support/ComponentFragment.php
index 16f7c4a..1091420 100644
--- a/src/Support/ComponentFragment.php
+++ b/src/Support/ComponentFragment.php
@@ -1,6 +1,6 @@
<?php
-namespace Code16\LaravelContentRenderer\Support;
+namespace Code16\ContentRenderer\Support;
use Illuminate\Support\Str;
diff --git a/src/Support/Fragment.php b/src/Support/Fragment.php
index 3fafbd7..c31f84b 100644
--- a/src/Support/Fragment.php
+++ b/src/Support/Fragment.php
@@ -1,6 +1,6 @@
<?php
-namespace Code16\LaravelContentRenderer\Support;
+namespace Code16\ContentRenderer\Support;
abstract class Fragment
{
diff --git a/src/Support/FragmentsFactory.php b/src/Support/FragmentsFactory.php
index 36c714a..57ea764 100644
--- a/src/Support/FragmentsFactory.php
+++ b/src/Support/FragmentsFactory.php
@@ -1,6 +1,6 @@
<?php
-namespace Code16\LaravelContentRenderer\Support;
+namespace Code16\ContentRenderer\Support;
use Illuminate\Support\Collection;
use Illuminate\Support\Str;
diff --git a/src/Support/HTMLFragment.php b/src/Support/HTMLFragment.php
index c5542ed..2c541ff 100644
--- a/src/Support/HTMLFragment.php
+++ b/src/Support/HTMLFragment.php
@@ -1,6 +1,6 @@
<?php
-namespace Code16\LaravelContentRenderer\Support;
+namespace Code16\ContentRenderer\Support;
class HTMLFragment extends Fragment
{
diff --git a/src/View/Components/Attributes.php b/src/View/Components/Attributes.php
index d4ff27b..97bebef 100644
--- a/src/View/Components/Attributes.php
+++ b/src/View/Components/Attributes.php
@@ -1,6 +1,6 @@
<?php
-namespace Code16\LaravelContentRenderer\View\Components;
+namespace Code16\ContentRenderer\View\Components;
use Illuminate\View\Component;
use Illuminate\View\ComponentAttributeBag;
diff --git a/src/View/Components/Content.php b/src/View/Components/Content.php
index 6d17c9e..f2c148f 100644
--- a/src/View/Components/Content.php
+++ b/src/View/Components/Content.php
@@ -1,9 +1,9 @@
<?php
-namespace Code16\LaravelContentRenderer\View\Components;
+namespace Code16\ContentRenderer\View\Components;
-use Code16\LaravelContentRenderer\Support\ComponentAttributeBagCollection;
+use Code16\ContentRenderer\Support\ComponentAttributeBagCollection;
use Illuminate\View\Component;
abstract class Content extends Component
diff --git a/src/View/Components/RenderComponent.php b/src/View/Components/RenderComponent.php
index 81a61a2..e494ba1 100644
--- a/src/View/Components/RenderComponent.php
+++ b/src/View/Components/RenderComponent.php
@@ -1,8 +1,8 @@
<?php
-namespace Code16\LaravelContentRenderer\View\Components;
+namespace Code16\ContentRenderer\View\Components;
-use Code16\LaravelContentRenderer\Support\ComponentFragment;
+use Code16\ContentRenderer\Support\ComponentFragment;
use Illuminate\View\Component;
use Illuminate\View\ComponentAttributeBag;
use Illuminate\View\View;
diff --git a/src/View/Components/RenderContent.php b/src/View/Components/RenderContent.php
index 01d676f..685674b 100644
--- a/src/View/Components/RenderContent.php
+++ b/src/View/Components/RenderContent.php
@@ -1,9 +1,9 @@
<?php
-namespace Code16\LaravelContentRenderer\View\Components;
+namespace Code16\ContentRenderer\View\Components;
-use Code16\LaravelContentRenderer\Support\Fragment;
-use Code16\LaravelContentRenderer\Support\FragmentsFactory;
+use Code16\ContentRenderer\Support\Fragment;
+use Code16\ContentRenderer\Support\FragmentsFactory;
use Illuminate\Support\Collection;
use Illuminate\View\Component;
use Illuminate\View\View;
diff --git a/tests/Pest.php b/tests/Pest.php
index d3d90db..5550661 100644
--- a/tests/Pest.php
+++ b/tests/Pest.php
@@ -1,5 +1,5 @@
<?php
-use Code16\LaravelContentRenderer\Tests\TestCase;
+use Code16\ContentRenderer\Tests\TestCase;
uses(TestCase::class)->in(__DIR__);
diff --git a/tests/TestCase.php b/tests/TestCase.php
index e0ae861..875da19 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,10 +1,10 @@
<?php
-namespace Code16\LaravelContentRenderer\Tests;
+namespace Code16\ContentRenderer\Tests;
use Illuminate\Database\Eloquent\Factories\Factory;
use Orchestra\Testbench\TestCase as Orchestra;
-use Code16\LaravelContentRenderer\ContentRendererServiceProvider;
+use Code16\ContentRenderer\ContentRendererServiceProvider;
class TestCase extends Orchestra
{