Merge branch '2.4'
commit
c9973cf5a8
|
@ -65,7 +65,7 @@ class ValidatingArrayLoader implements LoaderInterface
|
|||
$this->config = $config;
|
||||
|
||||
$this->validateString('name', true);
|
||||
if (isset($config['name']) && ($err = self::hasPackageNamingError($config['name']))) {
|
||||
if (isset($config['name']) && null !== ($err = self::hasPackageNamingError($config['name']))) {
|
||||
$this->errors[] = 'name : '.$err;
|
||||
}
|
||||
|
||||
|
@ -326,7 +326,7 @@ class ValidatingArrayLoader implements LoaderInterface
|
|||
}
|
||||
if ($type === 'psr-4') {
|
||||
foreach ($typeConfig as $namespace => $dirs) {
|
||||
if ($namespace !== '' && '\\' !== substr($namespace, -1)) {
|
||||
if ($namespace !== '' && '\\' !== substr((string) $namespace, -1)) {
|
||||
$this->errors[] = 'autoload.psr-4 : invalid value ('.$namespace.'), namespaces must end with a namespace separator, should be '.$namespace.'\\\\';
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue