Skip to content

Commit 174e62f

Browse files
skurfuerstskurfuerst
authored
Merge pull request #52 from MarcoPNS/master
Neos 7
2 parents ab3cd47 + 03f1e19 commit 174e62f

9 files changed

+30
-30
lines changed

‎Migrations/Mysql/Version20160519150828.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Neos\Flow\Persistence\Doctrine\Migrations;
44

5-
use Doctrine\DBAL\Migrations\AbstractMigration;
5+
use Doctrine\Migrations\AbstractMigration;
66
use Doctrine\DBAL\Schema\Schema;
77

88
/**
@@ -14,7 +14,7 @@ class Version20160519150828 extends AbstractMigration
1414
* @param Schema $schema
1515
* @return void
1616
*/
17-
public function up(Schema $schema)
17+
public function up(Schema $schema): void
1818
{
1919
$this->abortIf($this->connection->getDatabasePlatform()->getName() != "mysql");
2020

@@ -42,7 +42,7 @@ public function up(Schema $schema)
4242
* @param Schema $schema
4343
* @return void
4444
*/
45-
public function down(Schema $schema)
45+
public function down(Schema $schema): void
4646
{
4747
// this down() migration is autogenerated, please modify it to your needs
4848
$this->abortIf($this->connection->getDatabasePlatform()->getName() != "mysql");

‎Migrations/Mysql/Version20160524125855.php

+4-4
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 Version20160524125855 extends AbstractMigration
1313
/**
1414
* @return string
1515
*/
16-
public function getDescription()
16+
public function getDescription(): string
1717
{
1818
return '';
1919
}
@@ -22,7 +22,7 @@ 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 up() migration is autogenerated, please modify it to your needs
2828
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".');
@@ -34,7 +34,7 @@ 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 down() migration is autogenerated, please modify it to your needs
4040
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".');

‎Migrations/Mysql/Version20160526150442.php

+4-4
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 Version20160526150442 extends AbstractMigration
1313
/**
1414
* @return string
1515
*/
16-
public function getDescription()
16+
public function getDescription(): string
1717
{
1818
return '';
1919
}
@@ -22,7 +22,7 @@ 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 up() migration is autogenerated, please modify it to your needs
2828
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".');
@@ -34,7 +34,7 @@ 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 down() migration is autogenerated, please modify it to your needs
4040
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".');

‎Migrations/Mysql/Version20160526150536.php

+4-4
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 Version20160526150536 extends AbstractMigration
1313
/**
1414
* @return string
1515
*/
16-
public function getDescription()
16+
public function getDescription(): string
1717
{
1818
return '';
1919
}
@@ -22,7 +22,7 @@ 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 up() migration is autogenerated, please modify it to your needs
2828
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".');
@@ -34,7 +34,7 @@ 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 down() migration is autogenerated, please modify it to your needs
4040
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".');

‎Migrations/Mysql/Version20160530132725.php

+4-4
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 Version20160530132725 extends AbstractMigration
1313
/**
1414
* @return string
1515
*/
16-
public function getDescription()
16+
public function getDescription(): string
1717
{
1818
return '';
1919
}
@@ -22,7 +22,7 @@ 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 up() migration is autogenerated, please modify it to your needs
2828
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".');
@@ -34,7 +34,7 @@ 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 down() migration is autogenerated, please modify it to your needs
4040
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".');

‎Migrations/Mysql/Version20160607125833.php

+4-4
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 Version20160607125833 extends AbstractMigration
1313
/**
1414
* @return string
1515
*/
16-
public function getDescription()
16+
public function getDescription(): string
1717
{
1818
return '';
1919
}
@@ -22,7 +22,7 @@ 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 up() migration is autogenerated, please modify it to your needs
2828
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".');
@@ -35,7 +35,7 @@ public function up(Schema $schema)
3535
* @param Schema $schema
3636
* @return void
3737
*/
38-
public function down(Schema $schema)
38+
public function down(Schema $schema): void
3939
{
4040
// this down() migration is autogenerated, please modify it to your needs
4141
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".');

‎Migrations/Mysql/Version20161101091328.php

+4-4
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 Version20161101091328 extends AbstractMigration
1313
/**
1414
* @return string
1515
*/
16-
public function getDescription()
16+
public function getDescription(): string
1717
{
1818
return '';
1919
}
@@ -22,7 +22,7 @@ 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 up() migration is autogenerated, please modify it to your needs
2828
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".');
@@ -33,7 +33,7 @@ public function up(Schema $schema)
3333
* @param Schema $schema
3434
* @return void
3535
*/
36-
public function down(Schema $schema)
36+
public function down(Schema $schema): void
3737
{
3838
// this down() migration is autogenerated, please modify it to your needs
3939
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".');

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Sandstorm.UserManagement is currently being maintained for the following version
1313

1414
| Neos / Flow Version | Sandstorm.UserManagement Version | Branch | Maintained |
1515
|----------------------------|----------------------------------|--------|------------|
16-
| Neos 5.x, Flow 6.x | 7.x | master | Yes |
16+
| Neos 5.x-7.x, Flow 6.x-7.x | 7.x | master | Yes |
1717
| Neos 4.x, Flow 5.x | 6.x | 6.0 | Yes |
1818
| Neos 3.x, Flow 4.x | 5.x | 5.0 | Bugfixes |
1919
| Neos 2.3 LTS, Flow 3.3 LTS | 3.x | 3.0 | No |

‎composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"source": "https://github.com/sandstorm/UserManagement"
2323
},
2424
"require": {
25-
"neos/flow": "^6.0 || dev-master",
26-
"sandstorm/templatemailer": "^2.0"
25+
"neos/flow": "^6.0 || ^7.0 || dev-master",
26+
"sandstorm/templatemailer": "^2.0.2"
2727
},
2828
"autoload": {
2929
"psr-4": {

0 commit comments

Comments
 (0)