From ced940247c5c55bfed1147222bc0bad3f17ccab9 Mon Sep 17 00:00:00 2001 From: Robin Krahnen Date: Wed, 22 Sep 2021 11:34:34 +0200 Subject: [PATCH 01/17] revised code --- Classes/Command/SequenceCommandController.php | 63 ++++++----- .../Model/{Insert.php => SequenceEntry.php} | 54 +++------- Classes/Exception.php | 11 ++ Classes/Service/Exception.php | 12 --- .../Exception/InvalidSourceException.php | 11 ++ Classes/Service/SequenceGenerator.php | 100 ++++++++++-------- Configuration/Testing/Settings.yaml | 4 +- Migrations/Mysql/Version20210922110814.php | 39 +++++++ README.md | 4 +- Tests/Functional/SequenceTest.php | 20 ++-- 10 files changed, 182 insertions(+), 136 deletions(-) rename Classes/Domain/Model/{Insert.php => SequenceEntry.php} (50%) create mode 100644 Classes/Exception.php delete mode 100644 Classes/Service/Exception.php create mode 100644 Classes/Service/Exception/InvalidSourceException.php create mode 100644 Migrations/Mysql/Version20210922110814.php diff --git a/Classes/Command/SequenceCommandController.php b/Classes/Command/SequenceCommandController.php index cf9dc7e..881d3c1 100644 --- a/Classes/Command/SequenceCommandController.php +++ b/Classes/Command/SequenceCommandController.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace DigiComp\Sequence\Command; -use DigiComp\Sequence\Domain\Model\Insert; -use DigiComp\Sequence\Service\Exception as DigiCompSequenceServiceException; +use DigiComp\Sequence\Domain\Model\SequenceEntry; +use DigiComp\Sequence\Service\Exception\InvalidSourceException; use DigiComp\Sequence\Service\SequenceGenerator; use Doctrine\DBAL\Driver\Exception as DoctrineDBALDriverException; use Doctrine\DBAL\Exception as DoctrineDBALException; @@ -14,8 +14,6 @@ use Neos\Flow\Annotations as Flow; use Neos\Flow\Cli\CommandController; /** - * A database agnostic SequenceNumber generator - * * @Flow\Scope("singleton") */ class SequenceCommandController extends CommandController @@ -33,42 +31,53 @@ class SequenceCommandController extends CommandController protected $entityManager; /** - * Sets minimum number for sequence generator + * Set last number for sequence generator. * - * @param int $to * @param string $type - * @throws DigiCompSequenceServiceException + * @param int $number + * @throws DoctrineDBALDriverException + * @throws DoctrineDBALException + * @throws InvalidSourceException */ - public function advanceCommand(int $to, string $type): void + public function setLastNumberForCommand(string $type, int $number): void { - $this->sequenceGenerator->advanceTo($to, $type); + if ($this->sequenceGenerator->setLastNumberFor($type, $number)) { + $this->outputLine('Last number successfully set.'); + } else { + $this->outputLine('Failed to set last number.'); + } } /** - * @param string[] $typesToClean - * @throws DigiCompSequenceServiceException + * Clean up sequence table. + * + * @param string[] $types * @throws DoctrineDBALDriverException * @throws DoctrineDBALException + * @throws InvalidSourceException */ - public function cleanSequenceInsertsCommand(array $typesToClean = []) + public function cleanUpCommand(array $types = []): void { - $cleanArray = []; - if ($typesToClean === []) { - $results = $this->entityManager - ->createQuery('SELECT i.type, MAX(i.number) max_number FROM ' . Insert::class . ' i GROUP BY i.type') - ->getScalarResult(); - foreach ($results as $result) { - $cleanArray[$result['type']] = (int)$result['max_number']; - } - } else { - foreach ($typesToClean as $typeToClean) { - $cleanArray[$typeToClean] = $this->sequenceGenerator->getLastNumberFor($typeToClean); + if ($types === []) { + foreach ( + $this + ->entityManager + ->createQuery('SELECT DISTINCT(se.type) type FROM ' . SequenceEntry::class . ' se') + ->execute() + as $result + ) { + $types[] = $result['type']; } } - foreach ($cleanArray as $typeToClean => $number) { - $this->entityManager - ->createQuery('DELETE FROM ' . Insert::class . ' i WHERE i.type = ?0 AND i.number < ?1') - ->execute([$typeToClean, $number]); + + foreach ($types as $type) { + $rowCount = $this + ->entityManager + ->createQuery('DELETE FROM ' . SequenceEntry::class . ' se WHERE se.type = ?0 AND se.number < ?1') + ->execute([$type, $this->sequenceGenerator->getLastNumberFor($type)]); + + + $this->outputLine('Deleted ' . $rowCount . ' row(s) for type "' . $type . '".'); } } } diff --git a/Classes/Domain/Model/Insert.php b/Classes/Domain/Model/SequenceEntry.php similarity index 50% rename from Classes/Domain/Model/Insert.php rename to Classes/Domain/Model/SequenceEntry.php index 97b0cb8..d010331 100644 --- a/Classes/Domain/Model/Insert.php +++ b/Classes/Domain/Model/SequenceEntry.php @@ -8,52 +8,35 @@ use Doctrine\ORM\Mapping as ORM; use Neos\Flow\Annotations as Flow; /** - * SequenceInsert - * * @Flow\Entity - * @ORM\Table(indexes={ - * @ORM\Index(name="type_idx", columns={"type"}) - * }) + * @ORM\Table( + * indexes={ + * @ORM\Index(columns={"type"}) + * }, + * uniqueConstraints={ + * @ORM\UniqueConstraint(columns={"type", "number"}) + * } + * ) */ -class Insert +class SequenceEntry { /** - * @Flow\Identity - * @ORM\Id - * @var int - */ - protected int $number; - - /** - * @Flow\Identity - * @ORM\Id * @var string */ protected string $type; /** - * @param int $number - * @param string|object $type + * @var int */ - public function __construct(int $number, $type) - { - $this->setNumber($number); - $this->setType($type); - } - - /** - * @return int - */ - public function getNumber(): int - { - return $this->number; - } + protected int $number; /** + * @param string $type * @param int $number */ - public function setNumber(int $number): void + public function __construct(string $type, int $number) { + $this->type = $type; $this->number = $number; } @@ -66,13 +49,10 @@ class Insert } /** - * @param string|object $type + * @return int */ - public function setType($type): void + public function getNumber(): int { - if (\is_object($type)) { - $type = \get_class($type); - } - $this->type = $type; + return $this->number; } } diff --git a/Classes/Exception.php b/Classes/Exception.php new file mode 100644 index 0000000..383db6f --- /dev/null +++ b/Classes/Exception.php @@ -0,0 +1,11 @@ + 1 we could return new keys immediately for this * request, as we "reserved" the space between. @@ -35,98 +37,102 @@ class SequenceGenerator protected $logger; /** - * @param string|object $type + * @param string|object $source * @return int - * @throws Exception * @throws DoctrineDBALDriverException * @throws DoctrineDBALException + * @throws InvalidSourceException */ - public function getNextNumberFor($type): int + public function getNextNumberFor($source): int { - $type = $this->inferTypeFromSource($type); - $count = $this->getLastNumberFor($type); + $type = $this->inferTypeFromSource($source); + $number = $this->getLastNumberFor($type); - // TODO: Check for maximal tries, or similar - // TODO: Let increment be configurable per type + // TODO: Check for maximal tries, or similar? + // TODO: Let increment be configurable per type? do { - $count++; - } while (!$this->validateFreeNumber($count, $type)); + $number++; + } while (!$this->insertFor($type, $number)); - return $count; + return $number; } /** - * @param int $count * @param string $type + * @param int $number * @return bool */ - protected function validateFreeNumber(int $count, string $type): bool + protected function insertFor(string $type, int $number): bool { - $em = $this->entityManager; try { - $em->getConnection()->insert( - $em->getClassMetadata(Insert::class)->getTableName(), - ['number' => $count, 'type' => $type] + $this->entityManager->getConnection()->insert( + $this->entityManager->getClassMetadata(SequenceEntry::class)->getTableName(), + ['persistence_object_identifier' => Algorithms::generateUUID(), 'number' => $number, 'type' => $type] ); + return true; - } catch (\PDOException $e) { - return false; - } catch (DoctrineDBALException $e) { - if (!$e->getPrevious() instanceof \PDOException) { - $this->logger->critical('Exception occurred: ' . $e->getMessage()); + } catch (\PDOException $exception) { + } catch (DoctrineDBALException $exception) { + if (!$exception->getPrevious() instanceof \PDOException) { + $this->logger->critical('Exception occurred: ' . $exception->getMessage()); } - } catch (\Exception $e) { - $this->logger->critical('Exception occurred: ' . $e->getMessage()); + } catch (\Exception $exception) { + $this->logger->critical('Exception occurred: ' . $exception->getMessage()); } return false; } /** - * @param int $to - * @param string|object $type - * + * @param string|object $source + * @param int $number * @return bool - * @throws Exception + * @throws DoctrineDBALDriverException + * @throws DoctrineDBALException + * @throws InvalidSourceException */ - public function advanceTo(int $to, $type): bool + public function setLastNumberFor($source, int $number): bool { - $type = $this->inferTypeFromSource($type); + $type = $this->inferTypeFromSource($source); - return $this->validateFreeNumber($to, $type); + if ($this->getLastNumberFor($type) >= $number) { + return false; + } + + return $this->insertFor($type, $number); } /** - * @param string|object $type - * @return int - * @throws Exception + * @param string|object $source * @throws DoctrineDBALDriverException * @throws DoctrineDBALException + * @throws InvalidSourceException */ - public function getLastNumberFor($type): int + public function getLastNumberFor($source): int { return (int)$this->entityManager->getConnection()->executeQuery( 'SELECT MAX(number) FROM ' - . $this->entityManager->getClassMetadata(Insert::class)->getTableName() + . $this->entityManager->getClassMetadata(SequenceEntry::class)->getTableName() . ' WHERE type = :type', - ['type' => $this->inferTypeFromSource($type)] + ['type' => $this->inferTypeFromSource($source)] )->fetchOne(); } /** - * @param string|object $stringOrObject + * @param string|object $source * @return string - * @throws Exception + * @throws InvalidSourceException */ - protected function inferTypeFromSource($stringOrObject): string + protected function inferTypeFromSource($source): string { - if (\is_object($stringOrObject)) { - $stringOrObject = TypeHandling::getTypeForValue($stringOrObject); - } - if (!$stringOrObject) { - throw new Exception('No Type given'); + if (\is_string($source)) { + return $source; } - return $stringOrObject; + if (\is_object($source)) { + return TypeHandling::getTypeForValue($source); + } + + throw new InvalidSourceException('Could not infer type from source.', 1632216173); } } diff --git a/Configuration/Testing/Settings.yaml b/Configuration/Testing/Settings.yaml index 54d2680..5d0dfb7 100644 --- a/Configuration/Testing/Settings.yaml +++ b/Configuration/Testing/Settings.yaml @@ -2,5 +2,5 @@ Neos: Flow: persistence: backendOptions: - driver: 'pdo_sqlite' - path: '%FLOW_PATH_DATA%/Temporary/testing.db' + driver: "pdo_sqlite" + path: "%FLOW_PATH_DATA%/Temporary/testing.db" diff --git a/Migrations/Mysql/Version20210922110814.php b/Migrations/Mysql/Version20210922110814.php new file mode 100644 index 0000000..e74c465 --- /dev/null +++ b/Migrations/Mysql/Version20210922110814.php @@ -0,0 +1,39 @@ +abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on "mysql".'); + + $this->addSql('CREATE TABLE digicomp_sequence_domain_model_sequenceentry (persistence_object_identifier VARCHAR(40) NOT NULL, type VARCHAR(255) NOT NULL, number INT NOT NULL, INDEX IDX_F6ADC8568CDE5729 (type), UNIQUE INDEX UNIQ_F6ADC8568CDE572996901F54 (type, number), PRIMARY KEY(persistence_object_identifier))'); + $this->addSql('INSERT INTO digicomp_sequence_domain_model_sequenceentry (persistence_object_identifier, type, number) SELECT UUID(), i.type, i.number FROM digicomp_sequence_domain_model_insert AS i'); + $this->addSql('DROP TABLE digicomp_sequence_domain_model_insert'); + } + + /** + * @param Schema $schema + * @throws AbortMigrationException + * @throws DoctrineDBALException + */ + public function down(Schema $schema): void + { + $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on "mysql".'); + + $this->addSql('CREATE TABLE digicomp_sequence_domain_model_insert (number INT NOT NULL, type VARCHAR(255) NOT NULL, INDEX type_idx (type), PRIMARY KEY(number, type))'); + $this->addSql('INSERT INTO digicomp_sequence_domain_model_insert (number, type) SELECT se.number, se.type FROM digicomp_sequence_domain_model_sequenceentry AS se'); + $this->addSql('DROP TABLE digicomp_sequence_domain_model_sequenceentry'); + } +} diff --git a/README.md b/README.md index 36ea7c5..e796736 100644 --- a/README.md +++ b/README.md @@ -16,5 +16,5 @@ public function __construct(SequenceNumberGenerator $sequenceNumberGenerator) `getNextNumberFor` allows you to give an object (which will be resolved to its FQCN) or a custom sequence name. -The `SequenceCommandController` helps you to advance the current sequence number, in case of migrations or similar. See -`./flow help sequence:advance` if interested. +The `SequenceCommandController` helps you to set the last sequence number, in case of migrations or similar. See +`./flow help sequence:setlastnumberfor` if interested. diff --git a/Tests/Functional/SequenceTest.php b/Tests/Functional/SequenceTest.php index b400c34..4fb3067 100644 --- a/Tests/Functional/SequenceTest.php +++ b/Tests/Functional/SequenceTest.php @@ -1,8 +1,10 @@ objectManager->get(SequenceGenerator::class); - $number = $sequenceGenerator->getLastNumberFor($sequenceGenerator); - $this->assertEquals(0, $number); + $this->assertEquals(0, $sequenceGenerator->getLastNumberFor($sequenceGenerator)); $this->assertEquals(1, $sequenceGenerator->getNextNumberFor($sequenceGenerator)); $pIds = []; for ($i = 0; $i < 10; $i++) { $pId = \pcntl_fork(); - if ($pId) { + if ($pId > 0) { $pIds[] = $pId; } else { for ($j = 0; $j < 10; $j++) { @@ -53,16 +54,17 @@ class SequenceTest extends FunctionalTestCase /** * @test - * @throws DigiCompSequenceServiceException * @throws DoctrineDBALDriverException * @throws DoctrineDBALException + * @throws InvalidSourceException */ - public function advanceTest() + public function setLastNumberForTest() { $sequenceGenerator = $this->objectManager->get(SequenceGenerator::class); - $sequenceGenerator->advanceTo(100, $sequenceGenerator); + $sequenceGenerator->setLastNumberFor($sequenceGenerator, 100); + $this->assertEquals(100, $sequenceGenerator->getLastNumberFor($sequenceGenerator)); - $this->assertEquals(0, $sequenceGenerator->getLastNumberFor('strangeOtherSequence')); + $this->assertEquals(0, $sequenceGenerator->getLastNumberFor('otherSequence')); } } From 19b58b9c267dc297ba24e7ebf9ad8ff8dee7b40e Mon Sep 17 00:00:00 2001 From: Robin Krahnen Date: Wed, 22 Sep 2021 14:26:09 +0200 Subject: [PATCH 02/17] reformat @ORM\Table --- Classes/Domain/Model/SequenceEntry.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Classes/Domain/Model/SequenceEntry.php b/Classes/Domain/Model/SequenceEntry.php index d010331..ee164a9 100644 --- a/Classes/Domain/Model/SequenceEntry.php +++ b/Classes/Domain/Model/SequenceEntry.php @@ -9,14 +9,11 @@ use Neos\Flow\Annotations as Flow; /** * @Flow\Entity - * @ORM\Table( - * indexes={ - * @ORM\Index(columns={"type"}) - * }, - * uniqueConstraints={ - * @ORM\UniqueConstraint(columns={"type", "number"}) - * } - * ) + * @ORM\Table(indexes={ + * @ORM\Index(columns={"type"}) + * }, uniqueConstraints={ + * @ORM\UniqueConstraint(columns={"type", "number"}) + * }) */ class SequenceEntry { From 71748c0d758e2f9ebfcc2ef14419d38bc0f26cf0 Mon Sep 17 00:00:00 2001 From: Robin Krahnen Date: Wed, 22 Sep 2021 15:00:26 +0200 Subject: [PATCH 03/17] add empty line at end of License.txt --- License.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/License.txt b/License.txt index 2ffa411..ab84d82 100644 --- a/License.txt +++ b/License.txt @@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file +THE SOFTWARE. From d46c2ca7ffc2c936013a524e3eb532f55b09ae8a Mon Sep 17 00:00:00 2001 From: Robin Krahnen Date: Thu, 23 Sep 2021 08:55:03 +0200 Subject: [PATCH 04/17] add missing return type hints --- Tests/Functional/SequenceTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/Functional/SequenceTest.php b/Tests/Functional/SequenceTest.php index 4fb3067..b912129 100644 --- a/Tests/Functional/SequenceTest.php +++ b/Tests/Functional/SequenceTest.php @@ -23,7 +23,7 @@ class SequenceTest extends FunctionalTestCase * @throws DoctrineDBALException * @throws InvalidSourceException */ - public function sequenceTest() + public function sequenceTest(): void { $sequenceGenerator = $this->objectManager->get(SequenceGenerator::class); @@ -58,7 +58,7 @@ class SequenceTest extends FunctionalTestCase * @throws DoctrineDBALException * @throws InvalidSourceException */ - public function setLastNumberForTest() + public function setLastNumberForTest(): void { $sequenceGenerator = $this->objectManager->get(SequenceGenerator::class); From 03672e05c58dd8cf147e1adef8a1e1fe08d5e26c Mon Sep 17 00:00:00 2001 From: Robin Krahnen Date: Thu, 23 Sep 2021 16:14:00 +0200 Subject: [PATCH 05/17] TASK: Apply migration Neos.Flow-20190425144900 Adjusts code to FlashMessageContainer renaming from "\Neos\Flow\Mvc" to "\Neos\Flow\Mvc\FlashMessage". Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index cace62e..9cea398 100644 --- a/composer.json +++ b/composer.json @@ -62,7 +62,8 @@ "Neos.Flow-20170125103800", "Neos.Flow-20170127183102", "DigiComp.SettingValidator-20170603120900", - "Neos.Flow-20180415105700" + "Neos.Flow-20180415105700", + "Neos.Flow-20190425144900" ] }, "authors": [ @@ -81,4 +82,4 @@ "doctrine", "sequence" ] -} +} \ No newline at end of file From a34f5eb20b6cf09f005d5d7397469d8e4314c2bf Mon Sep 17 00:00:00 2001 From: Robin Krahnen Date: Thu, 23 Sep 2021 16:14:01 +0200 Subject: [PATCH 06/17] TASK: Apply migration Neos.Flow-20190515215000 Adjust "Settings.yaml" to new PSR-3 logging settings (see https://github.com/neos/flow-development-collection/pull/1574) Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9cea398..1d44ad5 100644 --- a/composer.json +++ b/composer.json @@ -63,7 +63,8 @@ "Neos.Flow-20170127183102", "DigiComp.SettingValidator-20170603120900", "Neos.Flow-20180415105700", - "Neos.Flow-20190425144900" + "Neos.Flow-20190425144900", + "Neos.Flow-20190515215000" ] }, "authors": [ From 3fc0ddce1fcc6665c7794b201feb46e650751ef1 Mon Sep 17 00:00:00 2001 From: Robin Krahnen Date: Thu, 23 Sep 2021 16:52:53 +0200 Subject: [PATCH 07/17] add empty line at end of composer.json (was removed by flow core migrations...) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1d44ad5..d357aac 100644 --- a/composer.json +++ b/composer.json @@ -83,4 +83,4 @@ "doctrine", "sequence" ] -} \ No newline at end of file +} From f324e8c0cafa45f3ed1d3c9cecd7a5b248e99909 Mon Sep 17 00:00:00 2001 From: Robin Krahnen Date: Mon, 11 Oct 2021 12:23:44 +0200 Subject: [PATCH 08/17] remove unnecessary slash after %FLOW_PATH_*% --- Configuration/Testing/Settings.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/Testing/Settings.yaml b/Configuration/Testing/Settings.yaml index 5d0dfb7..3f9770d 100644 --- a/Configuration/Testing/Settings.yaml +++ b/Configuration/Testing/Settings.yaml @@ -3,4 +3,4 @@ Neos: persistence: backendOptions: driver: "pdo_sqlite" - path: "%FLOW_PATH_DATA%/Temporary/testing.db" + path: "%FLOW_PATH_DATA%Temporary/testing.db" From 586d6036500defcc0c621fbaf979ef984ef9f98b Mon Sep 17 00:00:00 2001 From: Robin Krahnen Date: Thu, 10 Feb 2022 15:57:07 +0100 Subject: [PATCH 09/17] removed duplicated blank line --- Classes/Command/SequenceCommandController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/Classes/Command/SequenceCommandController.php b/Classes/Command/SequenceCommandController.php index 881d3c1..1884d44 100644 --- a/Classes/Command/SequenceCommandController.php +++ b/Classes/Command/SequenceCommandController.php @@ -76,7 +76,6 @@ class SequenceCommandController extends CommandController ->createQuery('DELETE FROM ' . SequenceEntry::class . ' se WHERE se.type = ?0 AND se.number < ?1') ->execute([$type, $this->sequenceGenerator->getLastNumberFor($type)]); - $this->outputLine('Deleted ' . $rowCount . ' row(s) for type "' . $type . '".'); } } From 9263cf05969343bc94314850bee3f79886ea39d5 Mon Sep 17 00:00:00 2001 From: Robin Krahnen Date: Thu, 10 Feb 2022 15:57:40 +0100 Subject: [PATCH 10/17] optimized line breaks README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e796736..4030886 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ This is a very simple tool, helping in generation of gapless sequences. For this database of your choice. Usage is quite simple also: + ```php /** * @param SequenceNumberGenerator $sequenceNumberGenerator From 24016dd0606d4a90518242664f4528bae68573e6 Mon Sep 17 00:00:00 2001 From: Robin Krahnen Date: Thu, 3 Mar 2022 13:30:53 +0100 Subject: [PATCH 11/17] optimized php requirement --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d357aac..fd31a97 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "require": { "ext-pdo": "*", "neos/flow": "^5.3.0 || ^6.3.5", - "php": "~7.4.0" + "php": ">=7.4" }, "require-dev": { "ext-pcntl": "*", From b0dd57f693b1c7b82a3cd081e8626c623ccd609b Mon Sep 17 00:00:00 2001 From: Robin Krahnen Date: Mon, 4 Apr 2022 22:41:28 +0200 Subject: [PATCH 12/17] change dependency to neos/flow --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index fd31a97..2d12076 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "neos-package", "require": { "ext-pdo": "*", - "neos/flow": "^5.3.0 || ^6.3.5", + "neos/flow": "^6.3.5", "php": ">=7.4" }, "require-dev": { From 8396fa0db75d86a328709a63ab8e7475e517c758 Mon Sep 17 00:00:00 2001 From: Robin Krahnen Date: Mon, 4 Apr 2022 22:42:58 +0200 Subject: [PATCH 13/17] code style --- Tests/Functional/SequenceTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/Tests/Functional/SequenceTest.php b/Tests/Functional/SequenceTest.php index b912129..1a5cd0c 100644 --- a/Tests/Functional/SequenceTest.php +++ b/Tests/Functional/SequenceTest.php @@ -61,7 +61,6 @@ class SequenceTest extends FunctionalTestCase public function setLastNumberForTest(): void { $sequenceGenerator = $this->objectManager->get(SequenceGenerator::class); - $sequenceGenerator->setLastNumberFor($sequenceGenerator, 100); $this->assertEquals(100, $sequenceGenerator->getLastNumberFor($sequenceGenerator)); From e839d216adbe3c9ce1669dcaf361bd32ebe731d4 Mon Sep 17 00:00:00 2001 From: Robin Krahnen Date: Wed, 20 Apr 2022 17:36:31 +0200 Subject: [PATCH 14/17] revised code --- Classes/Domain/Model/SequenceEntry.php | 35 +++------------------- Classes/Service/SequenceGenerator.php | 3 +- Migrations/Mysql/Version20210922110814.php | 6 ++-- Tests/Functional/SequenceTest.php | 10 +++---- composer.json | 2 +- 5 files changed, 14 insertions(+), 42 deletions(-) diff --git a/Classes/Domain/Model/SequenceEntry.php b/Classes/Domain/Model/SequenceEntry.php index ee164a9..ee8c39f 100644 --- a/Classes/Domain/Model/SequenceEntry.php +++ b/Classes/Domain/Model/SequenceEntry.php @@ -8,48 +8,21 @@ use Doctrine\ORM\Mapping as ORM; use Neos\Flow\Annotations as Flow; /** + * This class is only here to set up the table. We never create an instance of this class. + * * @Flow\Entity - * @ORM\Table(indexes={ - * @ORM\Index(columns={"type"}) - * }, uniqueConstraints={ - * @ORM\UniqueConstraint(columns={"type", "number"}) - * }) */ class SequenceEntry { /** + * @ORM\Id * @var string */ protected string $type; /** + * @ORM\Id * @var int */ protected int $number; - - /** - * @param string $type - * @param int $number - */ - public function __construct(string $type, int $number) - { - $this->type = $type; - $this->number = $number; - } - - /** - * @return string - */ - public function getType(): string - { - return $this->type; - } - - /** - * @return int - */ - public function getNumber(): int - { - return $this->number; - } } diff --git a/Classes/Service/SequenceGenerator.php b/Classes/Service/SequenceGenerator.php index 45bbfac..a9ed1c7 100644 --- a/Classes/Service/SequenceGenerator.php +++ b/Classes/Service/SequenceGenerator.php @@ -10,7 +10,6 @@ use Doctrine\DBAL\Driver\Exception as DoctrineDBALDriverException; use Doctrine\DBAL\Exception as DoctrineDBALException; use Doctrine\ORM\EntityManagerInterface; use Neos\Flow\Annotations as Flow; -use Neos\Flow\Utility\Algorithms; use Neos\Utility\TypeHandling; use Psr\Log\LoggerInterface; @@ -67,7 +66,7 @@ class SequenceGenerator try { $this->entityManager->getConnection()->insert( $this->entityManager->getClassMetadata(SequenceEntry::class)->getTableName(), - ['persistence_object_identifier' => Algorithms::generateUUID(), 'number' => $number, 'type' => $type] + ['type' => $type, 'number' => $number] ); return true; diff --git a/Migrations/Mysql/Version20210922110814.php b/Migrations/Mysql/Version20210922110814.php index e74c465..7623464 100644 --- a/Migrations/Mysql/Version20210922110814.php +++ b/Migrations/Mysql/Version20210922110814.php @@ -18,8 +18,8 @@ class Version20210922110814 extends AbstractMigration { $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on "mysql".'); - $this->addSql('CREATE TABLE digicomp_sequence_domain_model_sequenceentry (persistence_object_identifier VARCHAR(40) NOT NULL, type VARCHAR(255) NOT NULL, number INT NOT NULL, INDEX IDX_F6ADC8568CDE5729 (type), UNIQUE INDEX UNIQ_F6ADC8568CDE572996901F54 (type, number), PRIMARY KEY(persistence_object_identifier))'); - $this->addSql('INSERT INTO digicomp_sequence_domain_model_sequenceentry (persistence_object_identifier, type, number) SELECT UUID(), i.type, i.number FROM digicomp_sequence_domain_model_insert AS i'); + $this->addSql('CREATE TABLE digicomp_sequence_domain_model_sequenceentry (type VARCHAR(255) NOT NULL, number INT NOT NULL, PRIMARY KEY(type, number))'); + $this->addSql('INSERT INTO digicomp_sequence_domain_model_sequenceentry (type, number) SELECT i.type, MAX(i.number) FROM digicomp_sequence_domain_model_insert AS i GROUP BY i.type'); $this->addSql('DROP TABLE digicomp_sequence_domain_model_insert'); } @@ -33,7 +33,7 @@ class Version20210922110814 extends AbstractMigration $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on "mysql".'); $this->addSql('CREATE TABLE digicomp_sequence_domain_model_insert (number INT NOT NULL, type VARCHAR(255) NOT NULL, INDEX type_idx (type), PRIMARY KEY(number, type))'); - $this->addSql('INSERT INTO digicomp_sequence_domain_model_insert (number, type) SELECT se.number, se.type FROM digicomp_sequence_domain_model_sequenceentry AS se'); + $this->addSql('INSERT INTO digicomp_sequence_domain_model_insert (number, type) SELECT MAX(se.number), se.type FROM digicomp_sequence_domain_model_sequenceentry AS se GROUP BY se.type'); $this->addSql('DROP TABLE digicomp_sequence_domain_model_sequenceentry'); } } diff --git a/Tests/Functional/SequenceTest.php b/Tests/Functional/SequenceTest.php index 1a5cd0c..542095e 100644 --- a/Tests/Functional/SequenceTest.php +++ b/Tests/Functional/SequenceTest.php @@ -27,8 +27,8 @@ class SequenceTest extends FunctionalTestCase { $sequenceGenerator = $this->objectManager->get(SequenceGenerator::class); - $this->assertEquals(0, $sequenceGenerator->getLastNumberFor($sequenceGenerator)); - $this->assertEquals(1, $sequenceGenerator->getNextNumberFor($sequenceGenerator)); + self::assertEquals(0, $sequenceGenerator->getLastNumberFor($sequenceGenerator)); + self::assertEquals(1, $sequenceGenerator->getNextNumberFor($sequenceGenerator)); $pIds = []; for ($i = 0; $i < 10; $i++) { @@ -49,7 +49,7 @@ class SequenceTest extends FunctionalTestCase \pcntl_waitpid($pId, $status); } - $this->assertEquals(101, $sequenceGenerator->getLastNumberFor($sequenceGenerator)); + self::assertEquals(101, $sequenceGenerator->getLastNumberFor($sequenceGenerator)); } /** @@ -63,7 +63,7 @@ class SequenceTest extends FunctionalTestCase $sequenceGenerator = $this->objectManager->get(SequenceGenerator::class); $sequenceGenerator->setLastNumberFor($sequenceGenerator, 100); - $this->assertEquals(100, $sequenceGenerator->getLastNumberFor($sequenceGenerator)); - $this->assertEquals(0, $sequenceGenerator->getLastNumberFor('otherSequence')); + self::assertEquals(100, $sequenceGenerator->getLastNumberFor($sequenceGenerator)); + self::assertEquals(0, $sequenceGenerator->getLastNumberFor('otherSequence')); } } diff --git a/composer.json b/composer.json index 2d12076..d955c14 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ }, "require-dev": { "ext-pcntl": "*", - "phpunit/phpunit": "3.7.*" + "phpunit/phpunit": "~8.5" }, "autoload": { "psr-4": { From 5d7f705828de98b44b9198b21f2bd42e9134a505 Mon Sep 17 00:00:00 2001 From: Robin Krahnen Date: Mon, 2 May 2022 09:56:14 +0200 Subject: [PATCH 15/17] add "declare(strict_types=1);" --- Migrations/Mysql/Version20140505093853.php | 2 ++ Migrations/Mysql/Version20160624203903.php | 2 ++ Migrations/Mysql/Version20210922110814.php | 2 ++ 3 files changed, 6 insertions(+) diff --git a/Migrations/Mysql/Version20140505093853.php b/Migrations/Mysql/Version20140505093853.php index d1aa1a3..2b1ea74 100644 --- a/Migrations/Mysql/Version20140505093853.php +++ b/Migrations/Mysql/Version20140505093853.php @@ -1,5 +1,7 @@ Date: Mon, 2 May 2022 10:17:04 +0200 Subject: [PATCH 16/17] Removing Flow 5.3 building (not longer supported) --- .woodpecker/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml index 8d5107f..8a881da 100644 --- a/.woodpecker/test.yml +++ b/.woodpecker/test.yml @@ -4,7 +4,6 @@ workspace: matrix: FLOW_VERSION: - - 5.3 - 6.3 pipeline: From e9ff06a55344420f735aeafccec79b15da4599b9 Mon Sep 17 00:00:00 2001 From: Robin Krahnen Date: Wed, 4 May 2022 19:01:16 +0200 Subject: [PATCH 17/17] optimized versions in composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d955c14..89a5b5a 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "package-key": "DigiComp.Sequence" }, "branch-alias": { - "dev-develop": "3.0.x-dev", + "dev-develop": "4.0.x-dev", "dev-version/2.x-dev": "2.1.x-dev", "dev-version/1.x-dev": "1.1.x-dev" },