From cd9fd36bcf6faaa8681977f7c4798d88c5883391 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:37 +0300
Subject: [PATCH 01/72] TASK: Import core migration log to composer.json

This commit imports the core migration log to the "extra" section of the
composer manifest.
---
 composer.json | 53 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/composer.json b/composer.json
index 143d9cc..1e016b0 100644
--- a/composer.json
+++ b/composer.json
@@ -1,22 +1,33 @@
 {
-	"name":"flowpack/oauth2-client",
-	"description":"An OAuth 2.0 authorization framework client for the web application framework TYPO3 Flow.",
-	"keywords":["OAuth2", "TYPO3", "Flow", "Flowpack", "Client"],
-	"type":"typo3-flow-package",
-	"authors":[
-		{
-			"name":"Adrian Föder"
-		},
-		{
-			"name":"Philipp Maier"
-		}
-	],
-	"require":{
-		"typo3/flow": ">=2.1"
-	},
-	"autoload":{
-		"psr-0":{
-			"Flowpack\\OAuth2\\Client":"Classes/"
-		}
-	}
-}
+    "name": "flowpack/oauth2-client",
+    "description": "An OAuth 2.0 authorization framework client for the web application framework TYPO3 Flow.",
+    "keywords": [
+        "OAuth2",
+        "TYPO3",
+        "Flow",
+        "Flowpack",
+        "Client"
+    ],
+    "type": "typo3-flow-package",
+    "authors": [
+        {
+            "name": "Adrian Föder"
+        },
+        {
+            "name": "Philipp Maier"
+        }
+    ],
+    "require": {
+        "typo3/flow": ">=2.1"
+    },
+    "autoload": {
+        "psr-0": {
+            "Flowpack\\OAuth2\\Client": "Classes/"
+        }
+    },
+    "extra": {
+        "applied-flow-migrations": [
+            "TYPO3.Neos-201407061038"
+        ]
+    }
+}
\ No newline at end of file

From a7085c4ae723c978d464a913d168c315ca32505f Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:37 +0300
Subject: [PATCH 02/72] TASK: Apply migration TYPO3.FLOW3-201201261636

Adjust to the major changes in FLOW3 1.1 when coming from 1.0.

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 1e016b0..91b92c7 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,8 @@
     },
     "extra": {
         "applied-flow-migrations": [
-            "TYPO3.Neos-201407061038"
+            "TYPO3.Neos-201407061038",
+            "TYPO3.FLOW3-201201261636"
         ]
     }
 }
\ No newline at end of file

From 2b6e78845ba7c68f2513fbeaa445b727e00b1358 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:37 +0300
Subject: [PATCH 03/72] TASK: Apply migration TYPO3.Fluid-201205031303

Rename form.textbox to form.textfield

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 91b92c7..8e9aeac 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,8 @@
     "extra": {
         "applied-flow-migrations": [
             "TYPO3.Neos-201407061038",
-            "TYPO3.FLOW3-201201261636"
+            "TYPO3.FLOW3-201201261636",
+            "TYPO3.Fluid-201205031303"
         ]
     }
 }
\ No newline at end of file

From ae7fa4639c342de6aaaceef254746ce41e13576e Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:37 +0300
Subject: [PATCH 04/72] TASK: Apply migration TYPO3.FLOW3-201205292145

Replace FileTypes use with MediaTypes use.

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 8e9aeac..fe7fa52 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,8 @@
         "applied-flow-migrations": [
             "TYPO3.Neos-201407061038",
             "TYPO3.FLOW3-201201261636",
-            "TYPO3.Fluid-201205031303"
+            "TYPO3.Fluid-201205031303",
+            "TYPO3.FLOW3-201205292145"
         ]
     }
 }
\ No newline at end of file

From bc535a99c5b13a1799b8dfd5beb24390afcc3a2a Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:37 +0300
Subject: [PATCH 05/72] TASK: Apply migration TYPO3.FLOW3-201206271128

Replace DataNotSerializeableException with DataNotSerializableException.

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index fe7fa52..74e4241 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,8 @@
             "TYPO3.Neos-201407061038",
             "TYPO3.FLOW3-201201261636",
             "TYPO3.Fluid-201205031303",
-            "TYPO3.FLOW3-201205292145"
+            "TYPO3.FLOW3-201205292145",
+            "TYPO3.FLOW3-201206271128"
         ]
     }
 }
\ No newline at end of file

From aa9cc185447d9f91e6ff8b2a87883f6a6778b00d Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:37 +0300
Subject: [PATCH 06/72] TASK: Apply migration TYPO3.FLOW3-201209201112

Move all code to PSR-0 compatible directory structure, remove
Package.xml,

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 74e4241..099efe2 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,8 @@
             "TYPO3.FLOW3-201201261636",
             "TYPO3.Fluid-201205031303",
             "TYPO3.FLOW3-201205292145",
-            "TYPO3.FLOW3-201206271128"
+            "TYPO3.FLOW3-201206271128",
+            "TYPO3.FLOW3-201209201112"
         ]
     }
 }
\ No newline at end of file

From 7fa916dbd4e95d5a059e0f64a70598314d595a22 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:37 +0300
Subject: [PATCH 07/72] TASK: Apply migration TYPO3.Flow-201209251426

Rename FLOW3 to TYPO3 Flow

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 099efe2..c1994bf 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,8 @@
             "TYPO3.Fluid-201205031303",
             "TYPO3.FLOW3-201205292145",
             "TYPO3.FLOW3-201206271128",
-            "TYPO3.FLOW3-201209201112"
+            "TYPO3.FLOW3-201209201112",
+            "TYPO3.Flow-201209251426"
         ]
     }
 }
\ No newline at end of file

From 6574ebe9b4d14d1c00b40750fdc727a159df0ac2 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:37 +0300
Subject: [PATCH 08/72] TASK: Apply migration TYPO3.Flow-201211151101

Check for globally defined role identifiers in Policy.yaml files

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index c1994bf..c858f2e 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,8 @@
             "TYPO3.FLOW3-201205292145",
             "TYPO3.FLOW3-201206271128",
             "TYPO3.FLOW3-201209201112",
-            "TYPO3.Flow-201209251426"
+            "TYPO3.Flow-201209251426",
+            "TYPO3.Flow-201211151101"
         ]
     }
 }
\ No newline at end of file

From 2fba78e50f7048b86393180bc8ea829724457361 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:37 +0300
Subject: [PATCH 09/72] TASK: Apply migration TYPO3.Flow-201212051340

Change entity resource definitions from using _ to \

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index c858f2e..8a67286 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,8 @@
             "TYPO3.FLOW3-201206271128",
             "TYPO3.FLOW3-201209201112",
             "TYPO3.Flow-201209251426",
-            "TYPO3.Flow-201211151101"
+            "TYPO3.Flow-201211151101",
+            "TYPO3.Flow-201212051340"
         ]
     }
 }
\ No newline at end of file

From 03dff49aabb79576d027205e29888adc35e71660 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:37 +0300
Subject: [PATCH 10/72] TASK: Apply migration TYPO3.TypoScript-130516234520

Rename "renderTypoScript" VH to just "render"

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 8a67286..06f2af9 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,8 @@
             "TYPO3.FLOW3-201209201112",
             "TYPO3.Flow-201209251426",
             "TYPO3.Flow-201211151101",
-            "TYPO3.Flow-201212051340"
+            "TYPO3.Flow-201212051340",
+            "TYPO3.TypoScript-130516234520"
         ]
     }
 }
\ No newline at end of file

From 83fd347d60c7132f95fb2ffab37062ed9c1def7c Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:37 +0300
Subject: [PATCH 11/72] TASK: Apply migration TYPO3.TypoScript-130516235550

Rename "renderTypoScript" VH to just "render"

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 06f2af9..f2ec873 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,8 @@
             "TYPO3.Flow-201209251426",
             "TYPO3.Flow-201211151101",
             "TYPO3.Flow-201212051340",
-            "TYPO3.TypoScript-130516234520"
+            "TYPO3.TypoScript-130516234520",
+            "TYPO3.TypoScript-130516235550"
         ]
     }
 }
\ No newline at end of file

From f1429f6741fa93efe6063dd37bd2b10385119dc5 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:37 +0300
Subject: [PATCH 12/72] TASK: Apply migration TYPO3.TYPO3CR-130523180140

Adjust to removed TYPO3.ContentRepository:Folder node type by replacing
it

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index f2ec873..95c9b52 100644
--- a/composer.json
+++ b/composer.json
@@ -37,7 +37,8 @@
             "TYPO3.Flow-201211151101",
             "TYPO3.Flow-201212051340",
             "TYPO3.TypoScript-130516234520",
-            "TYPO3.TypoScript-130516235550"
+            "TYPO3.TypoScript-130516235550",
+            "TYPO3.TYPO3CR-130523180140"
         ]
     }
 }
\ No newline at end of file

From 3db317187e4e0420fe2c42468076d3fcfb28747a Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:37 +0300
Subject: [PATCH 13/72] TASK: Apply migration TYPO3.Flow-201310031523

Change Neos\Flow\Persistence\Doctrine\DatabaseConnectionException to

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 95c9b52..a30be26 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,8 @@
             "TYPO3.Flow-201212051340",
             "TYPO3.TypoScript-130516234520",
             "TYPO3.TypoScript-130516235550",
-            "TYPO3.TYPO3CR-130523180140"
+            "TYPO3.TYPO3CR-130523180140",
+            "TYPO3.Flow-201310031523"
         ]
     }
 }
\ No newline at end of file

From 65388b5803c4a7ab706bde37780f1c8a83f11780 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:37 +0300
Subject: [PATCH 14/72] TASK: Apply migration TYPO3.Flow-201405111147

This migration does not actually change any code. It just displays a
warning if a TypeConverters canConvertFrom() is

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index a30be26..50ffc6d 100644
--- a/composer.json
+++ b/composer.json
@@ -39,7 +39,8 @@
             "TYPO3.TypoScript-130516234520",
             "TYPO3.TypoScript-130516235550",
             "TYPO3.TYPO3CR-130523180140",
-            "TYPO3.Flow-201310031523"
+            "TYPO3.Flow-201310031523",
+            "TYPO3.Flow-201405111147"
         ]
     }
 }
\ No newline at end of file

From cd441febef12f3336b6423ec4ba19169b09efbc6 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:37 +0300
Subject: [PATCH 15/72] TASK: Apply migration TYPO3.Neos-201409071922

Adjust to updated folder name for TypoScript in site packages

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 50ffc6d..693e4e4 100644
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,8 @@
             "TYPO3.TypoScript-130516235550",
             "TYPO3.TYPO3CR-130523180140",
             "TYPO3.Flow-201310031523",
-            "TYPO3.Flow-201405111147"
+            "TYPO3.Flow-201405111147",
+            "TYPO3.Neos-201409071922"
         ]
     }
 }
\ No newline at end of file

From e3b41655331fdb042ac8fc308fef4c9ee421ee4b Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:37 +0300
Subject: [PATCH 16/72] TASK: Apply migration TYPO3.TYPO3CR-140911160326

Adjust to renamed NodeLabelGeneratorInterface.

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 693e4e4..95e99b0 100644
--- a/composer.json
+++ b/composer.json
@@ -41,7 +41,8 @@
             "TYPO3.TYPO3CR-130523180140",
             "TYPO3.Flow-201310031523",
             "TYPO3.Flow-201405111147",
-            "TYPO3.Neos-201409071922"
+            "TYPO3.Neos-201409071922",
+            "TYPO3.TYPO3CR-140911160326"
         ]
     }
 }
\ No newline at end of file

From 9d655f1aec4ea0a6a2472f87fbd27d18156a89ea Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:37 +0300
Subject: [PATCH 17/72] TASK: Apply migration TYPO3.Neos-201410010000

Migrates the former HtmlEditor to CodeEditor

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 95e99b0..2d3e1e0 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,8 @@
             "TYPO3.Flow-201310031523",
             "TYPO3.Flow-201405111147",
             "TYPO3.Neos-201409071922",
-            "TYPO3.TYPO3CR-140911160326"
+            "TYPO3.TYPO3CR-140911160326",
+            "TYPO3.Neos-201410010000"
         ]
     }
 }
\ No newline at end of file

From 232490cefcce9d2b687937441da45b6255a168f8 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:37 +0300
Subject: [PATCH 18/72] TASK: Apply migration TYPO3.TYPO3CR-141101082142

Adjust namespaces for ContentRepository related FlowQuery operations
that were moved from TYPO3.Neos to TYPO3.TYPO3CR

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 2d3e1e0..fa4c1dd 100644
--- a/composer.json
+++ b/composer.json
@@ -43,7 +43,8 @@
             "TYPO3.Flow-201405111147",
             "TYPO3.Neos-201409071922",
             "TYPO3.TYPO3CR-140911160326",
-            "TYPO3.Neos-201410010000"
+            "TYPO3.Neos-201410010000",
+            "TYPO3.TYPO3CR-141101082142"
         ]
     }
 }
\ No newline at end of file

