update structure of composer.json and update dependencies

Tagging 4.0.1

.gitignore

@@ -1 +0,0 @@
-.svn

.woodpecker/code-style.yml

@@ -0,0 +1,8 @@
+pipeline:
+  code-style:
+    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/ Tests/

.woodpecker/functional-tests.yml

@@ -0,0 +1,32 @@
+workspace:
+  base: /woodpecker
+  path: package
+
+matrix:
+  include:
+    - FLOW_VERSION: 6.3
+      PHP_VERSION: 7.4
+    - FLOW_VERSION: 7.3
+      PHP_VERSION: 7.4
+    - FLOW_VERSION: 7.3
+      PHP_VERSION: 8.2
+    - FLOW_VERSION: 8.2
+      PHP_VERSION: 8.2
+
+pipeline:
+  functional-tests:
+    image: "thecodingmachine/php:${PHP_VERSION}-v4-cli"
+    environment:
+      # Enable the PDO_SQLITE extension
+      - "PHP_EXTENSION_PDO_SQLITE=1"
+      - "FLOW_VERSION=${FLOW_VERSION}"
+      - "NEOS_BUILD_DIR=/woodpecker/Build-${FLOW_VERSION}"
+    commands:
+      - "sudo mkdir $NEOS_BUILD_DIR"
+      - "sudo chown -R docker:docker $NEOS_BUILD_DIR"
+      - "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 --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"

Classes/Command/SequenceCommandController.php

@@ -1,34 +1,82 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DigiComp\Sequence\Command;
 
+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;
+use Doctrine\ORM\EntityManagerInterface;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Cli\CommandController;
 
 /**
- * A database agnostic SequenceNumber generator
- *
  * @Flow\Scope("singleton")
  */
 class SequenceCommandController extends CommandController
 {
     /**
-     * @var SequenceGenerator
      * @Flow\Inject
+     * @var SequenceGenerator
      */
     protected $sequenceGenerator;
 
     /**
-     * Sets minimum number for sequence generator
+     * @Flow\Inject
-     *
+     * @var EntityManagerInterface
-     * @param int $to
-     * @param string $type
      */
-    public function advanceCommand($to, $type)
+    protected $entityManager;
+
+    /**
+     * Set last number for sequence generator.
+     *
+     * @param string $type
+     * @param int $number
+     * @throws DoctrineDBALDriverException
+     * @throws DoctrineDBALException
+     * @throws InvalidSourceException
+     */
+    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.');
+        }
     }
 
-    // TODO: make clean up job to delete all but the biggest number to save resources
+    /**
+     * Clean up sequence table.
+     *
+     * @param string[] $types
+     * @throws DoctrineDBALDriverException
+     * @throws DoctrineDBALException
+     * @throws InvalidSourceException
+     */
+    public function cleanUpCommand(array $types = []): void
+    {
+        if ($types === []) {
+            foreach (
+                $this
+                    ->entityManager
+                    ->createQuery('SELECT DISTINCT(se.type) type FROM ' . SequenceEntry::class . ' se')
+                    ->execute()
+                as $result
+            ) {
+                $types[] = $result['type'];
+            }
+        }
+
+        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 . '".');
+        }
+    }
 }

Classes/Domain/Model/Insert.php

@@ -1,76 +0,0 @@
-<?php
-
-namespace DigiComp\Sequence\Domain\Model;
-
-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"})
- * })
- */
-class Insert
-{
-    /**
-     * @var int
-     * @Flow\Identity
-     * @ORM\Id
-     */
-    protected $number;
-
-    /**
-     * @var string
-     * @Flow\Identity
-     * @ORM\Id
-     */
-    protected $type;
-
-    /**
-     * @param int $number
-     * @param string|object $type
-     */
-    public function __construct($number, $type)
-    {
-        $this->setNumber($number);
-        $this->setType($type);
-    }
-
-    /**
-     * @return int
-     */
-    public function getNumber()
-    {
-        return $this->number;
-    }
-
-    /**
-     * @param int $number
-     */
-    public function setNumber($number)
-    {
-        $this->number = $number;
-    }
-
-    /**
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * @param string|object $type
-     */
-    public function setType($type)
-    {
-        if (is_object($type)) {
-            $type = get_class($type);
-        }
-        $this->type = $type;
-    }
-}

Classes/Domain/Model/SequenceEntry.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DigiComp\Sequence\Domain\Model;
+
+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
+ */
+class SequenceEntry
+{
+    /**
+     * @ORM\Id
+     * @var string
+     */
+    protected string $type;
+
+    /**
+     * @ORM\Id
+     * @var int
+     */
+    protected int $number;
+}

