dependabot-composer 0.286.0 → 0.287.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d544676aafa67c45ff3d489882678802b0d168f9fd6652a1545552a49b8beb5
-  data.tar.gz: d5ecf28b2e85c494136db0f09293e8a268b18ac7c52685958a23381499a0708f
+  metadata.gz: 33efc3aae325bc2acdd965e6ec6904a390e1e69c730028acbf543ae50c7f853e
+  data.tar.gz: 3d70840ea14077b634287b459b5168ebcc991f341cc305e78cde0efbd0796694
 SHA512:
-  metadata.gz: a683c8a8b3363618a1b87fd9269246100de66ca595eb4c89709fe6d4b4c626fe4b2d3d0cc9af00f10c43ef06b7b67acdc48f92fb01f35882abc7d4287fe0e91f
-  data.tar.gz: 84e4afce44edf09ddd4922ca0e89fe80b2e20857ac7258ecf416ab7658f892bf2c8153ad11c948d02e62639403642ba1b3903b2d91ff0aaa91ace47a7288ac5e
+  metadata.gz: b274ddd490c9d93fa441e06404df4bad8e172178a54963307d3b804865cd45e448caeb55d7446a9d13030c7a71637712a405e6a4311a1e539dfa04b21a4c3139
+  data.tar.gz: 7d06ec720c22e6e88602a76e987887aa1a927e3b031673b9773d61884ddb19272a02d9efe12d13aa4091e6a0c635a93f7340c533d4839e3a84eef8a93aba9a8d

data/lib/dependabot/composer/helpers.rb

@@ -43,13 +43,13 @@ module Dependabot
           .returns(String)
       end
       def self.composer_version(composer_json, parsed_lockfile = nil)
-        v1_unsupported = Dependabot::Experiments.enabled?(:composer_v1_unsupported_error)
-
         # If the parsed lockfile has a plugin API version, we return either V1 or V2
         # based on the major version of the lockfile.
         if parsed_lockfile && parsed_lockfile["plugin-api-version"]
           version = Composer::Version.new(parsed_lockfile["plugin-api-version"])
-          return version.canonical_segments.first == 1 ? V1 : V2
+          major_version = version.canonical_segments.first
+
+          return major_version.nil? || major_version > 1 ? V2 : V1
         end
 
         # Check if the composer name does not follow the Composer V2 naming conventions.
@@ -57,18 +57,14 @@ module Dependabot
         composer_name_invalid = composer_json["name"] && composer_json["name"] !~ COMPOSER_V2_NAME_REGEX
 
         # If the name is invalid returns the fallback version.
-        if composer_name_invalid
-          return v1_unsupported ? V2 : V1
-        end
+        return V2 if composer_name_invalid
 
         # Check if the composer.json file contains "require" entries that don't follow
         # either the platform package naming conventions or the Composer V2 name conventions.
         invalid_v2 = invalid_v2_requirement?(composer_json)
 
         # If there are invalid requirements returns fallback version.
-        if invalid_v2
-          return v1_unsupported ? V2 : V1
-        end
+        return V2 if invalid_v2
 
         # If no conditions are met return V2 by default.
         V2

data/lib/dependabot/composer/package_manager.rb

@@ -29,24 +29,6 @@ module Dependabot
           SUPPORTED_COMPOSER_VERSIONS,
        )
       end
-
-      sig { override.returns(T::Boolean) }
-      def deprecated?
-        return false if unsupported?
-
-        # Check if the feature flag for Composer v1 deprecation warning is enabled.
-        return false unless Dependabot::Experiments.enabled?(:composer_v1_deprecation_warning)
-
-        super
-      end
-
-      sig { override.returns(T::Boolean) }
-      def unsupported?
-        # Check if the feature flag for Composer v1 unsupported error is enabled.
-        return false unless Dependabot::Experiments.enabled?(:composer_v1_unsupported_error)
-
-        super
-      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-composer
 version: !ruby/object:Gem::Version
-  version: 0.286.0
+  version: 0.287.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-14 00:00:00.000000000 Z
+date: 2024-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.286.0
+        version: 0.287.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.286.0
+        version: 0.287.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -242,18 +242,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- helpers/v1/.php-cs-fixer.dist.php
-- helpers/v1/bin/run
-- helpers/v1/build
-- helpers/v1/composer.json
-- helpers/v1/composer.lock
-- helpers/v1/phpstan.dist.neon
-- helpers/v1/src/DependabotInstallationManager.php
-- helpers/v1/src/DependabotPluginManager.php
-- helpers/v1/src/ExceptionIO.php
-- helpers/v1/src/Hasher.php
-- helpers/v1/src/UpdateChecker.php
-- helpers/v1/src/Updater.php
 - helpers/v2/.php-cs-fixer.php
 - helpers/v2/bin/run
 - helpers/v2/build
@@ -287,7 +275,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.286.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.287.0
 post_install_message: 
 rdoc_options: []
 require_paths:

data/helpers/v1/.php-cs-fixer.dist.php

