From 37fac60cc33c68ecc10c210d18ae17e92b436a02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:27 +0200 Subject: [PATCH 01/79] 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 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/composer.json b/composer.json index b05bc40..b84ab28 100644 --- a/composer.json +++ b/composer.json @@ -9,5 +9,10 @@ "psr-0": { "Flowpack\\SchemaOrg\\NodeTypes": "Classes" } + }, + "extra": { + "applied-flow-migrations": [ + "TYPO3.FLOW3-201201261636" + ] } } \ No newline at end of file From 689f17b06d4b8a434676952489e85da898facc6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:27 +0200 Subject: [PATCH 02/79] 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 b84ab28..c015ed9 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,8 @@ }, "extra": { "applied-flow-migrations": [ - "TYPO3.FLOW3-201201261636" + "TYPO3.FLOW3-201201261636", + "TYPO3.Fluid-201205031303" ] } } \ No newline at end of file From 24504752d17221070a83e1cd91a51e8e4bcd4db1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:27 +0200 Subject: [PATCH 03/79] 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 c015ed9..01ca26f 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,8 @@ "extra": { "applied-flow-migrations": [ "TYPO3.FLOW3-201201261636", - "TYPO3.Fluid-201205031303" + "TYPO3.Fluid-201205031303", + "TYPO3.FLOW3-201205292145" ] } } \ No newline at end of file From 64dfaa63797f4f3da130eca35ddb8d5315b38469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:27 +0200 Subject: [PATCH 04/79] 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 01ca26f..162fb5f 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,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 114d0c8658fe8fa8c5a549d5e6de9972db9a9a3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:27 +0200 Subject: [PATCH 05/79] 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 162fb5f..313de8a 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,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 7bf971e23edf6171e84df11c4d2cbb5267b0f0f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:27 +0200 Subject: [PATCH 06/79] 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 313de8a..b07a57a 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,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 ee0d5d63bba899f23c245a97e5f1bf44a7148957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:27 +0200 Subject: [PATCH 07/79] 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 b07a57a..5d2dcec 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,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 bdcbcfc3aea4e2afd35e0509f793ab04374de47b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:27 +0200 Subject: [PATCH 08/79] 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 5d2dcec..bcd70f2 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,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 1aee774a5753771fe561c3c5bcdbeb9919896371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:27 +0200 Subject: [PATCH 09/79] 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 bcd70f2..bcc973b 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,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 b962b463df394e57d5ad1ff3b5e58a7c5cfd0263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:27 +0200 Subject: [PATCH 10/79] 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 bcc973b..e12f3e3 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,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 e3ec772196b1fe32eff9d93de30c0e2c4c996fa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:27 +0200 Subject: [PATCH 11/79] 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 e12f3e3..e233e0b 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,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 e48a14ff8349c95e3e9d6ac83fcb5dda9a5c4874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:27 +0200 Subject: [PATCH 12/79] 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 e233e0b..65bd3f2 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,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 0a92edfc73b4cfa72d45b8bb3766b86284ffdf36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:27 +0200 Subject: [PATCH 13/79] 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 65bd3f2..854523c 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,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 92a5f4665307e7046196ed334386aa497c4b08db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:27 +0200 Subject: [PATCH 14/79] 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 854523c..db41c48 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,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 10af503f5ff4950447be9af11add32f53b6b8169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:28 +0200 Subject: [PATCH 15/79] 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 db41c48..d0cc8ed 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,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 e3c5959cfcf7027f53cb4bb752297a98f92d1ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:28 +0200 Subject: [PATCH 16/79] 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 d0cc8ed..d152109 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,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 50b9e3049d322226974d02dfd1f6bfbbba0ec656 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:28 +0200 Subject: [PATCH 17/79] TASK: Apply migration TYPO3.TYPO3CR-140911160326 Adjust to renamed NodeLabelGeneratorInterface. --- .../NodeTypes/Domain/Model/DefaultNodeLabelGenerator.php | 4 ++-- composer.json | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/DefaultNodeLabelGenerator.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/DefaultNodeLabelGenerator.php index 56e9c5a..1f3cab5 100644 --- a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/DefaultNodeLabelGenerator.php +++ b/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/DefaultNodeLabelGenerator.php @@ -14,14 +14,14 @@ use TYPO3\Flow\Annotations as Flow; use TYPO3\TYPO3CR\Domain\Model\AbstractNodeData; use TYPO3\TYPO3CR\Domain\Model\NodeInterface; -use TYPO3\TYPO3CR\Domain\Model\NodeLabelGeneratorInterface; +use TYPO3\TYPO3CR\Domain\Model\NodeDataLabelGeneratorInterface; /** * The default node label generator; used if no-other is configured * * @Flow\Scope("singleton") */ -class DefaultNodeLabelGenerator implements NodeLabelGeneratorInterface { +class FallbackNodeDataLabelGenerator implements NodeDataLabelGeneratorInterface { /** * Render a node label diff --git a/composer.json b/composer.json index d152109..7042edc 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,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 9a96a251cb2e275595b0275bc1d6fed1faacd67e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:28 +0200 Subject: [PATCH 18/79] 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 7042edc..563771e 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,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 2731c37e98bc4f89566c321dcdabd03bd145f325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:28 +0200 Subject: [PATCH 19/79] 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 563771e..caa70f6 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,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 f1543f18071254d98890bb91a1893a56b5091cbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:28 +0200 Subject: [PATCH 20/79] 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 caa70f6..5f378a8 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,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 f341f540a00e89ca26790ad312bea634e73a8ab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:28 +0200 Subject: [PATCH 21/79] 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 5f378a8..499c8f5 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,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 41dd972bbce88038824611e859b82bc0b977936c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:28 +0200 Subject: [PATCH 22/79] 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 499c8f5..b7a947a 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,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 fc9b3cf1cfe6321227de03a9b95cb5db04ba5f3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:28 +0200 Subject: [PATCH 23/79] 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 b7a947a..0011503 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,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 5192bbe0de1ef3534fc7cc73a224d49120aabecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:28 +0200 Subject: [PATCH 24/79] 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 0011503..5447fd8 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,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 118a86b612387b83922f86d5b49ed5ad3ac6eb7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:28 +0200 Subject: [PATCH 25/79] 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 5447fd8..dd32fb4 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,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 4f7809aa01c155be6a344921ecd2208127b7a212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:28 +0200 Subject: [PATCH 26/79] TASK: Apply migration TYPO3.Neos-20150303231600 Migrates ImageVariant to ImageInterface --- Configuration/NodeTypes.Mixins.yaml | 4 ++-- Configuration/Settings.yaml | 2 +- composer.json | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Configuration/NodeTypes.Mixins.yaml b/Configuration/NodeTypes.Mixins.yaml index d630fd6..c85daf8 100644 --- a/Configuration/NodeTypes.Mixins.yaml +++ b/Configuration/NodeTypes.Mixins.yaml @@ -79,7 +79,7 @@ abstract: TRUE properties: photo: - type: TYPO3\Media\Domain\Model\ImageVariant + type: TYPO3\Media\Domain\Model\ImageInterface ui: label: 'Image' reloadIfChanged: TRUE @@ -90,7 +90,7 @@ abstract: TRUE properties: photos: - type: TYPO3\Media\Domain\Model\ImageVariant + type: TYPO3\Media\Domain\Model\ImageInterface ui: label: 'Images' reloadIfChanged: TRUE \ No newline at end of file diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml index 0747c43..4272184 100644 --- a/Configuration/Settings.yaml +++ b/Configuration/Settings.yaml @@ -106,7 +106,7 @@ Flowpack: 'TYPO3.Neos/Validation/EmailAddressValidator': [] 'logo': - type: TYPO3\Media\Domain\Model\ImageVariant + type: TYPO3\Media\Domain\Model\ImageInterface ui: label: 'Image' diff --git a/composer.json b/composer.json index dd32fb4..8aa3956 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,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 740c18e43ece88a9d9e7eae86a6b9bef1442b1dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:28 +0200 Subject: [PATCH 27/79] 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 8aa3956..54d0642 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,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 17bb848c05eaff0f3a40303ea845c4620f4d192f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:28 +0200 Subject: [PATCH 28/79] 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 54d0642..951661b 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,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 8b7e274ead77608f5a2c57bbfe56927381c9ac42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:28 +0200 Subject: [PATCH 29/79] 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 951661b..9bd4727 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,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 198b048cc6da7622649358e05c61024125aa5ddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:28 +0200 Subject: [PATCH 30/79] 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 9bd4727..473564c 100644 --- a/composer.json +++ b/composer.json @@ -40,7 +40,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 a205d0ecf36af2c7b6dfd0726d69d875c3be4c79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:28 +0200 Subject: [PATCH 31/79] 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 473564c..99ca268 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,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 d5b76769e9439f88766858cf24bb71625359db2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:29 +0200 Subject: [PATCH 32/79] TASK: Apply migration Neos.Flow-20161124204700 Adjusts code to package renaming from "TYPO3.Flow" to "Neos.Flow" --- .../NodeTypes/Command/SchemaCommandController.php | 4 ++-- .../NodeTypes/Domain/Model/DefaultNodeLabelGenerator.php | 2 +- .../SchemaOrg/NodeTypes/Domain/Model/NodeType.php | 4 ++-- .../SchemaOrg/NodeTypes/Domain/Model/Property.php | 6 +++--- .../SchemaOrg/NodeTypes/Service/ConfigurationService.php | 4 ++-- .../SchemaOrg/NodeTypes/Service/NodeTypeBuilder.php | 8 ++++---- .../SchemaOrg/NodeTypes/Service/SchemaParserService.php | 4 ++-- Tests/Unit/Domain/Model/NodeTypeTest.php | 2 +- Tests/Unit/Service/SchemaParserServiceTest.php | 4 ++-- composer.json | 3 ++- 10 files changed, 21 insertions(+), 20 deletions(-) diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Command/SchemaCommandController.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Command/SchemaCommandController.php index 609fbb5..9e1eae4 100644 --- a/Classes/Flowpack/SchemaOrg/NodeTypes/Command/SchemaCommandController.php +++ b/Classes/Flowpack/SchemaOrg/NodeTypes/Command/SchemaCommandController.php @@ -15,8 +15,8 @@ use Flowpack\SchemaOrg\NodeTypes\Service\ConfigurationService; use Flowpack\SchemaOrg\NodeTypes\Service\NodeTypeBuilder; use Flowpack\SchemaOrg\NodeTypes\Service\SchemaParserService; -use TYPO3\Flow\Annotations as Flow; -use TYPO3\Flow\Cli\CommandController; +use Neos\Flow\Annotations as Flow; +use Neos\Flow\Cli\CommandController; use TYPO3\TYPO3CR\Domain\Service\NodeTypeManager; use TYPO3\TYPO3CR\Exception\NodeTypeNotFoundException; diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/DefaultNodeLabelGenerator.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/DefaultNodeLabelGenerator.php index 1f3cab5..9eec3c3 100644 --- a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/DefaultNodeLabelGenerator.php +++ b/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/DefaultNodeLabelGenerator.php @@ -11,7 +11,7 @@ * The TYPO3 project - inspiring people to share! * * */ -use TYPO3\Flow\Annotations as Flow; +use Neos\Flow\Annotations as Flow; use TYPO3\TYPO3CR\Domain\Model\AbstractNodeData; use TYPO3\TYPO3CR\Domain\Model\NodeInterface; use TYPO3\TYPO3CR\Domain\Model\NodeDataLabelGeneratorInterface; diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/NodeType.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/NodeType.php index c5f6ec7..88036e4 100644 --- a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/NodeType.php +++ b/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/NodeType.php @@ -12,8 +12,8 @@ * */ use Flowpack\SchemaOrg\NodeTypes\Service\ConfigurationService; -use TYPO3\Flow\Annotations as Flow; -use TYPO3\Flow\Utility\Arrays; +use Neos\Flow\Annotations as Flow; +use Neos\Flow\Utility\Arrays; /** * NodeType Definition diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/Property.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/Property.php index daaf335..fe30b60 100644 --- a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/Property.php +++ b/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/Property.php @@ -12,9 +12,9 @@ * */ use Flowpack\SchemaOrg\NodeTypes\Service\ConfigurationService; -use TYPO3\Flow\Annotations as Flow; -use TYPO3\Flow\Utility\Arrays; -use TYPO3\Flow\Utility\Unicode\Functions; +use Neos\Flow\Annotations as Flow; +use Neos\Flow\Utility\Arrays; +use Neos\Flow\Utility\Unicode\Functions; /** * Properties diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Service/ConfigurationService.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Service/ConfigurationService.php index 34e3c55..70d74bd 100644 --- a/Classes/Flowpack/SchemaOrg/NodeTypes/Service/ConfigurationService.php +++ b/Classes/Flowpack/SchemaOrg/NodeTypes/Service/ConfigurationService.php @@ -11,8 +11,8 @@ * The TYPO3 project - inspiring people to share! * * */ -use TYPO3\Flow\Annotations as Flow; -use TYPO3\Flow\Utility\Arrays; +use Neos\Flow\Annotations as Flow; +use Neos\Flow\Utility\Arrays; /** * Configuration Service diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Service/NodeTypeBuilder.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Service/NodeTypeBuilder.php index fea75c8..f567612 100644 --- a/Classes/Flowpack/SchemaOrg/NodeTypes/Service/NodeTypeBuilder.php +++ b/Classes/Flowpack/SchemaOrg/NodeTypes/Service/NodeTypeBuilder.php @@ -13,10 +13,10 @@ use Flowpack\SchemaOrg\NodeTypes\Domain\Model\NodeType; use Symfony\Component\Yaml\Dumper; -use TYPO3\Flow\Annotations as Flow; -use TYPO3\Flow\Utility\Arrays; -use TYPO3\Flow\Utility\Files; -use TYPO3\Flow\Utility\Now; +use Neos\Flow\Annotations as Flow; +use Neos\Flow\Utility\Arrays; +use Neos\Flow\Utility\Files; +use Neos\Flow\Utility\Now; /** * Neos NodeType builder diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Service/SchemaParserService.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Service/SchemaParserService.php index feeb6a3..5e09ef6 100644 --- a/Classes/Flowpack/SchemaOrg/NodeTypes/Service/SchemaParserService.php +++ b/Classes/Flowpack/SchemaOrg/NodeTypes/Service/SchemaParserService.php @@ -13,8 +13,8 @@ use Flowpack\SchemaOrg\NodeTypes\Domain\Model\NodeType; use Flowpack\SchemaOrg\NodeTypes\Domain\Model\Property; -use TYPO3\Flow\Annotations as Flow; -use TYPO3\Flow\Utility\Arrays; +use Neos\Flow\Annotations as Flow; +use Neos\Flow\Utility\Arrays; /** * Schema.org Parser diff --git a/Tests/Unit/Domain/Model/NodeTypeTest.php b/Tests/Unit/Domain/Model/NodeTypeTest.php index da3b7a9..ea7bb38 100644 --- a/Tests/Unit/Domain/Model/NodeTypeTest.php +++ b/Tests/Unit/Domain/Model/NodeTypeTest.php @@ -12,7 +12,7 @@ * */ use Flowpack\SchemaOrg\NodeTypes\Domain\Model\NodeType; -use TYPO3\Flow\Tests\UnitTestCase; +use Neos\Flow\Tests\UnitTestCase; /** * NodeType Tests diff --git a/Tests/Unit/Service/SchemaParserServiceTest.php b/Tests/Unit/Service/SchemaParserServiceTest.php index 1b4bebc..b55e5b6 100644 --- a/Tests/Unit/Service/SchemaParserServiceTest.php +++ b/Tests/Unit/Service/SchemaParserServiceTest.php @@ -12,8 +12,8 @@ * */ use Flowpack\SchemaOrg\NodeTypes\Service\SchemaParserService; -use TYPO3\Flow\Reflection\ObjectAccess; -use TYPO3\Flow\Tests\UnitTestCase; +use Neos\Flow\Reflection\ObjectAccess; +use Neos\Flow\Tests\UnitTestCase; /** * Testcase for the HTML Augmenter diff --git a/composer.json b/composer.json index 99ca268..be9867c 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,8 @@ "TYPO3.Flow-20151113161300", "TYPO3.Form-20160601101500", "TYPO3.Flow-20161115140400", - "TYPO3.Flow-20161115140430" + "TYPO3.Flow-20161115140430", + "Neos.Flow-20161124204700" ] } } \ No newline at end of file From 99b38899db472f0949028feff1c3996928ee4a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:29 +0200 Subject: [PATCH 33/79] 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. --- .../Flowpack/SchemaOrg/NodeTypes/Domain/Model/NodeType.php | 2 +- .../Flowpack/SchemaOrg/NodeTypes/Domain/Model/Property.php | 2 +- .../SchemaOrg/NodeTypes/Service/ConfigurationService.php | 2 +- .../Flowpack/SchemaOrg/NodeTypes/Service/NodeTypeBuilder.php | 4 ++-- .../SchemaOrg/NodeTypes/Service/SchemaParserService.php | 2 +- Tests/Unit/Service/SchemaParserServiceTest.php | 2 +- composer.json | 3 ++- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/NodeType.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/NodeType.php index 88036e4..c77d0ea 100644 --- a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/NodeType.php +++ b/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/NodeType.php @@ -13,7 +13,7 @@ use Flowpack\SchemaOrg\NodeTypes\Service\ConfigurationService; use Neos\Flow\Annotations as Flow; -use Neos\Flow\Utility\Arrays; +use Neos\Utility\Arrays; /** * NodeType Definition diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/Property.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/Property.php index fe30b60..dda7f55 100644 --- a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/Property.php +++ b/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/Property.php @@ -13,7 +13,7 @@ use Flowpack\SchemaOrg\NodeTypes\Service\ConfigurationService; use Neos\Flow\Annotations as Flow; -use Neos\Flow\Utility\Arrays; +use Neos\Utility\Arrays; use Neos\Flow\Utility\Unicode\Functions; /** diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Service/ConfigurationService.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Service/ConfigurationService.php index 70d74bd..e5fc410 100644 --- a/Classes/Flowpack/SchemaOrg/NodeTypes/Service/ConfigurationService.php +++ b/Classes/Flowpack/SchemaOrg/NodeTypes/Service/ConfigurationService.php @@ -12,7 +12,7 @@ * */ use Neos\Flow\Annotations as Flow; -use Neos\Flow\Utility\Arrays; +use Neos\Utility\Arrays; /** * Configuration Service diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Service/NodeTypeBuilder.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Service/NodeTypeBuilder.php index f567612..d8a0cdd 100644 --- a/Classes/Flowpack/SchemaOrg/NodeTypes/Service/NodeTypeBuilder.php +++ b/Classes/Flowpack/SchemaOrg/NodeTypes/Service/NodeTypeBuilder.php @@ -14,8 +14,8 @@ use Flowpack\SchemaOrg\NodeTypes\Domain\Model\NodeType; use Symfony\Component\Yaml\Dumper; use Neos\Flow\Annotations as Flow; -use Neos\Flow\Utility\Arrays; -use Neos\Flow\Utility\Files; +use Neos\Utility\Arrays; +use Neos\Utility\Files; use Neos\Flow\Utility\Now; /** diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Service/SchemaParserService.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Service/SchemaParserService.php index 5e09ef6..9b9109b 100644 --- a/Classes/Flowpack/SchemaOrg/NodeTypes/Service/SchemaParserService.php +++ b/Classes/Flowpack/SchemaOrg/NodeTypes/Service/SchemaParserService.php @@ -14,7 +14,7 @@ use Flowpack\SchemaOrg\NodeTypes\Domain\Model\NodeType; use Flowpack\SchemaOrg\NodeTypes\Domain\Model\Property; use Neos\Flow\Annotations as Flow; -use Neos\Flow\Utility\Arrays; +use Neos\Utility\Arrays; /** * Schema.org Parser diff --git a/Tests/Unit/Service/SchemaParserServiceTest.php b/Tests/Unit/Service/SchemaParserServiceTest.php index b55e5b6..2b68f15 100644 --- a/Tests/Unit/Service/SchemaParserServiceTest.php +++ b/Tests/Unit/Service/SchemaParserServiceTest.php @@ -12,7 +12,7 @@ * */ use Flowpack\SchemaOrg\NodeTypes\Service\SchemaParserService; -use Neos\Flow\Reflection\ObjectAccess; +use Neos\Utility\ObjectAccess; use Neos\Flow\Tests\UnitTestCase; /** diff --git a/composer.json b/composer.json index be9867c..7e7904d 100644 --- a/composer.json +++ b/composer.json @@ -43,7 +43,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 727704c7ef70faac7b75453d58317426c644409d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:29 +0200 Subject: [PATCH 34/79] 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 7e7904d..cd4432e 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,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 763b574d0df1a97e58fe28d6b47f7dac91a6ff22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:29 +0200 Subject: [PATCH 35/79] 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 cd4432e..6ea10cf 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,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 c4d805091528d1a30e11b8ddf4444681bc68edef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:29 +0200 Subject: [PATCH 36/79] 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 6ea10cf..17efa5d 100644 --- a/composer.json +++ b/composer.json @@ -46,7 +46,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 1b4f78a0b7a5e38d6037a5bc3dec80d20fd5a656 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:29 +0200 Subject: [PATCH 37/79] 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 17efa5d..0477caa 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,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 f9bb5c64386e36cd0715e55c3e27711f1de20207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:29 +0200 Subject: [PATCH 38/79] 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 0477caa..a7ed7db 100644 --- a/composer.json +++ b/composer.json @@ -48,7 +48,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 d184aa9ae610fd60400acf93b24203555b05a5b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:29 +0200 Subject: [PATCH 39/79] 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 a7ed7db..506239a 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,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 cb6d370b8e75f3ef6db10eb8ba0840e78e97264c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:29 +0200 Subject: [PATCH 40/79] 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 506239a..14a5734 100644 --- a/composer.json +++ b/composer.json @@ -50,7 +50,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 b4cf23003eac5fd5134626616e9fcbf04bf06a2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:29 +0200 Subject: [PATCH 41/79] 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 14a5734..593c32f 100644 --- a/composer.json +++ b/composer.json @@ -51,7 +51,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 e1394cbeade10bdaeadc63e30a8dd063f730b5dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:29 +0200 Subject: [PATCH 42/79] TASK: Apply migration Neos.Media-20161124233100 Adjusts code to package renaming from "TYPO3.Media" to "Neos.Media" --- Configuration/NodeTypes.Mixins.yaml | 4 ++-- Configuration/Settings.yaml | 4 ++-- composer.json | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Configuration/NodeTypes.Mixins.yaml b/Configuration/NodeTypes.Mixins.yaml index c85daf8..3972db8 100644 --- a/Configuration/NodeTypes.Mixins.yaml +++ b/Configuration/NodeTypes.Mixins.yaml @@ -79,7 +79,7 @@ abstract: TRUE properties: photo: - type: TYPO3\Media\Domain\Model\ImageInterface + type: Neos\Media\Domain\Model\ImageInterface ui: label: 'Image' reloadIfChanged: TRUE @@ -90,7 +90,7 @@ abstract: TRUE properties: photos: - type: TYPO3\Media\Domain\Model\ImageInterface + type: Neos\Media\Domain\Model\ImageInterface ui: label: 'Images' reloadIfChanged: TRUE \ No newline at end of file diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml index 4272184..7128b3f 100644 --- a/Configuration/Settings.yaml +++ b/Configuration/Settings.yaml @@ -106,7 +106,7 @@ Flowpack: 'TYPO3.Neos/Validation/EmailAddressValidator': [] 'logo': - type: TYPO3\Media\Domain\Model\ImageInterface + type: Neos\Media\Domain\Model\ImageInterface ui: label: 'Image' @@ -296,4 +296,4 @@ Flowpack: label: 'mixed' 'associatedMedia': - type: array + type: array diff --git a/composer.json b/composer.json index 593c32f..6700f7f 100644 --- a/composer.json +++ b/composer.json @@ -52,7 +52,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 2b193951baeeab040ff6c4aaf3f205c80eb77eb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:29 +0200 Subject: [PATCH 43/79] TASK: Apply migration Neos.NodeTypes-20161125002300 Adjusts code to package renaming from "TYPO3.Neos.NodeTypes" to "Neos.NodeTypes" --- Configuration/Settings.yaml | 10 +++++----- composer.json | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml index 7128b3f..ac73200 100644 --- a/Configuration/Settings.yaml +++ b/Configuration/Settings.yaml @@ -9,7 +9,7 @@ Flowpack: jsonFilename: 'resource://Flowpack.SchemaOrg.NodeTypes/Private/Schema/All.json' nodeTypeMapping: - ImageObject: 'TYPO3.Neos.NodeTypes:Image' + ImageObject: 'Neos.NodeTypes:Image' propertyBlackList: # todo: add support for relation to an other Document @@ -32,7 +32,7 @@ Flowpack: 'Review': abstract: FALSE superTypes: - - 'TYPO3.Neos.NodeTypes:Page' + - 'Neos.NodeTypes:Page' 'PostalAddress': ui: @@ -49,7 +49,7 @@ Flowpack: 'Event': abstract: FALSE superTypes: - - 'TYPO3.Neos.NodeTypes:Page' + - 'Neos.NodeTypes:Page' 'Place': abstract: FALSE @@ -64,8 +64,8 @@ Flowpack: propertyMixinsMapping: 'image': - - 'TYPO3.Neos.NodeTypes:ImageMixin' - - 'TYPO3.Neos.NodeTypes:ImageCaptionMixin' + - 'Neos.NodeTypes:ImageMixin' + - 'Neos.NodeTypes:ImageCaptionMixin' 'description': - 'Flowpack.SchemaOrg.NodeTypes:DescriptionMixin' diff --git a/composer.json b/composer.json index 6700f7f..4f9e6a7 100644 --- a/composer.json +++ b/composer.json @@ -53,7 +53,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 c6e04b7aaf76d031908fbcf622cd5db34175f0fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:29 +0200 Subject: [PATCH 44/79] 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 4f9e6a7..4c68013 100644 --- a/composer.json +++ b/composer.json @@ -54,7 +54,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 eb1fd2f1f2bf7b8bf3276047715c848bce02f176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:29 +0200 Subject: [PATCH 45/79] TASK: Apply migration Neos.Neos-20161125002322 Adjusts code to package renaming from "TYPO3.Neos" to "Neos.Neos" --- Configuration/NodeTypes.Mixins.yaml | 4 ++-- Configuration/Settings.yaml | 20 +++++++++---------- Tests/Unit/Domain/Model/NodeTypeTest.php | 2 +- .../Unit/Service/SchemaParserServiceTest.php | 2 +- composer.json | 3 ++- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Configuration/NodeTypes.Mixins.yaml b/Configuration/NodeTypes.Mixins.yaml index 3972db8..eb1afea 100644 --- a/Configuration/NodeTypes.Mixins.yaml +++ b/Configuration/NodeTypes.Mixins.yaml @@ -33,14 +33,14 @@ abstract: TRUE childNodes: articleBody: - type: 'TYPO3.Neos:ContentCollection' + type: 'Neos.Neos:ContentCollection' # Comment mixin 'Flowpack.SchemaOrg.NodeTypes:CommentMixin': abstract: TRUE childNodes: comment: - type: 'TYPO3.Neos:ContentCollection' + type: 'Neos.Neos:ContentCollection' constraints: nodeTypes: '*': FALSE diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml index ac73200..66b942e 100644 --- a/Configuration/Settings.yaml +++ b/Configuration/Settings.yaml @@ -54,12 +54,12 @@ Flowpack: 'Place': abstract: FALSE superTypes: - - 'TYPO3.Neos:Content' + - 'Neos.Neos:Content' 'VideoObject': abstract: FALSE superTypes: - - 'TYPO3.Neos:Content' + - 'Neos.Neos:Content' propertyMixinsMapping: @@ -103,7 +103,7 @@ Flowpack: type: 'string' validation: validation: - 'TYPO3.Neos/Validation/EmailAddressValidator': [] + 'Neos.Neos/Validation/EmailAddressValidator': [] 'logo': type: Neos\Media\Domain\Model\ImageInterface @@ -113,7 +113,7 @@ Flowpack: 'proficiencyLevel': ui: inspector: - editor: 'TYPO3.Neos/Inspector/Editors/SelectBoxEditor' + editor: 'Neos.Neos/Inspector/Editors/SelectBoxEditor' editorOptions: values: '': @@ -127,7 +127,7 @@ Flowpack: 'accessibilityAPI': ui: inspector: - editor: 'TYPO3.Neos/Inspector/Editors/SelectBoxEditor' + editor: 'Neos.Neos/Inspector/Editors/SelectBoxEditor' editorOptions: values: '': @@ -159,7 +159,7 @@ Flowpack: 'accessibilityControl': ui: inspector: - editor: 'TYPO3.Neos/Inspector/Editors/SelectBoxEditor' + editor: 'Neos.Neos/Inspector/Editors/SelectBoxEditor' editorOptions: values: '': @@ -181,7 +181,7 @@ Flowpack: 'accessibilityFeature': ui: inspector: - editor: 'TYPO3.Neos/Inspector/Editors/SelectBoxEditor' + editor: 'Neos.Neos/Inspector/Editors/SelectBoxEditor' editorOptions: values: '': @@ -249,7 +249,7 @@ Flowpack: 'accessibilityHazard': ui: inspector: - editor: 'TYPO3.Neos/Inspector/Editors/SelectBoxEditor' + editor: 'Neos.Neos/Inspector/Editors/SelectBoxEditor' editorOptions: values: '': @@ -270,7 +270,7 @@ Flowpack: 'educationalUse': ui: inspector: - editor: 'TYPO3.Neos/Inspector/Editors/SelectBoxEditor' + editor: 'Neos.Neos/Inspector/Editors/SelectBoxEditor' editorOptions: values: '': @@ -283,7 +283,7 @@ Flowpack: 'interactivityType': ui: inspector: - editor: 'TYPO3.Neos/Inspector/Editors/SelectBoxEditor' + editor: 'Neos.Neos/Inspector/Editors/SelectBoxEditor' editorOptions: values: '': diff --git a/Tests/Unit/Domain/Model/NodeTypeTest.php b/Tests/Unit/Domain/Model/NodeTypeTest.php index ea7bb38..ee38892 100644 --- a/Tests/Unit/Domain/Model/NodeTypeTest.php +++ b/Tests/Unit/Domain/Model/NodeTypeTest.php @@ -1,5 +1,5 @@ Date: Fri, 7 Apr 2017 10:17:29 +0200 Subject: [PATCH 46/79] TASK: Apply migration Neos.ContentRepository-20161125012000 Adjusts code to package renaming from "TYPO3.TYPO3CR" to "Neos.ContentRepository" --- .../SchemaOrg/NodeTypes/Command/SchemaCommandController.php | 4 ++-- .../NodeTypes/Domain/Model/DefaultNodeLabelGenerator.php | 6 +++--- composer.json | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Command/SchemaCommandController.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Command/SchemaCommandController.php index 9e1eae4..737bf4f 100644 --- a/Classes/Flowpack/SchemaOrg/NodeTypes/Command/SchemaCommandController.php +++ b/Classes/Flowpack/SchemaOrg/NodeTypes/Command/SchemaCommandController.php @@ -17,8 +17,8 @@ use Flowpack\SchemaOrg\NodeTypes\Service\SchemaParserService; use Neos\Flow\Annotations as Flow; use Neos\Flow\Cli\CommandController; -use TYPO3\TYPO3CR\Domain\Service\NodeTypeManager; -use TYPO3\TYPO3CR\Exception\NodeTypeNotFoundException; +use Neos\ContentRepository\Domain\Service\NodeTypeManager; +use Neos\ContentRepository\Exception\NodeTypeNotFoundException; /** * Schema.org Schema Extraction CLI diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/DefaultNodeLabelGenerator.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/DefaultNodeLabelGenerator.php index 9eec3c3..ef7b30e 100644 --- a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/DefaultNodeLabelGenerator.php +++ b/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/DefaultNodeLabelGenerator.php @@ -12,9 +12,9 @@ * */ use Neos\Flow\Annotations as Flow; -use TYPO3\TYPO3CR\Domain\Model\AbstractNodeData; -use TYPO3\TYPO3CR\Domain\Model\NodeInterface; -use TYPO3\TYPO3CR\Domain\Model\NodeDataLabelGeneratorInterface; +use Neos\ContentRepository\Domain\Model\AbstractNodeData; +use Neos\ContentRepository\Domain\Model\NodeInterface; +use Neos\ContentRepository\Domain\Model\NodeDataLabelGeneratorInterface; /** * The default node label generator; used if no-other is configured diff --git a/composer.json b/composer.json index b5d05d8..6ce15dc 100644 --- a/composer.json +++ b/composer.json @@ -56,7 +56,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 13bdb17b635c047e8b5be373732370067957dbe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:29 +0200 Subject: [PATCH 47/79] 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 6ce15dc..4e046e2 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,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 00850181dee7e0d6b56451afe9284aac08462482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:29 +0200 Subject: [PATCH 48/79] 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 4e046e2..5584d7b 100644 --- a/composer.json +++ b/composer.json @@ -58,7 +58,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 19a87d2ab8298de7f36132363b215e9e7798b366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:29 +0200 Subject: [PATCH 49/79] 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 5584d7b..d30ca6d 100644 --- a/composer.json +++ b/composer.json @@ -59,7 +59,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 4e414b5dad30a6acb74bcaf1c6dcb97efe8a0c33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:30 +0200 Subject: [PATCH 50/79] 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 d30ca6d..edbb185 100644 --- a/composer.json +++ b/composer.json @@ -60,7 +60,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 ca1530d8685cacba6fe9e92da581c5f517d4a5bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:30 +0200 Subject: [PATCH 51/79] 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 edbb185..b893f39 100644 --- a/composer.json +++ b/composer.json @@ -61,7 +61,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 957a934aadf5096e10ecb2104fac4cae33171e42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:30 +0200 Subject: [PATCH 52/79] 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 b893f39..5818618 100644 --- a/composer.json +++ b/composer.json @@ -62,7 +62,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 136ec970724853991e7ae2950c6c1cd41a209942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:30 +0200 Subject: [PATCH 53/79] 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 5818618..0290ffb 100644 --- a/composer.json +++ b/composer.json @@ -63,7 +63,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 1555cdc8b5835dc76f7c8ebfafd8520381a72947 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:30 +0200 Subject: [PATCH 54/79] 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 0290ffb..9d9f35a 100644 --- a/composer.json +++ b/composer.json @@ -64,7 +64,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 9b7754d09a9c6537c7bba4b422da64bfbe8a1874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:30 +0200 Subject: [PATCH 55/79] TASK: Apply migration Neos.Flow-20161125124112 Adjusts code to Neos\Flow\Utility\Unicode adjustment --- Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/Property.php | 2 +- composer.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/Property.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/Property.php index dda7f55..5610228 100644 --- a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/Property.php +++ b/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/Property.php @@ -14,7 +14,7 @@ use Flowpack\SchemaOrg\NodeTypes\Service\ConfigurationService; use Neos\Flow\Annotations as Flow; use Neos\Utility\Arrays; -use Neos\Flow\Utility\Unicode\Functions; +use Neos\Utility\Unicode\Functions; /** * Properties diff --git a/composer.json b/composer.json index 9d9f35a..6c3e82d 100644 --- a/composer.json +++ b/composer.json @@ -65,7 +65,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 b08a5149674e73eb42acade06232fec7d8822c0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:30 +0200 Subject: [PATCH 56/79] TASK: Apply migration Neos.SwiftMailer-20161130105617 Adjusts code to package renaming from "TYPO3.SwiftMailer" to "Neos.SwiftMailer". 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 6c3e82d..e247771 100644 --- a/composer.json +++ b/composer.json @@ -66,7 +66,8 @@ "Neos.Neos-20161125104802", "Neos.Kickstarter-20161125110814", "Neos.Neos-20161125122412", - "Neos.Flow-20161125124112" + "Neos.Flow-20161125124112", + "Neos.SwiftMailer-20161130105617" ] } } \ No newline at end of file From 4de6fa874d3be45c4e3ca29c28577bc0865caecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:30 +0200 Subject: [PATCH 57/79] 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 e247771..90be4d1 100644 --- a/composer.json +++ b/composer.json @@ -67,7 +67,8 @@ "Neos.Kickstarter-20161125110814", "Neos.Neos-20161125122412", "Neos.Flow-20161125124112", - "Neos.SwiftMailer-20161130105617" + "Neos.SwiftMailer-20161130105617", + "TYPO3.FluidAdaptor-20161130112935" ] } } \ No newline at end of file From 2eecf67bbc0f4c0957e3aabb751497d386037cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:30 +0200 Subject: [PATCH 58/79] 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 90be4d1..1b17876 100644 --- a/composer.json +++ b/composer.json @@ -68,7 +68,8 @@ "Neos.Neos-20161125122412", "Neos.Flow-20161125124112", "Neos.SwiftMailer-20161130105617", - "TYPO3.FluidAdaptor-20161130112935" + "TYPO3.FluidAdaptor-20161130112935", + "Neos.Fusion-20161201202543" ] } } \ No newline at end of file From c97aa8ad1b39b680c4a299a96cb3b33809cf84e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:30 +0200 Subject: [PATCH 59/79] 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 1b17876..26799d2 100644 --- a/composer.json +++ b/composer.json @@ -69,7 +69,8 @@ "Neos.Flow-20161125124112", "Neos.SwiftMailer-20161130105617", "TYPO3.FluidAdaptor-20161130112935", - "Neos.Fusion-20161201202543" + "Neos.Fusion-20161201202543", + "Neos.Neos-20161201222211" ] } } \ No newline at end of file From 4b93f362e80de483409758a3f757b0f2103e01ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:30 +0200 Subject: [PATCH 60/79] 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 26799d2..f9d547e 100644 --- a/composer.json +++ b/composer.json @@ -70,7 +70,8 @@ "Neos.SwiftMailer-20161130105617", "TYPO3.FluidAdaptor-20161130112935", "Neos.Fusion-20161201202543", - "Neos.Neos-20161201222211" + "Neos.Neos-20161201222211", + "Neos.Fusion-20161202215034" ] } } \ No newline at end of file From 1a7f7b98d14c0fed7159beb43e1f510ed6e67e9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:30 +0200 Subject: [PATCH 61/79] TASK: Apply migration Neos.ContentRepository.Search-20161210231100 Adjusts code to package renaming from "TYPO3.TYPO3CR.Search" to "Neos.ContentRepository.Search" Note: This migration did not produce any changes, so the commit simply marks the migration as applied. This makes sure it will not be applied again. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f9d547e..272ea8f 100644 --- a/composer.json +++ b/composer.json @@ -71,7 +71,8 @@ "TYPO3.FluidAdaptor-20161130112935", "Neos.Fusion-20161201202543", "Neos.Neos-20161201222211", - "Neos.Fusion-20161202215034" + "Neos.Fusion-20161202215034", + "Neos.ContentRepository.Search-20161210231100" ] } } \ No newline at end of file From df393b44ccfa07d2b9d86fc8797609c5bf450e4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:30 +0200 Subject: [PATCH 62/79] 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 272ea8f..0d01ebf 100644 --- a/composer.json +++ b/composer.json @@ -72,7 +72,8 @@ "Neos.Fusion-20161201202543", "Neos.Neos-20161201222211", "Neos.Fusion-20161202215034", - "Neos.ContentRepository.Search-20161210231100" + "Neos.ContentRepository.Search-20161210231100", + "Neos.Fusion-20161219092345" ] } } \ No newline at end of file From 1d7286181c8244ef07df657dd314013b4c8ac9c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:30 +0200 Subject: [PATCH 63/79] 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 0d01ebf..6c8a816 100644 --- a/composer.json +++ b/composer.json @@ -73,7 +73,8 @@ "Neos.Neos-20161201222211", "Neos.Fusion-20161202215034", "Neos.ContentRepository.Search-20161210231100", - "Neos.Fusion-20161219092345" + "Neos.Fusion-20161219092345", + "Neos.ContentRepository-20161219093512" ] } } \ No newline at end of file From ed765a2adfc0bbb4d63e06a9bb2890449d3e638f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:30 +0200 Subject: [PATCH 64/79] 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 6c8a816..e20bba4 100644 --- a/composer.json +++ b/composer.json @@ -74,7 +74,8 @@ "Neos.Fusion-20161202215034", "Neos.ContentRepository.Search-20161210231100", "Neos.Fusion-20161219092345", - "Neos.ContentRepository-20161219093512" + "Neos.ContentRepository-20161219093512", + "Neos.Media-20161219094126" ] } } \ No newline at end of file From 853b06b7660e0a54c40e30383b47ba578e5ec0cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:30 +0200 Subject: [PATCH 65/79] 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 e20bba4..e307a45 100644 --- a/composer.json +++ b/composer.json @@ -75,7 +75,8 @@ "Neos.ContentRepository.Search-20161210231100", "Neos.Fusion-20161219092345", "Neos.ContentRepository-20161219093512", - "Neos.Media-20161219094126" + "Neos.Media-20161219094126", + "Neos.Neos-20161219094403" ] } } \ No newline at end of file From 214e1a98c0819f58a9e36760aa690a00de5a7c20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:30 +0200 Subject: [PATCH 66/79] 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 e307a45..aa9517b 100644 --- a/composer.json +++ b/composer.json @@ -76,7 +76,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 d9f11a2b7dbb5e05990c93f0caddadad34bd6db6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:30 +0200 Subject: [PATCH 67/79] 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 aa9517b..a98b093 100644 --- a/composer.json +++ b/composer.json @@ -77,7 +77,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 d9a31adeb763433d1fd1d3c7f87de5efc14315ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:30 +0200 Subject: [PATCH 68/79] 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 a98b093..155207e 100644 --- a/composer.json +++ b/composer.json @@ -78,7 +78,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 c1cf9c498853759290be4640e3c4fd543a0705a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:30 +0200 Subject: [PATCH 69/79] 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 155207e..541e203 100644 --- a/composer.json +++ b/composer.json @@ -79,7 +79,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 55bbc3b386082cb443912add6582046e7b9abc20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:30 +0200 Subject: [PATCH 70/79] 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 541e203..b9bbb9e 100644 --- a/composer.json +++ b/composer.json @@ -80,7 +80,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 6e127aa50623da9e10320ad8e0238cc61a1218b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:31 +0200 Subject: [PATCH 71/79] 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 b9bbb9e..e2adba6 100644 --- a/composer.json +++ b/composer.json @@ -81,7 +81,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 273dc0c6a2e6d99ad5f8364e0b099024b738173a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:31 +0200 Subject: [PATCH 72/79] 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 e2adba6..7657972 100644 --- a/composer.json +++ b/composer.json @@ -82,7 +82,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 a0e84583fec840f2600c74bb10f6f5a00cdd656d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:17:31 +0200 Subject: [PATCH 73/79] 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 7657972..e1a6334 100644 --- a/composer.json +++ b/composer.json @@ -83,7 +83,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 e98e1cb00557b832607ad2bca43901d533161278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 10:47:54 +0200 Subject: [PATCH 74/79] [CGL] PSR-2 formatting, PSR-4 autoloading, readme, composer type and dependency --- .php_cs | 31 ++ Classes/Command/SchemaCommandController.php | 113 +++++++ .../Model/FallbackNodeDataLabelGenerator.php | 37 +++ Classes/Domain/Model/NodeType.php | 225 ++++++++++++++ Classes/Domain/Model/Property.php | 169 +++++++++++ .../Command/SchemaCommandController.php | 117 -------- .../Model/DefaultNodeLabelGenerator.php | 42 --- .../NodeTypes/Domain/Model/NodeType.php | 214 -------------- .../NodeTypes/Domain/Model/Property.php | 167 ----------- .../Service/ConfigurationService.php | 154 ---------- .../NodeTypes/Service/NodeTypeBuilder.php | 107 ------- .../NodeTypes/Service/SchemaParserService.php | 272 ----------------- Classes/Service/ConfigurationService.php | 155 ++++++++++ Classes/Service/NodeTypeBuilder.php | 105 +++++++ Classes/Service/SchemaParserService.php | 279 ++++++++++++++++++ README.md | 16 +- Tests/Unit/Domain/Model/NodeTypeTest.php | 142 ++++----- .../Unit/Service/SchemaParserServiceTest.php | 154 +++++----- composer.json | 12 +- 19 files changed, 1278 insertions(+), 1233 deletions(-) create mode 100644 .php_cs create mode 100644 Classes/Command/SchemaCommandController.php create mode 100644 Classes/Domain/Model/FallbackNodeDataLabelGenerator.php create mode 100644 Classes/Domain/Model/NodeType.php create mode 100644 Classes/Domain/Model/Property.php delete mode 100644 Classes/Flowpack/SchemaOrg/NodeTypes/Command/SchemaCommandController.php delete mode 100644 Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/DefaultNodeLabelGenerator.php delete mode 100644 Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/NodeType.php delete mode 100644 Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/Property.php delete mode 100644 Classes/Flowpack/SchemaOrg/NodeTypes/Service/ConfigurationService.php delete mode 100644 Classes/Flowpack/SchemaOrg/NodeTypes/Service/NodeTypeBuilder.php delete mode 100644 Classes/Flowpack/SchemaOrg/NodeTypes/Service/SchemaParserService.php create mode 100644 Classes/Service/ConfigurationService.php create mode 100644 Classes/Service/NodeTypeBuilder.php create mode 100644 Classes/Service/SchemaParserService.php diff --git a/.php_cs b/.php_cs new file mode 100644 index 0000000..f11c5e7 --- /dev/null +++ b/.php_cs @@ -0,0 +1,31 @@ +in('Classes') + ->in('Tests') +; + +return PhpCsFixer\Config::create() + ->setRules([ + '@PSR2' => true, + 'single_quote' => true, + 'no_unused_imports' => true, + 'no_useless_else' => true, + 'phpdoc_align' => true, + 'phpdoc_order' => true, + 'phpdoc_scalar' => true, + 'pre_increment' => true, + 'short_scalar_cast' => true, + 'space_after_semicolon' => true, + 'ternary_operator_spaces' => true, + 'trailing_comma_in_multiline_array' => true, + 'semicolon_after_instruction' => true, + 'trim_array_spaces' => true, + 'whitespace_after_comma_in_array' => true, + 'phpdoc_add_missing_param_annotation' => true, + 'binary_operator_spaces' => ['align_equals' => false, 'align_double_arrow' => true], + 'concat_space' => ['spacing' => 'one'], + 'array_syntax' => ['syntax' => 'short'], + ]) + ->setFinder($finder) +; diff --git a/Classes/Command/SchemaCommandController.php b/Classes/Command/SchemaCommandController.php new file mode 100644 index 0000000..6a224d4 --- /dev/null +++ b/Classes/Command/SchemaCommandController.php @@ -0,0 +1,113 @@ +configurationService->setPackageKey($packageKey); + $this->outputLine(); + $this->outputFormatted('# Extracting schema.org ...'); + + $this->schemaParserService->setAllSchemaJsonFilename($this->jsonSchema); + + if ($type !== null) { + $nodeTypes = $this->schemaParserService->parseByTypes(explode(',', $type)); + } else { + $nodeTypes = $this->schemaParserService->parseAll(); + } + + $filename = 'NodeTypes.SchemaOrg.' . $name . '.yaml'; + + $this->nodeTypeBuilder + ->setFilename($filename) + ->unlinkExistingFile(); + + $success = $error = 0; + foreach ($nodeTypes as $nodeType) { + /** @var NodeType $nodeType */ + $this->outputLine('+ ' . $nodeType->getName() . ''); + + try { + $existingNodeType = $this->nodeTypeManager->getNodeType($nodeType->getName()); + $this->outputFormatted(' - NodeType "%s" skipped, update is not supported ...', [$existingNodeType->getName()]); + ++$error; + } catch (NodeTypeNotFoundException $exception) { + $filename = $this->nodeTypeBuilder->dump($nodeType); + ++$success; + } + } + + $this->outputLine(); + if ($success > 0) { + $this->outputFormatted('The following file contain your new NodeType: ' . $filename); + } else { + $this->outputFormatted('Nothing to do ...'); + } + + $this->outputLine(); + $this->outputFormatted('We are on Github, Pull request welcome or open an issue if you have trouble ...'); + } catch (\InvalidArgumentException $exception) { + $this->outputLine(); + $this->outputFormatted($exception->getMessage()); + $this->sendAndExit(1); + } + } +} diff --git a/Classes/Domain/Model/FallbackNodeDataLabelGenerator.php b/Classes/Domain/Model/FallbackNodeDataLabelGenerator.php new file mode 100644 index 0000000..2d34aa8 --- /dev/null +++ b/Classes/Domain/Model/FallbackNodeDataLabelGenerator.php @@ -0,0 +1,37 @@ +hasProperty('name') === true && $node->getProperty('name') !== '') { + $label = strip_tags($node->getProperty('name')); + } else { + $label = ($node->getNodeType()->getLabel() ?: $node->getNodeType()->getName()) . ' (' . $node->getName() . ')'; + } + + return $label; + } +} diff --git a/Classes/Domain/Model/NodeType.php b/Classes/Domain/Model/NodeType.php new file mode 100644 index 0000000..04b8b91 --- /dev/null +++ b/Classes/Domain/Model/NodeType.php @@ -0,0 +1,225 @@ +name = (string)$name; + $this->type = (string)$type; + } + + /** + * @return string + */ + public function getName() + { + return $this->name; + } + + /** + * @return string + */ + public function getLabel() + { + list(, $label) = explode(':', $this->getName()); + return $label; + } + + /** + * @return bool + */ + public function getAbstract() + { + return $this->abstract; + } + + /** + * @return bool + */ + public function getFinal() + { + return $this->final; + } + + /** + * @return array + */ + public function getDefaultConfiguration() + { + return Arrays::arrayMergeRecursiveOverrule($this->configurationService->getTypeDefaultConfiguration($this->type), [ + 'ui' => [ + 'label' => $this->getLabel(), + ], + ]); + } + + /** + * @return array + */ + public function getConfiguration() + { + return $this->configuration; + } + + /** + * @param array|string $path The path to follow. Either a simple array of keys or a string in the format 'foo.bar.baz' + * @param mixed $value + */ + public function setConfigurationByPath($path, $value) + { + $this->configuration = Arrays::setValueByPath($this->configuration, $path, $value); + } + + /** + * @param array|string $path The path to follow. Either a simple array of keys or a string in the format 'foo.bar.baz' + * @param mixed $value + */ + public function getConfigurationByPath($path) + { + $this->configuration = Arrays::getValueByPath($this->configuration, $path); + } + + /** + * @param string $superTypeName + */ + public function addSuperType($superTypeName) + { + $this->superTypes[$superTypeName] = true; + } + + /** + * @return array + */ + public function getSuperTypes() + { + $superTypes = []; + foreach ($this->superTypes as $superTypeName=>$superTypeStatus) { + if ($superTypeStatus === true) { + $superTypes[] = $superTypeName; + } + } + + return $superTypes; + } + + /** + * @return bool + */ + public function hasSuperTypes() + { + return (bool)count($this->getSuperTypes()); + } + + /** + * @return array + */ + public function getRelatedNodeTypes() + { + return $this->relatedNodeTypes; + } + + /** + * @return array + */ + public function getProperties() + { + return $this->properties; + } + + /** + * @param array $properties + */ + public function setProperties($properties) + { + $this->properties = []; + foreach ($properties as $property) { + $this->initializeRelatedNodeTypes($property); + /** @var Property $property */ + if ($property->isSkipProperty()) { + continue; + } + $propertyName = $property->getName(); + $configuration = $property->getConfiguration(); + + $this->properties[$propertyName] = $this->configurationService->mergePropertyConfigurationWithDefaultConfiguration($propertyName, $this->getName(), $configuration); + } + } + + /** + * @return bool + */ + public function hasProperties() + { + return (bool)count($this->getProperties()); + } + + /** + * @param Property $property + * @return void + */ + protected function initializeRelatedNodeTypes(Property $property) + { + if (substr($property->getType(), 0, 9) !== 'reference') { + return; + } + + $configuration = $property->getConfiguration(); + $nodeTypes = Arrays::getValueByPath($configuration, 'ui.inspector.editorOptions.nodeTypes') ?: []; + foreach ($nodeTypes as $nodeType) { + $this->relatedNodeTypes[$nodeType] = true; + } + } +} diff --git a/Classes/Domain/Model/Property.php b/Classes/Domain/Model/Property.php new file mode 100644 index 0000000..ee4af32 --- /dev/null +++ b/Classes/Domain/Model/Property.php @@ -0,0 +1,169 @@ + 'boolean', + 'Date' => 'date', + 'DateTime' => 'date', + 'Float' => 'float', + 'Number' => 'integer', + 'Integer' => 'integer', + 'Text' => 'string', + 'Time' => 'date', + 'URL' => 'string', + ]; + + /** + * @var string + */ + protected $name; + + /** + * @var string + */ + protected $label; + + /** + * @var string + */ + protected $comment; + + /** + * @var string + */ + protected $type; + + /** + * @var bool + */ + protected $reloadIfChanged; + + /** + * @var array + */ + protected $ui = []; + + /** + * @var bool + */ + protected $skipProperty = false; + + /** + * @param ConfigurationService $configurationService + * @param string $type + * @param string $name + * @param string $label + * @param string $comment + * @param string $groupName + * @param bool $reloadIfChanged + * + */ + public function __construct(ConfigurationService $configurationService, $type, $name, $label, $comment, $groupName, $reloadIfChanged = false) + { + $this->configurationService = $configurationService; + $this->type = $this->convertDataType($type, $name); + $this->name = (string)$name; + $this->label = (string)$label; + $this->comment = (string)$comment; + $this->ui = Arrays::arrayMergeRecursiveOverrule($this->ui, [ + 'label' => $this->label, + 'comment' => $this->comment, + 'inspector' => [ + 'group' => $groupName, + ], + ]); + $this->reloadIfChanged = (bool)$reloadIfChanged; + } + + /** + * @return bool + */ + public function isSkipProperty() + { + return $this->skipProperty; + } + + /** + * @param bool $skipProperty + */ + public function setSkipProperty($skipProperty) + { + $this->skipProperty = $skipProperty; + } + + /** + * @return string + */ + public function getName() + { + return $this->name; + } + + /** + * @return string + */ + public function getType() + { + return $this->type; + } + + /** + * @param string $schemaOrgPropertyName + * @param string $propertyName + * @return string + */ + protected function convertDataType($schemaOrgPropertyName, $propertyName) + { + if (strpos($schemaOrgPropertyName, ':')) { + $type = Functions::substr($propertyName, -1) === 's' ? 'references' : 'reference'; + $schemaOrgPropertyName = $this->configurationService->nodeTypeNameMapping($schemaOrgPropertyName); + $this->ui = Arrays::setValueByPath($this->ui, 'inspector', [ + 'editorOptions' => [ + 'nodeTypes' => [$schemaOrgPropertyName], + ], + ]); + } else { + if (!isset($this->dataTypeMapping[$schemaOrgPropertyName]) && strpos($schemaOrgPropertyName, ':') > 0) { + throw new \InvalidArgumentException(sprintf('Invalid property type (%s)', $schemaOrgPropertyName), 1396192757); + } + $type = (string)$this->dataTypeMapping[$schemaOrgPropertyName]; + } + return $type; + } + + /** + * @return array + */ + public function getConfiguration() + { + $configuration = [ + 'type' => $this->type, + 'ui' => $this->ui, + ]; + + return $configuration; + } +} diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Command/SchemaCommandController.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Command/SchemaCommandController.php deleted file mode 100644 index 737bf4f..0000000 --- a/Classes/Flowpack/SchemaOrg/NodeTypes/Command/SchemaCommandController.php +++ /dev/null @@ -1,117 +0,0 @@ -configurationService->setPackageKey($packageKey); - $this->outputLine(); - $this->outputFormatted("# Extracting schema.org ..."); - - $this->schemaParserService->setAllSchemaJsonFilename($this->jsonSchema); - - if ($type !== NULL) { - $nodeTypes = $this->schemaParserService->parseByTypes(explode(',', $type)); - } else { - $nodeTypes = $this->schemaParserService->parseAll(); - } - - $filename = 'NodeTypes.SchemaOrg.' . $name . '.yaml'; - - $this->nodeTypeBuilder - ->setFilename($filename) - ->unlinkExistingFile(); - - $success = $error = 0; - foreach ($nodeTypes as $nodeType) { - /** @var NodeType $nodeType */ - $this->outputLine("+ " . $nodeType->getName() . ""); - - try { - $existingNodeType = $this->nodeTypeManager->getNodeType($nodeType->getName()); - $this->outputFormatted(" - NodeType \"%s\" skipped, update is not supported ...", array($existingNodeType->getName())); - ++$error; - } catch (NodeTypeNotFoundException $exception) { - $filename = $this->nodeTypeBuilder->dump($nodeType); - ++$success; - } - } - - $this->outputLine(); - if ($success > 0) { - $this->outputFormatted("The following file contain your new NodeType: " . $filename); - } else { - $this->outputFormatted("Nothing to do ..."); - } - - $this->outputLine(); - $this->outputFormatted("We are on Github, Pull request welcome or open an issue if you have trouble ..."); - } catch (\InvalidArgumentException $exception) { - $this->outputLine(); - $this->outputFormatted($exception->getMessage()); - $this->sendAndExit(1); - } - } - -} \ No newline at end of file diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/DefaultNodeLabelGenerator.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/DefaultNodeLabelGenerator.php deleted file mode 100644 index ef7b30e..0000000 --- a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/DefaultNodeLabelGenerator.php +++ /dev/null @@ -1,42 +0,0 @@ -hasProperty('name') === TRUE && $node->getProperty('name') !== '') { - $label = strip_tags($node->getProperty('name')); - } else { - $label = ($node->getNodeType()->getLabel() ?: $node->getNodeType()->getName()) . ' (' . $node->getName() . ')'; - } - - return $label; - } -} diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/NodeType.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/NodeType.php deleted file mode 100644 index c77d0ea..0000000 --- a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/NodeType.php +++ /dev/null @@ -1,214 +0,0 @@ -name = (string)$name; - $this->type = (string)$type; - } - - /** - * @return string - */ - public function getName() { - return $this->name; - } - - /** - * @return string - */ - public function getLabel() { - list(, $label) = explode(':', $this->getName()); - return $label; - } - - /** - * @return boolean - */ - public function getAbstract() { - return $this->abstract; - } - - /** - * @return boolean - */ - public function getFinal() { - return $this->final; - } - - /** - * @return array - */ - public function getDefaultConfiguration() { - return Arrays::arrayMergeRecursiveOverrule($this->configurationService->getTypeDefaultConfiguration($this->type), array( - 'ui' => array( - 'label' => $this->getLabel(), - ) - )); - } - - /** - * @return array - */ - public function getConfiguration() { - return $this->configuration; - } - - /** - * @param array|string $path The path to follow. Either a simple array of keys or a string in the format 'foo.bar.baz' - * @param mixed $value - */ - public function setConfigurationByPath($path, $value) { - $this->configuration = Arrays::setValueByPath($this->configuration, $path, $value); - } - - /** - * @param array|string $path The path to follow. Either a simple array of keys or a string in the format 'foo.bar.baz' - * @param mixed $value - */ - public function getConfigurationByPath($path) { - $this->configuration = Arrays::getValueByPath($this->configuration, $path); - } - - /** - * @param string $superTypeName - */ - public function addSuperType($superTypeName) { - $this->superTypes[$superTypeName] = TRUE; - } - - /** - * @return array - */ - public function getSuperTypes() { - $superTypes = array(); - foreach ($this->superTypes as $superTypeName=>$superTypeStatus) { - if ($superTypeStatus === TRUE) { - $superTypes[] = $superTypeName; - } - } - - return $superTypes; - } - - /** - * @return boolean - */ - public function hasSuperTypes() { - return (boolean)count($this->getSuperTypes()); - } - - /** - * @return array - */ - public function getRelatedNodeTypes() { - return $this->relatedNodeTypes; - } - - /** - * @return array - */ - public function getProperties() { - return $this->properties; - } - - /** - * @param array $properties - */ - public function setProperties($properties) { - $this->properties = array(); - foreach ($properties as $property) { - $this->initializeRelatedNodeTypes($property); - /** @var Property $property */ - if ($property->isSkipProperty()) { - continue; - } - $propertyName = $property->getName(); - $configuration = $property->getConfiguration(); - - $this->properties[$propertyName] = $this->configurationService->mergePropertyConfigurationWithDefaultConfiguration($propertyName, $this->getName(), $configuration); - } - } - - /** - * @return boolean - */ - public function hasProperties() { - return (boolean)count($this->getProperties()); - } - - /** - * @param Property $property - * @return void - */ - protected function initializeRelatedNodeTypes(Property $property) { - if (substr($property->getType(), 0, 9) !== 'reference') { - return; - } - - $configuration = $property->getConfiguration(); - $nodeTypes = Arrays::getValueByPath($configuration, 'ui.inspector.editorOptions.nodeTypes') ?: array(); - foreach ($nodeTypes as $nodeType) { - $this->relatedNodeTypes[$nodeType] = TRUE; - } - } - -} \ No newline at end of file diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/Property.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/Property.php deleted file mode 100644 index 5610228..0000000 --- a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/Property.php +++ /dev/null @@ -1,167 +0,0 @@ - 'boolean', - 'Date' => 'date', - 'DateTime' => 'date', - 'Float' => 'float', - 'Number' => 'integer', - 'Integer' => 'integer', - 'Text' => 'string', - 'Time' => 'date', - 'URL' => 'string' - ); - - /** - * @var string - */ - protected $name; - - /** - * @var string - */ - protected $label; - - /** - * @var string - */ - protected $comment; - - /** - * @var string - */ - protected $type; - - /** - * @var boolean - */ - protected $reloadIfChanged; - - /** - * @var array - */ - protected $ui = array(); - - /** - * @var boolean - */ - protected $skipProperty = FALSE; - - /** - * @param ConfigurationService $configurationService - * @param string $type - * @param string $name - * @param string $label - * @param string $comment - * @param string $groupName - * @param boolean $reloadIfChanged - * - */ - public function __construct(ConfigurationService $configurationService, $type, $name, $label, $comment, $groupName, $reloadIfChanged = FALSE) { - $this->configurationService = $configurationService; - $this->type = $this->convertDataType($type, $name); - $this->name = (string)$name; - $this->label = (string)$label; - $this->comment = (string)$comment; - $this->ui = Arrays::arrayMergeRecursiveOverrule($this->ui, array( - 'label' => $this->label, - 'comment' => $this->comment, - 'inspector' => array( - 'group' => $groupName - ) - )); - $this->reloadIfChanged = (boolean)$reloadIfChanged; - } - - /** - * @return boolean - */ - public function isSkipProperty() { - return $this->skipProperty; - } - - /** - * @param boolean $skipProperty - */ - public function setSkipProperty($skipProperty) { - $this->skipProperty = $skipProperty; - } - - /** - * @return string - */ - public function getName() { - return $this->name; - } - - /** - * @return string - */ - public function getType() { - return $this->type; - } - - /** - * @param string $schemaOrgPropertyName - * @param string $propertyName - * @return string - */ - protected function convertDataType($schemaOrgPropertyName, $propertyName) { - if (strpos($schemaOrgPropertyName, ':')) { - $type = Functions::substr($propertyName, -1) === 's' ? 'references' : 'reference'; - $schemaOrgPropertyName = $this->configurationService->nodeTypeNameMapping($schemaOrgPropertyName); - $this->ui = Arrays::setValueByPath($this->ui, 'inspector', array( - 'editorOptions' => array( - 'nodeTypes' => array($schemaOrgPropertyName) - ) - )); - } else { - if (!isset($this->dataTypeMapping[$schemaOrgPropertyName]) && strpos($schemaOrgPropertyName, ':') > 0) { - throw new \InvalidArgumentException(sprintf('Invalid property type (%s)', $schemaOrgPropertyName), 1396192757); - } - $type = (string)$this->dataTypeMapping[$schemaOrgPropertyName]; - } - return $type; - } - - /** - * @return array - */ - public function getConfiguration() { - $configuration = array( - 'type' => $this->type, - 'ui' => $this->ui - ); - - return $configuration; - } -} \ No newline at end of file diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Service/ConfigurationService.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Service/ConfigurationService.php deleted file mode 100644 index e5fc410..0000000 --- a/Classes/Flowpack/SchemaOrg/NodeTypes/Service/ConfigurationService.php +++ /dev/null @@ -1,154 +0,0 @@ -nodeTypeMapping[$typeName])) { - return $this->nodeTypeMapping[$typeName]; - } - - return $nodeTypeName; - } - - /** - * @param string $type - * @return array - */ - public function getTypeDefaultConfiguration($type) { - $configuration = $this->typeDefaultConfiguration['*']; - if (isset($this->typeDefaultConfiguration[$type])) { - $configuration = Arrays::arrayMergeRecursiveOverrule($configuration, $this->typeDefaultConfiguration[$type]); - } - - return $configuration; - } - - /** - * @param string $propertyName - * @param string $nodeTypeName - * @param array $configuration - * @return array - * @todo add support for property configuration override for a given $nodeTypeName - */ - public function mergePropertyConfigurationWithDefaultConfiguration($propertyName, $nodeTypeName, array $configuration) { - $defaultConfiguration = $this->propertyDefaultConfiguration['*']; - $configuration = Arrays::arrayMergeRecursiveOverrule($defaultConfiguration, $configuration); - if (isset($this->propertyDefaultConfiguration[$propertyName]) && is_array($this->propertyDefaultConfiguration[$propertyName])) { - $configuration = Arrays::arrayMergeRecursiveOverrule($configuration, $this->propertyDefaultConfiguration[$propertyName]); - } - - return $configuration; - } - - /** - * @param string $propertyName - * @param string $nodeTypeName - * @return array - * @todo add support for property configuration override for a given $nodeTypeName - */ - public function getNodeTypeMixinsByProperty($propertyName, $nodeTypeName) { - $mixins = array(); - if (isset($this->propertyMixinsMapping[$propertyName]) && is_array($this->propertyMixinsMapping[$propertyName])) { - $mixins = $this->propertyMixinsMapping[$propertyName]; - } - - return $mixins; - } - - /** - * @param string $propertyName - * @param string $nodeTypeName - * @return array - * @todo add support for property configuration override for a given $nodeTypeName - */ - public function isPropertyBlacklisted($propertyName, $nodeTypeName) { - if (isset($this->propertyBlackList[$propertyName]) && $this->propertyBlackList[$propertyName] === TRUE) { - return TRUE; - } - - return FALSE; - } - - /** - * @return string - */ - public function getPackageKey() { - if (trim($this->packageKey) === '') { - return $this->defaultPackageKey; - } - - return $this->packageKey; - } - - /** - * @param string $packageKey - */ - public function setPackageKey($packageKey) { - $this->packageKey = $packageKey; - } - -} \ No newline at end of file diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Service/NodeTypeBuilder.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Service/NodeTypeBuilder.php deleted file mode 100644 index d8a0cdd..0000000 --- a/Classes/Flowpack/SchemaOrg/NodeTypes/Service/NodeTypeBuilder.php +++ /dev/null @@ -1,107 +0,0 @@ -filename = $filename; - return $this; - } - - /** - * @return $this - */ - public function unlinkExistingFile() { - Files::unlink($this->getSavePathAndFilename($this->filename)); - return $this; - } - - /** - * @param NodeType $nodeType - * @return string - */ - public function dump(NodeType $nodeType) { - $filename = $this->getFilename(); - $dumper = new Dumper(); - - $configuration = $nodeType->getDefaultConfiguration(); - if ($nodeType->hasSuperTypes()) { - if (!isset($configuration['superTypes'])) { - $configuration['superTypes'] = $nodeType->getSuperTypes(); - } else { - $configuration['superTypes'] = array_merge($nodeType->getSuperTypes(), $configuration['superTypes']); - } - } - if ($nodeType->hasProperties()) { - $configuration['properties'] = $nodeType->getProperties(); - } - $nodeTypeDefinition = array( - $nodeType->getName() => Arrays::arrayMergeRecursiveOverrule($configuration, $nodeType->getConfiguration()) - ); - $dumper->setIndentation(2); - $yaml = $dumper->dump($nodeTypeDefinition, 12); - - Files::createDirectoryRecursively($this->renderedNodeTypeRootPath); - - $filename = $this->getSavePathAndFilename($filename); - file_put_contents($filename, $yaml . chr(10) . chr(10), FILE_APPEND); - - return str_replace(FLOW_PATH_ROOT, '', $filename); - } - - /** - * @return string - */ - protected function getFilename() { - if (trim($this->filename) === '') { - throw new \InvalidArgumentException("Please set the filename property ...", 1412162107); - } - return $this->filename; - } - - /** - * @param string $filename - * @return string - */ - protected function getSavePathAndFilename($filename) { - return $this->renderedNodeTypeRootPath . $filename; - } - -} \ No newline at end of file diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Service/SchemaParserService.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Service/SchemaParserService.php deleted file mode 100644 index 9b9109b..0000000 --- a/Classes/Flowpack/SchemaOrg/NodeTypes/Service/SchemaParserService.php +++ /dev/null @@ -1,272 +0,0 @@ -allSchemaJsonFilename = $jsonSchemaFilename; - $this->schemas = array(); - } - - /** - * @return array - * @throws \InvalidArgumentException - */ - public function getSchemas() { - if ($this->schemas !== array()) { - return $this->schemas; - } - $this->schemas = json_decode(file_get_contents($this->allSchemaJsonFilename), TRUE); - if ($this->schemas === NULL) { - throw new \InvalidArgumentException('Unable to decode the given json string', 1396168377); - } - return $this->schemas; - } - - /** - * @param array|string $path The path to follow. Either a simple array of keys or a string in the format 'foo.bar.baz' - * @return mixed - */ - public function getSchemaConfigurationByPath($path) { - $rawSchema = $this->getSchemas(); - return Arrays::getValueByPath($rawSchema, $path); - } - - /** - * @return array - */ - public function parseAll() { - $schemas = array(); - foreach ($this->getSchemaConfigurationByPath('types') as $type => $configuration) { - $schemas = $this->mergeSchema($schemas, $this->parseByType($type)); - } - ksort($schemas); - return $schemas; - } - - /** - * @param array list of schema type to extract, the ancestors schemas will also be extracted - * @return array - * @throws \InvalidArgumentException - */ - public function parseByTypes(array $types) { - $schemas = array(); - foreach ($types as $type) { - $schemas = $this->mergeSchema($schemas, $this->parseByType($type)); - } - ksort($schemas); - return $schemas; - } - - /** - * @param string $type - * @return array - * @throws \InvalidArgumentException - */ - public function parseByType($type) { - static $parsedTypes = array(); - - if (!$type || isset($parsedTypes[$type])) { - return; - } - - $parsedTypes[$type] = TRUE; - - $schemas = array(); - - $currentRawSchema = $this->getSchemaConfigurationByPath(array('types', $type)); - if ($currentRawSchema === NULL) { - throw new \InvalidArgumentException(sprintf('The given type (%s) is not found', $type), 1396190989); - } - - $typeName = $this->getNodeTypeName($type); - $groupName = strtolower($type); - - $nodeType = new NodeType($typeName, $type); - $inspector = array( - 'label' => $currentRawSchema['label'] - ); - if ($currentRawSchema['comment']) { - $inspector['comment'] = $currentRawSchema['comment']; - } - $nodeType->setConfigurationByPath('ui', array( - 'inspector' => array( - 'groups' => array( - $groupName => $inspector - ) - ) - )); - - foreach ($this->parseSuperTypes($type) as $superTypeName => $configuration) { - $schemas[$superTypeName] = $configuration; - if (!isset($schemas[$typeName]['superTypes']) || !is_array($schemas[$typeName]['superTypes'])) { - $schemas[$typeName]['superTypes'] = array(); - } - } - $superTypes = $this->getSchemaConfigurationByPath(array('types', $type, 'supertypes')); - $superType = trim(array_shift($superTypes)); - if ($superType !== '') { - $nodeType->addSuperType($this->getNodeTypeName($superType)); - } - - $nodeType->setProperties($this->processProperties($currentRawSchema['specific_properties'], $groupName, $nodeType)); - - $this->parseRelatedNodeTypes($nodeType, $schemas); - - $schemas[$typeName] = $nodeType; - - return $schemas; - } - - /** - * @param string $dataType - * @return boolean - */ - public function isSimpleDataType($dataType) { - return $this->getSchemaConfigurationByPath(array('datatypes', $dataType)) ? TRUE : FALSE; - } - - /** - * @param array $specificProperties - * @param string $groupName - * @param NodeType $nodeType - * @return array - * @todo add support for Ranges, when we found a correct solution - */ - protected function processProperties(array $specificProperties, $groupName, NodeType $nodeType) { - $currentProperties = array(); - foreach ($specificProperties as $propertyName) { - $skipProperty = FALSE; - $propertyConfiguration = $this->getSchemaConfigurationByPath(array('properties', $propertyName)); - $type = reset($propertyConfiguration['ranges']); - - if ($this->configurationService->isPropertyBlacklisted($propertyName, $type)) { - continue; - } - - foreach ($this->configurationService->getNodeTypeMixinsByProperty($propertyName, $type) as $mixin) { - $nodeType->addSuperType($mixin); - $skipProperty = TRUE; - } - - $property = new Property( - $this->configurationService, - $this->isSimpleDataType($type) ? $type : $this->getNodeTypeName($type), - $propertyConfiguration['id'], - $propertyConfiguration['label'], - $propertyConfiguration['comment'], - $groupName, - FALSE - ); - - $property->setSkipProperty($skipProperty); - $currentProperties[$propertyName] = $property; - } - return $currentProperties; - } - - /** - * @param string $type - * @return array - */ - protected function parseSuperTypes($type) { - $schemas = array(); - $superTypes = $this->getSchemaConfigurationByPath(array('types', $type, 'supertypes')) ?: array(); - foreach ($superTypes as $superType) { - $schemas = $this->mergeSchema($schemas, $this->parseByType($superType)); - } - - return $schemas; - } - - /** - * @param NodeType $nodeType - * @param array $schema - */ - protected function parseRelatedNodeTypes(NodeType $nodeType, array &$schema) { - foreach ($nodeType->getRelatedNodeTypes() as $nodeType => $status) { - $typeName = $this->getSchemaOrgTypeName($nodeType); - if ($typeName === NULL || isset($schemas[$typeName])) { - continue; - } - $schema = $this->mergeSchema($schema, $this->parseByType($typeName)); - } - } - - /** - * @param array $currentSchemas - * @param array|null $additionalSchemas - * @return array - */ - protected function mergeSchema(array $currentSchemas, $additionalSchemas) { - if (is_array($additionalSchemas)) { - $currentSchemas = Arrays::arrayMergeRecursiveOverrule($currentSchemas, $additionalSchemas); - } - return $currentSchemas; - } - - /** - * @param string $schemaType - * @return string - * @throws \InvalidException - */ - protected function getNodeTypeName($schemaType) { - $schemaType = trim($schemaType); - if ($schemaType === '') { - throw new \InvalidException("Empty super type name is not allowed", 1412115678); - } - return $this->configurationService->getPackageKey() . ':' . $schemaType; - } - - protected function getSchemaOrgTypeName($nodeType) { - if (strpos($nodeType, $this->configurationService->getPackageKey()) === FALSE) { - return NULL; - } - - return str_replace($this->configurationService->getPackageKey() . ':', '', $nodeType); - } - -} \ No newline at end of file diff --git a/Classes/Service/ConfigurationService.php b/Classes/Service/ConfigurationService.php new file mode 100644 index 0000000..02087ae --- /dev/null +++ b/Classes/Service/ConfigurationService.php @@ -0,0 +1,155 @@ +nodeTypeMapping[$typeName])) { + return $this->nodeTypeMapping[$typeName]; + } + + return $nodeTypeName; + } + + /** + * @param string $type + * @return array + */ + public function getTypeDefaultConfiguration($type) + { + $configuration = $this->typeDefaultConfiguration['*']; + if (isset($this->typeDefaultConfiguration[$type])) { + $configuration = Arrays::arrayMergeRecursiveOverrule($configuration, $this->typeDefaultConfiguration[$type]); + } + + return $configuration; + } + + /** + * @param string $propertyName + * @param string $nodeTypeName + * @param array $configuration + * @return array + * @todo add support for property configuration override for a given $nodeTypeName + */ + public function mergePropertyConfigurationWithDefaultConfiguration($propertyName, $nodeTypeName, array $configuration) + { + $defaultConfiguration = $this->propertyDefaultConfiguration['*']; + $configuration = Arrays::arrayMergeRecursiveOverrule($defaultConfiguration, $configuration); + if (isset($this->propertyDefaultConfiguration[$propertyName]) && is_array($this->propertyDefaultConfiguration[$propertyName])) { + $configuration = Arrays::arrayMergeRecursiveOverrule($configuration, $this->propertyDefaultConfiguration[$propertyName]); + } + + return $configuration; + } + + /** + * @param string $propertyName + * @param string $nodeTypeName + * @return array + * @todo add support for property configuration override for a given $nodeTypeName + */ + public function getNodeTypeMixinsByProperty($propertyName, $nodeTypeName) + { + $mixins = []; + if (isset($this->propertyMixinsMapping[$propertyName]) && is_array($this->propertyMixinsMapping[$propertyName])) { + $mixins = $this->propertyMixinsMapping[$propertyName]; + } + + return $mixins; + } + + /** + * @param string $propertyName + * @param string $nodeTypeName + * @return boolean + * @todo add support for property configuration override for a given $nodeTypeName + */ + public function isPropertyBlacklisted($propertyName, $nodeTypeName) + { + if (isset($this->propertyBlackList[$propertyName]) && $this->propertyBlackList[$propertyName] === true) { + return true; + } + + return false; + } + + /** + * @return string + */ + public function getPackageKey() + { + if (trim($this->packageKey) === '') { + return $this->defaultPackageKey; + } + + return $this->packageKey; + } + + /** + * @param string $packageKey + */ + public function setPackageKey($packageKey) + { + $this->packageKey = $packageKey; + } +} diff --git a/Classes/Service/NodeTypeBuilder.php b/Classes/Service/NodeTypeBuilder.php new file mode 100644 index 0000000..d3080ea --- /dev/null +++ b/Classes/Service/NodeTypeBuilder.php @@ -0,0 +1,105 @@ +filename = $filename; + return $this; + } + + /** + * @return $this + */ + public function unlinkExistingFile() + { + Files::unlink($this->getSavePathAndFilename($this->filename)); + return $this; + } + + /** + * @param NodeType $nodeType + * @return string + */ + public function dump(NodeType $nodeType) + { + $filename = $this->getFilename(); + $dumper = new Dumper(); + + $configuration = $nodeType->getDefaultConfiguration(); + if ($nodeType->hasSuperTypes()) { + if (!isset($configuration['superTypes'])) { + $configuration['superTypes'] = $nodeType->getSuperTypes(); + } else { + $configuration['superTypes'] = array_merge($nodeType->getSuperTypes(), $configuration['superTypes']); + } + } + if ($nodeType->hasProperties()) { + $configuration['properties'] = $nodeType->getProperties(); + } + $nodeTypeDefinition = [ + $nodeType->getName() => Arrays::arrayMergeRecursiveOverrule($configuration, $nodeType->getConfiguration()), + ]; + $dumper->setIndentation(2); + $yaml = $dumper->dump($nodeTypeDefinition, 12); + + Files::createDirectoryRecursively($this->renderedNodeTypeRootPath); + + $filename = $this->getSavePathAndFilename($filename); + file_put_contents($filename, $yaml . chr(10) . chr(10), FILE_APPEND); + + return str_replace(FLOW_PATH_ROOT, '', $filename); + } + + /** + * @return string + */ + protected function getFilename() + { + if (trim($this->filename) === '') { + throw new \InvalidArgumentException('Please set the filename property ...', 1412162107); + } + return $this->filename; + } + + /** + * @param string $filename + * @return string + */ + protected function getSavePathAndFilename($filename) + { + return $this->renderedNodeTypeRootPath . $filename; + } +} diff --git a/Classes/Service/SchemaParserService.php b/Classes/Service/SchemaParserService.php new file mode 100644 index 0000000..90be3b6 --- /dev/null +++ b/Classes/Service/SchemaParserService.php @@ -0,0 +1,279 @@ +allSchemaJsonFilename = $jsonSchemaFilename; + $this->schemas = []; + } + + /** + * @throws \InvalidArgumentException + * @return array + */ + public function getSchemas() + { + if ($this->schemas !== []) { + return $this->schemas; + } + $this->schemas = json_decode(file_get_contents($this->allSchemaJsonFilename), true); + if ($this->schemas === null) { + throw new \InvalidArgumentException('Unable to decode the given json string', 1396168377); + } + return $this->schemas; + } + + /** + * @param array|string $path The path to follow. Either a simple array of keys or a string in the format 'foo.bar.baz' + * @return mixed + */ + public function getSchemaConfigurationByPath($path) + { + $rawSchema = $this->getSchemas(); + return Arrays::getValueByPath($rawSchema, $path); + } + + /** + * @return array + */ + public function parseAll() + { + $schemas = []; + foreach ($this->getSchemaConfigurationByPath('types') as $type => $configuration) { + $schemas = $this->mergeSchema($schemas, $this->parseByType($type)); + } + ksort($schemas); + return $schemas; + } + + /** + * @param array list of schema type to extract, the ancestors schemas will also be extracted + * @throws \InvalidArgumentException + * @return array + */ + public function parseByTypes(array $types) + { + $schemas = []; + foreach ($types as $type) { + $schemas = $this->mergeSchema($schemas, $this->parseByType($type)); + } + ksort($schemas); + return $schemas; + } + + /** + * @param string $type + * @throws \InvalidArgumentException + * @return array + */ + public function parseByType($type) + { + static $parsedTypes = []; + + if (!$type || isset($parsedTypes[$type])) { + return; + } + + $parsedTypes[$type] = true; + + $schemas = []; + + $currentRawSchema = $this->getSchemaConfigurationByPath(['types', $type]); + if ($currentRawSchema === null) { + throw new \InvalidArgumentException(sprintf('The given type (%s) is not found', $type), 1396190989); + } + + $typeName = $this->getNodeTypeName($type); + $groupName = strtolower($type); + + $nodeType = new NodeType($typeName, $type); + $inspector = [ + 'label' => $currentRawSchema['label'], + ]; + if ($currentRawSchema['comment']) { + $inspector['comment'] = $currentRawSchema['comment']; + } + $nodeType->setConfigurationByPath('ui', [ + 'inspector' => [ + 'groups' => [ + $groupName => $inspector, + ], + ], + ]); + + foreach ($this->parseSuperTypes($type) as $superTypeName => $configuration) { + $schemas[$superTypeName] = $configuration; + if (!isset($schemas[$typeName]['superTypes']) || !is_array($schemas[$typeName]['superTypes'])) { + $schemas[$typeName]['superTypes'] = []; + } + } + $superTypes = $this->getSchemaConfigurationByPath(['types', $type, 'supertypes']); + $superType = trim(array_shift($superTypes)); + if ($superType !== '') { + $nodeType->addSuperType($this->getNodeTypeName($superType)); + } + + $nodeType->setProperties($this->processProperties($currentRawSchema['specific_properties'], $groupName, $nodeType)); + + $this->parseRelatedNodeTypes($nodeType, $schemas); + + $schemas[$typeName] = $nodeType; + + return $schemas; + } + + /** + * @param string $dataType + * @return bool + */ + public function isSimpleDataType($dataType) + { + return $this->getSchemaConfigurationByPath(['datatypes', $dataType]) ? true : false; + } + + /** + * @param array $specificProperties + * @param string $groupName + * @param NodeType $nodeType + * @return array + * @todo add support for Ranges, when we found a correct solution + */ + protected function processProperties(array $specificProperties, $groupName, NodeType $nodeType) + { + $currentProperties = []; + foreach ($specificProperties as $propertyName) { + $skipProperty = false; + $propertyConfiguration = $this->getSchemaConfigurationByPath(['properties', $propertyName]); + $type = reset($propertyConfiguration['ranges']); + + if ($this->configurationService->isPropertyBlacklisted($propertyName, $type)) { + continue; + } + + foreach ($this->configurationService->getNodeTypeMixinsByProperty($propertyName, $type) as $mixin) { + $nodeType->addSuperType($mixin); + $skipProperty = true; + } + + $property = new Property( + $this->configurationService, + $this->isSimpleDataType($type) ? $type : $this->getNodeTypeName($type), + $propertyConfiguration['id'], + $propertyConfiguration['label'], + $propertyConfiguration['comment'], + $groupName, + false + ); + + $property->setSkipProperty($skipProperty); + $currentProperties[$propertyName] = $property; + } + return $currentProperties; + } + + /** + * @param string $type + * @return array + */ + protected function parseSuperTypes($type) + { + $schemas = []; + $superTypes = $this->getSchemaConfigurationByPath(['types', $type, 'supertypes']) ?: []; + foreach ($superTypes as $superType) { + $schemas = $this->mergeSchema($schemas, $this->parseByType($superType)); + } + + return $schemas; + } + + /** + * @param NodeType $nodeType + * @param array $schema + */ + protected function parseRelatedNodeTypes(NodeType $nodeType, array &$schema) + { + foreach ($nodeType->getRelatedNodeTypes() as $nodeType => $status) { + $typeName = $this->getSchemaOrgTypeName($nodeType); + if ($typeName === null || isset($schemas[$typeName])) { + continue; + } + $schema = $this->mergeSchema($schema, $this->parseByType($typeName)); + } + } + + /** + * @param array $currentSchemas + * @param array|null $additionalSchemas + * @return array + */ + protected function mergeSchema(array $currentSchemas, $additionalSchemas) + { + if (is_array($additionalSchemas)) { + $currentSchemas = Arrays::arrayMergeRecursiveOverrule($currentSchemas, $additionalSchemas); + } + return $currentSchemas; + } + + /** + * @param string $schemaType + * @throws \InvalidArgumentException + * @return string + */ + protected function getNodeTypeName($schemaType) + { + $schemaType = trim($schemaType); + if ($schemaType === '') { + throw new \InvalidArgumentException('Empty super type name is not allowed', 1412115678); + } + return $this->configurationService->getPackageKey() . ':' . $schemaType; + } + + protected function getSchemaOrgTypeName($nodeType) + { + if (strpos($nodeType, $this->configurationService->getPackageKey()) === false) { + return null; + } + + return str_replace($this->configurationService->getPackageKey() . ':', '', $nodeType); + } +} diff --git a/README.md b/README.md index 8a813d0..3144d5e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -TYPO3 Neos Utility to create NodeType based on schema.org -========================================================= +Neos Utility to create NodeType based on schema.org +=================================================== This plugin provides a service to create NodeType YAML configuration based on schema.org type. You can found the full schema.org types list here: http://schema.org/docs/full.html @@ -151,7 +151,7 @@ Flowpack: 'Review': abstract: FALSE superTypes: - - 'TYPO3.Neos.NodeTypes:Page' + - 'Neos.NodeTypes:Page' 'PostalAddress': ui: icon: 'icon-building' @@ -167,7 +167,7 @@ Flowpack: SchemaOrg: NodeTypes: nodeTypeMapping: - ImageObject: 'TYPO3.Neos.NodeTypes:Image' + ImageObject: 'Neos.NodeTypes:Image' ``` Configuration: Property Blacklist @@ -195,8 +195,8 @@ Flowpack: NodeTypes: propertyMixinsMapping: 'image': - - 'TYPO3.Neos.NodeTypes:ImageMixin' - - 'TYPO3.Neos.NodeTypes:ImageCaptionMixin' + - 'Neos.NodeTypes:ImageMixin' + - 'Neos.NodeTypes:ImageCaptionMixin' ``` Configuration: Override property configuration @@ -214,5 +214,5 @@ Flowpack: type: 'string' validation: validation: - 'TYPO3.Neos/Validation/EmailAddressValidator': [] -``` \ No newline at end of file + 'Neos.Neos/Validation/EmailAddressValidator': [] +``` diff --git a/Tests/Unit/Domain/Model/NodeTypeTest.php b/Tests/Unit/Domain/Model/NodeTypeTest.php index ee38892..d092d49 100644 --- a/Tests/Unit/Domain/Model/NodeTypeTest.php +++ b/Tests/Unit/Domain/Model/NodeTypeTest.php @@ -2,13 +2,7 @@ namespace Neos\Neos\Tests\Unit\Domain\Model; /* * - * This script belongs to the TYPO3 Flow package "Flowpack.SchemaOrg.NodeTypes". * - * * - * It is free software; you can redistribute it and/or modify it under * - * the terms of the GNU Lesser General Public License, either version 3 * - * of the License, or (at your option) any later version. * - * * - * The TYPO3 project - inspiring people to share! * + * This script belongs to the Neos Flow package "Flowpack.SchemaOrg.NodeTypes". * * */ use Flowpack\SchemaOrg\NodeTypes\Domain\Model\NodeType; @@ -17,73 +11,81 @@ /** * NodeType Tests */ -class NodeTypeTest extends UnitTestCase { +class NodeTypeTest extends UnitTestCase +{ - /** - * @test - */ - public function getNameReturnTheName() { - $nodeType = new NodeType('Foo'); - $this->assertSame('Foo', $nodeType->getName()); - } + /** + * @test + */ + public function getNameReturnTheName() + { + $nodeType = new NodeType('Foo'); + $this->assertSame('Foo', $nodeType->getName()); + } - /** - * @test - */ - public function getAbstractReturnTheAbstractValueByDefaultFalse() { - $nodeType = new NodeType('Foo'); - $this->assertSame(FALSE, $nodeType->getAbstract()); - $nodeType = new NodeType('Foo', TRUE); - $this->assertSame(TRUE, $nodeType->getAbstract()); - } + /** + * @test + */ + public function getAbstractReturnTheAbstractValueByDefaultFalse() + { + $nodeType = new NodeType('Foo'); + $this->assertSame(false, $nodeType->getAbstract()); + $nodeType = new NodeType('Foo', true); + $this->assertSame(true, $nodeType->getAbstract()); + } - /** - * @test - */ - public function getFinalReturnTheFinalValueByDefaultFalse() { - $nodeType = new NodeType('Foo'); - $this->assertSame(FALSE, $nodeType->getFinal()); - $nodeType = new NodeType('Foo', TRUE, TRUE); - $this->assertSame(TRUE, $nodeType->getFinal()); - } + /** + * @test + */ + public function getFinalReturnTheFinalValueByDefaultFalse() + { + $nodeType = new NodeType('Foo'); + $this->assertSame(false, $nodeType->getFinal()); + $nodeType = new NodeType('Foo', true, true); + $this->assertSame(true, $nodeType->getFinal()); + } - /** - * @test - */ - public function getConfigurationReturnAnArray() { - $nodeType = new NodeType('Foo'); - $this->assertSame(array(), $nodeType->getConfiguration()); - } + /** + * @test + */ + public function getConfigurationReturnAnArray() + { + $nodeType = new NodeType('Foo'); + $this->assertSame([], $nodeType->getConfiguration()); + } - /** - * @test - */ - public function setConfigurationByPathUpdateTheCurrentConfiguration() { - $nodeType = new NodeType('Foo'); - $nodeType->setConfigurationByPath('foo.fii', 'Hello World'); - $this->assertSame(array( - 'foo' => array( - 'fii' => 'Hello World' - ) - ), $nodeType->getConfiguration()); - } + /** + * @test + */ + public function setConfigurationByPathUpdateTheCurrentConfiguration() + { + $nodeType = new NodeType('Foo'); + $nodeType->setConfigurationByPath('foo.fii', 'Hello World'); + $this->assertSame([ + 'foo' => [ + 'fii' => 'Hello World', + ], + ], $nodeType->getConfiguration()); + } - /** - * @test - */ - public function getSuperTypeReturnAnArray() { - $nodeType = new NodeType('Foo'); - $this->assertSame(array(), $nodeType->getSuperTypes()); - } + /** + * @test + */ + public function getSuperTypeReturnAnArray() + { + $nodeType = new NodeType('Foo'); + $this->assertSame([], $nodeType->getSuperTypes()); + } - /** - * @test - */ - public function addSuperTypeRegisterNewSuperType() { - $nodeType = new NodeType('Foo'); - $nodeType->addSuperType('Flowpack.SchemaOrg.NodeTypes:Test'); - $this->assertSame(array( - 'Flowpack.SchemaOrg.NodeTypes:Test' => TRUE - ), $nodeType->getSuperTypes()); - } -} \ No newline at end of file + /** + * @test + */ + public function addSuperTypeRegisterNewSuperType() + { + $nodeType = new NodeType('Foo'); + $nodeType->addSuperType('Flowpack.SchemaOrg.NodeTypes:Test'); + $this->assertSame([ + 'Flowpack.SchemaOrg.NodeTypes:Test' => true, + ], $nodeType->getSuperTypes()); + } +} diff --git a/Tests/Unit/Service/SchemaParserServiceTest.php b/Tests/Unit/Service/SchemaParserServiceTest.php index e11ef77..5f7007d 100644 --- a/Tests/Unit/Service/SchemaParserServiceTest.php +++ b/Tests/Unit/Service/SchemaParserServiceTest.php @@ -2,13 +2,7 @@ namespace Neos\Neos\Tests\Unit\Service; /* * - * This script belongs to the TYPO3 Flow package "Flowpack.SchemaOrg.NodeTypes". * - * * - * It is free software; you can redistribute it and/or modify it under * - * the terms of the GNU Lesser General Public License, either version 3 * - * of the License, or (at your option) any later version. * - * * - * The TYPO3 project - inspiring people to share! * + * This script belongs to the Neos Flow package "Flowpack.SchemaOrg.NodeTypes". * * */ use Flowpack\SchemaOrg\NodeTypes\Service\SchemaParserService; @@ -19,81 +13,89 @@ * Testcase for the HTML Augmenter * */ -class SchemaParserServiceTest extends UnitTestCase { +class SchemaParserServiceTest extends UnitTestCase +{ - /** - * @return SchemaParserService - */ - protected function createParser() { - parent::setUp(); - $parser = new SchemaParserService(); - $parser->setAllSchemaJsonFilename(__DIR__ . '/Fixtures/Minimal.json'); - return $parser; - } + /** + * @return SchemaParserService + */ + protected function createParser() + { + parent::setUp(); + $parser = new SchemaParserService(); + $parser->setAllSchemaJsonFilename(__DIR__ . '/Fixtures/Minimal.json'); + return $parser; + } - /** - * @test - * @expectedException InvalidArgumentException - * @expectedExceptionCode 1396190384 - */ - public function setAllSchemaJsonFilenameThrowAnExceptionIfTheFileIsNotFound() { - $parser = $this->createParser(); - $parser->setAllSchemaJsonFilename(__DIR__ . '/Fixtures/NotFound.json'); - } + /** + * @test + * @expectedException \InvalidArgumentException + * @expectedExceptionCode 1396190384 + */ + public function setAllSchemaJsonFilenameThrowAnExceptionIfTheFileIsNotFound() + { + $parser = $this->createParser(); + $parser->setAllSchemaJsonFilename(__DIR__ . '/Fixtures/NotFound.json'); + } - /** - * @test - * @expectedException InvalidArgumentException - * @expectedExceptionCode 1396168377 - */ - public function getSchemasReturnAnExceptionIfTheGivenJsonFileIsNotValid() { - $parser = $this->createParser(); - $parser->setAllSchemaJsonFilename(__DIR__ . '/Fixtures/Invalid.json'); - $parser->getSchemas(); - } + /** + * @test + * @expectedException \InvalidArgumentException + * @expectedExceptionCode 1396168377 + */ + public function getSchemasReturnAnExceptionIfTheGivenJsonFileIsNotValid() + { + $parser = $this->createParser(); + $parser->setAllSchemaJsonFilename(__DIR__ . '/Fixtures/Invalid.json'); + $parser->getSchemas(); + } - /** - * @test - */ - public function setAllSchemaJsonFilenameResetTheProcessedSchemas() { - $parser = $this->createParser(); - $parser->parseByTypes(array('Thing')); - $currentSchemas = $parser->getSchemas(); - $parser->setAllSchemaJsonFilename(__DIR__ . '/Fixtures/Empty.json'); - $this->assertSame(__DIR__ . '/Fixtures/Empty.json', ObjectAccess::getProperty($parser, 'allSchemaJsonFilename', TRUE)); - $this->assertNotSame($currentSchemas, $parser->getSchemas()); - } + /** + * @test + */ + public function setAllSchemaJsonFilenameResetTheProcessedSchemas() + { + $parser = $this->createParser(); + $parser->parseByTypes(['Thing']); + $currentSchemas = $parser->getSchemas(); + $parser->setAllSchemaJsonFilename(__DIR__ . '/Fixtures/Empty.json'); + $this->assertSame(__DIR__ . '/Fixtures/Empty.json', ObjectAccess::getProperty($parser, 'allSchemaJsonFilename', true)); + $this->assertNotSame($currentSchemas, $parser->getSchemas()); + } - /** - * @test - * @expectedException InvalidArgumentException - * @expectedExceptionCode 1396190989 - */ - public function parseByTypeThrowAnExceptionIfTheTypeIsNotFound() { - $parser = $this->createParser(); - $parser->parseByTypes(array('Foo')); - } + /** + * @test + * @expectedException \InvalidArgumentException + * @expectedExceptionCode 1396190989 + */ + public function parseByTypeThrowAnExceptionIfTheTypeIsNotFound() + { + $parser = $this->createParser(); + $parser->parseByTypes(['Foo']); + } - /** - * @test - */ - public function parseByTypesReturnTheGivenSchemaWithAllSuperTypes() { - $parser = $this->createParser(); - $nodeTypes = $parser->parseByTypes(array('Person')); + /** + * @test + */ + public function parseByTypesReturnTheGivenSchemaWithAllSuperTypes() + { + $parser = $this->createParser(); + $nodeTypes = $parser->parseByTypes(['Person']); - $this->assertTrue(count($nodeTypes) === 2); - $keys = array_keys($nodeTypes); + $this->assertTrue(count($nodeTypes) === 2); + $keys = array_keys($nodeTypes); - $this->assertSame('Flowpack.SchemaOrg.NodeTypes:Thing', $keys[0]); - $this->assertSame('Flowpack.SchemaOrg.NodeTypes:Person', $keys[1]); - } + $this->assertSame('Flowpack.SchemaOrg.NodeTypes:Thing', $keys[0]); + $this->assertSame('Flowpack.SchemaOrg.NodeTypes:Person', $keys[1]); + } - /** - * @test - */ - public function parseAllReturnAllAvailableNodeType() { - $parser = $this->createParser(); - $nodeTypes = $parser->parseAll(); - $this->assertSame(548, count($nodeTypes)); - } -} \ No newline at end of file + /** + * @test + */ + public function parseAllReturnAllAvailableNodeType() + { + $parser = $this->createParser(); + $nodeTypes = $parser->parseAll(); + $this->assertSame(548, count($nodeTypes)); + } +} diff --git a/composer.json b/composer.json index e1a6334..3e603d5 100644 --- a/composer.json +++ b/composer.json @@ -1,13 +1,13 @@ { "name": "flowpack/schemaorg-nodetypes", - "type": "typo3-flow-package", - "description": "Add description here", + "type": "neos-package", + "description": "Generate nodeType YAML definitions from schema.org types", "require": { - "typo3/flow": "*" + "neos/flow": "^4.0" }, "autoload": { - "psr-0": { - "Flowpack\\SchemaOrg\\NodeTypes": "Classes" + "psr-4": { + "Flowpack\\SchemaOrg\\NodeTypes\\": "Classes" } }, "extra": { @@ -87,4 +87,4 @@ "Neos.Flow-20170127183102" ] } -} \ No newline at end of file +} From 24614d79f0c8ce63988f3a55a8d29fc584b51b26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 11:01:18 +0200 Subject: [PATCH 75/79] [FIX] setting injections --- Classes/Command/SchemaCommandController.php | 2 +- Classes/Service/ConfigurationService.php | 22 ++++++++++----------- Classes/Service/NodeTypeBuilder.php | 2 +- Classes/Service/SchemaParserService.php | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Classes/Command/SchemaCommandController.php b/Classes/Command/SchemaCommandController.php index 6a224d4..48ffaf8 100644 --- a/Classes/Command/SchemaCommandController.php +++ b/Classes/Command/SchemaCommandController.php @@ -46,7 +46,7 @@ class SchemaCommandController extends CommandController protected $configurationService; /** - * @Flow\Inject(setting="schemas.jsonFilename") + * @Flow\InjectConfiguration("schemas.jsonFilename") * @var string */ protected $jsonSchema; diff --git a/Classes/Service/ConfigurationService.php b/Classes/Service/ConfigurationService.php index 02087ae..d57bd15 100644 --- a/Classes/Service/ConfigurationService.php +++ b/Classes/Service/ConfigurationService.php @@ -16,37 +16,37 @@ class ConfigurationService { /** - * @Flow\Inject(setting="nodeTypeMapping") - * @var string + * @Flow\InjectConfiguration("nodeTypeMapping") + * @var array */ protected $nodeTypeMapping; /** - * @Flow\Inject(setting="propertyDefaultConfiguration") - * @var string + * @Flow\InjectConfiguration("propertyDefaultConfiguration") + * @var array */ protected $propertyDefaultConfiguration; /** - * @Flow\Inject(setting="typeDefaultConfiguration") - * @var string + * @Flow\InjectConfiguration("typeDefaultConfiguration") + * @var array */ protected $typeDefaultConfiguration; /** - * @Flow\Inject(setting="propertyMixinsMapping") - * @var string + * @Flow\InjectConfiguration("propertyMixinsMapping") + * @var array */ protected $propertyMixinsMapping; /** - * @Flow\Inject(setting="propertyBlackList") - * @var string + * @Flow\InjectConfiguration("propertyBlackList") + * @var array */ protected $propertyBlackList; /** - * @Flow\Inject(setting="defaultPackageKey") + * @Flow\InjectConfiguration("defaultPackageKey") * @var string */ protected $defaultPackageKey; diff --git a/Classes/Service/NodeTypeBuilder.php b/Classes/Service/NodeTypeBuilder.php index d3080ea..cbc459b 100644 --- a/Classes/Service/NodeTypeBuilder.php +++ b/Classes/Service/NodeTypeBuilder.php @@ -20,7 +20,7 @@ class NodeTypeBuilder { /** - * @Flow\Inject(setting="renderedNodeTypeRootPath") + * @Flow\InjectConfiguration("renderedNodeTypeRootPath") * @var string */ protected $renderedNodeTypeRootPath; diff --git a/Classes/Service/SchemaParserService.php b/Classes/Service/SchemaParserService.php index 90be3b6..b0420b0 100644 --- a/Classes/Service/SchemaParserService.php +++ b/Classes/Service/SchemaParserService.php @@ -24,7 +24,7 @@ class SchemaParserService protected $configurationService; /** - * @Flow\Inject(setting="schemas.jsonFilename") + * @Flow\InjectConfiguration("schemas.jsonFilename") * @var string */ protected $allSchemaJsonFilename; From d14750dd0c0ed99a66a0cf046213fecb25cd6d3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 11:32:44 +0200 Subject: [PATCH 76/79] [FIX] handle fallback CR nodeType --- Classes/Command/SchemaCommandController.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Classes/Command/SchemaCommandController.php b/Classes/Command/SchemaCommandController.php index 48ffaf8..adb9726 100644 --- a/Classes/Command/SchemaCommandController.php +++ b/Classes/Command/SchemaCommandController.php @@ -50,6 +50,11 @@ class SchemaCommandController extends CommandController * @var string */ protected $jsonSchema; + /** + * @Flow\InjectConfiguration(path="fallbackNodeType",package="Neos.ContentRepository") + * @var string + */ + protected $fallbackNodeTypeName; /** * Extract Schema.org to build NodeTypes configuration @@ -87,6 +92,9 @@ public function extractCommand($name = null, $packageKey = null, $type = null) try { $existingNodeType = $this->nodeTypeManager->getNodeType($nodeType->getName()); + if ($existingNodeType->getName() === $this->fallbackNodeTypeName) { + throw new NodeTypeNotFoundException(); + } $this->outputFormatted(' - NodeType "%s" skipped, update is not supported ...', [$existingNodeType->getName()]); ++$error; } catch (NodeTypeNotFoundException $exception) { From be1c7c1a1dbe97ff48a5d435a1bcfbbf2d0a05f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 11:43:32 +0200 Subject: [PATCH 77/79] [FIX] superTypes yaml scheme --- Classes/Service/NodeTypeBuilder.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Classes/Service/NodeTypeBuilder.php b/Classes/Service/NodeTypeBuilder.php index cbc459b..62b37f2 100644 --- a/Classes/Service/NodeTypeBuilder.php +++ b/Classes/Service/NodeTypeBuilder.php @@ -61,9 +61,13 @@ public function dump(NodeType $nodeType) $configuration = $nodeType->getDefaultConfiguration(); if ($nodeType->hasSuperTypes()) { if (!isset($configuration['superTypes'])) { - $configuration['superTypes'] = $nodeType->getSuperTypes(); + $superTypes = $nodeType->getSuperTypes(); } else { - $configuration['superTypes'] = array_merge($nodeType->getSuperTypes(), $configuration['superTypes']); + $superTypes = array_merge($nodeType->getSuperTypes(), $configuration['superTypes']); + } + $configuration['superTypes'] = []; + foreach ($superTypes as $superType) { + $configuration['superTypes'][$superType] = true; } } if ($nodeType->hasProperties()) { From b6335b5bedc46b5b5d6c1af4a0464ed9f159810f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 13:15:05 +0200 Subject: [PATCH 78/79] [TASK] implement a fusion prototype generator that can prepare JSON+LD structure --- .../Service/SchemaOrgPrototypeGenerator.php | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 Classes/Domain/Service/SchemaOrgPrototypeGenerator.php diff --git a/Classes/Domain/Service/SchemaOrgPrototypeGenerator.php b/Classes/Domain/Service/SchemaOrgPrototypeGenerator.php new file mode 100644 index 0000000..b5dbde9 --- /dev/null +++ b/Classes/Domain/Service/SchemaOrgPrototypeGenerator.php @@ -0,0 +1,59 @@ +getName(), ':') === false) { + return ''; + } + $output = ''; + /** @var NodeType $superType */ + foreach ($nodeType->getDeclaredSuperTypes() as $superType) { + + if (!$superType->isAbstract()) { + continue; + } + + $output .= chr(10); + $output .= 'prototype(' . $superType->getName() . ') < prototype(Neos.Fusion:RawArray) {' . chr(10); + + $output .= "\t" . '\'@context\' = \'http://schema.org\'' . chr(10); + list($packageKey, $relativeName) = explode(':', $superType->getName(), 2); + $output .= "\t" . '\'@type\' = \'' . $relativeName . '\'' . chr(10); + + foreach ($superType->getProperties() as $propertyName => $propertyConfiguration) { + if (isset($propertyName[0]) && $propertyName[0] !== '_') { + $output .= "\t" . $propertyName . ' = ${q(node).property("' . $propertyName . '")}' . chr(10); + if (isset($propertyConfiguration['type']) && $propertyConfiguration['type'] === 'DateTime') { + $output .= "\t" . $propertyName . '.@process.formatDate = ${Date.format(value, \'Y-m-d\')}' . chr(10); + } + // todo: handle reference types as nested RawArray + } + } + + $output .= '}' . chr(10); + + } + return $output; + } + + +} From b2ebb472125a5b5001cc8852a0ca82dedbe5c94a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Ho=CC=88chtl?= Date: Fri, 7 Apr 2017 13:44:57 +0200 Subject: [PATCH 79/79] [TASK] change fusion prototype naming schema --- .../Service/SchemaOrgPrototypeGenerator.php | 4 ++- README.md | 36 +++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/Classes/Domain/Service/SchemaOrgPrototypeGenerator.php b/Classes/Domain/Service/SchemaOrgPrototypeGenerator.php index b5dbde9..6d25f2c 100644 --- a/Classes/Domain/Service/SchemaOrgPrototypeGenerator.php +++ b/Classes/Domain/Service/SchemaOrgPrototypeGenerator.php @@ -33,7 +33,7 @@ public function generate(NodeType $nodeType) } $output .= chr(10); - $output .= 'prototype(' . $superType->getName() . ') < prototype(Neos.Fusion:RawArray) {' . chr(10); + $output .= 'prototype(' . $superType->getName() . '.Schema) < prototype(Neos.Fusion:RawArray) {' . chr(10); $output .= "\t" . '\'@context\' = \'http://schema.org\'' . chr(10); list($packageKey, $relativeName) = explode(':', $superType->getName(), 2); @@ -45,6 +45,8 @@ public function generate(NodeType $nodeType) if (isset($propertyConfiguration['type']) && $propertyConfiguration['type'] === 'DateTime') { $output .= "\t" . $propertyName . '.@process.formatDate = ${Date.format(value, \'Y-m-d\')}' . chr(10); } + $output .= "\t" . $propertyName . '.@if.notEmpty = ${q(node).property("' . $propertyName . '") != null}' . chr(10); + // todo: handle reference types as nested RawArray } } diff --git a/README.md b/README.md index 3144d5e..7650615 100644 --- a/README.md +++ b/README.md @@ -216,3 +216,39 @@ Flowpack: validation: 'Neos.Neos/Validation/EmailAddressValidator': [] ``` + +Fusion prototype generation +--------------------------- + +As you might want to use the generate schema properties to be included as `JSON-LD` in your template and not +copy paste all properties into Fusion or Fluid (Fusion preferred of course), we provide a Fusion-Generator +that auto-generates Fusion prototypes for every abstract NodeType that is used in your node. + +Given you have a nodeType definition and auto-generated the `JobPosting` schema e.g. + +```yaml +'My.Site:Job': + options: + fusion: + prototypeGenerator: Flowpack\SchemaOrg\NodeTypes\Domain\Service\SchemaOrgPrototypeGenerator + superTypes: + 'Neos.NodeTypes:Page': true + 'My.Site:JobPosting': true +``` + +The prototype generator will generate Fusion objects for all abstract superTypes with name `My.Site:JobPosting.Schema` +that is a `Neos.Fusion:RawArray` containing all properties already. + +You can simply use: + +```neosfusion +jobPostingMeta = Neos.Fusion:Tag { + tagName = 'script' + attributes.type = 'application/ld+json' + content = My.Site:JobPosting.Schema { + @process.json = ${Json.stringify(value)} + } +} +``` + +to have a full `JSON-LD` in your frontend without manually mapping all properties.