Classes/Exception.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DigiComp\Sequence;
+
+use Neos\Flow\Exception as NeosFlowException;
+
+class Exception extends NeosFlowException
+{
+}

Classes/Service/Exception.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace DigiComp\Sequence\Service;
-
-/**
- * SequenceException
- */
-class Exception extends \Exception
-{
-}

Classes/Service/Exception/InvalidSourceException.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DigiComp\Sequence\Service\Exception;
+
+use DigiComp\Sequence\Exception;
+
+class InvalidSourceException extends Exception
+{
+}

Classes/Service/SequenceGenerator.php

@@ -1,18 +1,20 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DigiComp\Sequence\Service;
 
-use DigiComp\Sequence\Domain\Model\Insert;
+use DigiComp\Sequence\Domain\Model\SequenceEntry;
-use Doctrine\Common\Persistence\ObjectManager;
+use DigiComp\Sequence\Service\Exception\InvalidSourceException;
-use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Driver\Exception as DoctrineDBALDriverException;
-use Doctrine\ORM\EntityManager;
+use Doctrine\DBAL\Exception as DoctrineDBALException;
+use Doctrine\ORM\EntityManagerInterface;
 use Neos\Flow\Annotations as Flow;
-use Neos\Flow\Log\SystemLoggerInterface;
-use Neos\Flow\Reflection\ReflectionService;
 use Neos\Utility\TypeHandling;
+use Psr\Log\LoggerInterface;
 
 /**
- * A SequenceNumber generator working for transactional databases
+ * A sequence number generator working for transactional databases.
  *
  * Thoughts: We could make the step-range configurable, and if > 1 we could return new keys immediately for this
  * request, as we "reserved" the space between.
@@ -22,116 +24,114 @@ use Neos\Utility\TypeHandling;
 class SequenceGenerator
 {
     /**
-     * @var ObjectManager
      * @Flow\Inject
+     * @var EntityManagerInterface
      */
     protected $entityManager;
 
     /**
-     * @var ReflectionService
      * @Flow\Inject
-     * @deprecated
+     * @var LoggerInterface
      */
-    protected $reflectionService;
+    protected $logger;
 
     /**
-     * @var SystemLoggerInterface
+     * @param string|object $source
-     * @Flow\Inject
-     */
-    protected $systemLogger;
-
-    /**
-     * @param string|object $type
-     *
      * @return int
+     * @throws DoctrineDBALDriverException
+     * @throws DoctrineDBALException
+     * @throws InvalidSourceException
      */
-    public function getNextNumberFor($type)
+    public function getNextNumberFor($source): int
     {
-        $type = $this->inferTypeFromSource($type);
+        $type = $this->inferTypeFromSource($source);
-        $count = $this->getLastNumberFor($type);
+        $number = $this->getLastNumberFor($type);
 
-        // TODO: Check for maximal tries, or similar
+        // TODO: Check for maximal tries, or similar?
-        // TODO: Let increment be configurable per type
+        // TODO: Let increment be configurable per type?
         do {
-            $count++;
+            $number++;
-        } while (! $this->validateFreeNumber($count, $type));
+        } while (!$this->insertFor($type, $number));
 
-        return $count;
+        return $number;
     }
 
     /**
-     * @param int $count
+     * @param string $type
-     * @param string|object $type
+     * @param int $number
-     *
      * @return bool
      */
