Skip to content

Commit 7681db3

Browse files
flydev-frflydev-fr
committed
Merge branch 'main' of github.com:wirecli/wire-cli
2 parents 30e8217 + bd42900 commit 7681db3

File tree

10 files changed

+624
-571
lines changed

10 files changed

+624
-571
lines changed

‎.cursor/environment.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"terminals": []
3+
}

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,6 @@ ProcessWire
1515
Tests/processwire.zip
1616

1717
Tests/pw
18+
.cursorrules
19+
.phpunit.result.cache
20+
.phpunit.cache/test-results

‎.repomix/bundles.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"bundles": {}
3+
}

‎Tests/Commands/Common/NewCommandTest.php‎

Lines changed: 35 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ class NewCommandTest extends Base {
2121
'--useremail' => '[email protected]'
2222
);
2323

24+
/**
25+
* @var array Extended configuration for tests
26+
*/
27+
protected $extends = array();
28+
2429
/**
2530
* @before
2631
*/
@@ -50,7 +55,8 @@ public function testDownload() {
5055

5156
$this->assertDirectoryExists(Base::INSTALLATION_FOLDER);
5257
$this->assertDirectoryExists(Base::INSTALLATION_FOLDER . '/wire');
53-
$this->assertDirectoryNotExists(Base::INSTALLATION_FOLDER . '/site');
58+
$this->assertFileExists(Base::INSTALLATION_FOLDER . '/index.php');
59+
$this->assertFileExists(Base::INSTALLATION_FOLDER . '/install.php');
5460
}
5561

