From b85e0eebc115688653d3739aa4928c1ddfc45311 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Thu, 24 Feb 2022 11:17:46 +0100
Subject: [PATCH 1/2] Allow 3rd parties to use URL_REGEX

---
 src/Composer/Repository/Vcs/GitLabDriver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Composer/Repository/Vcs/GitLabDriver.php b/src/Composer/Repository/Vcs/GitLabDriver.php
index 13ecd755d636..2397b78d3ab9 100644
--- a/src/Composer/Repository/Vcs/GitLabDriver.php
+++ b/src/Composer/Repository/Vcs/GitLabDriver.php
@@ -82,7 +82,7 @@ class GitLabDriver extends VcsDriver
      */
     private $hasNonstandardOrigin = false;
 
-    private const URL_REGEX = '#^(?:(?P<scheme>https?)://(?P<domain>.+?)(?::(?P<port>[0-9]+))?/|git@(?P<domain2>[^:]+):)(?P<parts>.+)/(?P<repo>[^/]+?)(?:\.git|/)?$#';
+    public const URL_REGEX = '#^(?:(?P<scheme>https?)://(?P<domain>.+?)(?::(?P<port>[0-9]+))?/|git@(?P<domain2>[^:]+):)(?P<parts>.+)/(?P<repo>[^/]+?)(?:\.git|/)?$#';
 
     /**
      * Extracts information from the repository url.

From 907a0b0d458762ddd340a2313dfb5e7736d6fcf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Mirtes?= <ondrej@mirtes.cz>
Date: Thu, 24 Feb 2022 13:21:22 +0100
Subject: [PATCH 2/2] Better ignore-by-php-version.neon.php

---
 phpstan/ignore-by-php-version.neon.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/phpstan/ignore-by-php-version.neon.php b/phpstan/ignore-by-php-version.neon.php
index a88d63bced28..21212110c723 100644
--- a/phpstan/ignore-by-php-version.neon.php
+++ b/phpstan/ignore-by-php-version.neon.php
@@ -1,14 +1,12 @@
 <?php declare(strict_types = 1);
 
-use PHPStan\DependencyInjection\NeonAdapter;
-
-$adapter = new NeonAdapter();
-
 // more inspiration at https://github.com/phpstan/phpstan-src/blob/master/build/ignore-by-php-version.neon.php
-$config = [];
+$includes = [];
 if (PHP_VERSION_ID >= 80000) {
-    $config = array_merge_recursive($config, $adapter->load(__DIR__ . '/baseline-8.1.neon'));
+    $includes[] = __DIR__ . '/baseline-8.1.neon';
 }
+
+$config['includes'] = $includes;
 $config['parameters']['phpVersion'] = PHP_VERSION_ID;
 
 return $config;