From 3f9b4b1adf4ae2ba4cf102b1f8b4ce84c9d871b9 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:37 +0300
Subject: [PATCH 19/72] TASK: Apply migration TYPO3.Neos-20141113115300

Rename setting TYPO3.Neos.modules.<moduleName>.resource to
"privilegeTarget"

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index fa4c1dd..1b46086 100644
--- a/composer.json
+++ b/composer.json
@@ -44,7 +44,8 @@
             "TYPO3.Neos-201409071922",
             "TYPO3.TYPO3CR-140911160326",
             "TYPO3.Neos-201410010000",
-            "TYPO3.TYPO3CR-141101082142"
+            "TYPO3.TYPO3CR-141101082142",
+            "TYPO3.Neos-20141113115300"
         ]
     }
 }
\ No newline at end of file

From 4fae2a9a27ff764fa9988744ffafc806d8742e12 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:38 +0300
Subject: [PATCH 20/72] TASK: Apply migration TYPO3.Fluid-20141113120800

Rename the "resource" argument of the security.ifAccess ViewHelper to
"privilegeTarget"

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 1b46086..2282b72 100644
--- a/composer.json
+++ b/composer.json
@@ -45,7 +45,8 @@
             "TYPO3.TYPO3CR-140911160326",
             "TYPO3.Neos-201410010000",
             "TYPO3.TYPO3CR-141101082142",
-            "TYPO3.Neos-20141113115300"
+            "TYPO3.Neos-20141113115300",
+            "TYPO3.Fluid-20141113120800"
         ]
     }
 }
\ No newline at end of file

From c7f17c7acb7f691f9e0abd7eccd2a42355ecac43 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:38 +0300
Subject: [PATCH 21/72] TASK: Apply migration TYPO3.Flow-20141113121400

Adjust "Policy.yaml" to new syntax

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 2282b72..76cf9ca 100644
--- a/composer.json
+++ b/composer.json
@@ -46,7 +46,8 @@
             "TYPO3.Neos-201410010000",
             "TYPO3.TYPO3CR-141101082142",
             "TYPO3.Neos-20141113115300",
-            "TYPO3.Fluid-20141113120800"
+            "TYPO3.Fluid-20141113120800",
+            "TYPO3.Flow-20141113121400"
         ]
     }
 }
\ No newline at end of file

From e26f0fdc128668c50ddb765dd8e49b93e147b9a9 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:38 +0300
Subject: [PATCH 22/72] TASK: Apply migration TYPO3.Fluid-20141121091700

Warn about removed ReflectionService dependency from AbstractViewHelper

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 76cf9ca..ed18fc4 100644
--- a/composer.json
+++ b/composer.json
@@ -47,7 +47,8 @@
             "TYPO3.TYPO3CR-141101082142",
             "TYPO3.Neos-20141113115300",
             "TYPO3.Fluid-20141113120800",
-            "TYPO3.Flow-20141113121400"
+            "TYPO3.Flow-20141113121400",
+            "TYPO3.Fluid-20141121091700"
         ]
     }
 }
\ No newline at end of file

From 00cb8cf88011837842077b0f5e5862f4c0a32da6 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:38 +0300
Subject: [PATCH 23/72] TASK: Apply migration TYPO3.Neos-20141218134700

Rename node property type 'date' to DateTime

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ed18fc4..d08cb34 100644
--- a/composer.json
+++ b/composer.json
@@ -48,7 +48,8 @@
             "TYPO3.Neos-20141113115300",
             "TYPO3.Fluid-20141113120800",
             "TYPO3.Flow-20141113121400",
-            "TYPO3.Fluid-20141121091700"
+            "TYPO3.Fluid-20141121091700",
+            "TYPO3.Neos-20141218134700"
         ]
     }
 }
\ No newline at end of file

From 361357b9cc3b68587bb4d27467c32b1cf9e256f4 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:38 +0300
Subject: [PATCH 24/72] TASK: Apply migration TYPO3.Fluid-20150214130800

Warn about "escapeOutput" property for existing ViewHelpers to ensure
backwards-compatibility

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index d08cb34..393e0c1 100644
--- a/composer.json
+++ b/composer.json
@@ -49,7 +49,8 @@
             "TYPO3.Fluid-20141113120800",
             "TYPO3.Flow-20141113121400",
             "TYPO3.Fluid-20141121091700",
-            "TYPO3.Neos-20141218134700"
+            "TYPO3.Neos-20141218134700",
+            "TYPO3.Fluid-20150214130800"
         ]
     }
 }
\ No newline at end of file

From 8cdab3435f6438a826d612d075f2c5ce1ea0273e Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:38 +0300
Subject: [PATCH 25/72] TASK: Apply migration TYPO3.Neos-20150303231600

Migrates ImageVariant to ImageInterface

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 393e0c1..d9a7f56 100644
--- a/composer.json
+++ b/composer.json
@@ -50,7 +50,8 @@
             "TYPO3.Flow-20141113121400",
             "TYPO3.Fluid-20141121091700",
             "TYPO3.Neos-20141218134700",
-            "TYPO3.Fluid-20150214130800"
+            "TYPO3.Fluid-20150214130800",
+            "TYPO3.Neos-20150303231600"
         ]
     }
 }
\ No newline at end of file

From af68964c5f658eb2776e200222d2c09892315085 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:38 +0300
Subject: [PATCH 26/72] TASK: Apply migration TYPO3.TYPO3CR-20150510103823

Migrates to new super type syntax in node type configuration

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index d9a7f56..62d2208 100644
--- a/composer.json
+++ b/composer.json
@@ -51,7 +51,8 @@
             "TYPO3.Fluid-20141121091700",
             "TYPO3.Neos-20141218134700",
             "TYPO3.Fluid-20150214130800",
-            "TYPO3.Neos-20150303231600"
+            "TYPO3.Neos-20150303231600",
+            "TYPO3.TYPO3CR-20150510103823"
         ]
     }
 }
\ No newline at end of file

From b83b91a49ee7309029c1b3050671892a8ecc4ac3 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:38 +0300
Subject: [PATCH 27/72] TASK: Apply migration TYPO3.Flow-20151113161300

Adjust "Settings.yaml" to new "requestPattern" and "firewall" syntax
(see FLOW-412)

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 62d2208..c389593 100644
--- a/composer.json
+++ b/composer.json
@@ -52,7 +52,8 @@
             "TYPO3.Neos-20141218134700",
             "TYPO3.Fluid-20150214130800",
             "TYPO3.Neos-20150303231600",
-            "TYPO3.TYPO3CR-20150510103823"
+            "TYPO3.TYPO3CR-20150510103823",
+            "TYPO3.Flow-20151113161300"
         ]
     }
 }
\ No newline at end of file

From a118d448c3458c20e2865c0419d955694a288918 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:38 +0300
Subject: [PATCH 28/72] TASK: Apply migration TYPO3.Form-20160601101500

Adjust "Settings.yaml" to use validationErrorTranslationPackage instead
of translationPackage

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index c389593..944789f 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,8 @@
             "TYPO3.Fluid-20150214130800",
             "TYPO3.Neos-20150303231600",
             "TYPO3.TYPO3CR-20150510103823",
-            "TYPO3.Flow-20151113161300"
+            "TYPO3.Flow-20151113161300",
+            "TYPO3.Form-20160601101500"
         ]
     }
 }
\ No newline at end of file

From 49e1bc3f6ae28847546217b5e9c399982f05422a Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:39 +0300
Subject: [PATCH 29/72] TASK: Apply migration TYPO3.Flow-20161115140400

Adjust to the renaming of the Resource namespace and class in Flow 4.0

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 944789f..7e6732d 100644
--- a/composer.json
+++ b/composer.json
@@ -54,7 +54,8 @@
             "TYPO3.Neos-20150303231600",
             "TYPO3.TYPO3CR-20150510103823",
             "TYPO3.Flow-20151113161300",
-            "TYPO3.Form-20160601101500"
+            "TYPO3.Form-20160601101500",
+            "TYPO3.Flow-20161115140400"
         ]
     }
 }
\ No newline at end of file

From 15e3389016a6ffb37514a0c587c944cafaf3b017 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:39 +0300
Subject: [PATCH 30/72] TASK: Apply migration TYPO3.Flow-20161115140430

Adjust to the renaming of the Object namespace in Flow 4.0
---
 Classes/Flowpack/OAuth2/Client/Endpoint/Resolver.php         | 2 +-
 Classes/Flowpack/OAuth2/Client/Provider/GoogleProvider.php   | 2 +-
 Classes/Flowpack/OAuth2/Client/Utility/FacebookApiClient.php | 2 +-
 Classes/Flowpack/OAuth2/Client/Utility/GoogleApiClient.php   | 2 +-
 composer.json                                                | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Classes/Flowpack/OAuth2/Client/Endpoint/Resolver.php b/Classes/Flowpack/OAuth2/Client/Endpoint/Resolver.php
index cc46b58..3bf9c7d 100644
--- a/Classes/Flowpack/OAuth2/Client/Endpoint/Resolver.php
+++ b/Classes/Flowpack/OAuth2/Client/Endpoint/Resolver.php
@@ -13,7 +13,7 @@
 
 use TYPO3\Flow\Annotations as Flow;
 use TYPO3\Flow\Configuration\ConfigurationManager;
-use TYPO3\Flow\Object\ObjectManagerInterface;
+use TYPO3\Flow\ObjectManagement\ObjectManagerInterface;
 
 /**
  * @Flow\Scope("singleton")
diff --git a/Classes/Flowpack/OAuth2/Client/Provider/GoogleProvider.php b/Classes/Flowpack/OAuth2/Client/Provider/GoogleProvider.php
index 0eb9bdd..ef50493 100644
--- a/Classes/Flowpack/OAuth2/Client/Provider/GoogleProvider.php
+++ b/Classes/Flowpack/OAuth2/Client/Provider/GoogleProvider.php
@@ -20,7 +20,7 @@
 use TYPO3\Flow\Security\Policy\PolicyService;
 
 use TYPO3\Flow\Configuration\ConfigurationManager;
-use TYPO3\Flow\Object\ObjectManagerInterface;
+use TYPO3\Flow\ObjectManagement\ObjectManagerInterface;
 
 /**
  */
diff --git a/Classes/Flowpack/OAuth2/Client/Utility/FacebookApiClient.php b/Classes/Flowpack/OAuth2/Client/Utility/FacebookApiClient.php
index b38b99b..cd4e009 100644
--- a/Classes/Flowpack/OAuth2/Client/Utility/FacebookApiClient.php
+++ b/Classes/Flowpack/OAuth2/Client/Utility/FacebookApiClient.php
@@ -16,7 +16,7 @@
 use TYPO3\Flow\Http\Client\RequestEngineInterface;
 use TYPO3\Flow\Http\Request;
 use TYPO3\Flow\Http\Uri;
-use TYPO3\Flow\Object\DependencyInjection\DependencyProxy;
+use TYPO3\Flow\ObjectManagement\DependencyInjection\DependencyProxy;
 
 /**
  * @Flow\Scope("singleton")
diff --git a/Classes/Flowpack/OAuth2/Client/Utility/GoogleApiClient.php b/Classes/Flowpack/OAuth2/Client/Utility/GoogleApiClient.php
index a365cf7..b718f7d 100644
--- a/Classes/Flowpack/OAuth2/Client/Utility/GoogleApiClient.php
+++ b/Classes/Flowpack/OAuth2/Client/Utility/GoogleApiClient.php
@@ -16,7 +16,7 @@
 use TYPO3\Flow\Http\Client\RequestEngineInterface;
 use TYPO3\Flow\Http\Request;
 use TYPO3\Flow\Http\Uri;
-use TYPO3\Flow\Object\DependencyInjection\DependencyProxy;
+use TYPO3\Flow\ObjectManagement\DependencyInjection\DependencyProxy;
 
 /**
  * @Flow\Scope("singleton")
diff --git a/composer.json b/composer.json
index 7e6732d..74f1fce 100644
--- a/composer.json
+++ b/composer.json
@@ -55,7 +55,8 @@
             "TYPO3.TYPO3CR-20150510103823",
             "TYPO3.Flow-20151113161300",
             "TYPO3.Form-20160601101500",
-            "TYPO3.Flow-20161115140400"
+            "TYPO3.Flow-20161115140400",
+            "TYPO3.Flow-20161115140430"
         ]
     }
 }
\ No newline at end of file

From 603ce29743d848d16cf755ca3e2895f1057055f9 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:39 +0300
Subject: [PATCH 31/72] TASK: Apply migration Neos.Flow-20161124204700

Adjusts code to package renaming from "TYPO3.Flow" to "Neos.Flow"
---
 .../Endpoint/AbstractHttpTokenEndpoint.php    | 10 ++---
 .../Client/Endpoint/FacebookTokenEndpoint.php |  8 ++--
 .../Client/Endpoint/GoogleTokenEndpoint.php   |  8 ++--
 .../OAuth2/Client/Endpoint/Resolver.php       |  8 ++--
 .../Endpoint/TokenEndpointInterface.php       |  2 +-
 Classes/Flowpack/OAuth2/Client/Exception.php  |  2 +-
 .../Exception/InvalidPartyDataException.php   |  2 +-
 .../OAuth2/Client/Flow/AbstractFlow.php       | 16 ++++----
 .../OAuth2/Client/Flow/FacebookFlow.php       |  6 +--
 .../OAuth2/Client/Flow/FlowInterface.php      |  8 ++--
 .../OAuth2/Client/Flow/GoogleFlow.php         |  2 +-
 .../Provider/AbstractClientProvider.php       |  4 +-
 .../Client/Provider/FacebookProvider.php      | 22 +++++-----
 .../OAuth2/Client/Provider/GoogleProvider.php | 28 ++++++-------
 .../Client/Token/AbstractClientToken.php      | 10 ++---
 .../OAuth2/Client/Token/FacebookToken.php     |  2 +-
 .../OAuth2/Client/Token/GoogleToken.php       |  2 +-
 Classes/Flowpack/OAuth2/Client/UriBuilder.php |  8 ++--
 .../Client/Utility/FacebookApiClient.php      | 16 ++++----
 .../OAuth2/Client/Utility/GoogleApiClient.php | 16 ++++----
 .../Uri/AuthorizationViewHelper.php           |  2 +-
 Configuration/Objects.yaml                    | 20 +++++-----
 Configuration/Settings.yaml                   | 40 +++----------------
 composer.json                                 |  3 +-
 24 files changed, 109 insertions(+), 136 deletions(-)

diff --git a/Classes/Flowpack/OAuth2/Client/Endpoint/AbstractHttpTokenEndpoint.php b/Classes/Flowpack/OAuth2/Client/Endpoint/AbstractHttpTokenEndpoint.php
index 071f4be..14e5a66 100644
--- a/Classes/Flowpack/OAuth2/Client/Endpoint/AbstractHttpTokenEndpoint.php
+++ b/Classes/Flowpack/OAuth2/Client/Endpoint/AbstractHttpTokenEndpoint.php
@@ -12,10 +12,10 @@
  *                                                                        */
 
 use Flowpack\OAuth2\Client\Exception as OAuth2Exception;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Http\Request;
