Add SymlinkProtectFilesystemAdapter

.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
+indent_size = 2

.github/workflows/codecoverage.yml

@@ -50,7 +50,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          tools: composer:v2, phive
+          tools: composer:v2
           extensions: fileinfo, gd
           coverage: ${{ matrix.php == env.COVERAGE_PHP_VERSION && 'xdebug' || 'none' }}
 
@@ -70,37 +70,6 @@ jobs:
       # TODO: merge master into this branch and run tests against what master will become, not just the isolated branch.
       # NB: how would that affect tj-actions/changed-files?
 
-      - name: Install Phive tools
-        if: ${{ github.event.pull_request.author_association == 'COLLABORATOR' || github.event.pull_request.author_association == 'OWNER' }} # secrets are not available to users without write access
-        # Keys taken from `phive status`
-        # `phive status | grep -oE '[A-F0-9]{16}' | tr '\n' ',' | sed 's/,$//'`
-        # sed -i "s|^\s*phive install --trust-gpg-keys .*| phive install --trust-gpg-keys $(phive status | grep -oE '[A-F0-9]{16}' | paste -sd,)|" .github/workflows/phpstan.yml
-        run: |
-          phive install --trust-gpg-keys A9DB489A9190DE9B,4AA394086372C20A
-          phive status
-        env:
-          # We need to be authenticated to skip GitHub rate limits
-          # Generate a key at: https://github.com/settings/tokens, "classic"
-          # Approve the 2FA notification on your phone (I presume/hope)
-          # "Note" what it is for, I use ~PHIVE_GH_RATE_LIMIT_BRIANHENRY_EXPIRES_DEC182026 etc.
-          # Choose "Expiration", "Custom"
-          # For "Select Date", the Expiration date can only be set ~364 days ahead
-          # No scopes are needed, scroll down and click "Generate Token"
-          # Copied the displayed key
-          # Visit https://github.com/your/repo/settings/secrets/actions
-          # Click "New repository secret" and fill it in
-          # Do the same at https://github.com/your/repo/settings/secrets/dependabot
-          #
-          # Fix for rate limited GitHub API requests. See https://github.com/phar-io/phive/issues/384#issuecomment-1337064012
-          GITHUB_AUTH_TOKEN: ${{ secrets.PHIVE_GH_RATE_LIMIT_BRIANHENRY_EXPIRES_DEC182026 }}
-
-      - name: Install Phive tools (unauthenticated)
-        # secrets are not available to users without write access
-        if: ${{ github.event.pull_request.author_association != 'COLLABORATOR' && github.event.pull_request.author_association != 'OWNER' }}
-        run: |
-          phive install --trust-gpg-keys A9DB489A9190DE9B,4AA394086372C20A
-          phive status
-
       - name: Install PHP dependencies
         run: composer update --prefer-dist --verbose
 

.github/workflows/main.yml

@@ -22,7 +22,7 @@ on:
 
 concurrency:
   # Cancel previous runs of this workflow if they are testing the same branch
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.head_ref) || github.sha }}
   cancel-in-progress: true
 
 jobs:
@@ -42,40 +42,9 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          tools: composer:v2, phive
+          tools: composer:v2
           extensions: fileinfo, gd, zip
 
-      - name: Install Phive tools
-        if: ${{ github.event.pull_request.author_association == 'COLLABORATOR' || github.event.pull_request.author_association == 'OWNER' }}
-        # Keys taken from `phive status`
-        # `phive status | grep -oE '[A-F0-9]{16}' | tr '\n' ',' | sed 's/,$//'`
-        # sed -i "s|^\s*phive install --trust-gpg-keys .*| phive install --trust-gpg-keys $(phive status | grep -oE '[A-F0-9]{16}' | paste -sd,)|" .github/workflows/phpstan.yml
-        run: |
-          phive install --trust-gpg-keys A9DB489A9190DE9B,4AA394086372C20A
-          phive status
-        env:
-          # We need to be authenticated to skip GitHub rate limits
-          # Generate a key at: https://github.com/settings/tokens, "classic"
-          # Approve the 2FA notification on your phone (I presume/hope)
-          # "Note" what it is for, I use ~PHIVE_GH_RATE_LIMIT_BRIANHENRY_EXPIRES_DEC182026 etc.
-          # Choose "Expiration", "Custom"
-          # For "Select Date", the Expiration date can only be set ~364 days ahead
-          # No scopes are needed, scroll down and click "Generate Token"
-          # Copied the displayed key
-          # Visit https://github.com/your/repo/settings/secrets/actions
-          # Click "New repository secret" and fill it in
-          # Do the same at https://github.com/your/repo/settings/secrets/dependabot
-          #
-          # Fix for rate limited GitHub API requests. See https://github.com/phar-io/phive/issues/384#issuecomment-1337064012
-          GITHUB_AUTH_TOKEN: ${{ secrets.PHIVE_GH_RATE_LIMIT_BRIANHENRY_EXPIRES_DEC182026 }}
-
-      - name: Install Phive tools (unauthenticated)
-        # secrets are not available to users without write access
-        if: ${{ github.event.pull_request.author_association != 'COLLABORATOR' && github.event.pull_request.author_association != 'OWNER' }}
-        run: |
-          phive install --trust-gpg-keys A9DB489A9190DE9B,4AA394086372C20A
-          phive status
-
       - name: Setup problem matcher for PHPUnit
         run: |
           echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
