From 7f34af52a8606db7c36f4aef3c58812db310e96a Mon Sep 17 00:00:00 2001
From: Brian Weaver <weaver.299@osu.edu>
Date: Mon, 30 Nov 2020 15:10:02 -0500
Subject: [PATCH] remove zaporylie/composer-drupal-optimizations
---
composer.json | 3 +-
composer.lock | 45 +----
vendor/composer/autoload_classmap.php | 3 -
vendor/composer/autoload_psr4.php | 1 -
vendor/composer/autoload_static.php | 11 --
vendor/composer/installed.json | 45 -----
.../composer-drupal-optimizations/.gitignore | 4 -
.../composer-drupal-optimizations/.travis.yml | 47 -----
.../composer-drupal-optimizations/README.md | 68 --------
.../composer.json | 27 ---
.../phpunit.xml.dist | 27 ---
.../src/Cache.php | 127 --------------
.../src/Plugin.php | 71 --------
.../src/TruncatedComposerRepository.php | 26 ---
.../tests/CacheTest.php | 161 ------------------
.../tests/DefaultRequireTest.php | 40 -----
16 files changed, 2 insertions(+), 704 deletions(-)
delete mode 100644 vendor/zaporylie/composer-drupal-optimizations/.gitignore
delete mode 100644 vendor/zaporylie/composer-drupal-optimizations/.travis.yml
delete mode 100644 vendor/zaporylie/composer-drupal-optimizations/README.md
delete mode 100644 vendor/zaporylie/composer-drupal-optimizations/composer.json
delete mode 100644 vendor/zaporylie/composer-drupal-optimizations/phpunit.xml.dist
delete mode 100644 vendor/zaporylie/composer-drupal-optimizations/src/Cache.php
delete mode 100644 vendor/zaporylie/composer-drupal-optimizations/src/Plugin.php
delete mode 100644 vendor/zaporylie/composer-drupal-optimizations/src/TruncatedComposerRepository.php
delete mode 100644 vendor/zaporylie/composer-drupal-optimizations/tests/CacheTest.php
delete mode 100644 vendor/zaporylie/composer-drupal-optimizations/tests/DefaultRequireTest.php
diff --git a/composer.json b/composer.json
index 2348c7adb5..b87ed6814c 100644
--- a/composer.json
+++ b/composer.json
@@ -191,8 +191,7 @@
"enyo/dropzone": "5.1.1",
"gdsmith/jquery.easing": "1.4.1",
"oomphinc/composer-installers-extender": "2.0",
- "pantheon-systems/quicksilver-pushback": "1.0.1",
- "zaporylie/composer-drupal-optimizations": "1.1"
+ "pantheon-systems/quicksilver-pushback": "1.0.1"
},
"require-dev": {},
"conflict": {
diff --git a/composer.lock b/composer.lock
index 49f64243a6..f65fb16877 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "df313a5863c9258df18719ef6cfe21e0",
+ "content-hash": "04322a544764f633495fd1d9c5c319f8",
"packages": [
{
"name": "alchemy/zippy",
@@ -13427,49 +13427,6 @@
"apr1"
],
"time": "2015-02-11T11:06:42+00:00"
- },
- {
- "name": "zaporylie/composer-drupal-optimizations",
- "version": "1.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/zaporylie/composer-drupal-optimizations.git",
- "reference": "173c198fd7c9aefa5e5b68cd755ee63eb0abf7e8"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/zaporylie/composer-drupal-optimizations/zipball/173c198fd7c9aefa5e5b68cd755ee63eb0abf7e8",
- "reference": "173c198fd7c9aefa5e5b68cd755ee63eb0abf7e8",
- "shasum": ""
- },
- "require": {
- "composer-plugin-api": "^1.1"
- },
- "require-dev": {
- "composer/composer": "^1.6",
- "phpunit/phpunit": "^6"
- },
- "type": "composer-plugin",
- "extra": {
- "class": "zaporylie\\ComposerDrupalOptimizations\\Plugin"
- },
- "autoload": {
- "psr-4": {
- "zaporylie\\ComposerDrupalOptimizations\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "GPL-2.0-or-later"
- ],
- "authors": [
- {
- "name": "Jakub Piasecki",
- "email": "jakub@piaseccy.pl"
- }
- ],
- "description": "Composer plugin to improve composer performance for Drupal projects",
- "time": "2019-02-20T10:00:17+00:00"
}
],
"packages-dev": [],
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index fde1ea6131..817a87ee3d 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -6027,7 +6027,4 @@
'enshrined\\svgSanitize\\data\\AttributeInterface' => $vendorDir . '/enshrined/svg-sanitize/src/data/AttributeInterface.php',
'enshrined\\svgSanitize\\data\\TagInterface' => $vendorDir . '/enshrined/svg-sanitize/src/data/TagInterface.php',
'enshrined\\svgSanitize\\data\\XPath' => $vendorDir . '/enshrined/svg-sanitize/src/data/XPath.php',
- 'zaporylie\\ComposerDrupalOptimizations\\Cache' => $vendorDir . '/zaporylie/composer-drupal-optimizations/src/Cache.php',
- 'zaporylie\\ComposerDrupalOptimizations\\Plugin' => $vendorDir . '/zaporylie/composer-drupal-optimizations/src/Plugin.php',
- 'zaporylie\\ComposerDrupalOptimizations\\TruncatedComposerRepository' => $vendorDir . '/zaporylie/composer-drupal-optimizations/src/TruncatedComposerRepository.php',
);
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index f6474efec0..204fed7266 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -6,7 +6,6 @@
$baseDir = dirname($vendorDir);
return array(
- 'zaporylie\\ComposerDrupalOptimizations\\' => array($vendorDir . '/zaporylie/composer-drupal-optimizations/src'),
'enshrined\\svgSanitize\\' => array($vendorDir . '/enshrined/svg-sanitize/src'),
'cweagans\\Composer\\' => array($vendorDir . '/cweagans/composer-patches/src'),
'XdgBaseDir\\' => array($vendorDir . '/dnoegel/php-xdg-base-dir/src'),
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 1509b85962..1d7b45c22e 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -44,10 +44,6 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
);
public static $prefixLengthsPsr4 = array (
- 'z' =>
- array (
- 'zaporylie\\ComposerDrupalOptimizations\\' => 38,
- ),
'e' =>
array (
'enshrined\\svgSanitize\\' => 22,
@@ -203,10 +199,6 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
);
public static $prefixDirsPsr4 = array (
- 'zaporylie\\ComposerDrupalOptimizations\\' =>
- array (
- 0 => __DIR__ . '/..' . '/zaporylie/composer-drupal-optimizations/src',
- ),
'enshrined\\svgSanitize\\' =>
array (
0 => __DIR__ . '/..' . '/enshrined/svg-sanitize/src',
@@ -6696,9 +6688,6 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
'enshrined\\svgSanitize\\data\\AttributeInterface' => __DIR__ . '/..' . '/enshrined/svg-sanitize/src/data/AttributeInterface.php',
'enshrined\\svgSanitize\\data\\TagInterface' => __DIR__ . '/..' . '/enshrined/svg-sanitize/src/data/TagInterface.php',
'enshrined\\svgSanitize\\data\\XPath' => __DIR__ . '/..' . '/enshrined/svg-sanitize/src/data/XPath.php',
- 'zaporylie\\ComposerDrupalOptimizations\\Cache' => __DIR__ . '/..' . '/zaporylie/composer-drupal-optimizations/src/Cache.php',
- 'zaporylie\\ComposerDrupalOptimizations\\Plugin' => __DIR__ . '/..' . '/zaporylie/composer-drupal-optimizations/src/Plugin.php',
- 'zaporylie\\ComposerDrupalOptimizations\\TruncatedComposerRepository' => __DIR__ . '/..' . '/zaporylie/composer-drupal-optimizations/src/TruncatedComposerRepository.php',
);
public static function getInitializer(ClassLoader $loader)
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 18ddc716df..20a73a20d6 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -13862,50 +13862,5 @@
"MD5",
"apr1"
]
- },
- {
- "name": "zaporylie/composer-drupal-optimizations",
- "version": "1.1.0",
- "version_normalized": "1.1.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/zaporylie/composer-drupal-optimizations.git",
- "reference": "173c198fd7c9aefa5e5b68cd755ee63eb0abf7e8"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/zaporylie/composer-drupal-optimizations/zipball/173c198fd7c9aefa5e5b68cd755ee63eb0abf7e8",
- "reference": "173c198fd7c9aefa5e5b68cd755ee63eb0abf7e8",
- "shasum": ""
- },
- "require": {
- "composer-plugin-api": "^1.1"
- },
- "require-dev": {
- "composer/composer": "^1.6",
- "phpunit/phpunit": "^6"
- },
- "time": "2019-02-20T10:00:17+00:00",
- "type": "composer-plugin",
- "extra": {
- "class": "zaporylie\\ComposerDrupalOptimizations\\Plugin"
- },
- "installation-source": "dist",
- "autoload": {
- "psr-4": {
- "zaporylie\\ComposerDrupalOptimizations\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "GPL-2.0-or-later"
- ],
- "authors": [
- {
- "name": "Jakub Piasecki",
- "email": "jakub@piaseccy.pl"
- }
- ],
- "description": "Composer plugin to improve composer performance for Drupal projects"
}
]
diff --git a/vendor/zaporylie/composer-drupal-optimizations/.gitignore b/vendor/zaporylie/composer-drupal-optimizations/.gitignore
deleted file mode 100644
index 6de133df86..0000000000
--- a/vendor/zaporylie/composer-drupal-optimizations/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/vendor/
-composer.lock
-.phpunit.result.cache
-/test
diff --git a/vendor/zaporylie/composer-drupal-optimizations/.travis.yml b/vendor/zaporylie/composer-drupal-optimizations/.travis.yml
deleted file mode 100644
index addd889106..0000000000
--- a/vendor/zaporylie/composer-drupal-optimizations/.travis.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-language: php
-dist: trusty
-sudo: false
-
-php:
- - 5.6
- - 7.0
- - 7.1
- - 7.2
- - 7.3
-
-env:
- matrix:
- - RELEASE=stable COMPOSER_CHANNEL=stable
- - RELEASE=dev COMPOSER_CHANNEL=stable
- - RELEASE=stable COMPOSER_CHANNEL=snapshot
-
-matrix:
- exclude:
- - php: 5.6
- env: RELEASE=dev COMPOSER_CHANNEL=stable
- - php: 5.6
- env: RELEASE=stable COMPOSER_CHANNEL=snapshot
-
-before_install:
- - if [[ $TRAVIS_PHP_VERSION = 5.6 ]]; then export COMPOSER_MEMORY_LIMIT=-1; fi;
- - composer --verbose self-update --$COMPOSER_CHANNEL
- - composer --version
-
-install:
- - composer --verbose validate
-
-script:
- # Run automated tests.
- - if [[ ${TRAVIS_PHP_VERSION:0:3} != "5.6" ]]; then composer install && ./vendor/bin/phpunit; fi
- - cd .. && composer create-project drupal-composer/drupal-project:8.x-dev drupal-project --stability dev --no-interaction
- - ls -lah . && cd drupal-project
- # zaporylie/composer-drupal-optimizations has been added to drupal-composer/drupal-project and now must be removed
- # in order to measure the performance change.
- - composer remove zaporylie/composer-drupal-optimizations
- - if [[ $RELEASE = dev ]]; then composer --verbose require --no-update --dev webflo/drupal-core-require-dev:8.6.x-dev; fi;
- - if [[ $RELEASE = dev ]]; then composer --verbose require --no-update drupal/core:8.6.x-dev; fi;
- - if [[ $RELEASE = dev ]]; then composer --verbose update; fi;
- # Check the performance.
- - composer update nothing --profile
- - composer config repositories.local path "../composer-drupal-optimizations" && composer require zaporylie/composer-drupal-optimizations:@dev
- - composer update nothing --profile
diff --git a/vendor/zaporylie/composer-drupal-optimizations/README.md b/vendor/zaporylie/composer-drupal-optimizations/README.md
deleted file mode 100644
index 182be1a5d9..0000000000
--- a/vendor/zaporylie/composer-drupal-optimizations/README.md
+++ /dev/null
@@ -1,68 +0,0 @@
-Optimize Composer for Drupal projects
-====
-[](https://travis-ci.org/zaporylie/composer-drupal-optimizations)
-
-
-
-# About
-
-This composer-plugin contains set of improvements that makes running heavy duty composer commands (i.e. `composer update` or `composer require`) much faster.
-
-# Installation
-
-```bash
-composer require zaporylie/composer-drupal-optimizations:^1.0
-```
-
-No configuration required 🎊
-
-# Optimizations
-
-- Reduce memory usage and CPU usage by removing legacy symfony tags
-
-# Benchmark
-
-Following numbers are for clean https://github.com/drupal-composer/drupal-project/ without and with this plugin.
-
-Before:
-
-```
-Memory usage: 323.19MB (peak: 1121.09MB), time: 13.68s
-```
-
-After:
-
-```
-Memory usage: 238.66MB (peak: 297.17MB), time: 4.84s
-```
-
-> php 7.2, macOS High Sierra, i7, 16GB RAM
-
-# Configuration
-
-If no configuration is provided this package will provide sensible defaults based on the content of project's composer.json
-file. Default configuration should cover 99% of the cases. However, in case you want to manually specify the tags
-that should be filtered out you are welcome to use the `extra` section:
-
-```json
-{
- "extra": {
- "composer-drupal-optimizations": {
- "require": {
- "symfony/symfony": ">3.4"
- }
- }
- }
-}
-```
-
-***Recommendation note:***
-Use defaults (skip config above) if possible - this package will be maintained throughout the Drupal's lifecycle in order
-to optimize legacy constraints in parallel with Drupal's requirements.
-
-All you have to do is to make sure your drupal core constraint is set to `drupal/core: ^8.5` or above.
-
-# Credits
-
-- Symfony community - idea and development; Special thanks to @nicolas-grekas
-- Jakub Piasecki - port and maintenance
diff --git a/vendor/zaporylie/composer-drupal-optimizations/composer.json b/vendor/zaporylie/composer-drupal-optimizations/composer.json
deleted file mode 100644
index 415f844a3f..0000000000
--- a/vendor/zaporylie/composer-drupal-optimizations/composer.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "zaporylie/composer-drupal-optimizations",
- "description": "Composer plugin to improve composer performance for Drupal projects",
- "type": "composer-plugin",
- "license": "GPL-2.0-or-later",
- "authors": [
- {
- "name": "Jakub Piasecki",
- "email": "jakub@piaseccy.pl"
- }
- ],
- "require": {
- "composer-plugin-api": "^1.1"
- },
- "require-dev": {
- "composer/composer": "^1.6",
- "phpunit/phpunit": "^6"
- },
- "autoload": {
- "psr-4": {
- "zaporylie\\ComposerDrupalOptimizations\\": "src/"
- }
- },
- "extra": {
- "class": "zaporylie\\ComposerDrupalOptimizations\\Plugin"
- }
-}
diff --git a/vendor/zaporylie/composer-drupal-optimizations/phpunit.xml.dist b/vendor/zaporylie/composer-drupal-optimizations/phpunit.xml.dist
deleted file mode 100644
index 179ca29b14..0000000000
--- a/vendor/zaporylie/composer-drupal-optimizations/phpunit.xml.dist
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="true"
- backupStaticAttributes="false"
- colors="true"
- convertErrorsToExceptions="true"
- convertNoticesToExceptions="true"
- convertWarningsToExceptions="true"
- processIsolation="false"
- stopOnFailure="false"
->
- <testsuites>
- <testsuite name="Test Suite">
- <directory>./tests</directory>
- </testsuite>
- </testsuites>
-
- <php>
- <ini name="error_reporting" value="-1" />
- </php>
-
- <filter>
- <whitelist>
- <directory>./src/</directory>
- </whitelist>
- </filter>
-</phpunit>
diff --git a/vendor/zaporylie/composer-drupal-optimizations/src/Cache.php b/vendor/zaporylie/composer-drupal-optimizations/src/Cache.php
deleted file mode 100644
index 815b43286e..0000000000
--- a/vendor/zaporylie/composer-drupal-optimizations/src/Cache.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-namespace zaporylie\ComposerDrupalOptimizations;
-
-use Composer\Cache as BaseCache;
-use Composer\Semver\Constraint\Constraint;
-use Composer\Semver\VersionParser;
-
-/**
- * Class Cache
- * @package zaporylie\ComposerDrupalOptimizations
- */
-class Cache extends BaseCache
-{
-
- /**
- * @var array
- */
- protected $packages = [];
-
- /**
- * @var \Composer\Semver\VersionParser
- */
- protected $versionParser;
-
- /**
- * {@inheritdoc}
- */
- public function read($file)
- {
- $content = $this->readFile($file);
- if (!\is_array($data = json_decode($content, true))) {
- return $content;
- }
- foreach (array_keys($this->packages) as $key) {
- list($provider, ) = explode('/', $key, 2);
- if (0 === strpos($file, "provider-$provider\$")) {
- $data = $this->removeLegacyTags($data);
- break;
- }
- }
- return json_encode($data);
- }
-
- protected function readFile($file)
- {
- return parent::read($file);
- }
-
- /**
- * Removes legacy tags from $data.
- *
- * @param array $data
- * @return array
- */
- public function removeLegacyTags(array $data)
- {
- // Skip if the list of packages is empty.
- if (!$this->packages || empty($data['packages'])) {
- return $data;
- }
-
- // Skip if none of the packages was found.
- if (!array_diff_key($data['packages'], $this->packages)) {
- return $data;
- }
-
- foreach ($this->packages as $packageName => $packageVersionConstraint) {
- if (!isset($data['packages'][$packageName])) {
- continue;
- }
- $packages = [];
- $specificPackage = $data['packages'][$packageName];
- foreach ($specificPackage as $version => $composerJson) {
- if ('dev-master' === $version) {
- $normalizedVersion = $this->versionParser->normalize($composerJson['extra']['branch-alias']['dev-master']);
- } else {
- $normalizedVersion = $composerJson['version_normalized'];
- }
- $packageConstraint = $this->versionParser->parseConstraints($packageVersionConstraint);
- $versionConstraint = new Constraint('==', $normalizedVersion);
- if ($packageConstraint->matches($versionConstraint)) {
- $packages += isset($composerJson['replace']) ? $composerJson['replace'] : [];
- } else {
- unset($specificPackage[$version]);
- }
- }
-
- // Ignore requirements: their intersection with versions of the package gives empty result.
- if (!$specificPackage) {
- continue;
- }
- $data['packages'][$packageName] = $specificPackage;
-
- unset($specificPackage['dev-master']);
- foreach ($data['packages'] as $name => $versions) {
- if (!isset($packages[$name]) || null === $devMasterAlias = (isset($versions['dev-master']['extra']['branch-alias']['dev-master']) ? $versions['dev-master']['extra']['branch-alias']['dev-master'] : null)) {
- continue;
- }
- $devMaster = $versions['dev-master'];
- $versions = array_intersect_key($versions, $specificPackage);
- $packageConstraint = $this->versionParser->parseConstraints($packageVersionConstraint);
- $versionConstraint = new Constraint('==', $this->versionParser->normalize($devMasterAlias));
- if ($packageConstraint->matches($versionConstraint)) {
- $versions['dev-master'] = $devMaster;
- }
- if ($versions) {
- $data['packages'][$name] = $versions;
- }
- }
- }
- return $data;
-
- }
-
- /**
- * @param array $packages
- *
- * @return $this
- */
- public function setRequiredVersionConstraints(array $packages) {
- $this->versionParser = new VersionParser();
- $this->packages = $packages;
- return $this;
- }
-
-}
diff --git a/vendor/zaporylie/composer-drupal-optimizations/src/Plugin.php b/vendor/zaporylie/composer-drupal-optimizations/src/Plugin.php
deleted file mode 100644
index 7069aac49c..0000000000
--- a/vendor/zaporylie/composer-drupal-optimizations/src/Plugin.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-namespace zaporylie\ComposerDrupalOptimizations;
-
-use Composer\Composer;
-use Composer\Factory;
-use Composer\IO\IOInterface;
-use Composer\Plugin\PluginInterface;
-use Composer\Repository\RepositoryFactory;
-use Composer\Repository\RepositoryManager;
-use Composer\Semver\Constraint\Constraint;
-use Composer\Semver\Constraint\ConstraintInterface;
-
-class Plugin implements PluginInterface
-{
-
- public function activate(Composer $composer, IOInterface $io)
- {
- // Set default version constraints based on the composer requirements.
- $extra = $composer->getPackage()->getExtra();
- $packages = $composer->getPackage()->getRequires();
- if (!isset($extra['composer-drupal-optimizations']['require']) && isset($packages['drupal/core'])) {
- $coreConstraint = $packages['drupal/core']->getConstraint();
- $extra['composer-drupal-optimizations']['require'] = static::getDefaultRequire($coreConstraint);
- if (!empty($extra['composer-drupal-optimizations']['require']) && $io->isVerbose()) {
- $io->write('Required tags were not explicitly set so the zaporylie/composer-drupal-optimizations set default based on project\'s composer.json content.');
- }
- }
- if (!empty($extra['composer-drupal-optimizations']['require']) && $io->isVerbose()) {
- foreach ($extra['composer-drupal-optimizations']['require'] as $package => $version) {
- $io->write(sprintf('extra.commerce-drupal-optimizations.require.%s: \'%s\'', $package, $version));
- }
- }
-
- $rfs = Factory::createRemoteFilesystem($io, $composer->getConfig());
- $manager = RepositoryFactory::manager($io, $composer->getConfig(), $composer->getEventDispatcher(), $rfs);
- $setRepositories = \Closure::bind(function (RepositoryManager $manager) use ($extra) {
- $manager->repositoryClasses = $this->repositoryClasses;
- $manager->setRepositoryClass('composer', TruncatedComposerRepository::class);
- $manager->repositories = $this->repositories;
- $i = 0;
- foreach (RepositoryFactory::defaultRepos(null, $this->config, $manager) as $repo) {
- $manager->repositories[$i++] = $repo;
- if ($repo instanceof TruncatedComposerRepository && !empty($extra['composer-drupal-optimizations']['require'])) {
- $repo->setRequiredVersionConstraints($extra['composer-drupal-optimizations']['require']);
- }
- }
- $manager->setLocalRepository($this->getLocalRepository());
- }, $composer->getRepositoryManager(), RepositoryManager::class);
- $setRepositories($manager);
- $composer->setRepositoryManager($manager);
- }
-
- /**
- * Negotiates default require constraint and package for given drupal/core.
- *
- * @param \Composer\Semver\Constraint\ConstraintInterface
- *
- * @return array
- */
- static public function getDefaultRequire(ConstraintInterface $coreConstraint)
- {
- if ((new Constraint('>=', '8.5.0'))->matches($coreConstraint)
- && !(new Constraint('<', '8.5.0'))->matches($coreConstraint)) {
- return [
- 'symfony/symfony' => '>3.4',
- ];
- }
- return [];
- }
-}
diff --git a/vendor/zaporylie/composer-drupal-optimizations/src/TruncatedComposerRepository.php b/vendor/zaporylie/composer-drupal-optimizations/src/TruncatedComposerRepository.php
deleted file mode 100644
index 23f8ecf08b..0000000000
--- a/vendor/zaporylie/composer-drupal-optimizations/src/TruncatedComposerRepository.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace zaporylie\ComposerDrupalOptimizations;
-
-use Composer\Config;
-use Composer\EventDispatcher\EventDispatcher;
-use Composer\IO\IOInterface;
-use Composer\Repository\ComposerRepository as BaseComposerRepository;
-use Composer\Util\RemoteFilesystem;
-
-class TruncatedComposerRepository extends BaseComposerRepository
-{
- public function __construct(array $repoConfig, IOInterface $io, Config $config, EventDispatcher $eventDispatcher = null, RemoteFilesystem $rfs = null)
- {
- parent::__construct($repoConfig, $io, $config, $eventDispatcher, $rfs);
- $this->cache = new Cache($io, $config->get('cache-repo-dir').'/'.preg_replace('{[^a-z0-9.]}i', '-', $this->url), 'a-z0-9.$');
- }
- protected function fetchFile($filename, $cacheKey = null, $sha256 = null, $storeLastModifiedTime = false)
- {
- $data = parent::fetchFile($filename, $cacheKey, $sha256, $storeLastModifiedTime);
- return \is_array($data) ? $this->cache->removeLegacyTags($data) : $data;
- }
- public function setRequiredVersionConstraints(array $packages) {
- $this->cache->setRequiredVersionConstraints($packages);
- }
-}
diff --git a/vendor/zaporylie/composer-drupal-optimizations/tests/CacheTest.php b/vendor/zaporylie/composer-drupal-optimizations/tests/CacheTest.php
deleted file mode 100644
index 2eb471fa9b..0000000000
--- a/vendor/zaporylie/composer-drupal-optimizations/tests/CacheTest.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-
-namespace zaporylie\ComposerDrupalOptimizations\Tests;
-
-use Composer\IO\NullIO;
-use PHPUnit\Framework\TestCase;
-use zaporylie\ComposerDrupalOptimizations\Cache;
-
-class CacheTest extends TestCase
-{
-
- /**
- * Tests if data is not malformed and only valid array from valid provider
- * is processed.
- *
- * @param $provided
- * @param $expected
- *
- * @dataProvider provideReadTest
- * @covers \zaporylie\ComposerDrupalOptimizations\Cache::read
- */
- public function testRead($provided, $expected)
- {
- $cache = new class(new NullIO(), 'test') extends Cache {
- protected $packages = [
- 'vendor/package' => 'version',
- ];
- protected function readFile($file)
- {
- // Remove provider - used only for tests.
- if (0 === strpos($file, 'provider-vendor$')) {
- $file = substr($file, 16);
- }
- return $file;
- }
- public function removeLegacyTags(array $data)
- {
- $data['status'] = 'ok';
- return $data;
- }
- };
- static::assertEquals($expected, $cache->read($provided));
- }
-
- /**
- * Test data.
- */
- function provideReadTest()
- {
- yield 'normal' => ['{"a":"b"}', '{"a":"b"}'];
- yield 'falsy' => ['{"a":"b"', '{"a":"b"'];
- yield 'empty' => ['', ''];
- yield 'matching-incorrect-provider' => ['{"provider":"vendor"}', '{"provider":"vendor"}'];
- yield 'matching' => ['provider-vendor${"provider":"vendor"}', '{"provider":"vendor","status":"ok"}'];
- }
-
- /**
- * @dataProvider provideRemoveLegacyTags
- * @covers \zaporylie\ComposerDrupalOptimizations\Cache::removeLegacyTags
- */
- public function testRemoveLegacyTags(array $expected, array $packages, array $versionConstraints)
- {
- /** @var Cache $cache */
- $cache = (new \ReflectionClass(Cache::class))->newInstanceWithoutConstructor();
- $cache->setRequiredVersionConstraints($versionConstraints);
- $this->assertSame(['packages' => $expected], $cache->removeLegacyTags(['packages' => $packages]));
- }
-
- /**
- * Test data.
- */
- public function provideRemoveLegacyTags()
- {
- yield 'no-symfony/symfony' => [[123], [123], ['symfony/symfony' => '~1']];
- $branchAlias = function ($versionAlias) {
- return [
- 'extra' => [
- 'branch-alias' => [
- 'dev-master' => $versionAlias.'-dev',
- ],
- ],
- ];
- };
- $packages = [
- 'foo/unrelated' => [
- '1.0.0' => [],
- ],
- 'symfony/symfony' => [
- '3.3.0' => [
- 'version_normalized' => '3.3.0.0',
- 'replace' => ['symfony/foo' => 'self.version'],
- ],
- '3.4.0' => [
- 'version_normalized' => '3.4.0.0',
- 'replace' => ['symfony/foo' => 'self.version'],
- ],
- 'dev-master' => $branchAlias('3.5') + [
- 'replace' => ['symfony/foo' => 'self.version'],
- ],
- ],
- 'symfony/foo' => [
- '3.3.0' => ['version_normalized' => '3.3.0.0'],
- '3.4.0' => ['version_normalized' => '3.4.0.0'],
- 'dev-master' => $branchAlias('3.5'),
- ],
- ];
- yield 'empty-intersection-ignores' => [$packages, $packages, ['symfony/symfony' => '~2.0']];
- yield 'empty-intersection-ignores' => [$packages, $packages, ['symfony/symfony' => '~4.0']];
- $expected = $packages;
- unset($expected['symfony/symfony']['3.3.0']);
- unset($expected['symfony/foo']['3.3.0']);
- yield 'non-empty-intersection-filters' => [$expected, $packages, ['symfony/symfony' => '~3.4']];
- unset($expected['symfony/symfony']['3.4.0']);
- unset($expected['symfony/foo']['3.4.0']);
- yield 'master-only' => [$expected, $packages, ['symfony/symfony' => '~3.5']];
- $packages = [
- 'symfony/symfony' => [
- '2.8.0' => [
- 'version_normalized' => '2.8.0.0',
- 'replace' => [
- 'symfony/legacy' => 'self.version',
- 'symfony/foo' => 'self.version',
- ],
- ],
- ],
- 'symfony/legacy' => [
- '2.8.0' => ['version_normalized' => '2.8.0.0'],
- 'dev-master' => $branchAlias('2.8'),
- ],
- ];
- yield 'legacy-are-not-filtered' => [$packages, $packages, ['symfony/symfony' => '~3.0']];
- $packages = [
- 'symfony/symfony' => [
- '2.8.0' => [
- 'version_normalized' => '2.8.0.0',
- 'replace' => [
- 'symfony/foo' => 'self.version',
- 'symfony/new' => 'self.version',
- ],
- ],
- 'dev-master' => $branchAlias('3.0') + [
- 'replace' => [
- 'symfony/foo' => 'self.version',
- 'symfony/new' => 'self.version',
- ],
- ],
- ],
- 'symfony/foo' => [
- '2.8.0' => ['version_normalized' => '2.8.0.0'],
- 'dev-master' => $branchAlias('3.0'),
- ],
- 'symfony/new' => [
- 'dev-master' => $branchAlias('3.0'),
- ],
- ];
- $expected = $packages;
- unset($expected['symfony/symfony']['dev-master']);
- unset($expected['symfony/foo']['dev-master']);
- yield 'master-is-filtered-only-when-in-range' => [$expected, $packages, ['symfony/symfony' => '~2.8']];
- }
-}
diff --git a/vendor/zaporylie/composer-drupal-optimizations/tests/DefaultRequireTest.php b/vendor/zaporylie/composer-drupal-optimizations/tests/DefaultRequireTest.php
deleted file mode 100644
index e3368c48ec..0000000000
--- a/vendor/zaporylie/composer-drupal-optimizations/tests/DefaultRequireTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace zaporylie\ComposerDrupalOptimizations\Tests;
-
-use Composer\Semver\VersionParser;
-use PHPUnit\Framework\TestCase;
-use zaporylie\ComposerDrupalOptimizations\Plugin;
-
-class DefaultRequireTest extends TestCase
-{
-
- /**
- * Tests default require provider.
- *
- * @param $provided
- * @param $expected
- * @dataProvider provideTestData
- */
- public function testDefaultRequire($provided, $expected)
- {
- $versionParser = new VersionParser();
- self::assertEquals($expected, Plugin::getDefaultRequire($versionParser->parseConstraints($provided)));
- }
-
- /**
- * Test data.
- */
- function provideTestData()
- {
- yield 'exact-below' => ['8.2.0', []];
- yield 'exact-above' => ['8.6.0', ['symfony/symfony' => '>3.4']];
- yield 'exact-min' => ['8.5.0', ['symfony/symfony' => '>3.4']];
- yield 'range-below' => ['~8.4.0', []];
- yield 'range-overlapping' => ['>8.4.0 <8.6.0', []];
- yield 'range-below-above' => ['~8.2.0|~8.6.0', []];
- yield 'range-above' => ['~8.6.0', ['symfony/symfony' => '>3.4']];
- yield 'range-min' => ['^8.5', ['symfony/symfony' => '>3.4']];
- }
-
-}
--
GitLab