Rename Str methods

src/Lodash/Commands/DbClear.php

@@ -61,7 +61,7 @@ public function handle(): void
                 foreach ($table as $value) {
                     $stm = 'DROP TABLE IF EXISTS `' . $value . '`';
                     if ($pretend) {
-                        $this->line("{$stm}");
+                        $this->line($stm);
                     } else {
                         $connection->statement($stm);
                         $this->comment('Table `' . $value . '` dropped');

src/Lodash/Eloquent/ManyToManyPreload.php

@@ -60,9 +60,11 @@ public function scopeLimitPerGroupViaSubQuery(Builder $query, int $limit = 10):
         $numAlias = $table . '_rn';
 
         // Apply mysql variables
-        $newQuery->addSelect($connection->raw(
-            "@num := if(@group = {$this->quoteColumn($queryKeyColumn)}, @num+1, 1) as `{$numAlias}`, @group := {$this->quoteColumn($queryKeyColumn)} as `{$groupAlias}`",
-        ));
+        $newQuery->addSelect(
+            $connection->raw(
+                "@num := if(@group = " . $this->quoteColumn($queryKeyColumn) . ", @num+1, 1) as `" . $numAlias . "`, @group := " . $this->quoteColumn($queryKeyColumn) . " as `" . $groupAlias . "`",
+            ),
+        );
 
         // Make sure first order clause is the group order
         $newQuery->getQuery()->orders = (array) $query->getQuery()->orders;
@@ -73,14 +75,14 @@ public function scopeLimitPerGroupViaSubQuery(Builder $query, int $limit = 10):
 
         if ($join) {
             $leftKey = explode('.', $queryKeyColumn)[1];
-            $leftKeyColumn = "`{$table}`.`{$leftKey}`";
+            $leftKeyColumn = "`" . $table . "`.`" . $leftKey . "`";
             $newQuery->addSelect($queryKeyColumn);
             $newQuery->mergeBindings($query->getQuery());
             $newQuery->getQuery()->joins = (array) $query->getQuery()->joins;
-            $query->whereRaw("{$leftKeyColumn} = {$this->quoteColumn($queryKeyColumn)}");
+            $query->whereRaw($leftKeyColumn . ' = ' . $this->quoteColumn($queryKeyColumn));
         }
 
-        $query->from($connection->raw("({$newQuery->toSql()}) as `{$table}`"))
+        $query->from($connection->raw("(" . $newQuery->toSql() . ") as `" . $table . "`"))
             ->where($numAlias, '<=', $limit);
 
         return $this;

src/Lodash/Http/Resources/TransformsData.php

@@ -98,13 +98,13 @@ private static function parseKeyValue(string $internalField, $transformValue, Tr
             }
         } else {
             // Try to find getter for external field
-            $method = 'get' . Str::snakeCaseToCamelCase($transformValue);
+            $method = 'get' . Str::snakeCaseToPascalCase($transformValue);
             if (method_exists($model, $method)) {
                 $key = $transformValue;
                 $value = $model->$method();
             } else {
                 // Call getter for internal field
-                $method = 'get' . Str::snakeCaseToCamelCase($internalField);
+                $method = 'get' . Str::snakeCaseToPascalCase($internalField);
                 if (! method_exists($model, $method)) {
                     throw new LogicException('Field ' . $internalField . ' getter (' . $method . ') does not available for model ' . $model::class);
                 }

src/Lodash/ServiceProvider.php

@@ -81,9 +81,9 @@ protected function registerBladeDirectives(): void
 
         // Display relative time
         app('blade.compiler')->directive('datetime', static function ($expression) {
-            return "<?php echo '<time datetime=\'' . with({$expression})->toIso8601String()
+            return "<?php echo '<time datetime=\'' . with($expression)->toIso8601String()
                 . '\' title=\'' . $expression . '\'>'
-                . with({$expression})->diffForHumans() . '</time>' ?>";
+                . with($expression)->diffForHumans() . '</time>' ?>";
         });
 
         // Pluralization helper

src/Lodash/Support/Str.php

@@ -13,6 +13,7 @@
 use function is_array;
 use function is_null;
 use function is_object;
+use function lcfirst;
 use function max;
 use function mb_substr;
 use function number_format;
@@ -53,13 +54,27 @@ public static function formatBalance(?int $amount = 0, int $d = 2): string
         return $amount;
     }
 
-    public static function snakeCaseToCamelCase(string $string): string
+    public static function snakeCaseToPascalCase(string $string): string
     {
         $str = str_replace('_', '', ucwords($string, '_'));
 
         return $str;
     }
 
+    public static function pascalCaseToSnakeCase(string $string): string
+    {
+        $string = strtolower(preg_replace('/(?<!^)[A-Z]/', '_$0', $string));
+
+        return $string;
+    }
+
+    public static function snakeCaseToCamelCase(string $string): string
+    {
+        $str = lcfirst(str_replace('_', '', ucwords($string, '_')));
+
+        return $str;
+    }
+
     public static function camelCaseToSnakeCase(string $string): string
     {
         $string = strtolower(preg_replace('/(?<!^)[A-Z]/', '_$0', $string));

tests/Unit/Eloquent/UsesUuidAsPrimaryTest.php

@@ -5,12 +5,13 @@
 namespace Tests\Unit\Eloquent;
 
 use Longman\LaravelLodash\Eloquent\UsesUuidAsPrimary;
+use PHPUnit\Framework\Attributes\Test;
 use Ramsey\Uuid\Uuid;
 use Tests\Unit\TestCase;
 
 class UsesUuidAsPrimaryTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function it_should_check_uuid_is_valid_binary(): void
     {
         $mock = $this->getMockForTrait(UsesUuidAsPrimary::class);
@@ -22,7 +23,7 @@ public function it_should_check_uuid_is_valid_binary(): void
         $this->assertTrue($mock->isUuidBinary($uuidBinary));
     }
 
-    /** @test */
+    #[Test]
     public function it_should_check_uuid_is_invalid_binary(): void
     {
         $mock = $this->getMockForTrait(UsesUuidAsPrimary::class);

tests/Unit/Http/Requests/RestrictsExtraAttributesTest.php

@@ -17,7 +17,7 @@
 
 class RestrictsExtraAttributesTest extends TestCase
 {
-    #[Test()]
+    #[Test]
     #[DataProvider('provideData')]
     public function it_should_throw_validation_error_on_extra_arguments(
         array $rules,

tests/Unit/Http/Resources/ArrayResourceTest.php

@@ -7,13 +7,14 @@
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Longman\LaravelLodash\Http\Resources\ArrayResource;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\Unit\TestCase;
 
 use function app;
 
 class ArrayResourceTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function it_should_transform_array(): void
     {
         $resource = new ArrayResource([
@@ -31,7 +32,7 @@ public function it_should_transform_array(): void
         $this->assertSame($expected, $response->content());
     }
 
-    /** @test */
+    #[Test]
     public function it_should_return_unecaped_json(): void
     {
         $resource = new ArrayResource([

tests/Unit/Http/Resources/ErrorResourceTest.php

@@ -7,13 +7,14 @@
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Longman\LaravelLodash\Http\Resources\ErrorResource;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\Unit\TestCase;
 
 use function app;
 
 class ErrorResourceTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function it_should_transform_array(): void
     {
         $resource = new ErrorResource([

tests/Unit/Http/Resources/JsonResourceCollectionTest.php

@@ -10,6 +10,7 @@
 use Illuminate\Support\Collection;
 use Longman\LaravelLodash\Http\Resources\ArrayResource;
 use Longman\LaravelLodash\Http\Resources\JsonResourceCollection;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\Unit\TestCase;
 
 use function app;
@@ -19,7 +20,7 @@ class JsonResourceCollectionTest extends TestCase
 {
     use WithFaker;
 
-    /** @test */
+    #[Test]
     public function it_should_transform_collection_of_arrays(): void
     {
         $collection = new Collection(array_fill(0, 3, [
@@ -38,7 +39,7 @@ public function it_should_transform_collection_of_arrays(): void
         $this->assertSame($expected, $response->content());
     }
 
-    /** @test */
+    #[Test]
     public function it_should_transform_collection_of_models(): void
     {
         $models = [];
@@ -78,7 +79,7 @@ public function it_should_transform_collection_of_models(): void
         ], $transformed);
     }
 
-    /** @test */
+    #[Test]
     public function it_should_transform_collection_of_models_with_hidden_properties(): void
     {
         $models = [];
@@ -120,7 +121,7 @@ public function it_should_transform_collection_of_models_with_hidden_properties(
         ], $transformed);
     }
 
-    /** @test */
+    #[Test]
     public function it_should_transform_collection_of_models_with_hidden_properties_in_output(): void
     {
         $models = [];

tests/Unit/Middleware/SimpleBasicAuthTest.php

@@ -5,13 +5,14 @@
 namespace Tests\Unit\Middleware;
 
 use Longman\LaravelLodash\Middlewares\SimpleBasicAuth;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\Unit\TestCase;
 
 use function config;
 
 class SimpleBasicAuthTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function it_should_return_access_denied_on_empty_credentials()
     {
         config()->set('auth.simple', [
@@ -24,7 +25,7 @@ public function it_should_return_access_denied_on_empty_credentials()
         $response->assertStatus(401);
     }
 
-    /** @test */
+    #[Test]
     public function it_should_return_access_denied_on_wrong_credentials()
     {
         config()->set('auth.simple', [
@@ -37,7 +38,7 @@ public function it_should_return_access_denied_on_wrong_credentials()
         $response->assertStatus(401);
     }
 
-    /** @test */
+    #[Test]
     public function it_should_return_ok_on_disabled_auth()
     {
         config()->set('auth.simple', [
@@ -51,7 +52,7 @@ public function it_should_return_ok_on_disabled_auth()
         $response->assertSeeText('ok');
     }
 
-    /** @test */
+    #[Test]
     public function it_should_return_ok_with_credentials()
     {
         config()->set('auth.simple', [

tests/Unit/RedisTest.php

@@ -5,6 +5,7 @@
 namespace Tests\Unit;
 
 use Longman\LaravelLodash\Redis\RedisManager;
+use PHPUnit\Framework\Attributes\Test;
 use Redis;
 use RedisArray;
 
@@ -13,7 +14,7 @@
 
 class RedisTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function it_should_set_custom_serializer()
     {
         $redis = $this->createConnection('phpredis', [
@@ -42,7 +43,7 @@ public function it_should_set_custom_serializer()
         $this->assertEquals($redis->get('country'), $data);
     }
 
-    /** @test */
+    #[Test]
     public function it_should_set_custom_serializer_for_cluster()
     {
         $redis = $this->createConnection('phpredis', [

tests/Unit/ServiceProviderTest.php

@@ -6,12 +6,13 @@
 
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Http\Request;
+use PHPUnit\Framework\Attributes\Test;
 
 use function array_keys;
 
 class ServiceProviderTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function check_if_commands_registered()
     {
         $commands = [
@@ -31,7 +32,7 @@ public function check_if_commands_registered()
         }
     }
 
-    /** @test */
+    #[Test]
     public function check_if_request_has_macros()
     {
         $this->assertTrue(Request::hasMacro('getInt'));
@@ -40,7 +41,7 @@ public function check_if_request_has_macros()
         $this->assertTrue(Request::hasMacro('getString'));
     }
 
-    /** @test */
+    #[Test]
     public function check_blade_directives()
     {
         $directives = [

tests/Unit/Support/DeclensionsTest.php

@@ -11,7 +11,7 @@
 
 class DeclensionsTest extends TestCase
 {
-    #[Test()]
+    #[Test]
     #[DataProvider('dataForDeclensions')]
     public function turn_words_declensions(string $word, array $declensions): void
     {