style(Bencode): Separate Bencode library to Rhilip/Bencode

Rhilip · Jan 23, 2020 · 18cbfa1 · 18cbfa1
1 parent 81f0783
commit 18cbfa1
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 174 deletions.
diff --git a/application/Controllers/TrackerController.php b/application/Controllers/TrackerController.php
@@ -10,11 +10,12 @@
 
 use App\Libraries\Constant;
 use App\Repository\User\UserRole;
-use App\Libraries\Bencode\Bencode;
 use App\Exceptions\TrackerException;
 
 use Rid\Utils\IpUtils;
 
+use Rhilip\Bencode\Bencode;
+
 /** @noinspection PhpUnused */
 class TrackerController
 {

diff --git a/application/Libraries/Bencode/Bencode.php b/application/Libraries/Bencode/Bencode.php
diff --git a/application/Libraries/Bencode/ParseErrorException.php b/application/Libraries/Bencode/ParseErrorException.php
diff --git a/application/Middleware/AuthMiddleware.php b/application/Middleware/AuthMiddleware.php
@@ -85,10 +85,10 @@ public function handle($callable, \Closure $next)
          */
         $route = strtolower(
             str_replace(
-            ['App\\Controllers\\', 'Controller', 'action'],
-            '',
-            $controllerName . '_' . $action
-        )
+                ['App\\Controllers\\', 'Controller', 'action'],
+                '',
+                $controllerName . '_' . $action
+            )
         );
 
         $required_class = config('route.' . $route) ?: 1;

diff --git a/application/Models/Form/Torrent/DownloadForm.php b/application/Models/Form/Torrent/DownloadForm.php
@@ -9,7 +9,8 @@
 namespace App\Models\Form\Torrent;
 
 use App\Models\Form\Traits\FileSentTrait;
-use App\Libraries\Bencode\Bencode;
+
+use Rhilip\Bencode\Bencode;
 
 class DownloadForm extends StructureForm
 {

diff --git a/application/Models/Form/Torrent/StructureForm.php b/application/Models/Form/Torrent/StructureForm.php
@@ -9,7 +9,8 @@
 namespace App\Models\Form\Torrent;
 
 use App\Libraries\Constant;
-use App\Libraries\Bencode\Bencode;
+
+use Rhilip\Bencode\Bencode;
 
 class StructureForm extends DetailsForm
 {

diff --git a/application/Models/Form/Torrent/UploadForm.php b/application/Models/Form/Torrent/UploadForm.php
@@ -11,11 +11,12 @@
 use App\Libraries\Constant;
 use App\Repository\Torrent\TorrentStatus;
 use App\Repository\Torrent\TorrentType;
-use App\Libraries\Bencode\Bencode;
-use App\Libraries\Bencode\ParseErrorException;
 
 use Rid\Http\UploadFile;
 
+use Rhilip\Bencode\Bencode;
+use Rhilip\Bencode\ParseErrorException;
+
 class UploadForm extends EditForm
 {
 

diff --git a/composer.json b/composer.json
@@ -39,7 +39,8 @@
     "siriusphp/validation": "^2.3",
     "mjohnson/decoda": "^6.12",
     "symfony/translation": "^4.3",
-    "symfony/config": "^4.3"
+    "symfony/config": "^4.3",
+    "rhilip/bencode": "^1.0"
   },
   "require-dev": {
     "eaglewu/swoole-ide-helper": "dev-master"

diff --git a/composer.lock b/composer.lock
diff --git a/templates/torrent/structure.php b/templates/torrent/structure.php
@@ -9,7 +9,7 @@
  * @var \App\Models\Form\Torrent\StructureForm $structure
  */
 
-use App\Libraries\Bencode\Bencode;
+use Rhilip\Bencode\Bencode;
 
 if (!function_exists('torrent_structure_builder')) {
     function torrent_structure_builder($array, $parent = "")