@@ -1,32 +0,0 @@
-<?php
-$finder = PhpCsFixer\Finder::create()
-    ->in(__DIR__ . '/src')
-    ->in(__DIR__ . '/bin');
-$config = new PhpCsFixer\Config();
-return $config
-    ->setRules([
-        '@Symfony' => true,
-        'array_syntax' => ['syntax' => 'short'],
-        'blank_line_after_opening_tag' => true,
-        'concat_space' => ['spacing' => 'one'],
-        'declare_strict_types' => true,
-        'increment_style' => ['style' => 'post'],
-        'list_syntax' => ['syntax' => 'short'],
-        'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
-        'modernize_types_casting' => true,
-        'multiline_whitespace_before_semicolons' => true,
-        'no_useless_else' => true,
-        'no_useless_return' => true,
-        'ordered_imports' => true,
-        'php_unit_construct' => true,
-        'php_unit_dedicate_assert' => true,
-        'phpdoc_align' => false,
-        'phpdoc_order' => true,
-        'single_line_comment_style' => true,
-        'ternary_to_null_coalescing' => true,
-        'void_return' => true,
-        'yoda_style' => false,
-    ])
-    ->setFinder($finder)
-    ->setUsingCache(true)
-    ->setRiskyAllowed(true);

data/helpers/v1/bin/run

@@ -1,86 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-declare(strict_types=1);
-
-namespace Dependabot\Composer;
-
-require __DIR__ . '/../vendor/autoload.php';
-
-// Get details of the process to run from STDIN. It will have a `function`
-// and an `args` method, as passed in by UpdateCheckers::Php
-$request = json_decode(file_get_contents('php://stdin'), true);
-
-function memoryInBytes($value) {
-    $unit = strtolower(substr($value, -1, 1));
-    $value = (int) $value;
-    if ($unit == 'g') {
-        $value *= (1024 * 1024 * 1024);
-    } elseif ($unit == 'm') {
-        $value *= (1024 * 1024);
-    } elseif ($unit == 'k') {
-        $value *= 1024;
-    }
-
-    return $value;
-}
-
-// Increase the default memory limit the same way Composer does (but clearer)
-if (function_exists('ini_set')) {
-    $memoryLimit = trim(ini_get('memory_limit'));
-    // Increase memory_limit if it is lower than 1900MB
-    if ($memoryLimit != -1 && memoryInBytes($memoryLimit) < 1024 * 1024 * 1900) {
-        @ini_set('memory_limit', '1900M');
-    }
-
-    // Set user defined memory limit
-    if ($memoryLimit = getenv('COMPOSER_MEMORY_LIMIT')) {
-        @ini_set('memory_limit', $memoryLimit);
-    }
-    unset($memoryInBytes, $memoryLimit);
-}
-
-date_default_timezone_set('Europe/London');
-
-// This storage is freed on error (case of allowed memory exhausted)
-$memory = str_repeat('*', 1024 * 1024);
-
-register_shutdown_function(function (): void {
-    global $memory;
-    $memory = null;
-    $error = error_get_last();
-    if (null !== $error) {
-        fwrite(STDOUT, json_encode(['error' => $error['message']]));
-    }
-});
-
-if ($memoryAlloc = getenv('DEPENDABOT_TEST_MEMORY_ALLOCATION')) {
-    str_repeat('*', memoryInBytes($memoryAlloc));
-}
-
-try {
-    switch ($request['function']) {
-        case 'update':
-            $updatedFiles = Updater::update($request['args']);
-            fwrite(STDOUT, json_encode(['result' => $updatedFiles]));
-            error_clear_last();
-            break;
-        case 'get_latest_resolvable_version':
-            $latestVersion = UpdateChecker::getLatestResolvableVersion($request['args']);
-            fwrite(STDOUT, json_encode(['result' => $latestVersion]));
-            error_clear_last();
-            break;
-        case 'get_content_hash':
-            $content_hash = Hasher::getContentHash($request['args']);
-            fwrite(STDOUT, json_encode(['result' => $content_hash]));
-            error_clear_last();
-            break;
-        default:
-            fwrite(STDOUT, json_encode(['error' => "Invalid function {$request['function']}"]));
-            exit(1);
-    }
-} catch (\Exception $e) {
-    fwrite(STDOUT, json_encode(['error' => $e->getMessage()]));
-    error_clear_last();
-    exit(1);
-}

data/helpers/v1/build

@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-if [ -z "$DEPENDABOT_NATIVE_HELPERS_PATH" ]; then
-  echo "Unable to build, DEPENDABOT_NATIVE_HELPERS_PATH is not set"
-  exit 1
-fi
-
-install_dir="$DEPENDABOT_NATIVE_HELPERS_PATH/composer/v1"
-mkdir -p "$install_dir"
-
-helpers_dir="$(dirname "${BASH_SOURCE[0]}")"
-cp -r \
-  "$helpers_dir/bin" \
-  "$helpers_dir/src" \
-  "$helpers_dir/.php-cs-fixer.dist.php" \
-  "$helpers_dir/composer.json" \
-  "$helpers_dir/composer.lock" \
-  "$helpers_dir/phpstan.dist.neon" \
-  "$install_dir"
-
-cd "$install_dir"
-
-composer1 validate --no-check-publish
-composer1 install
-composer1 run lint -- --dry-run
-composer1 run stan
-
-# Composer caches source zips and repo metadata, none of which is useful. Save space in this layer
-rm -Rf ~/.composer/cache

data/helpers/v1/composer.json

@@ -1,26 +0,0 @@
-{
-    "name": "dependabot/composer-v1-helper",
-    "description": "A helper package for Dependabot to perform updates using Composer",
-    "license": "MIT",
-    "require": {
-        "php": "^7.4",
-        "ext-json": "*",
-        "composer/composer": "^1"
-    },
-    "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.9",
-        "phpstan/phpstan": "~1.10.3"
-    },
-    "autoload": {
-        "psr-4": {
-            "Dependabot\\Composer\\": "src/"
-        }
-    },
-    "scripts": {
-        "lint": "php-cs-fixer fix --diff --verbose",
-        "stan": "phpstan analyse"
-    },
-    "config": {
-        "sort-packages": true
-    }
-}