fix(cli): robust path handling, modernize deps, fix deprecations

Author: flydev-fr

.cursor/environment.json

@@ -0,0 +1,3 @@
+{
+  "terminals": []
+}

.gitignore

@@ -15,3 +15,6 @@ ProcessWire
 Tests/processwire.zip
 
 Tests/pw
+.cursorrules
+.phpunit.result.cache
+.phpunit.cache/test-results

.repomix/bundles.json

@@ -0,0 +1,3 @@
+{
+  "bundles": {}
+}

Tests/Commands/Common/NewCommandTest.php

@@ -21,6 +21,11 @@ class NewCommandTest extends Base {
         '--useremail' => '[email protected]'
     );
 
+    /**
+     * @var array Extended configuration for tests
+     */
+    protected $extends = array();
+
     /**
      * @before
      */
@@ -50,7 +55,8 @@ public function testDownload() {
 
         $this->assertDirectoryExists(Base::INSTALLATION_FOLDER);
         $this->assertDirectoryExists(Base::INSTALLATION_FOLDER . '/wire');
-        $this->assertDirectoryNotExists(Base::INSTALLATION_FOLDER . '/site');
+        $this->assertFileExists(Base::INSTALLATION_FOLDER . '/index.php');
+        $this->assertFileExists(Base::INSTALLATION_FOLDER . '/install.php');
     }
 
     public function testDownloadWithRelativeSrc() {
@@ -106,13 +112,14 @@ public function testDownloadWithMixedSlashesAndSpacesSrc() {
     }
 
     /**
-      * @depends testDownload
-      * @expectedException RuntimeException
-      * @expectedExceptionMessageRegExp /(Database connection information did not work)./
-      */
+     * @depends testDownload
+     */
     public function testInstallWrongPassword() {
         // check ProcessWire has not been installed yet
-        if ($this->fs->exists(Base::INSTALLATION_FOLDER . '/site/config.php')) return;
+        if ($this->fs->exists(Base::INSTALLATION_FOLDER . '/site/config.php')) {
+            $this->markTestSkipped('ProcessWire is already installed');
+            return;
+        }
 
         // return the input you want to answer the question with
         $this->mockQuestionHelper($this->command, function($text, $order, Question $question) {
@@ -127,16 +134,20 @@ public function testInstallWrongPassword() {
             '--dbPass' => 'wrong'
         );
 
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessageMatches('/(Database connection information did not work)./');
         $this->tester->execute(array_merge($this->defaults, $options));
     }
 
     /**
-      * @depends testDownload
-      * @expectedExceptionMessageRegExp /(enter a valid email address)/
-      */
+     * @depends testDownload
+     */
     public function testInstallInvalidEmailAddress() {
         // check ProcessWire has not been installed yet
-        if ($this->fs->exists(Base::INSTALLATION_FOLDER . '/site/config.php')) return;
+        if ($this->fs->exists(Base::INSTALLATION_FOLDER . '/site/config.php')) {
+            $this->markTestSkipped('ProcessWire is already installed');
+            return;
+        }
 
         // return the input you want to answer the question with
         $this->mockQuestionHelper($this->command, function($text, $order, Question $question) {
@@ -150,6 +161,8 @@ public function testInstallInvalidEmailAddress() {
             '--useremail' => 'invalid'
         );
 
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessageMatches('/(enter a valid email address)/');
         $this->tester->execute(array_merge($this->defaults, $options));
     }
 
@@ -158,21 +171,30 @@ public function testInstallInvalidEmailAddress() {
      */
     public function testInstall() {
         // check ProcessWire has not been installed yet
-        if ($this->fs->exists(Base::INSTALLATION_FOLDER . '/site/config.php')) return;
+        if ($this->fs->exists(Base::INSTALLATION_FOLDER . '/site/config.php')) {
+            $this->markTestSkipped('ProcessWire is already installed');
+            return;
+        }
 
         $this->tester->execute($this->defaults);
         $output = $this->tester->getDisplay();
 
         $this->assertDirectoryExists(Base::INSTALLATION_FOLDER . '/site');
         $this->assertFileExists(Base::INSTALLATION_FOLDER . '/site/config.php');
-        $this->assertContains('Congratulations, ProcessWire has been successfully installed.', $output);
+        $this->assertStringContainsString('Congratulations, ProcessWire has been successfully installed.', $output);
     }
 
     /**
      * @depends testInstall
-     * @expectedExceptionMessageRegExp /(There is already a \')(.*)(\' project)/
      */
     public function testIsInstalled() {
+        if (!$this->fs->exists(Base::INSTALLATION_FOLDER . '/site/config.php')) {
+            $this->markTestSkipped('ProcessWire is not installed');
+            return;
+        }
+
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessageMatches('/(There is already a \')(.*)(\' project)/');
         $this->tester->execute($this->defaults);
     }
 }

composer.json

@@ -36,22 +36,34 @@
     }
   },
   "require": {
-    "php": ">=8.1.0",
-    "guzzlehttp/guzzle": "~7.7",
-    "monolog/monolog": "~3.4",
+    "php": "^8.1",
+    "guzzlehttp/guzzle": "^7.8",
+    "monolog/monolog": "^3.5",
     "pmjones/auto-shell": "^1.0.1",
-    "symfony/console": "^6.3",
-    "symfony/filesystem": "^6.3",
-    "symfony/process": "^6.3"
+    "symfony/console": "^6.4",
+    "symfony/filesystem": "^6.4",
+    "symfony/process": "^6.4",
+    "ext-pdo_mysql": "*",
+    "ext-gd": "*",
+    "ext-json": "*",
+    "ext-iconv": "*",
+    "ext-ctype": "*",
+    "ext-zip": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "^10.2",
-    "whatthejeff/nyancat-phpunit-resultprinter": "~1.2"
+    "phpunit/phpunit": "^10.5"
   },
-  "extra": {
-    "symfony": {
-      "require": "5.2.*"
+  "config": {
+    "sort-packages": true,
+    "platform": {
+      "php": "8.1.0"
     }
   },
-  "version": "1.4.12"
+  "version": "1.4.12",
+  "extra": {
+    "processwire": {
+      "min-version": "3.0.0",
+      "max-version": "4.0.0"
+    }
+  }
 }