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-03-24 09:12:18 +01: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-05-02 17:18:45 +02:00
5 changed files with 6 additions and 4 deletions
--- a/ClassMapGenerator.php
+++ b/ClassMapGenerator.php
@@ -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)) {
--- a/Tests/ClassMapGeneratorTest.php
+++ b/Tests/ClassMapGeneratorTest.php
@@ -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);
    }
--- a/Tests/Fixtures/classmap/multipleNs.php
+++ b/Tests/Fixtures/classmap/multipleNs.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace {
    class A
    {
--- a/Tests/Fixtures/php5.4/traits.php
+++ b/Tests/Fixtures/php5.4/traits.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace {
    trait TFoo
    {
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
    "type": "library",
    "description": "Symfony ClassLoader Component",
    "keywords": [],
-    "homepage": "http://symfony.com",
+    "homepage": "https://symfony.com",
    "license": "MIT",
    "authors": [
        {
@@ -12,7 +12,7 @@
        },
        {
            "name": "Symfony Community",
-            "homepage": "http://symfony.com/contributors"
+            "homepage": "https://symfony.com/contributors"
        }
    ],
    "minimum-stability": "dev",
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
Fabien Potencier	695134c9b3	Merge branch '2.3' into 2.6 * 2.3: link to https://symfony.com where possible [FrameworkBundle] Added missing log in server:run command [HttpFoundation] Allow curly braces in trusted host patterns [profiler][security] check authenticated user by tokenClass instead of username. Use https://symfony.com/search for searching Conflicts: src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php src/Symfony/Component/Form/README.md src/Symfony/Component/Intl/README.md src/Symfony/Component/Routing/composer.json src/Symfony/Component/Security/README.md src/Symfony/Component/Translation/README.md src/Symfony/Component/Validator/README.md	2015-05-02 17:18:45 +02:00
Christian Flothmann	85b2532f2f	link to https://symfony.com where possible	2015-05-01 16:06:45 +02:00
Gregor Harlan	1ecb64f0c2	CS: Pre incrementation/decrementation should be used if possible	2015-04-07 19:54:22 +02:00
Fabien Potencier	861765b3e5	Merge branch '2.3' into 2.6 * 2.3: CS: fixes Translator component has default domain for null implemented no need to have default translation domain logic in 3 different places [travis] Kill tests when a new commit has been pushed fixed CS Change behavior to mirror hash_equals() returning early if there is a length mismatch CS fixing Prevent modifying secrets as much as possible Update StringUtils.php Whitespace Update StringUtils.php CS: general fixes [SecurityBundle] removed a duplicated service definition and simplified others. Conflicts: src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php	2015-03-27 11:19:51 +01:00
Dariusz Ruminski	cc6272033e	CS: fixes	2015-03-27 10:02:23 +01:00