-use TYPO3\Flow\Http\Uri;
-use TYPO3\Flow\Utility\Arrays;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Http\Request;
+use Neos\Flow\Http\Uri;
+use Neos\Flow\Utility\Arrays;
 
 /**
  */
@@ -24,7 +24,7 @@ abstract class AbstractHttpTokenEndpoint implements TokenEndpointInterface
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Flow\Http\Client\CurlEngine
+     * @var \Neos\Flow\Http\Client\CurlEngine
      */
     protected $requestEngine;
 
diff --git a/Classes/Flowpack/OAuth2/Client/Endpoint/FacebookTokenEndpoint.php b/Classes/Flowpack/OAuth2/Client/Endpoint/FacebookTokenEndpoint.php
index 4564235..d0ae178 100644
--- a/Classes/Flowpack/OAuth2/Client/Endpoint/FacebookTokenEndpoint.php
+++ b/Classes/Flowpack/OAuth2/Client/Endpoint/FacebookTokenEndpoint.php
@@ -12,10 +12,10 @@
  *                                                                        */
 
 use Flowpack\OAuth2\Client\Exception as OAuth2Exception;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Http\Request;
-use TYPO3\Flow\Http\Uri;
-use TYPO3\Flow\Log\SecurityLoggerInterface;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Http\Request;
+use Neos\Flow\Http\Uri;
+use Neos\Flow\Log\SecurityLoggerInterface;
 
 /**
  * @Flow\Scope("singleton")
diff --git a/Classes/Flowpack/OAuth2/Client/Endpoint/GoogleTokenEndpoint.php b/Classes/Flowpack/OAuth2/Client/Endpoint/GoogleTokenEndpoint.php
index 1fcd9bc..26d89a5 100644
--- a/Classes/Flowpack/OAuth2/Client/Endpoint/GoogleTokenEndpoint.php
+++ b/Classes/Flowpack/OAuth2/Client/Endpoint/GoogleTokenEndpoint.php
@@ -12,10 +12,10 @@
  *                                                                        */
 
 use Flowpack\OAuth2\Client\Exception as OAuth2Exception;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Http\Request;
-use TYPO3\Flow\Http\Uri;
-use TYPO3\Flow\Log\SecurityLoggerInterface;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Http\Request;
+use Neos\Flow\Http\Uri;
+use Neos\Flow\Log\SecurityLoggerInterface;
 
 /**
  * @Flow\Scope("singleton")
diff --git a/Classes/Flowpack/OAuth2/Client/Endpoint/Resolver.php b/Classes/Flowpack/OAuth2/Client/Endpoint/Resolver.php
index 3bf9c7d..402de58 100644
--- a/Classes/Flowpack/OAuth2/Client/Endpoint/Resolver.php
+++ b/Classes/Flowpack/OAuth2/Client/Endpoint/Resolver.php
@@ -11,9 +11,9 @@
  * The TYPO3 project - inspiring people to share!                         *
  *                                                                        */
 
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Configuration\ConfigurationManager;
-use TYPO3\Flow\ObjectManagement\ObjectManagerInterface;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Configuration\ConfigurationManager;
+use Neos\Flow\ObjectManagement\ObjectManagerInterface;
 
 /**
  * @Flow\Scope("singleton")
@@ -40,7 +40,7 @@ class Resolver
      */
     public function getTokenEndpointForProvider($providerName)
     {
-        $tokenEndpointClassName = $this->configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, sprintf('TYPO3.Flow.security.authentication.providers.%s.providerOptions.tokenEndpointClassName', $providerName));
+        $tokenEndpointClassName = $this->configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, sprintf('Neos.Flow.security.authentication.providers.%s.providerOptions.tokenEndpointClassName', $providerName));
         if ($tokenEndpointClassName === null) {
             throw new \InvalidArgumentException(sprintf('In Settings.yaml, there was no "tokenEndpointClassName" option given for the provider "%s".', $providerName), 1383743372);
         }
diff --git a/Classes/Flowpack/OAuth2/Client/Endpoint/TokenEndpointInterface.php b/Classes/Flowpack/OAuth2/Client/Endpoint/TokenEndpointInterface.php
index 99887db..b2b9d00 100644
--- a/Classes/Flowpack/OAuth2/Client/Endpoint/TokenEndpointInterface.php
+++ b/Classes/Flowpack/OAuth2/Client/Endpoint/TokenEndpointInterface.php
@@ -11,7 +11,7 @@
  * The TYPO3 project - inspiring people to share!                         *
  *                                                                        */
 
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  */
diff --git a/Classes/Flowpack/OAuth2/Client/Exception.php b/Classes/Flowpack/OAuth2/Client/Exception.php
index 1f70ccb..be80736 100644
--- a/Classes/Flowpack/OAuth2/Client/Exception.php
+++ b/Classes/Flowpack/OAuth2/Client/Exception.php
@@ -13,6 +13,6 @@
 
 /**
  */
-class Exception extends \TYPO3\Flow\Exception
+class Exception extends \Neos\Flow\Exception
 {
 }
diff --git a/Classes/Flowpack/OAuth2/Client/Exception/InvalidPartyDataException.php b/Classes/Flowpack/OAuth2/Client/Exception/InvalidPartyDataException.php
index 7ce7c67..89bbb41 100644
--- a/Classes/Flowpack/OAuth2/Client/Exception/InvalidPartyDataException.php
+++ b/Classes/Flowpack/OAuth2/Client/Exception/InvalidPartyDataException.php
@@ -12,7 +12,7 @@
  *                                                                        */
 
 use Flowpack\OAuth2\Client\Exception;
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  *
diff --git a/Classes/Flowpack/OAuth2/Client/Flow/AbstractFlow.php b/Classes/Flowpack/OAuth2/Client/Flow/AbstractFlow.php
index 45b9e43..fd33109 100644
--- a/Classes/Flowpack/OAuth2/Client/Flow/AbstractFlow.php
+++ b/Classes/Flowpack/OAuth2/Client/Flow/AbstractFlow.php
@@ -12,11 +12,11 @@
  *                                                                        */
 
 use Flowpack\OAuth2\Client\Token\AbstractClientToken;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Security\Authentication\TokenInterface;
-use TYPO3\Flow\Security\Account;
-use TYPO3\Flow\Security\Policy\PolicyService;
-use TYPO3\Flow\Validation\ValidatorResolver;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Security\Authentication\TokenInterface;
+use Neos\Flow\Security\Account;
+use Neos\Flow\Security\Policy\PolicyService;
+use Neos\Flow\Validation\ValidatorResolver;
 use TYPO3\Party\Domain\Repository\PartyRepository;
 
 /**
@@ -26,19 +26,19 @@ abstract class AbstractFlow implements FlowInterface
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Flow\Security\Context
+     * @var \Neos\Flow\Security\Context
      */
     protected $securityContext;
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Flow\Persistence\PersistenceManagerInterface
+     * @var \Neos\Flow\Persistence\PersistenceManagerInterface
      */
     protected $persistenceManager;
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Flow\Security\AccountRepository
+     * @var \Neos\Flow\Security\AccountRepository
      */
     protected $accountRepository;
 
diff --git a/Classes/Flowpack/OAuth2/Client/Flow/FacebookFlow.php b/Classes/Flowpack/OAuth2/Client/Flow/FacebookFlow.php
index 736b3c7..b6bda9e 100644
--- a/Classes/Flowpack/OAuth2/Client/Flow/FacebookFlow.php
+++ b/Classes/Flowpack/OAuth2/Client/Flow/FacebookFlow.php
@@ -13,12 +13,12 @@
 
 use Flowpack\OAuth2\Client\Exception\InvalidPartyDataException;
 use Flowpack\OAuth2\Client\Token\AbstractClientToken;
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 use TYPO3\Party\Domain\Model\ElectronicAddress;
 use TYPO3\Party\Domain\Model\Person;
 use TYPO3\Party\Domain\Model\PersonName;
 use TYPO3\Party\Domain\Repository\PartyRepository;
-use TYPO3\Flow\Configuration\ConfigurationManager;
+use Neos\Flow\Configuration\ConfigurationManager;
 
 /**
  */
@@ -106,7 +106,7 @@ protected function initializeUserData(AbstractClientToken $token)
     protected function buildFacebookQuery()
     {
         $query = '/me';
-        $this->authenticationServicesFields = $this->configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, 'TYPO3.Flow.security.authentication.providers.FacebookOAuth2Provider.providerOptions.fields');
+        $this->authenticationServicesFields = $this->configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, 'Neos.Flow.security.authentication.providers.FacebookOAuth2Provider.providerOptions.fields');
         $fields = implode(',', $this->authenticationServicesFields);
 
         $query = $query . '?fields=' . $fields;
diff --git a/Classes/Flowpack/OAuth2/Client/Flow/FlowInterface.php b/Classes/Flowpack/OAuth2/Client/Flow/FlowInterface.php
index eae08f0..1ff5d2f 100644
--- a/Classes/Flowpack/OAuth2/Client/Flow/FlowInterface.php
+++ b/Classes/Flowpack/OAuth2/Client/Flow/FlowInterface.php
@@ -12,9 +12,9 @@
  *                                                                        */
 
 use Flowpack\OAuth2\Client\Token\AbstractClientToken;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Security\Account;
-use TYPO3\Flow\Security\Authentication\TokenInterface;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Security\Account;
+use Neos\Flow\Security\Authentication\TokenInterface;
 
 /**
  */
@@ -27,7 +27,7 @@ interface FlowInterface
     public function getChargedAuthenticatedTokenHavingNoPartyAttached();
 
     /**
-     * @param \TYPO3\Flow\Security\Authentication\TokenInterface|\Flowpack\OAuth2\Client\Token\AbstractClientToken $token
+     * @param \Neos\Flow\Security\Authentication\TokenInterface|\Flowpack\OAuth2\Client\Token\AbstractClientToken $token
      * @return TokenInterface
      */
     public function getTokenOfForeignAccountOf(AbstractClientToken $token);
diff --git a/Classes/Flowpack/OAuth2/Client/Flow/GoogleFlow.php b/Classes/Flowpack/OAuth2/Client/Flow/GoogleFlow.php
index b145c97..ca0bc13 100644
--- a/Classes/Flowpack/OAuth2/Client/Flow/GoogleFlow.php
+++ b/Classes/Flowpack/OAuth2/Client/Flow/GoogleFlow.php
@@ -13,7 +13,7 @@
 
 use Flowpack\OAuth2\Client\Exception\InvalidPartyDataException;
 use Flowpack\OAuth2\Client\Token\AbstractClientToken;
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 use TYPO3\Party\Domain\Model\ElectronicAddress;
 use TYPO3\Party\Domain\Model\Person;
 use TYPO3\Party\Domain\Model\PersonName;
