diff --git a/README.md b/README.md index 49185e6..9041093 100644 --- a/README.md +++ b/README.md @@ -7,12 +7,22 @@ ## Install +1. Add package to your `composer.json` + ```bash composer require hasanalyazidi/laravel-sendables ``` +2. Migrate package tables or publish migrations first then migrate + +```bash +php artisan migrate +``` + --- +## Publish package files + ### Publish config file (Required) ```bash diff --git a/composer.json b/composer.json index 34612be..ab3114d 100644 --- a/composer.json +++ b/composer.json @@ -16,17 +16,17 @@ "email": "hassanx220@gmail.com" } ], - "minimum-stability": "dev", + "minimum-stability": "stable", "prefer-stable":true, "require": { - "php": ">=7.1", + "php": ">=7.1|^8.0", "guzzlehttp/guzzle": "^7.3", - "illuminate/contracts": "^6|^7|^8|^9", - "illuminate/support": "^6|^7|^8|^9" + "illuminate/contracts": "^6|^7|^8|^9|^10", + "illuminate/support": "^6|^7|^8|^9|^10" }, "require-dev": { - "laravel/framework": "^6|^7|^8", - "phpunit/phpunit": "^6|^7|^8|^9", + "laravel/framework": "^6|^7|^8|^9|^10", + "phpunit/phpunit": "^6|^7|^8|^9|^10", "orchestra/testbench": "^6.0" }, "autoload": { diff --git a/resources/lang/ar/otp.php b/lang/ar/otp.php similarity index 100% rename from resources/lang/ar/otp.php rename to lang/ar/otp.php diff --git a/resources/lang/en/otp.php b/lang/en/otp.php similarity index 100% rename from resources/lang/en/otp.php rename to lang/en/otp.php diff --git a/src/Providers/SendablesServiceProvider.php b/src/Providers/SendablesServiceProvider.php index a104fc6..77406c5 100644 --- a/src/Providers/SendablesServiceProvider.php +++ b/src/Providers/SendablesServiceProvider.php @@ -3,6 +3,7 @@ namespace HasanAlyazidi\Sendables\Providers; use HasanAlyazidi\Sendables\SendablesFacade; +use Illuminate\Support\Facades\File; use Illuminate\Support\ServiceProvider; class SendablesServiceProvider extends ServiceProvider @@ -18,7 +19,7 @@ public function boot() $this->loadMigrationsFrom(__DIR__.'/../../database/migrations'); - $this->loadTranslationsFrom(__DIR__.'/../../resources/lang', 'sendables'); + $this->loadTranslationsFrom(__DIR__.'/../../lang', 'sendables'); $this->publishAll(); } @@ -58,16 +59,22 @@ public function publishAll() private function publishTranslations() { + $isLangFolderInResources = File::isDirectory(resource_path('lang')); + + $langBasePath = $isLangFolderInResources + ? resource_path() + : base_path(); + $this->publishes([ - __DIR__.'/../../resources/lang/' => resource_path('lang/vendor/sendables') + __DIR__.'/../../lang/' => $langBasePath.'/lang/vendor/sendables' ], 'resources-lang-all'); $this->publishes([ - __DIR__.'/../../resources/lang/ar/' => resource_path('lang/vendor/sendables/ar') + __DIR__.'/../../lang/ar/' => $langBasePath.'/lang/vendor/sendables/ar' ], 'resources-lang-ar'); $this->publishes([ - __DIR__.'/../../resources/lang/en/' => resource_path('lang/vendor/sendables/en') + __DIR__.'/../../lang/en/' => $langBasePath.'/lang/vendor/sendables/en' ], 'resources-lang-en'); } }