Merge pull request #73 from mprins/openlayers-820

Upgrade to OpenLayers 8.2.0

.github/workflows/CI.yml

@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: [ '8.0', '8.1', '8.2' ]
+        php-version: [ '8.0', '8.1', '8.2', '8.3' ]
         dokuwiki-branch: [ 'master', 'stable' ]
       fail-fast: false
 
@@ -24,6 +24,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           extensions: mbstring, intl, bz2, gd, imagick
+          ini-values: pcre.jit=0
 
       - name: Setup problem matchers
         run: |
@@ -34,16 +35,28 @@ jobs:
         run: wget https://raw.github.com/splitbrain/dokuwiki-travis/master/travis.sh
 
       - name: Install DokuWiki and required plugins
-        env:
-          CI_SERVER: 1
-          DOKUWIKI: ${{ matrix.dokuwiki-branch }}
-        run: sh travis.sh
+        id: dokuwiki-env
+        uses: dokuwiki/github-action/.github/actions/dokuenv@main
+        with:
+          branch: ${{ matrix.dokuwiki-branch }}
+
+      - name: Install Composer Dependencies
+        run: |
+          cd _test
+          composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader --no-scripts
 
       - name: Setup PHPUnit
+        # old branches
         run: |
-          php _test/fetchphpunit.php
-          ./_test/phpunit.phar --version
+          if [ -f _test/fetchphpunit.php ]; then
+            php _test/fetchphpunit.php
+          fi
 
       - name: Run PHPUnit
         run: |
-          cd _test && PRESERVE_TMP=false ./phpunit.phar --stderr --verbose --debug --group plugin_openlayersmap
+          cd _test
+          if [ -f phpunit.phar ]; then
+            php phpunit.phar --verbose --stderr --group ${{ steps.dokuwiki-env.outputs.type }}_${{ steps.dokuwiki-env.outputs.base }}
+          else
+            composer exec -- phpunit --verbose --stderr --group ${{ steps.dokuwiki-env.outputs.type }}_${{ steps.dokuwiki-env.outputs.base }}
+          fi

ol/README.md

@@ -7,7 +7,7 @@ This will get the full/legacy build of OpenLayers. See https://openlayers.org/do
 
 ```shell
 cd ol
-export OL_VERSION=v8.1.0
+export OL_VERSION=v8.2.0
 wget https://github.com/openlayers/openlayers/releases/download/$OL_VERSION/$OL_VERSION-dist.zip
 unzip -jo $OL_VERSION-dist.zip  dist/* ol.css ol.css.map
 rm $OL_VERSION-dist.zip
@@ -20,7 +20,7 @@ A slightly more complicated build process is required to get an optimized-fot-si
 ```shell
 cd ol
 rm -rf openlayers
-export OL_VERSION=v8.1.0
+export OL_VERSION=v8.2.0
 git clone https://github.com/openlayers/openlayers.git
 cd openlayers
 git checkout -b $OL_VERSION-custom $OL_VERSION

plugin.info.txt

@@ -1,7 +1,7 @@
 base   openlayersmap
 author Mark C. Prins
 email  [email protected]
-date   2023-09-09
+date   2023-11-15
 name   OpenLayers map plugin for DokuWiki
 desc   Provides a syntax for rendering an OpenLayers based map in a wiki page. Uses OpenLayers 8.1.0
 url    https://www.dokuwiki.org/plugin:openlayersmap