diff --git a/Classes/Flowpack/OAuth2/Client/Provider/AbstractClientProvider.php b/Classes/Flowpack/OAuth2/Client/Provider/AbstractClientProvider.php
index 7d47176..0551bec 100644
--- a/Classes/Flowpack/OAuth2/Client/Provider/AbstractClientProvider.php
+++ b/Classes/Flowpack/OAuth2/Client/Provider/AbstractClientProvider.php
@@ -11,8 +11,8 @@
  * The TYPO3 project - inspiring people to share!                         *
  *                                                                        */
 
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Security\Authentication\Provider\AbstractProvider;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Security\Authentication\Provider\AbstractProvider;
 
 /**
  */
diff --git a/Classes/Flowpack/OAuth2/Client/Provider/FacebookProvider.php b/Classes/Flowpack/OAuth2/Client/Provider/FacebookProvider.php
index e4bbfa8..21ecc1b 100644
--- a/Classes/Flowpack/OAuth2/Client/Provider/FacebookProvider.php
+++ b/Classes/Flowpack/OAuth2/Client/Provider/FacebookProvider.php
@@ -12,12 +12,12 @@
  *                                                                        */
 
 use Flowpack\OAuth2\Client\Token\AbstractClientToken;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Log\SecurityLoggerInterface;
-use TYPO3\Flow\Security\Account;
-use TYPO3\Flow\Security\Authentication\TokenInterface;
-use TYPO3\Flow\Security\Exception\UnsupportedAuthenticationTokenException;
-use TYPO3\Flow\Security\Policy\PolicyService;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Log\SecurityLoggerInterface;
+use Neos\Flow\Security\Account;
+use Neos\Flow\Security\Authentication\TokenInterface;
+use Neos\Flow\Security\Exception\UnsupportedAuthenticationTokenException;
+use Neos\Flow\Security\Policy\PolicyService;
 
 /**
  */
@@ -38,13 +38,13 @@ class FacebookProvider extends AbstractClientProvider
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Flow\Security\AccountRepository
+     * @var \Neos\Flow\Security\AccountRepository
      */
     protected $accountRepository;
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Flow\Security\Context
+     * @var \Neos\Flow\Security\Context
      */
     protected $securityContext;
 
@@ -62,7 +62,7 @@ class FacebookProvider extends AbstractClientProvider
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Flow\Persistence\PersistenceManagerInterface
+     * @var \Neos\Flow\Persistence\PersistenceManagerInterface
      */
     protected $persistenceManager;
 
@@ -70,7 +70,7 @@ class FacebookProvider extends AbstractClientProvider
      * Tries to authenticate the given token. Sets isAuthenticated to TRUE if authentication succeeded.
      *
      * @param TokenInterface $authenticationToken The token to be authenticated
-     * @throws \TYPO3\Flow\Security\Exception\UnsupportedAuthenticationTokenException
+     * @throws \Neos\Flow\Security\Exception\UnsupportedAuthenticationTokenException
      * @return void
      */
     public function authenticate(TokenInterface $authenticationToken)
@@ -102,7 +102,7 @@ public function authenticate(TokenInterface $authenticationToken)
         // From here, we surely know the user is considered authenticated against the remote service,
         // yet to check if there is an immanent account present.
         $authenticationToken->setAuthenticationStatus(TokenInterface::AUTHENTICATION_SUCCESSFUL);
-        /** @var $account \TYPO3\Flow\Security\Account */
+        /** @var $account \Neos\Flow\Security\Account */
         $account = null;
         $isNewCreatedAccount = false;
         $providerName = $this->name;
diff --git a/Classes/Flowpack/OAuth2/Client/Provider/GoogleProvider.php b/Classes/Flowpack/OAuth2/Client/Provider/GoogleProvider.php
index ef50493..6118447 100644
--- a/Classes/Flowpack/OAuth2/Client/Provider/GoogleProvider.php
+++ b/Classes/Flowpack/OAuth2/Client/Provider/GoogleProvider.php
@@ -12,15 +12,15 @@
  *                                                                        */
 
 use Flowpack\OAuth2\Client\Token\AbstractClientToken;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Log\SecurityLoggerInterface;
-use TYPO3\Flow\Security\Account;
-use TYPO3\Flow\Security\Authentication\TokenInterface;
-use TYPO3\Flow\Security\Exception\UnsupportedAuthenticationTokenException;
-use TYPO3\Flow\Security\Policy\PolicyService;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Log\SecurityLoggerInterface;
+use Neos\Flow\Security\Account;
+use Neos\Flow\Security\Authentication\TokenInterface;
+use Neos\Flow\Security\Exception\UnsupportedAuthenticationTokenException;
+use Neos\Flow\Security\Policy\PolicyService;
 
-use TYPO3\Flow\Configuration\ConfigurationManager;
-use TYPO3\Flow\ObjectManagement\ObjectManagerInterface;
+use Neos\Flow\Configuration\ConfigurationManager;
+use Neos\Flow\ObjectManagement\ObjectManagerInterface;
 
 /**
  */
@@ -54,13 +54,13 @@ class GoogleProvider extends AbstractClientProvider
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Flow\Security\AccountRepository
+     * @var \Neos\Flow\Security\AccountRepository
      */
     protected $accountRepository;
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Flow\Security\Context
+     * @var \Neos\Flow\Security\Context
      */
     protected $securityContext;
 
@@ -78,7 +78,7 @@ class GoogleProvider extends AbstractClientProvider
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Flow\Persistence\PersistenceManagerInterface
+     * @var \Neos\Flow\Persistence\PersistenceManagerInterface
      */
     protected $persistenceManager;
 
@@ -86,7 +86,7 @@ class GoogleProvider extends AbstractClientProvider
      * Tries to authenticate the given token. Sets isAuthenticated to TRUE if authentication succeeded.
      *
      * @param TokenInterface $authenticationToken The token to be authenticated
-     * @throws \TYPO3\Flow\Security\Exception\UnsupportedAuthenticationTokenException
+     * @throws \Neos\Flow\Security\Exception\UnsupportedAuthenticationTokenException
      * @return void
      */
     public function authenticate(TokenInterface $authenticationToken)
@@ -107,7 +107,7 @@ public function authenticate(TokenInterface $authenticationToken)
         // From here, we surely know the user is considered authenticated against the remote service,
         // yet to check if there is an immanent account present.
         $authenticationToken->setAuthenticationStatus(TokenInterface::AUTHENTICATION_SUCCESSFUL);
-        /** @var $account \TYPO3\Flow\Security\Account */
+        /** @var $account \Neos\Flow\Security\Account */
         $account = null;
         $isNewCreatedAccount = false;
         $providerName = $this->name;
@@ -165,7 +165,7 @@ public function getTokenClassNames()
      */
     protected function buildScopeParameter()
     {
-        $scopes = $this->configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, 'TYPO3.Flow.security.authentication.providers.GoogleOAuth2Provider.providerOptions.scopes');
+        $scopes = $this->configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, 'Neos.Flow.security.authentication.providers.GoogleOAuth2Provider.providerOptions.scopes');
         $scope = implode(' ', $scopes);
         $scopes = array('scope' => $scope);
 
diff --git a/Classes/Flowpack/OAuth2/Client/Token/AbstractClientToken.php b/Classes/Flowpack/OAuth2/Client/Token/AbstractClientToken.php
index 75af995..c8d136f 100644
--- a/Classes/Flowpack/OAuth2/Client/Token/AbstractClientToken.php
+++ b/Classes/Flowpack/OAuth2/Client/Token/AbstractClientToken.php
@@ -13,11 +13,11 @@
 
 use Flowpack\OAuth2\Client\Endpoint\TokenEndpointInterface;
 use Flowpack\OAuth2\Client\Exception;
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Log\SecurityLoggerInterface;
-use TYPO3\Flow\Mvc\ActionRequest;
-use TYPO3\Flow\Security\Authentication\Token\AbstractToken;
-use TYPO3\Flow\Security\Authentication\TokenInterface;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Log\SecurityLoggerInterface;
+use Neos\Flow\Mvc\ActionRequest;
+use Neos\Flow\Security\Authentication\Token\AbstractToken;
+use Neos\Flow\Security\Authentication\TokenInterface;
 
 /**
  */
diff --git a/Classes/Flowpack/OAuth2/Client/Token/FacebookToken.php b/Classes/Flowpack/OAuth2/Client/Token/FacebookToken.php
index 330a5bd..51702ba 100644
--- a/Classes/Flowpack/OAuth2/Client/Token/FacebookToken.php
+++ b/Classes/Flowpack/OAuth2/Client/Token/FacebookToken.php
@@ -11,7 +11,7 @@
  * The TYPO3 project - inspiring people to share!                         *
  *                                                                        */
 
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  */
diff --git a/Classes/Flowpack/OAuth2/Client/Token/GoogleToken.php b/Classes/Flowpack/OAuth2/Client/Token/GoogleToken.php
index d3e8d52..e7c1b84 100644
--- a/Classes/Flowpack/OAuth2/Client/Token/GoogleToken.php
+++ b/Classes/Flowpack/OAuth2/Client/Token/GoogleToken.php
@@ -11,7 +11,7 @@
  * The TYPO3 project - inspiring people to share!                         *
  *                                                                        */
 
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 
 /**
  */
