port: bring v2.14.0 fixes into 3x-new

.github/workflows/release.yml

@@ -0,0 +1,169 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - "v*"
+
+permissions:
+  contents: write
+
+jobs:
+  build-release:
+    runs-on: ubuntu-latest
+
+    services:
+      mysql:
+        image: mysql:8.0
+        env:
+          MYSQL_ROOT_PASSWORD: root
+          MYSQL_DATABASE: modx
+        ports:
+          - 3306:3306
+        options: >-
+          --health-cmd="mysqladmin ping -h 127.0.0.1 -uroot -proot"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=10
+
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: "8.1"
+          extensions: pdo_mysql, mysqli, gd, zip, json, xml, mbstring, curl, tokenizer
+          coverage: none
+          tools: composer
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: "24"
+
+      - name: Verify tag matches PKG_VERSION
+        run: |
+          TAG_VERSION="${GITHUB_REF_NAME#v}"
+          TAG_VERSION="${TAG_VERSION%-pl}"
+          PKG_VERSION="$(sed -nE "s/^[[:space:]]*const PKG_VERSION = ['\"]([^'\"]+)['\"].*/\1/p" _build/build.config.php | head -1)"
+          if [ "$PKG_VERSION" != "$TAG_VERSION" ]; then
+            echo "PKG_VERSION=${PKG_VERSION} does not match tag ${GITHUB_REF_NAME} (${TAG_VERSION})"
+            exit 1
+          fi
+
+      - name: Build frontend assets
+        run: |
+          npm install
+          npx grunt
+
+      - name: Install Fenom
+        working-directory: core/components/pdotools
+        run: composer install --no-dev --no-interaction --prefer-dist
+
+      - name: Download MODX 3.0.5-pl
+        run: |
+          curl -fsSL -o modx.zip https://modx.s3.amazonaws.com/releases/3.0.5/modx-3.0.5-pl.zip
+          unzip -q modx.zip
+          mv modx-3.0.5-pl modx
+          rm modx.zip
+
+      - name: Install MODX (CLI)
+        working-directory: modx
+        run: |
+          MODX_ROOT="${GITHUB_WORKSPACE}/modx"
+          cat > setup/config.xml <<XML
+          <modx>
+            <database_type>mysql</database_type>
+            <database_server>127.0.0.1</database_server>
+            <database>modx</database>
+            <database_user>root</database_user>
+            <database_password>root</database_password>
+            <database_connection_charset>utf8mb4</database_connection_charset>
+            <database_charset>utf8mb4</database_charset>
+            <database_collation>utf8mb4_unicode_ci</database_collation>
+            <table_prefix>modx_</table_prefix>
+            <https_port>443</https_port>
+            <http_host>localhost</http_host>
+            <inplace>0</inplace>
+            <unpacked>0</unpacked>
+            <language>en</language>
+            <cmsadmin>admin</cmsadmin>
+            <cmspassword>AdminAdmin1</cmspassword>
+            <cmsadminemail>admin@example.com</cmsadminemail>
+            <core_path>${MODX_ROOT}/core/</core_path>
+            <context_mgr_path>${MODX_ROOT}/manager/</context_mgr_path>
+            <context_mgr_url>/manager/</context_mgr_url>
+            <context_connectors_path>${MODX_ROOT}/connectors/</context_connectors_path>
+            <context_connectors_url>/connectors/</context_connectors_url>
+            <context_web_path>${MODX_ROOT}/</context_web_path>
+            <context_web_url>/</context_web_url>
+            <remove_setup_directory>0</remove_setup_directory>
+          </modx>
+          XML
+          sed -i 's/^[[:space:]]*//' setup/config.xml
+          php setup/index.php --installmode=new --config="${MODX_ROOT}/setup/config.xml"
+          test -f core/config/config.inc.php
+
+      - name: Disable auto-install for release build
+        run: |
+          sed -i "s/const PKG_AUTO_INSTALL = true;/const PKG_AUTO_INSTALL = false;/" _build/build.config.php
+          sed -i "s/define('PKG_AUTO_INSTALL', true)/define('PKG_AUTO_INSTALL', false)/" _build/build.config.php
+
+      - name: Build transport package
+        run: |
+          php -r '
+          $_SERVER["MODX_BASE_PATH"] = getenv("GITHUB_WORKSPACE") . "/modx/";
+          require getenv("GITHUB_WORKSPACE") . "/_build/build.transport.php";
+          '
+
+      - name: Collect transport package
+        run: |
+          mkdir -p _packages
+          find modx/core/packages -name 'pdotools-*.transport.zip' -exec cp -t _packages {} +
+          ls -la _packages/
+          test -n "$(ls _packages/pdotools-*.transport.zip 2>/dev/null)"
+          python3 - <<'PY'
+          import glob, sys, zipfile
+          zpath = glob.glob('_packages/pdotools-*.transport.zip')[0]
+          needle = b'xPDO\\Transport\\xPDOObjectVehicle'
+          with zipfile.ZipFile(zpath) as zf:
+              manifests = [
+                  n for n in zf.namelist()
+                  if n.endswith('manifest.php') or n.endswith('/manifest') or n == 'manifest'
+              ]
+              if not manifests:
+                  print('ERROR: no manifest in transport zip', file=sys.stderr)
+                  sys.exit(1)
+              for name in manifests:
+                  data = zf.read(name)
+                  if needle in data:
+                      print(f'ERROR: namespaced vehicle class in {name}', file=sys.stderr)
+                      sys.exit(1)
+                  print(f'OK: {name} has no namespaced xPDOObjectVehicle')
+          print('package ready:', zpath)
+          PY
+
+      - name: Prepare release notes
+        env:
+          TAG_NAME: ${{ github.ref_name }}
+          REPOSITORY: ${{ github.repository }}
+        run: |
+          VERSION="${TAG_NAME#v}"
+          awk -v ver="$VERSION" '
+            $0 ~ "^## \\[" ver "(-pl)?\\]" {print; show=1; next}
+            $0 ~ "^" ver "(-pl)?[[:space:]]*\\(" {print; show=1; next}
+            show && (/^## \[/ || /^[0-9]+\.[0-9]+\.[0-9]+/) {exit}
+            show {print}
+          ' core/components/pdotools/docs/changelog.txt > release-notes.md
+          if ! grep -q . release-notes.md; then
+            echo "WARN: no changelog section for ${VERSION}; using compare link fallback" >&2
+            echo "**Full Changelog**: https://github.com/${REPOSITORY}/compare/v${VERSION}" > release-notes.md
+          fi
+
+      - name: Publish GitHub release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: _packages/*.transport.zip
+          body_path: release-notes.md
+          fail_on_unmatched_files: true

Gruntfile.js

@@ -46,11 +46,6 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-contrib-cssmin');
     grunt.loadNpmTasks('grunt-contrib-watch');
     grunt.loadNpmTasks('grunt-banner');
-    grunt.loadNpmTasks('grunt-ssh');
-    grunt.loadNpmTasks('grunt-sass');
-    grunt.loadNpmTasks('grunt-postcss');
-    grunt.loadNpmTasks('grunt-string-replace');
-    grunt.renameTask('string-replace', 'bump');
 
     //register the task
     grunt.registerTask('default', ['uglify', 'cssmin']);

_build/build.config.php

@@ -3,7 +3,7 @@
 const PKG_NAME = 'pdoTools';
 const PKG_NAME_LOWER = 'pdotools';
 
-const PKG_VERSION = '3.0.2';
+const PKG_VERSION = '3.0.3';
 const PKG_RELEASE = 'pl';
 const PKG_AUTO_INSTALL = false;
 

assets/components/pdotools/connector.php

@@ -6,6 +6,9 @@
 $modx->initialize('web');
 $modx->services->add('error', new MODX\Revolution\Error\modError($modx));
 $modx->error = $modx->services->get('error');
+if (!defined('MODX_CONNECTOR_INCLUDED')) {
+    define('MODX_CONNECTOR_INCLUDED', 1);
+}
 
 // Switch context if needed
 if (!empty($_REQUEST['pageId'])) {

assets/components/pdotools/js/jquery.pdopage.js

@@ -126,7 +126,7 @@
         addPage: function () {
             var _this = this;
             var params = this.hashGet();
-            var current = params[this.key] || 1;
+            var current = params[this.key] || _this.page || 1;
             $(this.settings.link).each(function () {
                 var href = $(this).prop('href');
                 var match = href.match(new RegExp(_this.key + '=(\\d+)'));
@@ -169,10 +169,13 @@
             $.get(window.location.pathname, params, function (response) {
                 if (response) {
                     _this.wrapper.find(pagination).replaceWith(response.pagination);
-                    if (mode == 'append') {
+                    if (!_this.history) {
+                        $(_this.settings.pagination).hide();
+                    }
+                    if (mode === 'append') {
                         _this.wrapper.find(rows).append(response.output);
                         if (_this.mode == 'button') {
-                            if (response.pages == response.page) {
+                            if (response.pages == response.page || response.pages == 0) {
                                 $(_this.settings.more).hide();
                             } else {
                                 $(_this.settings.more).show();
@@ -183,8 +186,18 @@
                         waitAnimation.remove();
                     } else {
                         _this.wrapper.find(rows).html(response.output);
-                        if (mode == 'force' && _this.history) {
-                            _this.hashSet(params);
+                        if (mode === 'force') {
+                            _this.page = response.page || 1;
+                            if (_this.settings.mode == 'button') {
+                                if (response.pages == response.page || response.pages == 0) {
+                                    $(_this.settings.more).hide();
+                                } else {
+                                    $(_this.settings.more).show();
+                                }
+                            }
+                            if (_this.history) {
+                                _this.hashSet(params);
+                            }
                         }
                     }
                     _this.wrapper.trigger('afterLoad', [_this, _this.settings, response]);
@@ -319,7 +332,7 @@
                 }
             }
             if (!this.oldBrowser) {
-                if (hash.length != 0) {
+                if (hash.length !== 0) {
                     hash = '?' + hash.substr(1);
                 }
                 window.history.pushState({pdoPage: window.location.pathname + hash}, '', window.location.pathname + hash);