fix: new naming

Author: vipblogger

README.md

@@ -1,11 +1,13 @@
+Bitrix24 PHP SDK (https://github.com/mesilov/bitrix24-php-sdk) for Laravel through Dependency Injection (Service Provider, Singleton).
+
 ### 1. Installation
 
-`composer require vipblogger/bitrix24-di`
+`composer require vipblogger/laravel-bitrix24`
 
 ### 2. Setup
 Publishing the config file and migrate
 
-`php artisan vendor:publish --provider="Vipblogger\Bitrix24DI\Bitrix24DIServiceProvider"`
+`php artisan vendor:publish --provider="Vipblogger\LaravelBitrix24\LaravelBitrix24ServiceProvider"`
 
 `php artisan migrate`
 
@@ -16,10 +18,10 @@ Register local application with redirect URI `/bitrix-redirect-uri`. Redirect UR
 .env example
 
 ```
-B24_APPLICATION_SCOPE=task,user
 B24_APPLICATION_ID=local.6007b39598c****.120****
 B24_APPLICATION_SECRET=oq33VjMcuperGAnB...
 B24_DOMAIN=example.bitrix24.ru
+B24_APPLICATION_SCOPE=task,user
 B24_REDIRECT_URI=/bitrix-redirect-uri
 ```
 
@@ -29,7 +31,7 @@ Go to route *your_project.com/**bitrix24di***
 ### 6. Usage
 
 ```php
-use Vipblogger\Bitrix24DI\Bitrix;
+use Vipblogger\LaravelBitrix24\Bitrix;
 
 Route::get('/list', function (Bitrix $bitrix) {
     $result = $bitrix->call('lists.get', [
@@ -39,4 +41,6 @@ Route::get('/list', function (Bitrix $bitrix) {
 
     var_dump($result);
 });
-```
+```
+
+More documentation: https://github.com/mesilov/bitrix24-php-sdk

composer.json

@@ -1,6 +1,6 @@
 {
-    "name": "vipblogger/bitrix24-di",
-    "description": "This is a wrapper for the Bitrix24 PHP SDK. Allows you to use Bitrix through Dependency Injections.",
+    "name": "vipblogger/laravel-bitrix24",
+    "description": "This is a wrapper for the Bitrix24 PHP SDK. Allows you to use Bitrix through Dependency Injection.",
     "type": "library",
     "version": "1.0.0",
     "require": {
@@ -17,13 +17,13 @@
     "extra": {
         "laravel": {
             "providers": [
-                "Vipblogger\\Bitrix24DI\\Bitrix24DIServiceProvider"
+                "Vipblogger\\LaravelBitrix24\\LaravelBitrix24ServiceProvider"
             ]
         }
     },
     "autoload": {
         "psr-4": {
-            "Vipblogger\\Bitrix24DI\\": "src"
+            "Vipblogger\\LaravelBitrix24\\": "src"
         }
     }
 }

composer.lock

@@ -1,16 +1,16 @@
 <?php
 
-use Vipblogger\Bitrix24DI\Bitrix;
+use Vipblogger\LaravelBitrix24\Bitrix;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Route;
 
-Route::name('bitrix24di.')->prefix('bitrix24di')->group(static function () {
+Route::name('laravel-bitrix24.')->prefix('laravel-bitrix24')->group(static function () {
 
     Route::get('/', function (Bitrix $bitrix) {
         if (settings('b24_refresh_token', null) === null) {
-            echo 'Авторизуйся по <a href="' . route('bitrix24di.login') . '" target="_blank">ссылке</a>
+            echo 'Авторизуйся по <a href="' . route('laravel-bitrix24.login') . '" target="_blank">ссылке</a>
                 и вставь ссылку сюда:
-                <form action="' . route('bitrix24di.save') . '" method="POST">
+                <form action="' . route('laravel-bitrix24.save') . '" method="POST">
                 <input type="text" name="link">
                 <button type="submit">Отправить</button>
                 ' . csrf_field() . '
@@ -23,15 +23,15 @@
                 echo 'Связь с Битрикс: НЕ УСТАНОВЛЕНА!';
             }
 
-            echo ' <a href="'.route('bitrix24di.logout').'">Выйти</a>';
+            echo ' <a href="'.route('laravel-bitrix24.logout').'">Выйти</a>';
         }
 
         return '';
     })->name('index');
 
     Route::get('/login', function (Bitrix $bitrix) {
         if (settings('b24_refresh_token') === null) {
-            return redirect('https://' . $bitrix->getDomain() . '/oauth/authorize/?redirect_uri='.url(config('bitrix24di.REDIRECT_URI')).'&client_id=' .
+            return redirect('https://' . $bitrix->getDomain() . '/oauth/authorize/?redirect_uri='.url(config('laravel-bitrix24.REDIRECT_URI')).'&client_id=' .
                 urlencode($bitrix->getApplicationId()));
         }
 
@@ -45,22 +45,22 @@
             'member_id' => null,
         ]);
 
-        return redirect()->route('bitrix24di.index');
+        return redirect()->route('laravel-bitrix24.index');
     })->name('logout');
 
     Route::post('/save', function (Request $request, Bitrix $bitrix) {
         parse_str(parse_url($request->input('link'))['query'], $params);
         $code = $params['code'];
 
         saveCode($bitrix, $code);
-        return redirect()->route('bitrix24di.index');
+        return redirect()->route('laravel-bitrix24.index');
     })->name('save');
 });
 
-Route::get(config('bitrix24di.REDIRECT_URI'), function (Request $request, Bitrix $bitrix) {
+Route::get(config('laravel-bitrix24.REDIRECT_URI'), function (Request $request, Bitrix $bitrix) {
     $code = $request->input('code');
     saveCode($bitrix, $code);
-    return redirect()->route('bitrix24di.index');
+    return redirect()->route('laravel-bitrix24.index');
 });
 
 function saveCode($bitrix, $code)

config/bitrix24di.php config/laravel-bitrix24.phpconfig/bitrix24di.php renamed to config/laravel-bitrix24.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Vipblogger\Bitrix24DI;
+namespace Vipblogger\LaravelBitrix24;
 
 
 use Bitrix24\Bitrix24;

routes/web.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Vipblogger\Bitrix24DI;
+namespace Vipblogger\LaravelBitrix24;
 
 use Bitrix24\Exceptions\Bitrix24TokenIsInvalidException;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\ServiceProvider;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
 
-class Bitrix24DIServiceProvider extends ServiceProvider
+class LaravelBitrix24ServiceProvider extends ServiceProvider
 {
     public function register()
     {
@@ -20,17 +20,17 @@ public function register()
     public function boot(Bitrix $obB24App)
     {
         $this->publishes([
-            __DIR__.'/../config/bitrix24di.php' => config_path('bitrix24di.php'),
+            __DIR__ . '/../config/laravel-bitrix24.php' => config_path('laravel-bitrix24.php'),
         ]);
 
         $this->loadRoutesFrom(__DIR__.'/../routes/web.php');
 
         // Bitrix settings
         // create a log channel
-        $log = new Logger('bitrix24');
-        $log->pushHandler(new StreamHandler(storage_path() . '/logs/bitrix24.log', Logger::DEBUG));
+        $log = new Logger('laravel-bitrix24');
+        $log->pushHandler(new StreamHandler(storage_path() . '/logs/laravel-bitrix24.log', Logger::DEBUG));
 
-        $arParams = config('bitrix24di');
+        $arParams = config('laravel-bitrix24');
 
         if (!$arParams) {
             return false;