passageidentity · ctran88 · Jan 7, 2025 · Jan 7, 2025 · Jan 7, 2025 · Jan 7, 2025
diff --git a/.github/workflows/on-pull-request.yml b/.github/workflows/on-pull-request.yml
@@ -22,7 +22,7 @@ jobs:
           php-version: '8.1'
           tools: phpcs, cs2pr
       - name: Lint
-        run: phpcs -q --standard=PSR12 --report=checkstyle custom | cs2pr
+        run: phpcs -q --standard=PSR12 --report=checkstyle src | cs2pr
   format:
     name: Format
     runs-on: ubuntu-latest
@@ -45,4 +45,4 @@ jobs:
       - name: Install dependencies
         run: composer install
       - name: Test
-        run: ./vendor/bin/phpunit custom/test/
+        run: ./vendor/bin/phpunit tests/
diff --git a/composer.json b/composer.json
@@ -28,8 +28,8 @@
         }
     ],
     "scripts": {
-        "lint": "./vendor/bin/phpcs --standard=PSR12 --report=full custom",
-        "phpcs-fix": "./vendor/bin/phpcbf --standard=PSR12 custom",
+        "lint": "./vendor/bin/phpcs --standard=PSR12 --report=full src",
+        "phpcs-fix": "./vendor/bin/phpcbf --standard=PSR12 src",
         "format": "./vendor/bin/php-cs-fixer fix --allow-risky=yes --rules=@PSR12"
     },
     "require": {
@@ -53,12 +53,12 @@
             "OpenAPI\\Client\\": [
                 "generated/lib/"
             ],
-            "Passage\\Client\\": "custom/lib/"
+            "Passage\\Client\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Passage\\Client\\Test\\": "custom/test/"
+            "Passage\\Client\\Test\\": "tests/"
         }
     }
 }
diff --git a/custom/lib/Auth.php → src/Auth.php b/custom/lib/Auth.php → src/Auth.php
diff --git a/custom/lib/CreateUserArgs.php → src/CreateUserArgs.php b/custom/lib/CreateUserArgs.php → src/CreateUserArgs.php
diff --git a/custom/lib/MagicLinkArgsBase.php → src/MagicLinkArgsBase.php b/custom/lib/MagicLinkArgsBase.php → src/MagicLinkArgsBase.php
diff --git a/custom/lib/MagicLinkOptions.php → src/MagicLinkOptions.php b/custom/lib/MagicLinkOptions.php → src/MagicLinkOptions.php
diff --git a/custom/lib/MagicLinkWithEmailArgs.php → src/MagicLinkWithEmailArgs.php b/custom/lib/MagicLinkWithEmailArgs.php → src/MagicLinkWithEmailArgs.php
diff --git a/custom/lib/MagicLinkWithPhoneArgs.php → src/MagicLinkWithPhoneArgs.php b/custom/lib/MagicLinkWithPhoneArgs.php → src/MagicLinkWithPhoneArgs.php
diff --git a/custom/lib/MagicLinkWithUserArgs.php → src/MagicLinkWithUserArgs.php b/custom/lib/MagicLinkWithUserArgs.php → src/MagicLinkWithUserArgs.php
diff --git a/custom/lib/Passage.php → src/Passage.php b/custom/lib/Passage.php → src/Passage.php
diff --git a/custom/lib/PassageError.php → src/PassageError.php b/custom/lib/PassageError.php → src/PassageError.php
diff --git a/custom/lib/PassageUser.php → src/PassageUser.php b/custom/lib/PassageUser.php → src/PassageUser.php
diff --git a/custom/lib/UpdateUserArgs.php → src/UpdateUserArgs.php b/custom/lib/UpdateUserArgs.php → src/UpdateUserArgs.php
diff --git a/custom/lib/User.php → src/User.php b/custom/lib/User.php → src/User.php
diff --git a/custom/test/AuthTest.php → tests/AuthTest.php b/custom/test/AuthTest.php → tests/AuthTest.php
@@ -19,8 +19,8 @@ public function setUp(): void
     {
         parent::setUp();
 
-        include __DIR__ . '/../../vendor/autoload.php';
-        Dotenv::createUnsafeImmutable(__DIR__ . '/../../')->safeLoad();
+        include __DIR__ . '/../vendor/autoload.php';
+        Dotenv::createUnsafeImmutable(__DIR__ . '/..')->safeLoad();
 
         $this->appId = getenv('APP_ID');
         $this->apiKey = getenv('API_KEY');

diff --git a/custom/test/PassageErrorTest.php → tests/PassageErrorTest.php b/custom/test/PassageErrorTest.php → tests/PassageErrorTest.php
diff --git a/custom/test/PassageTest.php → tests/PassageTest.php b/custom/test/PassageTest.php → tests/PassageTest.php
diff --git a/custom/test/UserTest.php → tests/UserTest.php b/custom/test/UserTest.php → tests/UserTest.php
@@ -20,8 +20,8 @@ public function setUp(): void
     {
         parent::setUp();
 
-        include __DIR__ . '/../../vendor/autoload.php';
-        Dotenv::createUnsafeImmutable(__DIR__ . '/../../')->safeLoad();
+        include __DIR__ . '/../vendor/autoload.php';
+        Dotenv::createUnsafeImmutable(__DIR__ . '/..')->safeLoad();
 
         $this->appId = getenv('APP_ID');
         $this->apiKey = getenv('API_KEY');