-    protected function validateFreeNumber($count, $type)
+    protected function insertFor(string $type, int $number): bool
     {
-        /* @var EntityManager $em */
-        $em = $this->entityManager;
         try {
-            $em->getConnection()->insert(
+            $this->entityManager->getConnection()->insert(
-                $em->getClassMetadata(Insert::class)->getTableName(),
+                $this->entityManager->getClassMetadata(SequenceEntry::class)->getTableName(),
-                ['number' => $count, 'type' => $type]
+                ['type' => $type, 'number' => $number]
             );
+
             return true;
-        } catch (\PDOException $e) {
+        } catch (\PDOException $exception) {
-            return false;
+        } catch (DoctrineDBALException $exception) {
-        } catch (DBALException $e) {
+            if (!$exception->getPrevious() instanceof \PDOException) {
-            if (! $e->getPrevious() instanceof \PDOException) {
+                $this->logger->critical('Exception occurred: ' . $exception->getMessage());
-                $this->systemLogger->logException($e);
             }
-        } catch (\Exception $e) {
+        } catch (\Exception $exception) {
-            $this->systemLogger->logException($e);
+            $this->logger->critical('Exception occurred: ' . $exception->getMessage());
         }
 
         return false;
     }
 
     /**
-     * @param int $to
+     * @param string|object $source
-     * @param string|object $type
+     * @param int $number
-     *
      * @return bool
+     * @throws DoctrineDBALDriverException
+     * @throws DoctrineDBALException
+     * @throws InvalidSourceException
      */
-    public function advanceTo($to, $type)
+    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
+     * @param string|object $source
-     *
+     * @throws DoctrineDBALDriverException
-     * @return int
+     * @throws DoctrineDBALException
+     * @throws InvalidSourceException
      */
-    public function getLastNumberFor($type)
+    public function getLastNumberFor($source): int
     {
-        /* @var EntityManager $em */
+        return (int)$this->entityManager->getConnection()->executeQuery(
-        $em = $this->entityManager;
+            'SELECT MAX(number) FROM '
-
+            . $this->entityManager->getClassMetadata(SequenceEntry::class)->getTableName()
-        return $em->getConnection()->executeQuery(
+            . ' WHERE type = :type',
-            'SELECT MAX(number) FROM ' . $em->getClassMetadata(Insert::class)->getTableName() . ' WHERE type = :type',
+            ['type' => $this->inferTypeFromSource($source)]
-            ['type' => $this->inferTypeFromSource($type)]
+        )->fetchOne();
-        )->fetchAll(\PDO::FETCH_COLUMN)[0];
     }
 
     /**
-     * @param string|object $stringOrObject
+     * @param string|object $source
-     *
      * @return string
-     * @throws Exception
+     * @throws InvalidSourceException
      */
-    protected function inferTypeFromSource($stringOrObject)
+    protected function inferTypeFromSource($source): string
     {
-        if (is_object($stringOrObject)) {
+        if (\is_string($source)) {
-            $stringOrObject = TypeHandling::getTypeForValue($stringOrObject);
+            return $source;
-        }
-        if (! $stringOrObject) {
-            throw new Exception('No Type given');
         }
 
-        return $stringOrObject;
+        if (\is_object($source)) {
+            return TypeHandling::getTypeForValue($source);
+        }
+
+        throw new InvalidSourceException('Could not infer type from source.', 1632216173);
     }
 }

Configuration/Testing/Settings.yaml

@@ -2,5 +2,5 @@ Neos:
   Flow:
     persistence:
       backendOptions:
-        driver: 'pdo_sqlite'
+        driver: "pdo_sqlite"
-        path: '%FLOW_PATH_DATA%/Temporary/testing.db'
+        path: "%FLOW_PATH_DATA%Temporary/testing.db"

Migrations/Mysql/Version20140505093853.php

@@ -1,46 +1,37 @@
 <?php
+
+declare(strict_types=1);
+
 namespace Neos\Flow\Persistence\Doctrine\Migrations;
 
-use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Exception as DoctrineDBALException;
+use Doctrine\DBAL\Migrations\AbortMigrationException;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
-/**
- * Auto-generated Migration: Please modify to your needs! This block will be used as the migration description if getDescription() is not used.
- */
 class Version20140505093853 extends AbstractMigration
 {
-
     /**
-     * @return string
+     * @param Schema $schema
+     * @throws AbortMigrationException
+     * @throws DoctrineDBALException
      */
-    public function getDescription()
+    public function up(Schema $schema): void
     {
-        return '';
+        $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, PRIMARY KEY(number, type))');
     }
 
     /**
      * @param Schema $schema
-     * @return void
+     * @throws AbortMigrationException
+     * @throws DoctrineDBALException
      */
-    public function up(Schema $schema)
+    public function down(Schema $schema): void
     {
-        // this up() migration is autogenerated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on "mysql".');
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != "mysql");
 
-        $this->addSql(
+        $this->addSql('DROP TABLE digicomp_sequence_domain_model_insert');
-            "CREATE TABLE digicomp_sequence_domain_model_insert (number INT NOT NULL, type VARCHAR(255) NOT NULL, PRIMARY KEY(number, type))"
-        );
-    }
-
-    /**
-     * @param Schema $schema
-     * @return void
-     */
-    public function down(Schema $schema)
-    {
-        // this down() migration is autogenerated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != "mysql");
-
-        $this->addSql("DROP TABLE digicomp_sequence_domain_model_insert");
     }
 }

Migrations/Mysql/Version20160624203903.php

@@ -1,49 +1,36 @@
 <?php
+
+declare(strict_types=1);
+
 namespace Neos\Flow\Persistence\Doctrine\Migrations;
 
