fix conflicts

Author: taylorotwell

CHANGELOG.md

@@ -3,6 +3,6 @@
 ## [Unreleased](https://github.com/laravel/framework/compare/v10.0.0..10.x)
 
 
-## [v10.0.0 (2023-??-??)](https://github.com/laravel/framework/compare/v10.0.0...10.x)
+## [v10.0.0 (2023-02-14)](https://github.com/laravel/framework/compare/v10.0.0...10.x)
 
-Check the upgrade guide in the [Official Laravel Upgrade Documentation](https://laravel.com/docs/10.x/upgrade). Also you can see some release notes in the [Official Laravel Release Documentation](https://laravel.com/docs/10.x/releases).
+Please consult the [upgrade guide](https://laravel.com/docs/10.x/upgrade) and [release notes](https://laravel.com/docs/10.x/releases) in the official Laravel documentation.

src/Illuminate/Cache/FileLock.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Illuminate\Cache;
+
+class FileLock extends CacheLock
+{
+    /**
+     * Attempt to acquire the lock.
+     *
+     * @return bool
+     */
+    public function acquire()
+    {
+        return $this->store->add($this->name, $this->owner, $this->seconds);
+    }
+}

src/Illuminate/Cache/FileStore.php

@@ -12,7 +12,7 @@
 
 class FileStore implements Store, LockProvider
 {
-    use InteractsWithTime, HasCacheLock, RetrievesMultipleKeys;
+    use InteractsWithTime, RetrievesMultipleKeys;
 
     /**
      * The Illuminate Filesystem instance.
@@ -200,6 +200,31 @@ public function forever($key, $value)
         return $this->put($key, $value, 0);
     }
 
+    /**
+     * Get a lock instance.
+     *
+     * @param  string  $name
+     * @param  int  $seconds
+     * @param  string|null  $owner
+     * @return \Illuminate\Contracts\Cache\Lock
+     */
+    public function lock($name, $seconds = 0, $owner = null)
+    {
+        return new FileLock($this, $name, $seconds, $owner);
+    }
+
+    /**
+     * Restore a lock instance using the owner identifier.
+     *
+     * @param  string  $name
+     * @param  string  $owner
+     * @return \Illuminate\Contracts\Cache\Lock
+     */
+    public function restoreLock($name, $owner)
+    {
+        return $this->lock($name, 0, $owner);
+    }
+
     /**
      * Remove an item from the cache.
      *

src/Illuminate/Cache/Repository.php

@@ -394,7 +394,9 @@ public function remember($key, $ttl, Closure $callback)
             return $value;
         }
 
-        $this->put($key, $value = $callback(), value($ttl));
+        $value = $callback();
+
+        $this->put($key, $value, value($ttl, $value));
 
         return $value;
     }

src/Illuminate/Collections/Arr.php

@@ -836,9 +836,7 @@ public static function where($array, callable $callback)
      */
     public static function whereNotNull($array)
     {
-        return static::where($array, function ($value) {
-            return ! is_null($value);
-        });
+        return static::where($array, fn ($value) => ! is_null($value));
     }
 
     /**

src/Illuminate/Collections/Collection.php

@@ -84,8 +84,9 @@ public function avg($callback = null)
     {
         $callback = $this->valueRetriever($callback);
 
-        $items = $this->map(fn ($value) => $callback($value))
-                      ->filter(fn ($value) => ! is_null($value));
+        $items = $this
+            ->map(fn ($value) => $callback($value))
+            ->filter(fn ($value) => ! is_null($value));
 
         if ($count = $items->count()) {
             return $items->sum() / $count;

src/Illuminate/Collections/LazyCollection.php

@@ -430,9 +430,7 @@ public function except($keys)
     public function filter(callable $callback = null)
     {
         if (is_null($callback)) {
-            $callback = function ($value) {
-                return (bool) $value;
-            };
+            $callback = fn ($value) => (bool) $value;
         }
 
         return new static(function () use ($callback) {
@@ -1500,9 +1498,7 @@ public function takeWhile($value)
         /** @var callable(TValue, TKey): bool $callback */
         $callback = $this->useAsCallable($value) ? $value : $this->equality($value);
 
-        return $this->takeUntil(function ($item, $key) use ($callback) {
-            return ! $callback($item, $key);
-        });
+        return $this->takeUntil(fn ($item, $key) => ! $callback($item, $key));
     }
 
     /**

src/Illuminate/Console/GeneratorCommand.php

@@ -92,6 +92,7 @@ abstract class GeneratorCommand extends Command implements PromptsForMissingInpu
         'require',
         'require_once',
         'return',
+        'self',
         'static',
         'switch',
         'throw',

src/Illuminate/Console/Scheduling/CacheEventMutex.php

@@ -3,6 +3,7 @@
 namespace Illuminate\Console\Scheduling;
 
 use Illuminate\Contracts\Cache\Factory as Cache;
+use Illuminate\Contracts\Cache\LockProvider;
 
 class CacheEventMutex implements EventMutex, CacheAware
 {
@@ -39,6 +40,12 @@ public function __construct(Cache $cache)
      */
     public function create(Event $event)
     {
+        if ($this->cache->store($this->store)->getStore() instanceof LockProvider) {
+            return $this->cache->store($this->store)->getStore()
+                ->lock($event->mutexName(), $event->expiresAt * 60)
+                ->acquire();
+        }
+
         return $this->cache->store($this->store)->add(
             $event->mutexName(), true, $event->expiresAt * 60
         );
@@ -52,6 +59,12 @@ public function create(Event $event)
      */
     public function exists(Event $event)
     {
+        if ($this->cache->store($this->store)->getStore() instanceof LockProvider) {
+            return ! $this->cache->store($this->store)->getStore()
+                ->lock($event->mutexName(), $event->expiresAt * 60)
+                ->get(fn () => true);
+        }
+
         return $this->cache->store($this->store)->has($event->mutexName());
     }
 
@@ -63,6 +76,14 @@ public function exists(Event $event)
      */
     public function forget(Event $event)
     {
+        if ($this->cache->store($this->store)->getStore() instanceof LockProvider) {
+            $this->cache->store($this->store)->getStore()
+                ->lock($event->mutexName(), $event->expiresAt * 60)
+                ->forceRelease();
+
+            return;
+        }
+
         $this->cache->store($this->store)->forget($event->mutexName());
     }
 

src/Illuminate/Console/Scheduling/Event.php

@@ -80,7 +80,7 @@ class Event
     public $onOneServer = false;
 
     /**
-     * The amount of time the mutex should be valid.
+     * The number of minutes the mutex should be valid.
      *
      * @var int
      */