Merge branch 'cleanup'

Author: lkrms

.git-blame-ignore-revs

@@ -1,29 +1,16 @@
 # .git-blame-ignore-revs
-# Update formatting
 c81cea1c82fb2b4c049939d0b4344ebbc29387f1
-# Update formatting (add `.prettyphp.dist`, reinstate heredoc indentation)
 34c5a7370e6e34bdbbfe7ac8efea832be3d723b2
-# Update formatting
 9dacde70ddb437225c09231eda61e895f51000d8
-# Update formatting
 2c5640274a5e1f161dbe504c7d26989251400d26
-# Update formatting
 66d9a27e1c57650dc0166e42611b648c8af5e09d
-# Adopt depth-first sort order for imports
 331128cdc554df67264373f63c04611c563e53be
-# Update formatting
 4f46da1b16823b11c1dfeaeb8e434f1169777075
-# Update formatting
 fce872ecb25b202192c47f2888f63bc67022d214
-# Update formatting
 78fa7d39618b7a885e6ecd557fc39559b91d1417
-# Update formatting
 f4a62e11068984999612806ec5525dca15d65d08
-# Add initial PHP CS Fixer config, add namespace prefixes to constants
 55ada029c6a7610323284ff3a46332ffee74d2ea
-# Update pretty-php and formatting
 969868ed14bebc451decf297c3adb8d75c9ecb9f
-# Update formatting
 23156859e88c8153b0b5f2ef6d5c57edd028e240
-# Update formatting
 448e4fb5a9db70358b573cfab15d2db3fc5961be
+358ef0878303383e256f0621f2c517db601995b6

.gitattributes

@@ -6,6 +6,7 @@
 /.php-cs-fixer.* export-ignore
 /.prettyphp export-ignore
 /.vscode export-ignore
+/composer.lock export-ignore
 /docs export-ignore
 /phpstan* export-ignore
 /phpstan-baseline-7.4.neon linguist-generated

.github/workflows/ci.yml

@@ -41,7 +41,7 @@ jobs:
           restore-keys: composer-cache-${{ runner.os }}-
 
       - name: Install PHP dependencies
-        run: composer install --no-interaction --no-progress
+        run: composer install --no-interaction --no-progress --no-dev
 
       - name: Check generated files
         run: scripts/generate.php --check
@@ -112,8 +112,9 @@ jobs:
           - macos-latest
         php-version:
           - "8.3"
-          - "8.2"
         include:
+          - os: ubuntu-latest
+            php-version: "8.2"
           - os: ubuntu-latest
             php-version: "8.1"
           - os: ubuntu-latest
@@ -122,13 +123,6 @@ jobs:
             php-version: "7.4"
           - os: windows-latest
             php-version: "7.4"
-        exclude:
-          # As of 2024-03-13, macos-latest + 8.3 is slooooow (5+ seconds per
-          # process spawned?), but macos-latest + 8.2 runs normally
-          - os: macos-latest
-            php-version: "8.3"
-          - os: windows-latest
-            php-version: "8.2"
 
     runs-on: ${{ matrix.os }}
 

.gitignore

@@ -1,12 +1,10 @@
-/composer.lock
+#/composer.lock
 /vendor
 composer.phar
 
 .env
 *.log
 /var
-!/tests/.env
-/tests/.tmp
 
 /build
 /docs/api

.prettyphp

@@ -17,5 +17,7 @@
     "enable": [
         "preserve-one-line",
         "strict-lists"
-    ]
+    ],
+    "operatorsFirst": true,
+    "heredocIndent": "none"
 }

composer.json

@@ -86,6 +86,9 @@
         "sort-packages": true,
         "allow-plugins": {
             "phpstan/extension-installer": true
+        },
+        "platform": {
+            "php": "7.4.33"
         }
     },
     "extra": {