diff --git a/Classes/Flowpack/OAuth2/Client/UriBuilder.php b/Classes/Flowpack/OAuth2/Client/UriBuilder.php
index 5392fa2..9fa5100 100644
--- a/Classes/Flowpack/OAuth2/Client/UriBuilder.php
+++ b/Classes/Flowpack/OAuth2/Client/UriBuilder.php
@@ -11,9 +11,9 @@
  * The TYPO3 project - inspiring people to share!                         *
  *                                                                        */
 
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Configuration\ConfigurationManager;
-use TYPO3\Flow\Http\Uri;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Configuration\ConfigurationManager;
+use Neos\Flow\Http\Uri;
 
 /**
  * @Flow\Scope("singleton")
@@ -72,7 +72,7 @@ public function getRedirectionEndpointUri($providerName)
     protected function getConfiguredOptionsByProviderName($providerName)
     {
         if (!array_key_exists($providerName, $this->providerOptionsByProviderName)) {
-            $providerOptions = $this->configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, sprintf('TYPO3.Flow.security.authentication.providers.%s.providerOptions', $providerName));
+            $providerOptions = $this->configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, sprintf('Neos.Flow.security.authentication.providers.%s.providerOptions', $providerName));
             if (!is_array($providerOptions)) {
                 throw new \InvalidArgumentException(sprintf('The given provider name "%s" was not properly defined in the Settings (i.e. being defined and having a "providerOptions" key).', $providerName), 1383739910);
             }
diff --git a/Classes/Flowpack/OAuth2/Client/Utility/FacebookApiClient.php b/Classes/Flowpack/OAuth2/Client/Utility/FacebookApiClient.php
index cd4e009..87362d1 100644
--- a/Classes/Flowpack/OAuth2/Client/Utility/FacebookApiClient.php
+++ b/Classes/Flowpack/OAuth2/Client/Utility/FacebookApiClient.php
@@ -11,12 +11,12 @@
  * The TYPO3 project - inspiring people to share!                         *
  *                                                                        */
 
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Http\Client\CurlEngine;
-use TYPO3\Flow\Http\Client\RequestEngineInterface;
-use TYPO3\Flow\Http\Request;
-use TYPO3\Flow\Http\Uri;
-use TYPO3\Flow\ObjectManagement\DependencyInjection\DependencyProxy;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Http\Client\CurlEngine;
+use Neos\Flow\Http\Client\RequestEngineInterface;
+use Neos\Flow\Http\Request;
+use Neos\Flow\Http\Uri;
+use Neos\Flow\ObjectManagement\DependencyInjection\DependencyProxy;
 
 /**
  * @Flow\Scope("singleton")
@@ -51,7 +51,7 @@ class FacebookApiClient
     public function initializeObject()
     {
         if (($this->requestEngine instanceof DependencyProxy
-                && $this->requestEngine->_getClassName() === 'TYPO3\Flow\Http\Client\CurlEngine')
+                && $this->requestEngine->_getClassName() === 'Neos\Flow\Http\Client\CurlEngine')
             || $this->requestEngine instanceof CurlEngine) {
             $this->requestEngine->setOption(CURLOPT_CAINFO, FLOW_PATH_PACKAGES . 'Application/Flowpack.OAuth2.Client/Resources/Private/cacert.pem');
             $this->requestEngine->setOption(CURLOPT_SSL_VERIFYPEER, true);
@@ -61,7 +61,7 @@ public function initializeObject()
     /**
      * @param string $resource
      * @param string $method
-     * @return \TYPO3\Flow\Http\Response
+     * @return \Neos\Flow\Http\Response
      */
     public function query($resource, $method = 'GET')
     {
diff --git a/Classes/Flowpack/OAuth2/Client/Utility/GoogleApiClient.php b/Classes/Flowpack/OAuth2/Client/Utility/GoogleApiClient.php
index b718f7d..2835bbc 100644
--- a/Classes/Flowpack/OAuth2/Client/Utility/GoogleApiClient.php
+++ b/Classes/Flowpack/OAuth2/Client/Utility/GoogleApiClient.php
@@ -11,12 +11,12 @@
  * The TYPO3 project - inspiring people to share!                         *
  *                                                                        */
 
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\Flow\Http\Client\CurlEngine;
-use TYPO3\Flow\Http\Client\RequestEngineInterface;
-use TYPO3\Flow\Http\Request;
-use TYPO3\Flow\Http\Uri;
-use TYPO3\Flow\ObjectManagement\DependencyInjection\DependencyProxy;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Http\Client\CurlEngine;
+use Neos\Flow\Http\Client\RequestEngineInterface;
+use Neos\Flow\Http\Request;
+use Neos\Flow\Http\Uri;
+use Neos\Flow\ObjectManagement\DependencyInjection\DependencyProxy;
 
 /**
  * @Flow\Scope("singleton")
@@ -51,7 +51,7 @@ class GoogleApiClient
     public function initializeObject()
     {
         if (($this->requestEngine instanceof DependencyProxy
-                && $this->requestEngine->_getClassName() === 'TYPO3\Flow\Http\Client\CurlEngine')
+                && $this->requestEngine->_getClassName() === 'Neos\Flow\Http\Client\CurlEngine')
             || $this->requestEngine instanceof CurlEngine) {
             $this->requestEngine->setOption(CURLOPT_CAINFO, FLOW_PATH_PACKAGES . 'Application/Flowpack.OAuth2.Client/Resources/Private/cacert.pem');
             $this->requestEngine->setOption(CURLOPT_SSL_VERIFYPEER, true);
@@ -61,7 +61,7 @@ public function initializeObject()
     /**
      * @param string $resource
      * @param string $method
-     * @return \TYPO3\Flow\Http\Response
+     * @return \Neos\Flow\Http\Response
      */
     public function query($resource, $method = 'GET')
     {
diff --git a/Classes/Flowpack/OAuth2/Client/ViewHelpers/Uri/AuthorizationViewHelper.php b/Classes/Flowpack/OAuth2/Client/ViewHelpers/Uri/AuthorizationViewHelper.php
index 0813f83..abcf69b 100644
--- a/Classes/Flowpack/OAuth2/Client/ViewHelpers/Uri/AuthorizationViewHelper.php
+++ b/Classes/Flowpack/OAuth2/Client/ViewHelpers/Uri/AuthorizationViewHelper.php
@@ -12,7 +12,7 @@
  *                                                                        */
 
 use Flowpack\OAuth2\Client\UriBuilder;
-use TYPO3\Flow\Annotations as Flow;
+use Neos\Flow\Annotations as Flow;
 use TYPO3\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 /**
diff --git a/Configuration/Objects.yaml b/Configuration/Objects.yaml
index 9d9120f..a0dc593 100644
--- a/Configuration/Objects.yaml
+++ b/Configuration/Objects.yaml
@@ -2,32 +2,32 @@ Flowpack\OAuth2\Client\Utility\FacebookApiClient:
   properties:
     'requestEngine':
       object:
-        name: 'TYPO3\Flow\Http\Client\CurlEngine'
+        name: 'Neos\Flow\Http\Client\CurlEngine'
     'appSecret':
-      setting: 'TYPO3.Flow.security.authentication.providers.FacebookOAuth2Provider.providerOptions.clientSecret'
+      setting: 'Neos.Flow.security.authentication.providers.FacebookOAuth2Provider.providerOptions.clientSecret'
 
 Flowpack\OAuth2\Client\Endpoint\FacebookTokenEndpoint:
   properties:
     'endpointUri':
-      setting: 'TYPO3.Flow.security.authentication.providers.FacebookOAuth2Provider.providerOptions.tokenEndpointUri'
+      setting: 'Neos.Flow.security.authentication.providers.FacebookOAuth2Provider.providerOptions.tokenEndpointUri'
     'clientIdentifier':
-      setting: 'TYPO3.Flow.security.authentication.providers.FacebookOAuth2Provider.providerOptions.clientIdentifier'
+      setting: 'Neos.Flow.security.authentication.providers.FacebookOAuth2Provider.providerOptions.clientIdentifier'
     'clientSecret':
-      setting: 'TYPO3.Flow.security.authentication.providers.FacebookOAuth2Provider.providerOptions.clientSecret'
+      setting: 'Neos.Flow.security.authentication.providers.FacebookOAuth2Provider.providerOptions.clientSecret'
 
 Flowpack\OAuth2\Client\Utility\GoogleApiClient:
   properties:
     'requestEngine':
       object:
-        name: 'TYPO3\Flow\Http\Client\CurlEngine'
+        name: 'Neos\Flow\Http\Client\CurlEngine'
     'appSecret':
-      setting: 'TYPO3.Flow.security.authentication.providers.GoogleOAuth2Provider.providerOptions.clientSecret'
+      setting: 'Neos.Flow.security.authentication.providers.GoogleOAuth2Provider.providerOptions.clientSecret'
 
 Flowpack\OAuth2\Client\Endpoint\GoogleTokenEndpoint:
   properties:
     'endpointUri':
-      setting: 'TYPO3.Flow.security.authentication.providers.GoogleOAuth2Provider.providerOptions.tokenEndpointUri'
+      setting: 'Neos.Flow.security.authentication.providers.GoogleOAuth2Provider.providerOptions.tokenEndpointUri'
     'clientIdentifier':
-      setting: 'TYPO3.Flow.security.authentication.providers.GoogleOAuth2Provider.providerOptions.clientIdentifier'
+      setting: 'Neos.Flow.security.authentication.providers.GoogleOAuth2Provider.providerOptions.clientIdentifier'
     'clientSecret':
-      setting: 'TYPO3.Flow.security.authentication.providers.GoogleOAuth2Provider.providerOptions.clientSecret'
+      setting: 'Neos.Flow.security.authentication.providers.GoogleOAuth2Provider.providerOptions.clientSecret'
diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml
index fa1146b..dd3ea45 100644
--- a/Configuration/Settings.yaml
+++ b/Configuration/Settings.yaml
@@ -1,5 +1,5 @@
 
-TYPO3:
+Neos:
   Flow:
     security:
       authentication:
@@ -7,61 +7,33 @@ TYPO3:
           FacebookOAuth2Provider:
             provider: Flowpack\OAuth2\Client\Provider\FacebookProvider
             providerOptions:
-              #authenticateRoles: ['TYPO3.Flow.SomeRole']
-
               authorizationEndpointUri: 'https://www.facebook.com/dialog/oauth'
-
-              # redirectionEndpointUri must be some page on your site
               redirectionEndpointUri: 'https://www.yoursite.com/authentication/authenticate'
-
               tokenEndpointUri: 'https://graph.facebook.com/oauth/access_token'
               tokenEndpointClassName: Flowpack\OAuth2\Client\Endpoint\FacebookTokenEndpoint
               clientIdentifier: 123456-your-client-identifier
               clientSecret: '-add-your-client-secret-here-'
               responseType: code
-
-              # Reference for scopes https://developers.facebook.com/docs/facebook-login/permissions
               scopes:
                 - email
-
-              #Reference for fields https://developers.facebook.com/docs/graph-api/reference/user
               fields:
                 - email
                 - first_name
                 - last_name
-
-              # per default an account with a role (if 'authenticateRoles' is defined) is only created
-              # if 'partyCreation' is TRUE a Party with the given 'fields' is created
-              partyCreation: TRUE
-
+              partyCreation: true
               display: popup
-
-
           GoogleOAuth2Provider:
             provider: Flowpack\OAuth2\Client\Provider\GoogleProvider
             providerOptions:
-              #authenticateRoles: ['TYPO3.Flow.SomeRole']
-
               authorizationEndpointUri: 'https://accounts.google.com/o/oauth2/auth'
-
-              # redirectionEndpointUri must be some page on your site which is defined in your google API manager
-              # https://console.developers.google.com/apis/library
               redirectionEndpointUri: 'https://www.yoursite.com/authentication/authenticate'
-
               tokenEndpointUri: 'https://accounts.google.com/o/oauth2/token'
               tokenEndpointClassName: Flowpack\OAuth2\Client\Endpoint\GoogleTokenEndpoint
-              clientIdentifier: '123456youridentifier.apps.googleusercontent.com'
+              clientIdentifier: 123456youridentifier.apps.googleusercontent.com
               clientSecret: '-add-your-client-secret-here-'
               responseType: code
-
-              # Reference for scopes https://developers.google.com/identity/protocols/googlescopes
               scopes:
-                - https://www.googleapis.com/auth/userinfo.email
-                - https://www.googleapis.com/auth/userinfo.profile
-
-              # per default an account with a role (if 'authenticateRoles' is defined) is only created
-              # if 'partyCreation' is TRUE a Party with the given 'fields' is created
-              partyCreation: TRUE
-
+                - 'https://www.googleapis.com/auth/userinfo.email'
+                - 'https://www.googleapis.com/auth/userinfo.profile'
+              partyCreation: true
               display: popup
-  
diff --git a/composer.json b/composer.json
index 74f1fce..0dcce40 100644
--- a/composer.json
+++ b/composer.json
@@ -56,7 +56,8 @@
             "TYPO3.Flow-20151113161300",
             "TYPO3.Form-20160601101500",
             "TYPO3.Flow-20161115140400",
-            "TYPO3.Flow-20161115140430"
+            "TYPO3.Flow-20161115140430",
+            "Neos.Flow-20161124204700"
         ]
     }
 }
\ No newline at end of file

From e735a2ed0c3a56294649d8895797b2831fe2cb2a Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:39 +0300
Subject: [PATCH 32/72] TASK: Apply migration Neos.Flow-20161124204701

Adjusts code to package renaming from "Neos.Flow.Utility.Files" to
"Neos.Utility.Files" and other extractions of the "Utility" packages.
---
 .../OAuth2/Client/Endpoint/AbstractHttpTokenEndpoint.php       | 2 +-
 composer.json                                                  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Classes/Flowpack/OAuth2/Client/Endpoint/AbstractHttpTokenEndpoint.php b/Classes/Flowpack/OAuth2/Client/Endpoint/AbstractHttpTokenEndpoint.php
index 14e5a66..bc8ac6e 100644
--- a/Classes/Flowpack/OAuth2/Client/Endpoint/AbstractHttpTokenEndpoint.php
+++ b/Classes/Flowpack/OAuth2/Client/Endpoint/AbstractHttpTokenEndpoint.php
@@ -15,7 +15,7 @@
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Http\Request;
 use Neos\Flow\Http\Uri;
-use Neos\Flow\Utility\Arrays;
+use Neos\Utility\Arrays;
 
 /**
  */
diff --git a/composer.json b/composer.json
index 0dcce40..a9eb509 100644
--- a/composer.json
+++ b/composer.json
@@ -57,7 +57,8 @@
             "TYPO3.Form-20160601101500",
             "TYPO3.Flow-20161115140400",
             "TYPO3.Flow-20161115140430",
-            "Neos.Flow-20161124204700"
+            "Neos.Flow-20161124204700",
+            "Neos.Flow-20161124204701"
         ]
     }
 }
\ No newline at end of file

From 1e524b6f7ea970d8998a94752d7efb0f145e97e5 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:39 +0300
Subject: [PATCH 33/72] TASK: Apply migration
 Neos.Twitter.Bootstrap-20161124204912

Adjusts code to package renaming from "TYPO3.Twitter.Bootstrap" to
"Neos.Twitter.Bootstrap"

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index a9eb509..27faf38 100644
--- a/composer.json
+++ b/composer.json
@@ -58,7 +58,8 @@
             "TYPO3.Flow-20161115140400",
             "TYPO3.Flow-20161115140430",
             "Neos.Flow-20161124204700",
-            "Neos.Flow-20161124204701"
+            "Neos.Flow-20161124204701",
+            "Neos.Twitter.Bootstrap-20161124204912"
         ]
     }
 }
\ No newline at end of file

From d3e48dec11bc434e4f9e8a672c5e0101e0810f23 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:39 +0300
Subject: [PATCH 34/72] TASK: Apply migration Neos.Form-20161124205254

Adjusts code to package renaming from "TYPO3.Form" to "Neos.Form"

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 27faf38..955e2bd 100644
--- a/composer.json
+++ b/composer.json
@@ -59,7 +59,8 @@
             "TYPO3.Flow-20161115140430",
             "Neos.Flow-20161124204700",
             "Neos.Flow-20161124204701",
-            "Neos.Twitter.Bootstrap-20161124204912"
+            "Neos.Twitter.Bootstrap-20161124204912",
+            "Neos.Form-20161124205254"
         ]
     }
 }
\ No newline at end of file

From 4835c94083617d7041a8f108b5168d0b4ae7ee9d Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:39 +0300
Subject: [PATCH 35/72] TASK: Apply migration Neos.Flow-20161124224015

Adjusts code to cache extraction

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 955e2bd..2321c4f 100644
--- a/composer.json
+++ b/composer.json
@@ -60,7 +60,8 @@
             "Neos.Flow-20161124204700",
             "Neos.Flow-20161124204701",
             "Neos.Twitter.Bootstrap-20161124204912",
-            "Neos.Form-20161124205254"
+            "Neos.Form-20161124205254",
+            "Neos.Flow-20161124224015"
         ]
     }
 }
