Skip to content

Commit f1db513

Browse files
author
Pantea Marius-ciclistu
committed
Fix laravel pulls:
Fix compiling queries that use orderByRaw with expressions #57228 Remove duplicated word in Str::apa method #57254 Ensure cookie lifetime matches session lifetime in StartSession middleware #57266 Fix AWS S3 adapter's constructor not allowing decorated adapter instances #57217 Track filesystem adapter decoration #57167
1 parent e96a185 commit f1db513

File tree

7 files changed

+14
-11
lines changed

7 files changed

+14
-11
lines changed

illuminate/Database/Query/Grammars/Grammar.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,11 @@ protected function compileOrders(Builder $query, $orders)
910910
*/
911911
protected function compileOrdersToArray(Builder $query, $orders)
912912
{
913-
return array_map(function ($order) {
913+
return \array_map(function (array $order) use ($query): mixed {
914+
if (isset($order['sql']) && $order['sql'] instanceof Expression) {
915+
return $order['sql']->getValue($query->getGrammar());
916+
}
917+
914918
return $order['sql'] ?? $this->wrap($order['column']) . ' ' . $order['direction'];
915919
}, $orders);
916920
}

illuminate/Filesystem/AwsS3V3Adapter.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Aws\S3\S3Client;
66
use Illuminate\Support\Traits\Conditionable;
7-
use League\Flysystem\AwsS3V3\AwsS3V3Adapter as S3Adapter;
7+
use League\Flysystem\FilesystemAdapter as FlysystemAdapter;
88
use League\Flysystem\FilesystemOperator;
99

1010
class AwsS3V3Adapter extends FilesystemAdapter
@@ -22,12 +22,12 @@ class AwsS3V3Adapter extends FilesystemAdapter
2222
* Create a new AwsS3V3FilesystemAdapter instance.
2323
*
2424
* @param \League\Flysystem\FilesystemOperator $driver
25-
* @param \League\Flysystem\AwsS3V3\AwsS3V3Adapter $adapter
25+
* @param \League\Flysystem\FilesystemAdapter $adapter
2626
* @param array $config
2727
* @param \Aws\S3\S3Client $client
2828
* @return void
2929
*/
30-
public function __construct(FilesystemOperator $driver, S3Adapter $adapter, array $config, S3Client $client)
30+
public function __construct(FilesystemOperator $driver, FlysystemAdapter $adapter, array $config, S3Client $client)
3131
{
3232
parent::__construct($driver, $adapter, $config);
3333

illuminate/Filesystem/FilesystemManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ function (&$parent) use ($config) {
329329
* @param array $config
330330
* @return \League\Flysystem\FilesystemOperator
331331
*/
332-
protected function createFlysystem(FlysystemAdapter $adapter, array $config)
332+
protected function createFlysystem(FlysystemAdapter &$adapter, array $config)
333333
{
334334
if (($config['read-only'] ?? false) === true) {
335335
$adapter = new ReadOnlyFilesystemAdapter($adapter);

illuminate/Foundation/Application.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class Application extends Container implements
4444
*
4545
* @var string
4646
*/
47-
public const VERSION = '10.51.13';
47+
public const VERSION = '10.51.14';
4848

4949
/**
5050
* The base path for the Laravel installation.

illuminate/Session/Middleware/StartSession.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,10 +269,10 @@ protected function getSessionLifetimeInSeconds()
269269
*/
270270
protected function getCookieExpirationDate()
271271
{
272-
$config = $this->manager->getSessionConfig();
272+
$expiresOnClose = $this->manager->getSessionConfig()['expire_on_close'];
273273

274-
return $config['expire_on_close'] ? 0 : Date::instance(
275-
Carbon::now()->addRealMinutes($config['lifetime'])
274+
return $expiresOnClose ? 0 : Date::instance(
275+
Carbon::now()->addSeconds($this->getSessionLifetimeInSeconds())
276276
);
277277
}
278278

illuminate/Support/Str.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1394,7 +1394,6 @@ public static function apa($value)
13941394
'and',
13951395
'as',
13961396
'but',
1397-
'for',
13981397
'if',
13991398
'nor',
14001399
'or',

src/Application.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public function bootstrapRouter()
169169
*/
170170
public function version()
171171
{
172-
return 'Maravel Framework 10.51.13';
172+
return 'Maravel Framework 10.51.14';
173173
}
174174

175175
/**

0 commit comments

Comments
 (0)