Merge pull request #30 from mprins/CI-fixes

Update CI workflow

Author: mprins

.github/workflows/CI.yml

@@ -1,46 +1,16 @@
-name: CI
+name: 'CI'
 
-on: [ push, pull_request ]
+on: [ push, pull_request, workflow_dispatch ]
 
 jobs:
-  testLinux:
-    name: PHP Unit
-    runs-on: ubuntu-latest
-
+  action:
     strategy:
+      fail-fast: false
       matrix:
-        php-version: [ '8.0', '8.1', '8.2' ]
+        php-version: [ '8.1', '8.2', '8.3' ]
         dokuwiki-branch: [ 'master', 'stable' ]
-      fail-fast: false
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          extensions: mbstring, intl, bz2
-
-      - name: Setup problem matchers
-        run: |
-          echo ::add-matcher::${{ runner.tool_cache }}/php.json
-          echo ::add-matcher::${{ runner.tool_cache }}/phpunit.json
-
-      - name: Download DokuWiki Test-setup
-        run: wget https://raw.github.com/splitbrain/dokuwiki-travis/master/travis.sh
-
-      - name: Install DokuWiki
-        env:
-          CI_SERVER: 1
-          DOKUWIKI: ${{ matrix.dokuwiki-branch }}
-        run: sh travis.sh
-
-      - name: Setup PHPUnit
-        run: |
-          php _test/fetchphpunit.php
-          ./_test/phpunit.phar --version
 
-      - name: Run PHPUnit
-        run: |
-          cd _test && PRESERVE_TMP=false ./phpunit.phar --stderr --verbose --debug --group plugin_pagequery
+    uses: mprins/.github/.github/workflows/test.yml@main
+    with:
+      php-version: ${{ matrix.php-version }}
+      dokuwiki-branch: ${{ matrix.dokuwiki-branch }}

syntax.php

@@ -240,7 +240,8 @@ public function render($format, Doku_Renderer $renderer, $data): bool
         $group_opts = [];
         $message    = '';
 
-        $lang = ['jump_section' => $this->getLang('jump_section'), 'link_to_top'  => $this->getLang('link_to_top'), 'no_results'   => $this->getLang('no_results')];
+        $lang = ['jump_section' => $this->getLang('jump_section'), 'link_to_top'  => $this->getLang('link_to_top'),
+            'no_results'   => $this->getLang('no_results')];
         require_once DOKU_PLUGIN . 'pagequery/PageQuery.php';
         $pq = new PageQuery($lang);
 
@@ -267,13 +268,13 @@ public function render($format, Doku_Renderer $renderer, $data): bool
                 // search by page name or path only
                 $results = $pq->pageLookup($query, $data['fullregex'], $incl_ns, $excl_ns);
             }
-            $results = $pq->validatePages($results, $data['hidestart'], $data['maxns']);
             $no_result = false;
             $sort_array = [];
             if ($results == false) {
                 $no_result = true;
                 $message   = $this->getLang('regex_error');
             } elseif (!empty($results)) {
+                $results = $pq->validatePages($results, $data['hidestart'], $data['maxns']);
                 // prepare the necessary sorting arrays, as per users options
                 [$sort_array, $sort_opts, $group_opts] = $pq->buildSortingArray($results, $data);