public-mirrors/composer
1
0
Fork 0
mirror of https://github.com/composer/composer synced 2025-05-09 00:22:53 +00:00
Code Activity

Extract email validation into a method

Browse source
This commit is contained in:
Francesc Rosàs 2013-05-25 17:01:14 +01:00
parent e3b9dd10c2
commit 9aa0aba77c
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Composer/Command/InitCommand.php
View file

@ -36,7 +36,7 @@ class InitCommand extends Command
public function parseAuthorString($author)
{
if (preg_match('/^(?P<name>[- \.,\w\'’]+) <(?P<email>.+?)>$/u', $author, $match)) {
if (!function_exists('filter_var') || version_compare(PHP_VERSION, '5.3.3', '<') || $match['email'] === filter_var($match['email'], FILTER_VALIDATE_EMAIL)) {
if ($this->isValidEmail($match['email'])) {
return array(
'name' => trim($match['name']),
'email' => $match['email']
@ -487,4 +487,11 @@ EOT
file_put_contents($ignoreFile, $contents . $vendor. "\n");
}
protected function isValidEmail($email)
{
if (!function_exists('filter_var')) return true; // Bypass if we can't validate it
if (version_compare(PHP_VERSION, '5.3.3', '<')) return true; // ?
return false !== filter_var($email, FILTER_VALIDATE_EMAIL);
}
}