\ No newline at end of file

From 5ac8bc6d1997e3eb80fb333170f1e504def834a4 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:40 +0300
Subject: [PATCH 36/72] TASK: Apply migration Neos.Party-20161124225257

Adjusts code to package renaming from "TYPO3.Party" to "Neos.Party"
---
 Classes/Flowpack/OAuth2/Client/Flow/AbstractFlow.php |  2 +-
 Classes/Flowpack/OAuth2/Client/Flow/FacebookFlow.php | 10 +++++-----
 Classes/Flowpack/OAuth2/Client/Flow/GoogleFlow.php   |  8 ++++----
 composer.json                                        |  3 ++-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Classes/Flowpack/OAuth2/Client/Flow/AbstractFlow.php b/Classes/Flowpack/OAuth2/Client/Flow/AbstractFlow.php
index fd33109..98e2796 100644
--- a/Classes/Flowpack/OAuth2/Client/Flow/AbstractFlow.php
+++ b/Classes/Flowpack/OAuth2/Client/Flow/AbstractFlow.php
@@ -17,7 +17,7 @@
 use Neos\Flow\Security\Account;
 use Neos\Flow\Security\Policy\PolicyService;
 use Neos\Flow\Validation\ValidatorResolver;
-use TYPO3\Party\Domain\Repository\PartyRepository;
+use Neos\Party\Domain\Repository\PartyRepository;
 
 /**
  */
diff --git a/Classes/Flowpack/OAuth2/Client/Flow/FacebookFlow.php b/Classes/Flowpack/OAuth2/Client/Flow/FacebookFlow.php
index b6bda9e..c4d390a 100644
--- a/Classes/Flowpack/OAuth2/Client/Flow/FacebookFlow.php
+++ b/Classes/Flowpack/OAuth2/Client/Flow/FacebookFlow.php
@@ -14,10 +14,10 @@
 use Flowpack\OAuth2\Client\Exception\InvalidPartyDataException;
 use Flowpack\OAuth2\Client\Token\AbstractClientToken;
 use Neos\Flow\Annotations as Flow;
-use TYPO3\Party\Domain\Model\ElectronicAddress;
-use TYPO3\Party\Domain\Model\Person;
-use TYPO3\Party\Domain\Model\PersonName;
-use TYPO3\Party\Domain\Repository\PartyRepository;
+use Neos\Party\Domain\Model\ElectronicAddress;
+use Neos\Party\Domain\Model\Person;
+use Neos\Party\Domain\Model\PersonName;
+use Neos\Party\Domain\Repository\PartyRepository;
 use Neos\Flow\Configuration\ConfigurationManager;
 
 /**
@@ -59,7 +59,7 @@ public function createPartyAndAttachToAccountFor(AbstractClientToken $token)
         $party->addElectronicAddress($electronicAddress);
         $party->setPrimaryElectronicAddress($electronicAddress);
 
-        $partyValidator = $this->validatorResolver->getBaseValidatorConjunction('TYPO3\Party\Domain\Model\Person');
+        $partyValidator = $this->validatorResolver->getBaseValidatorConjunction('Neos\Party\Domain\Model\Person');
         $validationResult = $partyValidator->validate($party);
         if ($validationResult->hasErrors()) {
             throw new InvalidPartyDataException('The created party does not satisfy the requirements', 1384266207);
diff --git a/Classes/Flowpack/OAuth2/Client/Flow/GoogleFlow.php b/Classes/Flowpack/OAuth2/Client/Flow/GoogleFlow.php
index ca0bc13..458aea3 100644
--- a/Classes/Flowpack/OAuth2/Client/Flow/GoogleFlow.php
+++ b/Classes/Flowpack/OAuth2/Client/Flow/GoogleFlow.php
@@ -14,9 +14,9 @@
 use Flowpack\OAuth2\Client\Exception\InvalidPartyDataException;
 use Flowpack\OAuth2\Client\Token\AbstractClientToken;
 use Neos\Flow\Annotations as Flow;
-use TYPO3\Party\Domain\Model\ElectronicAddress;
-use TYPO3\Party\Domain\Model\Person;
-use TYPO3\Party\Domain\Model\PersonName;
+use Neos\Party\Domain\Model\ElectronicAddress;
+use Neos\Party\Domain\Model\Person;
+use Neos\Party\Domain\Model\PersonName;
 
 /**
  */
@@ -51,7 +51,7 @@ public function createPartyAndAttachToAccountFor(AbstractClientToken $token)
         $party->addElectronicAddress($electronicAddress);
         $party->setPrimaryElectronicAddress($electronicAddress);
 
-        $partyValidator = $this->validatorResolver->getBaseValidatorConjunction('TYPO3\Party\Domain\Model\Person');
+        $partyValidator = $this->validatorResolver->getBaseValidatorConjunction('Neos\Party\Domain\Model\Person');
         $validationResult = $partyValidator->validate($party);
         if ($validationResult->hasErrors()) {
             throw new InvalidPartyDataException('The created party does not satisfy the requirements', 1384266207);
diff --git a/composer.json b/composer.json
index 2321c4f..2288cb6 100644
--- a/composer.json
+++ b/composer.json
@@ -61,7 +61,8 @@
             "Neos.Flow-20161124204701",
             "Neos.Twitter.Bootstrap-20161124204912",
             "Neos.Form-20161124205254",
-            "Neos.Flow-20161124224015"
+            "Neos.Flow-20161124224015",
+            "Neos.Party-20161124225257"
         ]
     }
 }
\ No newline at end of file

From fd5dae5d835d981e1652ecda6e1ff3cf79b7fc03 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:40 +0300
Subject: [PATCH 37/72] TASK: Apply migration Neos.Eel-20161124230101

Adjusts code to Eel Renaming

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 2288cb6..29d937c 100644
--- a/composer.json
+++ b/composer.json
@@ -62,7 +62,8 @@
             "Neos.Twitter.Bootstrap-20161124204912",
             "Neos.Form-20161124205254",
             "Neos.Flow-20161124224015",
-            "Neos.Party-20161124225257"
+            "Neos.Party-20161124225257",
+            "Neos.Eel-20161124230101"
         ]
     }
 }
\ No newline at end of file

From 270e5c88a422fe1eb8dd4aebf338290a8a0da0bc Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:40 +0300
Subject: [PATCH 38/72] TASK: Apply migration Neos.Setup-20161124230842

Adjusts code to Setup Renaming

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 29d937c..3552dbd 100644
--- a/composer.json
+++ b/composer.json
@@ -63,7 +63,8 @@
             "Neos.Form-20161124205254",
             "Neos.Flow-20161124224015",
             "Neos.Party-20161124225257",
-            "Neos.Eel-20161124230101"
+            "Neos.Eel-20161124230101",
+            "Neos.Setup-20161124230842"
         ]
     }
 }
\ No newline at end of file

From 324f358a81e82aa730948d5d304027b555153422 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:40 +0300
Subject: [PATCH 39/72] TASK: Apply migration Neos.Imagine-20161124231742

Adjusts code to Imagine Renaming

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 3552dbd..46f7899 100644
--- a/composer.json
+++ b/composer.json
@@ -64,7 +64,8 @@
             "Neos.Flow-20161124224015",
             "Neos.Party-20161124225257",
             "Neos.Eel-20161124230101",
-            "Neos.Setup-20161124230842"
+            "Neos.Setup-20161124230842",
+            "Neos.Imagine-20161124231742"
         ]
     }
 }
\ No newline at end of file

From c44cb3c09fbae277649fe52d69eadddcfcdc3333 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:40 +0300
Subject: [PATCH 40/72] TASK: Apply migration Neos.Media-20161124233100

Adjusts code to package renaming from "TYPO3.Media" to "Neos.Media"

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 46f7899..f4e4e47 100644
--- a/composer.json
+++ b/composer.json
@@ -65,7 +65,8 @@
             "Neos.Party-20161124225257",
             "Neos.Eel-20161124230101",
             "Neos.Setup-20161124230842",
-            "Neos.Imagine-20161124231742"
+            "Neos.Imagine-20161124231742",
+            "Neos.Media-20161124233100"
         ]
     }
 }
\ No newline at end of file

From fb94c6759641a325116f15211d668ea4a25172c8 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:40 +0300
Subject: [PATCH 41/72] TASK: Apply migration Neos.Neos-20161125002322

Adjusts code to package renaming from "TYPO3.Neos" to "Neos.Neos"

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index f4e4e47..4a95d94 100644
--- a/composer.json
+++ b/composer.json
@@ -66,7 +66,8 @@
             "Neos.Eel-20161124230101",
             "Neos.Setup-20161124230842",
             "Neos.Imagine-20161124231742",
-            "Neos.Media-20161124233100"
+            "Neos.Media-20161124233100",
+            "Neos.Neos-20161125002322"
         ]
     }
 }
\ No newline at end of file

From ffc1a9c7a34fa308a4a22811d0dad41e85da936a Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:40 +0300
Subject: [PATCH 42/72] TASK: Apply migration
 Neos.ContentRepository-20161125012000

Adjusts code to package renaming from "TYPO3.TYPO3CR" to
"Neos.ContentRepository"

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 4a95d94..7e61b1c 100644
--- a/composer.json
+++ b/composer.json
@@ -67,7 +67,8 @@
             "Neos.Setup-20161124230842",
             "Neos.Imagine-20161124231742",
             "Neos.Media-20161124233100",
-            "Neos.Neos-20161125002322"
+            "Neos.Neos-20161125002322",
+            "Neos.ContentRepository-20161125012000"
         ]
     }
 }
\ No newline at end of file

From 390acf43ba53e7a34a3fa19f5da5b2374a45a60a Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:40 +0300
Subject: [PATCH 43/72] TASK: Apply migration Neos.Fusion-20161125013710

Adjusts code to package renaming from "TYPO3.TypoScript" to
"Neos.Fusion"

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7e61b1c..aeef76b 100644
--- a/composer.json
+++ b/composer.json
@@ -68,7 +68,8 @@
             "Neos.Imagine-20161124231742",
             "Neos.Media-20161124233100",
             "Neos.Neos-20161125002322",
-            "Neos.ContentRepository-20161125012000"
+            "Neos.ContentRepository-20161125012000",
+            "Neos.Fusion-20161125013710"
         ]
     }
 }
\ No newline at end of file

From 5e5842c327cd9ec7673912a23b4745b0cc1e381a Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:40 +0300
Subject: [PATCH 44/72] TASK: Apply migration Neos.Setup-20161125014759

Adjusts settings path from TYPO3.Setup to Neos.Setup to Setup Renaming

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index aeef76b..8d3ba77 100644
--- a/composer.json
+++ b/composer.json
@@ -69,7 +69,8 @@
             "Neos.Media-20161124233100",
             "Neos.Neos-20161125002322",
             "Neos.ContentRepository-20161125012000",
-            "Neos.Fusion-20161125013710"
+            "Neos.Fusion-20161125013710",
+            "Neos.Setup-20161125014759"
         ]
     }
 }
\ No newline at end of file

From d179c2be8a66376763f2737e80700ff68e736fb1 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:40 +0300
Subject: [PATCH 45/72] TASK: Apply migration Neos.Fusion-20161125104701

Adjusts code to package renaming from "TYPO3.TypoScript" to
"Neos.Fusion" in Fusion files

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 8d3ba77..2f45a33 100644
--- a/composer.json
+++ b/composer.json
@@ -70,7 +70,8 @@
             "Neos.Neos-20161125002322",
             "Neos.ContentRepository-20161125012000",
             "Neos.Fusion-20161125013710",
-            "Neos.Setup-20161125014759"
+            "Neos.Setup-20161125014759",
+            "Neos.Fusion-20161125104701"
         ]
     }
 }
\ No newline at end of file

From b755b0962477b4a78fcb5d1af0b67f22492c7974 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:40 +0300
Subject: [PATCH 46/72] TASK: Apply migration Neos.Neos-20161125104802

Adjusts code to package renaming from "TYPO3.Neos" to "Neos.Neos" in
Fusion files

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 2f45a33..40d821e 100644
--- a/composer.json
+++ b/composer.json
@@ -71,7 +71,8 @@
             "Neos.ContentRepository-20161125012000",
             "Neos.Fusion-20161125013710",
             "Neos.Setup-20161125014759",
-            "Neos.Fusion-20161125104701"
+            "Neos.Fusion-20161125104701",
+            "Neos.Neos-20161125104802"
         ]
     }
 }
\ No newline at end of file

From 54a6ac5354009dd93c5b6baa2fa568d48fe6f75d Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:40 +0300
Subject: [PATCH 47/72] TASK: Apply migration Neos.Neos-20161125122412

Allow to migrate Sites.xml files

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 40d821e..82fe144 100644
--- a/composer.json
+++ b/composer.json
@@ -72,7 +72,8 @@
             "Neos.Fusion-20161125013710",
             "Neos.Setup-20161125014759",
             "Neos.Fusion-20161125104701",
