From 0598846af1d50a09fb359984a0bc7181725f375c Mon Sep 17 00:00:00 2001
From: Henning Leutz <leutz@pcsg.de>
Date: Fri, 3 Feb 2017 15:08:20 +0100
Subject: [PATCH 01/13] fix: dev-master
---
composer.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/composer.json b/composer.json
index 443b2e5..155aab5 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"name": "quiqqer/authgoogle2fa",
"type": "quiqqer-module",
"description": "QUIQQER Authentication with Google Authenticator",
- "version": "dev-dev",
+ "version": "dev-master",
"license": "GPL-3.0+",
"authors": [
{
--
GitLab
From edb9931afd402f42eca76fede26960e2155855ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20M=C3=BCller?= <p.mueller@pcsg.de>
Date: Wed, 11 Dec 2019 09:36:28 +0100
Subject: [PATCH 02/13] refactor: removed version from composer.json
---
composer.json | 55 +++++++++++++++++++++++++--------------------------
1 file changed, 27 insertions(+), 28 deletions(-)
diff --git a/composer.json b/composer.json
index f7279fa..433e934 100644
--- a/composer.json
+++ b/composer.json
@@ -1,30 +1,29 @@
{
- "name": "quiqqer/authgoogle2fa",
- "type": "quiqqer-module",
- "description": "QUIQQER Authentication with Google Authenticator",
- "version": "dev-master",
- "license": "GPL-3.0+",
- "homepage": "https://www.quiqqer.com",
- "authors": [
- {
- "name": "Patrick Müller",
- "email": "p.mueller@pcsg.de",
- "homepage": "http://www.pcsg.de",
- "role": "Developer"
+ "name": "quiqqer\/authgoogle2fa",
+ "type": "quiqqer-module",
+ "description": "QUIQQER Authentication with Google Authenticator",
+ "license": "GPL-3.0+",
+ "homepage": "https:\/\/www.quiqqer.com",
+ "authors": [
+ {
+ "name": "Patrick M\u00fcller",
+ "email": "p.mueller@pcsg.de",
+ "homepage": "http:\/\/www.pcsg.de",
+ "role": "Developer"
+ }
+ ],
+ "support": {
+ "email": "support@pcsg.de",
+ "url": "http:\/\/www.pcsg.de"
+ },
+ "require": {
+ "quiqqer\/quiqqer": ">=1.1|dev-master|dev-dev",
+ "pragmarx\/google2fa": "2.*",
+ "bacon\/bacon-qr-code": "~1.0"
+ },
+ "autoload": {
+ "psr-4": {
+ "QUI\\Auth\\Google2Fa\\": "src\/QUI\/Auth\/Google2Fa"
+ }
}
- ],
- "support": {
- "email": "support@pcsg.de",
- "url": "http://www.pcsg.de"
- },
- "require": {
- "quiqqer/quiqqer": ">=1.1|dev-master|dev-dev",
- "pragmarx/google2fa": "2.*",
- "bacon/bacon-qr-code": "~1.0"
- },
- "autoload": {
- "psr-4": {
- "QUI\\Auth\\Google2Fa\\": "src/QUI/Auth/Google2Fa"
- }
- }
-}
+}
\ No newline at end of file
--
GitLab
From 50a9ae4b185c86358c1f3616eab4e5eb676a1e1a Mon Sep 17 00:00:00 2001
From: Jan Wennrich <jan.wennrich@pcsg.de>
Date: Fri, 24 May 2024 17:01:50 +0200
Subject: [PATCH 03/13] chore: add .gitattributes file
---
.gitattributes | 15 +++++++++++++++
.gitignore | 2 ++
2 files changed, 17 insertions(+)
create mode 100644 .gitattributes
create mode 100644 .gitignore
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..9ab59b1
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,15 @@
+
+# Ignore developer files when exporting
+.gitattributes export-ignore
+.gitignore export-ignore
+.gitlab-ci.yml export-ignore
+.phive export-ignore
+captainhook.json export-ignore
+phpcs.xml.dist export-ignore
+phpstan-baseline.neon export-ignore
+phpstan.dist.neon export-ignore
+phpunit.dist.xml export-ignore
+tests export-ignore
+
+# Explicitly set file type and line endings for PHP files, improves git diff output
+*.php text eol=lf diff=php
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a8c0d1b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+
+tools/
--
GitLab
From c92a004f1c5b2ca7bdc76ee0afa279e21cf1040f Mon Sep 17 00:00:00 2001
From: Jan Wennrich <jan.wennrich@pcsg.de>
Date: Fri, 24 May 2024 17:01:51 +0200
Subject: [PATCH 04/13] chore: setup PHPStan for project tooling
---
.gitignore | 2 ++
.phive/phars.xml | 4 ++++
phpstan-baseline.neon | 0
phpstan.dist.neon | 9 +++++++++
tests/phpstan-bootstrap.php | 13 +++++++++++++
5 files changed, 28 insertions(+)
create mode 100644 .phive/phars.xml
create mode 100644 phpstan-baseline.neon
create mode 100644 phpstan.dist.neon
create mode 100644 tests/phpstan-bootstrap.php
diff --git a/.gitignore b/.gitignore
index a8c0d1b..0920b95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
tools/
+
+phpstan.neon
diff --git a/.phive/phars.xml b/.phive/phars.xml
new file mode 100644
index 0000000..f909b52
--- /dev/null
+++ b/.phive/phars.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phive xmlns="https://phar.io/phive">
+ <phar name="phpstan" version="1.11.1" installed="1.11.1" location="./tools/phpstan" copy="false"/>
+</phive>
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
new file mode 100644
index 0000000..e69de29
diff --git a/phpstan.dist.neon b/phpstan.dist.neon
new file mode 100644
index 0000000..e929f5a
--- /dev/null
+++ b/phpstan.dist.neon
@@ -0,0 +1,9 @@
+includes:
+ - phpstan-baseline.neon
+
+parameters:
+ level: 8
+ paths:
+ - src
+ - ajax
+ tipsOfTheDay: false
diff --git a/tests/phpstan-bootstrap.php b/tests/phpstan-bootstrap.php
new file mode 100644
index 0000000..b61ff4b
--- /dev/null
+++ b/tests/phpstan-bootstrap.php
@@ -0,0 +1,13 @@
+<?php
+
+if (!defined('QUIQQER_SYSTEM')) {
+ define('QUIQQER_SYSTEM', true);
+}
+
+if (!defined('QUIQQER_AJAX')) {
+ define('QUIQQER_AJAX', true);
+}
+
+putenv("QUIQQER_OTHER_AUTOLOADERS=KEEP");
+
+require_once __DIR__ . '/../../../../bootstrap.php';
--
GitLab
From 7d8902d565ba029742922b93b095e18585124ae5 Mon Sep 17 00:00:00 2001
From: Jan Wennrich <jan.wennrich@pcsg.de>
Date: Fri, 24 May 2024 17:01:51 +0200
Subject: [PATCH 05/13] chore: setup PHPUnit for project tooling
---
.gitignore | 4 ++++
.phive/phars.xml | 1 +
phpunit.dist.xml | 8 ++++++++
tests/phpunit-bootstrap.php | 11 +++++++++++
4 files changed, 24 insertions(+)
create mode 100644 phpunit.dist.xml
create mode 100644 tests/phpunit-bootstrap.php
diff --git a/.gitignore b/.gitignore
index 0920b95..b9f7c5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,7 @@
tools/
phpstan.neon
+
+.phpunit.result.cache
+
+phpunit.xml
diff --git a/.phive/phars.xml b/.phive/phars.xml
index f909b52..6984891 100644
--- a/.phive/phars.xml
+++ b/.phive/phars.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
<phar name="phpstan" version="1.11.1" installed="1.11.1" location="./tools/phpstan" copy="false"/>
+ <phar name="phpunit" version="^10.5.20" installed="10.5.20" location="./tools/phpunit" copy="false"/>
</phive>
diff --git a/phpunit.dist.xml b/phpunit.dist.xml
new file mode 100644
index 0000000..f6c7bec
--- /dev/null
+++ b/phpunit.dist.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="tests/phpunit-bootstrap.php">
+ <testsuites>
+ <testsuite name="Tests">
+ <directory>tests/</directory>
+ </testsuite>
+ </testsuites>
+</phpunit>
diff --git a/tests/phpunit-bootstrap.php b/tests/phpunit-bootstrap.php
new file mode 100644
index 0000000..eca92fd
--- /dev/null
+++ b/tests/phpunit-bootstrap.php
@@ -0,0 +1,11 @@
+<?php
+
+if (!defined('QUIQQER_SYSTEM')) {
+ define('QUIQQER_SYSTEM', true);
+}
+
+if (!defined('QUIQQER_AJAX')) {
+ define('QUIQQER_AJAX', true);
+}
+
+require_once __DIR__ . '/../../../../bootstrap.php';
--
GitLab
From f22d007c701f64ece5277f5dcb1bec4e00cd31f0 Mon Sep 17 00:00:00 2001
From: Jan Wennrich <jan.wennrich@pcsg.de>
Date: Fri, 24 May 2024 17:01:51 +0200
Subject: [PATCH 06/13] chore: setup PHP_CodeSniffer for project tooling
---
.phive/phars.xml | 2 ++
phpcs.xml.dist | 23 +++++++++++++++++++++++
2 files changed, 25 insertions(+)
create mode 100644 phpcs.xml.dist
diff --git a/.phive/phars.xml b/.phive/phars.xml
index 6984891..3c7dea3 100644
--- a/.phive/phars.xml
+++ b/.phive/phars.xml
@@ -2,4 +2,6 @@
<phive xmlns="https://phar.io/phive">
<phar name="phpstan" version="1.11.1" installed="1.11.1" location="./tools/phpstan" copy="false"/>
<phar name="phpunit" version="^10.5.20" installed="10.5.20" location="./tools/phpunit" copy="false"/>
+ <phar name="phpcs" version="^3.10.1" installed="3.10.1" location="./tools/phpcs" copy="false"/>
+ <phar name="phpcbf" version="^3.10.1" installed="3.10.1" location="./tools/phpcbf" copy="false"/>
</phive>
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
new file mode 100644
index 0000000..d48084f
--- /dev/null
+++ b/phpcs.xml.dist
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<ruleset>
+ <!-- Use PSR-12 ruleset -->
+ <rule ref="PSR12"/>
+
+ <!-- Only scan *.php files -->
+ <arg name="extensions" value="php"/>
+
+ <!-- Ignore warnings -->
+ <arg name="warning-severity" value="0"/>
+
+ <!-- Process 64 (or number of CPU cores) files in parallel -->
+ <arg name="parallel" value="64"/>
+
+ <!-- Output relative file paths, by setting the current folder as the basepath -->
+ <arg name="basepath" value="."/>
+
+ <!-- Show colored output -->
+ <arg name="colors"/>
+
+ <!-- Scan everything in the current folder -->
+ <file>.</file>
+</ruleset>
--
GitLab
From aa1db0d47341a16f6030a56d0ea548aaa9fd5962 Mon Sep 17 00:00:00 2001
From: Jan Wennrich <jan.wennrich@pcsg.de>
Date: Fri, 24 May 2024 17:01:52 +0200
Subject: [PATCH 07/13] chore: setup CaptainHook for project tooling
---
.phive/phars.xml | 1 +
captainhook.json | 16 ++++++++++++++++
tests/captainhook-bootstrap.php | 3 +++
3 files changed, 20 insertions(+)
create mode 100644 captainhook.json
create mode 100644 tests/captainhook-bootstrap.php
diff --git a/.phive/phars.xml b/.phive/phars.xml
index 3c7dea3..63a030f 100644
--- a/.phive/phars.xml
+++ b/.phive/phars.xml
@@ -4,4 +4,5 @@
<phar name="phpunit" version="^10.5.20" installed="10.5.20" location="./tools/phpunit" copy="false"/>
<phar name="phpcs" version="^3.10.1" installed="3.10.1" location="./tools/phpcs" copy="false"/>
<phar name="phpcbf" version="^3.10.1" installed="3.10.1" location="./tools/phpcbf" copy="false"/>
+ <phar name="captainhook" version="^5.23.0" installed="5.23.0" location="./tools/captainhook" copy="false"/>
</phive>
diff --git a/captainhook.json b/captainhook.json
new file mode 100644
index 0000000..30f1064
--- /dev/null
+++ b/captainhook.json
@@ -0,0 +1,16 @@
+{
+ "config": {
+ "bootstrap": "tests/captainhook-bootstrap.php"
+ },
+ "pre-commit": {
+ "enabled": true,
+ "actions": [
+ {
+ "action": "\\CaptainHook\\App\\Hook\\PHP\\Action\\Linting"
+ },
+ {
+ "action": "composer test"
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/tests/captainhook-bootstrap.php b/tests/captainhook-bootstrap.php
new file mode 100644
index 0000000..1b61b73
--- /dev/null
+++ b/tests/captainhook-bootstrap.php
@@ -0,0 +1,3 @@
+<?php
+
+// This file is supposed to be empty, see https://github.com/captainhookphp/captainhook/issues/248
--
GitLab
From 87fed830114c7c3a874542866491730659989eae Mon Sep 17 00:00:00 2001
From: Jan Wennrich <jan.wennrich@pcsg.de>
Date: Fri, 24 May 2024 17:01:52 +0200
Subject: [PATCH 08/13] chore: add developer scripts to composer.json
---
composer.json | 60 +++++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 51 insertions(+), 9 deletions(-)
diff --git a/composer.json b/composer.json
index 433e934..50484f8 100644
--- a/composer.json
+++ b/composer.json
@@ -1,29 +1,71 @@
{
- "name": "quiqqer\/authgoogle2fa",
+ "name": "quiqqer/authgoogle2fa",
"type": "quiqqer-module",
"description": "QUIQQER Authentication with Google Authenticator",
"license": "GPL-3.0+",
- "homepage": "https:\/\/www.quiqqer.com",
+ "homepage": "https://www.quiqqer.com",
"authors": [
{
- "name": "Patrick M\u00fcller",
+ "name": "Patrick Müller",
"email": "p.mueller@pcsg.de",
- "homepage": "http:\/\/www.pcsg.de",
+ "homepage": "http://www.pcsg.de",
"role": "Developer"
}
],
"support": {
"email": "support@pcsg.de",
- "url": "http:\/\/www.pcsg.de"
+ "url": "http://www.pcsg.de"
},
"require": {
- "quiqqer\/quiqqer": ">=1.1|dev-master|dev-dev",
- "pragmarx\/google2fa": "2.*",
- "bacon\/bacon-qr-code": "~1.0"
+ "quiqqer/quiqqer": ">=1.1|dev-master|dev-dev",
+ "pragmarx/google2fa": "2.*",
+ "bacon/bacon-qr-code": "~1.0"
},
"autoload": {
"psr-4": {
- "QUI\\Auth\\Google2Fa\\": "src\/QUI\/Auth\/Google2Fa"
+ "QUI\\Auth\\Google2Fa\\": "src/QUI/Auth/Google2Fa"
}
+ },
+ "scripts": {
+ "test": [
+ "@dev:lint",
+ "@dev:phpunit"
+ ],
+ "dev:phpunit": "./tools/phpunit",
+ "dev:lint": [
+ "@dev:lint:phpstan",
+ "@dev:lint:style"
+ ],
+ "dev:lint:phpstan": "./tools/phpstan",
+ "dev:lint:style": "./tools/phpcs",
+ "dev:lint:style:fix": "./tools/phpcbf",
+ "dev:init": [
+ "@dev:init:check-requirements",
+ "@dev:init:tools",
+ "@dev:init:git-hooks"
+ ],
+ "dev:init:check-requirements": [
+ "which composer > /dev/null || (echo 'Error: composer has to be globally installed'; exit 1)",
+ "which phive > /dev/null || (echo 'Error: PHIVE has to be globally installed'; exit 1)"
+ ],
+ "dev:init:tools": "phive install --temporary",
+ "dev:init:git-hooks": "./tools/captainhook install --only-enabled --force"
+ },
+ "scripts-aliases": {
+ "test": [
+ "dev:test"
+ ]
+ },
+ "scripts-descriptions": {
+ "test": "Runs linting, static analysis, and unit tests.",
+ "dev:phpunit": "Run PHPUnit test suites",
+ "dev:lint": "Run PHPStan and code style check",
+ "dev:lint:phpstan": "Run PHPStan",
+ "dev:lint:style": "Run code style check (PHP_CodeSniffer)",
+ "dev:lint:style:fix": "Try to fix code style errors automatically",
+ "dev:init": "Initialize the developer tooling (tools and git hooks)",
+ "dev:init:check-requirements": "Check if the necessary requirements are met",
+ "dev:init:tools": "Install all developer tools (requires PHIVE)",
+ "dev:init:git-hooks": "Install all git hooks (may require tools to be installed)"
}
}
\ No newline at end of file
--
GitLab
From 4514797f781939d9b26c2407a43b6ad6afaae260 Mon Sep 17 00:00:00 2001
From: Jan Wennrich <jan.wennrich@pcsg.de>
Date: Fri, 24 May 2024 17:01:52 +0200
Subject: [PATCH 09/13] ci: use quiqqer-package-bundle component
---
.gitlab-ci.yml | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b8d20ac..b5a64b4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,17 @@
include:
- - project: 'quiqqer/stabilization/semantic-release'
- file: '/ci-templates/.gitlab-ci.yml'
+ - component: dev.quiqqer.com/quiqqer/stabilization/ci-cd-components/quiqqer-package-bundle/quiqqer-package-bundle@main
+
+# Remove the entire phpunit-php8.1 block, to allow PHPUnit to run on PHP 8.1 in your pipeline
+phpunit-php8.1:
+ rules:
+ - when: never
+
+# Remove the entire phpunit-php8.2 block, to allow PHPUnit to run on PHP 8.2 in your pipeline
+phpunit-php8.2:
+ rules:
+ - when: never
+
+# Remove the entire phpunit-php8.3 block, to allow PHPUnit to run on PHP 8.3 in your pipeline
+phpunit-php8.3:
+ rules:
+ - when: never
\ No newline at end of file
--
GitLab
From ce6fa6845a7ca8c03e9dcb306d77b8d899b7965e Mon Sep 17 00:00:00 2001
From: Jan Wennrich <jan.wennrich@pcsg.de>
Date: Fri, 24 May 2024 17:01:52 +0200
Subject: [PATCH 10/13] docs: add CONTRIBUTING.md file
---
CONTRIBUTING.md | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 CONTRIBUTING.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..4a69a59
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# Contributing
+
+This package follows the [QUIQQER contribution guidelines](https://dev.quiqqer.com/quiqqer/stabilization/documentation/-/wikis/home).
\ No newline at end of file
--
GitLab
From 6842bfd8649f4311967109a34afcfb59db9eee47 Mon Sep 17 00:00:00 2001
From: Jan Wennrich <jan.wennrich@pcsg.de>
Date: Thu, 1 Aug 2024 17:39:27 +0200
Subject: [PATCH 11/13] chore: set PHPStan to level 5 with baseline
---
.phive/phars.xml | 2 +-
phpstan-baseline.neon | 36 ++++++++++++++++++++++++++++++++++++
phpstan.dist.neon | 4 +++-
3 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/.phive/phars.xml b/.phive/phars.xml
index 63a030f..ebb5988 100644
--- a/.phive/phars.xml
+++ b/.phive/phars.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
- <phar name="phpstan" version="1.11.1" installed="1.11.1" location="./tools/phpstan" copy="false"/>
+ <phar name="phpstan" version="1.11.8" installed="1.11.8" location="./tools/phpstan" copy="false"/>
<phar name="phpunit" version="^10.5.20" installed="10.5.20" location="./tools/phpunit" copy="false"/>
<phar name="phpcs" version="^3.10.1" installed="3.10.1" location="./tools/phpcs" copy="false"/>
<phar name="phpcbf" version="^3.10.1" installed="3.10.1" location="./tools/phpcbf" copy="false"/>
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index e69de29..a327597 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -0,0 +1,36 @@
+parameters:
+ ignoreErrors:
+ -
+ message: "#^Call to an undefined method QUI\\\\Interfaces\\\\Users\\\\User\\:\\:checkEditPermission\\(\\)\\.$#"
+ count: 1
+ path: ajax/deleteKeys.php
+
+ -
+ message: "#^Call to an undefined method QUI\\\\Interfaces\\\\Users\\\\User\\:\\:checkEditPermission\\(\\)\\.$#"
+ count: 1
+ path: ajax/generateKey.php
+
+ -
+ message: "#^Call to an undefined method QUI\\\\Interfaces\\\\Users\\\\User\\:\\:checkEditPermission\\(\\)\\.$#"
+ count: 1
+ path: ajax/getKey.php
+
+ -
+ message: "#^Call to an undefined method QUI\\\\Interfaces\\\\Users\\\\User\\:\\:checkEditPermission\\(\\)\\.$#"
+ count: 1
+ path: ajax/getKeys.php
+
+ -
+ message: "#^Call to an undefined method QUI\\\\Interfaces\\\\Users\\\\User\\:\\:checkEditPermission\\(\\)\\.$#"
+ count: 1
+ path: ajax/regenerateRecoveryKeys.php
+
+ -
+ message: "#^Method QUI\\\\Auth\\\\Google2Fa\\\\Auth\\:\\:getPasswordResetControl\\(\\) should return QUI\\\\Control but returns null\\.$#"
+ count: 1
+ path: src/QUI/Auth/Google2Fa/Auth.php
+
+ -
+ message: "#^Property QUI\\\\Auth\\\\Google2Fa\\\\Auth\\:\\:\\$User \\(QUI\\\\Users\\\\User\\) does not accept QUI\\\\Users\\\\Nobody\\|null\\.$#"
+ count: 1
+ path: src/QUI/Auth/Google2Fa/Auth.php
diff --git a/phpstan.dist.neon b/phpstan.dist.neon
index e929f5a..dc33bb4 100644
--- a/phpstan.dist.neon
+++ b/phpstan.dist.neon
@@ -2,8 +2,10 @@ includes:
- phpstan-baseline.neon
parameters:
- level: 8
+ level: 5
paths:
- src
- ajax
+ bootstrapFiles:
+ - tests/phpstan-bootstrap.php
tipsOfTheDay: false
--
GitLab
From 7f28959c3ca697f2d3601d4b9052f71346860f01 Mon Sep 17 00:00:00 2001
From: Jan Wennrich <jan.wennrich@pcsg.de>
Date: Thu, 1 Aug 2024 17:39:27 +0200
Subject: [PATCH 12/13] chore: upgrade CaptainHook to version ^5.23.3
---
.phive/phars.xml | 2 +-
captainhook.json | 25 +++++++++++--------------
tests/captainhook-bootstrap.php | 3 ---
3 files changed, 12 insertions(+), 18 deletions(-)
delete mode 100644 tests/captainhook-bootstrap.php
diff --git a/.phive/phars.xml b/.phive/phars.xml
index ebb5988..5bfa092 100644
--- a/.phive/phars.xml
+++ b/.phive/phars.xml
@@ -4,5 +4,5 @@
<phar name="phpunit" version="^10.5.20" installed="10.5.20" location="./tools/phpunit" copy="false"/>
<phar name="phpcs" version="^3.10.1" installed="3.10.1" location="./tools/phpcs" copy="false"/>
<phar name="phpcbf" version="^3.10.1" installed="3.10.1" location="./tools/phpcbf" copy="false"/>
- <phar name="captainhook" version="^5.23.0" installed="5.23.0" location="./tools/captainhook" copy="false"/>
+ <phar name="captainhook" version="^5.23.3" installed="5.23.3" location="./tools/captainhook" copy="false"/>
</phive>
diff --git a/captainhook.json b/captainhook.json
index 30f1064..3702e1a 100644
--- a/captainhook.json
+++ b/captainhook.json
@@ -1,16 +1,13 @@
{
- "config": {
- "bootstrap": "tests/captainhook-bootstrap.php"
- },
- "pre-commit": {
- "enabled": true,
- "actions": [
- {
- "action": "\\CaptainHook\\App\\Hook\\PHP\\Action\\Linting"
- },
- {
- "action": "composer test"
- }
- ]
- }
+ "pre-commit": {
+ "enabled": true,
+ "actions": [
+ {
+ "action": "\\CaptainHook\\App\\Hook\\PHP\\Action\\Linting"
+ },
+ {
+ "action": "composer test"
+ }
+ ]
+ }
}
\ No newline at end of file
diff --git a/tests/captainhook-bootstrap.php b/tests/captainhook-bootstrap.php
deleted file mode 100644
index 1b61b73..0000000
--- a/tests/captainhook-bootstrap.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-// This file is supposed to be empty, see https://github.com/captainhookphp/captainhook/issues/248
--
GitLab
From ab9eeb419f0931007aa0db5d85fde70554cc95cf Mon Sep 17 00:00:00 2001
From: Jan Wennrich <jan.wennrich@pcsg.de>
Date: Tue, 6 Aug 2024 14:34:26 +0200
Subject: [PATCH 13/13] ci: use "quiqqer-package-bundle" component for QUIQQER
version 1
---
.gitlab-ci.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b5a64b4..958e6db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,7 @@
include:
- - component: dev.quiqqer.com/quiqqer/stabilization/ci-cd-components/quiqqer-package-bundle/quiqqer-package-bundle@main
+ - component: dev.quiqqer.com/quiqqer/stabilization/ci-cd-components/quiqqer-package-bundle/quiqqer-package-bundle@2
+ inputs:
+ quiqqer-major-version: 1
# Remove the entire phpunit-php8.1 block, to allow PHPUnit to run on PHP 8.1 in your pipeline
phpunit-php8.1:
--
GitLab