From fba583dae92288623b2d69033e8c33e962826534 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:48 +0200 Subject: [PATCH 01/75] TASK: Apply migration TYPO3.FLOW3-201201261636 Adjust to the major changes in FLOW3 1.1 when coming from 1.0. --- .../ContentRepositoryImporter/Aspect/EventLogAspect.php | 2 +- composer.json | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Classes/Ttree/ContentRepositoryImporter/Aspect/EventLogAspect.php b/Classes/Ttree/ContentRepositoryImporter/Aspect/EventLogAspect.php index 4a72f62..801585c 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Aspect/EventLogAspect.php +++ b/Classes/Ttree/ContentRepositoryImporter/Aspect/EventLogAspect.php @@ -8,7 +8,7 @@ use Ttree\ContentRepositoryImporter\Domain\Service\ImportService; use Ttree\ContentRepositoryImporter\Importer\ImporterInterface; use TYPO3\Flow\Annotations as Flow; -use TYPO3\Flow\AOP\JoinPointInterface; +use TYPO3\Flow\Aop\JoinPointInterface; use TYPO3\Flow\Log\SystemLoggerInterface; use TYPO3\Flow\Persistence\PersistenceManagerInterface; use TYPO3\Flow\Utility\Arrays; diff --git a/composer.json b/composer.json index b85686b..484ac39 100644 --- a/composer.json +++ b/composer.json @@ -12,5 +12,10 @@ "psr-0": { "Ttree\\ContentRepositoryImporter": "Classes" } + }, + "extra": { + "applied-flow-migrations": [ + "TYPO3.FLOW3-201201261636" + ] } -} +} \ No newline at end of file From 1081678517925727e64b6d54d180a076080ebe9e Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:48 +0200 Subject: [PATCH 02/75] 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 484ac39..03cd5a2 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,8 @@ }, "extra": { "applied-flow-migrations": [ - "TYPO3.FLOW3-201201261636" + "TYPO3.FLOW3-201201261636", + "TYPO3.Fluid-201205031303" ] } } \ No newline at end of file From 82fdb7c38d1776387b7d056a2b8cf8e56f6f2a1a Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:48 +0200 Subject: [PATCH 03/75] 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 03cd5a2..77c8113 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,8 @@ "extra": { "applied-flow-migrations": [ "TYPO3.FLOW3-201201261636", - "TYPO3.Fluid-201205031303" + "TYPO3.Fluid-201205031303", + "TYPO3.FLOW3-201205292145" ] } } \ No newline at end of file From 1b6eb28f113ccd3599fb84f5b836e7a0d1fd8565 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:48 +0200 Subject: [PATCH 04/75] 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 77c8113..2a77f15 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,8 @@ "applied-flow-migrations": [ "TYPO3.FLOW3-201201261636", "TYPO3.Fluid-201205031303", - "TYPO3.FLOW3-201205292145" + "TYPO3.FLOW3-201205292145", + "TYPO3.FLOW3-201206271128" ] } } \ No newline at end of file From 3a1185f0bb6f6f1ccee21de454c6c80f21733547 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:48 +0200 Subject: [PATCH 05/75] 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 2a77f15..9751b5f 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,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 a1f4d6181e185693148c8fe25b891bf84019fae4 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:48 +0200 Subject: [PATCH 06/75] 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 9751b5f..94c9111 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,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 cd0d22b0baeddfea758e6b562a818445be5fed66 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:48 +0200 Subject: [PATCH 07/75] 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 94c9111..dd7a6d5 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,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 434cf73e17e8f4b1109f1b0465b0e69a65526ac1 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:48 +0200 Subject: [PATCH 08/75] 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 dd7a6d5..beb0a37 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,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 6fef21f5c485c54a5650e4e5e8c6774f0079d75b Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:48 +0200 Subject: [PATCH 09/75] 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 beb0a37..852c8d9 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,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 ee236706e49ca1d0bf01477380b505d99bb49dfe Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:48 +0200 Subject: [PATCH 10/75] 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 852c8d9..5894e8c 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,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 aa3a14359f9e43e39cab44bcf14ab356cbea027a Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:48 +0200 Subject: [PATCH 11/75] 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 5894e8c..3ceec74 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,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 2d2671578ade80ad0214a45f29ec0721d21c212b Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:48 +0200 Subject: [PATCH 12/75] TASK: Apply migration TYPO3.Neos.NodeTypes-201309111655 Change node type and TS object names in NodeTypes.yaml and PHP code. 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 3ceec74..a76c981 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,8 @@ "TYPO3.Flow-201212051340", "TYPO3.TypoScript-130516234520", "TYPO3.TypoScript-130516235550", - "TYPO3.TYPO3CR-130523180140" + "TYPO3.TYPO3CR-130523180140", + "TYPO3.Neos.NodeTypes-201309111655" ] } } \ No newline at end of file From 3f02e2d6b207643577152880c94f814f3725c4de Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:48 +0200 Subject: [PATCH 13/75] 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 a76c981..722388f 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,8 @@ "TYPO3.TypoScript-130516234520", "TYPO3.TypoScript-130516235550", "TYPO3.TYPO3CR-130523180140", - "TYPO3.Neos.NodeTypes-201309111655" + "TYPO3.Neos.NodeTypes-201309111655", + "TYPO3.Flow-201310031523" ] } } \ No newline at end of file From d85cc20d90e12992cde9ad4dfb1351e9cf4b23ec Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:49 +0200 Subject: [PATCH 14/75] 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 722388f..e8d1afb 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,8 @@ "TYPO3.TypoScript-130516235550", "TYPO3.TYPO3CR-130523180140", "TYPO3.Neos.NodeTypes-201309111655", - "TYPO3.Flow-201310031523" + "TYPO3.Flow-201310031523", + "TYPO3.Flow-201405111147" ] } } \ No newline at end of file From 49942a5e34684c443156522e8b2b0830e2793053 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:49 +0200 Subject: [PATCH 15/75] TASK: Apply migration TYPO3.Neos-201407061038 Adjust to updated date format for inspector date editor 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 e8d1afb..c70d1a5 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,8 @@ "TYPO3.TYPO3CR-130523180140", "TYPO3.Neos.NodeTypes-201309111655", "TYPO3.Flow-201310031523", - "TYPO3.Flow-201405111147" + "TYPO3.Flow-201405111147", + "TYPO3.Neos-201407061038" ] } } \ No newline at end of file From df36d90dcb105680b2416acf3ce274e1a5d6da6e Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:49 +0200 Subject: [PATCH 16/75] 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 c70d1a5..9be8d26 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,8 @@ "TYPO3.Neos.NodeTypes-201309111655", "TYPO3.Flow-201310031523", "TYPO3.Flow-201405111147", - "TYPO3.Neos-201407061038" + "TYPO3.Neos-201407061038", + "TYPO3.Neos-201409071922" ] } } \ No newline at end of file From aa523c326cf4ed5f66dbcfb51dd964b746357e02 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:49 +0200 Subject: [PATCH 17/75] 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 9be8d26..e11e358 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,8 @@ "TYPO3.Flow-201310031523", "TYPO3.Flow-201405111147", "TYPO3.Neos-201407061038", - "TYPO3.Neos-201409071922" + "TYPO3.Neos-201409071922", + "TYPO3.TYPO3CR-140911160326" ] } } \ No newline at end of file From e467fc6dc6986ba1de9034c507a2fae53cf4da13 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:49 +0200 Subject: [PATCH 18/75] 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 e11e358..810bff3 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,8 @@ "TYPO3.Flow-201405111147", "TYPO3.Neos-201407061038", "TYPO3.Neos-201409071922", - "TYPO3.TYPO3CR-140911160326" + "TYPO3.TYPO3CR-140911160326", + "TYPO3.Neos-201410010000" ] } } \ No newline at end of file From 6b534f2066dbbfc988aa241145b1ce6b5e23224d Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:49 +0200 Subject: [PATCH 19/75] 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 810bff3..66dfc60 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,8 @@ "TYPO3.Neos-201407061038", "TYPO3.Neos-201409071922", "TYPO3.TYPO3CR-140911160326", - "TYPO3.Neos-201410010000" + "TYPO3.Neos-201410010000", + "TYPO3.TYPO3CR-141101082142" ] } } \ No newline at end of file From d2b1273070667e57a2c2dc5aa9d93efde2048e30 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:49 +0200 Subject: [PATCH 20/75] TASK: Apply migration TYPO3.Neos-20141113115300 Rename setting TYPO3.Neos.modules..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 66dfc60..86f3e70 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,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 bae792f68f19ef8ae7bd9086be1961a42456d2ea Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:49 +0200 Subject: [PATCH 21/75] 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 86f3e70..9c567e7 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,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 e3446f74feab78015e1fd072f3a4ee2348ac6f79 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:49 +0200 Subject: [PATCH 22/75] 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 9c567e7..100216d 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,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 cfa593d4c28451ea81d1d64dfe9608f0b14d788c Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:49 +0200 Subject: [PATCH 23/75] 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 100216d..9410c2e 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,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 f196bbdcd93f605e0f4b23a23c6c71079a254558 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:49 +0200 Subject: [PATCH 24/75] 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 9410c2e..752c6f3 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,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 a981b00a0a96599b8e002e9448a4d1d2e951e33f Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:49 +0200 Subject: [PATCH 25/75] 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 752c6f3..988e461 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,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 82f3d8ea3643d7b082bc3cd017eea2c408904045 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:49 +0200 Subject: [PATCH 26/75] 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 988e461..439b8de 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,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 6f35b068c67c311813eafb3ec11b5230547e584c Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:49 +0200 Subject: [PATCH 27/75] 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 439b8de..9d33b11 100644 --- a/composer.json +++ b/composer.json @@ -40,7 +40,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 a1a277cbcf19cc2ce2b8849537bce4427e1309a4 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:49 +0200 Subject: [PATCH 28/75] 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 9d33b11..4eb2c70 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,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 f7885932581147f48b11b6a4ec622908a5c7258a Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:49 +0200 Subject: [PATCH 29/75] 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 4eb2c70..8a5b1ad 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,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 2e36a8e9f8601d5d95c13056079e06cd2352cfc6 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:49 +0200 Subject: [PATCH 30/75] TASK: Apply migration TYPO3.Flow-20161115140400 Adjust to the renaming of the Resource namespace and class in Flow 4.0 --- .../ContentRepositoryImporter/DataType/ExternalResource.php | 4 ++-- composer.json | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/ExternalResource.php b/Classes/Ttree/ContentRepositoryImporter/DataType/ExternalResource.php index 07167ec..4d0850c 100644 --- a/Classes/Ttree/ContentRepositoryImporter/DataType/ExternalResource.php +++ b/Classes/Ttree/ContentRepositoryImporter/DataType/ExternalResource.php @@ -9,7 +9,7 @@ use TYPO3\Flow\Annotations as Flow; use TYPO3\Flow\Exception; use TYPO3\Flow\Log\SystemLoggerInterface; -use TYPO3\Flow\Resource\ResourceManager; +use TYPO3\Flow\ResourceManagement\ResourceManager; use TYPO3\Flow\Utility\Files; use TYPO3\Flow\Utility\MediaTypes; @@ -62,7 +62,7 @@ public function disableForceDownload() /** * @param string $value * @throws Exception - * @throws \TYPO3\Flow\Resource\Exception + * @throws \TYPO3\Flow\ResourceManagement\Exception * @throws \TYPO3\Flow\Utility\Exception */ protected function initializeValue($value) diff --git a/composer.json b/composer.json index 8a5b1ad..9535c82 100644 --- a/composer.json +++ b/composer.json @@ -43,7 +43,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 eef25c84c94b7e8bcc70c3bd9364231b880e0772 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:49 +0200 Subject: [PATCH 31/75] TASK: Apply migration TYPO3.Flow-20161115140430 Adjust to the renaming of the Object namespace in Flow 4.0 --- .../Command/ImportCommandController.php | 2 +- .../Ttree/ContentRepositoryImporter/Domain/Model/Import.php | 2 +- composer.json | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Classes/Ttree/ContentRepositoryImporter/Command/ImportCommandController.php b/Classes/Ttree/ContentRepositoryImporter/Command/ImportCommandController.php index 45bb6fa..f4464c0 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Command/ImportCommandController.php +++ b/Classes/Ttree/ContentRepositoryImporter/Command/ImportCommandController.php @@ -16,7 +16,7 @@ use TYPO3\Flow\Core\Booting\Scripts; use TYPO3\Flow\Exception; use TYPO3\Flow\Log\SystemLoggerInterface; -use TYPO3\Flow\Object\ObjectManagerInterface; +use TYPO3\Flow\ObjectManagement\ObjectManagerInterface; use TYPO3\Flow\Utility\Arrays; use TYPO3\Neos\EventLog\Domain\Service\EventEmittingService; diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Import.php b/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Import.php index 594a586..41846dd 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Import.php +++ b/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Import.php @@ -9,7 +9,7 @@ use TYPO3\Flow\Annotations as Flow; use TYPO3\Flow\Exception; use TYPO3\Flow\Log\SystemLoggerInterface; -use TYPO3\Flow\Object\ObjectManagerInterface; +use TYPO3\Flow\ObjectManagement\ObjectManagerInterface; use TYPO3\Neos\EventLog\Domain\Service\EventEmittingService; /** diff --git a/composer.json b/composer.json index 9535c82..1967473 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,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 ba405b0e4bbf170af3d519004f8d46452805215a Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:49 +0200 Subject: [PATCH 32/75] TASK: Apply migration Neos.Flow-20161124204700 Adjusts code to package renaming from "TYPO3.Flow" to "Neos.Flow" --- .../Aspect/EventLogAspect.php | 10 +++++----- .../Command/ImportCommandController.php | 18 +++++++++--------- .../DataProvider/AbstractDataProvider.php | 4 ++-- .../AbstractDatabaseDataProvider.php | 2 +- .../DataProvider/CsvDataProvider.php | 4 ++-- .../DataProvider/DataProviderInterface.php | 2 +- .../DataType/DataType.php | 4 ++-- .../DataType/DataTypeInterface.php | 2 +- .../DataType/Date.php | 2 +- .../DataType/ExternalResource.php | 16 ++++++++-------- .../DataType/HtmlContent.php | 4 ++-- .../DataType/Integer.php | 2 +- .../DataType/Slug.php | 2 +- .../DataType/StringValue.php | 2 +- .../Domain/Model/Event.php | 2 +- .../Domain/Model/Import.php | 8 ++++---- .../Domain/Model/PresetPartDefinition.php | 2 +- .../Domain/Model/RecordMapping.php | 2 +- .../Domain/Repository/EventRepository.php | 2 +- .../Domain/Repository/ImportRepository.php | 4 ++-- .../Repository/RecordMappingRepository.php | 4 ++-- .../Domain/Service/ImportService.php | 8 ++++---- .../ImportAlreadyExecutedException.php | 4 ++-- .../Exception/InvalidArgumentException.php | 4 ++-- .../Importer/AbstractCommandBasedImporter.php | 2 +- .../Importer/AbstractImporter.php | 8 ++++---- .../Importer/ImporterInterface.php | 2 +- .../Service/ProcessedNodeService.php | 2 +- Configuration/Objects.yaml | 6 +++--- Migrations/Mysql/Version20150317235257.php | 2 +- Migrations/Mysql/Version20150319132414.php | 2 +- Migrations/Mysql/Version20160523202439.php | 2 +- composer.json | 3 ++- 33 files changed, 72 insertions(+), 71 deletions(-) diff --git a/Classes/Ttree/ContentRepositoryImporter/Aspect/EventLogAspect.php b/Classes/Ttree/ContentRepositoryImporter/Aspect/EventLogAspect.php index 801585c..b2f8ddd 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Aspect/EventLogAspect.php +++ b/Classes/Ttree/ContentRepositoryImporter/Aspect/EventLogAspect.php @@ -7,11 +7,11 @@ use Ttree\ContentRepositoryImporter\Domain\Service\ImportService; use Ttree\ContentRepositoryImporter\Importer\ImporterInterface; -use TYPO3\Flow\Annotations as Flow; -use TYPO3\Flow\Aop\JoinPointInterface; -use TYPO3\Flow\Log\SystemLoggerInterface; -use TYPO3\Flow\Persistence\PersistenceManagerInterface; -use TYPO3\Flow\Utility\Arrays; +use Neos\Flow\Annotations as Flow; +use Neos\Flow\Aop\JoinPointInterface; +use Neos\Flow\Log\SystemLoggerInterface; +use Neos\Flow\Persistence\PersistenceManagerInterface; +use Neos\Flow\Utility\Arrays; use TYPO3\TYPO3CR\Domain\Repository\NodeDataRepository; /** diff --git a/Classes/Ttree/ContentRepositoryImporter/Command/ImportCommandController.php b/Classes/Ttree/ContentRepositoryImporter/Command/ImportCommandController.php index f4464c0..3972af8 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Command/ImportCommandController.php +++ b/Classes/Ttree/ContentRepositoryImporter/Command/ImportCommandController.php @@ -11,13 +11,13 @@ use Ttree\ContentRepositoryImporter\Domain\Service\ImportService; use Ttree\ContentRepositoryImporter\Exception\ImportAlreadyExecutedException; use Ttree\ContentRepositoryImporter\Importer\AbstractImporter; -use TYPO3\Flow\Annotations as Flow; -use TYPO3\Flow\Cli\CommandController; -use TYPO3\Flow\Core\Booting\Scripts; -use TYPO3\Flow\Exception; -use TYPO3\Flow\Log\SystemLoggerInterface; -use TYPO3\Flow\ObjectManagement\ObjectManagerInterface; -use TYPO3\Flow\Utility\Arrays; +use Neos\Flow\Annotations as Flow; +use Neos\Flow\Cli\CommandController; +use Neos\Flow\Core\Booting\Scripts; +use Neos\Flow\Exception; +use Neos\Flow\Log\SystemLoggerInterface; +use Neos\Flow\ObjectManagement\ObjectManagerInterface; +use Neos\Flow\Utility\Arrays; use TYPO3\Neos\EventLog\Domain\Service\EventEmittingService; /** @@ -40,7 +40,7 @@ class ImportCommandController extends CommandController protected $eventLogRepository; /** - * @Flow\InjectConfiguration(package="TYPO3.Flow") + * @Flow\InjectConfiguration(package="Neos.Flow") * @var array */ protected $flowSettings; @@ -273,7 +273,7 @@ public function flushEventLogCommand() * * @param array $presetSettings * @param string $preset - * @throws \TYPO3\Flow\Mvc\Exception\StopActionException + * @throws \Neos\Flow\Mvc\Exception\StopActionException */ protected function checkForPartsSettingsOrQuit(array $presetSettings, $preset) { diff --git a/Classes/Ttree/ContentRepositoryImporter/DataProvider/AbstractDataProvider.php b/Classes/Ttree/ContentRepositoryImporter/DataProvider/AbstractDataProvider.php index cf69b3e..21642f1 100644 --- a/Classes/Ttree/ContentRepositoryImporter/DataProvider/AbstractDataProvider.php +++ b/Classes/Ttree/ContentRepositoryImporter/DataProvider/AbstractDataProvider.php @@ -6,8 +6,8 @@ */ use Ttree\ContentRepositoryImporter\Service\ProcessedNodeService; -use TYPO3\Flow\Annotations as Flow; -use TYPO3\Flow\Log\SystemLoggerInterface; +use Neos\Flow\Annotations as Flow; +use Neos\Flow\Log\SystemLoggerInterface; /** * Abstract Data Provider diff --git a/Classes/Ttree/ContentRepositoryImporter/DataProvider/AbstractDatabaseDataProvider.php b/Classes/Ttree/ContentRepositoryImporter/DataProvider/AbstractDatabaseDataProvider.php index 65214b5..46df8be 100644 --- a/Classes/Ttree/ContentRepositoryImporter/DataProvider/AbstractDatabaseDataProvider.php +++ b/Classes/Ttree/ContentRepositoryImporter/DataProvider/AbstractDatabaseDataProvider.php @@ -8,7 +8,7 @@ use Doctrine\DBAL\Configuration; use Doctrine\DBAL\Connection; use Doctrine\DBAL\DriverManager; -use TYPO3\Flow\Annotations as Flow; +use Neos\Flow\Annotations as Flow; /** * Database based Data Provider diff --git a/Classes/Ttree/ContentRepositoryImporter/DataProvider/CsvDataProvider.php b/Classes/Ttree/ContentRepositoryImporter/DataProvider/CsvDataProvider.php index 1af7087..d0a7405 100644 --- a/Classes/Ttree/ContentRepositoryImporter/DataProvider/CsvDataProvider.php +++ b/Classes/Ttree/ContentRepositoryImporter/DataProvider/CsvDataProvider.php @@ -7,8 +7,8 @@ use Ttree\ContentRepositoryImporter\Exception\InvalidArgumentException; use Ttree\ContentRepositoryImporter\Service\ProcessedNodeService; -use TYPO3\Flow\Annotations as Flow; -use TYPO3\Flow\Log\SystemLoggerInterface; +use Neos\Flow\Annotations as Flow; +use Neos\Flow\Log\SystemLoggerInterface; /** * Csv Data Provider diff --git a/Classes/Ttree/ContentRepositoryImporter/DataProvider/DataProviderInterface.php b/Classes/Ttree/ContentRepositoryImporter/DataProvider/DataProviderInterface.php index d58efbb..6640cc0 100644 --- a/Classes/Ttree/ContentRepositoryImporter/DataProvider/DataProviderInterface.php +++ b/Classes/Ttree/ContentRepositoryImporter/DataProvider/DataProviderInterface.php @@ -5,7 +5,7 @@ * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter". */ -use TYPO3\Flow\Annotations as Flow; +use Neos\Flow\Annotations as Flow; /** * Data Provider Interface diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/DataType.php b/Classes/Ttree/ContentRepositoryImporter/DataType/DataType.php index 09335d5..7622d48 100644 --- a/Classes/Ttree/ContentRepositoryImporter/DataType/DataType.php +++ b/Classes/Ttree/ContentRepositoryImporter/DataType/DataType.php @@ -5,8 +5,8 @@ * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter". */ -use TYPO3\Flow\Annotations as Flow; -use TYPO3\Flow\Configuration\ConfigurationManager; +use Neos\Flow\Annotations as Flow; +use Neos\Flow\Configuration\ConfigurationManager; /** * String Data Type diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/DataTypeInterface.php b/Classes/Ttree/ContentRepositoryImporter/DataType/DataTypeInterface.php index 841d7f3..3b2d284 100644 --- a/Classes/Ttree/ContentRepositoryImporter/DataType/DataTypeInterface.php +++ b/Classes/Ttree/ContentRepositoryImporter/DataType/DataTypeInterface.php @@ -5,7 +5,7 @@ * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter". */ -use TYPO3\Flow\Annotations as Flow; +use Neos\Flow\Annotations as Flow; /** * Data Type Interface diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/Date.php b/Classes/Ttree/ContentRepositoryImporter/DataType/Date.php index 566fef3..73835fe 100644 --- a/Classes/Ttree/ContentRepositoryImporter/DataType/Date.php +++ b/Classes/Ttree/ContentRepositoryImporter/DataType/Date.php @@ -5,7 +5,7 @@ * This script belongs to the TYPO3 Flow package "Ttree.ContentRepositoryImporter". * * */ -use TYPO3\Flow\Annotations as Flow; +use Neos\Flow\Annotations as Flow; /** * Date Data Type diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/ExternalResource.php b/Classes/Ttree/ContentRepositoryImporter/DataType/ExternalResource.php index 4d0850c..b187640 100644 --- a/Classes/Ttree/ContentRepositoryImporter/DataType/ExternalResource.php +++ b/Classes/Ttree/ContentRepositoryImporter/DataType/ExternalResource.php @@ -6,12 +6,12 @@ */ use Gedmo\Uploadable\MimeType\MimeTypeGuesser; -use TYPO3\Flow\Annotations as Flow; -use TYPO3\Flow\Exception; -use TYPO3\Flow\Log\SystemLoggerInterface; -use TYPO3\Flow\ResourceManagement\ResourceManager; -use TYPO3\Flow\Utility\Files; -use TYPO3\Flow\Utility\MediaTypes; +use Neos\Flow\Annotations as Flow; +use Neos\Flow\Exception; +use Neos\Flow\Log\SystemLoggerInterface; +use Neos\Flow\ResourceManagement\ResourceManager; +use Neos\Flow\Utility\Files; +use Neos\Flow\Utility\MediaTypes; /** * String Data Type @@ -62,8 +62,8 @@ public function disableForceDownload() /** * @param string $value * @throws Exception - * @throws \TYPO3\Flow\ResourceManagement\Exception - * @throws \TYPO3\Flow\Utility\Exception + * @throws \Neos\Flow\ResourceManagement\Exception + * @throws \Neos\Flow\Utility\Exception */ protected function initializeValue($value) { diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/HtmlContent.php b/Classes/Ttree/ContentRepositoryImporter/DataType/HtmlContent.php index 180f96e..d689b1d 100644 --- a/Classes/Ttree/ContentRepositoryImporter/DataType/HtmlContent.php +++ b/Classes/Ttree/ContentRepositoryImporter/DataType/HtmlContent.php @@ -5,8 +5,8 @@ * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter". */ -use TYPO3\Flow\Annotations as Flow; -use TYPO3\Flow\Utility\Arrays; +use Neos\Flow\Annotations as Flow; +use Neos\Flow\Utility\Arrays; /** * String Data Type diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/Integer.php b/Classes/Ttree/ContentRepositoryImporter/DataType/Integer.php index 78d49e3..aabbda1 100644 --- a/Classes/Ttree/ContentRepositoryImporter/DataType/Integer.php +++ b/Classes/Ttree/ContentRepositoryImporter/DataType/Integer.php @@ -5,7 +5,7 @@ * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter". */ -use TYPO3\Flow\Annotations as Flow; +use Neos\Flow\Annotations as Flow; /** * String Data Type diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/Slug.php b/Classes/Ttree/ContentRepositoryImporter/DataType/Slug.php index acd31f2..537da68 100644 --- a/Classes/Ttree/ContentRepositoryImporter/DataType/Slug.php +++ b/Classes/Ttree/ContentRepositoryImporter/DataType/Slug.php @@ -6,7 +6,7 @@ */ use Cocur\Slugify\Slugify; -use TYPO3\Flow\Annotations as Flow; +use Neos\Flow\Annotations as Flow; /** * String Data Type diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/StringValue.php b/Classes/Ttree/ContentRepositoryImporter/DataType/StringValue.php index 8403b4b..9dae9b6 100644 --- a/Classes/Ttree/ContentRepositoryImporter/DataType/StringValue.php +++ b/Classes/Ttree/ContentRepositoryImporter/DataType/StringValue.php @@ -5,7 +5,7 @@ * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter". */ -use TYPO3\Flow\Annotations as Flow; +use Neos\Flow\Annotations as Flow; /** * String Data Type diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Event.php b/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Event.php index e6d090e..5de47d1 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Event.php +++ b/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Event.php @@ -5,7 +5,7 @@ * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter". */ -use TYPO3\Flow\Annotations as Flow; +use Neos\Flow\Annotations as Flow; use TYPO3\Neos\EventLog\Domain\Model\NodeEvent; /** diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Import.php b/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Import.php index 41846dd..0ed04b6 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Import.php +++ b/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Import.php @@ -6,10 +6,10 @@ */ use Doctrine\ORM\Mapping as ORM; -use TYPO3\Flow\Annotations as Flow; -use TYPO3\Flow\Exception; -use TYPO3\Flow\Log\SystemLoggerInterface; -use TYPO3\Flow\ObjectManagement\ObjectManagerInterface; +use Neos\Flow\Annotations as Flow; +use Neos\Flow\Exception; +use Neos\Flow\Log\SystemLoggerInterface; +use Neos\Flow\ObjectManagement\ObjectManagerInterface; use TYPO3\Neos\EventLog\Domain\Service\EventEmittingService; /** diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/PresetPartDefinition.php b/Classes/Ttree/ContentRepositoryImporter/Domain/Model/PresetPartDefinition.php index 8638196..9f31e23 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/PresetPartDefinition.php +++ b/Classes/Ttree/ContentRepositoryImporter/Domain/Model/PresetPartDefinition.php @@ -6,7 +6,7 @@ */ use Ttree\ContentRepositoryImporter\Exception\InvalidArgumentException; -use TYPO3\Flow\Annotations as Flow; +use Neos\Flow\Annotations as Flow; /** * Preset Part Definition diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/RecordMapping.php b/Classes/Ttree/ContentRepositoryImporter/Domain/Model/RecordMapping.php index aedd367..375883e 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/RecordMapping.php +++ b/Classes/Ttree/ContentRepositoryImporter/Domain/Model/RecordMapping.php @@ -6,7 +6,7 @@ */ use Doctrine\ORM\Mapping as ORM; -use TYPO3\Flow\Annotations as Flow; +use Neos\Flow\Annotations as Flow; use Gedmo\Mapping\Annotation as Gedmo; /** diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/EventRepository.php b/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/EventRepository.php index 7c52dba..e899ec4 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/EventRepository.php +++ b/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/EventRepository.php @@ -5,7 +5,7 @@ * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter". */ -use TYPO3\Flow\Annotations as Flow; +use Neos\Flow\Annotations as Flow; /** * @Flow\Scope("singleton") diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/ImportRepository.php b/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/ImportRepository.php index 719ef41..f5a4c44 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/ImportRepository.php +++ b/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/ImportRepository.php @@ -6,8 +6,8 @@ */ use Doctrine\Common\Persistence\ObjectManager; -use TYPO3\Flow\Annotations as Flow; -use TYPO3\Flow\Persistence\Repository; +use Neos\Flow\Annotations as Flow; +use Neos\Flow\Persistence\Repository; /** * @Flow\Scope("singleton") diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/RecordMappingRepository.php b/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/RecordMappingRepository.php index 65dbfc7..d614aad 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/RecordMappingRepository.php +++ b/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/RecordMappingRepository.php @@ -7,8 +7,8 @@ use Doctrine\Common\Persistence\ObjectManager; use Ttree\ContentRepositoryImporter\Domain\Model\RecordMapping; -use TYPO3\Flow\Annotations as Flow; -use TYPO3\Flow\Persistence\Repository; +use Neos\Flow\Annotations as Flow; +use Neos\Flow\Persistence\Repository; /** * @Flow\Scope("singleton") diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Service/ImportService.php b/Classes/Ttree/ContentRepositoryImporter/Domain/Service/ImportService.php index b58f978..360c4be 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Domain/Service/ImportService.php +++ b/Classes/Ttree/ContentRepositoryImporter/Domain/Service/ImportService.php @@ -12,9 +12,9 @@ use Ttree\ContentRepositoryImporter\Domain\Repository\ImportRepository; use Ttree\ContentRepositoryImporter\Domain\Repository\RecordMappingRepository; use Ttree\ContentRepositoryImporter\Exception\ImportAlreadyExecutedException; -use TYPO3\Flow\Annotations as Flow; -use TYPO3\Flow\Exception; -use TYPO3\Flow\Persistence\PersistenceManagerInterface; +use Neos\Flow\Annotations as Flow; +use Neos\Flow\Exception; +use Neos\Flow\Persistence\PersistenceManagerInterface; /** * @Flow\Scope("singleton") @@ -67,7 +67,7 @@ public function resume($identifier) * @param string $externalImportIdentifier * @param boolean $force * @throws Exception - * @throws \TYPO3\Flow\Persistence\Exception\IllegalObjectTypeException + * @throws \Neos\Flow\Persistence\Exception\IllegalObjectTypeException */ public function start($externalImportIdentifier = null, $force = false) { diff --git a/Classes/Ttree/ContentRepositoryImporter/Exception/ImportAlreadyExecutedException.php b/Classes/Ttree/ContentRepositoryImporter/Exception/ImportAlreadyExecutedException.php index 910b84b..bd8182a 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Exception/ImportAlreadyExecutedException.php +++ b/Classes/Ttree/ContentRepositoryImporter/Exception/ImportAlreadyExecutedException.php @@ -5,8 +5,8 @@ * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter". */ -use TYPO3\Flow\Annotations as Flow; -use TYPO3\Flow\Exception; +use Neos\Flow\Annotations as Flow; +use Neos\Flow\Exception; /** * Import Already Executed Exception diff --git a/Classes/Ttree/ContentRepositoryImporter/Exception/InvalidArgumentException.php b/Classes/Ttree/ContentRepositoryImporter/Exception/InvalidArgumentException.php index 625ebd1..2a31bfa 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Exception/InvalidArgumentException.php +++ b/Classes/Ttree/ContentRepositoryImporter/Exception/InvalidArgumentException.php @@ -5,8 +5,8 @@ * This script belongs to the Neos Flow package "Ttree.ContentRepositoryImporter". */ -use TYPO3\Flow\Annotations as Flow; -use TYPO3\Flow\Exception; +use Neos\Flow\Annotations as Flow; +use Neos\Flow\Exception; /** * Invalid Argument Exception diff --git a/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractCommandBasedImporter.php b/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractCommandBasedImporter.php index 7fee090..a3fa51d 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractCommandBasedImporter.php +++ b/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractCommandBasedImporter.php @@ -6,7 +6,7 @@ */ use Ttree\ContentRepositoryImporter\DataType\Slug; -use TYPO3\Flow\Annotations as Flow; +use Neos\Flow\Annotations as Flow; use TYPO3\TYPO3CR\Domain\Model\NodeTemplate; /** diff --git a/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractImporter.php b/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractImporter.php index 7f5b489..8f00c10 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractImporter.php +++ b/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractImporter.php @@ -11,10 +11,10 @@ use Ttree\ContentRepositoryImporter\Domain\Model\RecordMapping; use Ttree\ContentRepositoryImporter\Domain\Service\ImportService; use Ttree\ContentRepositoryImporter\Service\ProcessedNodeService; -use TYPO3\Flow\Annotations as Flow; -use TYPO3\Flow\Exception; -use TYPO3\Flow\Log\SystemLoggerInterface; -use TYPO3\Flow\Utility\Arrays; +use Neos\Flow\Annotations as Flow; +use Neos\Flow\Exception; +use Neos\Flow\Log\SystemLoggerInterface; +use Neos\Flow\Utility\Arrays; use TYPO3\TYPO3CR\Domain\Model\NodeInterface; use TYPO3\TYPO3CR\Domain\Model\NodeTemplate; use TYPO3\TYPO3CR\Domain\Model\NodeType; diff --git a/Classes/Ttree/ContentRepositoryImporter/Importer/ImporterInterface.php b/Classes/Ttree/ContentRepositoryImporter/Importer/ImporterInterface.php index 0f5a5bf..5897a8f 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Importer/ImporterInterface.php +++ b/Classes/Ttree/ContentRepositoryImporter/Importer/ImporterInterface.php @@ -8,7 +8,7 @@ use Ttree\ContentRepositoryImporter\DataProvider\DataProviderInterface; use Ttree\ContentRepositoryImporter\Domain\Model\Event; use Ttree\ContentRepositoryImporter\Domain\Service\ImportService; -use TYPO3\Flow\Annotations as Flow; +use Neos\Flow\Annotations as Flow; use TYPO3\TYPO3CR\Domain\Model\NodeTemplate; /** diff --git a/Classes/Ttree/ContentRepositoryImporter/Service/ProcessedNodeService.php b/Classes/Ttree/ContentRepositoryImporter/Service/ProcessedNodeService.php index 06a1f72..86d1425 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Service/ProcessedNodeService.php +++ b/Classes/Ttree/ContentRepositoryImporter/Service/ProcessedNodeService.php @@ -8,7 +8,7 @@ use Ttree\ContentRepositoryImporter\Domain\Model\RecordMapping; use Ttree\ContentRepositoryImporter\Domain\Repository\RecordMappingRepository; use Ttree\ContentRepositoryImporter\Domain\Service\ImportService; -use TYPO3\Flow\Annotations as Flow; +use Neos\Flow\Annotations as Flow; /** * Processed Node Service diff --git a/Configuration/Objects.yaml b/Configuration/Objects.yaml index 6c0ff6b..4d5c14b 100644 --- a/Configuration/Objects.yaml +++ b/Configuration/Objects.yaml @@ -2,7 +2,7 @@ Ttree\ContentRepositoryImporter\Service\ProcessedNodeService: properties: cache: object: - factoryObjectName: TYPO3\Flow\Cache\CacheManager + factoryObjectName: Neos\Flow\Cache\CacheManager factoryMethodName: getCache arguments: 1: @@ -12,7 +12,7 @@ Ttree\ContentRepositoryImporter\Command\ImportCommandController: properties: cache: object: - factoryObjectName: TYPO3\Flow\Cache\CacheManager + factoryObjectName: Neos\Flow\Cache\CacheManager factoryMethodName: getCache arguments: 1: @@ -22,7 +22,7 @@ Ttree\ContentRepositoryImporter\DataType\ExternalResource: properties: downloadCache: object: - factoryObjectName: TYPO3\Flow\Cache\CacheManager + factoryObjectName: Neos\Flow\Cache\CacheManager factoryMethodName: getCache arguments: 1: diff --git a/Migrations/Mysql/Version20150317235257.php b/Migrations/Mysql/Version20150317235257.php index 23c4193..2331e5f 100644 --- a/Migrations/Mysql/Version20150317235257.php +++ b/Migrations/Mysql/Version20150317235257.php @@ -1,5 +1,5 @@ Date: Wed, 12 Apr 2017 20:53:49 +0200 Subject: [PATCH 33/75] 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. --- .../Ttree/ContentRepositoryImporter/Aspect/EventLogAspect.php | 2 +- .../Command/ImportCommandController.php | 2 +- .../ContentRepositoryImporter/DataType/ExternalResource.php | 4 ++-- .../Ttree/ContentRepositoryImporter/DataType/HtmlContent.php | 2 +- .../ContentRepositoryImporter/Importer/AbstractImporter.php | 2 +- composer.json | 3 ++- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Classes/Ttree/ContentRepositoryImporter/Aspect/EventLogAspect.php b/Classes/Ttree/ContentRepositoryImporter/Aspect/EventLogAspect.php index b2f8ddd..5ff1927 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Aspect/EventLogAspect.php +++ b/Classes/Ttree/ContentRepositoryImporter/Aspect/EventLogAspect.php @@ -11,7 +11,7 @@ use Neos\Flow\Aop\JoinPointInterface; use Neos\Flow\Log\SystemLoggerInterface; use Neos\Flow\Persistence\PersistenceManagerInterface; -use Neos\Flow\Utility\Arrays; +use Neos\Utility\Arrays; use TYPO3\TYPO3CR\Domain\Repository\NodeDataRepository; /** diff --git a/Classes/Ttree/ContentRepositoryImporter/Command/ImportCommandController.php b/Classes/Ttree/ContentRepositoryImporter/Command/ImportCommandController.php index 3972af8..fa17213 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Command/ImportCommandController.php +++ b/Classes/Ttree/ContentRepositoryImporter/Command/ImportCommandController.php @@ -17,7 +17,7 @@ use Neos\Flow\Exception; use Neos\Flow\Log\SystemLoggerInterface; use Neos\Flow\ObjectManagement\ObjectManagerInterface; -use Neos\Flow\Utility\Arrays; +use Neos\Utility\Arrays; use TYPO3\Neos\EventLog\Domain\Service\EventEmittingService; /** diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/ExternalResource.php b/Classes/Ttree/ContentRepositoryImporter/DataType/ExternalResource.php index b187640..8e56212 100644 --- a/Classes/Ttree/ContentRepositoryImporter/DataType/ExternalResource.php +++ b/Classes/Ttree/ContentRepositoryImporter/DataType/ExternalResource.php @@ -10,8 +10,8 @@ use Neos\Flow\Exception; use Neos\Flow\Log\SystemLoggerInterface; use Neos\Flow\ResourceManagement\ResourceManager; -use Neos\Flow\Utility\Files; -use Neos\Flow\Utility\MediaTypes; +use Neos\Utility\Files; +use Neos\Utility\MediaTypes; /** * String Data Type diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/HtmlContent.php b/Classes/Ttree/ContentRepositoryImporter/DataType/HtmlContent.php index d689b1d..c495ac0 100644 --- a/Classes/Ttree/ContentRepositoryImporter/DataType/HtmlContent.php +++ b/Classes/Ttree/ContentRepositoryImporter/DataType/HtmlContent.php @@ -6,7 +6,7 @@ */ use Neos\Flow\Annotations as Flow; -use Neos\Flow\Utility\Arrays; +use Neos\Utility\Arrays; /** * String Data Type diff --git a/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractImporter.php b/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractImporter.php index 8f00c10..c231f2e 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractImporter.php +++ b/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractImporter.php @@ -14,7 +14,7 @@ use Neos\Flow\Annotations as Flow; use Neos\Flow\Exception; use Neos\Flow\Log\SystemLoggerInterface; -use Neos\Flow\Utility\Arrays; +use Neos\Utility\Arrays; use TYPO3\TYPO3CR\Domain\Model\NodeInterface; use TYPO3\TYPO3CR\Domain\Model\NodeTemplate; use TYPO3\TYPO3CR\Domain\Model\NodeType; diff --git a/composer.json b/composer.json index 5e9132c..be122f6 100644 --- a/composer.json +++ b/composer.json @@ -46,7 +46,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 475009907f1729204993f5a80fac73beb9fab94d Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:50 +0200 Subject: [PATCH 34/75] 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 be122f6..a5b8641 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,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 ea7b2b06bc03e730c7287666aa3db4c42e1656ae Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:50 +0200 Subject: [PATCH 35/75] 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 a5b8641..526cff5 100644 --- a/composer.json +++ b/composer.json @@ -48,7 +48,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 2a1ce2c4bfe0e2b3358879fe892394b63dfa8b79 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:50 +0200 Subject: [PATCH 36/75] 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 526cff5..6f06fbf 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,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 d65f1e3c20de11cb9c219cd9a6e1f3b86cf542a6 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:50 +0200 Subject: [PATCH 37/75] TASK: Apply migration Neos.Party-20161124225257 Adjusts code to package renaming from "TYPO3.Party" to "Neos.Party" 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 6f06fbf..a1e9cf6 100644 --- a/composer.json +++ b/composer.json @@ -50,7 +50,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 d81364d55d33da71ebe61521bfdbc0f657fee638 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:50 +0200 Subject: [PATCH 38/75] 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 a1e9cf6..aa7202b 100644 --- a/composer.json +++ b/composer.json @@ -51,7 +51,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 a9ddee93b46cd06bd9b615647441a0e76edff78a Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:50 +0200 Subject: [PATCH 39/75] TASK: Apply migration Neos.Kickstart-20161124230102 Adjusts code to Kickstarter 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 aa7202b..7e0001d 100644 --- a/composer.json +++ b/composer.json @@ -52,7 +52,8 @@ "Neos.Form-20161124205254", "Neos.Flow-20161124224015", "Neos.Party-20161124225257", - "Neos.Eel-20161124230101" + "Neos.Eel-20161124230101", + "Neos.Kickstart-20161124230102" ] } } \ No newline at end of file From ad38457f51b68a17f764003e43d66c95d7d60d43 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:50 +0200 Subject: [PATCH 40/75] 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 7e0001d..615ef3b 100644 --- a/composer.json +++ b/composer.json @@ -53,7 +53,8 @@ "Neos.Flow-20161124224015", "Neos.Party-20161124225257", "Neos.Eel-20161124230101", - "Neos.Kickstart-20161124230102" + "Neos.Kickstart-20161124230102", + "Neos.Setup-20161124230842" ] } } \ No newline at end of file From 30bd049610a66c892b0085278806876912f4509b Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:50 +0200 Subject: [PATCH 41/75] 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 615ef3b..e25b969 100644 --- a/composer.json +++ b/composer.json @@ -54,7 +54,8 @@ "Neos.Party-20161124225257", "Neos.Eel-20161124230101", "Neos.Kickstart-20161124230102", - "Neos.Setup-20161124230842" + "Neos.Setup-20161124230842", + "Neos.Imagine-20161124231742" ] } } \ No newline at end of file From dce05d0a55e516106341d04a9b77796acd68a64a Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:50 +0200 Subject: [PATCH 42/75] 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 e25b969..1cc37a5 100644 --- a/composer.json +++ b/composer.json @@ -55,7 +55,8 @@ "Neos.Eel-20161124230101", "Neos.Kickstart-20161124230102", "Neos.Setup-20161124230842", - "Neos.Imagine-20161124231742" + "Neos.Imagine-20161124231742", + "Neos.Media-20161124233100" ] } } \ No newline at end of file From a683f23f6aac3c634b8ec294332b2b949a1f92a7 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:50 +0200 Subject: [PATCH 43/75] TASK: Apply migration Neos.NodeTypes-20161125002300 Adjusts code to package renaming from "TYPO3.Neos.NodeTypes" to "Neos.NodeTypes" --- .../ContentRepositoryImporter/Importer/AbstractImporter.php | 2 +- composer.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractImporter.php b/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractImporter.php index c231f2e..1d4ddbe 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractImporter.php +++ b/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractImporter.php @@ -48,7 +48,7 @@ abstract class AbstractImporter implements ImporterInterface * * @var string */ - protected $storageNodeTypeName = 'TYPO3.Neos.NodeTypes:Page'; + protected $storageNodeTypeName = 'Neos.NodeTypes:Page'; /** * Key name for getExternalIdentifierFromRecordData() to determine the external identifier of a record diff --git a/composer.json b/composer.json index 1cc37a5..3770193 100644 --- a/composer.json +++ b/composer.json @@ -56,7 +56,8 @@ "Neos.Kickstart-20161124230102", "Neos.Setup-20161124230842", "Neos.Imagine-20161124231742", - "Neos.Media-20161124233100" + "Neos.Media-20161124233100", + "Neos.NodeTypes-20161125002300" ] } } \ No newline at end of file From 9c6dc3a4e1e474b81bae35622e7cafb2b6d6d381 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:50 +0200 Subject: [PATCH 44/75] TASK: Apply migration Neos.SiteKickstarter-20161125002311 Adjusts code to package renaming from "TYPO3.Neos.Kickstarter" to "Neos.SiteKickstarter" 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 3770193..50dcea4 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,8 @@ "Neos.Setup-20161124230842", "Neos.Imagine-20161124231742", "Neos.Media-20161124233100", - "Neos.NodeTypes-20161125002300" + "Neos.NodeTypes-20161125002300", + "Neos.SiteKickstarter-20161125002311" ] } } \ No newline at end of file From 39c06340e01b82a4ec1c13ad9b4e9e69f83207f4 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:50 +0200 Subject: [PATCH 45/75] TASK: Apply migration Neos.Neos-20161125002322 Adjusts code to package renaming from "TYPO3.Neos" to "Neos.Neos" --- .../Command/ImportCommandController.php | 2 +- .../Ttree/ContentRepositoryImporter/Domain/Model/Event.php | 2 +- .../Ttree/ContentRepositoryImporter/Domain/Model/Import.php | 4 ++-- .../Domain/Repository/EventRepository.php | 2 +- composer.json | 3 ++- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Classes/Ttree/ContentRepositoryImporter/Command/ImportCommandController.php b/Classes/Ttree/ContentRepositoryImporter/Command/ImportCommandController.php index fa17213..5573943 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Command/ImportCommandController.php +++ b/Classes/Ttree/ContentRepositoryImporter/Command/ImportCommandController.php @@ -18,7 +18,7 @@ use Neos\Flow\Log\SystemLoggerInterface; use Neos\Flow\ObjectManagement\ObjectManagerInterface; use Neos\Utility\Arrays; -use TYPO3\Neos\EventLog\Domain\Service\EventEmittingService; +use Neos\Neos\EventLog\Domain\Service\EventEmittingService; /** * Import Command Controller diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Event.php b/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Event.php index 5de47d1..17c364b 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Event.php +++ b/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Event.php @@ -6,7 +6,7 @@ */ use Neos\Flow\Annotations as Flow; -use TYPO3\Neos\EventLog\Domain\Model\NodeEvent; +use Neos\Neos\EventLog\Domain\Model\NodeEvent; /** * A specific event used by the ContentRepositoryImporter diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Import.php b/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Import.php index 0ed04b6..c3344a7 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Import.php +++ b/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Import.php @@ -10,7 +10,7 @@ use Neos\Flow\Exception; use Neos\Flow\Log\SystemLoggerInterface; use Neos\Flow\ObjectManagement\ObjectManagerInterface; -use TYPO3\Neos\EventLog\Domain\Service\EventEmittingService; +use Neos\Neos\EventLog\Domain\Service\EventEmittingService; /** * @Flow\Entity @@ -80,7 +80,7 @@ public function getExternalImportIdentifier() * @param array $data * @param Event $parentEvent * @return Event - * @throws \TYPO3\Neos\Exception + * @throws \Neos\Neos\Exception */ public function addEvent($eventType, $externalIdentifier = null, array $data = null, Event $parentEvent = null) { diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/EventRepository.php b/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/EventRepository.php index e899ec4..309129c 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/EventRepository.php +++ b/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/EventRepository.php @@ -10,7 +10,7 @@ /** * @Flow\Scope("singleton") */ -class EventRepository extends \TYPO3\Neos\EventLog\Domain\Repository\EventRepository +class EventRepository extends \Neos\Neos\EventLog\Domain\Repository\EventRepository { /** * Remove all events without checking foreign keys. Needed for clearing the table during tests. diff --git a/composer.json b/composer.json index 50dcea4..97859d3 100644 --- a/composer.json +++ b/composer.json @@ -58,7 +58,8 @@ "Neos.Imagine-20161124231742", "Neos.Media-20161124233100", "Neos.NodeTypes-20161125002300", - "Neos.SiteKickstarter-20161125002311" + "Neos.SiteKickstarter-20161125002311", + "Neos.Neos-20161125002322" ] } } \ No newline at end of file From d327f8d8cd20cada83e74a867269458d7cc76db8 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:50 +0200 Subject: [PATCH 46/75] TASK: Apply migration Neos.ContentRepository-20161125012000 Adjusts code to package renaming from "TYPO3.TYPO3CR" to "Neos.ContentRepository" --- .../Aspect/EventLogAspect.php | 2 +- .../Importer/AbstractCommandBasedImporter.php | 2 +- .../Importer/AbstractImporter.php | 16 ++++++++-------- .../Importer/ImporterInterface.php | 2 +- composer.json | 3 ++- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Classes/Ttree/ContentRepositoryImporter/Aspect/EventLogAspect.php b/Classes/Ttree/ContentRepositoryImporter/Aspect/EventLogAspect.php index 5ff1927..4521d8b 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Aspect/EventLogAspect.php +++ b/Classes/Ttree/ContentRepositoryImporter/Aspect/EventLogAspect.php @@ -12,7 +12,7 @@ use Neos\Flow\Log\SystemLoggerInterface; use Neos\Flow\Persistence\PersistenceManagerInterface; use Neos\Utility\Arrays; -use TYPO3\TYPO3CR\Domain\Repository\NodeDataRepository; +use Neos\ContentRepository\Domain\Repository\NodeDataRepository; /** * Aspect to automatically handle EventLog in Importer object diff --git a/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractCommandBasedImporter.php b/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractCommandBasedImporter.php index a3fa51d..9852b71 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractCommandBasedImporter.php +++ b/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractCommandBasedImporter.php @@ -7,7 +7,7 @@ use Ttree\ContentRepositoryImporter\DataType\Slug; use Neos\Flow\Annotations as Flow; -use TYPO3\TYPO3CR\Domain\Model\NodeTemplate; +use Neos\ContentRepository\Domain\Model\NodeTemplate; /** * A base importer for data providers which deliver data as commands (create, delete, update, ...) instead of plain diff --git a/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractImporter.php b/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractImporter.php index 1d4ddbe..3c0ccbf 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractImporter.php +++ b/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractImporter.php @@ -15,12 +15,12 @@ use Neos\Flow\Exception; use Neos\Flow\Log\SystemLoggerInterface; use Neos\Utility\Arrays; -use TYPO3\TYPO3CR\Domain\Model\NodeInterface; -use TYPO3\TYPO3CR\Domain\Model\NodeTemplate; -use TYPO3\TYPO3CR\Domain\Model\NodeType; -use TYPO3\TYPO3CR\Domain\Repository\NodeDataRepository; -use TYPO3\TYPO3CR\Domain\Service\ContextFactoryInterface; -use TYPO3\TYPO3CR\Domain\Service\NodeTypeManager; +use Neos\ContentRepository\Domain\Model\NodeInterface; +use Neos\ContentRepository\Domain\Model\NodeTemplate; +use Neos\ContentRepository\Domain\Model\NodeType; +use Neos\ContentRepository\Domain\Repository\NodeDataRepository; +use Neos\ContentRepository\Domain\Service\ContextFactoryInterface; +use Neos\ContentRepository\Domain\Service\NodeTypeManager; /** * Abstract Importer @@ -369,7 +369,7 @@ public function processRecord(NodeTemplate $nodeTemplate, array $data) /** * @param NodeTemplate $nodeTemplate - * @throws \TYPO3\TYPO3CR\Exception\NodeException + * @throws \Neos\ContentRepository\Exception\NodeException */ protected function unsetAllNodeTemplateProperties(NodeTemplate $nodeTemplate) { @@ -553,7 +553,7 @@ protected function getLabelFromRecordData(array $data) * @param string $nodePath Absolute or relative (to the site node) node path of the storage node * @param string $title Title for the storage node document * @return void - * @throws \TYPO3\TYPO3CR\Exception\NodeTypeNotFoundException + * @throws \Neos\ContentRepository\Exception\NodeTypeNotFoundException */ protected function initializeStorageNode($nodePath, $title) { diff --git a/Classes/Ttree/ContentRepositoryImporter/Importer/ImporterInterface.php b/Classes/Ttree/ContentRepositoryImporter/Importer/ImporterInterface.php index 5897a8f..62b6ad3 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Importer/ImporterInterface.php +++ b/Classes/Ttree/ContentRepositoryImporter/Importer/ImporterInterface.php @@ -9,7 +9,7 @@ use Ttree\ContentRepositoryImporter\Domain\Model\Event; use Ttree\ContentRepositoryImporter\Domain\Service\ImportService; use Neos\Flow\Annotations as Flow; -use TYPO3\TYPO3CR\Domain\Model\NodeTemplate; +use Neos\ContentRepository\Domain\Model\NodeTemplate; /** * Importer Interface diff --git a/composer.json b/composer.json index 97859d3..a9c31db 100644 --- a/composer.json +++ b/composer.json @@ -59,7 +59,8 @@ "Neos.Media-20161124233100", "Neos.NodeTypes-20161125002300", "Neos.SiteKickstarter-20161125002311", - "Neos.Neos-20161125002322" + "Neos.Neos-20161125002322", + "Neos.ContentRepository-20161125012000" ] } } \ No newline at end of file From 0cd4b825be03042215ab180788607f47a0303869 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:50 +0200 Subject: [PATCH 47/75] 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 a9c31db..7b21a92 100644 --- a/composer.json +++ b/composer.json @@ -60,7 +60,8 @@ "Neos.NodeTypes-20161125002300", "Neos.SiteKickstarter-20161125002311", "Neos.Neos-20161125002322", - "Neos.ContentRepository-20161125012000" + "Neos.ContentRepository-20161125012000", + "Neos.Fusion-20161125013710" ] } } \ No newline at end of file From 1f6956ee92c575a9654de47cee2b9287747ea05e Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:50 +0200 Subject: [PATCH 48/75] 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 7b21a92..54e5854 100644 --- a/composer.json +++ b/composer.json @@ -61,7 +61,8 @@ "Neos.SiteKickstarter-20161125002311", "Neos.Neos-20161125002322", "Neos.ContentRepository-20161125012000", - "Neos.Fusion-20161125013710" + "Neos.Fusion-20161125013710", + "Neos.Setup-20161125014759" ] } } \ No newline at end of file From 73c1112383b89e50b122b8406e4c6e23fd0c3630 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:50 +0200 Subject: [PATCH 49/75] TASK: Apply migration Neos.SiteKickstarter-20161125095901 Fix wronly renamed Neos.SiteKickstarter references. There was a replacement from "TYPO3.Neos" to "Neos.Neos"; which inadvertedly also got applied 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 54e5854..2857f40 100644 --- a/composer.json +++ b/composer.json @@ -62,7 +62,8 @@ "Neos.Neos-20161125002322", "Neos.ContentRepository-20161125012000", "Neos.Fusion-20161125013710", - "Neos.Setup-20161125014759" + "Neos.Setup-20161125014759", + "Neos.SiteKickstarter-20161125095901" ] } } \ No newline at end of file From 0be679c4ad4a2cadecd521ad1a11db5b4a1e2931 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:50 +0200 Subject: [PATCH 50/75] 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 2857f40..7c71f60 100644 --- a/composer.json +++ b/composer.json @@ -63,7 +63,8 @@ "Neos.ContentRepository-20161125012000", "Neos.Fusion-20161125013710", "Neos.Setup-20161125014759", - "Neos.SiteKickstarter-20161125095901" + "Neos.SiteKickstarter-20161125095901", + "Neos.Fusion-20161125104701" ] } } \ No newline at end of file From a908cbe6d6be916679f3a27799c1fceca5324c6f Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:50 +0200 Subject: [PATCH 51/75] TASK: Apply migration Neos.NodeTypes-20161125104800 Adjusts code to package renaming from "TYPO3.Neos.NodeTypes" to "Neos.NodeTypes" 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 7c71f60..05dadda 100644 --- a/composer.json +++ b/composer.json @@ -64,7 +64,8 @@ "Neos.Fusion-20161125013710", "Neos.Setup-20161125014759", "Neos.SiteKickstarter-20161125095901", - "Neos.Fusion-20161125104701" + "Neos.Fusion-20161125104701", + "Neos.NodeTypes-20161125104800" ] } } \ No newline at end of file From 3b634af7095aa5b49ff4bada20f04b8f0a4e8d78 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:50 +0200 Subject: [PATCH 52/75] 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 05dadda..6a1a07c 100644 --- a/composer.json +++ b/composer.json @@ -65,7 +65,8 @@ "Neos.Setup-20161125014759", "Neos.SiteKickstarter-20161125095901", "Neos.Fusion-20161125104701", - "Neos.NodeTypes-20161125104800" + "Neos.NodeTypes-20161125104800", + "Neos.Neos-20161125104802" ] } } \ No newline at end of file From a3b49f9206c5963a4d91433776907dea158be253 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:50 +0200 Subject: [PATCH 53/75] TASK: Apply migration Neos.Kickstarter-20161125110814 Adjusts code to Kickstarter 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 6a1a07c..fc43320 100644 --- a/composer.json +++ b/composer.json @@ -66,7 +66,8 @@ "Neos.SiteKickstarter-20161125095901", "Neos.Fusion-20161125104701", "Neos.NodeTypes-20161125104800", - "Neos.Neos-20161125104802" + "Neos.Neos-20161125104802", + "Neos.Kickstarter-20161125110814" ] } } \ No newline at end of file From 2a428893f4951e32747494cfbdcf61f30b2f69eb Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:51 +0200 Subject: [PATCH 54/75] 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 fc43320..0cea5dd 100644 --- a/composer.json +++ b/composer.json @@ -67,7 +67,8 @@ "Neos.Fusion-20161125104701", "Neos.NodeTypes-20161125104800", "Neos.Neos-20161125104802", - "Neos.Kickstarter-20161125110814" + "Neos.Kickstarter-20161125110814", + "Neos.Neos-20161125122412" ] } } \ No newline at end of file From 73a495d9e85798efdfc047f5624bc0249b4da2af Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:51 +0200 Subject: [PATCH 55/75] 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 0cea5dd..336cdd6 100644 --- a/composer.json +++ b/composer.json @@ -68,7 +68,8 @@ "Neos.NodeTypes-20161125104800", "Neos.Neos-20161125104802", "Neos.Kickstarter-20161125110814", - "Neos.Neos-20161125122412" + "Neos.Neos-20161125122412", + "Neos.Flow-20161125124112" ] } } \ No newline at end of file From 6204d9afcd1266a66d265129e1a4e521cded4d7a Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:51 +0200 Subject: [PATCH 56/75] TASK: Apply migration TYPO3.FluidAdaptor-20161130112935 Adjusts code to package renaming from "TYPO3.Fluid" to "Neos.FluidAdaptor". 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 336cdd6..136577f 100644 --- a/composer.json +++ b/composer.json @@ -69,7 +69,8 @@ "Neos.Neos-20161125104802", "Neos.Kickstarter-20161125110814", "Neos.Neos-20161125122412", - "Neos.Flow-20161125124112" + "Neos.Flow-20161125124112", + "TYPO3.FluidAdaptor-20161130112935" ] } } \ No newline at end of file From d9e9e69a9f5c61e6fc056ae27f9c0ad6bfff334c Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:51 +0200 Subject: [PATCH 57/75] 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 136577f..d07e049 100644 --- a/composer.json +++ b/composer.json @@ -70,7 +70,8 @@ "Neos.Kickstarter-20161125110814", "Neos.Neos-20161125122412", "Neos.Flow-20161125124112", - "TYPO3.FluidAdaptor-20161130112935" + "TYPO3.FluidAdaptor-20161130112935", + "Neos.Fusion-20161201202543" ] } } \ No newline at end of file From 2c5d872a4b5920872a5cd07a1b4b25572a3721e6 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:51 +0200 Subject: [PATCH 58/75] 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 d07e049..adaa19c 100644 --- a/composer.json +++ b/composer.json @@ -71,7 +71,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 e433690bf86cfc00f531c82f312b489213f495c3 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:51 +0200 Subject: [PATCH 59/75] 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 adaa19c..51c2ed3 100644 --- a/composer.json +++ b/composer.json @@ -72,7 +72,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 3583a711a66b19f7360fc449eaae8dc5be9cbe40 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:51 +0200 Subject: [PATCH 60/75] 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 51c2ed3..e4a5bd1 100644 --- a/composer.json +++ b/composer.json @@ -73,7 +73,8 @@ "TYPO3.FluidAdaptor-20161130112935", "Neos.Fusion-20161201202543", "Neos.Neos-20161201222211", - "Neos.Fusion-20161202215034" + "Neos.Fusion-20161202215034", + "Neos.Fusion-20161219092345" ] } } \ No newline at end of file From 8e24c6b852b76cc1c64d28759b2ef2ff0c998069 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:51 +0200 Subject: [PATCH 61/75] 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 e4a5bd1..bc9e223 100644 --- a/composer.json +++ b/composer.json @@ -74,7 +74,8 @@ "Neos.Fusion-20161201202543", "Neos.Neos-20161201222211", "Neos.Fusion-20161202215034", - "Neos.Fusion-20161219092345" + "Neos.Fusion-20161219092345", + "Neos.ContentRepository-20161219093512" ] } } \ No newline at end of file From a9a4d3c3c0f3934e2c726e5cc9bd75e7e4a942b4 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:51 +0200 Subject: [PATCH 62/75] 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 bc9e223..43448be 100644 --- a/composer.json +++ b/composer.json @@ -75,7 +75,8 @@ "Neos.Neos-20161201222211", "Neos.Fusion-20161202215034", "Neos.Fusion-20161219092345", - "Neos.ContentRepository-20161219093512" + "Neos.ContentRepository-20161219093512", + "Neos.Media-20161219094126" ] } } \ No newline at end of file From 7d7ee78b1e8bcf369b54ca83708348bd36622f98 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:51 +0200 Subject: [PATCH 63/75] 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 43448be..3eaaeda 100644 --- a/composer.json +++ b/composer.json @@ -76,7 +76,8 @@ "Neos.Fusion-20161202215034", "Neos.Fusion-20161219092345", "Neos.ContentRepository-20161219093512", - "Neos.Media-20161219094126" + "Neos.Media-20161219094126", + "Neos.Neos-20161219094403" ] } } \ No newline at end of file From 4e6a518ef72baca2a71359d217086970845ee252 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:51 +0200 Subject: [PATCH 64/75] 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 3eaaeda..f0800c1 100644 --- a/composer.json +++ b/composer.json @@ -77,7 +77,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 3808bffa8e73d2c294de7fe7dfb3cdf2d82aa2e4 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:51 +0200 Subject: [PATCH 65/75] 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 f0800c1..0c66ce8 100644 --- a/composer.json +++ b/composer.json @@ -78,7 +78,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 09aed9ab933acd9f06d41a25497e27a8ea986001 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:51 +0200 Subject: [PATCH 66/75] 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 0c66ce8..1484513 100644 --- a/composer.json +++ b/composer.json @@ -79,7 +79,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 c6d676b64866d37c9fe37761b998ed6cfb00694f Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:51 +0200 Subject: [PATCH 67/75] 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 1484513..7beb864 100644 --- a/composer.json +++ b/composer.json @@ -80,7 +80,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 4e25489a63e5f7ea493d8a918dd5bd6b4a1a49c2 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:51 +0200 Subject: [PATCH 68/75] 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 7beb864..5c8f646 100644 --- a/composer.json +++ b/composer.json @@ -81,7 +81,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 4ec4c75eb5ed8fb9e0471cf69d67311bbe53fff4 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:51 +0200 Subject: [PATCH 69/75] 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 5c8f646..ec6d9b4 100644 --- a/composer.json +++ b/composer.json @@ -82,7 +82,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 625688e593953b1852cf53559036627b92766cf0 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:51 +0200 Subject: [PATCH 70/75] 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 ec6d9b4..d716ff1 100644 --- a/composer.json +++ b/composer.json @@ -83,7 +83,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 23a446133ef435edba16440c4e4e5845c540d0dc Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:53:51 +0200 Subject: [PATCH 71/75] 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 d716ff1..5222899 100644 --- a/composer.json +++ b/composer.json @@ -84,7 +84,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 ec0963268601ee60fd621bbfb414d6188d3edc02 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 12 Apr 2017 20:57:10 +0200 Subject: [PATCH 72/75] TASK: Update composer.json --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 5222899..1206e75 100644 --- a/composer.json +++ b/composer.json @@ -1,9 +1,9 @@ { "name": "ttree/contentrepositoryimporter", - "type": "typo3-flow-package", - "description": "Helper package to import data in the TYPO3CR", + "type": "neos-flow-package", + "description": "Helper package to import data in the Neos content repository", "require": { - "typo3/flow": "*", + "neos/flow": ">3.0", "ezyang/htmlpurifier": "*", "cocur/slugify": "*", "typo3/neos": "*" @@ -88,4 +88,4 @@ "Neos.Flow-20170127183102" ] } -} \ No newline at end of file +} From e93301fbe50a5b96c8754aa92476a4bbf4843c74 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Thu, 13 Apr 2017 16:56:20 +0200 Subject: [PATCH 73/75] TASK: Change eventlog table name --- Migrations/Mysql/Version20150317235257.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Migrations/Mysql/Version20150317235257.php b/Migrations/Mysql/Version20150317235257.php index 2331e5f..08db674 100644 --- a/Migrations/Mysql/Version20150317235257.php +++ b/Migrations/Mysql/Version20150317235257.php @@ -17,7 +17,7 @@ public function up(Schema $schema) { $this->abortIf($this->connection->getDatabasePlatform()->getName() != "mysql"); - $this->addSql("ALTER TABLE typo3_neos_eventlog_domain_model_event ADD externalidentifier VARCHAR(255) DEFAULT NULL"); + $this->addSql("ALTER TABLE neos_neos_eventlog_domain_model_event ADD externalidentifier VARCHAR(255) DEFAULT NULL"); $this->addSql("CREATE TABLE ttree_contentrepositoryimporter_domain_model_import (persistence_object_identifier VARCHAR(40) NOT NULL, start DATETIME NOT NULL, end DATETIME DEFAULT NULL, PRIMARY KEY(persistence_object_identifier))"); } @@ -29,7 +29,7 @@ public function down(Schema $schema) { $this->abortIf($this->connection->getDatabasePlatform()->getName() != "mysql"); - $this->addSql("ALTER TABLE typo3_neos_eventlog_domain_model_event DROP externalidentifier"); + $this->addSql("ALTER TABLE neos_neos_eventlog_domain_model_event DROP externalidentifier"); $this->addSql("DROP TABLE ttree_contentrepositoryimporter_domain_model_import"); } } From e7b037d9708703132eb6f461bca6f4535a57fe21 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Sun, 16 Apr 2017 08:38:56 +0200 Subject: [PATCH 74/75] TASK: Switch to PSR-4 --- .../ContentRepositoryImporter => }/Aspect/EventLogAspect.php | 0 .../Command/ImportCommandController.php | 0 .../DataProvider/AbstractDataProvider.php | 0 .../DataProvider/AbstractDatabaseDataProvider.php | 0 .../DataProvider/CsvDataProvider.php | 0 .../DataProvider/DataProviderInterface.php | 0 .../ContentRepositoryImporter => }/DataType/DataType.php | 0 .../DataType/DataTypeInterface.php | 0 .../{Ttree/ContentRepositoryImporter => }/DataType/Date.php | 0 .../DataType/ExternalResource.php | 0 .../ContentRepositoryImporter => }/DataType/HtmlContent.php | 0 .../ContentRepositoryImporter => }/DataType/Integer.php | 0 .../{Ttree/ContentRepositoryImporter => }/DataType/Slug.php | 0 .../ContentRepositoryImporter => }/DataType/StringValue.php | 0 .../ContentRepositoryImporter => }/Domain/Model/Event.php | 0 .../ContentRepositoryImporter => }/Domain/Model/Import.php | 0 .../Domain/Model/PresetPartDefinition.php | 0 .../Domain/Model/RecordMapping.php | 0 .../Domain/Repository/EventRepository.php | 0 .../Domain/Repository/ImportRepository.php | 0 .../Domain/Repository/RecordMappingRepository.php | 0 .../Domain/Service/ImportService.php | 0 .../Exception/ImportAlreadyExecutedException.php | 0 .../Exception/InvalidArgumentException.php | 0 .../Importer/AbstractCommandBasedImporter.php | 0 .../Importer/AbstractImporter.php | 1 + .../Importer/ImporterInterface.php | 0 .../Service/ProcessedNodeService.php | 0 composer.json | 4 ++-- 29 files changed, 3 insertions(+), 2 deletions(-) rename Classes/{Ttree/ContentRepositoryImporter => }/Aspect/EventLogAspect.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/Command/ImportCommandController.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/DataProvider/AbstractDataProvider.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/DataProvider/AbstractDatabaseDataProvider.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/DataProvider/CsvDataProvider.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/DataProvider/DataProviderInterface.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/DataType/DataType.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/DataType/DataTypeInterface.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/DataType/Date.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/DataType/ExternalResource.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/DataType/HtmlContent.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/DataType/Integer.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/DataType/Slug.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/DataType/StringValue.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/Domain/Model/Event.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/Domain/Model/Import.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/Domain/Model/PresetPartDefinition.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/Domain/Model/RecordMapping.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/Domain/Repository/EventRepository.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/Domain/Repository/ImportRepository.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/Domain/Repository/RecordMappingRepository.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/Domain/Service/ImportService.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/Exception/ImportAlreadyExecutedException.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/Exception/InvalidArgumentException.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/Importer/AbstractCommandBasedImporter.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/Importer/AbstractImporter.php (99%) rename Classes/{Ttree/ContentRepositoryImporter => }/Importer/ImporterInterface.php (100%) rename Classes/{Ttree/ContentRepositoryImporter => }/Service/ProcessedNodeService.php (100%) diff --git a/Classes/Ttree/ContentRepositoryImporter/Aspect/EventLogAspect.php b/Classes/Aspect/EventLogAspect.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/Aspect/EventLogAspect.php rename to Classes/Aspect/EventLogAspect.php diff --git a/Classes/Ttree/ContentRepositoryImporter/Command/ImportCommandController.php b/Classes/Command/ImportCommandController.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/Command/ImportCommandController.php rename to Classes/Command/ImportCommandController.php diff --git a/Classes/Ttree/ContentRepositoryImporter/DataProvider/AbstractDataProvider.php b/Classes/DataProvider/AbstractDataProvider.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/DataProvider/AbstractDataProvider.php rename to Classes/DataProvider/AbstractDataProvider.php diff --git a/Classes/Ttree/ContentRepositoryImporter/DataProvider/AbstractDatabaseDataProvider.php b/Classes/DataProvider/AbstractDatabaseDataProvider.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/DataProvider/AbstractDatabaseDataProvider.php rename to Classes/DataProvider/AbstractDatabaseDataProvider.php diff --git a/Classes/Ttree/ContentRepositoryImporter/DataProvider/CsvDataProvider.php b/Classes/DataProvider/CsvDataProvider.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/DataProvider/CsvDataProvider.php rename to Classes/DataProvider/CsvDataProvider.php diff --git a/Classes/Ttree/ContentRepositoryImporter/DataProvider/DataProviderInterface.php b/Classes/DataProvider/DataProviderInterface.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/DataProvider/DataProviderInterface.php rename to Classes/DataProvider/DataProviderInterface.php diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/DataType.php b/Classes/DataType/DataType.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/DataType/DataType.php rename to Classes/DataType/DataType.php diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/DataTypeInterface.php b/Classes/DataType/DataTypeInterface.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/DataType/DataTypeInterface.php rename to Classes/DataType/DataTypeInterface.php diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/Date.php b/Classes/DataType/Date.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/DataType/Date.php rename to Classes/DataType/Date.php diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/ExternalResource.php b/Classes/DataType/ExternalResource.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/DataType/ExternalResource.php rename to Classes/DataType/ExternalResource.php diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/HtmlContent.php b/Classes/DataType/HtmlContent.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/DataType/HtmlContent.php rename to Classes/DataType/HtmlContent.php diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/Integer.php b/Classes/DataType/Integer.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/DataType/Integer.php rename to Classes/DataType/Integer.php diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/Slug.php b/Classes/DataType/Slug.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/DataType/Slug.php rename to Classes/DataType/Slug.php diff --git a/Classes/Ttree/ContentRepositoryImporter/DataType/StringValue.php b/Classes/DataType/StringValue.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/DataType/StringValue.php rename to Classes/DataType/StringValue.php diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Event.php b/Classes/Domain/Model/Event.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/Domain/Model/Event.php rename to Classes/Domain/Model/Event.php diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/Import.php b/Classes/Domain/Model/Import.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/Domain/Model/Import.php rename to Classes/Domain/Model/Import.php diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/PresetPartDefinition.php b/Classes/Domain/Model/PresetPartDefinition.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/Domain/Model/PresetPartDefinition.php rename to Classes/Domain/Model/PresetPartDefinition.php diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Model/RecordMapping.php b/Classes/Domain/Model/RecordMapping.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/Domain/Model/RecordMapping.php rename to Classes/Domain/Model/RecordMapping.php diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/EventRepository.php b/Classes/Domain/Repository/EventRepository.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/Domain/Repository/EventRepository.php rename to Classes/Domain/Repository/EventRepository.php diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/ImportRepository.php b/Classes/Domain/Repository/ImportRepository.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/Domain/Repository/ImportRepository.php rename to Classes/Domain/Repository/ImportRepository.php diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Repository/RecordMappingRepository.php b/Classes/Domain/Repository/RecordMappingRepository.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/Domain/Repository/RecordMappingRepository.php rename to Classes/Domain/Repository/RecordMappingRepository.php diff --git a/Classes/Ttree/ContentRepositoryImporter/Domain/Service/ImportService.php b/Classes/Domain/Service/ImportService.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/Domain/Service/ImportService.php rename to Classes/Domain/Service/ImportService.php diff --git a/Classes/Ttree/ContentRepositoryImporter/Exception/ImportAlreadyExecutedException.php b/Classes/Exception/ImportAlreadyExecutedException.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/Exception/ImportAlreadyExecutedException.php rename to Classes/Exception/ImportAlreadyExecutedException.php diff --git a/Classes/Ttree/ContentRepositoryImporter/Exception/InvalidArgumentException.php b/Classes/Exception/InvalidArgumentException.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/Exception/InvalidArgumentException.php rename to Classes/Exception/InvalidArgumentException.php diff --git a/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractCommandBasedImporter.php b/Classes/Importer/AbstractCommandBasedImporter.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/Importer/AbstractCommandBasedImporter.php rename to Classes/Importer/AbstractCommandBasedImporter.php diff --git a/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractImporter.php b/Classes/Importer/AbstractImporter.php similarity index 99% rename from Classes/Ttree/ContentRepositoryImporter/Importer/AbstractImporter.php rename to Classes/Importer/AbstractImporter.php index 3c0ccbf..9b2d0fe 100644 --- a/Classes/Ttree/ContentRepositoryImporter/Importer/AbstractImporter.php +++ b/Classes/Importer/AbstractImporter.php @@ -314,6 +314,7 @@ protected function processBatch(NodeTemplate $nodeTemplate = null) throw new Exception(sprintf('Expected records as an array while calling %s->fetch(), but returned %s instead.', get_class($this->dataProvider), gettype($records)), 1462960769826); } $records = $this->preProcessing($records); + array_walk($records, function ($data) use ($nodeTemplate) { $this->processRecord($nodeTemplate, $data); ++$this->processedRecords; diff --git a/Classes/Ttree/ContentRepositoryImporter/Importer/ImporterInterface.php b/Classes/Importer/ImporterInterface.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/Importer/ImporterInterface.php rename to Classes/Importer/ImporterInterface.php diff --git a/Classes/Ttree/ContentRepositoryImporter/Service/ProcessedNodeService.php b/Classes/Service/ProcessedNodeService.php similarity index 100% rename from Classes/Ttree/ContentRepositoryImporter/Service/ProcessedNodeService.php rename to Classes/Service/ProcessedNodeService.php diff --git a/composer.json b/composer.json index 1206e75..7be91b5 100644 --- a/composer.json +++ b/composer.json @@ -9,8 +9,8 @@ "typo3/neos": "*" }, "autoload": { - "psr-0": { - "Ttree\\ContentRepositoryImporter": "Classes" + "psr-4": { + "Ttree\\ContentRepositoryImporter\\": "Classes" } }, "extra": { From 2c0bc777076819ca901eead4e39d859acafbcfc3 Mon Sep 17 00:00:00 2001 From: Daniel Lienert Date: Wed, 26 Apr 2017 17:09:41 +0200 Subject: [PATCH 75/75] TASK: Change type to neos-package --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7be91b5..56f87b8 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "ttree/contentrepositoryimporter", - "type": "neos-flow-package", + "type": "neos-package", "description": "Helper package to import data in the Neos content repository", "require": { "neos/flow": ">3.0",