Skip to content

Commit ca91156

Browse files
pKallertpKallert
committed
Merge branch '8.4' into feature/AddInactiveContentDimensionsDropdown
2 parents 6510a0c + a14bac7 commit ca91156

File tree

38 files changed

+123
-72
lines changed

38 files changed

+123
-72
lines changed

‎.circleci/config.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,20 +137,25 @@ jobs:
137137
echo "Target Branch: $TARGET_BRANCH"
138138
# Save the variable to BASH_ENV to be able to access it in the next steps
139139
echo "export TARGET_BRANCH=$TARGET_BRANCH" >> $BASH_ENV
140-
- run:
141-
name: Use target branch
142-
command: |
143-
echo "Using target branch: $TARGET_BRANCH"
144140
- run:
145141
name: Prepare and run e2e tests
146142
no_output_timeout: 30m
147143
command: |
144+
echo "Using target branch: $TARGET_BRANCH"
148145
export NVM_DIR="$HOME/.nvm"
149146
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
150147
cd /home/circleci/app/Packages/Application/Neos.Neos.Ui
151148
nvm install
152149
nvm use
153150
make test-e2e-saucelabs
151+
- run:
152+
name: Show testcafe output
153+
command: |
154+
for file in /home/circleci/app/Data/Logs/saucelabs-artifacts/**/console.log; do
155+
echo $file
156+
cat $file
157+
done
158+
when: always
154159
- store_artifacts:
155160
path: /home/circleci/app/Data/Logs
156161
- persist_to_workspace:

‎.sauce/config1Dimension.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ sauce:
88
retries: 0
99
metadata:
1010
tags:
11-
- e2e
1211
- $TARGET_BRANCH
13-
build: $TARGET_BRANCH
12+
build: $TARGET_BRANCH $CIRCLE_PR_NUMBER
1413
tunnel:
1514
name: "circleci-tunnel"
1615
testcafe:
@@ -44,7 +43,7 @@ artifacts:
4443
- sauce-test-report.json
4544
when: always
4645
allAttempts: true
47-
directory: ../../Data/Logs/saucelabs-artifacts/
46+
directory: ../../../Data/Logs/saucelabs-artifacts/
4847

4948
reporters:
5049
json:

‎Build/Jenkins/release-neos-ui.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ make install
4747
make build-subpackages
4848

4949
# code quality
50-
make lint
51-
make test
50+
# @todo: Improve to return correct response for passing tests in Jenkins
51+
#make lint
52+
#make test
5253

5354
# publishing
5455
VERSION=$VERSION make bump-version

‎Classes/Aspects/AugmentationAspect.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class AugmentationAspect
5757
* inside the wrapContentObject() advice. It will not be necessary once we implement a custom content element
5858
* wrapping implementation.
5959
*
60-
* @var \Neos\Flow\Mvc\Controller\ControllerContext
60+
* @var ?\Neos\Flow\Mvc\Controller\ControllerContext
6161
*/
6262
protected $controllerContext = null;
6363

