From 30b0c37b680e63d1bb583d29f426c05073663e76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dariusz=20G=C3=B3recki?= Date: Thu, 7 Feb 2013 17:16:00 +0000 Subject: [PATCH 01/30] [Router] Fix TraceableUrlMatcher --- .../Routing/Matcher/TraceableUrlMatcher.php | 8 ++++++++ .../Tests/Matcher/TraceableUrlMatcherTest.php | 12 +++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php b/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php index 584d37e9a7..794a5a90c1 100644 --- a/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php +++ b/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php @@ -70,6 +70,14 @@ class TraceableUrlMatcher extends UrlMatcher continue; } + // check host requirement + $hostMatches = array(); + if ($compiledRoute->getHostRegex() && !preg_match($compiledRoute->getHostRegex(), $this->context->getHost(), $hostMatches)) { + $this->addTrace(sprintf('Host "%s" does not match the required ("%s")', $route->getHost(), $this->context->getHost()), self::ROUTE_ALMOST_MATCHES, $name, $route); + + return true; + } + // check HTTP method requirement if ($req = $route->getRequirement('_method')) { // HEAD and GET are equivalent as per RFC diff --git a/src/Symfony/Component/Routing/Tests/Matcher/TraceableUrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/TraceableUrlMatcherTest.php index 7f8725cc5b..86d8d954c0 100644 --- a/src/Symfony/Component/Routing/Tests/Matcher/TraceableUrlMatcherTest.php +++ b/src/Symfony/Component/Routing/Tests/Matcher/TraceableUrlMatcherTest.php @@ -24,21 +24,27 @@ class TraceableUrlMatcherTest extends \PHPUnit_Framework_TestCase $coll->add('foo', new Route('/foo', array(), array('_method' => 'POST'))); $coll->add('bar', new Route('/bar/{id}', array(), array('id' => '\d+'))); $coll->add('bar1', new Route('/bar/{name}', array(), array('id' => '\w+', '_method' => 'POST'))); + $coll->add('bar2', new Route('/foo', array(), array(), array(), 'baz')); + $coll->add('bar3', new Route('/foo1', array(), array(), array(), 'baz')); $context = new RequestContext(); + $context->setHost('baz'); $matcher = new TraceableUrlMatcher($coll, $context); $traces = $matcher->getTraces('/babar'); - $this->assertEquals(array(0, 0, 0), $this->getLevels($traces)); + $this->assertEquals(array(0, 0, 0, 0, 0), $this->getLevels($traces)); $traces = $matcher->getTraces('/foo'); - $this->assertEquals(array(1, 0, 0), $this->getLevels($traces)); + $this->assertEquals(array(1, 0, 0, 2), $this->getLevels($traces)); $traces = $matcher->getTraces('/bar/12'); $this->assertEquals(array(0, 2), $this->getLevels($traces)); $traces = $matcher->getTraces('/bar/dd'); - $this->assertEquals(array(0, 1, 1), $this->getLevels($traces)); + $this->assertEquals(array(0, 1, 1, 0, 0), $this->getLevels($traces)); + + $traces = $matcher->getTraces('/foo1'); + $this->assertEquals(array(0, 0, 0, 0, 2), $this->getLevels($traces)); $context->setMethod('POST'); $traces = $matcher->getTraces('/foo'); From 61aadd6304c8e07b901e8d984bea826a925af5ce Mon Sep 17 00:00:00 2001 From: Lee McDermott Date: Thu, 7 Feb 2013 20:39:09 +0000 Subject: [PATCH 02/30] Fix style for abbr elements in toolbar --- .../Resources/views/Profiler/toolbar.css.twig | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig index ba4e809536..1e94d7f35e 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig @@ -41,6 +41,10 @@ bottom: 0; border-top: 1px solid #bbb; } +.sf-toolbarreset abbr { + border-bottom: 1px dotted #000000; + cursor: help; +} .sf-toolbarreset span, .sf-toolbarreset div { font-size: 11px; @@ -324,11 +328,6 @@ background-image: -o-linear-gradient(180deg, #cbcbcb, #e8e8e8); !important; background: linear-gradient(90deg, #cbcbcb, #e8e8e8); !important; } - - .sf-toolbarreset abbr { - border-bottom: 1px dotted #000000; - cursor: help; - } {% endif %} /***** Media query *****/ From 85557619ba410b242258714f16e62849895b51b2 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 7 Feb 2013 23:44:42 +0100 Subject: [PATCH 03/30] [Routing] fixed previous merge --- src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php b/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php index 794a5a90c1..c09f83e86a 100644 --- a/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php +++ b/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php @@ -73,7 +73,7 @@ class TraceableUrlMatcher extends UrlMatcher // check host requirement $hostMatches = array(); if ($compiledRoute->getHostRegex() && !preg_match($compiledRoute->getHostRegex(), $this->context->getHost(), $hostMatches)) { - $this->addTrace(sprintf('Host "%s" does not match the required ("%s")', $route->getHost(), $this->context->getHost()), self::ROUTE_ALMOST_MATCHES, $name, $route); + $this->addTrace(sprintf('Host "%s" does not match the requirement ("%s")', $this->context->getHost(), $route->getHost()), self::ROUTE_ALMOST_MATCHES, $name, $route); return true; } From c3c9c9ec5bf25d265100039e4e51c52a6fe2f5e1 Mon Sep 17 00:00:00 2001 From: Martijn Evers Date: Fri, 8 Feb 2013 11:28:47 +0100 Subject: [PATCH 04/30] exception listener, allow easier overloading of the default behavior --- .../Component/HttpKernel/EventListener/ExceptionListener.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php index 3d3c7a1c36..b404de79a7 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php @@ -27,8 +27,8 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface; */ class ExceptionListener implements EventSubscriberInterface { - private $controller; - private $logger; + protected $controller; + protected $logger; public function __construct($controller, LoggerInterface $logger = null) { From 642c95a63175a2d98bd5df5895d162312b445d3e Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 8 Feb 2013 14:02:12 +0100 Subject: [PATCH 05/30] added Universal* classes in the list of deprecated classes for 3.0 --- UPGRADE-3.0.md | 17 +++++++++++++++++ .../Controller/ControllerNameParserTest.php | 6 +++--- src/Symfony/Component/HttpKernel/Client.php | 7 +++---- .../Component/HttpKernel/Tests/ClientTest.php | 2 +- .../Security/Acl/Resources/bin/generateSql.php | 8 ++++---- 5 files changed, 28 insertions(+), 12 deletions(-) diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md index 34b41b90e0..5fe5a5bbaf 100644 --- a/UPGRADE-3.0.md +++ b/UPGRADE-3.0.md @@ -1,6 +1,23 @@ UPGRADE FROM 2.x to 3.0 ======================= +### ClassLoader + + * The `UniversalClassLoader` class has been removed in favor of `ClassLoader`. The only difference is that some method + names are different: + + * `registerNamespaces()` -> `addPrefixes()` + * `registerPrefixes()` -> `addPrefixes()` + * `registerNamespaces()` -> `addPrefix()` + * `registerPrefixes()` -> `addPrefix()` + * `getNamespaces()` -> `getPrefixes()` + * `getNamespaceFallbacks()` -> `getFallbackDirs()` + * `getPrefixFallbacks()` -> `getFallbackDirs()` + + * The `DebugUniversalClassLoader` class has been removed in favor of + `DebugClassLoader`. The difference is that the constructor now takes a + loader to wrap. + ### HttpKernel * The `Symfony\Component\HttpKernel\Log\LoggerInterface` has been removed in diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php index 9cc0b77395..3f1dc249d2 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php @@ -13,7 +13,7 @@ namespace Symfony\Bundle\FrameworkBundle\Tests\Controller; use Symfony\Bundle\FrameworkBundle\Tests\TestCase; use Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser; -use Symfony\Component\ClassLoader\UniversalClassLoader; +use Symfony\Component\ClassLoader\ClassLoader; class ControllerNameParserTest extends TestCase { @@ -21,8 +21,8 @@ class ControllerNameParserTest extends TestCase protected function setUp() { - $this->loader = new UniversalClassLoader(); - $this->loader->registerNamespaces(array( + $this->loader = new ClassLoader(); + $this->loader->addPrefixes(array( 'TestBundle' => __DIR__.'/../Fixtures', 'TestApplication' => __DIR__.'/../Fixtures', )); diff --git a/src/Symfony/Component/HttpKernel/Client.php b/src/Symfony/Component/HttpKernel/Client.php index 71d05a57ca..6c896749a3 100644 --- a/src/Symfony/Component/HttpKernel/Client.php +++ b/src/Symfony/Component/HttpKernel/Client.php @@ -79,9 +79,8 @@ class Client extends BaseClient $kernel = str_replace("'", "\\'", serialize($this->kernel)); $request = str_replace("'", "\\'", serialize($request)); - $r = new \ReflectionClass('\\Symfony\\Component\\ClassLoader\\UniversalClassLoader'); + $r = new \ReflectionClass('\\Symfony\\Component\\ClassLoader\\ClassLoader'); $requirePath = str_replace("'", "\\'", $r->getFileName()); - $symfonyPath = str_replace("'", "\\'", realpath(__DIR__.'/../../..')); return <<registerNamespaces(array('Symfony' => '$symfonyPath')); +\$loader = new Symfony\Component\ClassLoader\ClassLoader(); +\$loader->addPrefix('Symfony', '$symfonyPath'); \$loader->register(); \$kernel = unserialize('$kernel'); diff --git a/src/Symfony/Component/HttpKernel/Tests/ClientTest.php b/src/Symfony/Component/HttpKernel/Tests/ClientTest.php index 4e273069da..d55688de8c 100644 --- a/src/Symfony/Component/HttpKernel/Tests/ClientTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/ClientTest.php @@ -50,7 +50,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase $this->markTestSkipped('The "Process" component is not available'); } - if (!class_exists('Symfony\Component\ClassLoader\UniversalClassLoader')) { + if (!class_exists('Symfony\Component\ClassLoader\ClassLoader')) { $this->markTestSkipped('The "ClassLoader" component is not available'); } diff --git a/src/Symfony/Component/Security/Acl/Resources/bin/generateSql.php b/src/Symfony/Component/Security/Acl/Resources/bin/generateSql.php index d65874bae6..4a5ca05ce9 100644 --- a/src/Symfony/Component/Security/Acl/Resources/bin/generateSql.php +++ b/src/Symfony/Component/Security/Acl/Resources/bin/generateSql.php @@ -9,14 +9,14 @@ * file that was distributed with this source code. */ -require_once __DIR__.'/../../../../ClassLoader/UniversalClassLoader.php'; +require_once __DIR__.'/../../../../ClassLoader/ClassLoader.php'; -use Symfony\Component\ClassLoader\UniversalClassLoader; +use Symfony\Component\ClassLoader\ClassLoader; use Symfony\Component\Finder\Finder; use Symfony\Component\Security\Acl\Dbal\Schema; -$loader = new UniversalClassLoader(); -$loader->registerNamespaces(array( +$loader = new ClassLoader(); +$loader->addPrefixes(array( 'Symfony' => __DIR__.'/../../../../../..', 'Doctrine\\Common' => __DIR__.'/../../../../../../../vendor/doctrine-common/lib', 'Doctrine\\DBAL\\Migrations' => __DIR__.'/../../../../../../../vendor/doctrine-migrations/lib', From 63bfd9ef79230225302f81f0c3e870d6e9da8dd4 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 8 Feb 2013 16:51:49 +0100 Subject: [PATCH 06/30] [Doctrine] removed usage of the deprecated LoggerInterface in some tests --- src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php b/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php index c4ca0eecdf..4d3ba1fed9 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php @@ -18,7 +18,7 @@ class DbalLoggerTest extends \PHPUnit_Framework_TestCase */ public function testLog($sql, $params, $logParams) { - $logger = $this->getMock('Symfony\\Component\\HttpKernel\\Log\\LoggerInterface'); + $logger = $this->getMock('Psr\\Log\\LoggerInterface'); $dbalLogger = $this ->getMockBuilder('Symfony\\Bridge\\Doctrine\\Logger\\DbalLogger') @@ -47,7 +47,7 @@ class DbalLoggerTest extends \PHPUnit_Framework_TestCase public function testLogNonUtf8() { - $logger = $this->getMock('Symfony\\Component\\HttpKernel\\Log\\LoggerInterface'); + $logger = $this->getMock('Psr\\Log\\LoggerInterface'); $dbalLogger = $this ->getMockBuilder('Symfony\\Bridge\\Doctrine\\Logger\\DbalLogger') From c3906a4acb72488c1993b96fe6311c881e623f6a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 8 Feb 2013 12:59:44 +0100 Subject: [PATCH 07/30] updated required versions when depending on the Yaml component The API has not changed since 2.0 and won't until 3.0. --- src/Symfony/Bridge/Twig/composer.json | 2 +- src/Symfony/Component/DependencyInjection/composer.json | 2 +- src/Symfony/Component/Routing/composer.json | 2 +- src/Symfony/Component/Translation/composer.json | 2 +- src/Symfony/Component/Validator/composer.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 41aef64007..06658793fb 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -25,7 +25,7 @@ "symfony/routing": "2.2.*", "symfony/templating": "2.2.*", "symfony/translation": "2.2.*", - "symfony/yaml": "2.2.*", + "symfony/yaml": "~2.0", "symfony/security": "2.2.*" }, "suggest": { diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json index d951f3041d..3be68112cf 100644 --- a/src/Symfony/Component/DependencyInjection/composer.json +++ b/src/Symfony/Component/DependencyInjection/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.3" }, "require-dev": { - "symfony/yaml": "2.2.*", + "symfony/yaml": "~2.0", "symfony/config": "2.2.*" }, "suggest": { diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json index 0bfc5e8c67..1a7b38f3a2 100644 --- a/src/Symfony/Component/Routing/composer.json +++ b/src/Symfony/Component/Routing/composer.json @@ -20,7 +20,7 @@ }, "require-dev": { "symfony/config": "2.2.*", - "symfony/yaml": "2.2.*", + "symfony/yaml": "~2.0", "symfony/http-kernel": "2.2.*", "doctrine/common": "~2.2", "psr/log": "~1.0" diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json index 52e4c43b40..5c84a3cd2b 100644 --- a/src/Symfony/Component/Translation/composer.json +++ b/src/Symfony/Component/Translation/composer.json @@ -20,7 +20,7 @@ }, "require-dev": { "symfony/config": "2.2.*", - "symfony/yaml": "2.2.*" + "symfony/yaml": "~2.2" }, "suggest": { "symfony/config": "2.2.*", diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index deecd17dc4..d2a94c30bc 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -22,7 +22,7 @@ "require-dev": { "symfony/http-foundation": "2.2.*", "symfony/locale": "2.2.*", - "symfony/yaml": "2.2.*", + "symfony/yaml": "~2.0", "symfony/config": "2.2.*" }, "suggest": { From 9b64be2ee81c48c2880934d684a5b4d50cdd43f2 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 8 Feb 2013 13:13:08 +0100 Subject: [PATCH 08/30] use ~2.0 when depending on the locale component Some methods have been added in 2.1 but none of them are used by the Symfony components. --- src/Symfony/Component/Form/composer.json | 2 +- src/Symfony/Component/Validator/composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index 51afa67c3a..3dde43f23f 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=5.3.3", "symfony/event-dispatcher": "2.2.*", - "symfony/locale": "2.2.*", + "symfony/locale": "~2.0", "symfony/options-resolver": "2.2.*", "symfony/property-access": "2.2.*" }, diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index d2a94c30bc..6514913eb6 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -21,7 +21,7 @@ }, "require-dev": { "symfony/http-foundation": "2.2.*", - "symfony/locale": "2.2.*", + "symfony/locale": "~2.0", "symfony/yaml": "~2.0", "symfony/config": "2.2.*" }, From 4def2219cda54d447583e86660702006f39e9bbb Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 8 Feb 2013 13:15:11 +0100 Subject: [PATCH 09/30] use ~2.0 when depending on the CSS selector component The API is stable and won't change. --- src/Symfony/Component/BrowserKit/composer.json | 2 +- src/Symfony/Component/DomCrawler/composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/BrowserKit/composer.json b/src/Symfony/Component/BrowserKit/composer.json index e192143510..1eab6f4b23 100644 --- a/src/Symfony/Component/BrowserKit/composer.json +++ b/src/Symfony/Component/BrowserKit/composer.json @@ -21,7 +21,7 @@ }, "require-dev": { "symfony/process": "2.2.*", - "symfony/css-selector": "2.2.*" + "symfony/css-selector": "~2.0" }, "suggest": { "symfony/process": "2.2.*" diff --git a/src/Symfony/Component/DomCrawler/composer.json b/src/Symfony/Component/DomCrawler/composer.json index 5696a86893..7383d03ad4 100644 --- a/src/Symfony/Component/DomCrawler/composer.json +++ b/src/Symfony/Component/DomCrawler/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.3" }, "require-dev": { - "symfony/css-selector": "2.2.*" + "symfony/css-selector": "~2.0" }, "suggest": { "symfony/css-selector": "2.2.*" From d2d4c0a9bb2ecd870ee01363d7ddd42553996c3d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 8 Feb 2013 13:23:28 +0100 Subject: [PATCH 10/30] use ~2.1 when depending on the ClassLoader component --- src/Symfony/Component/HttpKernel/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index 9680fadd2a..becb9f5c57 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -23,7 +23,7 @@ }, "require-dev": { "symfony/browser-kit": "2.2.*", - "symfony/class-loader": "2.2.*", + "symfony/class-loader": "~2.1", "symfony/config": "2.2.*", "symfony/console": "2.2.*", "symfony/dependency-injection": "2.2.*", From 0d74948280d685bd4bbc8098ae8a0afde2137014 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 8 Feb 2013 14:04:53 +0100 Subject: [PATCH 11/30] use ~2.0 when depending on the Dom Crawler component --- src/Symfony/Component/BrowserKit/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/BrowserKit/composer.json b/src/Symfony/Component/BrowserKit/composer.json index 1eab6f4b23..d1fdb5179e 100644 --- a/src/Symfony/Component/BrowserKit/composer.json +++ b/src/Symfony/Component/BrowserKit/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/dom-crawler": "2.2.*" + "symfony/dom-crawler": "~2.0" }, "require-dev": { "symfony/process": "2.2.*", From a5da4a1c9ae541ed9e5973c09e8ee398b5b24902 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 8 Feb 2013 14:11:48 +0100 Subject: [PATCH 12/30] updated required versions when depending on the Dom Crawler component --- src/Symfony/Bundle/FrameworkBundle/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 0e4b2b7e4e..a871f01d92 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -21,7 +21,7 @@ "symfony/config" : "2.2.*", "symfony/event-dispatcher": "2.2.*", "symfony/http-kernel": "2.2.*", - "symfony/filesystem": "2.2.*", + "symfony/filesystem": ">=2.1,<2.3-dev", "symfony/routing": "2.2.*", "symfony/stopwatch": "2.2.*", "symfony/templating": "2.2.*", From b95184b834c00ac4d0f85a7109fbfe3f5ec55600 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 8 Feb 2013 14:17:14 +0100 Subject: [PATCH 13/30] updated required versions when depending on the Finder component --- src/Symfony/Bundle/FrameworkBundle/composer.json | 2 +- src/Symfony/Component/ClassLoader/composer.json | 2 +- src/Symfony/Component/HttpKernel/composer.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index a871f01d92..b0cf62ab8c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -29,7 +29,7 @@ "doctrine/common": "~2.2" }, "require-dev": { - "symfony/finder": "2.2.*", + "symfony/finder": "~2.0", "symfony/security": "2.2.*" }, "suggest": { diff --git a/src/Symfony/Component/ClassLoader/composer.json b/src/Symfony/Component/ClassLoader/composer.json index cd56c8c2fa..57f2f3408b 100644 --- a/src/Symfony/Component/ClassLoader/composer.json +++ b/src/Symfony/Component/ClassLoader/composer.json @@ -20,7 +20,7 @@ "php": ">=5.3.3" }, "require-dev": { - "symfony/finder": "2.2.*" + "symfony/finder": "~2.0" }, "autoload": { "psr-0": { "Symfony\\Component\\ClassLoader\\": "" } diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index becb9f5c57..3961643185 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -27,7 +27,7 @@ "symfony/config": "2.2.*", "symfony/console": "2.2.*", "symfony/dependency-injection": "2.2.*", - "symfony/finder": "2.2.*", + "symfony/finder": "~2.0", "symfony/process": "2.2.*", "symfony/routing": "2.2.*", "symfony/stopwatch": "2.2.*" From 155cccbe8e027a61f3ccde13b047837397a512c8 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 8 Feb 2013 14:19:00 +0100 Subject: [PATCH 14/30] updated required versions when depending on the Process component --- src/Symfony/Component/BrowserKit/composer.json | 2 +- src/Symfony/Component/HttpKernel/composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/BrowserKit/composer.json b/src/Symfony/Component/BrowserKit/composer.json index d1fdb5179e..c237db4153 100644 --- a/src/Symfony/Component/BrowserKit/composer.json +++ b/src/Symfony/Component/BrowserKit/composer.json @@ -20,7 +20,7 @@ "symfony/dom-crawler": "~2.0" }, "require-dev": { - "symfony/process": "2.2.*", + "symfony/process": "~2.0", "symfony/css-selector": "~2.0" }, "suggest": { diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index 3961643185..3f696d766a 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -28,7 +28,7 @@ "symfony/console": "2.2.*", "symfony/dependency-injection": "2.2.*", "symfony/finder": "~2.0", - "symfony/process": "2.2.*", + "symfony/process": "~2.0", "symfony/routing": "2.2.*", "symfony/stopwatch": "2.2.*" }, From 108a8c0117c0747c5004ef8c191e7af4d0cc311a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 8 Feb 2013 14:21:29 +0100 Subject: [PATCH 15/30] updated required versions when depending on the Stopwatch component --- src/Symfony/Bridge/Doctrine/composer.json | 2 +- src/Symfony/Bridge/Propel1/composer.json | 2 +- src/Symfony/Bundle/FrameworkBundle/composer.json | 2 +- src/Symfony/Bundle/TwigBundle/composer.json | 2 +- src/Symfony/Bundle/WebProfilerBundle/composer.json | 2 +- src/Symfony/Component/HttpKernel/composer.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 33f233495b..c086685d40 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -20,7 +20,7 @@ "doctrine/common": "~2.2" }, "require-dev": { - "symfony/stopwatch": "2.2.*", + "symfony/stopwatch": ">=2.2,<2.3-dev", "symfony/dependency-injection": "2.2.*", "symfony/form": "2.2.*", "symfony/http-kernel": "2.2.*", diff --git a/src/Symfony/Bridge/Propel1/composer.json b/src/Symfony/Bridge/Propel1/composer.json index 3e9bdd3299..0fb4998f8c 100644 --- a/src/Symfony/Bridge/Propel1/composer.json +++ b/src/Symfony/Bridge/Propel1/composer.json @@ -23,7 +23,7 @@ "propel/propel1": "1.6.*" }, "require-dev": { - "symfony/stopwatch": "2.2.*" + "symfony/stopwatch": ">=2.2,<2.3-dev" }, "autoload": { "psr-0": { "Symfony\\Bridge\\Propel1\\": "" } diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index b0cf62ab8c..3a39d1b484 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -23,7 +23,7 @@ "symfony/http-kernel": "2.2.*", "symfony/filesystem": ">=2.1,<2.3-dev", "symfony/routing": "2.2.*", - "symfony/stopwatch": "2.2.*", + "symfony/stopwatch": ">=2.2,<2.3-dev", "symfony/templating": "2.2.*", "symfony/translation": "2.2.*", "doctrine/common": "~2.2" diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json index b65b8923bd..8837fdf89e 100644 --- a/src/Symfony/Bundle/TwigBundle/composer.json +++ b/src/Symfony/Bundle/TwigBundle/composer.json @@ -20,7 +20,7 @@ "symfony/twig-bridge": "2.2.*" }, "require-dev": { - "symfony/stopwatch": "2.2.*" + "symfony/stopwatch": ">=2.2,<2.3-dev" }, "autoload": { "psr-0": { "Symfony\\Bundle\\TwigBundle\\": "" } diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json index 338ad281d5..2bb5ef2479 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/composer.json +++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json @@ -24,7 +24,7 @@ "require-dev": { "symfony/config": "2.2.*", "symfony/dependency-injection": "2.2.*", - "symfony/stopwatch": "2.2.*" + "symfony/stopwatch": ">=2.2,<2.3-dev" }, "autoload": { "psr-0": { "Symfony\\Bundle\\WebProfilerBundle\\": "" } diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index 3f696d766a..877d940650 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -30,7 +30,7 @@ "symfony/finder": "~2.0", "symfony/process": "~2.0", "symfony/routing": "2.2.*", - "symfony/stopwatch": "2.2.*" + "symfony/stopwatch": ">=2.2,<2.3-dev" }, "suggest": { "symfony/browser-kit": "2.2.*", From da068171bbed64d965946abea5f3afecc1f6b0dd Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 8 Feb 2013 14:22:44 +0100 Subject: [PATCH 16/30] updated required versions when depending on the Templating component --- src/Symfony/Bridge/Twig/composer.json | 2 +- src/Symfony/Bundle/FrameworkBundle/composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 06658793fb..9eb094e26e 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -23,7 +23,7 @@ "symfony/form": "2.2.*", "symfony/http-kernel": "2.2.*", "symfony/routing": "2.2.*", - "symfony/templating": "2.2.*", + "symfony/templating": "~2.1", "symfony/translation": "2.2.*", "symfony/yaml": "~2.0", "symfony/security": "2.2.*" diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 3a39d1b484..bd4d95bca8 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -24,7 +24,7 @@ "symfony/filesystem": ">=2.1,<2.3-dev", "symfony/routing": "2.2.*", "symfony/stopwatch": ">=2.2,<2.3-dev", - "symfony/templating": "2.2.*", + "symfony/templating": "~2.1", "symfony/translation": "2.2.*", "doctrine/common": "~2.2" }, From f971ccf231c0e9e18e4ee5f87b9db66be8dd547d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 8 Feb 2013 15:04:13 +0100 Subject: [PATCH 17/30] updated required versions when depending on the Security component --- src/Symfony/Bridge/Doctrine/composer.json | 2 +- src/Symfony/Bridge/Twig/composer.json | 2 +- src/Symfony/Bundle/FrameworkBundle/composer.json | 2 +- src/Symfony/Bundle/SecurityBundle/composer.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index c086685d40..f485d5b3b7 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -24,7 +24,7 @@ "symfony/dependency-injection": "2.2.*", "symfony/form": "2.2.*", "symfony/http-kernel": "2.2.*", - "symfony/security": "2.2.*", + "symfony/security": ">=2.2,<2.3-dev", "symfony/validator": "2.2.*", "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": "~2.2", diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 9eb094e26e..75a2571756 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -26,7 +26,7 @@ "symfony/templating": "~2.1", "symfony/translation": "2.2.*", "symfony/yaml": "~2.0", - "symfony/security": "2.2.*" + "symfony/security": ">=2.0,<2.3-dev" }, "suggest": { "symfony/form": "2.2.*", diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index bd4d95bca8..0b01f2a847 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -30,7 +30,7 @@ }, "require-dev": { "symfony/finder": "~2.0", - "symfony/security": "2.2.*" + "symfony/security": ">=2.2,<2.3-dev" }, "suggest": { "symfony/console": "2.2.*", diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json index f7be085bb7..3c36ac8526 100644 --- a/src/Symfony/Bundle/SecurityBundle/composer.json +++ b/src/Symfony/Bundle/SecurityBundle/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/security": "2.2.*" + "symfony/security": ">=2.2,<2.3-dev" }, "autoload": { "psr-0": { "Symfony\\Bundle\\SecurityBundle\\": "" } From 20dfc15de65d4b219b2ad4c9d855916aeb5b818a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 8 Feb 2013 15:05:11 +0100 Subject: [PATCH 18/30] updated required versions when depending on the PropertyAccess component --- src/Symfony/Component/Form/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index 3dde43f23f..35779d95f5 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -20,7 +20,7 @@ "symfony/event-dispatcher": "2.2.*", "symfony/locale": "~2.0", "symfony/options-resolver": "2.2.*", - "symfony/property-access": "2.2.*" + "symfony/property-access": ">=2.2,<2.3-dev" }, "require-dev": { "symfony/validator": "2.2.*", From 51857feb8b7fd0c01135c27b2d997c5bf93c6a5f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 8 Feb 2013 15:22:22 +0100 Subject: [PATCH 19/30] updated required versions when depending on the OptionsResolver component --- src/Symfony/Component/Form/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index 35779d95f5..e47c3c5fe9 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.3", "symfony/event-dispatcher": "2.2.*", "symfony/locale": "~2.0", - "symfony/options-resolver": "2.2.*", + "symfony/options-resolver": ">=2.1,<2.3-dev", "symfony/property-access": ">=2.2,<2.3-dev" }, "require-dev": { From a742f0a03e5d23f1cb2ce1cfd96300d97e03b1fc Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 8 Feb 2013 15:25:24 +0100 Subject: [PATCH 20/30] updated required versions when depending on the EventDispatcher component --- src/Symfony/Bundle/FrameworkBundle/composer.json | 2 +- src/Symfony/Component/Form/composer.json | 2 +- src/Symfony/Component/HttpKernel/composer.json | 2 +- src/Symfony/Component/Security/composer.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 0b01f2a847..5b089efdcd 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.3", "symfony/dependency-injection" : "2.2.*", "symfony/config" : "2.2.*", - "symfony/event-dispatcher": "2.2.*", + "symfony/event-dispatcher": "~2.1", "symfony/http-kernel": "2.2.*", "symfony/filesystem": ">=2.1,<2.3-dev", "symfony/routing": "2.2.*", diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index e47c3c5fe9..10e87128de 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/event-dispatcher": "2.2.*", + "symfony/event-dispatcher": "~2.1", "symfony/locale": "~2.0", "symfony/options-resolver": ">=2.1,<2.3-dev", "symfony/property-access": ">=2.2,<2.3-dev" diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index 877d940650..ee9ddd5861 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/event-dispatcher": "2.2.*", + "symfony/event-dispatcher": "~2.1", "symfony/http-foundation": "2.2.*", "psr/log": "~1.0" }, diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json index 3b4c93b7b0..8213d80271 100644 --- a/src/Symfony/Component/Security/composer.json +++ b/src/Symfony/Component/Security/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/event-dispatcher": "2.2.*", + "symfony/event-dispatcher": "~2.1", "symfony/http-foundation": "2.2.*", "symfony/http-kernel": "2.2.*" }, From 289ccfc724ea918b4820dafc96ab789a90e421a7 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 8 Feb 2013 15:31:59 +0100 Subject: [PATCH 21/30] updated required versions when depending on the Routing component --- src/Symfony/Bridge/Twig/composer.json | 2 +- src/Symfony/Bundle/FrameworkBundle/composer.json | 2 +- src/Symfony/Bundle/WebProfilerBundle/composer.json | 2 +- src/Symfony/Component/HttpKernel/composer.json | 2 +- src/Symfony/Component/Security/composer.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 75a2571756..d2a36d9bf2 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -22,7 +22,7 @@ "require-dev": { "symfony/form": "2.2.*", "symfony/http-kernel": "2.2.*", - "symfony/routing": "2.2.*", + "symfony/routing": ">=2.2,<2.3-dev", "symfony/templating": "~2.1", "symfony/translation": "2.2.*", "symfony/yaml": "~2.0", diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 5b089efdcd..d94461911c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -22,7 +22,7 @@ "symfony/event-dispatcher": "~2.1", "symfony/http-kernel": "2.2.*", "symfony/filesystem": ">=2.1,<2.3-dev", - "symfony/routing": "2.2.*", + "symfony/routing": ">=2.2,<2.3-dev", "symfony/stopwatch": ">=2.2,<2.3-dev", "symfony/templating": "~2.1", "symfony/translation": "2.2.*", diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json index 2bb5ef2479..4d2cf8007d 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/composer.json +++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=5.3.3", "symfony/http-kernel": "2.2.*", - "symfony/routing": "2.2.*", + "symfony/routing": ">=2.2,<2.3-dev", "symfony/twig-bridge": "2.2.*" }, "require-dev": { diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index ee9ddd5861..45a9d788e8 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -29,7 +29,7 @@ "symfony/dependency-injection": "2.2.*", "symfony/finder": "~2.0", "symfony/process": "~2.0", - "symfony/routing": "2.2.*", + "symfony/routing": ">=2.2,<2.3-dev", "symfony/stopwatch": ">=2.2,<2.3-dev" }, "suggest": { diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json index 8213d80271..fd1afb28db 100644 --- a/src/Symfony/Component/Security/composer.json +++ b/src/Symfony/Component/Security/composer.json @@ -23,7 +23,7 @@ }, "require-dev": { "symfony/form": "2.2.*", - "symfony/routing": "2.2.*", + "symfony/routing": ">=2.2,<2.3-dev", "symfony/validator": "2.2.*", "doctrine/common": "~2.2", "doctrine/dbal": "~2.2", From a6713136d0279ba826d743118ad6c97bf4ced153 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 8 Feb 2013 15:58:11 +0100 Subject: [PATCH 22/30] updated required versions when depending on the Translation component --- src/Symfony/Bridge/Twig/composer.json | 2 +- src/Symfony/Bundle/FrameworkBundle/composer.json | 4 ++-- src/Symfony/Component/Validator/composer.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index d2a36d9bf2..762c6de6cc 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -24,7 +24,7 @@ "symfony/http-kernel": "2.2.*", "symfony/routing": ">=2.2,<2.3-dev", "symfony/templating": "~2.1", - "symfony/translation": "2.2.*", + "symfony/translation": ">=2.0,<2.3-dev", "symfony/yaml": "~2.0", "symfony/security": ">=2.0,<2.3-dev" }, diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index d94461911c..3f4d6e44cb 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -25,8 +25,8 @@ "symfony/routing": ">=2.2,<2.3-dev", "symfony/stopwatch": ">=2.2,<2.3-dev", "symfony/templating": "~2.1", - "symfony/translation": "2.2.*", - "doctrine/common": "~2.2" + "symfony/translation": ">=2.2,<2.3-dev", + "doctrine/common": ">=2.2,<2.4-dev" }, "require-dev": { "symfony/finder": "~2.0", diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index 6514913eb6..b0912808d9 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/translation": "2.2.*" + "symfony/translation": "~2.0" }, "require-dev": { "symfony/http-foundation": "2.2.*", From 3db311a601527c2c4bfa41089fd92e58a737f22b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 8 Feb 2013 16:08:22 +0100 Subject: [PATCH 23/30] updated required versions when depending on the Validator component --- src/Symfony/Bridge/Doctrine/composer.json | 2 +- src/Symfony/Component/Form/composer.json | 2 +- src/Symfony/Component/Security/composer.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index f485d5b3b7..ae96b84616 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -25,7 +25,7 @@ "symfony/form": "2.2.*", "symfony/http-kernel": "2.2.*", "symfony/security": ">=2.2,<2.3-dev", - "symfony/validator": "2.2.*", + "symfony/validator": ">=2.2,<2.3-dev", "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": "~2.2", "doctrine/orm": "~2.2,>=2.2.3" diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index 10e87128de..1e42bf0be4 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -23,7 +23,7 @@ "symfony/property-access": ">=2.2,<2.3-dev" }, "require-dev": { - "symfony/validator": "2.2.*", + "symfony/validator": ">=2.2,<2.3-dev", "symfony/http-foundation": "2.2.*" }, "suggest": { diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json index fd1afb28db..d9bcd754e5 100644 --- a/src/Symfony/Component/Security/composer.json +++ b/src/Symfony/Component/Security/composer.json @@ -24,8 +24,8 @@ "require-dev": { "symfony/form": "2.2.*", "symfony/routing": ">=2.2,<2.3-dev", - "symfony/validator": "2.2.*", - "doctrine/common": "~2.2", + "symfony/validator": ">=2.2,<2.3-dev", + "doctrine/common": ">=2.2,<2.4-dev", "doctrine/dbal": "~2.2", "psr/log": "~1.0" }, From 719628a5cea3edeaeb0e2f4e267d98c2e3e87495 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 8 Feb 2013 16:21:42 +0100 Subject: [PATCH 24/30] updated required versions when depending on the DependencyInjection component --- src/Symfony/Bridge/Doctrine/composer.json | 2 +- src/Symfony/Bundle/FrameworkBundle/composer.json | 2 +- src/Symfony/Bundle/WebProfilerBundle/composer.json | 2 +- src/Symfony/Component/EventDispatcher/composer.json | 2 +- src/Symfony/Component/HttpKernel/composer.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index ae96b84616..8795d23855 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -21,7 +21,7 @@ }, "require-dev": { "symfony/stopwatch": ">=2.2,<2.3-dev", - "symfony/dependency-injection": "2.2.*", + "symfony/dependency-injection": "~2.0", "symfony/form": "2.2.*", "symfony/http-kernel": "2.2.*", "symfony/security": ">=2.2,<2.3-dev", diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 3f4d6e44cb..845d47bdb5 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/dependency-injection" : "2.2.*", + "symfony/dependency-injection" : "~2.0", "symfony/config" : "2.2.*", "symfony/event-dispatcher": "~2.1", "symfony/http-kernel": "2.2.*", diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json index 4d2cf8007d..f2dc9a1445 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/composer.json +++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json @@ -23,7 +23,7 @@ }, "require-dev": { "symfony/config": "2.2.*", - "symfony/dependency-injection": "2.2.*", + "symfony/dependency-injection": "~2.0", "symfony/stopwatch": ">=2.2,<2.3-dev" }, "autoload": { diff --git a/src/Symfony/Component/EventDispatcher/composer.json b/src/Symfony/Component/EventDispatcher/composer.json index 1a90992fd1..efc320c95e 100644 --- a/src/Symfony/Component/EventDispatcher/composer.json +++ b/src/Symfony/Component/EventDispatcher/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.3" }, "require-dev": { - "symfony/dependency-injection": "2.2.*" + "symfony/dependency-injection": "~2.0" }, "suggest": { "symfony/dependency-injection": "2.2.*", diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index 45a9d788e8..e51eb9c6a8 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -26,7 +26,7 @@ "symfony/class-loader": "~2.1", "symfony/config": "2.2.*", "symfony/console": "2.2.*", - "symfony/dependency-injection": "2.2.*", + "symfony/dependency-injection": "~2.0", "symfony/finder": "~2.0", "symfony/process": "~2.0", "symfony/routing": ">=2.2,<2.3-dev", From 2f1939b4a07a1644986449a59d6cc25abf887502 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 8 Feb 2013 16:31:14 +0100 Subject: [PATCH 25/30] updated required versions when depending on the Form component --- src/Symfony/Bridge/Doctrine/composer.json | 2 +- src/Symfony/Bridge/Propel1/composer.json | 2 +- src/Symfony/Component/Security/composer.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 8795d23855..40f1638c8e 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -22,7 +22,7 @@ "require-dev": { "symfony/stopwatch": ">=2.2,<2.3-dev", "symfony/dependency-injection": "~2.0", - "symfony/form": "2.2.*", + "symfony/form": ">=2.2,<2.3-dev", "symfony/http-kernel": "2.2.*", "symfony/security": ">=2.2,<2.3-dev", "symfony/validator": ">=2.2,<2.3-dev", diff --git a/src/Symfony/Bridge/Propel1/composer.json b/src/Symfony/Bridge/Propel1/composer.json index 0fb4998f8c..00f6661c13 100644 --- a/src/Symfony/Bridge/Propel1/composer.json +++ b/src/Symfony/Bridge/Propel1/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.3", "symfony/http-foundation": "2.2.*", "symfony/http-kernel": "2.2.*", - "symfony/form": "2.2.*", + "symfony/form": ">=2.2,<2.3-dev", "propel/propel1": "1.6.*" }, "require-dev": { diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json index d9bcd754e5..d80e0de6f4 100644 --- a/src/Symfony/Component/Security/composer.json +++ b/src/Symfony/Component/Security/composer.json @@ -22,7 +22,7 @@ "symfony/http-kernel": "2.2.*" }, "require-dev": { - "symfony/form": "2.2.*", + "symfony/form": "~2.0", "symfony/routing": ">=2.2,<2.3-dev", "symfony/validator": ">=2.2,<2.3-dev", "doctrine/common": ">=2.2,<2.4-dev", From 0a70fe707963ba40e93a3d7a0cdd8cb4798bb7b5 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 8 Feb 2013 16:41:01 +0100 Subject: [PATCH 26/30] updated required versions when depending on the Config component --- src/Symfony/Bundle/FrameworkBundle/composer.json | 2 +- src/Symfony/Bundle/WebProfilerBundle/composer.json | 2 +- src/Symfony/Component/DependencyInjection/composer.json | 2 +- src/Symfony/Component/HttpKernel/composer.json | 2 +- src/Symfony/Component/Routing/composer.json | 2 +- src/Symfony/Component/Translation/composer.json | 2 +- src/Symfony/Component/Validator/composer.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 845d47bdb5..293602d1d3 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=5.3.3", "symfony/dependency-injection" : "~2.0", - "symfony/config" : "2.2.*", + "symfony/config" : ">=2.2,<2.3-dev", "symfony/event-dispatcher": "~2.1", "symfony/http-kernel": "2.2.*", "symfony/filesystem": ">=2.1,<2.3-dev", diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json index f2dc9a1445..f362436a36 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/composer.json +++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json @@ -22,7 +22,7 @@ "symfony/twig-bridge": "2.2.*" }, "require-dev": { - "symfony/config": "2.2.*", + "symfony/config": ">=2.2,<2.3-dev", "symfony/dependency-injection": "~2.0", "symfony/stopwatch": ">=2.2,<2.3-dev" }, diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json index 3be68112cf..349007f925 100644 --- a/src/Symfony/Component/DependencyInjection/composer.json +++ b/src/Symfony/Component/DependencyInjection/composer.json @@ -20,7 +20,7 @@ }, "require-dev": { "symfony/yaml": "~2.0", - "symfony/config": "2.2.*" + "symfony/config": ">=2.2.*,<2.3-dev" }, "suggest": { "symfony/yaml": "2.2.*", diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index e51eb9c6a8..716d1e9820 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -24,7 +24,7 @@ "require-dev": { "symfony/browser-kit": "2.2.*", "symfony/class-loader": "~2.1", - "symfony/config": "2.2.*", + "symfony/config": "~2.0", "symfony/console": "2.2.*", "symfony/dependency-injection": "~2.0", "symfony/finder": "~2.0", diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json index 1a7b38f3a2..b4aa68671c 100644 --- a/src/Symfony/Component/Routing/composer.json +++ b/src/Symfony/Component/Routing/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.3" }, "require-dev": { - "symfony/config": "2.2.*", + "symfony/config": ">=2.2.*,<2.3-dev", "symfony/yaml": "~2.0", "symfony/http-kernel": "2.2.*", "doctrine/common": "~2.2", diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json index 5c84a3cd2b..9be29e3f98 100644 --- a/src/Symfony/Component/Translation/composer.json +++ b/src/Symfony/Component/Translation/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.3" }, "require-dev": { - "symfony/config": "2.2.*", + "symfony/config": ">=2.0,<2.3-dev", "symfony/yaml": "~2.2" }, "suggest": { diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index b0912808d9..836c875da3 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -23,7 +23,7 @@ "symfony/http-foundation": "2.2.*", "symfony/locale": "~2.0", "symfony/yaml": "~2.0", - "symfony/config": "2.2.*" + "symfony/config": ">=2.2,<2.3-dev" }, "suggest": { "doctrine/common": "~2.2", From 270470596fb32cef3e9fc6cf3ce6d6ac2f48e6a2 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 8 Feb 2013 16:52:01 +0100 Subject: [PATCH 27/30] updated required versions when depending on the HttpKernel component --- src/Symfony/Bridge/Doctrine/composer.json | 2 +- src/Symfony/Bridge/Monolog/composer.json | 2 +- src/Symfony/Bridge/Propel1/composer.json | 2 +- src/Symfony/Bridge/Twig/composer.json | 2 +- src/Symfony/Bundle/FrameworkBundle/composer.json | 2 +- src/Symfony/Bundle/WebProfilerBundle/composer.json | 2 +- src/Symfony/Component/Routing/composer.json | 1 - src/Symfony/Component/Security/composer.json | 2 +- 8 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 40f1638c8e..a7a9ace238 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -23,7 +23,7 @@ "symfony/stopwatch": ">=2.2,<2.3-dev", "symfony/dependency-injection": "~2.0", "symfony/form": ">=2.2,<2.3-dev", - "symfony/http-kernel": "2.2.*", + "symfony/http-kernel": ">=2.2,<2.3-dev", "symfony/security": ">=2.2,<2.3-dev", "symfony/validator": ">=2.2,<2.3-dev", "doctrine/data-fixtures": "1.0.*", diff --git a/src/Symfony/Bridge/Monolog/composer.json b/src/Symfony/Bridge/Monolog/composer.json index 0e89cf2346..b0d104f6ea 100644 --- a/src/Symfony/Bridge/Monolog/composer.json +++ b/src/Symfony/Bridge/Monolog/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/http-kernel": "2.2.*", + "symfony/http-kernel": ">=2.2,<2.3-dev", "monolog/monolog": "~1.3" }, "autoload": { diff --git a/src/Symfony/Bridge/Propel1/composer.json b/src/Symfony/Bridge/Propel1/composer.json index 00f6661c13..2edc026436 100644 --- a/src/Symfony/Bridge/Propel1/composer.json +++ b/src/Symfony/Bridge/Propel1/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=5.3.3", "symfony/http-foundation": "2.2.*", - "symfony/http-kernel": "2.2.*", + "symfony/http-kernel": "~2.0", "symfony/form": ">=2.2,<2.3-dev", "propel/propel1": "1.6.*" }, diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 762c6de6cc..a6e2a687dc 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -21,7 +21,7 @@ }, "require-dev": { "symfony/form": "2.2.*", - "symfony/http-kernel": "2.2.*", + "symfony/http-kernel": ">=2.2,<2.3-dev", "symfony/routing": ">=2.2,<2.3-dev", "symfony/templating": "~2.1", "symfony/translation": ">=2.0,<2.3-dev", diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 293602d1d3..566488d6db 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -20,7 +20,7 @@ "symfony/dependency-injection" : "~2.0", "symfony/config" : ">=2.2,<2.3-dev", "symfony/event-dispatcher": "~2.1", - "symfony/http-kernel": "2.2.*", + "symfony/http-kernel": ">=2.2,<2.3-dev", "symfony/filesystem": ">=2.1,<2.3-dev", "symfony/routing": ">=2.2,<2.3-dev", "symfony/stopwatch": ">=2.2,<2.3-dev", diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json index f362436a36..09659cde8d 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/composer.json +++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/http-kernel": "2.2.*", + "symfony/http-kernel": ">=2.2,<2.3-dev", "symfony/routing": ">=2.2,<2.3-dev", "symfony/twig-bridge": "2.2.*" }, diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json index b4aa68671c..c2cb7e9271 100644 --- a/src/Symfony/Component/Routing/composer.json +++ b/src/Symfony/Component/Routing/composer.json @@ -21,7 +21,6 @@ "require-dev": { "symfony/config": ">=2.2.*,<2.3-dev", "symfony/yaml": "~2.0", - "symfony/http-kernel": "2.2.*", "doctrine/common": "~2.2", "psr/log": "~1.0" }, diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json index d80e0de6f4..fc5ba87b6f 100644 --- a/src/Symfony/Component/Security/composer.json +++ b/src/Symfony/Component/Security/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.3", "symfony/event-dispatcher": "~2.1", "symfony/http-foundation": "2.2.*", - "symfony/http-kernel": "2.2.*" + "symfony/http-kernel": ">=2.1,<=2.3-dev" }, "require-dev": { "symfony/form": "~2.0", From 0e4a1fe41842ef1ed32916d5247af37872621520 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 8 Feb 2013 16:56:56 +0100 Subject: [PATCH 28/30] updated required versions when depending on the HttpFoundation component --- src/Symfony/Bridge/Propel1/composer.json | 2 +- src/Symfony/Component/Form/composer.json | 2 +- src/Symfony/Component/HttpKernel/composer.json | 2 +- src/Symfony/Component/Security/composer.json | 2 +- src/Symfony/Component/Validator/composer.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Bridge/Propel1/composer.json b/src/Symfony/Bridge/Propel1/composer.json index 2edc026436..f3c0b28777 100644 --- a/src/Symfony/Bridge/Propel1/composer.json +++ b/src/Symfony/Bridge/Propel1/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/http-foundation": "2.2.*", + "symfony/http-foundation": "~2.0", "symfony/http-kernel": "~2.0", "symfony/form": ">=2.2,<2.3-dev", "propel/propel1": "1.6.*" diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index 1e42bf0be4..9f175f4e52 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -24,7 +24,7 @@ }, "require-dev": { "symfony/validator": ">=2.2,<2.3-dev", - "symfony/http-foundation": "2.2.*" + "symfony/http-foundation": ">=2.1,<2.3-dev" }, "suggest": { "symfony/validator": "2.2.*", diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index 716d1e9820..1f114f8d47 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=5.3.3", "symfony/event-dispatcher": "~2.1", - "symfony/http-foundation": "2.2.*", + "symfony/http-foundation": ">=2.2,<2.3-dev", "psr/log": "~1.0" }, "require-dev": { diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json index fc5ba87b6f..5492b4b0d3 100644 --- a/src/Symfony/Component/Security/composer.json +++ b/src/Symfony/Component/Security/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=5.3.3", "symfony/event-dispatcher": "~2.1", - "symfony/http-foundation": "2.2.*", + "symfony/http-foundation": ">=2.1,<2.3-dev", "symfony/http-kernel": ">=2.1,<=2.3-dev" }, "require-dev": { diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index 836c875da3..ca8c501267 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -20,7 +20,7 @@ "symfony/translation": "~2.0" }, "require-dev": { - "symfony/http-foundation": "2.2.*", + "symfony/http-foundation": "~2.1", "symfony/locale": "~2.0", "symfony/yaml": "~2.0", "symfony/config": ">=2.2,<2.3-dev" From d9b91458f1cd61073eb4478fe18173fe33e68e3c Mon Sep 17 00:00:00 2001 From: Jakub Zalas Date: Sat, 9 Feb 2013 16:02:08 +0100 Subject: [PATCH 29/30] [HttpFoundation] Fixed byte ranges in the BinaryFileResponse. According to rfc2616 (http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35.1) byte positions are inclusive: The first-byte-pos value in a byte-range-spec gives the byte-offset of the first byte in a range. The last-byte-pos value gives the byte-offset of the last byte in the range; that is, the byte positions specified are inclusive. Byte offsets start at zero. --- src/Symfony/Component/HttpFoundation/BinaryFileResponse.php | 2 +- .../Component/HttpFoundation/Tests/BinaryFileResponseTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php index a5c77f0ab7..5c2bf48877 100644 --- a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php +++ b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php @@ -199,7 +199,7 @@ class BinaryFileResponse extends Response list($start, $end) = array_map('intval', explode('-', substr($range, 6), 2)) + array(0); if ('' !== $end) { - $this->maxlen = $end - $start; + $this->maxlen = $end - $start + 1; } else { $end = $this->file->getSize() - 1; } diff --git a/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php index 23f93f7a76..4f749a1ef0 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php @@ -61,7 +61,7 @@ class BinaryFileResponseTest extends \PHPUnit_Framework_TestCase $request->headers->set('If-Range', $etag); $request->headers->set('Range', 'bytes=1-4'); - $this->expectOutputString('IF8'); + $this->expectOutputString('IF87'); $response = clone $response; $response->prepare($request); $response->sendContent(); From 381bd7e2353f6573b534d8e66f622494da95be4d Mon Sep 17 00:00:00 2001 From: Jakub Zalas Date: Sat, 9 Feb 2013 16:37:25 +0100 Subject: [PATCH 30/30] [HttpFoundation] Added support for partial ranges in the BinaryFileResponse. Valid ranges include: * bytes=0-499 * bytes=500-999 * bytes=-500 * bytes=9500- * bytes=0-0 --- .../HttpFoundation/BinaryFileResponse.php | 18 +++++++---- .../Tests/BinaryFileResponseTest.php | 30 +++++++++++++++++-- 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php index 5c2bf48877..cb6c8a1e8a 100644 --- a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php +++ b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php @@ -195,19 +195,27 @@ class BinaryFileResponse extends Response // Process the range headers. if (!$request->headers->has('If-Range') || $this->getEtag() == $request->headers->get('If-Range')) { $range = $request->headers->get('Range'); + $fileSize = $this->file->getSize(); - list($start, $end) = array_map('intval', explode('-', substr($range, 6), 2)) + array(0); + list($start, $end) = explode('-', substr($range, 6), 2) + array(0); - if ('' !== $end) { - $this->maxlen = $end - $start + 1; + $end = ('' === $end) ? $fileSize - 1 : (int) $end; + + if ('' === $start) { + $start = $fileSize - $end; + $end = $fileSize - 1; } else { - $end = $this->file->getSize() - 1; + $start = (int) $start; } + $start = max($start, 0); + $end = min($end, $fileSize - 1); + + $this->maxlen = $end < $fileSize ? $end - $start + 1 : -1; $this->offset = $start; $this->setStatusCode(206); - $this->headers->set('Content-Range', sprintf('bytes %s-%s/%s', $start, $end, $this->file->getSize())); + $this->headers->set('Content-Range', sprintf('bytes %s-%s/%s', $start, $end, $fileSize)); } } diff --git a/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php index 4f749a1ef0..4d517313f3 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php @@ -47,7 +47,10 @@ class BinaryFileResponseTest extends \PHPUnit_Framework_TestCase $this->assertFalse($response->getContent()); } - public function testRequests() + /** + * @dataProvider provideRanges + */ + public function testRequests($requestRange, $offset, $length, $responseRange) { $response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif')->setAutoEtag(); @@ -59,14 +62,35 @@ class BinaryFileResponseTest extends \PHPUnit_Framework_TestCase // prepare a request for a range of the testing file $request = Request::create('/'); $request->headers->set('If-Range', $etag); - $request->headers->set('Range', 'bytes=1-4'); + $request->headers->set('Range', $requestRange); - $this->expectOutputString('IF87'); + $file = fopen(__DIR__.'/File/Fixtures/test.gif', 'r'); + fseek($file, $offset); + $data = fread($file, $length); + fclose($file); + + $this->expectOutputString($data); $response = clone $response; $response->prepare($request); $response->sendContent(); + $this->assertEquals(206, $response->getStatusCode()); $this->assertEquals('binary', $response->headers->get('Content-Transfer-Encoding')); + $this->assertEquals($responseRange, $response->headers->get('Content-Range')); + } + + public function provideRanges() + { + return array( + array('bytes=1-4', 1, 4, 'bytes 1-4/35'), + array('bytes=-5', 30, 5, 'bytes 30-34/35'), + array('bytes=-35', 0, 35, 'bytes 0-34/35'), + array('bytes=-40', 0, 35, 'bytes 0-34/35'), + array('bytes=30-', 30, 5, 'bytes 30-34/35'), + array('bytes=30-30', 30, 1, 'bytes 30-30/35'), + array('bytes=30-34', 30, 5, 'bytes 30-34/35'), + array('bytes=30-40', 30, 5, 'bytes 30-34/35') + ); } public function testXSendfile()