Skip to content

Commit 936b952

Browse files
usernaneusernane
committed
fix: Namespaces Issue
1 parent ff68a02 commit 936b952

9 files changed

Lines changed: 64 additions & 24 deletions

‎Themes/VuetifyCore/Cli/FooterSectionWriter.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ public function getWireframe() : string {
2121
public function __construct(VuetifyThemeClassWriter $writer) {
2222
parent::__construct('FooterSection', $writer->getPath(), $writer->getNamespace());
2323

24-
$this->addUseStatement('WebFiori\Framework\ui\WebPage');
25-
$this->addUseStatement('WebFiori\\UI\\HTMLNode');
24+
$this->addUseStatement('WebFiori\Framework\Ui\WebPage');
25+
$this->addUseStatement('WebFiori\\Ui\\HTMLNode');
2626
$this->wf = $writer->getWireframe();
2727

2828

‎Themes/VuetifyCore/Cli/HeadSectionWriter.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
class HeadSectionWriter extends ClassWriter {
1313
public function __construct(VuetifyThemeClassWriter $writer) {
1414
parent::__construct('HeadSection', $writer->getPath(), $writer->getNamespace());
15-
$this->addUseStatement('WebFiori\Framework\ui\WebPage');
16-
$this->addUseStatement('WebFiori\\UI\\HeadNode');
15+
$this->addUseStatement('WebFiori\Framework\Ui\WebPage');
16+
$this->addUseStatement('WebFiori\\Ui\\HeadNode');
1717
}
1818
public function writeClassBody() {
1919

‎Themes/VuetifyCore/Cli/HeaderSectionWriter.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ public function getWireframe() : string {
2121
public function __construct(VuetifyThemeClassWriter $writer) {
2222
parent::__construct('HeaderSection', $writer->getPath(), $writer->getNamespace());
2323

24-
$this->addUseStatement('WebFiori\Framework\ui\WebPage');
25-
$this->addUseStatement('WebFiori\\UI\\HTMLNode');
24+
$this->addUseStatement('WebFiori\Framework\Ui\WebPage');
25+
$this->addUseStatement('WebFiori\\Ui\\HTMLNode');
2626
$this->wf = $writer->getWireframe();
2727

2828
}

‎Themes/VuetifyCore/Cli/SideSectionWriter.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ class SideSectionWriter extends ClassWriter {
1818
public function __construct(VuetifyThemeClassWriter $writer) {
1919
parent::__construct('AsideSection', $writer->getPath(), $writer->getNamespace());
2020

21-
$this->addUseStatement('WebFiori\Framework\ui\WebPage');
22-
$this->addUseStatement('WebFiori\\UI\\HTMLNode');
21+
$this->addUseStatement('WebFiori\Framework\Ui\WebPage');
22+
$this->addUseStatement('WebFiori\\Ui\\HTMLNode');
2323
$this->wf = $writer->getWireframe();
2424
}
2525
public function getWireframe() : string {

‎Themes/VuetifyCore/Cli/SysBarWriter.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ class SysBarWriter extends ClassWriter {
1818
public function __construct(VuetifyThemeClassWriter $writer) {
1919
parent::__construct('SystemBarSection', $writer->getPath(), $writer->getNamespace());
2020

21-
$this->addUseStatement('WebFiori\Framework\ui\WebPage');
22-
$this->addUseStatement('use WebFiori\\UI\\HTMLNode');
21+
$this->addUseStatement('WebFiori\Framework\Ui\WebPage');
22+
$this->addUseStatement('use WebFiori\\Ui\\HTMLNode');
2323
$this->wf = $writer->getWireframe();
2424
}
2525
public function getWireframe() : string {

‎Themes/VuetifyCore/Cli/VuetifyThemeClassWriter.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ public function __construct(array $classInfoArr) {
1717
$ns = $this->getNamespace();
1818

1919
$this->addUseStatement('Themes\\VuetifyCore\\VuetifyThemeCore;');
20-
$this->addUseStatement('WebFiori\\UI\\HTMLNode;');
21-
$this->addUseStatement('WebFiori\UI\HeadNode');
20+
$this->addUseStatement('WebFiori\\Ui\\HTMLNode;');
21+
$this->addUseStatement('WebFiori\Ui\HeadNode');
2222

2323
$this->addUseStatement($ns.'\\AsideSection');
2424
$this->addUseStatement($ns.'\\FooterSection');

‎Themes/VuetifyCore/CommonHead.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
namespace Themes\VuetifyCore;
44

55
use WebFiori\Framework\App;
6-
use WebFiori\Framework\ui\WebPage;
7-
use WebFiori\UI\HeadNode;
6+
use WebFiori\Framework\Ui\WebPage;
7+
use WebFiori\Ui\HeadNode;
88
use WebFiori\Ui\HTMLNode;
9-
use WebFiori\UI\JsCode;
9+
use WebFiori\Ui\JsCode;
1010
/**
1111
* A base class that represents a <head> tag.
1212
*

‎Themes/VuetifyCore/VueHeadSectionV2.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
namespace Themes\VuetifyCore;
33

4-
use WebFiori\Framework\ui\WebPage;
4+
use WebFiori\Framework\Ui\WebPage;
55
/**
66
* This class represents head section the theme.
77
*

‎tests/Themes/VuetifyCore/CreateVuetifyThemeTest.php‎

Lines changed: 48 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ class CreateVuetifyThemeTest extends CommandTestCase {
1111
public function test00() {
1212
$ns = 'TestTheme\\My';
1313
$name = 'MyCoolVuetifyTheme';
14-
$path = ROOT_PATH.DS.$ns;
14+
$path = ROOT_PATH . DS . str_replace('\\', DS, $ns);
15+
16+
// Clean up before test
17+
$this->cleanupTestResources($path);
18+
1519
$output = $this->executeSingleCommand(new CreateVuetifyThemeCommand(), [], [
1620
'0',
1721
$name,
@@ -29,11 +33,47 @@ public function test00() {
2933
"Creating new vuetify theme based on 'Base' wireframe...\n",
3034
"Your theme was successfully created.\n"
3135
], $output);
32-
$this->assertTrue(file_exists($path.DS.$name.'.php'), "File not found: ".$path.DS.$name.'.php');
33-
$this->assertTrue(class_exists($ns.'\\'.$name), "Class not found: ".$ns.'\\'.$name);
34-
$this->assertTrue(class_exists($ns.'\\AsideSection', "Class not found: ".$ns.'\\AsideSection'));
35-
$this->assertTrue(class_exists($ns.'\\FooterSection', "Class not found: ".$ns.'\\FooterSection'));
36-
$this->assertTrue(class_exists($ns.'\\HeaderSection', "Class not found: ".$ns.'\\HeaderSection'));
37-
$this->assertTrue(class_exists($ns.'\\HeadSection', "Class not found: ".$ns.'\\HeadSection'));
36+
37+
// Check that all expected files were created
38+
$expectedFiles = [
39+
$name . '.php',
40+
'AsideSection.php',
41+
'FooterSection.php',
42+
'HeaderSection.php',
43+
'HeadSection.php'
44+
];
45+
46+
foreach ($expectedFiles as $fileName) {
47+
$filePath = $path . DS . $fileName;
48+
$this->assertTrue(file_exists($filePath), "File not found: " . $filePath);
49+
require_once $filePath;
50+
$this->assertTrue(class_exists($ns.'\\'.explode('.', $fileName)[0]), "Class not found: " . $ns.'\\'.explode('.', $fileName)[0]);
51+
}
52+
53+
// Clean up after test
54+
$this->cleanupTestResources($path);
55+
}
56+
57+
/**
58+
* Deletes all resources created by a test in the specified path
59+
*
60+
* @param string $path The path to clean up
61+
*/
62+
public function cleanupTestResources($path) {
63+
if (is_dir($path)) {
64+
$files = glob($path . DS . '*');
65+
foreach ($files as $file) {
66+
if (is_file($file)) {
67+
unlink($file);
68+
}
69+
}
70+
rmdir($path);
71+
}
72+
73+
// Also remove parent directory if empty
74+
$parentPath = dirname($path);
75+
if (is_dir($parentPath) && count(glob($parentPath . DS . '*')) === 0) {
76+
rmdir($parentPath);
77+
}
3878
}
39-
}
79+
}

0 commit comments

Comments
 (0)