Support Laravel 12.x and PHP 8.4

Author: kitar

.github/workflows/php.yml

@@ -10,6 +10,8 @@ jobs:
     strategy:
       matrix:
         include:
+          - php: 8.4
+            illuminate: ^12.0
           - php: 8.3
             illuminate: ^11.0
           - php: 8.2

composer.json

@@ -20,15 +20,15 @@
         "ci-test": "vendor/bin/phpunit --coverage-clover coverage.xml"
     },
     "require": {
-        "php": "^7.3|^7.4|^8.0|^8.1|^8.2|^8.3",
-        "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-        "illuminate/container": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-        "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-        "illuminate/hashing": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+        "php": "^7.3|^7.4|^8.0|^8.1|^8.2|^8.3|^8.4",
+        "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
+        "illuminate/container": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
+        "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
+        "illuminate/hashing": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
         "aws/aws-sdk-php": "^3.0"
     },
     "require-dev": {
-        "illuminate/auth": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+        "illuminate/auth": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
         "symfony/var-dumper": "^5.0|^6.0|^7.0",
         "vlucas/phpdotenv": "^4.1|^5.0",
         "mockery/mockery": "^1.3",

src/Kitar/Dynamodb/Connection.php

@@ -124,7 +124,7 @@ protected function getDefaultPostProcessor()
      */
     protected function getDefaultQueryGrammar()
     {
-        return $this->withTablePrefix(new Query\Grammar());
+        return new Query\Grammar();
     }
 
     /**

src/Kitar/Dynamodb/Query/Builder.php

@@ -577,6 +577,8 @@ public function newQuery()
      */
     protected function process($query_method, $processor_method)
     {
+        $table_name = $this->connection->getTablePrefix() . $this->from;
+
         // Compile columns and wheres attributes.
         // These attributes needs to interact with ExpressionAttributes during compile,
         // so it need to run before compileExpressionAttributes.
@@ -590,13 +592,13 @@ protected function process($query_method, $processor_method)
         // Compile rest of attributes.
         $params = array_merge(
             $params,
-            $this->grammar->compileTableName($this->from),
+            $this->grammar->compileTableName($table_name),
             $this->grammar->compileIndexName($this->index),
             $this->grammar->compileKey($this->key),
             $this->grammar->compileItem($this->item),
             $this->grammar->compileUpdates($this->updates),
-            $this->grammar->compileBatchGetRequestItems($this->from, $this->batch_get_keys),
-            $this->grammar->compileBatchWriteRequestItems($this->from, $this->batch_write_request_items),
+            $this->grammar->compileBatchGetRequestItems($table_name, $this->batch_get_keys),
+            $this->grammar->compileBatchWriteRequestItems($table_name, $this->batch_write_request_items),
             $this->grammar->compileDynamodbLimit($this->limit),
             $this->grammar->compileScanIndexForward($this->scan_index_forward),
             $this->grammar->compileExclusiveStartKey($this->exclusive_start_key),

src/Kitar/Dynamodb/Query/Grammar.php

@@ -55,7 +55,7 @@ public function __construct()
     public function compileTableName($table_name)
     {
         return [
-            'TableName' => $this->tablePrefix . $table_name
+            'TableName' => $table_name
         ];
     }
 
@@ -146,8 +146,6 @@ public function compileBatchGetRequestItems($table_name, $keys)
             return $marshaler->marshalItem($key);
         })->toArray();
 
-        $table_name = $this->tablePrefix . $table_name;
-
         return [
             'RequestItems' => [
                 $table_name => [
@@ -174,8 +172,6 @@ public function compileBatchWriteRequestItems($table_name, $request_items)
             });
         })->toArray();
 
-        $table_name = $this->tablePrefix . $table_name;
-
         return [
             'RequestItems' => [
                 $table_name => $marshaled_items,

tests/Query/BuilderTest.php

@@ -1165,6 +1165,7 @@ public function it_can_process_scan_with_columns_specified()
     public function it_can_process_process()
     {
         $connection = m::mock(Connection::class);
+        $connection->shouldReceive('getTablePrefix');
         $connection->shouldReceive('scan')
                    ->with(['TableName' => 'Forum'])
                    ->andReturn(new Result(['Items' => []]))
@@ -1179,6 +1180,7 @@ public function it_can_process_process()
     public function it_can_process_process_with_no_processor()
     {
         $connection = m::mock(Connection::class);
+        $connection->shouldReceive('getTablePrefix');
         $connection->shouldReceive('putItem')
                    ->with([
                        'TableName' => 'Thread',