@@ -87,7 +56,7 @@ jobs:
           composer --version
 
       - name: Install dependencies
-        run: composer install --prefer-dist --no-progress
+        run: composer install --prefer-dist --verbose
 
       - name: Run previously workflows' failed tests first
         uses: BrianHenryIE/bh-phpunit-failed-tests-action@main
@@ -142,40 +111,9 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: '7.4'
-          tools: composer, cs2pr, phive
+          tools: composer:v2, cs2pr
           extensions: fileinfo, gd
 
-      - name: Install Phive tools
-        if: ${{ github.event.pull_request.author_association == 'COLLABORATOR' || github.event.pull_request.author_association == 'OWNER' }} # secrets are not available to users without write access
-        # Keys taken from `phive status`
-        # `phive status | grep -oE '[A-F0-9]{16}' | tr '\n' ',' | sed 's/,$//'`
-        # sed -i "s|^\s*phive install --trust-gpg-keys .*| phive install --trust-gpg-keys $(phive status | grep -oE '[A-F0-9]{16}' | paste -sd,)|" .github/workflows/phpstan.yml
-        run: |
-          phive install --trust-gpg-keys A9DB489A9190DE9B,4AA394086372C20A
-          phive status
-        env:
-          # We need to be authenticated to skip GitHub rate limits
-          # Generate a key at: https://github.com/settings/tokens, "classic"
-          # Approve the 2FA notification on your phone (I presume/hope)
-          # "Note" what it is for, I use ~PHIVE_GH_RATE_LIMIT_BRIANHENRY_EXPIRES_DEC182026 etc.
-          # Choose "Expiration", "Custom"
-          # For "Select Date", the Expiration date can only be set ~364 days ahead
-          # No scopes are needed, scroll down and click "Generate Token"
-          # Copied the displayed key
-          # Visit https://github.com/your/repo/settings/secrets/actions
-          # Click "New repository secret" and fill it in
-          # Do the same at https://github.com/your/repo/settings/secrets/dependabot
-          #
-          # Fix for rate limited GitHub API requests. See https://github.com/phar-io/phive/issues/384#issuecomment-1337064012
-          GITHUB_AUTH_TOKEN: ${{ secrets.PHIVE_GH_RATE_LIMIT_BRIANHENRY_EXPIRES_DEC182026 }}
-
-      - name: Install Phive tools (unauthenticated)
-        # secrets are not available to users without write access
-        if: ${{ github.event.pull_request.author_association != 'COLLABORATOR' && github.event.pull_request.author_association != 'OWNER' }}
-        run: |
-          phive install --trust-gpg-keys A9DB489A9190DE9B,4AA394086372C20A
-          phive status
-
       - name: Debugging
         run: |
           php --version

.github/workflows/phpstan.yml

@@ -25,41 +25,10 @@ jobs:
         uses: shivammathur/setup-php@ccf2c627fe61b1b4d924adfcbd19d661a18133a0 # v2.35.2
         with:
           php-version: 7.4
-          tools: composer:v2, phive, cs2pr
+          tools: composer:v2, cs2pr
           extensions: fileinfo, gd
           coverage: none
 
