Merge branch '10.x' into 11.x

# Conflicts: # CHANGELOG.md # src/Illuminate/Foundation/Application.php
laravel · Apr 30, 2024 · 5d06b37 · 5d06b37
2 parents 44dba84 + 470e3e8
commit 5d06b37
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
@@ -90,10 +90,11 @@ jobs:
       - name: Cleanup release notes
         id: cleaned-notes
         run: |
-          NOTES="${{ steps.generated-notes.outputs.release-notes }}"
           NOTES=$(echo $NOTES | sed '/## What/d')
           NOTES=$(echo $NOTES | sed '/## New Contributors/,$d')
           echo "release-notes=${NOTES}" >> "$GITHUB_OUTPUT"
+        env:
+          NOTES: ${{ steps.generated-notes.outputs.release-notes }}
 
       - name: Create release
         uses: softprops/action-gh-release@v2

diff --git a/src/Illuminate/Database/DetectsLostConnections.php b/src/Illuminate/Database/DetectsLostConnections.php
@@ -19,6 +19,7 @@ protected function causedByLostConnection(Throwable $e)
 
         return Str::contains($message, [
             'server has gone away',
+            'Server has gone away',
             'no connection to the server',
             'Lost connection',
             'is dead or not enabled',

diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php
@@ -591,6 +591,10 @@ public function storagePath($path = '')
             return $this->joinPaths($this->storagePath ?: $_ENV['LARAVEL_STORAGE_PATH'], $path);
         }
 
+        if (isset($_SERVER['LARAVEL_STORAGE_PATH'])) {
+            return $this->joinPaths($this->storagePath ?: $_SERVER['LARAVEL_STORAGE_PATH'], $path);
+        }
+
         return $this->joinPaths($this->storagePath ?: $this->basePath('storage'), $path);
     }
 

diff --git a/tests/Routing/RoutingUrlGeneratorTest.php b/tests/Routing/RoutingUrlGeneratorTest.php
@@ -779,7 +779,7 @@ public function testSignedUrl()
 
         $this->assertTrue($url->hasValidSignature($request));
 
-        $request = Request::create($url->signedRoute('foo').'?tempered=true');
+        $request = Request::create($url->signedRoute('foo').'?tampered=true');
 
         $this->assertFalse($url->hasValidSignature($request));
     }
@@ -827,7 +827,7 @@ public function testSignedRelativeUrl()
 
         $this->assertTrue($url->hasValidSignature($request, false));
 
-        $request = Request::create($url->signedRoute('foo', [], null, false).'?tempered=true');
+        $request = Request::create($url->signedRoute('foo', [], null, false).'?tampered=true');
 
         $this->assertFalse($url->hasValidSignature($request, false));
     }
@@ -906,7 +906,7 @@ public function testSignedUrlWithKeyResolver()
 
         $this->assertTrue($url->hasValidSignature($request));
 
-        $request = Request::create($url->signedRoute('foo').'?tempered=true');
+        $request = Request::create($url->signedRoute('foo').'?tampered=true');
 
         $this->assertFalse($url->hasValidSignature($request));