Skip to content

Commit f6da669

Browse files
pscheitpscheit
committed
add new WriteHtaccessPart to simply copy the htaccess file (which is not quite right, yet)
refactor the create-class code from commands into a simple command abstraction fluid interface
1 parent 107740b commit f6da669

File tree

7 files changed

+224
-13
lines changed

7 files changed

+224
-13
lines changed

‎lib/Webforge/Code/Generator/CreateClassCommand.php

+118
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
<?php
2+
3+
namespace Webforge\Code\Generator;
4+
5+
use Webforge\Framework\Container;
6+
use Closure;
7+
8+
/**
9+
* Easier usage of the classCreater
10+
*/
11+
class CreateClassCommand {
12+
13+
/**
14+
* @var Webforge\Code\Generator\ClassCreater
15+
*/
16+
protected $classCreater;
17+
18+
/**
19+
* is avaible after fqn()
20+
* @var Webforge\Code\Generator\GClass
21+
*/
22+
protected $gClass;
23+
24+
/**
25+
* is avaible after write()
26+
* @var Psc\System\File
27+
*/
28+
protected $file;
29+
30+
public function __construct(ClassCreater $classCreater) {
31+
$this->classCreater = $classCreater;
32+
}
33+
34+
/**
35+
* @return Webforge\Code\Generator\CreateClassCommand
36+
*/
37+
public static function fromContainer(Container $container) {
38+
return new static(
39+
new ClassCreater(
40+
$container->getClassFileMapper(),
41+
$container->getClassWriter(),
42+
$container->getClassElevator()
43+
)
44+
);
45+
}
46+
47+
public function reset() {
48+
$this->file = NULL;
49+
$this->gClass = NULL;
50+
return $this;
51+
}
52+
53+
/**
54+
* @chainable
55+
*/
56+
public function fqn($fqn) {
57+
$this->reset();
58+
$this->gClass = new GClass($fqn);
59+
return $this;
60+
}
61+
62+
/**
63+
* @chainable
64+
*/
65+
public function parent($fqn) {
66+
$this->gClass->setParent(new GClass($fqn));
67+
return $this;
68+
}
69+
70+
/**
71+
* @chainable
72+
*/
73+
public function addInterface($fqn) {
74+
$this->gClass->addInterface(new GInterface($fqn));
75+
return $this;
76+
}
77+
78+
/**
79+
*
80+
* @param Closure $do function(GClass $gClass)
81+
* @chainable
82+
*/
83+
public function withGClass(Closure $do) {
84+
$do($this->gClass);
85+
return $this;
86+
}
87+
88+
/**
89+
* @return Webforge\Code\Generator\GClass
90+
*/
91+
public function getGClass() {
92+
return $this->gClass;
93+
}
94+
95+
/**
96+
* @return Psc\System\File
97+
*/
98+
public function getFile() {
99+
return $this->file;
100+
}
101+
102+
/**
103+
* @chainable
104+
*/
105+
public function write($overwrite = FALSE) {
106+
$this->file = $this->classCreater->create($this->gClass, $overwrite ? ClassCreater::OVERWRITE : FALSE);
107+
108+
return $this;
109+
}
110+
111+
/**
112+
* @chainable
113+
*/
114+
public function overwrite() {
115+
return $this->write(TRUE);
116+
}
117+
}
118+
?>

‎lib/Webforge/Framework/Container.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,8 @@ public function getPartsInstaller() {
190190
Array(
191191
new \Webforge\Setup\Installer\CreateCLIPart(),
192192
new \Webforge\Setup\Installer\CreateBootstrapPart(),
193-
new \Webforge\Setup\Installer\InstallTestSuitePart()
193+
new \Webforge\Setup\Installer\InstallTestSuitePart(),
194+
new \Webforge\Setup\Installer\WriteHtaccessPart()
194195
),
195196
$this
196197
);

‎lib/Webforge/Setup/Installer/PartsInstaller.php

