Skip to content

Commit

Permalink
Bump funiq/geoPHP from 2.0.2 to 2.0.3 (#14)
Browse files Browse the repository at this point in the history
* Bump funiq/geoPHP from 2.0.2 to 2.0.3

* Add autofix workflow

* formatting

* formatting
  • Loading branch information
mprins authored Nov 8, 2023
1 parent 3900cc2 commit 4b22697
Show file tree
Hide file tree
Showing 16 changed files with 204 additions and 131 deletions.
57 changes: 57 additions & 0 deletions .github/autoFix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: "Auto-Fix code"
# see https://github.com/dokuwiki/dokuwiki/blob/master/.github/workflows/autoFix.yml
on:
push:
branches:
- master

jobs:
autofix:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
tools: phpcbf, rector

- name: retrieve script
run: wget https://raw.github.com/splitbrain/dokuwiki-travis/master/travis.sh

- name: Install DokuWiki
env:
CI_SERVER: 1
DOKUWIKI: master
run: sh travis.sh

- name: Setup Cache
uses: actions/cache@v3
with:
path: _test/.rector-cache
key: ${{ runner.os }}-rector-${{ hashFiles('_test/rector.php') }}

- name: Run Rector
run: rector process --config _test/rector.php --no-diffs

- name: Run PHP CodeSniffer autofixing
continue-on-error: true # even if not all errors are fixed, we want to create a PR
run: phpcbf --standard=_test/phpcs_MigrationAdjustments.xml

- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
with:
commit-message: "🤖 Rector and PHPCS fixes"
title: "🤖 Automatic code style fixes"
body: |
These changes were made automatically by running rector and phpcbf.
Please carefully check the changes before merging. Please note that unit tests are not run for automated pull requests - so if in doubt, manually test the branch before merging.
If you disagree with the changes, simply clean the code yourself and create a new pull request. This PR automatically closes when no more changes are suggested by rector and phpcbf.
delete-branch: true
branch: "bot/autofix"
2 changes: 1 addition & 1 deletion .github/workflows/phpCS.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: PHP Code Style

on: [ push, pull_request ]
on: [ pull_request ]

jobs:
phpcs:
Expand Down
18 changes: 9 additions & 9 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
*/
class helper_plugin_geophp extends DokuWiki_Plugin
{

final public function getMethods(): array
{
// no methods, just a loader.
Expand Down
2 changes: 1 addition & 1 deletion plugin.info.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
base geophp
author Mark C. Prins
email [email protected]
date 2023-07-14
date 2023-11-08
name geoPHP plugin for DokuWiki
desc Provides access to the geoPHP library available at https://github.com/funiq/geoPHP.
url https://www.dokuwiki.org/plugin:geophp
18 changes: 18 additions & 0 deletions vendor/autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,24 @@

// autoload.php @generated by Composer

if (PHP_VERSION_ID < 50600) {
if (!headers_sent()) {
header('HTTP/1.1 500 Internal Server Error');
}
$err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
if (!ini_get('display_errors')) {
if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
fwrite(STDERR, $err);
} elseif (!headers_sent()) {
echo $err;
}
}
trigger_error(
$err,
E_USER_ERROR
);
}

require_once __DIR__ . '/composer/autoload_real.php';

return ComposerAutoloaderInit8c920a9ce68d92f821701ab2e03316d3::getLoader();
Loading

0 comments on commit 4b22697

Please sign in to comment.