dependabot-composer 0.129.2 → 0.130.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c9f13d1fd21fd1b4680d45ad24e5c9a201fe0b7a9ff5b9bbc12b9a94f002dcc
-  data.tar.gz: 1ea636b756a39c1f30ad8b426c63dce3cb745dd09a68b57f74d74cf832d20568
+  metadata.gz: 409ae97c9d2f9e05d3772f4da3ee2038fd492e5d22684f0a2576e24862f60ec1
+  data.tar.gz: fc9ff5d7ccb2648e964c3764a20d4acd8e239f20e37e4fc6a33d1c6248d57823
 SHA512:
-  metadata.gz: 2a1787f713970eb9d400ad13c97a738351c9b232396dfdeec97c678d386e96442bfe3719a61e59c98d3dcbc0420d98b39a5cacdd6965c28581086f9c08e92302
-  data.tar.gz: b277aa9f82d15780a9324ed5604df5fc2cf132175017846e55ee0c04407f50894f18b69a66fe9cf1f173398671383d8c58fe0ee6d03d7c1cfae19b6c41c020ac
+  metadata.gz: 9eb332d3c62c469f95fe7e13281d8e57021b16194cc08a3335d8f78135d9c4e98655b5223e5cf8b7be7c2c04d737ea29e9cf3e66e902968aa88b46abe507fbfc
+  data.tar.gz: aea73efaf4d8f54746efa2ee2b22e74d26a6d724ed0a3caf1eb46237937d6fb981eb10266f399d56edd9127c4162fafaf3a30d5584a282883c161e2debe2000f

data/helpers/v1/composer.lock

@@ -1838,16 +1838,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "0.12.64",
+            "version": "0.12.66",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa"
+                "reference": "4110a2425c6bd53acbdfcda07885e87b66e9ba3e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa",
-                "reference": "23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/4110a2425c6bd53acbdfcda07885e87b66e9ba3e",
+                "reference": "4110a2425c6bd53acbdfcda07885e87b66e9ba3e",
                 "shasum": ""
             },
             "require": {
@@ -1890,7 +1890,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-12-21T11:59:02+00:00"
+            "time": "2021-01-11T16:43:15+00:00"
         },
         {
             "name": "psr/event-dispatcher",

data/helpers/v2/composer.lock

@@ -1883,16 +1883,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "0.12.64",
+            "version": "0.12.66",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa"
+                "reference": "4110a2425c6bd53acbdfcda07885e87b66e9ba3e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa",
-                "reference": "23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/4110a2425c6bd53acbdfcda07885e87b66e9ba3e",
+                "reference": "4110a2425c6bd53acbdfcda07885e87b66e9ba3e",
                 "shasum": ""
             },
             "require": {
@@ -1935,7 +1935,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-12-21T11:59:02+00:00"
+            "time": "2021-01-11T16:43:15+00:00"
         },
         {
             "name": "psr/event-dispatcher",

data/lib/dependabot/composer/helpers.rb

@@ -10,11 +10,21 @@ module Dependabot
 
       def self.composer_version(composer_json, parsed_lockfile = nil)
         return "v1" if composer_json["name"] && composer_json["name"] !~ COMPOSER_V2_NAME_REGEX
+        return "v1" if invalid_v2_requirement?(composer_json)
         return "v2" unless parsed_lockfile && parsed_lockfile["plugin-api-version"]
 
         version = Composer::Version.new(parsed_lockfile["plugin-api-version"])
         version.canonical_segments.first == 1 ? "v1" : "v2"
       end
+
+      def self.invalid_v2_requirement?(composer_json)
+        return false unless composer_json.key?("require")
+
+        composer_json["require"].keys.any? do |key|
+          key != "php" && key !~ COMPOSER_V2_NAME_REGEX
+        end
+      end
+      private_class_method :invalid_v2_requirement?
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-composer
 version: !ruby/object:Gem::Version
-  version: 0.129.2
+  version: 0.130.1
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-04 00:00:00.000000000 Z
+date: 2021-01-14 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.129.2
+        version: 0.130.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.129.2
+        version: 0.130.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.0
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: PHP (Composer) support for dependabot