Merge branch 'main' into update-code-php8

fix private email
update code to php 8
2026-03-24 21:02:08 +01:00 · 2026-02-25 14:11:20 +01:00 · 2026-02-25 14:09:00 +01:00 · 2026-02-19 15:46:54 +01:00 · 2026-02-19 15:45:56 +01:00 · 2026-02-19 15:45:47 +01:00
9 changed files with 13 additions and 39 deletions
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -23,7 +23,7 @@ jobs:
          tools: composer:v2
      - uses: ramsey/composer-install@v3
      - name: 'Lint the PHP source code'
-        run: ./vendor/bin/parallel-lint src tests
+        run: ./vendor/bin/parallel-lint src test

  coding-standards:
    name: Coding Standards
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,3 @@ composer.phar
 composer.lock
 .DS_Store
 .phpunit.result.cache
-/.phpunit.cache/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,14 +18,6 @@ All Notable changes to `oauth2-apple` will be documented in this file
 ### Security
 - Nothing

-## 0.5.0 - 2026-02-25
-
-### Fixed
- Updated code base to php 8
-
-### Removed
- lcobucci/jwt library
-
 ## 0.4.0 - 2026-02-19

 ### Added
--- a/composer.json
+++ b/composer.json
@@ -41,7 +41,7 @@
    },
    "autoload-dev": {
        "psr-4": {
-            "League\\OAuth2\\Client\\Test\\": "tests/src/"
+            "League\\OAuth2\\Client\\Test\\": "test/src/"
        }
    },
    "extra": {
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,31 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         cacheDirectory=".phpunit.cache"
-         executionOrder="depends,defects"
-         beStrictAboutCoverageMetadata="true"
-         beStrictAboutOutputDuringTests="true"
-         displayDetailsOnPhpunitDeprecations="true"
-         failOnPhpunitDeprecation="true"
-         failOnRisky="true"
-         failOnWarning="true">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false"
+         convertDeprecationsToExceptions="false" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false"
+         stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd">
+    <logging/>
    <testsuites>
-        <testsuite name="default">
-            <directory>tests</directory>
+        <testsuite name="Package Test Suite">
+            <directory suffix=".php">./test/</directory>
+            <exclude>./test/src/Provider/TestApple.php</exclude>
        </testsuite>
    </testsuites>
-
-    <source restrictNotices="true" restrictWarnings="true">
-        <include>
-            <directory>src</directory>
-        </include>
-    </source>
-
-    <coverage>
-        <report>
-            <clover outputFile="./build/coverage/log/coverage.xml"/>
-            <html outputDirectory="./build/coverage/html" lowUpperBound="35" highLowerBound="70"/>
-        </report>
-    </coverage>
 </phpunit>
--- a/tests/src/Provider/AppleTest.php
+++ b/tests/src/Provider/AppleTest.php
@@ -19,7 +19,7 @@ class AppleTest extends TestCase
    /**
     * @return Apple
     */
-    private function getProvider(): Apple
+    private function getProvider()
    {
        return new Apple([
            'clientId' => 'mock.example',
--- a/tests/src/Provider/TestApple.php
+++ b/tests/src/Provider/TestApple.php
--- a/tests/src/Token/AppleAccessTokenTest.php
+++ b/tests/src/Token/AppleAccessTokenTest.php
@@ -2,11 +2,12 @@

 namespace League\OAuth2\Client\Test\Token;

+use Firebase\JWT\Key;
 use League\OAuth2\Client\Token\AppleAccessToken;
-use Mockery as m;
 use PHPUnit\Framework\Attributes\PreserveGlobalState;
 use PHPUnit\Framework\Attributes\RunInSeparateProcess;
 use PHPUnit\Framework\TestCase;
+use Mockery as m;

 class AppleAccessTokenTest extends TestCase
 {
--- a/tests/src/private_key.pem
+++ b/tests/src/private_key.pem
Author	SHA1	Message	Date
AUDUL	344c96aeaf	Merge branch 'main' into update-code-php8	2026-02-25 14:11:20 +01:00
loic	db5789d4d2	fix private email	2026-02-25 14:09:00 +01:00
loic	6d17ab2e2d	update code to php 8 remove lcobucci/jwt	2026-02-19 15:46:54 +01:00
loic	31ece38879	update code to php 8 remove lcobucci/jwt	2026-02-19 15:45:56 +01:00
loic	7a03f29cc5	update code to php 8 remove lcobucci/jwt	2026-02-19 15:45:47 +01:00
loic	23a643494f	update code to php 8 remove lcobucci/jwt	2026-02-19 15:41:16 +01:00
loic	e645a8afa2	update code to php 8 remove lcobucci/jwt	2026-02-19 15:40:07 +01:00
loic	fdcae826ed	update code to php 8 remove lcobucci/jwt	2026-02-19 15:37:55 +01:00
loic	50fe6079e3	update code to php 8 remove lcobucci/jwt	2026-02-19 15:33:03 +01:00
loic	4b913d776d	update code to php 8 remove lcobucci/jwt	2026-02-19 15:32:25 +01:00
loic	6952cbec6d	update code to php 8 remove lcobucci/jwt	2026-02-19 15:30:16 +01:00
loic	ba795803bb	update code to php 8 remove lcobucci/jwt	2026-02-19 15:29:43 +01:00
loic	a72cfeba83	update code to php 8 remove lcobucci/jwt	2026-02-19 15:29:01 +01:00
loic	831c8e0e25	update code to php 8 remove lcobucci/jwt	2026-02-19 15:27:56 +01:00
loic	942a875dc6	update code to php 8 remove lcobucci/jwt	2026-02-19 15:20:18 +01:00