dependabot-composer 0.401.0 → 0.402.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b2933307bd6bed54667c81936605350c8ae6ba7a4b370cdbd261348e4c6b337
-  data.tar.gz: 0fc9b490113ad41da273feb357c8b08dc9b35526cdd345692501cd1cae7e03fb
+  metadata.gz: ab15aac0e816b7a9c6a980beac52353c3383621d9127bb66977025fc889b5b53
+  data.tar.gz: 72bc0fa5f98713d6dfe71246d8a50497c0312bfce3e0a4a714decd385e88adf4
 SHA512:
-  metadata.gz: f607c29e75ecde3e59ebf634412328423ead56e8b86ea4a7e4281ef5ae4e86e31016c629c818e2b5525a85e2ffa83f977256000996bbaa8daf95530eb2ec967b
-  data.tar.gz: eb7597f863112fafa2ebde80a654fee792b7a1ac9f2a6a92ef2cb4d5300ea046f55f3cebd5c10b80a8e00dd2adb5263fe9df386e1d88b8b2b22701b7591d1ff8
+  metadata.gz: 46984d5edfdd97c536cb0081b7c888b124a315f6fa28384e173a43c7317e2fd5fc10df9d5c35455dd71235f357ccf72d10bf8286ff8b46809e2170669a9ce7e1
+  data.tar.gz: cdacfb536eca1b4708e9f85bdabaf430860fc586f09569e7da36b09448d527ee89e88a250a574eccd16c483856d5fd5f102ccc4c7178e600619b90d0623d024d

data/lib/dependabot/composer/file_updater/lockfile_updater.rb

@@ -235,7 +235,7 @@ module Dependabot
             raise DependencyFileNotResolvable, error.message
           end
 
-          raise Dependabot::OutOfMemory if error.message.start_with?("Allowed memory size")
+          raise Dependabot::OutOfMemory if Helpers.out_of_memory_error?(error.message)
 
           match_data = error.message.match(%r{https?://(?<source>[^/]+)/})
           if error.message.include?("403 Forbidden") && match_data

data/lib/dependabot/composer/helpers.rb

@@ -31,6 +31,10 @@ module Dependabot
 
       GIT_REPO_URL = %r{((git|ssh|http(s)?)|(git@[\w\.]+))(:(//)?)([\w\.@\:/\-~]+)(/)?}
 
+      # PHP's out-of-memory errors. When the OS refuses an allocation, PHP
+      # prints "mmap() failed" lines before "Out of memory", so match any line.
+      OUT_OF_MEMORY_ERROR = /^(?:Allowed memory size|Out of memory)/
+
       sig do
         params(
           composer_json: ManifestDocument,
@@ -75,6 +79,11 @@ module Dependabot
         V2
       end
 
+      sig { params(message: String).returns(T::Boolean) }
+      def self.out_of_memory_error?(message)
+        OUT_OF_MEMORY_ERROR.match?(message)
+      end
+
       sig { params(message: String).returns(T.nilable(String)) }
       def self.dependency_url_from_git_clone_error(message)
         extract_and_clean_dependency_url(message, FAILED_GIT_CLONE_WITH_MIRROR) ||

data/lib/dependabot/composer/update_checker/version_resolver.rb

@@ -389,7 +389,7 @@ module Dependabot
 
             source = url.gsub(%r{/packages.json$}, "")
             raise Dependabot::PrivateSourceTimedOut, source
-          elsif error.message.start_with?("Allowed memory size", "Out of memory")
+          elsif Helpers.out_of_memory_error?(error.message)
             raise Dependabot::OutOfMemory
           elsif error.error_context[:process_termsig] == Dependabot::SharedHelpers::SIGKILL
             # If the helper was SIGKILL-ed, assume the OOMKiller did it
@@ -439,6 +439,7 @@ module Dependabot
           end
         end
 
+        # rubocop:disable Metrics/AbcSize
         sig { returns(T::Boolean) }
         def check_original_requirements_resolvable
           base_directory = T.must(dependency_files.first).directory
@@ -454,6 +455,8 @@ module Dependabot
 
           true
         rescue SharedHelpers::HelperSubprocessFailed => e
+          raise Dependabot::OutOfMemory if Helpers.out_of_memory_error?(e.message)
+
           if e.message.match?(MISSING_EXPLICIT_PLATFORM_REQ_REGEX)
             missing_extensions =
               e.message.scan(MISSING_EXPLICIT_PLATFORM_REQ_REGEX)
@@ -475,6 +478,7 @@ module Dependabot
 
           raise Dependabot::DependencyFileNotResolvable, e.message
         end
+        # rubocop:enable Metrics/AbcSize
 
         sig { params(requirements: T::Array[String]).returns(T.nilable(String)) }
         def version_for_reqs(requirements)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-composer
 version: !ruby/object:Gem::Version
-  version: 0.401.0
+  version: 0.402.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.401.0
+        version: 0.402.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.401.0
+        version: 0.402.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -281,7 +281,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.401.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.402.0
 rdoc_options: []
 require_paths:
 - lib