From f1f013edde6528e58a47dfd94af527f5b9af801c Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 29 Apr 2022 14:58:38 +0200 Subject: [PATCH] Downgrade naming errors to warnings again in package links to avoid BC issues with tags on packagist --- .../Package/Loader/ValidatingArrayLoader.php | 4 ++-- .../Loader/ValidatingArrayLoaderTest.php | 24 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Composer/Package/Loader/ValidatingArrayLoader.php b/src/Composer/Package/Loader/ValidatingArrayLoader.php index e341b18db..ac7fff385 100644 --- a/src/Composer/Package/Loader/ValidatingArrayLoader.php +++ b/src/Composer/Package/Loader/ValidatingArrayLoader.php @@ -258,9 +258,9 @@ class ValidatingArrayLoader implements LoaderInterface continue; } if ($err = self::hasPackageNamingError($package, true)) { - $this->errors[] = $linkType.'.'.$err; + $this->warnings[] = $linkType.'.'.$err; } elseif (!Preg::isMatch('{^[A-Za-z0-9_./-]+$}', $package)) { - $this->warnings[] = $linkType.'.'.$package.' : invalid key, package names must be strings containing only [A-Za-z0-9_./-]'; + $this->errors[] = $linkType.'.'.$package.' : invalid key, package names must be strings containing only [A-Za-z0-9_./-]'; } if (!is_string($constraint)) { $this->errors[] = $linkType.'.'.$package.' : invalid value, must be a string containing a version constraint'; diff --git a/tests/Composer/Test/Package/Loader/ValidatingArrayLoaderTest.php b/tests/Composer/Test/Package/Loader/ValidatingArrayLoaderTest.php index ad368bf24..e3d6103e1 100644 --- a/tests/Composer/Test/Package/Loader/ValidatingArrayLoaderTest.php +++ b/tests/Composer/Test/Package/Loader/ValidatingArrayLoaderTest.php @@ -352,18 +352,6 @@ class ValidatingArrayLoaderTest extends TestCase 'name : Foo/Bar is invalid, it should not contain uppercase characters. We suggest using foo/bar instead.', ), ), - array( - array( - 'name' => 'foo/bar', - 'require' => array( - 'Foo/Baz' => '^1.0', - ), - ), - array( - 'require.Foo/Baz is invalid, it should not contain uppercase characters. Please use foo/baz instead.', - ), - false, - ), array( array( 'name' => 'foo/bar', @@ -523,6 +511,18 @@ class ValidatingArrayLoaderTest extends TestCase ), false, ), + array( + array( + 'name' => 'foo/bar', + 'require' => array( + 'Foo/Baz' => '^1.0', + ), + ), + array( + 'require.Foo/Baz is invalid, it should not contain uppercase characters. Please use foo/baz instead.', + ), + false, + ), ); } }