5662
public function testDownloadWithRelativeSrc() {
@@ -106,13 +112,14 @@ public function testDownloadWithMixedSlashesAndSpacesSrc() {
106112
}
107113

108114
/**
109-
* @depends testDownload
110-
* @expectedException RuntimeException
111-
* @expectedExceptionMessageRegExp /(Database connection information did not work)./
112-
*/
115+
* @depends testDownload
116+
*/
113117
public function testInstallWrongPassword() {
114118
// check ProcessWire has not been installed yet
115-
if ($this->fs->exists(Base::INSTALLATION_FOLDER . '/site/config.php')) return;
119+
if ($this->fs->exists(Base::INSTALLATION_FOLDER . '/site/config.php')) {
120+
$this->markTestSkipped('ProcessWire is already installed');
121+
return;
122+
}
116123

117124
// return the input you want to answer the question with
118125
$this->mockQuestionHelper($this->command, function($text, $order, Question $question) {
@@ -127,16 +134,20 @@ public function testInstallWrongPassword() {
127134
'--dbPass' => 'wrong'
128135
);
129136

137+
$this->expectException(\RuntimeException::class);
138+
$this->expectExceptionMessageMatches('/(Database connection information did not work)./');
130139
$this->tester->execute(array_merge($this->defaults, $options));
131140
}
132141

133142
/**
134-
* @depends testDownload
135-
* @expectedExceptionMessageRegExp /(enter a valid email address)/
136-
*/
143+
* @depends testDownload
144+
*/
137145
public function testInstallInvalidEmailAddress() {
138146
// check ProcessWire has not been installed yet
139-
if ($this->fs->exists(Base::INSTALLATION_FOLDER . '/site/config.php')) return;
147+
if ($this->fs->exists(Base::INSTALLATION_FOLDER . '/site/config.php')) {
148+
$this->markTestSkipped('ProcessWire is already installed');
149+
return;
150+
}
140151

141152
// return the input you want to answer the question with
142153
$this->mockQuestionHelper($this->command, function($text, $order, Question $question) {
@@ -150,6 +161,8 @@ public function testInstallInvalidEmailAddress() {
150161
'--useremail' => 'invalid'
151162
);
152163

164+
$this->expectException(\RuntimeException::class);
165+
$this->expectExceptionMessageMatches('/(enter a valid email address)/');
153166
$this->tester->execute(array_merge($this->defaults, $options));
154167
}
155168

@@ -158,21 +171,30 @@ public function testInstallInvalidEmailAddress() {
158171
*/
159172
public function testInstall() {
160173
// check ProcessWire has not been installed yet
161-
if ($this->fs->exists(Base::INSTALLATION_FOLDER . '/site/config.php')) return;
174+
if ($this->fs->exists(Base::INSTALLATION_FOLDER . '/site/config.php')) {
175+
$this->markTestSkipped('ProcessWire is already installed');
176+
return;
177+
}
162178

163179
$this->tester->execute($this->defaults);
164180
$output = $this->tester->getDisplay();
165181

166182
$this->assertDirectoryExists(Base::INSTALLATION_FOLDER . '/site');
167183
$this->assertFileExists(Base::INSTALLATION_FOLDER . '/site/config.php');
168-
$this->assertContains('Congratulations, ProcessWire has been successfully installed.', $output);
184+
$this->assertStringContainsString('Congratulations, ProcessWire has been successfully installed.', $output);
169185
}
170186

171187
/**
172188
* @depends testInstall
173-
* @expectedExceptionMessageRegExp /(There is already a \')(.*)(\' project)/
174189
*/
175190
public function testIsInstalled() {
191+
if (!$this->fs->exists(Base::INSTALLATION_FOLDER . '/site/config.php')) {
192+
$this->markTestSkipped('ProcessWire is not installed');
193+
return;
194+
}
195+
196+
$this->expectException(\RuntimeException::class);
197+
$this->expectExceptionMessageMatches('/(There is already a \')(.*)(\' project)/');
176198
$this->tester->execute($this->defaults);
177199
}
178200
}

‎Tests/Commands/Module/ModuleEnableCommandTest.php‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Tests\Commands\Module;
6+
7+
use PHPUnit\Framework\TestCase;
8+
use Symfony\Component\Console\Application;
9+
use Symfony\Component\Console\Tester\CommandTester;
10+
use Wirecli\Commands\Module\ModuleEnableCommand;
11+
12+
/**
13+
* Class ModuleEnableCommandTest
14+
*
15+
* @package Tests\Commands\Module
16+
*/
17+
class ModuleEnableCommandTest extends TestCase
18+
{
19+
/**
20+
* @var Application
21+
*/
22+
private $application;
23+
24+
/**
25+
* @var CommandTester
26+
*/
27+
private $commandTester;
28+
29+
protected function setUp(): void
30+
{
31+
$this->application = new Application();
32+
$this->application->add(new ModuleEnableCommand());
33+
34+
$command = $this->application->find('module:enable');
35+
$this->commandTester = new CommandTester($command);
36+
}
37+
38+
public function testConfigureSetsCorrectNameAndDescription()
39+
{
40+
$command = $this->application->find('module:enable');
41+
42+
$this->assertEquals('module:enable', $command->getName());
43+
$this->assertEquals('Enables provided module(s)', $command->getDescription());
44+
}
45+
46+
public function testConfigureHasRequiredArguments()
47+
{
48+
$command = $this->application->find('module:enable');
49+
$definition = $command->getDefinition();
50+
51+
$this->assertTrue($definition->hasArgument('modules'));
52+
$this->assertTrue($definition->hasOption('github'));
53+
$this->assertTrue($definition->hasOption('branch'));
54+
}
55+
56+
public function testGithubOptionIsOptional()
57+
{
58+
$command = $this->application->find('module:enable');
59+
$definition = $command->getDefinition();
60+
$githubOption = $definition->getOption('github');
61+
62+
$this->assertFalse($githubOption->isValueRequired());
63+
$this->assertTrue($githubOption->isValueOptional());
64+
}
65+
66+
public function testBranchOptionIsOptional()
67+
{
68+
$command = $this->application->find('module:enable');
69+
$definition = $command->getDefinition();
70+
$branchOption = $definition->getOption('branch');
71+
72+
$this->assertFalse($branchOption->isValueRequired());
73+
$this->assertTrue($branchOption->isValueOptional());
74+
}
75+
76+
public function testCommandHandlesCommaSeparatedModules()
77+
{
78+
$command = $this->application->find('module:enable');
79+
$definition = $command->getDefinition();
80+
$modulesArgument = $definition->getArgument('modules');
81+
82+
$this->assertEquals('modules', $modulesArgument->getName());
83+
$this->assertStringContainsString('comma separated', $modulesArgument->getDescription());
84+
}
85+
}

‎composer.json‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,34 @@
3636
}
3737
},
3838
"require": {
39-
"php": ">=8.1.0",
40-
"guzzlehttp/guzzle": "~7.7",
41-
"monolog/monolog": "~3.4",
39+
"php": "^8.1",
40+
"guzzlehttp/guzzle": "^7.8",
41+
"monolog/monolog": "^3.5",
4242
"pmjones/auto-shell": "^1.0.1",
43-
"symfony/console": "^6.3",
44-
"symfony/filesystem": "^6.3",
45-
"symfony/process": "^6.3"
43+
"symfony/console": "^6.4",
44+
"symfony/filesystem": "^6.4",
45+
"symfony/process": "^6.4",
46+
"ext-pdo_mysql": "*",
47+
"ext-gd": "*",
48+
"ext-json": "*",
49+
"ext-iconv": "*",
50+
"ext-ctype": "*",
51+
"ext-zip": "*"
4652
},
4753
"require-dev": {
48-
"phpunit/phpunit": "^10.2",
49-
"whatthejeff/nyancat-phpunit-resultprinter": "~1.2"
54+
"phpunit/phpunit": "^10.5"
5055
},
51-
"extra": {
52-
"symfony": {
53-
"require": "5.2.*"
56+
"config": {
57+
"sort-packages": true,
58+
"platform": {
59+
"php": "8.1.0"
5460
}
5561
},
56-
"version": "1.4.12"
62+
"version": "1.4.12",
63+
"extra": {
64+
"processwire": {
65+
"min-version": "3.0.0",
66+
"max-version": "4.0.0"
67+
}
68+
}
5769
}

0 commit comments

Comments
 (0)