fix #2126 filter commonsbooking_isCurrentUserAdmin not granting edit permissions

.github/actions/build-plugin/action.yml

@@ -20,25 +20,18 @@ runs:
 
     - name: Cache Composer packages
       id: composer-cache
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: vendor
         key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
         restore-keys: |
           ${{ runner.os }}-php-
 
-    - name: Install dependencies
-      run: |
-        composer install --no-dev --prefer-dist --no-progress
-      shell: bash
-
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version-file: '.nvmrc'
         cache: 'npm'
-    - run: npm ci --legacy-peer-deps --include=dev
-      shell: bash
-
+
     - name: Run build script (skip zip generation)
       if: ${{ inputs.generate_zip == 'false' }}
       run: bin/build-zip.sh --skip-zip

.github/workflows/benchmark.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout PR branch
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           ref: ${{ github.head_ref }}
 
@@ -46,7 +46,7 @@ jobs:
           php vendor/bin/phpbench run tests/benchmark --report=aggregate > /tmp/pr-benchmark.txt
 
       - name: Checkout master branch
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           ref: master
 

.github/workflows/build-docs.yml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           fetch-depth: 0
 
@@ -44,7 +44,7 @@ jobs:
 
       - name: Upload documentation
         if: github.event_name == 'push' && github.ref == 'refs/heads/master'
-        uses: SamKirkland/FTP-Deploy-Action@v4.3.6
+        uses: SamKirkland/FTP-Deploy-Action@v4.4.0
         with:
           server: ${{ secrets.CBPAGE_SERVER }}
           username: ${{ secrets.CBPAGE_USER }}

.github/workflows/build-rc.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
 
-     - uses: actions/checkout@v6
+     - uses: actions/checkout@v7
 
      - uses: ./.github/actions/build-plugin
 

.github/workflows/compile.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-24.04
     name: Check i18n coverage
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - uses: shivammathur/setup-php@v2
         with:
@@ -47,7 +47,7 @@ jobs:
     needs: i18n-coverage
     steps:
 
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
       with:
         ref: ${{ github.ref }} # checkout the latest commit so that we can push changes
 

.github/workflows/copilot-setup-steps.yml

@@ -27,7 +27,7 @@ jobs:
     # If you do not check out your code, Copilot will do this for you.
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Set up MySQL
         run: |

.github/workflows/e2e.yml

@@ -36,20 +36,24 @@ jobs:
           - {name: 'trunk', version: 'WordPress/WordPress#master'}
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - uses: ./.github/actions/build-plugin
 
       - name: Install wp-env systemwide
         shell: bash
         run: npm -g i @wordpress/env
 
-      - name: Overwrite PHP versions & core for wp-env
-        if: matrix.core.version != 'null'
-        run: jq '. + {"phpVersion":"${{ matrix.php }}","core":"${{ matrix.core.version }}"}' tests/cypress/wordpress-files/e2e-override.json > .wp-env.override.json
+      - name: Overwrite PHP version & core for wp-env
+        run: >
+          jq
+          --arg php "${{ matrix.php }}"
+          --arg core "${{ matrix.core.version }}"
+          '. + {"phpVersion": $php} + (if $core == "null" then {} else {"core": $core} end)'
+          tests/cypress/wordpress-files/e2e-override.json > .wp-env.test.override.json
 
       - name: setup wp env
-        run: npm run env:start
+        run: npm run env:test:start
 
       - name: install test data for e2e test
         run: npm run cypress:setup
@@ -69,15 +73,23 @@ jobs:
 
       - name: Enable API
         run: |
-          wp-env run tests-cli wp option patch insert commonsbooking_options_api api-activated on
-          wp-env run tests-cli wp option patch insert commonsbooking_options_api apikey_not_required on
+          wp-env --config=.wp-env.test.json run cli wp option patch insert commonsbooking_options_api api-activated on
+          wp-env --config=.wp-env.test.json run cli wp option patch insert commonsbooking_options_api apikey_not_required on
 
       - name: Checkout GBFS validator
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           repository: MobilityData/gbfs-validator
           path: gbfs-validator
 
