Merge pull request #5 from rahulsonar-acquia/composer_2

phpcs
grasmash · May 25, 2021 · 9abe69a · 9abe69a
2 parents 440602a + 6ed606b
commit 9abe69a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/src/Composer/ComposerizeDrupalCommand.php b/src/Composer/ComposerizeDrupalCommand.php
@@ -42,7 +42,7 @@ public function configure()
         $this->addOption('composer-root', null, InputOption::VALUE_REQUIRED, 'The relative path to the directory that should contain composer.json.');
         $this->addOption('drupal-root', null, InputOption::VALUE_REQUIRED, 'The relative path to the Drupal root directory.');
         $this->addOption('exact-versions', null, InputOption::VALUE_NONE, 'Use exact version constraints rather than the recommended caret operator.');
-        $this->addOption('composer-path',null,InputOption::VALUE_OPTIONAL,'Composer1 path on the system');
+        $this->addOption('composer-path', null, InputOption::VALUE_OPTIONAL, 'Composer1 path on the system');
         $this->addOption('no-update', null, InputOption::VALUE_NONE, 'Prevent "composer update" being run after file generation.');
         $this->addOption('no-gitignore', null, InputOption::VALUE_NONE, 'Prevent root .gitignore file from being modified.');
         $this->addUsage('--composer-root=. --drupal-root=./docroot');

diff --git a/src/Composer/Plugin.php b/src/Composer/Plugin.php
@@ -19,12 +19,12 @@ public function activate(Composer $composer, IOInterface $io)
         $this->io = $io;
     }
 
-    public function deactivate(Composer $composer, IOInterface $io) {
-
+    public function deactivate(Composer $composer, IOInterface $io)
+    {
     }
 
-    public function uninstall(Composer $composer, IOInterface $io) {
-
+    public function uninstall(Composer $composer, IOInterface $io)
+    {
     }
 
     public function getCapabilities()

diff --git a/tests/phpunit/src/SandboxManager.php b/tests/phpunit/src/SandboxManager.php
@@ -88,15 +88,17 @@ public function makeSandbox()
      *
      * @param $dir
      */
-    private function deleteFolderRecursively($dir):void {
+    private function deleteFolderRecursively($dir):void
+    {
         if (is_dir($dir)) {
             $objects = scandir($dir);
             foreach ($objects as $object) {
                 if ($object != "." && $object != "..") {
-                    if (is_dir($dir. DIRECTORY_SEPARATOR .$object) && !is_link($dir."/".$object))
-                        $this->deleteFolderRecursively($dir. DIRECTORY_SEPARATOR .$object);
-                    else
-                        $this->fs->remove($dir. DIRECTORY_SEPARATOR .$object);
+                    if (is_dir($dir. DIRECTORY_SEPARATOR .$object) && !is_link($dir."/".$object)) {
+                        $this->deleteFolderRecursively($dir . DIRECTORY_SEPARATOR . $object);
+                    } else {
+                        $this->fs->remove($dir . DIRECTORY_SEPARATOR . $object);
+                    }
                 }
             }
             $this->fs->remove($dir);