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
9 changed files with 16 additions and 8 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/README.md
+++ b/README.md
@@ -81,5 +81,5 @@ Resources
 You can run the unit tests with the following command:

    $ cd path/to/Symfony/Component/ClassLoader/
-    $ composer.phar install
+    $ composer install
    $ phpunit
--- 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/Tests/LegacyApcUniversalClassLoaderTest.php
+++ b/Tests/LegacyApcUniversalClassLoaderTest.php
@@ -13,6 +13,9 @@ namespace Symfony\Component\ClassLoader\Tests;

 use Symfony\Component\ClassLoader\ApcUniversalClassLoader;

+/**
+ * @group legacy
+ */
 class LegacyApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
 {
    protected function setUp()
--- a/Tests/LegacyUniversalClassLoaderTest.php
+++ b/Tests/LegacyUniversalClassLoaderTest.php
@@ -13,9 +13,12 @@ namespace Symfony\Component\ClassLoader\Tests;

 use Symfony\Component\ClassLoader\UniversalClassLoader;

+/**
+ * @group legacy
+ */
 class LegacyUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
 {
-    public function setUp()
+    protected function setUp()
    {
        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
    }
--- 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",
@@ -20,6 +20,7 @@
        "php": ">=5.3.3"
    },
    "require-dev": {
+        "symfony/phpunit-bridge": "~2.7",
        "symfony/finder": "~2.0,>=2.0.5"
    },
    "autoload": {
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -7,8 +7,7 @@
         bootstrap="vendor/autoload.php"
 >
    <php>
-        <!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
    </php>
    <testsuites>
        <testsuite name="Symfony ClassLoader Component Test Suite">
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
Nicolas Grekas	56bf6fe551	[2.6] add @group legacy	2015-03-13 18:37:22 +01:00
sarah khalil	58743ab956	Changed visibility of setUp() and tearDown to protected	2015-03-13 10:50:03 +01:00
Nicolas Grekas	805179e9d9	Merge branch '2.3' into 2.6 * 2.3: Minor hot fix [PROCESS] make sure /dev/tty is readable [2.3] require-dev PHPUnit bridge [FrameworkBundle] Fixed Shell logo [2.3] Update CONTRIBUTING.md [2.3][Process] Fixed PhpProcess::getCommandLine() result [Console] explicit assertion for ArgvInput::getFirstArgument() with no arguments Enforce UTF-8 charset for core controllers Conflicts: CONTRIBUTING.md src/Symfony/Bridge/Monolog/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php src/Symfony/Component/Console/composer.json src/Symfony/Component/Debug/composer.json src/Symfony/Component/DomCrawler/composer.json src/Symfony/Component/EventDispatcher/composer.json src/Symfony/Component/HttpFoundation/composer.json src/Symfony/Component/Security/composer.json src/Symfony/Component/Templating/composer.json	2015-02-24 12:52:21 +01:00
Nicolas Grekas	41f582851c	[2.3] require-dev PHPUnit bridge	2015-02-24 11:24:26 +01:00
Fabien Potencier	cbf0c98779	Merge branch '2.3' into 2.6 * 2.3: [FrameworkBundle] Fix title and placeholder rendering in php form templates. RequestDataCollector - small fix renamed composer.phar to composer to be consistent with the Symfony docs [FrameworkBundle] bumped min version of Routing to 2.3 removed composer --dev option everywhere fixed a test [Console] Fixed output bug, if escaped string in a formatted string. [Security] Remove ContextListener's onKernelResponse listener as it is used Revert "minor #12652 [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value (skler)" Revert "fixed assertion" fixed assertion [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value fixed URL Add reference to documentation in FormEvents phpdocs [YAML] Fix one-liners to work with multiple new lines Keep "pre" meaning for var_dump quick-and-dirty debug [Console][Table] Fix cell padding with multi-byte Conflicts: src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/widget_attributes.html.php src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/Console/Helper/TableHelper.php	2015-02-11 08:12:14 +01:00
Fabien Potencier	e722b63c50	renamed composer.phar to composer to be consistent with the Symfony docs	2015-02-08 08:41:14 +01:00
Fabien Potencier	ad6b79e597	minor #13206 [2.3] Cleanup deprecations (nicolas-grekas) This PR was merged into the 2.3 branch. Discussion ---------- [2.3] Cleanup deprecations \| Q \| A \| ------------- \| --- \| Bug fix? \| no \| New feature? \| no \| BC breaks? \| no \| Deprecations? \| no \| Tests pass? \| let's see \| Fixed tickets \| - \| License \| MIT \| Doc PR \| - Commits ------- d649bef [2.3] Remove useless tests skips 1d68ad3 [2.3] Cleanup deprecations	2015-01-03 15:49:25 +01:00
Nicolas Grekas	b44bb69fd2	[2.3] Remove useless tests skips	2015-01-03 14:14:51 +01:00