Implement composer v2 support

Refactor testsuite to make sure composer v2 is fully compatible and change the constraints.

Remove const private qualifier to fix php 5.6 compat

Fix travis unwritable bindir problem

Reduce the nr of PHP versions tested

Fix travis script

Cleanup

Fixit

Author: pinkeen

.travis.yml

@@ -3,23 +3,39 @@ sudo: false
 dist: trusty
 
 cache:
-    directories:
-        - vendor
-        - $HOME/.composer/cache
+  directories:
+    - vendor
+    - $HOME/.composer/cache
+
+env:
+  global:
+    - COMPOSER_SANDBOX_TMPDIR="$HOME/.tmp"
+    - COMPOSER_SANDBOX_EXTRA_ARGS="-vv"
+    - IGNORE_PLATFORM_REQS=""
+  jobs:
+    - COMPOSER_VERSION="1"
+    - COMPOSER_VERSION="2"
 
 php:
   - 5.6
   - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
-  - nightly
+  - 7.4
+
+jobs:
+  include:
+    # Test PHP 8.0+ only with composer v2 while ignoring platform reqs 
+    # so conflicting dependencies like Symfony polyfills are not installed.
+    - php: 8.0
+      env: COMPOSER_VERSION="2" IGNORE_PLATFORM_REQS="--ignore-platform-reqs"
+    - php: nightly
+      env: COMPOSER_VERSION="2" IGNORE_PLATFORM_REQS="--ignore-platform-reqs"
 
 matrix:
   allow_failures:
     - php: nightly
+    - php: 8.0
 
-install:
-    - travis_retry composer install --ansi --prefer-dist --no-interaction --optimize-autoloader --no-suggest --no-progress
+install: travis_retry bin/install-project
 
-script: ./vendor/bin/phpunit --debug --testdox
+script: bin/tests-run
+  

README.md

