Skip to content

Commit c321168

Browse files
committed
ACP2E-517: fix static test warnings / errors
1 parent 2277201 commit c321168

File tree

5 files changed

+23
-15
lines changed

5 files changed

+23
-15
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
27
use Magento\Framework\Component\ComponentRegistrar;
38

49
ComponentRegistrar::register(ComponentRegistrar::THEME, 'frontend/Vendor/child', __DIR__);

dev/tests/integration/testsuite/Magento/Deploy/_files/Vendor/child/theme.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
1+
<!--
2+
~ /**
3+
~ * Copyright © Magento, Inc. All rights reserved.
4+
~ * See COPYING.txt for license details.
5+
~ */
6+
-->
27
<theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Config/etc/theme.xsd">
38
<title>Vendor Child</title>
49
<parent>Vendor/parent</parent>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
27
use Magento\Framework\Component\ComponentRegistrar;
38

49
ComponentRegistrar::register(ComponentRegistrar::THEME, 'frontend/Vendor/parent', __DIR__);

dev/tests/integration/testsuite/Magento/Deploy/_files/Vendor/parent/theme.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
1+
<!--
2+
~ /**
3+
~ * Copyright © Magento, Inc. All rights reserved.
4+
~ * See COPYING.txt for license details.
5+
~ */
6+
-->
27
<theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Config/etc/theme.xsd">
38
<title>Vendor Parent</title>
49
<parent>Magento/blank</parent>

dev/tests/integration/testsuite/Magento/Deploy/_files/theme.php

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function rcopy($src, $destination)
3838
foreach ($iterator as $file) {
3939
if ($file->isFile()) {
4040
copy($file->getRealPath(), $destination . '/' . $file->getFilename());
41-
} else if (!$file->isDot() && $file->isDir()) {
41+
} elseif (!$file->isDot() && $file->isDir()) {
4242
rcopy($file->getRealPath(), $destination . '/' . $file);
4343
}
4444
}
@@ -48,10 +48,6 @@ function rcopy($src, $destination)
4848
/** @var ComponentRegistrar $registrar */
4949
$registrar = $objectManager->get(ComponentRegistrar::class);
5050

51-
//rcopy(
52-
// __DIR__ . '/zoom1',
53-
// $appDir->getAbsolutePath() . 'design/frontend/Magento/zoom1'
54-
//);
5551
if (!$registrar->getPath(ComponentRegistrar::THEME, 'frontend/Magento/zoom1')) {
5652
ComponentRegistrar::register(
5753
ComponentRegistrar::THEME,
@@ -60,10 +56,6 @@ function rcopy($src, $destination)
6056
);
6157
}
6258

63-
//rcopy(
64-
// __DIR__ . '/zoom2',
65-
// $appDir->getAbsolutePath() . 'design/frontend/Magento/zoom2'
66-
//);
6759
if (!$registrar->getPath(ComponentRegistrar::THEME, 'frontend/Magento/zoom2')) {
6860
ComponentRegistrar::register(
6961
ComponentRegistrar::THEME,
@@ -72,10 +64,6 @@ function rcopy($src, $destination)
7264
);
7365
}
7466

75-
//rcopy(
76-
// __DIR__ . '/zoom3',
77-
// $appDir->getAbsolutePath() . 'design/frontend/Magento/zoom3'
78-
//);
7967
if (!$registrar->getPath(ComponentRegistrar::THEME, 'frontend/Magento/zoom3')) {
8068
ComponentRegistrar::register(
8169
ComponentRegistrar::THEME,

0 commit comments

Comments
 (0)