Merge pull request #38 from creative-commoners/pulls/1/backport-compo…

…ser-2-support

Composer 2 (1.x backport)

.travis.yml

@@ -8,17 +8,29 @@ cache:
 
 matrix:
   include:
-    - php: 5.6
-    - php: 7.2
+    - php: 7.1
+      env:
+       - COMPOSER_SELFUPDATE_ARG=--1
+       - COMPOSER_ARG=--prefer-lowest
+    - php: 7.3
+      env:
+       - COMPOSER_SELFUPDATE_ARG=--1
+    - php: 7.4
+      env:
+       - COMPOSER_SELFUPDATE_ARG=--preview
+    - php: nightly
+      env:
+       - COMPOSER_ARG=--ignore-platform-reqs
+       - COMPOSER_SELFUPDATE_ARG=--preview
 
 fast_finish: true
 
 before_script:
   - phpenv rehash
   - export PATH=~/.composer/vendor/bin:$PATH
+  - composer self-update $COMPOSER_SELFUPDATE_ARG
   - composer validate
-  - composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o
-  - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
+  - composer update --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile $COMPOSER_ARG
 
 script:
   - vendor/bin/phpunit

composer.json

@@ -25,13 +25,14 @@
         "lint": "phpcs src/ tests/",
         "lint-clean": "phpcbf src/ tests/"
     },
-    "minimum-stability": "dev",
     "require": {
         "composer/installers": "^1.4",
-        "composer-plugin-api": "^1.1"
+        "composer-plugin-api": "^1.1 || ^2",
+        "php": "^7.1 || ^8"
     },
     "require-dev": {
-        "composer/composer": "^1.5",
-        "phpunit/phpunit": "^5.7"
+        "composer/composer": "^1.5 || ^2@rc",
+        "phpunit/phpunit": "^5.7",
+        "squizlabs/php_codesniffer": "^3"
     }
 }

src/VendorPlugin.php

@@ -248,4 +248,18 @@ protected function installLibrary(IOInterface $IO, Library $library)
         );
         $task->process($IO, [$library]);
     }
+
+    /**
+     * Required by the composer 2 plugin interface
+     */
+    public function deactivate(Composer $composer, IOInterface $io)
+    {
+    }
+
+    /**
+     * Required by the composer 2 plugin interface
+     */
+    public function uninstall(Composer $composer, IOInterface $io)
+    {
+    }
 }

tests/Methods/LibraryTest.php

@@ -12,7 +12,7 @@ class LibraryTest extends TestCase
      */
     public function testResourcesDir($expected, $projectPath)
     {
-        $path = __DIR__ . '/fixtures/projects/' . $projectPath;
+        $path = __DIR__ . '/../fixtures/projects/' . $projectPath;
         $lib = new Library($path, 'vendor/silverstripe/skynet');
         $this->assertEquals($expected, $lib->getResourcesDir());
     }
@@ -29,7 +29,7 @@ public function resourcesDirProvider()
     public function testInvalidResourceDir()
     {
         $this->expectException(\LogicException::class);
-        $path = __DIR__ . '/fixtures/projects/ss44InvalidResourcesDir';
+        $path = __DIR__ . '/../fixtures/projects/ss44InvalidResourcesDir';
         $lib = new Library($path, 'vendor/silverstripe/skynet');
         $lib->getResourcesDir();
     }

tests/VendorPluginTest.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace SilverStripe\VendorPlugin\Tests;
+
+use PHPUnit\Framework\TestCase;
+use SilverStripe\VendorPlugin\VendorPlugin;
+
+class VendorPluginTest extends TestCase
+{
+    /**
+     * The simplest possible test, check that the plugin can be instantiated
+     */
+    public function testInstantiation(): void
+    {
+        new VendorPlugin();
+    }
+}