From 7c8f8ff75ae2037f8eb83dcf1b85950048ad6ac2 Mon Sep 17 00:00:00 2001 From: Ferdinand Kuhl Date: Sat, 18 Feb 2023 21:10:01 +0100 Subject: [PATCH 1/5] Fixing README.md --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 4030886..ce4783d 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,13 @@ database of your choice. Usage is quite simple also: ```php -/** - * @param SequenceNumberGenerator $sequenceNumberGenerator - */ -public function __construct(SequenceNumberGenerator $sequenceNumberGenerator) -{ - $this->orderId = $sequenceNumberGenerator->getNextNumberFor($this); -} + /** + * @param SequenceGenerator $sequenceGenerator + */ + public function __construct(SequenceGenerator $sequenceNumberGenerator) + { + $this->orderId = $sequenceGenerator->getNextNumberFor($this); + } ``` `getNextNumberFor` allows you to give an object (which will be resolved to its FQCN) or a custom sequence name. From 59229d8f3b0c55b9a8a37182807bc4024d150f9c Mon Sep 17 00:00:00 2001 From: Ferdinand Kuhl Date: Sat, 18 Feb 2023 21:12:34 +0100 Subject: [PATCH 2/5] Allowing recent Flow versions --- .woodpecker/{test.yml => functional-tests.yml} | 15 +++++++++++---- composer.json | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) rename .woodpecker/{test.yml => functional-tests.yml} (68%) diff --git a/.woodpecker/test.yml b/.woodpecker/functional-tests.yml similarity index 68% rename from .woodpecker/test.yml rename to .woodpecker/functional-tests.yml index 8a881da..c45215f 100644 --- a/.woodpecker/test.yml +++ b/.woodpecker/functional-tests.yml @@ -3,12 +3,19 @@ workspace: path: package matrix: - FLOW_VERSION: - - 6.3 + include: + - FLOW_VERSION: 6.3 + PHP_VERSION: 7.4 + - FLOW_VERSION: 7.3 + PHP_VERSION: 7.4 + - FLOW_VERSION: 8.2 + PHP_VERSION: 7.4 + - FLOW_VERSION: 8.2 + PHP_VERSION: 8.2 pipeline: functional-tests: - image: thecodingmachine/php:7.4-v4-cli + image: "thecodingmachine/php:${PHP_VERSION}-v4-cli" environment: # Enable the PDO_SQLITE extension - "PHP_EXTENSION_PDO_SQLITE=1" @@ -20,6 +27,6 @@ pipeline: - "cd $NEOS_BUILD_DIR" - "composer create-project --no-install neos/flow-base-distribution:^$FLOW_VERSION ." - "composer config repositories.repo-name path /woodpecker/package" - - "composer remove --dev neos/behat" + - "composer remove --dev --no-update neos/behat || composer remove --no-update neos/behat" - "composer require digicomp/sequence:@dev" - "bin/phpunit --configuration Build/BuildEssentials/PhpUnit/FunctionalTests.xml Packages/Application/DigiComp.Sequence/Tests/Functional" diff --git a/composer.json b/composer.json index 89a5b5a..deb5ef0 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "neos-package", "require": { "ext-pdo": "*", - "neos/flow": "^6.3.5", + "neos/flow": "^6.3.5 | ^7.0 | ^8.0", "php": ">=7.4" }, "require-dev": { From 69a860109e6b39c4ed3c77da29eacfb644cb0b76 Mon Sep 17 00:00:00 2001 From: Ferdinand Kuhl Date: Sat, 18 Feb 2023 21:13:58 +0100 Subject: [PATCH 3/5] Fixing code-style check --- .woodpecker/code-style.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.woodpecker/code-style.yml b/.woodpecker/code-style.yml index f888059..bfd94b0 100644 --- a/.woodpecker/code-style.yml +++ b/.woodpecker/code-style.yml @@ -3,5 +3,6 @@ pipeline: image: composer commands: - composer global config repositories.repo-name vcs https://git.digital-competence.de/Packages/php-codesniffer + - composer global config --no-plugins allow-plugins.dealerdirect/phpcodesniffer-composer-installer true - composer global require digicomp/php-codesniffer:@dev - - composer global exec -- phpcs --runtime-set ignore_warnings_on_exit 1 --standard=DigiComp Classes/ Migrations/ Tests/ + - composer global exec -- phpcs --runtime-set ignore_warnings_on_exit 1 --standard=DigiComp Classes/ Tests/ From f9629557e479c9c2e303a27eb1743f7460c90bd9 Mon Sep 17 00:00:00 2001 From: Ferdinand Kuhl Date: Sat, 18 Feb 2023 21:15:17 +0100 Subject: [PATCH 4/5] Test only flow 7.3 with PHP 7 and 8 --- .woodpecker/functional-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/functional-tests.yml b/.woodpecker/functional-tests.yml index c45215f..3b45b3b 100644 --- a/.woodpecker/functional-tests.yml +++ b/.woodpecker/functional-tests.yml @@ -8,8 +8,8 @@ matrix: PHP_VERSION: 7.4 - FLOW_VERSION: 7.3 PHP_VERSION: 7.4 - - FLOW_VERSION: 8.2 - PHP_VERSION: 7.4 + - FLOW_VERSION: 7.3 + PHP_VERSION: 8.2 - FLOW_VERSION: 8.2 PHP_VERSION: 8.2 From fb9263ec6880a1b42fde03f4824ae57116a62c0c Mon Sep 17 00:00:00 2001 From: Ferdinand Kuhl Date: Sat, 18 Feb 2023 21:29:59 +0100 Subject: [PATCH 5/5] Removing empty changelog --- CHANGELOG.md | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 461f64f..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ -# Changelog -All notable changes to this project will be documented in this file. - -The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), -and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - -## [Unreleased] -Start of the changelog.