@@ -1,8 +1,10 @@
-[![Build Status](https://travis-ci.org/mageops/php-composer-plugin-patchset.svg?branch=master)](https://travis-ci.org/mageops/php-composer-plugin-patchset)
+[![Build Status](https://travis-ci.com/mageops/php-composer-plugin-patchset.svg?branch=master)](https://travis-ci.com/mageops/php-composer-plugin-patchset)
 
 Composer Plugin For Applying Patchsets
 ======================================
 
+> ‼️ **NEW** Supports both composer branches _v1.x_ and _v2.x_.
+
 This plugin can automatically apply patches to any dependency of your project.
 
 One of the most distinguishing features is that it can apply patches from special composer packages of type `patchset`.
@@ -92,13 +94,13 @@ plugins have done their work so patching source files in vendor will have no eff
 
 ## Why no remote patches
 
- This plugin will not download patches from external sources directly (http). I consider this a bad practice and will
- never support it. I won't even comment on downloading patches using unencrypted connection without SHA check. Also what
- if somebody wants to use your software in 2 years and the patches are no longer available?
- 
- Also you will not be able to specify patches in any composer package. You have to use a dedicated packages for this 
- purpose. I can hardly imagine a legit use case when it would be desirable that installing package X will automatically 
- patch some other package Y in your project without explicitly being advertised as a patchset.
+This plugin will not download patches from external sources directly (http). I consider this a bad practice and will
+never support it. I won't even comment on downloading patches using unencrypted connection without SHA check. Also what
+if somebody wants to use your software in 2 years and the patches are no longer available?
+
+Also you will not be able to specify patches in any composer package. You have to use a dedicated packages for this 
+purpose. I can hardly imagine a legit use case when it would be desirable that installing package X will automatically 
+patch some other package Y in your project without explicitly being advertised as a patchset.
 
 
 

bin/composer-installer

@@ -0,0 +1,8 @@
+#!/usr/bin/env php
+<?php
+
+include __DIR__ . '/../vendor/autoload.php';
+
+use Pinkeen\ComposerPharInstaller\ComposerPharInstaller;
+
+ComposerPharInstaller::passthru();

bin/install-composer

@@ -0,0 +1,34 @@
+#!/usr/bin/env php
+<?php
+
+define('COMPOSER_PHAR_INSTALLER_NO_AUTO_PASSTHRU', 1);
+
+include __DIR__ . '/../tests/installer/ComposerPharInstaller.php';
+
+use Pinkeen\ComposerPharInstaller\ComposerPharInstaller;
+
+if (!$composerVersion = getenv('COMPOSER_VERSION')) {
+    $composerVersion = '2';
+}
+
+
+if (!$tempRootDir = getenv('COMPOSER_SANDBOX_TMPDIR')) {
+    $tempRootDir = sys_get_temp_dir();
+}
+
+$composerPharInstallDir =  $tempRootDir . '/' . uniqid('composer-phar-');
+$composerPharFilename = "composer-v$composerVersion.phar";
+$composerPharFilepath = "$composerPharInstallDir/$composerPharFilename";
+
+if (false === mkdir($composerPharInstallDir, 0775, true)) {
+    fprintf(STDERR, "Could not create composer installation temp dir: %s \n", $composerPharInstallDir);
+    exit(1);
+}
+
+ComposerPharInstaller::setComposerHome($composerPharInstallDir);
+ComposerPharInstaller::mustInstall(
+    $composerVersion, 
+    $composerPharInstallDir,
+    $composerPharFilename,
+    true
+);

bin/install-project

@@ -0,0 +1,15 @@
+#!/usr/bin/env php
+<?php
+
+include_once(__DIR__ . '/install-composer');
+
+passthru(
+    sprintf(
+        "%s update --working-dir %s --ansi --prefer-dist --no-interaction --optimize-autoloader --no-progress --no-plugins", 
+        escapeshellarg($composerPharFilepath),
+        escapeshellarg(realpath(__DIR__ . '/../'))
+    ), 
+    $code
+);
+
+return $code;

bin/tests-run

@@ -0,0 +1,26 @@
+#!/usr/bin/env php
+<?php
+
+if (!file_exists(__DIR__ . '/../vendor/autoload.php') || getenv('FORCE_PROJECT_INSTALL')) {
+    if (0 !== $code = include(__DIR__ . '/install-project')) {
+        exit($code);
+    }
+}
+
+include_once(__DIR__ . '/install-composer');
+
+putenv("COMPOSER_SANDBOX_COMPOSER=$composerPharFilepath");
+putenv("COMPOSER_SANDBOX_TMPDIR=$tempRootDir");
+
+$phpUnitCmdStr = sprintf('%s --debug --verbose %s',
+    realpath(__DIR__  . '/../vendor/bin/phpunit'), 
+    implode(' ', array_map('escapeshellarg', array_slice($argv, 1)))
+);
+
+
+fprintf(STDOUT, "Running phpunit: %s\n", $phpUnitCmdStr);
+
+passthru($phpUnitCmdStr, $code);
+
+exit($code);
+

composer.json

@@ -12,18 +12,24 @@
     "require": {
         "ext-json": "*",
         "php": ">=5.6.0",
-        "composer-plugin-api": "^1.1"
+        "composer-plugin-api": "~1.1 | ^2.0"
     },
     "require-dev": {
-        "composer/composer": "~1.0",
-        "composer/satis": "~1.0",
-        "phpunit/phpunit": "^4.8.35 || ^5.7"
+        "composer/composer": "^2.0",
+        "phpunit/phpunit": "~5.7",
+        "symfony/process": "^3"
     },
     "autoload": {
         "psr-4": {"Creativestyle\\Composer\\Patchset\\": "src"}
     },
     "autoload-dev": {
-        "psr-4": {"Creativestyle\\Composer\\Patchset\\Tests\\": "tests"}
+        "psr-4": {
+            "Creativestyle\\Composer\\TestingSandbox\\": "tests/sandbox",
+            "Creativestyle\\Composer\\Patchset\\Tests\\Functional\\": "tests/functional"
+        },
+        "classmap": [
+            "tests/installer/ComposerPharInstaller.php"
+        ]
     },
     "extra": {
         "class": "Creativestyle\\Composer\\Patchset\\Plugin"

docs/testing.md

@@ -2,10 +2,11 @@
 
 ## Composer sandbox
 
-This plugin uses a special sandbox which allows it to run composer as a separate process during testing.
-
-A fake local packagist repository is created from [package definitions](/tests/Functional/Fixtures/Packages) 
-for the purpose of testing by using internally [Satis](https://github.com/composer/satis) as a library.
+This plugin uses a special sandbox which allows it to run composer as a separate process during testing which creates:
+- Fake local composer repository in `/repo/packages.json` with all packages defined [package fixtures](/tests/Functional/Fixtures/Packages/).
+- Isolated `COMPOSER_HOME` with configuration in `/composer/config.json` that disabled packagist and configures the above repository.
+- Project directories in `/project/{test_run}` used for storing dynamically constructed
+  project used for testing.
 
 See the [ComposerSandbox](/tests/Functional/Fixtures/ComposerSandbox.php) class for the details.
 
@@ -18,4 +19,34 @@ vendor/bin/phpunit --debug
 ```
 
 It's nice to also add the `--testdox` switch then.
+
+### Override test sandbox settings via environment variables
+
+#### `COMPOSER_SANDBOX_TMPDIR="{{ sys_get_temp_dir() }}"` - Base temporary dir
+
+_Path to base directory used to store temporary files needed for running the tests._
+
+> **Warning!** Never place `TEST_TMP` dir inside your project's working tree as this
+> will cause composer to attempt recursively install its own files and all
+> hell breaks loose.
+#### `COMPOSER_SANDBOX_PHP="{{ PHP_BIN }}"` - Path to php binary
+
+_Path to php used for running composer._
+
+#### `COMPOSER_SANDBOX_COMPOSER="composer"` - Path to composer
+
+_Path to composer binary to use for running the tests._
+
+#### `COMPOSER_SANDBOX_EXTRA_ARGS=""` - Extra arguments for composer
+
+_String that will be appended to every invocation of composer command._
+
+> **Warning!** Arguments passed through env vars must must be space-delimited
+> and each argument cannot contain space characters even if they are escaped.
+
+
+#### `COMPOSER_SANDBOX_TEST_DEBUG` - Enable extra debugging features
+
+If enabled sandbox directories of failed tests are preserved and composer
+command output is flushed for every test.
 

src/Plugin.php

@@ -5,12 +5,9 @@
 use Composer\Composer;
 use Composer\EventDispatcher\EventSubscriberInterface;
 use Composer\IO\IOInterface;
-use Composer\Package\PackageInterface;
 use Composer\Plugin\PluginInterface;
-use Composer\Repository\ArrayRepository;
 use Composer\Script\ScriptEvents;
 use Composer\Script\Event as ScriptEvent;
-
 use Composer\Util\ProcessExecutor;
 use Psr\Log\LoggerInterface;
 
@@ -35,13 +32,39 @@ public function activate(Composer $composer, IOInterface $io)
         $this->logger = new IOLogger($io);
     }
 
+    /**
+     * Remove any hooks from Composer
+     *
+     * This will be called when a plugin is deactivated before being
+     * uninstalled, but also before it gets upgraded to a new version
+     * so the old one can be deactivated and the new one activated.
+     *
+     * @param Composer    $composer
+     * @param IOInterface $io
+     */
+    public function deactivate(Composer $composer, IOInterface $io)
+    {
+    }
+
+    /**
+     * Prepare the plugin to be uninstalled
+     *
+     * This will be called after deactivate.
+     *
+     * @param Composer    $composer
+     * @param IOInterface $io
+     */
+    public function uninstall(Composer $composer, IOInterface $io)
+    {
+    }
+
     /**
      * {@inheritdoc}
      */
     public static function getSubscribedEvents()
     {
         return [
-            ScriptEvents::PRE_AUTOLOAD_DUMP => 'onPreAutoloadDump'
+            ScriptEvents::PRE_AUTOLOAD_DUMP => 'onPreAutoloadDump',
         ];
     }