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 @@ = 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; diff --git a/src/Composer/Repository/Vcs/GitLabDriver.php b/src/Composer/Repository/Vcs/GitLabDriver.php index 68988e1e756a..d80157f37b2c 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 = '#^(?:(?Phttps?)://(?P.+?)(?::(?P[0-9]+))?/|git@(?P[^:]+):)(?P.+)/(?P[^/]+?)(?:\.git|/)?$#'; + public const URL_REGEX = '#^(?:(?Phttps?)://(?P.+?)(?::(?P[0-9]+))?/|git@(?P[^:]+):)(?P.+)/(?P[^/]+?)(?:\.git|/)?$#'; /** * Extracts information from the repository url.