-            "Neos.Neos-20161125104802"
+            "Neos.Neos-20161125104802",
+            "Neos.Neos-20161125122412"
         ]
     }
 }
\ No newline at end of file

From cff6b50e5bd6747e938c7249ce1d3a352f4de0a1 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:41 +0300
Subject: [PATCH 48/72] TASK: Apply migration Neos.Flow-20161125124112

Adjusts code to Neos\Flow\Utility\Unicode adjustment

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 82fe144..5c228ac 100644
--- a/composer.json
+++ b/composer.json
@@ -73,7 +73,8 @@
             "Neos.Setup-20161125014759",
             "Neos.Fusion-20161125104701",
             "Neos.Neos-20161125104802",
-            "Neos.Neos-20161125122412"
+            "Neos.Neos-20161125122412",
+            "Neos.Flow-20161125124112"
         ]
     }
 }
\ No newline at end of file

From 549c30bcebb4c1712d59a99b28bb00310aebcef3 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:41 +0300
Subject: [PATCH 49/72] TASK: Apply migration TYPO3.FluidAdaptor-20161130112935

Adjusts code to package renaming from "TYPO3.Fluid" to
"Neos.FluidAdaptor".
---
 .../OAuth2/Client/ViewHelpers/Uri/AuthorizationViewHelper.php  | 2 +-
 composer.json                                                  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Classes/Flowpack/OAuth2/Client/ViewHelpers/Uri/AuthorizationViewHelper.php b/Classes/Flowpack/OAuth2/Client/ViewHelpers/Uri/AuthorizationViewHelper.php
index abcf69b..96eba84 100644
--- a/Classes/Flowpack/OAuth2/Client/ViewHelpers/Uri/AuthorizationViewHelper.php
+++ b/Classes/Flowpack/OAuth2/Client/ViewHelpers/Uri/AuthorizationViewHelper.php
@@ -13,7 +13,7 @@
 
 use Flowpack\OAuth2\Client\UriBuilder;
 use Neos\Flow\Annotations as Flow;
-use TYPO3\Fluid\Core\ViewHelper\AbstractViewHelper;
+use Neos\FluidAdaptor\Core\ViewHelper\AbstractViewHelper;
 
 /**
  */
diff --git a/composer.json b/composer.json
index 5c228ac..dd49643 100644
--- a/composer.json
+++ b/composer.json
@@ -74,7 +74,8 @@
             "Neos.Fusion-20161125104701",
             "Neos.Neos-20161125104802",
             "Neos.Neos-20161125122412",
-            "Neos.Flow-20161125124112"
+            "Neos.Flow-20161125124112",
+            "TYPO3.FluidAdaptor-20161130112935"
         ]
     }
 }
\ No newline at end of file

From 7ac006d8a4ada5c24305878709eb37952b23beca Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:41 +0300
Subject: [PATCH 50/72] TASK: Apply migration Neos.Fusion-20161201202543

Moves fusion files from old path ``Resources/Private/TypoScript/`` to
the new path

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index dd49643..1fe79e0 100644
--- a/composer.json
+++ b/composer.json
@@ -75,7 +75,8 @@
             "Neos.Neos-20161125104802",
             "Neos.Neos-20161125122412",
             "Neos.Flow-20161125124112",
-            "TYPO3.FluidAdaptor-20161130112935"
+            "TYPO3.FluidAdaptor-20161130112935",
+            "Neos.Fusion-20161201202543"
         ]
     }
 }
\ No newline at end of file

From 2a85b800792b8b1cbd8ec7efd5f31a23bd6742ff Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:41 +0300
Subject: [PATCH 51/72] TASK: Apply migration Neos.Neos-20161201222211

Migrate namespaces for fusion core implementation and helper classes

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 1fe79e0..f4eb63b 100644
--- a/composer.json
+++ b/composer.json
@@ -76,7 +76,8 @@
             "Neos.Neos-20161125122412",
             "Neos.Flow-20161125124112",
             "TYPO3.FluidAdaptor-20161130112935",
-            "Neos.Fusion-20161201202543"
+            "Neos.Fusion-20161201202543",
+            "Neos.Neos-20161201222211"
         ]
     }
 }
\ No newline at end of file

From 875a5f40a280d18e1cfc6f38683e9358ace0bf30 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:41 +0300
Subject: [PATCH 52/72] TASK: Apply migration Neos.Fusion-20161202215034

Migrate name for the Fusion content cache to Neos_Fusion_Content

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index f4eb63b..ee13b5b 100644
--- a/composer.json
+++ b/composer.json
@@ -77,7 +77,8 @@
             "Neos.Flow-20161125124112",
             "TYPO3.FluidAdaptor-20161130112935",
             "Neos.Fusion-20161201202543",
-            "Neos.Neos-20161201222211"
+            "Neos.Neos-20161201222211",
+            "Neos.Fusion-20161202215034"
         ]
     }
 }
\ No newline at end of file

From e600f745fdd85ffe90ae8134f047d15feed72e8b Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:41 +0300
Subject: [PATCH 53/72] TASK: Apply migration
 Neos.ContentRepository.Search-20161210231100

Adjusts code to package renaming from "TYPO3.TYPO3CR.Search" to
"Neos.ContentRepository.Search"

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ee13b5b..00cb9a1 100644
--- a/composer.json
+++ b/composer.json
@@ -78,7 +78,8 @@
             "TYPO3.FluidAdaptor-20161130112935",
             "Neos.Fusion-20161201202543",
             "Neos.Neos-20161201222211",
-            "Neos.Fusion-20161202215034"
+            "Neos.Fusion-20161202215034",
+            "Neos.ContentRepository.Search-20161210231100"
         ]
     }
 }
\ No newline at end of file

From d14ec9b52c4f39c8d02849ba74752920efa35e31 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:41 +0300
Subject: [PATCH 54/72] TASK: Apply migration Neos.Fusion-20161219092345

Migrate name for the Fusion cache to Neos_Neos_Fusion

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 00cb9a1..dc74574 100644
--- a/composer.json
+++ b/composer.json
@@ -79,7 +79,8 @@
             "Neos.Fusion-20161201202543",
             "Neos.Neos-20161201222211",
             "Neos.Fusion-20161202215034",
-            "Neos.ContentRepository.Search-20161210231100"
+            "Neos.ContentRepository.Search-20161210231100",
+            "Neos.Fusion-20161219092345"
         ]
     }
 }
\ No newline at end of file

From 9fe8bb9e37f905bc6d6063ffbbd6871f354192c0 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:41 +0300
Subject: [PATCH 55/72] TASK: Apply migration
 Neos.ContentRepository-20161219093512

Migrate name for the CR node type configuration

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index dc74574..f9b644a 100644
--- a/composer.json
+++ b/composer.json
@@ -80,7 +80,8 @@
             "Neos.Neos-20161201222211",
             "Neos.Fusion-20161202215034",
             "Neos.ContentRepository.Search-20161210231100",
-            "Neos.Fusion-20161219092345"
+            "Neos.Fusion-20161219092345",
+            "Neos.ContentRepository-20161219093512"
         ]
     }
 }
\ No newline at end of file

From 8076321930ad09f43837ae30a29e5d39c1846e42 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:41 +0300
Subject: [PATCH 56/72] TASK: Apply migration Neos.Media-20161219094126

Migrate name for the media image size cache

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index f9b644a..90d6a3e 100644
--- a/composer.json
+++ b/composer.json
@@ -81,7 +81,8 @@
             "Neos.Fusion-20161202215034",
             "Neos.ContentRepository.Search-20161210231100",
             "Neos.Fusion-20161219092345",
-            "Neos.ContentRepository-20161219093512"
+            "Neos.ContentRepository-20161219093512",
+            "Neos.Media-20161219094126"
         ]
     }
 }
\ No newline at end of file

From 319628ba33470d90e87047c5ff7c843dd887a557 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:41 +0300
Subject: [PATCH 57/72] TASK: Apply migration Neos.Neos-20161219094403

Migrate several cache keys for the Neos.Neos package

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 90d6a3e..9cfbf77 100644
--- a/composer.json
+++ b/composer.json
@@ -82,7 +82,8 @@
             "Neos.ContentRepository.Search-20161210231100",
             "Neos.Fusion-20161219092345",
             "Neos.ContentRepository-20161219093512",
-            "Neos.Media-20161219094126"
+            "Neos.Media-20161219094126",
+            "Neos.Neos-20161219094403"
         ]
     }
 }
\ No newline at end of file

From 3fe3e8e77326b756229c61138be4b11a2a80a8ca Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:41 +0300
Subject: [PATCH 58/72] TASK: Apply migration Neos.Neos-20161219122512

Migrate usages of TypoScriptService to FusionService

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 9cfbf77..2e34a32 100644
--- a/composer.json
+++ b/composer.json
@@ -83,7 +83,8 @@
             "Neos.Fusion-20161219092345",
             "Neos.ContentRepository-20161219093512",
             "Neos.Media-20161219094126",
-            "Neos.Neos-20161219094403"
+            "Neos.Neos-20161219094403",
+            "Neos.Neos-20161219122512"
         ]
     }
 }
\ No newline at end of file

From 4b30380074d6657f75770c8e7be299e7a24b830c Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:41 +0300
Subject: [PATCH 59/72] TASK: Apply migration Neos.Fusion-20161219130100

Migrate name for the TypoScriptView to FusionView

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 2e34a32..36c6462 100644
--- a/composer.json
+++ b/composer.json
@@ -84,7 +84,8 @@
             "Neos.ContentRepository-20161219093512",
             "Neos.Media-20161219094126",
             "Neos.Neos-20161219094403",
-            "Neos.Neos-20161219122512"
+            "Neos.Neos-20161219122512",
+            "Neos.Fusion-20161219130100"
         ]
     }
 }
\ No newline at end of file

From 39eabb097f567efb34fc7e36b9b34f1f69152ce4 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:41 +0300
Subject: [PATCH 60/72] TASK: Apply migration Neos.Neos-20161220163741

Migrate usages of the Settings path Neos.Neos.typoScript to
Neos.Neos.fusion

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 36c6462..f91d43b 100644
--- a/composer.json
+++ b/composer.json
@@ -85,7 +85,8 @@
             "Neos.Media-20161219094126",
             "Neos.Neos-20161219094403",
             "Neos.Neos-20161219122512",
-            "Neos.Fusion-20161219130100"
+            "Neos.Fusion-20161219130100",
+            "Neos.Neos-20161220163741"
         ]
     }
 }
\ No newline at end of file

From 9354a336385df505a8ff5388c6294f610e2cd58b Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:42 +0300
Subject: [PATCH 61/72] TASK: Apply migration Neos.Neos-20170115114620

Migrate usages of the Settings path
Neos.Flow.security.authentication.providers.Typo3BackendProvider to
Neos.Flow.security.authentication.providers[Neos.Neos:Backend]

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index f91d43b..b07b967 100644
--- a/composer.json
+++ b/composer.json
@@ -86,7 +86,8 @@
             "Neos.Neos-20161219094403",
             "Neos.Neos-20161219122512",
             "Neos.Fusion-20161219130100",
-            "Neos.Neos-20161220163741"
+            "Neos.Neos-20161220163741",
+            "Neos.Neos-20170115114620"
         ]
     }
 }
\ No newline at end of file

From 77514c64d2265ab4e506e126e39194a04ce7f5b7 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:42 +0300
Subject: [PATCH 62/72] TASK: Apply migration Neos.Fusion-20170120013047

Migrate name for the TypoScriptView to FusionView

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index b07b967..fb48caf 100644
--- a/composer.json
+++ b/composer.json
@@ -87,7 +87,8 @@
             "Neos.Neos-20161219122512",
             "Neos.Fusion-20161219130100",
             "Neos.Neos-20161220163741",
-            "Neos.Neos-20170115114620"
+            "Neos.Neos-20170115114620",
+            "Neos.Fusion-20170120013047"
         ]
     }
 }
\ No newline at end of file

From f81bbabe8f1554f5396259396d37a8def7706f04 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:42 +0300
Subject: [PATCH 63/72] TASK: Apply migration Neos.Flow-20170125103800

Migrate usages of the path [TYPO3][Flow][Security][Authentication] to
[Neos][Flow][Security][Authentication]

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index fb48caf..765bedd 100644
--- a/composer.json
+++ b/composer.json
@@ -88,7 +88,8 @@
             "Neos.Fusion-20161219130100",
             "Neos.Neos-20161220163741",
             "Neos.Neos-20170115114620",
-            "Neos.Fusion-20170120013047"
+            "Neos.Fusion-20170120013047",
+            "Neos.Flow-20170125103800"
         ]
     }
 }
\ No newline at end of file

From 0382443e39889be9b42caa688c1869ce3e1b2888 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:42 +0300
Subject: [PATCH 64/72] TASK: Apply migration Neos.Seo-20170127154600

Migrate to new namespace

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 765bedd..89935aa 100644
--- a/composer.json
+++ b/composer.json
@@ -89,7 +89,8 @@
             "Neos.Neos-20161220163741",
             "Neos.Neos-20170115114620",
             "Neos.Fusion-20170120013047",
