chore: merge and resolve conflicts with main

passageidentity · Dec 3, 2024 · 08e85b5 · 08e85b5
2 parents 5552db6 + 9b527e4
commit 08e85b5
Show file tree

Hide file tree

Showing 10 changed files with 427 additions and 266 deletions.
diff --git a/.github/workflows/on-pull-request.yml b/.github/workflows/on-pull-request.yml
@@ -22,7 +22,7 @@ jobs:
           php-version: '8.3'
           tools: phpcs, cs2pr
       - name: Lint
-        run: phpcs -q --report=checkstyle custom | cs2pr
+        run: phpcs -q --standard=PSR12 --report=checkstyle custom | cs2pr
   format:
     name: Format
     runs-on: ubuntu-latest
@@ -33,7 +33,7 @@ jobs:
           php-version: '8.3'
           tools: php-cs-fixer, cs2pr
       - name: Format
-        run: php-cs-fixer fix --dry-run --allow-risky=yes --format=checkstyle | cs2pr
+        run: php-cs-fixer fix --dry-run --allow-risky=yes --format=checkstyle --rules=@PSR12 | cs2pr
   test:
     name: Test
     runs-on: ubuntu-latest

diff --git a/composer.json b/composer.json
@@ -27,6 +27,11 @@
             "homepage": "https://passage.1password.com/"
         }
     ],
+    "scripts": {
+        "lint": "./vendor/bin/phpcs  --standard=PSR12 --report=full custom",
+        "phpcs-fix": "./vendor/bin/phpcbf  --standard=PSR12 custom",
+        "format": "./vendor/bin/php-cs-fixer fix --allow-risky=yes --rules=@PSR12"
+    },
     "require": {
         "php": "^7.4 || ^8.0",
         "ext-curl": "*",
@@ -40,6 +45,7 @@
     "require-dev": {
         "phpunit/phpunit": "^9.0",
         "friendsofphp/php-cs-fixer": "^3.5",
+        "squizlabs/php_codesniffer": "^3.0",
         "vlucas/phpdotenv": "^5.6"
     },
     "autoload": {