-use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Exception as DoctrineDBALException;
+use Doctrine\DBAL\Migrations\AbortMigrationException;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
-/**
- * Auto-generated Migration: Please modify to your needs! This block will be used as the migration description if getDescription() is not used.
- */
 class Version20160624203903 extends AbstractMigration
 {
-
-    /**
-     * @return string
-     */
-    public function getDescription()
-    {
-        return '';
-    }
-
     /**
      * @param Schema $schema
-     * @return void
+     * @throws AbortMigrationException
+     * @throws DoctrineDBALException
      */
-    public function up(Schema $schema)
+    public function up(Schema $schema): void
     {
-        // this up() migration is autogenerated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on "mysql".');
-        $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() != 'mysql',
-            'Migration can only be executed safely on "mysql".'
-        );
 
         $this->addSql('CREATE INDEX type_idx ON digicomp_sequence_domain_model_insert (type)');
     }
 
     /**
      * @param Schema $schema
-     * @return void
+     * @throws AbortMigrationException
+     * @throws DoctrineDBALException
      */
-    public function down(Schema $schema)
+    public function down(Schema $schema): void
     {
-        // this down() migration is autogenerated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on "mysql".');
-        $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() != 'mysql',
-            'Migration can only be executed safely on "mysql".'
-        );
 
         $this->addSql('DROP INDEX type_idx ON digicomp_sequence_domain_model_insert');
     }

