diff --git a/Neos.ContentRepository/Classes/Domain/Repository/NodeDataRepository.php b/Neos.ContentRepository/Classes/Domain/Repository/NodeDataRepository.php index 79f5425527b..00ee9e65488 100644 --- a/Neos.ContentRepository/Classes/Domain/Repository/NodeDataRepository.php +++ b/Neos.ContentRepository/Classes/Domain/Repository/NodeDataRepository.php @@ -1133,7 +1133,7 @@ protected function getNodeTypeFilterConstraintsForDql($nodeTypeFilter = '') } else { $negate = false; } - $nodeTypeFilterPartSubTypes = array_merge([$this->nodeTypeManager->getNodeType($nodeTypeFilterPart)], $this->nodeTypeManager->getSubNodeTypes($nodeTypeFilterPart)); + $nodeTypeFilterPartSubTypes = array_merge([$this->nodeTypeManager->getNodeType($nodeTypeFilterPart)], $this->nodeTypeManager->getSubNodeTypes($nodeTypeFilterPart, false)); foreach ($nodeTypeFilterPartSubTypes as $nodeTypeFilterPartSubType) { if ($negate === true) { diff --git a/Neos.ContentRepository/Classes/Domain/Service/NodeTypeManager.php b/Neos.ContentRepository/Classes/Domain/Service/NodeTypeManager.php index 3dd918709bd..1b8ae27b8d8 100644 --- a/Neos.ContentRepository/Classes/Domain/Service/NodeTypeManager.php +++ b/Neos.ContentRepository/Classes/Domain/Service/NodeTypeManager.php @@ -82,7 +82,7 @@ public function getNodeTypes($includeAbstractNodeTypes = true) } /** - * Return all non-abstract node types which have a certain $superType, without + * Return all node types which have a certain $superType, without * the $superType itself. * * @param string $superTypeName diff --git a/Neos.Media/Documentation/requirements.in b/Neos.Media/Documentation/requirements.in new file mode 100644 index 00000000000..52096927cfe --- /dev/null +++ b/Neos.Media/Documentation/requirements.in @@ -0,0 +1,2 @@ +sphinx==7.2.6 +sphinx_rtd_theme==1.3.0 diff --git a/Neos.Media/Documentation/requirements.txt b/Neos.Media/Documentation/requirements.txt index 6b3439d4217..12e992402fd 100644 --- a/Neos.Media/Documentation/requirements.txt +++ b/Neos.Media/Documentation/requirements.txt @@ -1,2 +1,62 @@ -sphinx==3.2.1 -sphinx_rtd_theme==1.0.0 +# +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: +# +# pip-compile requirements.in +# +alabaster==0.7.13 + # via sphinx +babel==2.13.0 + # via sphinx +certifi==2023.7.22 + # via requests +charset-normalizer==3.3.0 + # via requests +docutils==0.18.1 + # via + # sphinx + # sphinx-rtd-theme +idna==3.4 + # via requests +imagesize==1.4.1 + # via sphinx +jinja2==3.1.2 + # via sphinx +markupsafe==2.1.3 + # via jinja2 +packaging==23.2 + # via sphinx +pygments==2.16.1 + # via sphinx +requests==2.31.0 + # via sphinx +snowballstemmer==2.2.0 + # via sphinx +sphinx==7.2.6 + # via + # -r requirements.in + # sphinx-rtd-theme + # sphinxcontrib-applehelp + # sphinxcontrib-devhelp + # sphinxcontrib-htmlhelp + # sphinxcontrib-jquery + # sphinxcontrib-qthelp + # sphinxcontrib-serializinghtml +sphinx-rtd-theme==1.3.0 + # via -r requirements.in +sphinxcontrib-applehelp==1.0.7 + # via sphinx +sphinxcontrib-devhelp==1.0.5 + # via sphinx +sphinxcontrib-htmlhelp==2.0.4 + # via sphinx +sphinxcontrib-jquery==4.1 + # via sphinx-rtd-theme +sphinxcontrib-jsmath==1.0.1 + # via sphinx +sphinxcontrib-qthelp==1.0.6 + # via sphinx +sphinxcontrib-serializinghtml==1.1.9 + # via sphinx +urllib3==2.0.6 + # via requests diff --git a/Neos.Neos/Documentation/requirements.in b/Neos.Neos/Documentation/requirements.in new file mode 100644 index 00000000000..52096927cfe --- /dev/null +++ b/Neos.Neos/Documentation/requirements.in @@ -0,0 +1,2 @@ +sphinx==7.2.6 +sphinx_rtd_theme==1.3.0 diff --git a/Neos.Neos/Documentation/requirements.txt b/Neos.Neos/Documentation/requirements.txt index 6b3439d4217..12e992402fd 100644 --- a/Neos.Neos/Documentation/requirements.txt +++ b/Neos.Neos/Documentation/requirements.txt @@ -1,2 +1,62 @@ -sphinx==3.2.1 -sphinx_rtd_theme==1.0.0 +# +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: +# +# pip-compile requirements.in +# +alabaster==0.7.13 + # via sphinx +babel==2.13.0 + # via sphinx +certifi==2023.7.22 + # via requests +charset-normalizer==3.3.0 + # via requests +docutils==0.18.1 + # via + # sphinx + # sphinx-rtd-theme +idna==3.4 + # via requests +imagesize==1.4.1 + # via sphinx +jinja2==3.1.2 + # via sphinx +markupsafe==2.1.3 + # via jinja2 +packaging==23.2 + # via sphinx +pygments==2.16.1 + # via sphinx +requests==2.31.0 + # via sphinx +snowballstemmer==2.2.0 + # via sphinx +sphinx==7.2.6 + # via + # -r requirements.in + # sphinx-rtd-theme + # sphinxcontrib-applehelp + # sphinxcontrib-devhelp + # sphinxcontrib-htmlhelp + # sphinxcontrib-jquery + # sphinxcontrib-qthelp + # sphinxcontrib-serializinghtml +sphinx-rtd-theme==1.3.0 + # via -r requirements.in +sphinxcontrib-applehelp==1.0.7 + # via sphinx +sphinxcontrib-devhelp==1.0.5 + # via sphinx +sphinxcontrib-htmlhelp==2.0.4 + # via sphinx +sphinxcontrib-jquery==4.1 + # via sphinx-rtd-theme +sphinxcontrib-jsmath==1.0.1 + # via sphinx +sphinxcontrib-qthelp==1.0.6 + # via sphinx +sphinxcontrib-serializinghtml==1.1.9 + # via sphinx +urllib3==2.0.6 + # via requests