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
minor #14121 CS: Pre incrementation/decrementation should be used if possible (gharlan)
2026-04-25 17:58:16 +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 · 2015-05-01 16:06:45 +02:00 · 2015-04-07 19:54:22 +02:00
2 changed files with 3 additions and 3 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)) {
@@ -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
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