Merge pull request #94 from jigarius/93-support-drupal-11

Support Drupal 11 and Drush 13
jigarius · Sep 23, 2024 · 745f30c · 745f30c
2 parents f1c58fb + dfb175b
commit 745f30c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 24 deletions.
diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-latest']
-        php-versions: ['8.1']
+        php-versions: ['8.3']
     steps:
       - uses: actions/checkout@v2
       - uses: shivammathur/setup-php@v2

diff --git a/src/Command/ExecCommand.php b/src/Command/ExecCommand.php
@@ -41,7 +41,7 @@ class ExecCommand extends BaseCommand {
    */
   protected array $argv;
 
-  public function __construct(string $name = NULL) {
+  public function __construct(?string $name = NULL) {
     parent::__construct($name);
     $this->argv = $GLOBALS['argv'];
   }

diff --git a/src/Drall.php b/src/Drall.php
@@ -2,6 +2,7 @@
 
 namespace Drall;
 
+use Composer\InstalledVersions;
 use Drall\Command\ExecCommand;
 use Drall\Command\SiteAliasesCommand;
 use Drall\Command\SiteDirectoriesCommand;
@@ -19,8 +20,6 @@ final class Drall extends Application {
 
   const NAME = 'Drall';
 
-  const VERSION = '3.1.0-rc1';
-
   use SiteDetectorAwareTrait;
 
   /**
@@ -29,7 +28,7 @@ final class Drall extends Application {
   public function __construct() {
     parent::__construct();
     $this->setName(self::NAME);
-    $this->setVersion(self::VERSION);
+    $this->setVersion(InstalledVersions::getPrettyVersion('jigarius/drall') ?? 'unknown');
     $this->setAutoExit(FALSE);
 
     $this->add(new SiteDirectoriesCommand());

diff --git a/src/Service/SiteDetector.php b/src/Service/SiteDetector.php
@@ -19,7 +19,7 @@ class SiteDetector {
 
   public function __construct(
     DrupalFinder $drupalFinder,
-    SiteAliasManagerInterface $siteAliasManager
+    SiteAliasManagerInterface $siteAliasManager,
   ) {
     $this->setDrupalFinder($drupalFinder);
     $this->setSiteAliasManager($siteAliasManager);
@@ -37,7 +37,7 @@ public function __construct(
    *   Site directory names.
    */
   public function getSiteDirNames(
-    string $group = NULL,
+    ?string $group = NULL,
     ?string $filter = NULL,
   ): array {
     if (!$sitesFile = $this->getSitesFile($group)) {
@@ -66,7 +66,7 @@ public function getSiteDirNames(
    *   Keys from the $sites array.
    */
   public function getSiteKeys(
-    string $group = NULL,
+    ?string $group = NULL,
     ?string $filter = NULL,
     bool $unique = FALSE,
   ): array {
@@ -190,7 +190,7 @@ private function getSitesFile($group = NULL): ?SitesFile {
   private function filter(
     array $data,
     string $expression,
-    string $default_filter_field = 'value'
+    string $default_filter_field = 'value',
   ): array {
     if (empty($data)) {
       return $data;

diff --git a/test/Integration/DrallTest.php b/test/Integration/DrallTest.php
@@ -2,6 +2,7 @@
 
 namespace Drall\Test\Integration;
 
+use Composer\InstalledVersions;
 use Drall\Drall;
 use Drall\IntegrationTestCase;
 
@@ -12,7 +13,8 @@ class DrallTest extends IntegrationTestCase {
 
   public function testVersion() {
     $output = shell_exec('drall --version');
-    $this->assertEquals(Drall::NAME . ' ' . Drall::VERSION . PHP_EOL, $output);
+    $version = InstalledVersions::getPrettyVersion('jigarius/drall');
+    $this->assertEquals(Drall::NAME . ' ' . $version . PHP_EOL, $output);
   }
 
   public function testWorkingDirectory() {

diff --git a/test/Unit/DrallTest.php b/test/Unit/DrallTest.php
@@ -17,20 +17,6 @@ public function testName() {
     $this->assertSame(Drall::NAME, $app->getName());
   }
 
-  public function testVersion() {
-    $app = new Drall();
-    $this->assertMatchesRegularExpression(
-      '/^\d+\.\d+.\d+(-(alpha|beta|rc)\d+)?$/',
-      $app->getVersion()
-    );
-
-    $json_path = $this->projectDir() . DIRECTORY_SEPARATOR . 'composer.json';
-    $json_data = json_decode(file_get_contents($json_path));
-
-    $this->assertNotEmpty($json_data->version);
-    $this->assertEquals($json_data->version, $app->getVersion());
-  }
-
   public function testDefaultInputOptions() {
     $app = new Drall();
     $options = $app->getDefinition()->getOptions();