Migrations/Mysql/Version20210922110814.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Neos\Flow\Persistence\Doctrine\Migrations;
+
+use Doctrine\DBAL\Exception as DoctrineDBALException;
+use Doctrine\DBAL\Migrations\AbortMigrationException;
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+class Version20210922110814 extends AbstractMigration
+{
+    /**
+     * @param Schema $schema
+     * @throws AbortMigrationException
+     * @throws DoctrineDBALException
+     */
+    public function up(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_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');
+    }
+
+    /**
+     * @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 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');
+    }
+}

README.md

@@ -1,22 +1,23 @@
-DigiComp.Sequence
+# DigiComp.Sequence
--------------------------
 
+![Build status](https://ci.digital-competence.de/api/badges/Packages/DigiComp.FlowObjectResolving/status.svg)
 
-This is a very simple and stupid tool, helping in generation of gapless sequences. For this task it relies on key 
+This is a very simple tool, helping in generation of gapless sequences. For this task it relies on key integrity of the
-integrity of the database of your choice.
+database of your choice.
 
 Usage is quite simple also:
 
-	/**
+```php
-	 * @param \DigiComp\Sequence\Service\SequenceNumberGenerator $sequenceNumberGenerator
+    /**
-	 */
+     * @param SequenceGenerator $sequenceGenerator
-	public function __construct(SequenceNumberGenerator $sequenceNumberGenerator) 
+     */
-	{
+    public function __construct(SequenceGenerator $sequenceNumberGenerator)
-		$this->orderId = $sequenceNumberGenerator->getNextNumberFor($this);		
+    {
-	}
+        $this->orderId = $sequenceGenerator->getNextNumberFor($this);
+    }
+```
 
-``getNextNumberFor`` allows you to give an object which will be resolved to its FQCN or a custom sequence name.
+`getNextNumberFor` allows you to give an object (which will be resolved to its FQCN) or a custom sequence name.
 
-The CommandController helps you to advance the current sequence number, in case of migrations or similar.
+The `SequenceCommandController` helps you to set the last sequence number, in case of migrations or similar. See
-
+`./flow help sequence:setlastnumberfor` if interested.
-See ``./flow help sequence:advance`` if interested.

Tests/Functional/SequenceTest.php

@@ -1,32 +1,39 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DigiComp\Sequence\Tests\Functional;
 
+use DigiComp\Sequence\Service\Exception\InvalidSourceException;
 use DigiComp\Sequence\Service\SequenceGenerator;
+use Doctrine\DBAL\Driver\Exception as DoctrineDBALDriverException;
+use Doctrine\DBAL\Exception as DoctrineDBALException;
 use Neos\Flow\Tests\FunctionalTestCase;
 
 class SequenceTest extends FunctionalTestCase
 {
     /**
-     * @var bool
+     * @inheritDoc
      */
     protected static $testablePersistenceEnabled = true;
 
     /**
      * @test
+     * @throws DoctrineDBALDriverException
+     * @throws DoctrineDBALException
+     * @throws InvalidSourceException
      */
-    public function sequenceTest()
+    public function sequenceTest(): void
     {
         $sequenceGenerator = $this->objectManager->get(SequenceGenerator::class);
 
-        $number = $sequenceGenerator->getLastNumberFor($sequenceGenerator);
+        self::assertEquals(0, $sequenceGenerator->getLastNumberFor($sequenceGenerator));
-        $this->assertEquals(0, $number);
+        self::assertEquals(1, $sequenceGenerator->getNextNumberFor($sequenceGenerator));
-        $this->assertEquals(1, $sequenceGenerator->getNextNumberFor($sequenceGenerator));
 
         $pIds = [];
         for ($i = 0; $i < 10; $i++) {
-            $pId = pcntl_fork();
+            $pId = \pcntl_fork();
-            if ($pId) {
+            if ($pId > 0) {
                 $pIds[] = $pId;
             } else {
                 for ($j = 0; $j < 10; $j++) {
@@ -39,21 +46,24 @@ class SequenceTest extends FunctionalTestCase
 
         foreach ($pIds as $pId) {
             $status = 0;
-            pcntl_waitpid($pId, $status);
+            \pcntl_waitpid($pId, $status);
         }
 
-        $this->assertEquals(101, $sequenceGenerator->getLastNumberFor($sequenceGenerator));
+        self::assertEquals(101, $sequenceGenerator->getLastNumberFor($sequenceGenerator));
     }
 
     /**
      * @test
+     * @throws DoctrineDBALDriverException
+     * @throws DoctrineDBALException
+     * @throws InvalidSourceException
      */
-    public function advanceTest()
+    public function setLastNumberForTest(): void
     {
         $sequenceGenerator = $this->objectManager->get(SequenceGenerator::class);
+        $sequenceGenerator->setLastNumberFor($sequenceGenerator, 100);
 
-        $sequenceGenerator->advanceTo(100, $sequenceGenerator);
+        self::assertEquals(100, $sequenceGenerator->getLastNumberFor($sequenceGenerator));
-        $this->assertEquals(100, $sequenceGenerator->getLastNumberFor($sequenceGenerator));
+        self::assertEquals(0, $sequenceGenerator->getLastNumberFor('otherSequence'));
-        $this->assertEquals(0, $sequenceGenerator->getLastNumberFor('strangeOtherSequence'));
     }
 }

composer.json

@@ -1,39 +1,57 @@
 {
     "name": "digicomp/sequence",
-    "type": "neos-package",
     "description": "Sequence is a very simple database agnostic but database based sequence generator",
+    "type": "neos-package",
     "keywords": [
-        "flow",
+        "Neos",
-        "neos",
+        "Flow",
         "doctrine",
         "sequence"
     ],
+    "homepage": "https://github.com/digital-competence/DigiComp.Sequence",
+    "license": "MIT",
     "authors": [
         {
             "name": "Ferdinand Kuhl",
             "email": "f.kuhl@digital-competence.de",
-            "homepage": "http://www.digital-competence.de",
+            "homepage": "https://www.digital-competence.de",
             "role": "Developer"
         }
     ],
-    "license": "MIT",
-    "homepage": "https://github.com/digicomp/DigiComp.Sequence",
     "require": {
-        "neos/flow": "~4.1|~5.3"
+        "php": ">=7.4.0",
+        "ext-pdo": "*",
+        "neos/flow": "^6.3.5 || ^7.0 || ^8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "3.7.*",
+        "ext-pcntl": "*",
-        "ext-pcntl": "*"
+        "mikey179/vfsstream": "^1.6.1",
+        "neos/buildessentials": "^7.0.0",
+        "phpunit/phpunit": "~8.5",
+        "vimeo/psalm": "~4.22.0"
     },
     "autoload": {
         "psr-4": {
-            "DigiComp\\Sequence\\": "Classes"
+            "DigiComp\\Sequence\\": "Classes/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "DigiComp\\Sequence\\Tests\\": "Tests/"
+        }
+    },
+    "config": {
+        "sort-packages": true,
+        "platform-check": true
+    },
     "extra": {
         "branch-alias": {
-            "dev-version/1.x-dev": "1.1.x-dev",
+            "dev-develop": "4.0.x-dev",
-            "dev-develop": "2.0.x-dev"
+            "dev-version/2.x-dev": "2.1.x-dev",
+            "dev-version/1.x-dev": "1.1.x-dev"
+        },
+        "neos": {
+            "package-key": "DigiComp.Sequence"
         },
         "applied-flow-migrations": [
             "Inwebs.Basket-201409170938",
@@ -67,7 +85,9 @@
             "Neos.Flow-20170125103800",
             "Neos.Flow-20170127183102",
             "DigiComp.SettingValidator-20170603120900",
-            "Neos.Flow-20180415105700"
+            "Neos.Flow-20180415105700",
+            "Neos.Flow-20190425144900",
+            "Neos.Flow-20190515215000"
         ]
     }
 }