updates from main

Author: bshaffer

dev/src/Command/AddVersionCommand.php

@@ -117,11 +117,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if ($returnCode !== Command::SUCCESS) {
             return $returnCode;
         }
-        // Run "add-sample-to-readme" command to ensure our README contains the latest version's sample.
-        $addSamplesArgs = ['--component' => [$componentName], '--update' => true];
-        if (!$addSampleCommand = $this->getApplication()->find('add-sample-to-readme')) {
+        // Run "update-readme-sample" command to ensure our README contains the latest version's sample.
+        $updateReadmeSampleArgs = ['--component' => [$componentName], '--update' => true];
+        if (!$updateReadmeSampleCommand = $this->getApplication()->find('update-readme-sample')) {
             throw new \RuntimeException('Application does not have an add-samples-to-readme command.');
         }
-        return $addSampleCommand->run(new ArrayInput($addSamplesArgs), $output);
+        return $updateReadmeSampleCommand->run(new ArrayInput($updateReadmeSampleArgs), $output);
     }
 }

dev/src/Component.php

@@ -47,9 +47,9 @@ public function __construct(private string $name, ?string $path = null)
         $this->validateComponentFiles();
     }
 
-    private static function getComponentNames(string $rootDir): array
+    private static function getComponentNames(?string $rootDir): array
     {
-        $components = scandir($rootDir);
+        $components = scandir($rootDir ?? self::ROOT_DIR);
         foreach ($components as $i => $name) {
             if (!is_dir(self::ROOT_DIR . $name) || !preg_match('/^[A-Z]/', $name)) {
                 unset($components[$i]);
@@ -61,12 +61,9 @@ private static function getComponentNames(string $rootDir): array
 
     public static function getComponents(array $componentNames = [], ?string $rootDir = null): array
     {
-        if (is_null($rootDir)) {
-            $rootDir = realpath(self::ROOT_DIR);
-        }
         $components = [];
         foreach ($componentNames ?: self::getComponentNames($rootDir) as $name) {
-            $components[] = new Component($name, $rootDir . '/' . $name);
+            $components[] = new Component($name, $rootDir ? $rootDir . '/' . $name : null);
         }
 
         return $components;