From 38c65231dc1bb29534c8c9e5f9c1e9ebf826b665 Mon Sep 17 00:00:00 2001
From: bwaidelich <b.waidelich@wwwision.de>
Date: Thu, 10 Dec 2020 12:39:14 +0100
Subject: [PATCH] FEATURE: Flow 7.x compatibility

Related: https://github.com/neos/flow-development-collection/issues/2244
---
 Migrations/Mysql/Version20141111161429.php    |  6 ++--
 Migrations/Mysql/Version20141202134558.php    |  6 ++--
 Migrations/Mysql/Version20170118172429.php    |  8 ++---
 Migrations/Mysql/Version20190607071727.php    |  6 ++--
 .../Postgresql/Version20141111161430.php      |  6 ++--
 .../Postgresql/Version20141202134559.php      |  8 ++---
 .../Postgresql/Version20170118172430.php      |  8 ++---
 .../Postgresql/Version20190725070956.php      |  6 ++--
 composer.json                                 | 31 +++++++++++++++++--
 9 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/Migrations/Mysql/Version20141111161429.php b/Migrations/Mysql/Version20141111161429.php
index a8a2fc1..1f3d73d 100644
--- a/Migrations/Mysql/Version20141111161429.php
+++ b/Migrations/Mysql/Version20141111161429.php
@@ -1,7 +1,7 @@
 <?php
 namespace Neos\Flow\Persistence\Doctrine\Migrations;
 
-use Doctrine\DBAL\Migrations\AbstractMigration,
+use Doctrine\Migrations\AbstractMigration,
 	Doctrine\DBAL\Schema\Schema;
 
 /**
@@ -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.
@@ -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");
diff --git a/Migrations/Mysql/Version20141202134558.php b/Migrations/Mysql/Version20141202134558.php
index 2f9c340..a2247a1 100644
--- a/Migrations/Mysql/Version20141202134558.php
+++ b/Migrations/Mysql/Version20141202134558.php
@@ -1,7 +1,7 @@
 <?php
 namespace Neos\Flow\Persistence\Doctrine\Migrations;
 
-use Doctrine\DBAL\Migrations\AbstractMigration,
+use Doctrine\Migrations\AbstractMigration,
 	Doctrine\DBAL\Schema\Schema;
 
 /**
@@ -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");
@@ -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");
diff --git a/Migrations/Mysql/Version20170118172429.php b/Migrations/Mysql/Version20170118172429.php
index 0bfbec6..02e0425 100644
--- a/Migrations/Mysql/Version20170118172429.php
+++ b/Migrations/Mysql/Version20170118172429.php
@@ -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;
 
 class Version20170118172429 extends AbstractMigration
@@ -9,7 +9,7 @@ class Version20170118172429 extends AbstractMigration
     /**
      * @return string
      */
-    public function getDescription()
+    public function getDescription(): string 
     {
         return 'Adjust table names to new package key.';
     }
@@ -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".');
 
@@ -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".');
 
diff --git a/Migrations/Mysql/Version20190607071727.php b/Migrations/Mysql/Version20190607071727.php
index 3c9a47f..906cae7 100644
--- a/Migrations/Mysql/Version20190607071727.php
+++ b/Migrations/Mysql/Version20190607071727.php
@@ -10,7 +10,7 @@ class Version20190607071727 extends AbstractMigration
     /**
      * @return string
      */
-    public function getDescription()
+    public function getDescription(): string 
     {
         return 'Remove deprecated site configuration entity';
     }
@@ -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".');
 
@@ -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".');
 
diff --git a/Migrations/Postgresql/Version20141111161430.php b/Migrations/Postgresql/Version20141111161430.php
index 8e2b2f9..5ae4d7b 100644
--- a/Migrations/Postgresql/Version20141111161430.php
+++ b/Migrations/Postgresql/Version20141111161430.php
@@ -1,7 +1,7 @@
 <?php
 namespace Neos\Flow\Persistence\Doctrine\Migrations;
 
-use Doctrine\DBAL\Migrations\AbstractMigration,
+use Doctrine\Migrations\AbstractMigration,
 	Doctrine\DBAL\Schema\Schema;
 
 /**
@@ -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))");
@@ -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");
diff --git a/Migrations/Postgresql/Version20141202134559.php b/Migrations/Postgresql/Version20141202134559.php
index 1d02c21..e430a2a 100644
--- a/Migrations/Postgresql/Version20141202134559.php
+++ b/Migrations/Postgresql/Version20141202134559.php
@@ -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;
 
 /**
@@ -12,7 +12,7 @@ class Version20141202134559 extends AbstractMigration
     /**
      * @return string
      */
-    public function getDescription()
+    public function getDescription(): string 
     {
         return 'Add trackingId to SiteConfiguration.';
     }
@@ -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".');
 
@@ -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".');
 
diff --git a/Migrations/Postgresql/Version20170118172430.php b/Migrations/Postgresql/Version20170118172430.php
index e5fc7b5..2829f7b 100644
--- a/Migrations/Postgresql/Version20170118172430.php
+++ b/Migrations/Postgresql/Version20170118172430.php
@@ -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;
 
 class Version20170118172430 extends AbstractMigration
@@ -9,7 +9,7 @@ class Version20170118172430 extends AbstractMigration
     /**
      * @return string
      */
-    public function getDescription()
+    public function getDescription(): string 
     {
         return 'Adjust table names to new package key.';
     }
@@ -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".');
 
@@ -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".');
 
diff --git a/Migrations/Postgresql/Version20190725070956.php b/Migrations/Postgresql/Version20190725070956.php
index e85f61d..e4cce30 100644
--- a/Migrations/Postgresql/Version20190725070956.php
+++ b/Migrations/Postgresql/Version20190725070956.php
@@ -11,7 +11,7 @@ class Version20190725070956 extends AbstractMigration
     /**
      * @return string
      */
-    public function getDescription()
+    public function getDescription(): string 
     {
         return 'Remove deprecated site configuration entity';
     }
@@ -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".');
         
@@ -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".');
         
diff --git a/composer.json b/composer.json
index 7875c4d..8d3ceb7 100644
--- a/composer.json
+++ b/composer.json
@@ -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": "*"
@@ -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"
         ]
     }
 }