diff --git a/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php b/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php index 04d4f80ad2..cc4d76cf64 100644 --- a/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php +++ b/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php @@ -178,7 +178,7 @@ class ModelChoiceList extends ObjectChoiceList return array(); } - /** + /* * This performance optimization reflects a common scenario: * * A simple select of a model entry. * * The choice option "expanded" is set to false. @@ -233,7 +233,7 @@ class ModelChoiceList extends ObjectChoiceList } if (!$this->loaded) { - /** + /* * This performance optimization assumes the validation of the respective values will be done by other means. * * It correlates with the performance optimization in {@link ModelChoiceList::getChoicesForValues()} diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php index 80d3ab892d..95d5cdbf56 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php @@ -11,11 +11,8 @@ namespace Symfony\Component\HttpFoundation\Session\Storage\Handler; -/** - * Adds SessionHandler functionality if available. - * - * @see http://php.net/sessionhandler - */ +// Adds SessionHandler functionality if available. +// @see http://php.net/sessionhandler if (PHP_VERSION_ID >= 50400) { class NativeSessionHandler extends \SessionHandler { diff --git a/src/Symfony/Component/HttpKernel/Exception/FatalErrorException.php b/src/Symfony/Component/HttpKernel/Exception/FatalErrorException.php index 0e7beda8e2..7a1cd23381 100644 --- a/src/Symfony/Component/HttpKernel/Exception/FatalErrorException.php +++ b/src/Symfony/Component/HttpKernel/Exception/FatalErrorException.php @@ -11,7 +11,7 @@ namespace Symfony\Component\HttpKernel\Exception; -/** +/* * Fatal Error Exception. * * @author Konstanton Myakshin diff --git a/src/Symfony/Component/HttpKernel/Exception/FlattenException.php b/src/Symfony/Component/HttpKernel/Exception/FlattenException.php index c84b6fa7ae..ebe45b4580 100644 --- a/src/Symfony/Component/HttpKernel/Exception/FlattenException.php +++ b/src/Symfony/Component/HttpKernel/Exception/FlattenException.php @@ -11,7 +11,7 @@ namespace Symfony\Component\HttpKernel\Exception; -/** +/* * FlattenException wraps a PHP Exception to be able to serialize it. * * Basically, this class removes all objects from the trace. diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php index c8b34e373f..fd63872894 100644 --- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php +++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php @@ -313,11 +313,9 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec } elseif ($key === '#') { $append = $this->selectNodeType($parentNode, $data); } elseif (is_array($data) && false === is_numeric($key)) { - /** - * Is this array fully numeric keys? - */ + // Is this array fully numeric keys? if (ctype_digit(implode('', array_keys($data)))) { - /** + /* * Create nodes to append to $parentNode based on the $key of this array * Produces 01 * From array("item" => array(0,1));. diff --git a/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php b/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php index cb511eee92..37efe89234 100644 --- a/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php +++ b/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php @@ -25,72 +25,52 @@ use Symfony\Component\Validator\ConstraintValidator; class CardSchemeValidator extends ConstraintValidator { protected $schemes = array( - /** - * American Express card numbers start with 34 or 37 and have 15 digits. - */ + // American Express card numbers start with 34 or 37 and have 15 digits. 'AMEX' => array( '/^3[47][0-9]{13}$/', ), - /** - * China UnionPay cards start with 62 and have between 16 and 19 digits. - * Please note that these cards do not follow Luhn Algorithm as a checksum. - */ + // China UnionPay cards start with 62 and have between 16 and 19 digits. + // Please note that these cards do not follow Luhn Algorithm as a checksum. 'CHINA_UNIONPAY' => array( '/^62[0-9]{14,17}$/', ), - /** - * Diners Club card numbers begin with 300 through 305, 36 or 38. All have 14 digits. - * There are Diners Club cards that begin with 5 and have 16 digits. - * These are a joint venture between Diners Club and MasterCard, and should be processed like a MasterCard. - */ + // Diners Club card numbers begin with 300 through 305, 36 or 38. All have 14 digits. + // There are Diners Club cards that begin with 5 and have 16 digits. + // These are a joint venture between Diners Club and MasterCard, and should be processed like a MasterCard. 'DINERS' => array( '/^3(?:0[0-5]|[68][0-9])[0-9]{11}$/', ), - /** - * Discover card numbers begin with 6011, 622126 through 622925, 644 through 649 or 65. - * All have 16 digits. - */ + // Discover card numbers begin with 6011, 622126 through 622925, 644 through 649 or 65. + // All have 16 digits. 'DISCOVER' => array( '/^6011[0-9]{12}$/', '/^64[4-9][0-9]{13}$/', '/^65[0-9]{14}$/', '/^622(12[6-9]|1[3-9][0-9]|[2-8][0-9][0-9]|91[0-9]|92[0-5])[0-9]{10}$/', ), - /** - * InstaPayment cards begin with 637 through 639 and have 16 digits. - */ + // InstaPayment cards begin with 637 through 639 and have 16 digits. 'INSTAPAYMENT' => array( '/^63[7-9][0-9]{13}$/', ), - /** - * JCB cards beginning with 2131 or 1800 have 15 digits. - * JCB cards beginning with 35 have 16 digits. - */ + // JCB cards beginning with 2131 or 1800 have 15 digits. + // JCB cards beginning with 35 have 16 digits. 'JCB' => array( '/^(?:2131|1800|35[0-9]{3})[0-9]{11}$/', ), - /** - * Laser cards begin with either 6304, 6706, 6709 or 6771 and have between 16 and 19 digits. - */ + // Laser cards begin with either 6304, 6706, 6709 or 6771 and have between 16 and 19 digits. 'LASER' => array( '/^(6304|670[69]|6771)[0-9]{12,15}$/', ), - /** - * Maestro cards begin with either 5018, 5020, 5038, 5893, 6304, 6759, 6761, 6762, 6763 or 0604 - * They have between 12 and 19 digits. - */ + // Maestro cards begin with either 5018, 5020, 5038, 5893, 6304, 6759, 6761, 6762, 6763 or 0604 + // They have between 12 and 19 digits. 'MAESTRO' => array( '/^(5018|5020|5038|6304|6759|6761|676[23]|0604)[0-9]{8,15}$/', ), - /** - * All MasterCard numbers start with the numbers 51 through 55. All have 16 digits. - */ + // All MasterCard numbers start with the numbers 51 through 55. All have 16 digits. 'MASTERCARD' => array( '/^5[1-5][0-9]{14}$/', ), - /** - * All Visa card numbers start with a 4. New cards have 16 digits. Old cards have 13. - */ + // All Visa card numbers start with a 4. New cards have 16 digits. Old cards have 13. 'VISA' => array( '/^4([0-9]{12}|[0-9]{15})$/', ),