Merge pull request #34 from theilm/master

Flow 7 compatibility
ttreeagency · Mar 5, 2021 · df3829d · df3829d
2 parents 27e2c5b + 3d5289e
commit df3829d
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 19 deletions.
diff --git a/Classes/Domain/Model/Task.php b/Classes/Domain/Model/Task.php
@@ -83,7 +83,7 @@ class Task
      * @ORM\Column(type="text")
      */
     protected $description;
-    
+
     /**
      * @param string $expression
      * @param string $implementation

diff --git a/Migrations/Mysql/Version20141223003023.php b/Migrations/Mysql/Version20141223003023.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;
 
 /**
@@ -14,7 +14,7 @@ class Version20141223003023 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");
 
@@ -25,7 +25,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");
 

diff --git a/Migrations/Mysql/Version20141223013606.php b/Migrations/Mysql/Version20141223013606.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;
 
 /**
@@ -14,7 +14,7 @@ class Version20141223013606 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");
 
@@ -25,7 +25,7 @@ public function up(Schema $schema)
      * @param Schema $schema
      * @return void
      */
-    public function down(Schema $schema)
+    public function down(Schema $schema): void 
     {
         // this down() migration is autogenerated, please modify it to your needs
         $this->abortIf($this->connection->getDatabasePlatform()->getName() != "mysql");

diff --git a/Migrations/Mysql/Version20160802074018.php b/Migrations/Mysql/Version20160802074018.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;
 
 /**
@@ -13,7 +13,7 @@ class Version20160802074018 extends AbstractMigration
     /**
      * @return string
      */
-    public function getDescription()
+    public function getDescription(): string 
     {
         return '';
     }
@@ -22,7 +22,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".');
         $this->addSql('ALTER TABLE ttree_scheduler_domain_model_task ADD description LONGTEXT NOT NULL');
@@ -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() != 'mysql', 'Migration can only be executed safely on "mysql".');
         $this->addSql('ALTER TABLE ttree_scheduler_domain_model_task DROP description');

diff --git a/Migrations/Postgresql/Version20160308124216.php b/Migrations/Postgresql/Version20160308124216.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;
 
 /**
@@ -14,7 +14,7 @@ class Version20160308124216 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");
 
@@ -27,7 +27,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");
 

diff --git a/Migrations/Postgresql/Version20160802074018.php b/Migrations/Postgresql/Version20160802074018.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;
 
 /**
@@ -13,7 +13,7 @@ class Version20160802074018 extends AbstractMigration
     /**
      * @return string
      */
-    public function getDescription()
+    public function getDescription(): string 
     {
         return '';
     }
@@ -22,7 +22,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");
         $this->addSql('ALTER TABLE ttree_scheduler_domain_model_task ADD description TEXT NOT NULL');
@@ -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");
         $this->addSql('ALTER TABLE ttree_scheduler_domain_model_task DROP description');

diff --git a/composer.json b/composer.json
@@ -10,13 +10,36 @@
         "runner"
     ],
     "require": {
-        "neos/flow": "^4.0 || ^5.0 || ^6.0",
+        "neos/flow": "^7.0",
         "mtdowling/cron-expression": "^1.2",
         "beberlei/assert": "^2.7"
     },
     "autoload": {
         "psr-4": {
             "Ttree\\Scheduler\\": "Classes"
         }
+    },
+    "extra": {
+        "applied-flow-migrations": [
+            "TYPO3.Form-20160601101500",
+            "Neos.Twitter.Bootstrap-20161124204912",
+            "Neos.Form-20161124205254",
+            "Neos.Party-20161124225257",
+            "Neos.Imagine-20161124231742",
+            "Neos.SwiftMailer-20161130105617",
+            "Neos.Seo-20170127154600",
+            "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"
+        ]
     }
 }