+      - name: Cache GBFS validator dependencies
+        uses: actions/cache@v6
+        with:
+          path: gbfs-validator/node_modules
+          key: ${{ runner.os }}-gbfs-validator-${{ hashFiles('gbfs-validator/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gbfs-validator-
+
       - name: Install GBFS validator dependencies
         working-directory: gbfs-validator
         run: yarn

.github/workflows/phpcbf-check.yml

@@ -16,12 +16,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'  # Adjust this to your PHP version
+          php-version: '8.1'
           extensions: uopz
 
 

.github/workflows/phpstan.yml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-24.04
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
 
     # TODO Use the composer action below
     - uses: shivammathur/setup-php@v2
@@ -44,7 +44,7 @@ jobs:
       run: |
         composer dump-autoload -o
 
-    #- uses: actions/checkout@v6
+    #- uses: actions/checkout@v7
     #- uses: php-actions/composer@v6
 
     - name: PHPStan Static Analysis

.github/workflows/phpunit.yml

@@ -38,7 +38,7 @@ jobs:
           - { name: 'trunk', version: 'trunk' }
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
 
     - name: Set up MySQL
       run: |
@@ -53,13 +53,12 @@ jobs:
     - name: Install SVN
       run: sudo apt install -y subversion
 
-
     - name: Validate composer.json and composer.lock
       run: composer validate
 
     - name: Cache Composer packages
       id: composer-cache
-      uses: actions/cache@v5
+      uses: actions/cache@v6
       with:
         path: vendor
         key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
@@ -84,7 +83,7 @@ jobs:
         php vendor/bin/phpunit
 
     - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@v6
+      uses: codecov/codecov-action@v7
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         files: ./build/logs/clover.xml

.github/workflows/prettier.yml

@@ -7,8 +7,10 @@ jobs:
   prettier:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - uses: actions/setup-node@v6
+        with:
+          node-version-file: '.nvmrc'
       - run: |
           yarn
           yarn prettier . --check

.github/workflows/release.yml

@@ -8,9 +8,11 @@ jobs:
   publish:
     name: New Release
     runs-on: ubuntu-24.04
+    permissions:
+      contents: write
     steps:
 
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
 
     - uses: ./.github/actions/build-plugin
 
@@ -34,11 +36,6 @@ jobs:
         SLUG: commonsbooking # optional, remove if GitHub repo name matches SVN slug, including capitalization
 
     - name: Upload release asset
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      uses: softprops/action-gh-release@v3
       with:
-        upload_url: ${{ github.event.release.upload_url }}
-        asset_path: ${{ steps.deploy.outputs.zip-path }}
-        asset_name: ${{ github.event.repository.name }}.zip
-        asset_content_type: application/zip
+        files: ${{ steps.deploy.outputs.zip-path }}

.github/workflows/wpcs.yml

@@ -16,7 +16,7 @@ jobs:
       name: WPCS
       runs-on: ubuntu-latest
       steps:
-        - uses: actions/checkout@v6
+        - uses: actions/checkout@v7
         - name: Install dependencies
           run: composer install --prefer-dist --no-progress --ignore-platform-reqs
         - name: WPCS check

.github/workflows/zip-pr.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
 
-     - uses: actions/checkout@v6
+     - uses: actions/checkout@v7
        with:
         fetch-depth: 0  # Important for getting full commit history
 
@@ -29,7 +29,7 @@ jobs:
 
      - name: Upload zip
        if: ${{ !startsWith(github.head_ref, 'dependabot') }}
-       uses: SamKirkland/FTP-Deploy-Action@v4.3.6
+       uses: SamKirkland/FTP-Deploy-Action@v4.4.0
        with:
          exclude: |
           **

.nvmrc

@@ -1 +1 @@
-v20.20.0
+v24.16.0

.wp-env.json

@@ -1,6 +1,6 @@
 {
   "phpVersion" : "8.1",
-  "core" : "Wordpress/Wordpress#6.9",
+  "core" : "Wordpress/Wordpress#7.0",
   "plugins" : [
     ".",
     "https://downloads.wordpress.org/plugin/wp-crontrol.zip",
@@ -11,25 +11,13 @@
     "https://downloads.wordpress.org/plugin/disable-welcome-messages-and-tips.zip"
   ],
   "port" : 1000,
-  "testsPort" : 1001,
+  "testsEnvironment" : false,
   "config" : {
     "WP_DEBUG" : true,
     "WP_DEBUG_LOG" : true,
     "WP_DEBUG_DISPLAY" : false
   },
   "themes" : [
     "flegfleg/kasimir-theme"
-  ],
-  "env" : {
-    "tests" : {
-      "mappings" : {
-        "wp-content/plugins/commonsbooking" : "."
-      },
-      "config" : {
-        "WP_DEBUG" : true,
-        "WP_DEBUG_LOG" : true,
-        "WP_DEBUG_DISPLAY" : false
-      }
-    }
-  }
+  ]
 }

.wp-env.test.json

@@ -0,0 +1,23 @@
+{
+  "phpVersion" : "8.1",
+  "core" : "Wordpress/Wordpress#6.9",
+  "plugins" : [
+    ".",
+    "https://downloads.wordpress.org/plugin/wp-crontrol.zip",
+    "https://downloads.wordpress.org/plugin/wordpress-importer.zip",
+    "https://downloads.wordpress.org/plugin/query-monitor.zip",
+    "https://downloads.wordpress.org/plugin/wp-mail-logging.zip",
+    "https://downloads.wordpress.org/plugin/jsm-show-post-meta.zip",
+    "https://downloads.wordpress.org/plugin/disable-welcome-messages-and-tips.zip"
+  ],
+  "port" : 1001,
+  "testsEnvironment" : false,
+  "config" : {
+    "WP_DEBUG" : true,
+    "WP_DEBUG_LOG" : true,
+    "WP_DEBUG_DISPLAY" : false
+  },
+  "themes" : [
+    "flegfleg/kasimir-theme"
+  ]
+}