chore: update dependencies (#53)

* chore: update dependencies

* build: update PHP and Laravel versions in PHPUnit configuration

Author: GeoSot

.github/workflows/phpunit.yml

@@ -13,16 +13,16 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [8.1, 8.2, 8.3]
-        laravel: [10.*, 11.*]
-        include:
-          -   laravel: 10.*
-              testbench: 8.*
-          -   laravel: 11.*
-              testbench: 9.*
-        exclude:
-          -   laravel: 11.*
-              php: 8.1
+        php: [8.2, 8.3, 8.4]
+        laravel: [11.*, 12.*]
+#        include:
+#          -   laravel: 10.*
+#              testbench: 8.*
+#          -   laravel: 11.*
+#              testbench: 9.*
+#        exclude:
+#          -   laravel: 11.*
+#              php: 8.1
 
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.os }}
@@ -60,7 +60,6 @@ jobs:
         run: |
           composer --version
           composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
-          composer require "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update --dev
           composer update --prefer-dist --no-interaction --no-suggest --dev
           composer dump
 

composer.json

@@ -20,9 +20,9 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3",
-        "larastan/larastan": "^2",
+        "larastan/larastan": "^3",
         "orchestra/testbench": ">=9",
-        "rector/rector": "^1.0"
+        "rector/rector": "^2"
     },
     "autoload": {
         "psr-4": {

rector.php

@@ -27,13 +27,9 @@
         earlyReturn: true,
 //        strictBooleans: true,
     )
-    ->withRules([
-        AddVoidReturnTypeWhereNoReturnRector::class,
-    ])
     ->withCache(
     // ensure file system caching is used instead of in-memory
         cacheClass: FileCacheStorage::class,
-
         // specify a path that works locally as well as on CI job runners
         cacheDirectory: '/tmp/rector'
     );

ruleset-phpstan.neon

@@ -5,8 +5,12 @@ parameters:
         - src
         - tests
 
-    level: 7
+    level: 6
     reportStaticMethodSignatures: true
+    noEnvCallsOutsideOfConfig: true
+    viewDirectories:
+        - resources/views
+
     parallel:
         jobSize: 20
         maximumNumberOfProcesses: 32

src/Controllers/EnvController.php

@@ -14,8 +14,13 @@
 
 class EnvController extends BaseController
 {
+    /**
+     * @const view-string
+     */
+    protected const INDEX_VIEW = ServiceProvider::PACKAGE.'::index';
+
     public function __construct(
-        protected EnvEditor $envEditor
+        protected EnvEditor $envEditor,
     ) {
     }
 
@@ -31,7 +36,7 @@ public function index(Request $request)
             return $this->returnGenericResponse(true, ['items' => $envFileContent]);
         }
 
-        return view(ServiceProvider::PACKAGE.'::index', ['envValues' => $envFileContent]);
+        return view(static::INDEX_VIEW, ['envValues' => $envFileContent]);
     }
 
     /**
@@ -78,7 +83,7 @@ public function getBackupFiles(Request $request): View|JsonResponse
             return $this->returnGenericResponse(true, ['items' => $allBackUps]);
         }
 
-        return view(ServiceProvider::PACKAGE.'::index', ['backUpFiles' => $allBackUps]);
+        return view(static::INDEX_VIEW, ['backUpFiles' => $allBackUps]);
     }
 
     /**
@@ -158,7 +163,7 @@ protected function returnGenericResponse(
         bool $success,
         array $data = [],
         ?string $translationWord = null,
-        string $keyName = ''
+        string $keyName = '',
     ): JsonResponse {
         if ($translationWord && $success) {
             $data = array_merge($data, [

src/Dto/EntryObj.php

@@ -18,7 +18,7 @@ public function __construct(
         protected mixed $value,
         public readonly int $group,
         public readonly int $index,
-        protected bool $isSeparator = false
+        protected bool $isSeparator = false,
     ) {
     }
 

src/Facades/EnvEditor.php

@@ -2,19 +2,21 @@
 
 namespace GeoSot\EnvEditor\Facades;
 
+use GeoSot\EnvEditor\Dto\BackupObj;
+use GeoSot\EnvEditor\Dto\EntryObj;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Facade;
 use Symfony\Component\HttpFoundation\File\File;
 
 /**
- * @method static Collection getEnvFileContent(string $fileName = '')
+ * @method static Collection<int, EntryObj> getEnvFileContent(string $fileName = '')
  * @method static bool keyExists(string $key)
  * @method static mixed getKey(string $key, $default = null)
- * @method static bool addKey(string $key, $value, array $options = [])
+ * @method static bool addKey(string $key, $value, array<string, int|string> $options = [])
  * @method static bool editKey(string $keyToChange, $newValue)
  * @method static bool deleteKey(string $key)
- * @method static Collection getAllBackUps()
+ * @method static Collection<int, BackupObj> getAllBackUps()
  * @method static File upload(UploadedFile $uploadedFile, bool $replaceCurrentEnv)
  * @method static bool backUpCurrent()
  * @method static string getFilePath(string $fileName = '')

src/ServiceProvider.php

@@ -7,8 +7,6 @@
 
 class ServiceProvider extends \Illuminate\Support\ServiceProvider
 {
-    public const VENDOR = 'geo-sv';
-
     public const PACKAGE = 'env-editor';
 
     public const TRANSLATE_PREFIX = self::PACKAGE.'::env-editor.';
@@ -32,7 +30,7 @@ public function register(): void
             static::PACKAGE
         );
 
-        $this->app->singleton(EnvEditor::class, fn (): \GeoSot\EnvEditor\EnvEditor => new EnvEditor(
+        $this->app->singleton(EnvEditor::class, fn (): EnvEditor => new EnvEditor(
             new Repository(config(static::PACKAGE)),
             $this->app->make(Filesystem::class)
         ));
@@ -43,7 +41,7 @@ public function register(): void
     private function loadResources(): void
     {
         $this->loadRoutesFrom(__DIR__.'/../routes/routes.php');
-        $this->loadViewsFrom(__DIR__.'/../resources/views', static::PACKAGE);
+        $this->loadViewsFrom(__DIR__.'/../resources/views', 'env-editor');
         $this->loadTranslationsFrom(__DIR__.'/../resources/lang', static::PACKAGE);
     }