-      - name: Install Phive tools
-        if: ${{ github.event.pull_request.author_association == 'COLLABORATOR' || github.event.pull_request.author_association == 'OWNER' }}
-        # Keys taken from `phive status`
-        # `phive status | grep -oE '[A-F0-9]{16}' | tr '\n' ',' | sed 's/,$//'`
-        # sed -i "s|^\s*phive install --trust-gpg-keys .*| phive install --trust-gpg-keys $(phive status | grep -oE '[A-F0-9]{16}' | paste -sd,)|" .github/workflows/phpstan.yml
-        run: |
-          phive install --trust-gpg-keys A9DB489A9190DE9B,4AA394086372C20A
-          phive status
-        env:
-          # We need to be authenticated to skip GitHub rate limits
-          # Generate a key at: https://github.com/settings/tokens, "classic"
-          # Approve the 2FA notification on your phone (I presume/hope)
-          # "Note" what it is for, I use ~PHIVE_GH_RATE_LIMIT_BRIANHENRY_EXPIRES_DEC182026 etc.
-          # Choose "Expiration", "Custom"
-          # For "Select Date", the Expiration date can only be set ~364 days ahead
-          # No scopes are needed, scroll down and click "Generate Token"
-          # Copied the displayed key
-          # Visit https://github.com/your/repo/settings/secrets/actions
-          # Click "New repository secret" and fill it in
-          # Do the same at https://github.com/your/repo/settings/secrets/dependabot
-          #
-          # Fix for rate limited GitHub API requests. See https://github.com/phar-io/phive/issues/384#issuecomment-1337064012
-          GITHUB_AUTH_TOKEN: ${{ secrets.PHIVE_GH_RATE_LIMIT_BRIANHENRY_EXPIRES_DEC182026 }}
-
-      - name: Install Phive tools (unauthenticated)
-        # secrets are not available to users without write access
-        if: ${{ github.event.pull_request.author_association != 'COLLABORATOR' && github.event.pull_request.author_association != 'OWNER' }}
-        run: |
-          phive install --trust-gpg-keys A9DB489A9190DE9B,4AA394086372C20A
-          phive status
-
       - name: Install Project Dependencies
         run: composer install
 
@@ -77,11 +46,11 @@ jobs:
       - name: Get PhpStan level
         id: phpstan-level
         run: |
-          # After adding the example commands at the top of the phpstan.neon file, which contain the word "level", we 
-          # now have to use `tail`+`head` to skip the first few lines. (I'm sure there's a suitable regex, but this is 
+          # After adding the example commands at the top of the phpstan.neon file, which contain the word "level", we
+          # now have to use `tail`+`head` to skip the first few lines. (I'm sure there's a suitable regex, but this is
           # easy to implement and follow)
           LEVEL=$(tail -n +3 phpstan.neon | head -n 10 | grep level | sed "s/[^0-9]*//")
-          echo "level=$LEVEL" >> "$GITHUB_OUTPUT" 
+          echo "level=$LEVEL" >> "$GITHUB_OUTPUT"
 
       - name: Check success
         if: steps.run-phpstan.outcome == 'success'

.github/workflows/release.yml

@@ -23,40 +23,9 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: 7.4
-          tools: composer:v2, phive
+          tools: composer:v2
           extensions: fileinfo, gd
 
-      - name: Install Phive tools
-        if: ${{ github.event.pull_request.author_association == 'COLLABORATOR' || github.event.pull_request.author_association == 'OWNER' }} # secrets are not available to users without write access
-        # Keys taken from `phive status`
-        # `phive status | grep -oE '[A-F0-9]{16}' | tr '\n' ',' | sed 's/,$//'`
-        # sed -i "s|^\s*phive install --trust-gpg-keys .*| phive install --trust-gpg-keys $(phive status | grep -oE '[A-F0-9]{16}' | paste -sd,)|" .github/workflows/phpstan.yml
-        run: |
-          phive install --trust-gpg-keys A9DB489A9190DE9B,4AA394086372C20A
-          phive status
-        env:
-          # We need to be authenticated to skip GitHub rate limits
-          # Generate a key at: https://github.com/settings/tokens, "classic"
-          # Approve the 2FA notification on your phone (I presume/hope)
-          # "Note" what it is for, I use ~PHIVE_GH_RATE_LIMIT_BRIANHENRY_EXPIRES_DEC182026 etc.
-          # Choose "Expiration", "Custom"
-          # For "Select Date", the Expiration date can only be set ~364 days ahead
-          # No scopes are needed, scroll down and click "Generate Token"
-          # Copied the displayed key
-          # Visit https://github.com/your/repo/settings/secrets/actions
-          # Click "New repository secret" and fill it in
-          # Do the same at https://github.com/your/repo/settings/secrets/dependabot
-          #
-          # Fix for rate limited GitHub API requests. See https://github.com/phar-io/phive/issues/384#issuecomment-1337064012
-          GITHUB_AUTH_TOKEN: ${{ secrets.PHIVE_GH_RATE_LIMIT_BRIANHENRY_EXPIRES_DEC182026 }}
-
-      - name: Install Phive tools (unauthenticated)
-        # secrets are not available to users without write access
-        if: ${{ github.event.pull_request.author_association != 'COLLABORATOR' && github.event.pull_request.author_association != 'OWNER' }}
-        run: |
-          phive install --trust-gpg-keys A9DB489A9190DE9B,4AA394086372C20A
-          phive status
-
       - name: Install dependencies
         run: composer install --no-dev --prefer-dist --no-progress
 

composer.json

