Merge remote-tracking branch 'upstream/6.x' into 6.x

Author: TBlindaruk

src/Illuminate/Cache/CacheManager.php

@@ -2,10 +2,12 @@
 
 namespace Illuminate\Cache;
 
+use Aws\DynamoDb\DynamoDbClient;
 use Closure;
 use Illuminate\Contracts\Cache\Factory as FactoryContract;
 use Illuminate\Contracts\Cache\Store;
 use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
+use Illuminate\Support\Arr;
 use InvalidArgumentException;
 
 /**
@@ -224,9 +226,11 @@ protected function createDatabaseDriver(array $config)
      */
     protected function createDynamodbDriver(array $config)
     {
+        $client = $this->newDynamodbClient($config);
+
         return $this->repository(
             new DynamoDbStore(
-                $this->app['cache.dynamodb.client'],
+                $client,
                 $config['table'],
                 $config['attributes']['key'] ?? 'key',
                 $config['attributes']['value'] ?? 'value',
@@ -236,6 +240,28 @@ protected function createDynamodbDriver(array $config)
         );
     }
 
+    /**
+     * Create new DynamoDb Client instance.
+     *
+     * @return DynamoDbClient
+     */
+    protected function newDynamodbClient(array $config)
+    {
+        $dynamoConfig = [
+            'region' => $config['region'],
+            'version' => 'latest',
+            'endpoint' => $config['endpoint'] ?? null,
+        ];
+
+        if (isset($config['key']) && isset($config['secret'])) {
+            $dynamoConfig['credentials'] = Arr::only(
+                $config, ['key', 'secret', 'token']
+            );
+        }
+
+        return new DynamoDbClient($dynamoConfig);
+    }
+
     /**
      * Create a new cache repository with the given implementation.
      *

src/Illuminate/Cache/CacheServiceProvider.php

@@ -2,9 +2,7 @@
 
 namespace Illuminate\Cache;
 
-use Aws\DynamoDb\DynamoDbClient;
 use Illuminate\Contracts\Support\DeferrableProvider;
-use Illuminate\Support\Arr;
 use Illuminate\Support\ServiceProvider;
 use Symfony\Component\Cache\Adapter\Psr16Adapter;
 
@@ -32,24 +30,6 @@ public function register()
         $this->app->singleton('memcached.connector', function () {
             return new MemcachedConnector;
         });
-
-        $this->app->singleton('cache.dynamodb.client', function ($app) {
-            $config = $app['config']->get('cache.stores.dynamodb');
-
-            $dynamoConfig = [
-                'region' => $config['region'],
-                'version' => 'latest',
-                'endpoint' => $config['endpoint'] ?? null,
-            ];
-
-            if ($config['key'] && $config['secret']) {
-                $dynamoConfig['credentials'] = Arr::only(
-                    $config, ['key', 'secret', 'token']
-                );
-            }
-
-            return new DynamoDbClient($dynamoConfig);
-        });
     }
 
     /**
@@ -60,7 +40,7 @@ public function register()
     public function provides()
     {
         return [
-            'cache', 'cache.store', 'cache.psr6', 'memcached.connector', 'cache.dynamodb.client',
+            'cache', 'cache.store', 'cache.psr6', 'memcached.connector',
         ];
     }
 }

src/Illuminate/Cache/DynamoDbStore.php

@@ -525,4 +525,14 @@ public function setPrefix($prefix)
     {
         $this->prefix = ! empty($prefix) ? $prefix.':' : '';
     }
+
+    /**
+     * Get the DynamoDb Client instance.
+     *
+     * @return DynamoDbClient
+     */
+    public function getClient()
+    {
+        return $this->dynamo;
+    }
 }

src/Illuminate/Database/Query/Builder.php

@@ -1932,7 +1932,7 @@ public function offset($value)
     {
         $property = $this->unions ? 'unionOffset' : 'offset';
 
-        $this->$property = max(0, $value);
+        $this->$property = max(0, (int) $value);
 
         return $this;
     }

src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php

@@ -60,8 +60,8 @@ protected function compileColumns(Builder $query, $columns)
         // If there is a limit on the query, but not an offset, we will add the top
         // clause to the query, which serves as a "limit" type clause within the
         // SQL Server system similar to the limit keywords available in MySQL.
-        if ($query->limit > 0 && $query->offset <= 0) {
-            $select .= 'top '.$query->limit.' ';
+        if (is_numeric($query->limit) && $query->limit > 0 && $query->offset <= 0) {
+            $select .= 'top '.((int) $query->limit).' ';
         }
 
         return $select.$this->columnize($columns);
@@ -221,10 +221,10 @@ protected function compileTableExpression($sql, $query)
      */
     protected function compileRowConstraint($query)
     {
-        $start = $query->offset + 1;
+        $start = (int) $query->offset + 1;
 
         if ($query->limit > 0) {
-            $finish = $query->offset + $query->limit;
+            $finish = (int) $query->offset + (int) $query->limit;
 
             return "between {$start} and {$finish}";
         }

src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php

@@ -29,13 +29,13 @@ class SqlServerGrammar extends Grammar
     protected $serials = ['tinyInteger', 'smallInteger', 'mediumInteger', 'integer', 'bigInteger'];
 
     /**
-     * Compile the query to determine if a table exists.
+     * Compile the query to determine if a table or view exists.
      *
      * @return string
      */
     public function compileTableExists()
     {
-        return "select * from sysobjects where type = 'U' and name = ?";
+        return "select * from sysobjects where type in ('U', 'V') and name = ?";
     }
 
     /**
@@ -48,7 +48,7 @@ public function compileColumnListing($table)
     {
         return "select col.name from sys.columns as col
                 join sys.objects as obj on col.object_id = obj.object_id
-                where obj.type = 'U' and obj.name = '$table'";
+                where obj.type in ('U', 'V') and obj.name = '$table'";
     }
 
     /**

src/Illuminate/Foundation/Application.php

@@ -31,7 +31,7 @@ class Application extends Container implements ApplicationContract, HttpKernelIn
      *
      * @var string
      */
-    const VERSION = '6.20.25';
+    const VERSION = '6.20.27';
 
     /**
      * The base path for the Laravel installation.

src/Illuminate/Foundation/Exceptions/Handler.php

@@ -105,7 +105,9 @@ public function report(Exception $e)
         }
 
         if (Reflector::isCallable($reportCallable = [$e, 'report'])) {
-            return $this->container->call($reportCallable);
+            if (($response = $this->container->call($reportCallable)) !== false) {
+                return $response;
+            }
         }
 
         try {

src/Illuminate/Foundation/Testing/Concerns/InteractsWithExceptionHandling.php

@@ -64,7 +64,8 @@ protected function withoutExceptionHandling(array $except = [])
             $this->originalExceptionHandler = app(ExceptionHandler::class);
         }
 
-        $this->app->instance(ExceptionHandler::class, new class($this->originalExceptionHandler, $except) implements ExceptionHandler {
+        $this->app->instance(ExceptionHandler::class, new class($this->originalExceptionHandler, $except) implements ExceptionHandler
+        {
             protected $except;
             protected $originalHandler;
 

src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php

@@ -121,7 +121,8 @@ public function withoutMiddleware($middleware = null)
         }
 
         foreach ((array) $middleware as $abstract) {
-            $this->app->instance($abstract, new class {
+            $this->app->instance($abstract, new class
+            {
                 public function handle($request, $next)
                 {
                     return $next($request);