Skip to content

Commit 79160a6

Browse files
committed
TASK: Flow 7.3 compatibility
1 parent b22b23f commit 79160a6

File tree

6 files changed

+31
-24
lines changed

6 files changed

+31
-24
lines changed
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
namespace Neos\Flow\Persistence\Doctrine\Migrations;
33

4-
use Doctrine\DBAL\Migrations\AbstractMigration;
4+
use Doctrine\Migrations\AbstractMigration;
55
use Doctrine\DBAL\Schema\Schema;
66

77
/**
@@ -13,7 +13,7 @@ class Version20171212225913 extends AbstractMigration
1313
/**
1414
* @return string
1515
*/
16-
public function getDescription()
16+
public function getDescription(): string
1717
{
1818
return '';
1919
}
@@ -22,10 +22,10 @@ public function getDescription()
2222
* @param Schema $schema
2323
* @return void
2424
*/
25-
public function up(Schema $schema)
25+
public function up(Schema $schema): void
2626
{
2727
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".');
28-
28+
2929
$this->addSql('CREATE TABLE swisscom_communicationdispatcher_domain_model_notification (persistence_object_identifier VARCHAR(40) NOT NULL, person VARCHAR(40) DEFAULT NULL, subject VARCHAR(255) NOT NULL, text VARCHAR(255) NOT NULL, isread TINYINT(1) NOT NULL, timestamp DATETIME NOT NULL, INDEX IDX_C9B1358A34DCD176 (person), PRIMARY KEY(persistence_object_identifier)) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ENGINE = InnoDB');
3030
$this->addSql('ALTER TABLE swisscom_communicationdispatcher_domain_model_notification ADD CONSTRAINT FK_C9B1358A34DCD176 FOREIGN KEY (person) REFERENCES neos_party_domain_model_person (persistence_object_identifier) ON DELETE CASCADE');
3131
}
@@ -34,10 +34,10 @@ public function up(Schema $schema)
3434
* @param Schema $schema
3535
* @return void
3636
*/
37-
public function down(Schema $schema)
37+
public function down(Schema $schema): void
3838
{
3939
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".');
40-
40+
4141
$this->addSql('DROP TABLE swisscom_communicationdispatcher_domain_model_notification');
4242
}
43-
}
43+
}
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
namespace Neos\Flow\Persistence\Doctrine\Migrations;
33

4-
use Doctrine\DBAL\Migrations\AbstractMigration;
4+
use Doctrine\Migrations\AbstractMigration;
55
use Doctrine\DBAL\Schema\Schema;
66

77
/**
@@ -13,7 +13,7 @@ class Version20180130175351 extends AbstractMigration
1313
/**
1414
* @return string
1515
*/
16-
public function getDescription()
16+
public function getDescription(): string
1717
{
1818
return '';
1919
}
@@ -22,21 +22,21 @@ public function getDescription()
2222
* @param Schema $schema
2323
* @return void
2424
*/
25-
public function up(Schema $schema)
25+
public function up(Schema $schema): void
2626
{
2727
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".');
28-
28+
2929
$this->addSql('ALTER TABLE swisscom_communicationdispatcher_domain_model_notification CHANGE isread notified TINYINT(1) NOT NULL');
3030
}
3131

3232
/**
3333
* @param Schema $schema
3434
* @return void
3535
*/
36-
public function down(Schema $schema)
36+
public function down(Schema $schema): void
3737
{
3838
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".');
39-
39+
4040
$this->addSql('ALTER TABLE swisscom_communicationdispatcher_domain_model_notification CHANGE notified isread TINYINT(1) NOT NULL');
4141
}
42-
}
42+
}

Migrations/Mysql/Version20190716210423.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class Version20190716210423 extends AbstractMigration
1313
/**
1414
* @return string
1515
*/
16-
public function getDescription()
16+
public function getDescription(): string
1717
{
1818
return '';
1919
}
@@ -22,21 +22,21 @@ public function getDescription()
2222
* @param Schema $schema
2323
* @return void
2424
*/
25-
public function up(Schema $schema)
25+
public function up(Schema $schema): void
2626
{
2727
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".');
28-
28+
2929
$this->addSql('ALTER TABLE swisscom_communicationdispatcher_domain_model_notification CHANGE text text LONGTEXT NOT NULL');
3030
}
3131

3232
/**
3333
* @param Schema $schema
3434
* @return void
3535
*/
36-
public function down(Schema $schema)
36+
public function down(Schema $schema): void
3737
{
3838
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".');
3939

4040
$this->addSql('ALTER TABLE swisscom_communicationdispatcher_domain_model_notification CHANGE text text VARCHAR(255) NOT NULL COLLATE utf8mb4_unicode_ci');
4141
}
42-
}
42+
}

Tests/Functional/MessageServiceTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class MessageServiceTest extends FunctionalTestCase
2424
/**
2525
* @return void
2626
*/
27-
public function setUp()
27+
public function setUp(): void
2828
{
2929
parent::setUp();
3030

Tests/Functional/NotificationChannelTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class NotificationChannelTest extends FunctionalTestCase
3030
/**
3131
* @return void
3232
*/
33-
public function setUp()
33+
public function setUp(): void
3434
{
3535
parent::setUp();
3636

composer.json

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"Flow"
1414
],
1515
"require": {
16-
"neos/flow": "^4.0 || ^5.0",
16+
"neos/flow": "^7.0",
1717
"neos/media": "*",
1818
"neos/swiftmailer": "~7.0"
1919
},
@@ -68,7 +68,14 @@
6868
"TYPO3.TYPO3CR-20150510103823",
6969
"Neos.ContentRepository-20161125012000",
7070
"Neos.ContentRepository-20161219093512",
71-
"Neos.Flow-20180415105700"
71+
"Neos.Flow-20180415105700",
72+
"Neos.Flow-20190425144900",
73+
"Neos.Flow-20190515215000",
74+
"Neos.Flow-20200813181400",
75+
"Neos.Flow-20201003165200",
76+
"Neos.Flow-20201109224100",
77+
"Neos.Flow-20201205172733",
78+
"Neos.Flow-20201207104500"
7279
]
7380
}
74-
}
81+
}

0 commit comments

Comments
 (0)