Skip to content

Commit

Permalink
Merge pull request #74 from neos/task/flow-70-compatibility
Browse files Browse the repository at this point in the history 
FEATURE: Flow 7.x compatibility
  • Loading branch information
@kdambekalns
kdambekalns committed Dec 10, 2020
2 parents 7653984 + 38c6523 commit 210dda7
Show file tree
Hide file tree
Showing 9 changed files with 55 additions and 30 deletions.
6 changes: 3 additions & 3 deletions Migrations/Mysql/Version20141111161429.php
View file
@@ -1,7 +1,7 @@
<?php
namespace Neos\Flow\Persistence\Doctrine\Migrations;

use Doctrine\DBAL\Migrations\AbstractMigration,
use Doctrine\Migrations\AbstractMigration,
Doctrine\DBAL\Schema\Schema;

/**
Expand All @@ -13,7 +13,7 @@ class Version20141111161429 extends AbstractMigration {
* @param Schema $schema
* @return void
*/
public function up(Schema $schema) {
public function up(Schema $schema): void {
$this->abortIf($this->connection->getDatabasePlatform()->getName() != "mysql");
/**
* With the new version of NEOS the recommended database charset is utf8mb4 and not just utf8 anymore.
Expand Down Expand Up @@ -52,7 +52,7 @@ public function up(Schema $schema) {
* @param Schema $schema
* @return void
*/
public function down(Schema $schema) {
public function down(Schema $schema): void {
$this->abortIf($this->connection->getDatabasePlatform()->getName() != "mysql");

$this->addSql("DROP TABLE typo3_neos_googleanalytics_domain_model_siteconfiguration");
Expand Down
6 changes: 3 additions & 3 deletions Migrations/Mysql/Version20141202134558.php
View file
@@ -1,7 +1,7 @@
<?php
namespace Neos\Flow\Persistence\Doctrine\Migrations;

use Doctrine\DBAL\Migrations\AbstractMigration,
use Doctrine\Migrations\AbstractMigration,
Doctrine\DBAL\Schema\Schema;

/**
Expand All @@ -13,7 +13,7 @@ class Version20141202134558 extends AbstractMigration {
* @param Schema $schema
* @return void
*/
public function up(Schema $schema) {
public function up(Schema $schema): void {
$this->abortIf($this->connection->getDatabasePlatform()->getName() != "mysql");

$this->addSql("ALTER TABLE typo3_neos_googleanalytics_domain_model_siteconfiguration ADD trackingid VARCHAR(255) NOT NULL");
Expand All @@ -23,7 +23,7 @@ public function up(Schema $schema) {
* @param Schema $schema
* @return void
*/
public function down(Schema $schema) {
public function down(Schema $schema): void {
$this->abortIf($this->connection->getDatabasePlatform()->getName() != "mysql");

$this->addSql("ALTER TABLE typo3_neos_googleanalytics_domain_model_siteconfiguration DROP trackingid");
Expand Down
8 changes: 4 additions & 4 deletions Migrations/Mysql/Version20170118172429.php
View file
@@ -1,15 +1,15 @@
<?php
namespace Neos\Flow\Persistence\Doctrine\Migrations;

use Doctrine\DBAL\Migrations\AbstractMigration;
use Doctrine\Migrations\AbstractMigration;
use Doctrine\DBAL\Schema\Schema;

class Version20170118172429 extends AbstractMigration
{
/**
* @return string
*/
public function getDescription()
public function getDescription(): string
{
return 'Adjust table names to new package key.';
}
Expand All @@ -18,7 +18,7 @@ public function getDescription()
* @param Schema $schema
* @return void
*/
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".');

Expand All @@ -37,7 +37,7 @@ public function up(Schema $schema)
* @param Schema $schema
* @return void
*/
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".');

Expand Down
6 changes: 3 additions & 3 deletions Migrations/Mysql/Version20190607071727.php
View file
Expand Up @@ -10,7 +10,7 @@ class Version20190607071727 extends AbstractMigration
/**
* @return string
*/
public function getDescription()
public function getDescription(): string
{
return 'Remove deprecated site configuration entity';
}
Expand All @@ -19,7 +19,7 @@ public function getDescription()
* @param Schema $schema
* @return void
*/
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".');

Expand All @@ -30,7 +30,7 @@ public function up(Schema $schema)
* @param Schema $schema
* @return void
*/
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".');

Expand Down
6 changes: 3 additions & 3 deletions Migrations/Postgresql/Version20141111161430.php
View file
@@ -1,7 +1,7 @@
<?php
namespace Neos\Flow\Persistence\Doctrine\Migrations;

use Doctrine\DBAL\Migrations\AbstractMigration,
use Doctrine\Migrations\AbstractMigration,
Doctrine\DBAL\Schema\Schema;

/**
Expand All @@ -13,7 +13,7 @@ class Version20141111161430 extends AbstractMigration {
* @param Schema $schema
* @return void
*/
public function up(Schema $schema) {
public function up(Schema $schema): void {
$this->abortIf($this->connection->getDatabasePlatform()->getName() != "postgresql");

$this->addSql("CREATE TABLE typo3_neos_googleanalytics_domain_model_siteconfiguration (persistence_object_identifier VARCHAR(40) NOT NULL, site VARCHAR(40) DEFAULT NULL, profileid VARCHAR(255) NOT NULL, PRIMARY KEY(persistence_object_identifier))");
Expand All @@ -38,7 +38,7 @@ public function up(Schema $schema) {
* @param Schema $schema
* @return void
*/
public function down(Schema $schema) {
public function down(Schema $schema): void {
$this->abortIf($this->connection->getDatabasePlatform()->getName() != "postgresql");

$this->addSql("DROP TABLE typo3_neos_googleanalytics_domain_model_siteconfiguration");
Expand Down
8 changes: 4 additions & 4 deletions Migrations/Postgresql/Version20141202134559.php
View file
@@ -1,7 +1,7 @@
<?php
namespace Neos\Flow\Persistence\Doctrine\Migrations;

use Doctrine\DBAL\Migrations\AbstractMigration;
use Doctrine\Migrations\AbstractMigration;
use Doctrine\DBAL\Schema\Schema;

/**
Expand All @@ -12,7 +12,7 @@ class Version20141202134559 extends AbstractMigration
/**
* @return string
*/
public function getDescription()
public function getDescription(): string
{
return 'Add trackingId to SiteConfiguration.';
}
Expand All @@ -21,7 +21,7 @@ public function getDescription()
* @param Schema $schema
* @return void
*/
public function up(Schema $schema)
public function up(Schema $schema): void
{
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on "postgresql".');

Expand All @@ -32,7 +32,7 @@ public function up(Schema $schema)
* @param Schema $schema
* @return void
*/
public function down(Schema $schema)
public function down(Schema $schema): void
{
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on "postgresql".');

Expand Down
8 changes: 4 additions & 4 deletions Migrations/Postgresql/Version20170118172430.php
View file
@@ -1,15 +1,15 @@
<?php
namespace Neos\Flow\Persistence\Doctrine\Migrations;

use Doctrine\DBAL\Migrations\AbstractMigration;
use Doctrine\Migrations\AbstractMigration;
use Doctrine\DBAL\Schema\Schema;

class Version20170118172430 extends AbstractMigration
{
/**
* @return string
*/
public function getDescription()
public function getDescription(): string
{
return 'Adjust table names to new package key.';
}
Expand All @@ -18,7 +18,7 @@ public function getDescription()
* @param Schema $schema
* @return void
*/
public function up(Schema $schema)
public function up(Schema $schema): void
{
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on "postgresql".');

Expand All @@ -30,7 +30,7 @@ public function up(Schema $schema)
* @param Schema $schema
* @return void
*/
public function down(Schema $schema)
public function down(Schema $schema): void
{
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on "postgresql".');

Expand Down
6 changes: 3 additions & 3 deletions Migrations/Postgresql/Version20190725070956.php
View file
Expand Up @@ -11,7 +11,7 @@ class Version20190725070956 extends AbstractMigration
/**
* @return string
*/
public function getDescription()
public function getDescription(): string
{
return 'Remove deprecated site configuration entity';
}
Expand All @@ -20,7 +20,7 @@ public function getDescription()
* @param Schema $schema
* @return void
*/
public function up(Schema $schema)
public function up(Schema $schema): void
{
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on "postgresql".');

Expand All @@ -31,7 +31,7 @@ public function up(Schema $schema)
* @param Schema $schema
* @return void
*/
public function down(Schema $schema)
public function down(Schema $schema): void
{
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on "postgresql".');

Expand Down
31 changes: 28 additions & 3 deletions composer.json
View file
Expand Up @@ -4,8 +4,8 @@
"description": "Google Analytics integration for Neos CMS",
"license": "GPL-3.0-or-later",
"require": {
"neos/neos": "~4.3 || ~5.0 || dev-master",
"neos/fusion-afx": "^1.2",
"neos/neos": "^7.0 || dev-master",
"neos/fusion-afx": "^7.0",
"flowpack/googleapiclient": "^1.0",
"guzzlehttp/psr7": "^1.4",
"ext-json": "*"
Expand Down Expand Up @@ -83,7 +83,32 @@
"Neos.Neos-20161219094403",
"Neos.Neos-20161219122512",
"Neos.Fusion-20161219130100",
"Neos.Neos-20161220163741"
"Neos.Neos-20161220163741",
"TYPO3.Form-20160601101500",
"Neos.Form-20161124205254",
"Neos.Kickstart-20161124230102",
"Neos.SiteKickstarter-20161125002311",
"Neos.SiteKickstarter-20161125095901",
"Neos.Kickstarter-20161125110814",
"Neos.Neos-20170115114620",
"Neos.Fusion-20170120013047",
"Neos.Flow-20170125103800",
"Neos.Seo-20170127154600",
"Neos.Flow-20170127183102",
"Neos.Fusion-20180211175500",
"Neos.Fusion-20180211184832",
"Neos.Flow-20180415105700",
"Neos.Neos-20180907103800",
"Neos.Neos.Ui-20190319094900",
"Neos.Flow-20190425144900",
"Neos.Flow-20190515215000",
"Neos.NodeTypes-20190917101945",
"Neos.NodeTypes-20200120114136",
"Neos.Flow-20200813181400",
"Neos.Flow-20201003165200",
"Neos.Flow-20201109224100",
"Neos.Flow-20201205172733",
"Neos.Flow-20201207104500"
]
}
}

0 comments on commit 210dda7

Please sign in to comment.