diff --git a/Classes/Domain/Agent/Agent.php b/Classes/Domain/Agent/Agent.php index cc7eb6c..0130973 100644 --- a/Classes/Domain/Agent/Agent.php +++ b/Classes/Domain/Agent/Agent.php @@ -44,7 +44,7 @@ public static function fromRole(Role $role): self { return new self( $role->getIdentifier(), - $role->getName(), + $role->getLabel(), AgentType::role() ); } diff --git a/Classes/Domain/Agent/AgentTypeIsInvalid.php b/Classes/Domain/Agent/AgentTypeIsInvalid.php index 9809f5b..1926b9b 100644 --- a/Classes/Domain/Agent/AgentTypeIsInvalid.php +++ b/Classes/Domain/Agent/AgentTypeIsInvalid.php @@ -13,7 +13,7 @@ */ final class AgentTypeIsInvalid extends \DomainException { - public static function becauseAgentTypeHasInvalidValue(int $attemptedValue, array $validValues): self + public static function becauseAgentTypeHasInvalidValue(string $attemptedValue, array $validValues): self { return new self('"' . $attemptedValue . '" is no valid value for AgentType, must be one of '.join(', ', $validValues), 1591622975); } diff --git a/Migrations/Mysql/Version20190902163126.php b/Migrations/Mysql/Version20190902163126.php index 32488df..37b5a17 100644 --- a/Migrations/Mysql/Version20190902163126.php +++ b/Migrations/Mysql/Version20190902163126.php @@ -3,7 +3,7 @@ namespace Neos\Flow\Persistence\Doctrine\Migrations; -use Doctrine\DBAL\Migrations\AbstractMigration; +use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; /** @@ -16,7 +16,7 @@ public function getDescription(): string return 'The migration for providing the basic task table structure'; } - public function up(Schema $schema) + public function up(Schema $schema): void { $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".'); @@ -24,7 +24,7 @@ public function up(Schema $schema) $this->addSql('CREATE TABLE sitegeist_bitzer_domain_task_task (identifier VARCHAR(40) NOT NULL, classname VARCHAR(255) NOT NULL, properties TEXT NOT NULL, scheduledtime DATETIME NOT NULL, actionstatus VARCHAR(255) NOT NULL, agent VARCHAR(255) NOT NULL, object VARCHAR(255) NULL, target VARCHAR(255) NULL, PRIMARY KEY(identifier), INDEX `OBJECT` (`object`), INDEX `CLASSNAME_OBJECT_STATUS` (`classname`, `object`, `actionstatus`)) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ENGINE = InnoDB'); } - public function down(Schema $schema) + public function down(Schema $schema): void { $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".'); diff --git a/Migrations/Mysql/Version20200707164857.php b/Migrations/Mysql/Version20200707164857.php index e660bf8..4dc2d5c 100644 --- a/Migrations/Mysql/Version20200707164857.php +++ b/Migrations/Mysql/Version20200707164857.php @@ -3,7 +3,7 @@ namespace Neos\Flow\Persistence\Doctrine\Migrations; -use Doctrine\DBAL\Migrations\AbstractMigration; +use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; /** @@ -16,7 +16,7 @@ public function getDescription(): string return 'The migration for adding the agenttype field to basic task table structure'; } - public function up(Schema $schema) + public function up(Schema $schema): void { $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".'); @@ -25,7 +25,7 @@ public function up(Schema $schema) $this->addSql('UPDATE sitegeist_bitzer_domain_task_task SET agenttype = 1'); } - public function down(Schema $schema) + public function down(Schema $schema): void { $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".'); diff --git a/Migrations/Mysql/Version20200707184200.php b/Migrations/Mysql/Version20200707184200.php index b87f30e..7cd52a1 100644 --- a/Migrations/Mysql/Version20200707184200.php +++ b/Migrations/Mysql/Version20200707184200.php @@ -3,7 +3,7 @@ namespace Neos\Flow\Persistence\Doctrine\Migrations; -use Doctrine\DBAL\Migrations\AbstractMigration; +use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; /** @@ -16,7 +16,7 @@ public function getDescription(): string return 'The migration for removing the agenttype field and adds a "role:" prefix to the agent field in the basic task table structure'; } - public function up(Schema $schema) + public function up(Schema $schema): void { $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".'); @@ -25,7 +25,7 @@ public function up(Schema $schema) $this->addSql('UPDATE sitegeist_bitzer_domain_task_task SET agent = concat("role:", agent)'); } - public function down(Schema $schema) + public function down(Schema $schema): void { $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".'); diff --git a/Resources/Private/Fusion/Application/Index.fusion b/Resources/Private/Fusion/Application/Index.fusion index f9534d9..3baf344 100644 --- a/Resources/Private/Fusion/Application/Index.fusion +++ b/Resources/Private/Fusion/Application/Index.fusion @@ -21,7 +21,7 @@ prototype(Sitegeist.Bitzer:Application.Index) < prototype(Neos.Fusion:Component)