@@ -15,13 +15,19 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "license": "MIT",
+    "repositories": {
+        "composer/composer": {
+            "type": "vcs",
+            "url": "https://github.com/brianhenryie/composer"
+        }
+    },
     "require": {
         "ext-json": "*",
         "brianhenryie/simple-php-code-parser": "^0.15.3",
-        "composer-runtime-api": "^2.0",
         "composer/class-map-generator": "^1.6.0",
-        "composer/composer": "^2.6.0",
-        "elazar/flystream": "^0.5.0|^1",
+        "composer/composer": "dev-main#4b766fabec26294c1aebbd828d359de642bf3099",
+        "composer-runtime-api": "^2.0",
+        "elazar/flystream": "^0.6.0|^1.4",
         "json-mapper/json-mapper": "^2.0.0",
         "league/flysystem": "^2.1|^3.0",
         "league/flysystem-memory": "*",
@@ -65,6 +71,16 @@
         "phpunit/phpunit": "^9|^10",
         "squizlabs/php_codesniffer": "^3.5"
     },
+    "extra": {
+        "patches": {
+            "composer/composer": {
+                "Improve stream wrapper support": "https://github.com/composer/composer/pull/12396.patch"
+            },
+            "elazar/flystream": {
+                "Catch exceptions; return false ": "https://github.com/elazar/flystream/pull/17.patch"
+            }
+        }
+    },
     "conflict": {
       "json-mapper/json-mapper": "2.23.0 | 2.24.0"
     },
@@ -86,11 +102,6 @@
           "phpcs || true",
           "@analyze"
         ],
-        "cs-fix": [
-          "phpcbf || true",
-          "phpcs || true",
-          "@analyze"
-        ],
         "cs-changes": [
           "updated_files=$(echo $(git diff --name-only `git merge-base origin/master HEAD` | grep php | tr '\\n' '\\0' | xargs -0 ls -1df 2>/dev/null)); if [ -n \"$updated_files\" ]; then phpcbf $updated_files || true; phpcs $updated_files || true; else echo \"No modified php files.\"; fi;",
           "@analyze-changes"
@@ -99,6 +110,10 @@
           "updated_files=$(echo $(git diff --name-only `git merge-base origin/master HEAD` | grep php | tr '\\n' '\\0' | xargs -0 ls -1df 2>/dev/null)); if [ -n \"$updated_files\" ]; then phpcbf $updated_files || true; phpcs $updated_files || true; else echo \"No modified php files.\"; fi;",
           "@analyze-changes-strict"
         ],
+        "cs-fix": [
+            "phpcbf || true",
+            "@cs"
+        ],
         "install-phive-dependencies": [
             "if [ -z \"$(command -v phive)\" ]; then echo \"Phive is not installed. Run 'brew install gpg phive' or see https://phar.io/.\"; exit 1; fi;",
             "phive install"
@@ -107,21 +122,6 @@
             "Composer\\Config::disableProcessTimeout",
             "phpunit --stop-on-failure --order-by=random"
         ],
-        "test-changes": [
-            "if [ -z \"$(command -v ./tools/php-diff-test)\" ]; then echo \"Please install 'php-diff-test' with 'phive install'.\"; exit 1; fi;",
-            "if [ \"$XDEBUG_MODE\" != \"coverage\" ]; then echo 'Run with XDEBUG_MODE=coverage composer test-changes'; exit 1; fi;",
-            "phpunit --filter=\"$(./tools/php-diff-test filter --input-files tests/_reports/php.cov --granularity=line)\" --coverage-text;"
-        ],
-        "test-changes-report": [
-            "if [ -z \"$(command -v ./tools/php-diff-test)\" ]; then echo \"Please install 'php-diff-test' with 'phive install'.\"; exit 1; fi;",
-            "if [ -z \"$(command -v ./tools/phpcov)\" ]; then echo \"Please install 'phpcov' with 'phive install'.\"; exit 1; fi;",
-            "if [ \"$XDEBUG_MODE\" != \"coverage\" ]; then echo 'Run with XDEBUG_MODE=coverage composer test-changes-report'; exit 1; fi;",
-            "if [ -d \"tests/_reports/diff\" ]; then rm -rf tests/_reports/diff; fi;",
-            "phpunit --filter=\"$(./tools/php-diff-test filter --input-files tests/_reports/php.cov --granularity file)\" --coverage-text --coverage-php tests/_reports/diff/php.cov -d memory_limit=-1;",
-            "./tools/php-diff-test coverage --input-files tests/_reports/diff/php.cov --output-file tests/_reports/diff/php.cov;",
-            "./tools/phpcov merge tests/_reports/diff --html tests/_reports/diff/html;",
-            "open tests/_reports/diff/html/index.html"
-        ],
         "test-coverage": [
             "Composer\\Config::disableProcessTimeout",
             "if [ \"$XDEBUG_MODE\" != \"coverage\" ]; then echo \"Run with 'XDEBUG_MODE=coverage composer test-coverage'\"; exit 1; fi;",