From 99f9761a4eac735086cf5e64a0388728b0283f2f Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:46 +0300 Subject: [PATCH 01/70] TASK: Apply migration TYPO3.FLOW3-201201261636 Adjust to the major changes in FLOW3 1.1 when coming from 1.0. Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 50 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/composer.json b/composer.json index d98c5a3..4645bc5 100644 --- a/composer.json +++ b/composer.json @@ -1,21 +1,31 @@ { - "name": "moc/notfound", - "type": "typo3-flow-package", - "description": "Neos CMS package that loads a normal editable page for displaying a 404 error", - "keywords": [ "404", "not found", "neos", "flow" ], - "license": "MIT", - "authors": [ - { - "name": "Aske Ertmann", - "email": "aske@ertmann.co" - } - ], - "require": { - "typo3/neos": ">=2.0" - }, - "autoload": { - "psr-0": { - "MOC\\NotFound": "Classes" - } - } -} + "name": "moc/notfound", + "type": "typo3-flow-package", + "description": "Neos CMS package that loads a normal editable page for displaying a 404 error", + "keywords": [ + "404", + "not found", + "neos", + "flow" + ], + "license": "MIT", + "authors": [ + { + "name": "Aske Ertmann", + "email": "aske@ertmann.co" + } + ], + "require": { + "typo3/neos": ">=2.0" + }, + "autoload": { + "psr-0": { + "MOC\\NotFound": "Classes" + } + }, + "extra": { + "applied-flow-migrations": [ + "TYPO3.FLOW3-201201261636" + ] + } +} \ No newline at end of file From 669707d4965ff142aa0a02fef8d789624d6bfca4 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:46 +0300 Subject: [PATCH 02/70] 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 4645bc5..fab5c52 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,8 @@ }, "extra": { "applied-flow-migrations": [ - "TYPO3.FLOW3-201201261636" + "TYPO3.FLOW3-201201261636", + "TYPO3.Fluid-201205031303" ] } } \ No newline at end of file From b195c0662019cff5600d347843cc394768ed102f Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:46 +0300 Subject: [PATCH 03/70] 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 fab5c52..0e5ee8b 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,8 @@ "extra": { "applied-flow-migrations": [ "TYPO3.FLOW3-201201261636", - "TYPO3.Fluid-201205031303" + "TYPO3.Fluid-201205031303", + "TYPO3.FLOW3-201205292145" ] } } \ No newline at end of file From e9fd5a74d0edff2675e5606f759e9a8e7d0f7f22 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:46 +0300 Subject: [PATCH 04/70] 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 0e5ee8b..5aaed45 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,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 d3aaddca167d5384426ef916c48c06761a835060 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:46 +0300 Subject: [PATCH 05/70] 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 5aaed45..363bf69 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,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 26f3f0ff80aa40196ee3a1fa22bc283be23b608c Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:46 +0300 Subject: [PATCH 06/70] 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 363bf69..c506b12 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,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 e90326e17b41ec06248b28e4f486ef193b385a9b Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:46 +0300 Subject: [PATCH 07/70] 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 c506b12..cfbefe2 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,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 6a11894d2b80f980a71809e91e4f956e869c1772 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:46 +0300 Subject: [PATCH 08/70] 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 cfbefe2..cfc2d1a 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,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 a95a45a2b3f2d87c4cb22b9f360006d8bf1eade4 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:46 +0300 Subject: [PATCH 09/70] 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 cfc2d1a..7338aca 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,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 e2f1d2bd85adfe7e70b5f21d18b2e6d460a3cbae Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:46 +0300 Subject: [PATCH 10/70] 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 7338aca..cf1bc2a 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,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 7dd9d96a80cf1a0afd0b6b7ef17db01dd0f8c672 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:46 +0300 Subject: [PATCH 11/70] 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 cf1bc2a..73441d2 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,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 4e267bb097edd98ba16514daac519a194bbaf5f0 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:46 +0300 Subject: [PATCH 12/70] 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 73441d2..8bb00ed 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,8 @@ "TYPO3.Flow-201212051340", "TYPO3.TypoScript-130516234520", "TYPO3.TypoScript-130516235550", - "TYPO3.TYPO3CR-130523180140" + "TYPO3.TYPO3CR-130523180140", + "TYPO3.Flow-201310031523" ] } } \ No newline at end of file From 438770325fd22bc98ca6659c10829f11a9ce63b2 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:46 +0300 Subject: [PATCH 13/70] 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 8bb00ed..eb1c513 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,8 @@ "TYPO3.TypoScript-130516234520", "TYPO3.TypoScript-130516235550", "TYPO3.TYPO3CR-130523180140", - "TYPO3.Flow-201310031523" + "TYPO3.Flow-201310031523", + "TYPO3.Flow-201405111147" ] } } \ No newline at end of file From 700b18b318b6cc3fca90c17c0922c26d064e8988 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:46 +0300 Subject: [PATCH 14/70] 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 eb1c513..b638f6b 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,8 @@ "TYPO3.TypoScript-130516235550", "TYPO3.TYPO3CR-130523180140", "TYPO3.Flow-201310031523", - "TYPO3.Flow-201405111147" + "TYPO3.Flow-201405111147", + "TYPO3.Neos-201407061038" ] } } \ No newline at end of file From 592776b7c188860eb3b89f75c95518102c6b80eb Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:46 +0300 Subject: [PATCH 15/70] 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 b638f6b..8c34492 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,8 @@ "TYPO3.TYPO3CR-130523180140", "TYPO3.Flow-201310031523", "TYPO3.Flow-201405111147", - "TYPO3.Neos-201407061038" + "TYPO3.Neos-201407061038", + "TYPO3.Neos-201409071922" ] } } \ No newline at end of file From 0746fd0dd19c79e1e3a7eb22412cd30598fb13e6 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:46 +0300 Subject: [PATCH 16/70] 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 8c34492..707755e 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,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 cc61cab7a74b2e5f4c55fa18babcb3dc6ef25520 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:46 +0300 Subject: [PATCH 17/70] 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 707755e..bdc8e15 100644 --- a/composer.json +++ b/composer.json @@ -40,7 +40,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 cbcf2a9987a026b2b6e04c129252fe61038e451f Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 18/70] 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 bdc8e15..44974f7 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,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 75ce9c861632de16579937cfb50b6c81a3dad0f1 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 19/70] 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 44974f7..8ffe320 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,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 882c22ef6d7440856d30438f026b3f95ab6b49c0 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 20/70] 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 8ffe320..9cb072f 100644 --- a/composer.json +++ b/composer.json @@ -43,7 +43,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 94ee4b318caff4639c455a08d76aefd9ebe52b53 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 21/70] 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 9cb072f..9922b9b 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,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 20a726437ae5794456a7886caa9fe0825231b071 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 22/70] 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 9922b9b..b3f0d06 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,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 8075a0db02d2868361611c80bb83ce364a59b93e Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 23/70] 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 b3f0d06..c04f3ad 100644 --- a/composer.json +++ b/composer.json @@ -46,7 +46,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 840bac3c1e22b39b8d7020cb8ba607e448658a9a Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 24/70] 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 c04f3ad..340fc26 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,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 af604a759ad55463d98f58a01679f0f334ce33c0 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 25/70] 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 340fc26..ee8b04d 100644 --- a/composer.json +++ b/composer.json @@ -48,7 +48,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 69263dbead61221b30982b939d9513a9079eea2a Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 26/70] 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 ee8b04d..6fa76c2 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,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 914642864d4b1a2f712db966d6e120f3cca99231 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 27/70] 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 6fa76c2..6836298 100644 --- a/composer.json +++ b/composer.json @@ -50,7 +50,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 b5b3398658165d241838497b3d4c03f642fec84d Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 28/70] 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 6836298..7b254a8 100644 --- a/composer.json +++ b/composer.json @@ -51,7 +51,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 dd0452d4351a0e63032301f88c478a755b173a97 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 29/70] TASK: Apply migration TYPO3.Flow-20161115140400 Adjust to the renaming of the Resource namespace and class in Flow 4.0 Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7b254a8..13de5ea 100644 --- a/composer.json +++ b/composer.json @@ -52,7 +52,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 6541512557fd43cbc6e5d5e937dc349e9afe7f77 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 30/70] TASK: Apply migration TYPO3.Flow-20161115140430 Adjust to the renaming of the Object namespace in Flow 4.0 Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 13de5ea..28f7d47 100644 --- a/composer.json +++ b/composer.json @@ -53,7 +53,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 152db4cc87f3b07c5edc8d33268c5da628c639e0 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 31/70] TASK: Apply migration Neos.Flow-20161124204700 Adjusts code to package renaming from "TYPO3.Flow" to "Neos.Flow" --- .../ViewHelpers/RequestViewHelper.php | 22 +++++++++---------- Configuration/Settings.yaml | 9 +++++--- composer.json | 3 ++- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/Classes/MOC/NotFound/ViewHelpers/RequestViewHelper.php b/Classes/MOC/NotFound/ViewHelpers/RequestViewHelper.php index 5d8640a..dce160c 100644 --- a/Classes/MOC/NotFound/ViewHelpers/RequestViewHelper.php +++ b/Classes/MOC/NotFound/ViewHelpers/RequestViewHelper.php @@ -1,15 +1,15 @@ Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 32/70] 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. 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 038254e..39a48a0 100644 --- a/composer.json +++ b/composer.json @@ -55,7 +55,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 17e9de49e9be81e37796542e967c9fed55b6304f Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 33/70] 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 39a48a0..27d67ec 100644 --- a/composer.json +++ b/composer.json @@ -56,7 +56,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 49ca90e792a9b366316ba5bf6e5c92150999a15f Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 34/70] 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 27d67ec..0d750ce 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,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 9ffe27eefbe639c60532b901fd13b992b136d3f1 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 35/70] 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 0d750ce..015e1e5 100644 --- a/composer.json +++ b/composer.json @@ -58,7 +58,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 067aedfe0507dd06cfe16fa80cbafd5143b742c2 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 36/70] 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 015e1e5..abfbd5e 100644 --- a/composer.json +++ b/composer.json @@ -59,7 +59,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 d466bd7009ef74fb0f80dec98f5ad2ee0429df37 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 37/70] 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 abfbd5e..9b9d035 100644 --- a/composer.json +++ b/composer.json @@ -60,7 +60,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 c9b3df769615482f2ad170895e6d21d8d262f9a6 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 38/70] 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 9b9d035..00fbcea 100644 --- a/composer.json +++ b/composer.json @@ -61,7 +61,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 2dbe1ef4f1e8665ddb16c6256622e5c6fea2986b Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 39/70] 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 00fbcea..d4ffa87 100644 --- a/composer.json +++ b/composer.json @@ -62,7 +62,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 f8edb4d078c2fb88b4d92cd6d42a36002b627645 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 40/70] 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 d4ffa87..78aa3bb 100644 --- a/composer.json +++ b/composer.json @@ -63,7 +63,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 c3d76f05285a4021e4a67275173d8aa7cedcbf50 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 41/70] 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 78aa3bb..7679123 100644 --- a/composer.json +++ b/composer.json @@ -64,7 +64,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 0cd606003066c8a61e9c363cc0e70f5e4af525de Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 42/70] 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 7679123..341b1e0 100644 --- a/composer.json +++ b/composer.json @@ -65,7 +65,8 @@ "Neos.Kickstart-20161124230102", "Neos.Setup-20161124230842", "Neos.Imagine-20161124231742", - "Neos.Media-20161124233100" + "Neos.Media-20161124233100", + "Neos.SiteKickstarter-20161125002311" ] } } \ No newline at end of file From 261223347ca3b6d7d13a90426ccc25a1547fa237 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 43/70] TASK: Apply migration Neos.Neos-20161125002322 Adjusts code to package renaming from "TYPO3.Neos" to "Neos.Neos" --- Classes/MOC/NotFound/ViewHelpers/RequestViewHelper.php | 6 +++--- composer.json | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Classes/MOC/NotFound/ViewHelpers/RequestViewHelper.php b/Classes/MOC/NotFound/ViewHelpers/RequestViewHelper.php index dce160c..d117c12 100644 --- a/Classes/MOC/NotFound/ViewHelpers/RequestViewHelper.php +++ b/Classes/MOC/NotFound/ViewHelpers/RequestViewHelper.php @@ -11,7 +11,7 @@ use Neos\Flow\Mvc\ActionRequest; use Neos\Flow\Mvc\Routing\Router; use TYPO3\Fluid\Core\ViewHelper\AbstractViewHelper; -use TYPO3\Neos\Domain\Service\ContentDimensionPresetSourceInterface; +use Neos\Neos\Domain\Service\ContentDimensionPresetSourceInterface; /** * Loads the content of a given URL @@ -49,7 +49,7 @@ class RequestViewHelper extends AbstractViewHelper { protected $configurationManager; /** - * @Flow\InjectConfiguration("routing.supportEmptySegmentForDimensions", package="TYPO3.Neos") + * @Flow\InjectConfiguration("routing.supportEmptySegmentForDimensions", package="Neos.Neos") * @var boolean */ protected $supportEmptySegmentForDimensions; @@ -108,7 +108,7 @@ public function render($path = NULL) { protected function appendFirstUriPartIfValidDimension(&$path) { $requestPath = ltrim($this->controllerContext->getRequest()->getHttpRequest()->getUri()->getPath(), '/'); $matches = []; - preg_match(\TYPO3\Neos\Routing\FrontendNodeRoutePartHandler::DIMENSION_REQUEST_PATH_MATCHER, $requestPath, $matches); + preg_match(\Neos\Neos\Routing\FrontendNodeRoutePartHandler::DIMENSION_REQUEST_PATH_MATCHER, $requestPath, $matches); if (!isset($matches['firstUriPart']) && !isset($matches['dimensionPresetUriSegments'])) { return; } diff --git a/composer.json b/composer.json index 341b1e0..2bdf32c 100644 --- a/composer.json +++ b/composer.json @@ -66,7 +66,8 @@ "Neos.Setup-20161124230842", "Neos.Imagine-20161124231742", "Neos.Media-20161124233100", - "Neos.SiteKickstarter-20161125002311" + "Neos.SiteKickstarter-20161125002311", + "Neos.Neos-20161125002322" ] } } \ No newline at end of file From 7b84cde91cb744acec117a948cba26aef1a7da4f Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 44/70] TASK: Apply migration Neos.ContentRepository-20161125012000 Adjusts code to package renaming from "TYPO3.TYPO3CR" to "Neos.ContentRepository" Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2bdf32c..18b659b 100644 --- a/composer.json +++ b/composer.json @@ -67,7 +67,8 @@ "Neos.Imagine-20161124231742", "Neos.Media-20161124233100", "Neos.SiteKickstarter-20161125002311", - "Neos.Neos-20161125002322" + "Neos.Neos-20161125002322", + "Neos.ContentRepository-20161125012000" ] } } \ No newline at end of file From d60346751fbc423304de824d2181d2f8c800d87d Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:47 +0300 Subject: [PATCH 45/70] 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 18b659b..fb704a1 100644 --- a/composer.json +++ b/composer.json @@ -68,7 +68,8 @@ "Neos.Media-20161124233100", "Neos.SiteKickstarter-20161125002311", "Neos.Neos-20161125002322", - "Neos.ContentRepository-20161125012000" + "Neos.ContentRepository-20161125012000", + "Neos.Fusion-20161125013710" ] } } \ No newline at end of file From bd65381a62df9018f8fbe493cc45194854b3b948 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:48 +0300 Subject: [PATCH 46/70] 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 fb704a1..ee793f8 100644 --- a/composer.json +++ b/composer.json @@ -69,7 +69,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 835bad73a030e7f1dcde5d70adc2c983b3ded117 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:48 +0300 Subject: [PATCH 47/70] 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 ee793f8..ec3a5e5 100644 --- a/composer.json +++ b/composer.json @@ -70,7 +70,8 @@ "Neos.Neos-20161125002322", "Neos.ContentRepository-20161125012000", "Neos.Fusion-20161125013710", - "Neos.Setup-20161125014759" + "Neos.Setup-20161125014759", + "Neos.SiteKickstarter-20161125095901" ] } } \ No newline at end of file From 3bc6816af6aefe4fb7d2dce431306aed64386e58 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:48 +0300 Subject: [PATCH 48/70] 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 ec3a5e5..8311e10 100644 --- a/composer.json +++ b/composer.json @@ -71,7 +71,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 b041c34f5b0593b6b882ed52288a22e08e599f27 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:48 +0300 Subject: [PATCH 49/70] 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 8311e10..ca3869f 100644 --- a/composer.json +++ b/composer.json @@ -72,7 +72,8 @@ "Neos.Fusion-20161125013710", "Neos.Setup-20161125014759", "Neos.SiteKickstarter-20161125095901", - "Neos.Fusion-20161125104701" + "Neos.Fusion-20161125104701", + "Neos.Neos-20161125104802" ] } } \ No newline at end of file From c4214e582f0afabc40cbb9eb1458d36db137f1bf Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:48 +0300 Subject: [PATCH 50/70] 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 ca3869f..94efd77 100644 --- a/composer.json +++ b/composer.json @@ -73,7 +73,8 @@ "Neos.Setup-20161125014759", "Neos.SiteKickstarter-20161125095901", "Neos.Fusion-20161125104701", - "Neos.Neos-20161125104802" + "Neos.Neos-20161125104802", + "Neos.Kickstarter-20161125110814" ] } } \ No newline at end of file From a004830879d3d79935400edf566ac7a1bb722d29 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:48 +0300 Subject: [PATCH 51/70] 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 94efd77..265fef7 100644 --- a/composer.json +++ b/composer.json @@ -74,7 +74,8 @@ "Neos.SiteKickstarter-20161125095901", "Neos.Fusion-20161125104701", "Neos.Neos-20161125104802", - "Neos.Kickstarter-20161125110814" + "Neos.Kickstarter-20161125110814", + "Neos.Neos-20161125122412" ] } } \ No newline at end of file From 90e845664e987f3bacd3bafd0e48b96ad802bbb1 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:48 +0300 Subject: [PATCH 52/70] 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 265fef7..d162cbc 100644 --- a/composer.json +++ b/composer.json @@ -75,7 +75,8 @@ "Neos.Fusion-20161125104701", "Neos.Neos-20161125104802", "Neos.Kickstarter-20161125110814", - "Neos.Neos-20161125122412" + "Neos.Neos-20161125122412", + "Neos.Flow-20161125124112" ] } } \ No newline at end of file From 01c5d2e715316c2ca13f0c01ce7e0cd692652b22 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:48 +0300 Subject: [PATCH 53/70] TASK: Apply migration TYPO3.FluidAdaptor-20161130112935 Adjusts code to package renaming from "TYPO3.Fluid" to "Neos.FluidAdaptor". --- Classes/MOC/NotFound/ViewHelpers/RequestViewHelper.php | 2 +- composer.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Classes/MOC/NotFound/ViewHelpers/RequestViewHelper.php b/Classes/MOC/NotFound/ViewHelpers/RequestViewHelper.php index d117c12..d2f99e3 100644 --- a/Classes/MOC/NotFound/ViewHelpers/RequestViewHelper.php +++ b/Classes/MOC/NotFound/ViewHelpers/RequestViewHelper.php @@ -10,7 +10,7 @@ use Neos\Flow\Http\Uri; use Neos\Flow\Mvc\ActionRequest; use Neos\Flow\Mvc\Routing\Router; -use TYPO3\Fluid\Core\ViewHelper\AbstractViewHelper; +use Neos\FluidAdaptor\Core\ViewHelper\AbstractViewHelper; use Neos\Neos\Domain\Service\ContentDimensionPresetSourceInterface; /** diff --git a/composer.json b/composer.json index d162cbc..d07238f 100644 --- a/composer.json +++ b/composer.json @@ -76,7 +76,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 7a10245668da2ce939dd1c0c917263853998f976 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:48 +0300 Subject: [PATCH 54/70] 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 d07238f..aef86e0 100644 --- a/composer.json +++ b/composer.json @@ -77,7 +77,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 fe03fda2c5100715dd1883dd1ec4f0436e1830c5 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:48 +0300 Subject: [PATCH 55/70] 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 aef86e0..0ecd170 100644 --- a/composer.json +++ b/composer.json @@ -78,7 +78,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 7be75bd28161c0781f910f3ec6366b8bb7f67b66 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:48 +0300 Subject: [PATCH 56/70] 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 0ecd170..16fe532 100644 --- a/composer.json +++ b/composer.json @@ -79,7 +79,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 3759f9703fe2ab13ec864b8bb02805c5dcdfc677 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:48 +0300 Subject: [PATCH 57/70] 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 16fe532..0046958 100644 --- a/composer.json +++ b/composer.json @@ -80,7 +80,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 5fe1c76cc79a30200618f1a1f465a0cbf4328dd8 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:48 +0300 Subject: [PATCH 58/70] 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 0046958..bcd2ca4 100644 --- a/composer.json +++ b/composer.json @@ -81,7 +81,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 920a9972fa9a6ff89280b7529917e57e4c77c9ac Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:48 +0300 Subject: [PATCH 59/70] 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 bcd2ca4..7fcb102 100644 --- a/composer.json +++ b/composer.json @@ -82,7 +82,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 471ac6e4f7a1f99bd2b8ddafb07c247ac4bd5e7c Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:48 +0300 Subject: [PATCH 60/70] 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 7fcb102..ee64407 100644 --- a/composer.json +++ b/composer.json @@ -83,7 +83,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 1dbb0f8083f21b9a954c5ce9e8176943ce344497 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:48 +0300 Subject: [PATCH 61/70] 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 ee64407..a23378b 100644 --- a/composer.json +++ b/composer.json @@ -84,7 +84,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 0080c190268799864663821639154943f5c4ee1c Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:48 +0300 Subject: [PATCH 62/70] 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 a23378b..6ee7b8d 100644 --- a/composer.json +++ b/composer.json @@ -85,7 +85,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 69571c07856b14ff1a55814da989a5f858824c2a Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 09:56:48 +0300 Subject: [PATCH 63/70] 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 6ee7b8d..2bdf0c0 100644 --- a/composer.json +++ b/composer.json @@ -86,7 +86,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 214c2b9e31513e946c5234349630b64e55400a64 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 10:09:44 +0300 Subject: [PATCH 64/70] TASK: get rid of ugly formatting in Settings.yaml --- Configuration/Settings.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml index 6406138..532043e 100644 --- a/Configuration/Settings.yaml +++ b/Configuration/Settings.yaml @@ -5,10 +5,8 @@ Neos: exceptionHandler: renderingGroups: notFoundExceptions: - matchingStatusCodes: - - 404 - - 410 + matchingStatusCodes: [ 404, 410 ] options: templatePathAndFilename: 'resource://MOC.NotFound/Private/Templates/404.html' variables: - path: 404.html + path: '404.html' # skip suffix if unset From a964cdebfd4ad52638321224b7128e1586afb097 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Fri, 20 Jan 2017 10:14:13 +0300 Subject: [PATCH 65/70] TASK: set correct Neos dependency --- composer.json | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 2bdf0c0..8e1c56f 100644 --- a/composer.json +++ b/composer.json @@ -2,12 +2,7 @@ "name": "moc/notfound", "type": "typo3-flow-package", "description": "Neos CMS package that loads a normal editable page for displaying a 404 error", - "keywords": [ - "404", - "not found", - "neos", - "flow" - ], + "keywords": [ "404", "not found", "neos", "flow" ], "license": "MIT", "authors": [ { @@ -16,7 +11,7 @@ } ], "require": { - "typo3/neos": ">=2.0" + "neos/neos": ">=3.0" }, "autoload": { "psr-0": { @@ -90,4 +85,4 @@ "Neos.Neos-20161220163741" ] } -} \ No newline at end of file +} From 3a49aa966fce91acd2e12568f6824ab0867882d8 Mon Sep 17 00:00:00 2001 From: Raffael Comi Date: Mon, 23 Jan 2017 13:55:15 +0100 Subject: [PATCH 66/70] TASK: PSR-2 & PSR-4 | Updated ReadMe --- .../ViewHelpers/RequestViewHelper.php | 152 ----------------- Classes/ViewHelpers/RequestViewHelper.php | 159 ++++++++++++++++++ Configuration/Settings.yaml | 5 +- README.md | 6 +- Resources/Private/Templates/404.html | 2 +- composer.json | 22 ++- 6 files changed, 182 insertions(+), 164 deletions(-) delete mode 100644 Classes/MOC/NotFound/ViewHelpers/RequestViewHelper.php create mode 100644 Classes/ViewHelpers/RequestViewHelper.php diff --git a/Classes/MOC/NotFound/ViewHelpers/RequestViewHelper.php b/Classes/MOC/NotFound/ViewHelpers/RequestViewHelper.php deleted file mode 100644 index d2f99e3..0000000 --- a/Classes/MOC/NotFound/ViewHelpers/RequestViewHelper.php +++ /dev/null @@ -1,152 +0,0 @@ -router->setRoutesConfiguration($this->configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_ROUTES)); - } - - /** - * @param string $path - * @return string - * @throws \Exception - */ - public function render($path = NULL) { - $this->appendFirstUriPartIfValidDimension($path); - /** @var RequestHandler $activeRequestHandler */ - $activeRequestHandler = $this->bootstrap->getActiveRequestHandler(); - $parentHttpRequest = $activeRequestHandler->getHttpRequest(); - $uri = rtrim($parentHttpRequest->getBaseUri(), '/') . '/' . $path; - $httpRequest = Request::create(new Uri($uri)); - $matchingRoute = $this->router->route($httpRequest); - if (!$matchingRoute) { - $exception = new \Exception(sprintf('Uri with path "%s" could not be found.', $uri), 1426446160); - $exceptionHandler = set_exception_handler(null)[0]; - $exceptionHandler->handleException($exception); - exit(); - } - $request = new ActionRequest($parentHttpRequest); - foreach ($matchingRoute as $argumentName => $argumentValue) { - $request->setArgument($argumentName, $argumentValue); - } - $response = new Response($activeRequestHandler->getHttpResponse()); - - $this->securityContext->withoutAuthorizationChecks(function() use ($request, $response) { - $this->dispatcher->dispatch($request, $response); - }); - - return $response->getContent(); - } - - /** - * @param string $path - * @return void - */ - protected function appendFirstUriPartIfValidDimension(&$path) { - $requestPath = ltrim($this->controllerContext->getRequest()->getHttpRequest()->getUri()->getPath(), '/'); - $matches = []; - preg_match(\Neos\Neos\Routing\FrontendNodeRoutePartHandler::DIMENSION_REQUEST_PATH_MATCHER, $requestPath, $matches); - if (!isset($matches['firstUriPart']) && !isset($matches['dimensionPresetUriSegments'])) { - return; - } - - $dimensionPresets = $this->contentDimensionPresetSource->getAllPresets(); - if (count($dimensionPresets) === 0) { - return; - } - - $firstUriPartExploded = explode('_', $matches['firstUriPart'] ?: $matches['dimensionPresetUriSegments']); - if ($this->supportEmptySegmentForDimensions) { - foreach ($firstUriPartExploded as $uriSegment) { - $uriSegmentIsValid = false; - foreach ($dimensionPresets as $dimensionName => $dimensionPreset) { - $preset = $this->contentDimensionPresetSource->findPresetByUriSegment($dimensionName, $uriSegment); - if ($preset !== null) { - $uriSegmentIsValid = true; - break; - } - } - if (!$uriSegmentIsValid) { - return; - } - } - } else { - if (count($firstUriPartExploded) !== count($dimensionPresets)) { - return; - } - foreach ($dimensionPresets as $dimensionName => $dimensionPreset) { - $uriSegment = array_shift($firstUriPartExploded); - $preset = $this->contentDimensionPresetSource->findPresetByUriSegment($dimensionName, $uriSegment); - if ($preset === null) { - return; - } - } - } - - $path = $matches['firstUriPart'] . '/' . $path; - } - -} diff --git a/Classes/ViewHelpers/RequestViewHelper.php b/Classes/ViewHelpers/RequestViewHelper.php new file mode 100644 index 0000000..b0cbde7 --- /dev/null +++ b/Classes/ViewHelpers/RequestViewHelper.php @@ -0,0 +1,159 @@ +router->setRoutesConfiguration($this->configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_ROUTES)); + } + + /** + * @param string $path + * + * @return string + * @throws \Exception + */ + public function render($path = null) + { + $this->appendFirstUriPartIfValidDimension($path); + /** @var RequestHandler $activeRequestHandler */ + $activeRequestHandler = $this->bootstrap->getActiveRequestHandler(); + $parentHttpRequest = $activeRequestHandler->getHttpRequest(); + $uri = rtrim($parentHttpRequest->getBaseUri(), '/') . '/' . $path; + $httpRequest = Request::create(new Uri($uri)); + $matchingRoute = $this->router->route($httpRequest); + if (!$matchingRoute) { + $exception = new \Exception(sprintf('Uri with path "%s" could not be found.', $uri), 1426446160); + $exceptionHandler = set_exception_handler(null)[0]; + $exceptionHandler->handleException($exception); + exit(); + } + $request = new ActionRequest($parentHttpRequest); + foreach ($matchingRoute as $argumentName => $argumentValue) { + $request->setArgument($argumentName, $argumentValue); + } + $response = new Response($activeRequestHandler->getHttpResponse()); + + $this->securityContext->withoutAuthorizationChecks(function () use ($request, $response) { + $this->dispatcher->dispatch($request, $response); + }); + + return $response->getContent(); + } + + /** + * @param string $path + * + * @return void + */ + protected function appendFirstUriPartIfValidDimension(&$path) + { + $requestPath = ltrim($this->controllerContext->getRequest()->getHttpRequest()->getUri()->getPath(), '/'); + $matches = []; + preg_match(FrontendNodeRoutePartHandler::DIMENSION_REQUEST_PATH_MATCHER, $requestPath, $matches); + if (!isset($matches['firstUriPart']) && !isset($matches['dimensionPresetUriSegments'])) { + return; + } + + $dimensionPresets = $this->contentDimensionPresetSource->getAllPresets(); + if (count($dimensionPresets) === 0) { + return; + } + + $firstUriPartExploded = explode('_', $matches['firstUriPart'] ?: $matches['dimensionPresetUriSegments']); + if ($this->supportEmptySegmentForDimensions) { + foreach ($firstUriPartExploded as $uriSegment) { + $uriSegmentIsValid = false; + foreach ($dimensionPresets as $dimensionName => $dimensionPreset) { + $preset = $this->contentDimensionPresetSource->findPresetByUriSegment($dimensionName, $uriSegment); + if ($preset !== null) { + $uriSegmentIsValid = true; + break; + } + } + if (!$uriSegmentIsValid) { + return; + } + } + } else { + if (count($firstUriPartExploded) !== count($dimensionPresets)) { + return; + } + foreach ($dimensionPresets as $dimensionName => $dimensionPreset) { + $uriSegment = array_shift($firstUriPartExploded); + $preset = $this->contentDimensionPresetSource->findPresetByUriSegment($dimensionName, $uriSegment); + if ($preset === null) { + return; + } + } + } + + $path = $matches['firstUriPart'] . '/' . $path; + } +} diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml index 532043e..cce6f49 100644 --- a/Configuration/Settings.yaml +++ b/Configuration/Settings.yaml @@ -1,11 +1,12 @@ - Neos: Flow: error: exceptionHandler: renderingGroups: notFoundExceptions: - matchingStatusCodes: [ 404, 410 ] + matchingStatusCodes: + - 404 + - 410 options: templatePathAndFilename: 'resource://MOC.NotFound/Private/Templates/404.html' variables: diff --git a/README.md b/README.md index 747514a..87ea767 100644 --- a/README.md +++ b/README.md @@ -11,13 +11,13 @@ Introduction Neos CMS package that loads a normal editable page for displaying a 404 error. -Compatible with Neos 2.x+ +Compatible with Neos 3.*. Supports multiple content dimensions with URI segments and empty segments for default dimensions. Installation ------------ -```composer require "moc/notfound:~2.0"``` +```composer require "moc/notfound:^3.0"``` Create a page with the URI segment "404" in the root of your site. If using content dimensions with URI segments, ensure a page exists in all contexts or through fallbacks. @@ -25,7 +25,7 @@ ensure a page exists in all contexts or through fallbacks. Alternatively set the following configuration in ``Settings.yaml``: ```yaml -TYPO3: +Neos: Flow: error: exceptionHandler: diff --git a/Resources/Private/Templates/404.html b/Resources/Private/Templates/404.html index 2021f96..768af97 100644 --- a/Resources/Private/Templates/404.html +++ b/Resources/Private/Templates/404.html @@ -1,2 +1,2 @@ {namespace notfound=MOC\NotFound\ViewHelpers} - \ No newline at end of file + diff --git a/composer.json b/composer.json index 8e1c56f..ab317c4 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,13 @@ { "name": "moc/notfound", - "type": "typo3-flow-package", + "type": "neos-plugin", "description": "Neos CMS package that loads a normal editable page for displaying a 404 error", - "keywords": [ "404", "not found", "neos", "flow" ], + "keywords": [ + "404", + "not found", + "neos", + "flow" + ], "license": "MIT", "authors": [ { @@ -11,11 +16,11 @@ } ], "require": { - "neos/neos": ">=3.0" + "neos/neos": "^3.0" }, "autoload": { - "psr-0": { - "MOC\\NotFound": "Classes" + "psr-4": { + "MOC\\NotFound\\": "Classes" } }, "extra": { @@ -31,6 +36,7 @@ "TYPO3.TypoScript-130516234520", "TYPO3.TypoScript-130516235550", "TYPO3.TYPO3CR-130523180140", + "TYPO3.Neos.NodeTypes-201309111655", "TYPO3.Flow-201310031523", "TYPO3.Flow-201405111147", "TYPO3.Neos-201407061038", @@ -61,6 +67,7 @@ "Neos.Setup-20161124230842", "Neos.Imagine-20161124231742", "Neos.Media-20161124233100", + "Neos.NodeTypes-20161125002300", "Neos.SiteKickstarter-20161125002311", "Neos.Neos-20161125002322", "Neos.ContentRepository-20161125012000", @@ -68,10 +75,12 @@ "Neos.Setup-20161125014759", "Neos.SiteKickstarter-20161125095901", "Neos.Fusion-20161125104701", + "Neos.NodeTypes-20161125104800", "Neos.Neos-20161125104802", "Neos.Kickstarter-20161125110814", "Neos.Neos-20161125122412", "Neos.Flow-20161125124112", + "Neos.SwiftMailer-20161130105617", "TYPO3.FluidAdaptor-20161130112935", "Neos.Fusion-20161201202543", "Neos.Neos-20161201222211", @@ -82,7 +91,8 @@ "Neos.Neos-20161219094403", "Neos.Neos-20161219122512", "Neos.Fusion-20161219130100", - "Neos.Neos-20161220163741" + "Neos.Neos-20161220163741", + "Neos.Fusion-20170120013047" ] } } From 5caba20d56a3369cb1068e39b369b81086e297ef Mon Sep 17 00:00:00 2001 From: Aske Ertmann Date: Thu, 26 Jan 2017 11:54:48 -0500 Subject: [PATCH 67/70] TASK: Adjust readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 87ea767..6501296 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Introduction Neos CMS package that loads a normal editable page for displaying a 404 error. -Compatible with Neos 3.*. +Compatible with Neos 2.x, 3.x Supports multiple content dimensions with URI segments and empty segments for default dimensions. From cd98b6a39d60148de668222a9305bd18aaa20b1f Mon Sep 17 00:00:00 2001 From: Aske Ertmann Date: Thu, 26 Jan 2017 11:58:48 -0500 Subject: [PATCH 68/70] TASK: Use shorthand array format in settings --- Configuration/Settings.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml index cce6f49..6c9214f 100644 --- a/Configuration/Settings.yaml +++ b/Configuration/Settings.yaml @@ -4,9 +4,7 @@ Neos: exceptionHandler: renderingGroups: notFoundExceptions: - matchingStatusCodes: - - 404 - - 410 + matchingStatusCodes:[ 404, 410 ] options: templatePathAndFilename: 'resource://MOC.NotFound/Private/Templates/404.html' variables: From 74027ce5a857f68722d313df20e9b25eba8316dc Mon Sep 17 00:00:00 2001 From: Aske Ertmann Date: Thu, 26 Jan 2017 11:59:11 -0500 Subject: [PATCH 69/70] TASK: Cleanup in settings --- Configuration/Settings.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml index 6c9214f..2303bab 100644 --- a/Configuration/Settings.yaml +++ b/Configuration/Settings.yaml @@ -4,7 +4,7 @@ Neos: exceptionHandler: renderingGroups: notFoundExceptions: - matchingStatusCodes:[ 404, 410 ] + matchingStatusCodes: [ 404, 410 ] options: templatePathAndFilename: 'resource://MOC.NotFound/Private/Templates/404.html' variables: From 262d9643612cbe79e3ea178d2f5d0f3d3b217d12 Mon Sep 17 00:00:00 2001 From: Aske Ertmann Date: Thu, 26 Jan 2017 12:00:18 -0500 Subject: [PATCH 70/70] TASK: Code cleanup --- Classes/ViewHelpers/RequestViewHelper.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/Classes/ViewHelpers/RequestViewHelper.php b/Classes/ViewHelpers/RequestViewHelper.php index b0cbde7..096e71d 100644 --- a/Classes/ViewHelpers/RequestViewHelper.php +++ b/Classes/ViewHelpers/RequestViewHelper.php @@ -75,7 +75,6 @@ public function initializeObject() /** * @param string $path - * * @return string * @throws \Exception */ @@ -109,7 +108,6 @@ public function render($path = null) /** * @param string $path - * * @return void */ protected function appendFirstUriPartIfValidDimension(&$path)