Small updates & test with PHP 8.1

druidfi · Dec 2, 2021 · fc16740 · fc16740
1 parent fa26a45
commit fc16740
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 13 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -7,12 +7,12 @@ jobs:
 
   build:
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.3','7.4','8.0']
+        php-versions: ['7.3','7.4','8.0','8.1']
         composer-versions: ['v2']
 
     steps:

diff --git a/composer.json b/composer.json
@@ -2,7 +2,6 @@
     "name": "druidfi/mona-plugin",
     "type": "composer-plugin",
     "description": "Mona Composer Plugin for Drupal 7 sites",
-    "minimum-stability": "dev",
     "license": "MIT",
     "authors": [
         {
@@ -28,7 +27,7 @@
     },
     "require": {
         "php": "^7.3 || ^8.0",
-        "composer-plugin-api": "^2.0",
+        "composer-plugin-api": "^2.0 || ^2.1",
         "composer/installers": "^1.11 || ^2.0",
         "cweagans/composer-patches": "^1.7",
         "drush/drush": "^8.4"
@@ -39,7 +38,9 @@
     },
     "conflict": {
         "drupal/core": "8.*",
-        "drupal/drupal": "<7.81",
+        "drupal/drupal": "<7.83",
         "drush/drush": "<8.4"
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }
diff --git a/src/Mona/Symlink.php b/src/Mona/Symlink.php
@@ -50,6 +50,7 @@ public function getOriginalTarget(): string
     public function setOriginalTarget(string $target): self
     {
         $this->originalTarget = $target;
+
         return $this;
     }
 
@@ -69,6 +70,7 @@ public function getOriginalLink(): string
     public function setOriginalLink(string $link): self
     {
         $this->originalLink = $link;
+
         return $this;
     }
 
@@ -88,6 +90,7 @@ public function getTarget(): string
     public function setTarget(string $target): self
     {
         $this->target = $target;
+
         return $this;
     }
 
@@ -107,6 +110,7 @@ public function getLink(): string
     public function setLink(string $link): self
     {
         $this->link = $link;
+
         return $this;
     }
 
@@ -126,6 +130,7 @@ public function isAbsolutePath(): bool
     public function setAbsolutePath(bool $absolutePath): self
     {
         $this->absolutePath = $absolutePath;
+
         return $this;
     }
 
@@ -145,6 +150,7 @@ public function isForceCreate(): bool
     public function setForceCreate(bool $forceCreate): self
     {
         $this->forceCreate = $forceCreate;
+
         return $this;
     }
 }
diff --git a/src/Mona/SymlinksFactory.php b/src/Mona/SymlinksFactory.php
@@ -44,8 +44,8 @@ public function __construct(Event $event, Filesystem $filesystem)
     public function process(string $webroot): array
     {
         $symlinksData = $this->getSymlinksData();
-
         $symlinks = [];
+
         foreach ($symlinksData as $target => $linkData) {
             $linkData = str_replace('${webroot}', $webroot, $linkData);
 
@@ -55,6 +55,7 @@ public function process(string $webroot): array
                 if ($this->getConfig(static::THROW_EXCEPTION, $linkData, true)) {
                     throw $exception;
                 }
+
                 $this->event->getIO()->writeError(
                     sprintf(
                         '  Error while process <comment>%s</comment>: <comment>%s</comment>',
@@ -123,6 +124,7 @@ protected function processSymlink(string $target, $linkData): ?Symlink
             if ($this->getConfig(static::SKIP_MISSED_TARGET, $link)) {
                 return null;
             }
+
             throw new InvalidArgumentException(
                 sprintf('The target path %s does not exists', $targetPath)
             );
@@ -142,6 +144,7 @@ protected function processSymlink(string $target, $linkData): ?Symlink
                     $link
                 )
             );
+
             return null;
         }
 
@@ -187,11 +190,13 @@ protected function getSymlinksData(): array
     protected function getLink($linkData): string
     {
         $link = '';
+
         if (is_array($linkData)) {
             $link = $linkData['link'] ?? '';
         } elseif (is_string($linkData)) {
             $link = $linkData;
         }
+
         return $link;
     }
 }
diff --git a/src/Mona/SymlinksProcessor.php b/src/Mona/SymlinksProcessor.php
@@ -54,14 +54,12 @@ public function processSymlink(Symlink $symlink): bool
         if ($symlink->isAbsolutePath()) {
             return @symlink($symlink->getTarget(), $symlink->getLink());
         }
+
         return $this->filesystem->relativeSymlink($symlink->getTarget(), $symlink->getLink());
     }
 
     protected function isToUnlink(string $path): bool
     {
-        return
-            file_exists($path) ||
-            is_dir($path) ||
-            is_link($path);
+        return file_exists($path) || is_dir($path) || is_link($path);
     }
 }
diff --git a/tests/composer.json b/tests/composer.json
@@ -10,8 +10,8 @@
     "require": {
         "ckeditor/ckeditor": "4.10.1",
         "druidfi/mona-plugin": "*",
-        "drupal/drupal": "^7.81",
-        "drupal/pathauto": "1.3"
+        "drupal/drupal": "^7.83",
+        "drupal/pathauto": "^1"
     },
     "repositories": [
         {