‎Classes/ContentRepository/Service/NodeService.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function isDocument(NodeInterface $node)
8686
* @param string $contextPath
8787
* @return NodeInterface|Error
8888
*/
89-
public function getNodeFromContextPath($contextPath, Site $site = null, Domain $domain = null, $includeAll = false)
89+
public function getNodeFromContextPath($contextPath, ?Site $site = null, ?Domain $domain = null, $includeAll = false)
9090
{
9191
$nodePathAndContext = NodePaths::explodeContextPath($contextPath);
9292
$nodePath = $nodePathAndContext['nodePath'];
@@ -170,10 +170,10 @@ public function getNodeInWorkspace(NodeInterface $node, Workspace $workspace): ?
170170
* Prepares the context properties for the nodes based on the given workspace and dimensions
171171
*
172172
* @param string $workspaceName
173-
* @param array $dimensions
173+
* @param ?array $dimensions
174174
* @return array
175175
*/
176-
protected function prepareContextProperties($workspaceName, array $dimensions = null)
176+
protected function prepareContextProperties($workspaceName, ?array $dimensions = null)
177177
{
178178
$contextProperties = [
179179
'workspaceName' => $workspaceName,

‎Classes/Controller/BackendController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public function initializeView(ViewInterface $view)
133133
* @throws \ReflectionException
134134
* @throws \Neos\Flow\Http\Exception
135135
*/
136-
public function indexAction(NodeInterface $node = null): void
136+
public function indexAction(?NodeInterface $node = null): void
137137
{
138138
$user = $this->userService->getBackendUser();
139139

@@ -177,7 +177,7 @@ protected function initializeRedirectToAction(): void
177177

178178
/**
179179
* @param NodeInterface $node
180-
* @param string $presetBaseNodeType
180+
* @param ?string $presetBaseNodeType
181181
* @throws MissingActionNameException
182182
* @throws StopActionException
183183
* @throws UnsupportedRequestTypeException
@@ -187,7 +187,7 @@ protected function initializeRedirectToAction(): void
187187
* @throws \Neos\Flow\Security\Exception
188188
* @throws \Neos\Neos\Exception
189189
*/
190-
public function redirectToAction(NodeInterface $node, string $presetBaseNodeType = null): void
190+
public function redirectToAction(NodeInterface $node, ?string $presetBaseNodeType = null): void
191191
{
192192
$this->response->setHttpHeader('Cache-Control', [
193193
'no-cache',

‎Classes/Domain/Model/AbstractChange.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ protected function updateWorkspaceInfo()
9191
*
9292
* This method will be triggered if [nodeType].properties.[propertyName].ui.reloadIfChanged is TRUE.
9393
*
94-
* @param NodeInterface $node
94+
* @param ?NodeInterface $node
9595
* @return void
9696
*/
9797
protected function reloadDocument($node = null)
@@ -107,7 +107,7 @@ protected function reloadDocument($node = null)
107107
/**
108108
* Inform the client that a node has been created, the client decides if and which tree should react to this change.
109109
*
110-
* @param NodeInterface $subject
110+
* @param ?NodeInterface $subject
111111
* @return void
112112
*/
113113
protected function addNodeCreatedFeedback($subject = null)

‎Classes/Domain/Model/Changes/AbstractCopy.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ protected function finish(NodeInterface $node): void
3636
$updateNodeInfo->setNode($node);
3737
$updateNodeInfo->recursive();
3838
$this->feedbackCollection->add($updateNodeInfo);
39+
$this->addNodeCreatedFeedback($node);
3940
parent::finish($node);
4041
}
4142

‎Classes/Domain/Model/Changes/AbstractMove.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
use Neos\Neos\Ui\Domain\Model\Feedback\Operations\RemoveNode;
1818
use Neos\Flow\Annotations as Flow;
1919
use Neos\Neos\Ui\Domain\Model\Feedback\Operations\UpdateNodePath;
20+
use Neos\Neos\Ui\Domain\Model\Feedback\Operations\Redirect;
2021

2122
abstract class AbstractMove extends AbstractStructuralChange
2223
{
@@ -40,7 +41,11 @@ protected function finish(NodeInterface $node)
4041
$updateNodePath->setNewContextPath($this->getSubject()->getContextPath());
4142
$this->feedbackCollection->add($updateNodePath);
4243
}
43-
44+
if ($this->getSubject()->getNodeType()->isOfType('Neos.Neos:Document')) {
45+
$redirect = new Redirect();
46+
$redirect->setNode($this->getSubject());
47+
$this->feedbackCollection->add($redirect);
48+
}
4449
// $this->getSubject() is the moved node at the NEW location!
4550
parent::finish($this->getSubject());
4651
}

‎Classes/Domain/Model/Changes/AbstractStructuralChange.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ abstract class AbstractStructuralChange extends AbstractChange
4646
protected $nodeService;
4747

4848
/**
49-
* @var NodeInterface
49+
* @var ?NodeInterface
5050
*/
5151
protected $cachedSiblingNode = null;
5252

@@ -87,10 +87,10 @@ abstract public function getMode();
8787
/**
8888
* Set the parent node dom address
8989
*
90-
* @param RenderedNodeDomAddress $parentDomAddress
90+
* @param ?RenderedNodeDomAddress $parentDomAddress
9191
* @return void
9292
*/
93-
public function setParentDomAddress(RenderedNodeDomAddress $parentDomAddress = null)
93+
public function setParentDomAddress(?RenderedNodeDomAddress $parentDomAddress = null)
9494
{
9595
$this->parentDomAddress = $parentDomAddress;
9696
}
@@ -110,10 +110,10 @@ public function getParentDomAddress()
110110
/**
111111
* Set the sibling node dom address
112112
*
113-
* @param RenderedNodeDomAddress $siblingDomAddress
113+
* @param ?RenderedNodeDomAddress $siblingDomAddress
114114
* @return void
115115
*/
116-
public function setSiblingDomAddress(RenderedNodeDomAddress $siblingDomAddress = null)
116+
public function setSiblingDomAddress(?RenderedNodeDomAddress $siblingDomAddress = null)
117117
{
118118
$this->siblingDomAddress = $siblingDomAddress;
119119
}
@@ -131,7 +131,7 @@ public function getSiblingDomAddress()
131131
/**
132132
* Get the sibling node
133133
*
134-
* @return NodeInterface
134+
* @return ?NodeInterface
135135
*/
136136
public function getSiblingNode()
137137
{

0 commit comments

Comments
 (0)