-            "Neos.Flow-20170125103800"
+            "Neos.Flow-20170125103800",
+            "Neos.Seo-20170127154600"
         ]
     }
 }
\ No newline at end of file

From 8309f99d693d4b1bcaf5a33ee046dc9d2f838981 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:42 +0300
Subject: [PATCH 65/72] TASK: Apply migration Neos.Flow-20170127183102

Migrate bootstep names.

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 89935aa..9b15bf9 100644
--- a/composer.json
+++ b/composer.json
@@ -90,7 +90,8 @@
             "Neos.Neos-20170115114620",
             "Neos.Fusion-20170120013047",
             "Neos.Flow-20170125103800",
-            "Neos.Seo-20170127154600"
+            "Neos.Seo-20170127154600",
+            "Neos.Flow-20170127183102"
         ]
     }
 }
\ No newline at end of file

From 3252df89c9cbfaa79236845fa891cf17b9ad3063 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:42 +0300
Subject: [PATCH 66/72] TASK: Apply migration Neos.Fusion-20180211175500

Expand Neos.Neos-FusionObjects without namespace to fully qualified
names

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 9b15bf9..955062b 100644
--- a/composer.json
+++ b/composer.json
@@ -91,7 +91,8 @@
             "Neos.Fusion-20170120013047",
             "Neos.Flow-20170125103800",
             "Neos.Seo-20170127154600",
-            "Neos.Flow-20170127183102"
+            "Neos.Flow-20170127183102",
+            "Neos.Fusion-20180211175500"
         ]
     }
 }
\ No newline at end of file

From 6abd8963e2dad8b8ca7ed6f02e1c70d993e78cdf Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:42 +0300
Subject: [PATCH 67/72] TASK: Apply migration Neos.Fusion-20180211184832

Remove namespace aliases and replace them with the package keys

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 955062b..d127b60 100644
--- a/composer.json
+++ b/composer.json
@@ -92,7 +92,8 @@
             "Neos.Flow-20170125103800",
             "Neos.Seo-20170127154600",
             "Neos.Flow-20170127183102",
-            "Neos.Fusion-20180211175500"
+            "Neos.Fusion-20180211175500",
+            "Neos.Fusion-20180211184832"
         ]
     }
 }
\ No newline at end of file

From 625013ccff304161c7a87e68b1bf737dc5ae1590 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:42 +0300
Subject: [PATCH 68/72] TASK: Apply migration Neos.Flow-20180415105700

Add scalar type hint to CacheAwareInterface implementations.

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index d127b60..ea04501 100644
--- a/composer.json
+++ b/composer.json
@@ -93,7 +93,8 @@
             "Neos.Seo-20170127154600",
             "Neos.Flow-20170127183102",
             "Neos.Fusion-20180211175500",
-            "Neos.Fusion-20180211184832"
+            "Neos.Fusion-20180211184832",
+            "Neos.Flow-20180415105700"
         ]
     }
 }
\ No newline at end of file

From 27982f490cd86e1b03e24cd6d3d32187940bdc41 Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Mon, 25 Feb 2019 11:39:42 +0300
Subject: [PATCH 69/72] TASK: Apply migration Neos.Neos-20180907103800

Migrate RTE formatting configuration to new format

Note: This migration did not produce any changes, so the commit simply
marks the migration as applied. This makes sure it will not be applied
again.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ea04501..2bb389c 100644
--- a/composer.json
+++ b/composer.json
@@ -94,7 +94,8 @@
             "Neos.Flow-20170127183102",
             "Neos.Fusion-20180211175500",
             "Neos.Fusion-20180211184832",
-            "Neos.Flow-20180415105700"
+            "Neos.Flow-20180415105700",
+            "Neos.Neos-20180907103800"
         ]
     }
 }
\ No newline at end of file

From 2fae128093d4acbc41bb2ee99edf5c7b3841de3b Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Tue, 26 Feb 2019 13:17:29 +0300
Subject: [PATCH 70/72] FEATURE: Authorization eel helper

---
 .../OAuth2/Client/Eel/AuthorizationHelper.php | 33 +++++++++++++++++++
 Configuration/Settings.yaml                   |  3 ++
 2 files changed, 36 insertions(+)
 create mode 100644 Classes/Flowpack/OAuth2/Client/Eel/AuthorizationHelper.php

diff --git a/Classes/Flowpack/OAuth2/Client/Eel/AuthorizationHelper.php b/Classes/Flowpack/OAuth2/Client/Eel/AuthorizationHelper.php
new file mode 100644
index 0000000..9c867ca
--- /dev/null
+++ b/Classes/Flowpack/OAuth2/Client/Eel/AuthorizationHelper.php
@@ -0,0 +1,33 @@
+<?php
+namespace Flowpack\OAuth2\Client\Eel;
+
+use Neos\Eel\ProtectedContextAwareInterface;
+use Neos\ContentRepository\Domain\Model\NodeInterface;
+use Neos\Flow\Annotations as Flow;
+use Flowpack\OAuth2\Client\UriBuilder;
+
+class AuthorizationHelper implements ProtectedContextAwareInterface {
+    /**
+     * @Flow\Inject
+     * @var UriBuilder
+     */
+    protected $oauthUriBuilder;
+
+	/**
+	 * @param string $providerName
+	 * @return string
+	 */
+	public function getAuthorizationUri(string $providerName) {
+		return $this->oauthUriBuilder->getAuthorizationUri($providerName);
+	}
+
+	/**
+	 * All methods are considered safe
+	 *
+	 * @param string $methodName
+	 * @return boolean
+	 */
+	public function allowsCallOfMethod($methodName) {
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml
index dd3ea45..37a0040 100644
--- a/Configuration/Settings.yaml
+++ b/Configuration/Settings.yaml
@@ -37,3 +37,6 @@ Neos:
                 - 'https://www.googleapis.com/auth/userinfo.profile'
               partyCreation: true
               display: popup
+  Fusion:
+    defaultContext:
+      OAuth2Client: Flowpack\OAuth2\Client\Eel\AuthorizationHelper
\ No newline at end of file

From a34718ccf4cf63cc0947a928bc7d7322f6e2214a Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Tue, 26 Feb 2019 13:18:08 +0300
Subject: [PATCH 71/72] !!! TASK: Don't persist account

---
 Classes/Flowpack/OAuth2/Client/Provider/FacebookProvider.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Classes/Flowpack/OAuth2/Client/Provider/FacebookProvider.php b/Classes/Flowpack/OAuth2/Client/Provider/FacebookProvider.php
index 21ecc1b..cc58c26 100644
--- a/Classes/Flowpack/OAuth2/Client/Provider/FacebookProvider.php
+++ b/Classes/Flowpack/OAuth2/Client/Provider/FacebookProvider.php
@@ -124,7 +124,6 @@ public function authenticate(TokenInterface $authenticationToken)
                 $roles[] = $this->policyService->getRole($roleIdentifier);
             }
             $account->setRoles($roles);
-            $this->accountRepository->add($account);
         }
         $authenticationToken->setAccount($account);
 
@@ -133,9 +132,6 @@ public function authenticate(TokenInterface $authenticationToken)
         $account->setCredentialsSource($longLivedToken['access_token']);
         $account->authenticationAttempted(TokenInterface::AUTHENTICATION_SUCCESSFUL);
 
-        $this->accountRepository->update($account);
-        $this->persistenceManager->persistAll();
-
         // Only if defined a Party for the account is created
         if ($this->options['partyCreation'] && $isNewCreatedAccount) {
             $this->facebookFlow->createPartyAndAttachToAccountFor($authenticationToken);

From 50b8e2db4696b4c012febb3db979c01ff950c0da Mon Sep 17 00:00:00 2001
From: Dmitri Pisarev <dimaip@gmail.com>
Date: Tue, 26 Feb 2019 18:17:53 +0300
Subject: [PATCH 72/72] TASK: fix Google auth

---
 .../Flowpack/OAuth2/Client/Flow/FacebookFlow.php   |  1 -
 Classes/Flowpack/OAuth2/Client/Flow/GoogleFlow.php |  1 -
 .../OAuth2/Client/Provider/FacebookProvider.php    | 10 ----------
 .../OAuth2/Client/Provider/GoogleProvider.php      | 14 --------------
 4 files changed, 26 deletions(-)

diff --git a/Classes/Flowpack/OAuth2/Client/Flow/FacebookFlow.php b/Classes/Flowpack/OAuth2/Client/Flow/FacebookFlow.php
index c4d390a..29f3763 100644
--- a/Classes/Flowpack/OAuth2/Client/Flow/FacebookFlow.php
+++ b/Classes/Flowpack/OAuth2/Client/Flow/FacebookFlow.php
@@ -67,7 +67,6 @@ public function createPartyAndAttachToAccountFor(AbstractClientToken $token)
 
         $account = $token->getAccount();
         $account->setParty($party);
-        $this->accountRepository->update($account);
         $this->partyRepository->add($party);
 
         $this->persistenceManager->persistAll();
diff --git a/Classes/Flowpack/OAuth2/Client/Flow/GoogleFlow.php b/Classes/Flowpack/OAuth2/Client/Flow/GoogleFlow.php
index 458aea3..48eeb32 100644
--- a/Classes/Flowpack/OAuth2/Client/Flow/GoogleFlow.php
+++ b/Classes/Flowpack/OAuth2/Client/Flow/GoogleFlow.php
@@ -59,7 +59,6 @@ public function createPartyAndAttachToAccountFor(AbstractClientToken $token)
 
         $account = $token->getAccount();
         $account->setParty($party);
-        $this->accountRepository->update($account);
         $this->partyRepository->add($party);
 
         $this->persistenceManager->persistAll();
diff --git a/Classes/Flowpack/OAuth2/Client/Provider/FacebookProvider.php b/Classes/Flowpack/OAuth2/Client/Provider/FacebookProvider.php
index cc58c26..5b84fc4 100644
--- a/Classes/Flowpack/OAuth2/Client/Provider/FacebookProvider.php
+++ b/Classes/Flowpack/OAuth2/Client/Provider/FacebookProvider.php
@@ -36,12 +36,6 @@ class FacebookProvider extends AbstractClientProvider
      */
     protected $policyService;
 
-    /**
-     * @Flow\Inject
-     * @var \Neos\Flow\Security\AccountRepository
-     */
-    protected $accountRepository;
-
     /**
      * @Flow\Inject
      * @var \Neos\Flow\Security\Context
@@ -106,10 +100,6 @@ public function authenticate(TokenInterface $authenticationToken)
         $account = null;
         $isNewCreatedAccount = false;
         $providerName = $this->name;
-        $accountRepository = $this->accountRepository;
-        $this->securityContext->withoutAuthorizationChecks(function () use ($tokenInformation, $providerName, $accountRepository, &$account) {
-            $account = $accountRepository->findByAccountIdentifierAndAuthenticationProviderName($tokenInformation['user_id'], $providerName);
-        });
 
         if ($account === null) {
             $account = new Account();
diff --git a/Classes/Flowpack/OAuth2/Client/Provider/GoogleProvider.php b/Classes/Flowpack/OAuth2/Client/Provider/GoogleProvider.php
index 6118447..58825b8 100644
--- a/Classes/Flowpack/OAuth2/Client/Provider/GoogleProvider.php
+++ b/Classes/Flowpack/OAuth2/Client/Provider/GoogleProvider.php
@@ -52,12 +52,6 @@ class GoogleProvider extends AbstractClientProvider
      */
     protected $policyService;
 
-    /**
-     * @Flow\Inject
-     * @var \Neos\Flow\Security\AccountRepository
-     */
-    protected $accountRepository;
-
     /**
      * @Flow\Inject
      * @var \Neos\Flow\Security\Context
@@ -111,10 +105,6 @@ public function authenticate(TokenInterface $authenticationToken)
         $account = null;
         $isNewCreatedAccount = false;
         $providerName = $this->name;
-        $accountRepository = $this->accountRepository;
-        $this->securityContext->withoutAuthorizationChecks(function () use ($tokenInformation, $providerName, $accountRepository, &$account) {
-            $account = $accountRepository->findByAccountIdentifierAndAuthenticationProviderName($tokenInformation['sub'], $providerName);
-        });
 
         if ($account === null) {
             $account = new Account();
@@ -129,7 +119,6 @@ public function authenticate(TokenInterface $authenticationToken)
                 $roles[] = $this->policyService->getRole($roleIdentifier);
             }
             $account->setRoles($roles);
-            $this->accountRepository->add($account);
         }
 
         $authenticationToken->setAccount($account);
@@ -139,9 +128,6 @@ public function authenticate(TokenInterface $authenticationToken)
         $account->setCredentialsSource($longLivedToken['access_token']);
         $account->authenticationAttempted(TokenInterface::AUTHENTICATION_SUCCESSFUL);
 
-        $this->accountRepository->update($account);
-        $this->persistenceManager->persistAll();
-
         // Only if defined a Party for the account is created
         if ($this->options['partyCreation'] && $isNewCreatedAccount) {
             $this->googleFlow->createPartyAndAttachToAccountFor($authenticationToken);