merge remote

thephpleague · Mar 22, 2023 · ce7e35f · ce7e35f
2 parents ac02716 + f6b884e
commit ce7e35f
Show file tree

Hide file tree

Showing 5 changed files with 106 additions and 102 deletions.
diff --git a/.github/workflows/backwards-compatibility.yml b/.github/workflows/backwards-compatibility.yml
@@ -14,7 +14,8 @@ jobs:
         uses: "actions/checkout@v2"
         with:
           fetch-depth: 0
-
+      - name: Fix git safe.directory in container
+        run: mkdir -p /home/runner/work/_temp/_github_home && printf "[safe]\n\tdirectory = /github/workspace" > /home/runner/work/_temp/_github_home/.gitconfig
       - name: "Backwards Compatibility Check"
         uses: docker://nyholm/roave-bc-check-ga
         with:

diff --git a/tests/AuthorizationServerTest.php b/tests/AuthorizationServerTest.php
@@ -32,6 +32,7 @@
 class AuthorizationServerTest extends TestCase
 {
     const DEFAULT_SCOPE = 'basic';
+    const REDIRECT_URI = 'https://foo/bar';
 
     public function setUp(): void
     {
@@ -86,7 +87,7 @@ public function testRespondToRequest()
         $client = new ClientEntity();
 
         $client->setConfidential();
-        $client->setRedirectUri('http://foo/bar');
+        $client->setRedirectUri(self::REDIRECT_URI);
 
         $clientRepository = $this->getMockBuilder(ClientRepositoryInterface::class)->getMock();
         $clientRepository->method('getClientEntity')->willReturn($client);
@@ -246,7 +247,7 @@ public function testCompleteAuthorizationRequest()
         $server->enableGrantType($grant);
 
         $client = new ClientEntity();
-        $client->setRedirectUri('https://foo/bar');
+        $client->setRedirectUri(self::REDIRECT_URI);
 
         $authRequest = new AuthorizationRequest();
         $authRequest->setAuthorizationApproved(true);
@@ -263,7 +264,7 @@ public function testCompleteAuthorizationRequest()
     public function testValidateAuthorizationRequest()
     {
         $client = new ClientEntity();
-        $client->setRedirectUri('http://foo/bar');
+        $client->setRedirectUri(self::REDIRECT_URI);
         $client->setConfidential();
         $clientRepositoryMock = $this->getMockBuilder(ClientRepositoryInterface::class)->getMock();
         $clientRepositoryMock->method('getClientEntity')->willReturn($client);

diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
@@ -1,6 +1,6 @@
 <?php
 
-error_reporting(E_ALL);
+\error_reporting(E_ALL);
 
 if (!@include_once __DIR__ . '/../vendor/autoload.php') {
     $message = <<<MSG