Merge branch '2.3' into 2.6

* 2.3: Fixed the regexp for the validator of Maestro-based credit/debit cards [Console] Fix STDERR output text on IBM iSeries OS400 [HttpFoundation] Use convention to allow throwing from __toString() [Form] Fixed: remove quoted strings from Intl date formats (e.g. es_ES full pattern) [bugfix][MonologBridge] WebProcessor: passing to BaseWebProcessor [2.3] Static Code Analysis for Components [Translation][update cmd] taken account into bundle overrides path. Conflicts: src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php src/Symfony/Component/Filesystem/Tests/FilesystemTest.php src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
[2.3] Static Code Analysis for Components
2026-04-26 02:08:05 +02:00 · 2015-06-25 13:21:15 +02:00 · 2015-06-21 22:11:32 +02:00 · 2015-05-15 15:32:45 +02:00 · 2015-05-15 15:28:34 +02:00 · 2015-04-07 19:54:22 +02:00
2 changed files with 2 additions and 2 deletions
@@ -95,7 +95,7 @@ class ClassMapGenerator
        $classes = array();

        $namespace = '';
-        for ($i = 0, $max = count($tokens); $i < $max; $i++) {
+        for ($i = 0, $max = count($tokens); $i < $max; ++$i) {
            $token = $tokens[$i];

            if (is_string($token)) {
@@ -22,7 +22,7 @@ class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase

    public function prepare_workspace()
    {
-        $this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().rand(0, 1000);
+        $this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().mt_rand(0, 1000);
        mkdir($this->workspace, 0777, true);
        $this->workspace = realpath($this->workspace);
    }
Author	SHA1	Message	Date
Nicolas Grekas	c5311911ee	Merge branch '2.3' into 2.6 * 2.3: Fixed the regexp for the validator of Maestro-based credit/debit cards [Console] Fix STDERR output text on IBM iSeries OS400 [HttpFoundation] Use convention to allow throwing from __toString() [Form] Fixed: remove quoted strings from Intl date formats (e.g. es_ES full pattern) [bugfix][MonologBridge] WebProcessor: passing to BaseWebProcessor [2.3] Static Code Analysis for Components [Translation][update cmd] taken account into bundle overrides path. Conflicts: src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php src/Symfony/Component/Filesystem/Tests/FilesystemTest.php src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php	2015-06-25 13:21:15 +02:00
Vladimir Reznichenko	82f4e6502e	[2.3] Static Code Analysis for Components	2015-06-21 22:11:32 +02:00
Fabien Potencier	abf5632a31	Merge branch '2.3' into 2.6 * 2.3: Fix tests in HHVM CS: Pre incrementation/decrementation should be used if possible Conflicts: src/Symfony/Bundle/TwigBundle/Command/LintCommand.php src/Symfony/Component/Console/Helper/TableHelper.php src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php src/Symfony/Component/Security/Acl/Dbal/AclProvider.php src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php	2015-05-15 15:32:45 +02:00
Fabien Potencier	598dfd4610	minor #14121 CS: Pre incrementation/decrementation should be used if possible (gharlan) This PR was merged into the 2.3 branch. Discussion ---------- CS: Pre incrementation/decrementation should be used if possible \| Q \| A \| ------------- \| --- \| Bug fix? \| no \| New feature? \| no \| BC breaks? \| no \| Deprecations? \| no \| Tests pass? \| yes \| Fixed tickets \| n/a \| License \| MIT \| Doc PR \| n/a Fixes provided by new fixer: https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/1113 If this pr is merged I would change the level of the fixer to `symfony`. Commits ------- c5123d6 CS: Pre incrementation/decrementation should be used if possible	2015-05-15 15:28:34 +02:00
Gregor Harlan	1ecb64f0c2	CS: Pre incrementation/decrementation should be used if possible	2015-04-07 19:54:22 +02:00