+15-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function copy($source, $destination, $flags = 0x000000) {
5555

5656
return $this;
5757
}
58-
58+
5959
public function write($contents, File $destination, $flags = 0x000000) {
6060
if ($destination instanceof File) {
6161
if (($flags & self::IF_NOT_EXISTS) && $destination->exists()) {
@@ -69,6 +69,20 @@ public function write($contents, File $destination, $flags = 0x000000) {
6969
return $this;
7070
}
7171

72+
/**
73+
* @return Psc\System\Dir
74+
*/
75+
public function getWebforgeResources() {
76+
return $this->container->getResourceDirectory();
77+
}
78+
79+
/**
80+
* @return Psc\System\Dir
81+
*/
82+
public function getInstallTemplates() {
83+
return $this->getWebforgeResources()->sub('installTemplates/');
84+
}
85+
7286
public function execute($cmd) {
7387
// @TODO finish test and use a new System->execute() command with symfony process
7488
return system($cmd);

‎lib/Webforge/Setup/Installer/README.md

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# (Parts) Installer
2+
3+
## Create a new Part
4+
5+
- extend the abstract class `Webforge\Setup\Installer\Part` name: `DoSomethingPart`
6+
- call `parent::__construct('DoSomething');`
7+
- add the part to the `Webforge\Framework\Container::getPartsInstaller()` function
8+

‎lib/Webforge/Setup/Installer/WriteHtaccessPart.php

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?php
2+
3+
namespace Webforge\Setup\Installer;
4+
5+
use Psc\System\Dir;
6+
use Webforge\Setup\Installer\Installer;
7+
8+
class WriteHtaccessPart extends Part {
9+
10+
public function __construct() {
11+
return parent::__construct('WriteHtaccess');
12+
}
13+
14+
public function installTo(Dir $target, Installer $installer) {
15+
16+
$installer->copy(
17+
$installer->getInstallTemplates()->getFile('www.htaccess.txt'),
18+
$target->sub('www/')->create()->getFile('.htaccess')
19+
);
20+
}
21+
}
22+
?>

‎lib/inc.commands.php

+44-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22

33
use Webforge\Code\Generator\ClassCreater;
4+
use Webforge\Code\Generator\CreateClassCommand;
45
use Webforge\Code\Generator\ClassWriter;
56
use Webforge\Code\Generator\GFunctionBody;
67
use Webforge\Code\GlobalClassFileMapper;
@@ -12,6 +13,7 @@
1213
use Psc\JS\JSONConverter;
1314
use Psc\System\File;
1415
use Psc\System\Dir;
16+
use Webforge\Common\String;
1517

1618
$container = new FrameworkContainer();
1719
$container->initLocalPackageFromDirectory(Dir::factoryTS(getcwd()));
@@ -36,22 +38,18 @@
3638
$flag('overwrite', NULL, 'If set the class will be created, regardless if the file already exists')
3739
),
3840
function ($input, $output, $command) use ($container) {
39-
$creater = new ClassCreater($container->getClassFileMapper(),
40-
$container->getClassWriter(),
41-
$container->getClassElevator()
42-
);
43-
44-
$gClass = new GClass($input->getArgument('fqn'));
45-
46-
if (($parent = $input->getArgument('parent'))) {
47-
$gClass->setParent($parent = new GClass($parent));
41+
$cmd = CreateClassCommand::fromContainer($container)
42+
->fqn($input->getArgument('fqn'));
43+
44+
if ($parent = $input->getArgument('parent')) {
45+
$cmd->parent($parent);
4846
}
4947

5048
foreach ($input->getArgument('interface') as $interface) {
51-
$gClass->addInterface(new GInterface($interface));
49+
$cmd->addInterface($interface);
5250
}
5351

54-
$file = $creater->create($gClass, $input->getOption('overwrite') ? ClassCreater::OVERWRITE : FALSE);
52+
$file = $cmd->write($input->getOption('overwrite'));
5553

5654
$command->info('wrote Class '.$gClass.' to file: '.$file);
5755
return 0;
@@ -163,4 +161,39 @@ function ($input, $output, $command) use ($container) {
163161
},
164162
'Lists all avaible parts to install'
165163
);
164+
165+
$createCommand('install:create-part',
166+
array(
167+
$arg('partName', 'the name of the part (without \'Part\' as suffix)'),
168+
$flag('overwrite', NULL, 'If set the part will be created, regardless if the file already exists')
169+
),
170+
function ($input, $output, $command) use ($container) {
171+
$partName = $input->getArgument('partName');
172+
173+
if (String::endsWith($partName, 'Part')) {
174+
$partName = mb_substr($partName, 0, -4);
175+
}
176+
177+
$cmd = CreateClassCommand::fromContainer($container)
178+
->fqn('Webforge\Setup\Installer\\'.$partName.'Part')
179+
->parent('Webforge\Setup\Installer\Part')
180+
->withGClass(
181+
function ($gClass) use($partName) {
182+
$gClass->createMethod(
183+
'__construct',
184+
array(),
185+
GFunctionBody::create(
186+
sprintf("return parent::__construct('%s');", $partName)
187+
)
188+
);
189+
})
190+
->write($input->getOption('overwrite'));
191+
192+
$command->info('wrote Part '.$partName.' to file: '.$cmd->getFile());
193+
$command->comment('you need to add '.$cmd->getGClass()->getFQN().' to Webforge\Framework\Container::getPartsInstaller() !');
194+
195+
return 0;
196+
},
197+
'Creates a new part in the Installer'
198+
);
166199
?>

‎resources/installTemplates/www.htaccess.txt

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Options FollowSymLinks
2+
3+
RewriteEngine On
4+
RewriteBase /
5+
6+
# css files from psc-cms
7+
# der Alias /psc-cms muss auf htdocs von psc-cms source zeigen (ohne trailing slash)
8+
RewriteCond %{REQUEST_FILENAME} !-f
9+
RewriteCond %{REQUEST_URI} ^/css
10+
RewriteRule ^(.*) /psc-cms/$1 [L,PT]
11+
12+
#api
13+
RewriteCond %{REQUEST_FILENAME} !-f
14+
RewriteCond %{REQUEST_URI} ^/(cms|entities)/.*
15+
RewriteRule . /api.php [L]

0 commit comments

Comments
 (0)