diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 65edd7b..4670340 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -1,46 +1,21 @@ -name: CI +name: 'CI' -on: [push, pull_request] +on: [ push, pull_request, workflow_dispatch ] jobs: - testLinux: - name: PHP Unit - runs-on: ubuntu-latest - - strategy: - matrix: - php-version: ['8.0', '8.1', '8.2'] - 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_dokusioc + test: + strategy: + fail-fast: false + matrix: + php-version: [ '8.1', '8.2' ] + dokuwiki-branch: [ 'master', 'stable' ] + include: + - php-version: '8.0' + dokuwiki-branch: 'stable' + - php-version: '8.3' + dokuwiki-branch: 'master' + + uses: mprins/.github/.github/workflows/test.yml@main + with: + php-version: "${{ matrix.php-version }}" + dokuwiki-branch: "${{ matrix.dokuwiki-branch }}" diff --git a/action.php b/action.php index 7d90dc2..b60be16 100644 --- a/action.php +++ b/action.php @@ -414,6 +414,8 @@ private function getDokuUrl($url = null) public function isRdfXmlRequest(): bool { + if (!isset($_SERVER['HTTP_ACCEPT']) return false; + // get accepted types $http_accept = trim($_SERVER['HTTP_ACCEPT']); diff --git a/plugin.info.txt b/plugin.info.txt index d648d31..039670d 100644 --- a/plugin.info.txt +++ b/plugin.info.txt @@ -1,7 +1,7 @@ base dokusioc author Mark C. Prins (previously Michael Haschke) email mprins@users.sf.net -date 2023-06-26 +date 2024-06-10 name DokuSIOC desc It adds an alternate meta link of the SIOC-RDF/XML document to HTML head, creates SIOC version of wiki content (RDF/XML export), checks the requested application type (content negotiation) and it pings PTSW.com for pushing updates. url https://www.dokuwiki.org/plugin:dokusioc